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 45ff420ec7e3ad522dc6d0e53837a6e1951407fc (commit) from 37de68c96531e9d968f45f345c813d3d240e6a48 (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 45ff420ec7e3ad522dc6d0e53837a6e1951407fc Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Apr 23 14:28:41 2015 +0200

Drop openssl-compat package

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

Summary of changes: config/rootfiles/common/openssl-compat | 2 - .../core/90/filelists/openssl-0.9.8-files | 20 ++++ config/rootfiles/core/90/update.sh | 3 + lfs/openssl-compat | 102 --------------------- make.sh | 1 - 5 files changed, 23 insertions(+), 105 deletions(-) delete mode 100644 config/rootfiles/common/openssl-compat create mode 100644 config/rootfiles/core/90/filelists/openssl-0.9.8-files delete mode 100644 lfs/openssl-compat

Difference in files: diff --git a/config/rootfiles/common/openssl-compat b/config/rootfiles/common/openssl-compat deleted file mode 100644 index ccf89d0..0000000 --- a/config/rootfiles/common/openssl-compat +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libcrypto.so.0.9.8 -usr/lib/libssl.so.0.9.8 diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/core/90/filelists/openssl-0.9.8-files new file mode 100644 index 0000000..cad5293 --- /dev/null +++ b/config/rootfiles/core/90/filelists/openssl-0.9.8-files @@ -0,0 +1,20 @@ +lib/security/pam_mysql.so +usr/lib/gnupg/gpgkeys_ldap +usr/lib/gnupg/gpgkeys_hkp +usr/lib/gnupg/gpgkeys_curl +usr/lib/apache/libphp5.so +usr/lib/squid/digest_ldap_auth +usr/lib/squid/basic_ldap_auth +usr/lib/squid/digest_edirectory_auth +usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/ext_edirectory_userip_acl +usr/lib/squid/ext_ldap_group_acl +usr/lib/python2.7/lib-dynload/_ssl.so +usr/lib/python2.7/lib-dynload/_hashlib.so +usr/lib/collectd/write_http.so +usr/lib/collectd/ascent.so +usr/lib/collectd/curl_xml.so +usr/lib/collectd/apache.so +usr/lib/collectd/bind.so +usr/lib/collectd/curl.so +usr/bin/php diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index d3b4038..573d5a7 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -136,6 +136,9 @@ esac #Extract files tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /

+# Remove old openssl libraries +rm -vf /usr/lib/libcrypto.so.0.9.8 /usr/lib/libssl.so.0.9.8 + # Check diskspace on boot BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`

diff --git a/lfs/openssl-compat b/lfs/openssl-compat deleted file mode 100644 index 5e3c1ff..0000000 --- a/lfs/openssl-compat +++ /dev/null @@ -1,102 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.9.8zf - -THISAPP = openssl-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = c69a4a679233f7df189e1ad6659511ec - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(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/openssl-disable-sslv2-sslv3.patch - - # Apply our CFLAGS - cd $(DIR_APP) && sed -i Configure \ - -e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g" - - cd $(DIR_APP) && sed -i -e 's/mcpu/march/' config - cd $(DIR_APP) && sed -i -e 's/-O3/-O2/' -e 's/-march=i486/-march=i586/' Configure - - # Support for engines is disabled, because the shared objects from the - # new version of openssl cannot be loaded by the old one. - - cd $(DIR_APP) && ./Configure \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - shared linux-elf \ - zlib-dynamic \ - no-engines \ - no-asm 386 \ - -DSSL_FORBID_ENULL - - cd $(DIR_APP) && make depend - cd $(DIR_APP) && make - - cd $(DIR_APP) && install -v -m 755 libcrypto.so.0.9.8 /usr/lib - cd $(DIR_APP) && install -v -m 755 libssl.so.0.9.8 /usr/lib - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5538712..1992c02 100755 --- a/make.sh +++ b/make.sh @@ -462,7 +462,6 @@ buildipfire() { ipfiremake xtables-addons USPACE="1" ipfiremake openssl [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl SSE2="1" - ipfiremake openssl-compat ipfiremake libgpg-error ipfiremake libgcrypt ipfiremake libassuan

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