[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 473a2a9e15e02323461448decbc3cc2d3d089fdb

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 473a2a9e15e02323461448decbc3cc2d3d089fdb

[git]

[-- Attachment #1: Type: text/plain, Size: 4454 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, master has been updated
       via  473a2a9e15e02323461448decbc3cc2d3d089fdb (commit)
       via  f7c98d3df1d0f7732b6089a9b211bb1328d37a82 (commit)
       via  12553c69cf9e5de8688d5576844a6336a39c9584 (commit)
      from  87cd02c3d7f699c704b758b50cc01bd134fd9885 (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 473a2a9e15e02323461448decbc3cc2d3d089fdb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 9 15:21:01 2015 +0200

    set pakfire version to core92.

commit f7c98d3df1d0f7732b6089a9b211bb1328d37a82
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 9 15:20:35 2015 +0200

    core92: stop/start squid at update.

commit 12553c69cf9e5de8688d5576844a6336a39c9584
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 9 15:15:05 2015 +0200

    openssl: security update to 1.0.2d
    
    cve 2015-1792

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

Summary of changes:
 config/rootfiles/{oldcore/91 => core/92}/filelists/openssh | 0
 config/rootfiles/{oldcore/91 => core/92}/filelists/openssl | 0
 config/rootfiles/core/92/update.sh                         | 6 ++++--
 lfs/openssl                                                | 4 ++--
 make.sh                                                    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)
 copy config/rootfiles/{oldcore/91 => core/92}/filelists/openssh (100%)
 copy config/rootfiles/{oldcore/91 => core/92}/filelists/openssl (100%)

Difference in files:
diff --git a/config/rootfiles/core/92/filelists/openssh b/config/rootfiles/core/92/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/92/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/92/filelists/openssl b/config/rootfiles/core/92/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/92/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh
index cd1bd01..083561f 100644
--- a/config/rootfiles/core/92/update.sh
+++ b/config/rootfiles/core/92/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/ipsec stop
 
 # Extract files
@@ -44,15 +45,15 @@ extract_files
 sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 
 rm -f /bin/[
-sync
 
 # Start services
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
 	/etc/init.d/ipsec start
 fi
+/etc/init.d/squid start
 
 # This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
@@ -61,6 +62,7 @@ sendprofile
 if [ -e /boot/grub/grub.cfg ]; then
 	grub-mkconfig > /boot/grub/grub.cfg
 fi
+sync
 
 # Don't report the exitcode last command
 exit 0
diff --git a/lfs/openssl b/lfs/openssl
index 1abc92c..670018a 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.2c
+VER        = 1.0.2d
 
 THISAPP    = openssl-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6
+$(DL_FILE)_MD5 = 38dd619b2e77cbac69b99f52a053d25a
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 9487883..f2b01ff 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
 CORE="92"							# Core Level (Filename)
-PAKFIRE_CORE="91"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="92"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir


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