[git.ipfire.org] IPFire 2.x development tree branch, core91, updated. 1f99566dd268515c18a8d8ae2e8ab526c490b99b

[git.ipfire.org] IPFire 2.x development tree branch, core91, updated. 1f99566dd268515c18a8d8ae2e8ab526c490b99b

[git]

[-- Attachment #1: Type: text/plain, Size: 4951 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, core91 has been updated
       via  1f99566dd268515c18a8d8ae2e8ab526c490b99b (commit)
       via  5cba4356690f1282b506844505d81bc8b050d32e (commit)
       via  c3e195433152f91a3f14d59d6ea10e8963e6308d (commit)
      from  6646be5a53c2fa4846f6403d887a2975469800f6 (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 1f99566dd268515c18a8d8ae2e8ab526c490b99b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jun 12 17:54:38 2015 +0200

    openssl: update to 1.0.2c
    
    fix ABI problems.

commit 5cba4356690f1282b506844505d81bc8b050d32e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jun 12 17:54:03 2015 +0200

    core91: rebuild grub.cfg to display new core version.

commit c3e195433152f91a3f14d59d6ea10e8963e6308d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jun 12 17:15:51 2015 +0200

    strongswan: Update to 5.3.2
    
    This release fixes a security issue filed under CVE-2015-4171.
    
    https://www.strongswan.org/blog/2015/06/08/strongswan-vulnerability-(cve-2015-4171).html
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/91/update.sh                  |  5 +++++
 lfs/openssl                                         |  4 ++--
 lfs/strongswan                                      |  6 ++----
 src/patches/strongswan-5.3.1-build-timeattack.patch | 11 -----------
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch

Difference in files:
diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh
index 1e55e8b..1104c9f 100644
--- a/config/rootfiles/core/91/update.sh
+++ b/config/rootfiles/core/91/update.sh
@@ -54,6 +54,11 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	/etc/init.d/ipsec start
 fi
 
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig > /boot/grub/grub.cfg
+fi
+
 # This update need a reboot...
 touch /var/run/need_reboot
 
diff --git a/lfs/openssl b/lfs/openssl
index 3b9f3e1..1abc92c 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2b
+VER        = 1.0.2c
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b
+$(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6
 
 install : $(TARGET)
 
diff --git a/lfs/strongswan b/lfs/strongswan
index d1a5b8c..b4438dd 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.3.1
+VER        = 5.3.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013
+$(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c
 
 install : $(TARGET)
 
@@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
 
-	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP) && ./configure \
 		--prefix="/usr" \
 		--sysconfdir="/etc" \
diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch
deleted file mode 100644
index 948c4fc..0000000
--- a/src/patches/strongswan-5.3.1-build-timeattack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- strongswan-5.3.1/scripts/Makefile.am.old	2015-06-04 17:20:43.539244145 +0000
-+++ strongswan-5.3.1/scripts/Makefile.am	2015-06-04 17:20:51.760510631 +0000
-@@ -42,7 +42,7 @@
- dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
- aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
- settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
--timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
-+timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB)
- 
- key2keyid.o :	$(top_builddir)/config.status
- 


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