mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.2.27
|
||||
VER = 2.2.29
|
||||
|
||||
THISAPP = httpd-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.bz2
|
||||
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
|
||||
|
||||
$(DL_FILE)_MD5 = 8faef0decf3fa7e69b2568eb2105a3d8
|
||||
$(DL_FILE)_MD5 = 579342fdeaa7b8b68d17fee91f8fab6e
|
||||
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 2.1.21
|
||||
VER = 2.1.26
|
||||
|
||||
THISAPP = cyrus-sasl-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = dde02db234dea892bee298390890502e
|
||||
$(DL_FILE)_MD5 = a7f4e5e559a0e37b3ffc438c9456e425
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
@@ -82,7 +82,6 @@ $(subst %,%_MD5,$(objects)) :
|
||||
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
|
||||
cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
|
||||
cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am
|
||||
cd $(DIR_APP) && autoconf
|
||||
@@ -90,7 +89,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
ifeq "$(PASS)" ""
|
||||
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
|
||||
--with-dbpath=/var/lib/sasl/sasldb2 \
|
||||
--with-saslauthd=/var/run/saslauthd
|
||||
--with-saslauthd=/var/run/saslauthd \
|
||||
--with-des=no --with-rc4=no
|
||||
cd $(DIR_APP) && make
|
||||
cd $(DIR_APP) && make install
|
||||
install -v -m700 -d /var/lib/sasl
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
include Config
|
||||
|
||||
VER = 6.6p1
|
||||
VER = 6.8p1
|
||||
|
||||
THISAPP = openssh-$(VER)
|
||||
DL_FILE = $(THISAPP).tar.gz
|
||||
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
|
||||
|
||||
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
|
||||
|
||||
$(DL_FILE)_MD5 = 3e9800e6bca1fbac0eea4d41baa7f239
|
||||
$(DL_FILE)_MD5 = 08f72de6751acfbd0892b5f003922701
|
||||
|
||||
install : $(TARGET)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user