[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79cfa337b16e54e86b7812fb0166639759af29fe

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 79cfa337b16e54e86b7812fb0166639759af29fe

[git]

[-- Attachment #1: Type: text/plain, Size: 4732 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  79cfa337b16e54e86b7812fb0166639759af29fe (commit)
       via  2acac5421f03eccd0e603106093489b985c65cb8 (commit)
       via  7f5795c65fa65e4835cfcb60408a64581813e9ca (commit)
      from  c3c2e81c6fd50e102b10891c980e515d1bb072a0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79cfa337b16e54e86b7812fb0166639759af29fe
Merge: 2acac54 c3c2e81
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Mar 19 19:19:32 2015 +0100

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 2acac5421f03eccd0e603106093489b985c65cb8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Mar 19 19:18:49 2015 +0100

    cyrus-sasl: Update to version 2.1.26

commit 7f5795c65fa65e4835cfcb60408a64581813e9ca
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Mar 19 19:18:23 2015 +0100

    apache2: Update to version 2.2.29

-----------------------------------------------------------------------

Summary of changes:
 lfs/apache2                                  |  4 ++--
 lfs/cyrus-sasl                               |  8 ++++----
 src/patches/cyrus-sasl-2.1.22-bad-elif.patch | 21 ---------------------
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 src/patches/cyrus-sasl-2.1.22-bad-elif.patch

Difference in files:
diff --git a/lfs/apache2 b/lfs/apache2
index 5e88625..0d7b11e 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -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)
diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index af2b148..84f49d9 100644
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -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
diff --git a/src/patches/cyrus-sasl-2.1.22-bad-elif.patch b/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
deleted file mode 100644
index 33550c4..0000000
--- a/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up cyrus-sasl-2.1.22/plugins/digestmd5.c.elif cyrus-sasl-2.1.22/plugins/digestmd5.c
---- cyrus-sasl-2.1.22/plugins/digestmd5.c.elif	2009-01-23 09:40:31.000000000 +0100
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c	2009-02-06 15:20:15.000000000 +0100
-@@ -2743,7 +2743,7 @@ static sasl_server_plug_t digestmd5_serv
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4071,7 +4071,7 @@ static sasl_client_plug_t digestmd5_clie
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,


hooks/post-receive
--
IPFire 2.x development tree