IPFire-SCM April 2015

ipfire-scm@lists.ipfire.org

1 participants
88 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0c923f424c0d4a8a8a873ee3f84a065ecce58f7
by git＠ipfire.org 25 Apr '15

25 Apr '15

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 e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 (commit) via 7f16c6664788ef9616c16a4b87ba98893c46fedb (commit) from 0594323b79a4bf8ba390a4cd9a2c6833983174ac (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 e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 25 13:23:34 2015 +0200 Add rootfile check for hardcoded machine type. commit 7f16c6664788ef9616c16a4b87ba98893c46fedb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 25 09:49:37 2015 +0200 libsrtp: update rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libsrtp | 1 + make.sh | 2 +- tools/{checkwronginitlinks => checkrootfiles} | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) rename tools/{checkwronginitlinks => checkrootfiles} (76%) Difference in files: diff --git a/config/rootfiles/packages/libsrtp b/config/rootfiles/packages/libsrtp index 105f3f0..3ee2e3b 100644 --- a/config/rootfiles/packages/libsrtp +++ b/config/rootfiles/packages/libsrtp @@ -37,4 +37,5 @@ #usr/include/srtp/ut_sim.h #usr/include/srtp/xfm.h usr/lib/libsrtp.so +usr/lib/libsrtp.so.1 #usr/lib/pkgconfig/libsrtp.pc diff --git a/make.sh b/make.sh index db40b56..26f9d42 100755 --- a/make.sh +++ b/make.sh @@ -978,7 +978,7 @@ build) cd $BASEDIR tools/checknewlog.pl - tools/checkwronginitlinks + tools/checkrootfiles cd $PWD beautify build_end diff --git a/tools/checkrootfiles b/tools/checkrootfiles new file mode 100755 index 0000000..74fab3e --- /dev/null +++ b/tools/checkrootfiles @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2015 IPFire Team info(a)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/>. # +# # +############################################################################### + +grep -r "^etc/init.d//*" ./config/rootfiles/ >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! 'etc/init.d/...' in rootfiles files found!" + grep -r "^etc/init.d//*" ./config/rootfiles/ + echo "Change this to 'etc/rc.d/init.d/...' !" +fi + +grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! 'var/run/...' in rootfiles files found!" + grep -r "^var/run//*" ./config/rootfiles/ + echo "Comment this and create it at initskript if needed !" +fi + +grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! '/i586' in rootfiles files found!" + grep -r "/i586" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore + echo "Replace by MACHINE !" +fi + +grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! '/armv5tel' in rootfiles files found!" + grep -r "/armv5tel" ./config/rootfiles/ --exclude gcc --exclude-dir oldcore + echo "Replace by MACHINE !" +fi diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks deleted file mode 100755 index 65fc946..0000000 --- a/tools/checkwronginitlinks +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info(a)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/>. # -# # -############################################################################### - -grep -r "^etc/init.d//*" ./config/rootfiles/ >/dev/null 2>&1 -if [ "${?}" == "0" ]; then - echo "Error! 'etc/init.d/...' in rootfiles files found!" - grep -r "^etc/init.d//*" ./config/rootfiles/ - echo "Change this to 'etc/rc.d/init.d/...' !" -fi - -grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1 -if [ "${?}" == "0" ]; then - echo "Error! 'var/run/...' in rootfiles files found!" - grep -r "^var/run//*" ./config/rootfiles/ - echo "Comment this and create it at initskript if needed !" -fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0594323b79a4bf8ba390a4cd9a2c6833983174ac
by git＠ipfire.org 24 Apr '15

24 Apr '15

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 0594323b79a4bf8ba390a4cd9a2c6833983174ac (commit) from f3c793854077e1368768af0137ffc1a885490381 (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 0594323b79a4bf8ba390a4cd9a2c6833983174ac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 24 20:06:13 2015 +0200 core90: remove missing file from openssl-0.9.8-files. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/filelists/openssl-0.9.8-files | 1 - 1 file changed, 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/90/filelists/openssl-0.9.8-files b/config/rootfiles/core/90/filelists/openssl-0.9.8-files index cad5293..e80a57d 100644 --- a/config/rootfiles/core/90/filelists/openssl-0.9.8-files +++ b/config/rootfiles/core/90/filelists/openssl-0.9.8-files @@ -5,7 +5,6 @@ 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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f3c793854077e1368768af0137ffc1a885490381
by git＠ipfire.org 24 Apr '15

24 Apr '15

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 f3c793854077e1368768af0137ffc1a885490381 (commit) from 67a0c5180db8bef41def07e9d6a8e11efca4fd35 (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 f3c793854077e1368768af0137ffc1a885490381 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Apr 24 20:03:45 2015 +0200 openssl: fix ssl2 rootfile handling. KCFG will added to the lfs filename at determine the filename in config/rootfiles folder. ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 10 +++------- make.sh | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) Difference in files: diff --git a/lfs/openssl b/lfs/openssl index 699f360..9cc1b4b 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -31,11 +31,7 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(SSE2)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-sse2 -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif +TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG) CFLAGS += -DPURIFY export RPM_OPT_FLAGS = $(CFLAGS) @@ -60,7 +56,7 @@ CONFIGURE_OPTIONS = \ ifeq "$(MACHINE)" "i586" CONFIGURE_OPTIONS += linux-elf -ifneq "$(SSE2)" "1" +ifneq "$(KCFG)" "-sse2" CONFIGURE_OPTIONS += no-sse2 endif endif @@ -124,7 +120,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make depend cd $(DIR_APP) && make -ifeq "$(SSE2)" "1" +ifeq "$(KCFG)" "-sse2" -mkdir -pv /usr/lib/sse2 cd $(DIR_APP) && install -m 755 \ libcrypto.so.10 libssl.so.10 /usr/lib/sse2 diff --git a/make.sh b/make.sh index 1992c02..db40b56 100755 --- a/make.sh +++ b/make.sh @@ -461,7 +461,7 @@ buildipfire() { esac ipfiremake xtables-addons USPACE="1" ipfiremake openssl - [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl SSE2="1" + [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl KCFG='-sse2' ipfiremake libgpg-error ipfiremake libgcrypt ipfiremake libassuan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 67a0c5180db8bef41def07e9d6a8e11efca4fd35
by git＠ipfire.org 24 Apr '15

24 Apr '15

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 67a0c5180db8bef41def07e9d6a8e11efca4fd35 (commit) via d0b47c7a8fb8b0be065e1874bb664b4fd01e9e00 (commit) from 432bc116fb34fd796c70132d184a3e3d1e126b4f (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 67a0c5180db8bef41def07e9d6a8e11efca4fd35 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Wed Apr 15 14:17:34 2015 +0200 asterisk addon: upate to 11.17.1 commit d0b47c7a8fb8b0be065e1874bb664b4fd01e9e00 Author: Dirk Wagner <dirk.wagner(a)ipfire.org> Date: Wed Apr 15 14:16:36 2015 +0200 libsrtp: upgrade to 1.5.2 ----------------------------------------------------------------------- Summary of changes: lfs/asterisk | 6 +++--- lfs/libsrtp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/lfs/asterisk b/lfs/asterisk index 2c112d0..7575246 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.16.0 +VER = 11.17.1 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 15 +PAK_VER = 16 DEPS = "libsrtp" @@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz -$(DL_FILE)_MD5 = de06d4ac0d1ba531c4c18805a9d5a18d +$(DL_FILE)_MD5 = 2c6cd0f499152d0d5ff32f36e274fc2e asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c diff --git a/lfs/libsrtp b/lfs/libsrtp index 6dfef3b..47c0cad 100644 --- a/lfs/libsrtp +++ b/lfs/libsrtp @@ -24,14 +24,14 @@ include Config -VER = 1.5.0 +VER = 1.5.2 THISAPP = libsrtp-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libsrtp -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ec49ba558b4fd056114df2c76935aa8e +$(DL_FILE)_MD5 = 2309aa6027992810a4285b042c71e644 install : $(TARGET) @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make uninstall && make $(MAKETUNING) libsrtp.so + cd $(DIR_APP) && make uninstall && make $(MAKETUNING) shared_library cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 432bc116fb34fd796c70132d184a3e3d1e126b4f
by git＠ipfire.org 23 Apr '15

23 Apr '15

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 432bc116fb34fd796c70132d184a3e3d1e126b4f (commit) from 991082e93600c3c2ba529ea8bbc0437c5764c964 (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 432bc116fb34fd796c70132d184a3e3d1e126b4f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 23 23:31:58 2015 +0200 openssl: fix typo on arm config. ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/lfs/openssl b/lfs/openssl index 6872f10..699f360 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -66,7 +66,7 @@ endif endif ifeq "$(MACHINE)" "armv5tel" - CONFIGURE_OPIONS += linux-generic32 + CONFIGURE_OPTIONS += linux-generic32 endif ############################################################################### hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 991082e93600c3c2ba529ea8bbc0437c5764c964
by git＠ipfire.org 23 Apr '15

23 Apr '15

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 991082e93600c3c2ba529ea8bbc0437c5764c964 (commit) from 45ff420ec7e3ad522dc6d0e53837a6e1951407fc (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 991082e93600c3c2ba529ea8bbc0437c5764c964 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 23 21:18:42 2015 +0200 core90: ship backupiso withupdate. this file was missing in core87. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/filelists/files | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 22a7d33..69d7421 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -18,6 +18,7 @@ srv/web/ipfire/html/themes/ipfire/include/css/style.css srv/web/ipfire/html/themes/maniac/include/style.css usr/lib/firewall/firewall-lib.pl usr/lib/firewall/rules.pl +usr/local/bin/backupiso usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update var/ipfire/general-functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 45ff420ec7e3ad522dc6d0e53837a6e1951407fc
by git＠ipfire.org 23 Apr '15

23 Apr '15

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(a)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(a)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

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 37de68c96531e9d968f45f345c813d3d240e6a48
by git＠ipfire.org 23 Apr '15

23 Apr '15

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 37de68c96531e9d968f45f345c813d3d240e6a48 (commit) via 69a419b19ac9c314b98cdc0ce72734f55857bb90 (commit) from 4ad384c68d90a912406aae93371ddb87808c6202 (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 37de68c96531e9d968f45f345c813d3d240e6a48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 23 13:33:35 2015 +0200 openssl: Enable all assembly optimisations build SSE2 optimised version Fixes #10814 commit 69a419b19ac9c314b98cdc0ce72734f55857bb90 Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Apr 23 09:20:00 2015 +0200 BUG10812: fix missing slash in path ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/openssl-sse2 | 2 + .../rootfiles/core/90/filelists/i586/openssl-sse2 | 1 + config/rootfiles/core/90/update.sh | 2 +- lfs/openssl | 62 ++++++++++++++-------- make.sh | 1 + src/patches/openssl-1.0.2a-rpmbuild.patch | 29 ++++++---- 6 files changed, 63 insertions(+), 34 deletions(-) create mode 100644 config/rootfiles/common/i586/openssl-sse2 create mode 120000 config/rootfiles/core/90/filelists/i586/openssl-sse2 Difference in files: diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2 new file mode 100644 index 0000000..59bfce3 --- /dev/null +++ b/config/rootfiles/common/i586/openssl-sse2 @@ -0,0 +1,2 @@ +usr/lib/sse2/libcrypto.so.10 +usr/lib/sse2/libssl.so.10 diff --git a/config/rootfiles/core/90/filelists/i586/openssl-sse2 b/config/rootfiles/core/90/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/90/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 270da21..d3b4038 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -173,7 +173,7 @@ if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then fi #Fix BUG10812 (openvpn server.conf has wrong collectd logfile path) -if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpnserver.conf; then +if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpn/server.conf; then sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf fi diff --git a/lfs/openssl b/lfs/openssl index 6f31e02..6872f10 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -30,19 +30,45 @@ THISAPP = openssl-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) + +ifeq "$(SSE2)" "1" + TARGET = $(DIR_INFO)/$(THISAPP)-sse2 +else + TARGET = $(DIR_INFO)/$(THISAPP) +endif + +CFLAGS += -DPURIFY +export RPM_OPT_FLAGS = $(CFLAGS) + +CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + --enginesdir=/usr/lib/openssl/engines \ + shared \ + zlib-dynamic \ + enable-camellia \ + enable-md2 \ + enable-seed \ + enable-tlsext \ + enable-rfc3779 \ + no-idea \ + no-mdc2 \ + no-rc5 \ + no-srp \ + -DSSL_FORBID_ENULL ifeq "$(MACHINE)" "i586" - CONFIGURE_ARGS = linux-generic32 no-asm 386 + CONFIGURE_OPTIONS += linux-elf + +ifneq "$(SSE2)" "1" + CONFIGURE_OPTIONS += no-sse2 +endif endif ifeq "$(MACHINE)" "armv5tel" - CONFIGURE_ARGS = linux-generic32 + CONFIGURE_OPIONS += linux-generic32 endif -CFLAGS += -DPURIFY -export RPM_OPT_FLAGS = $(CFLAGS) - ############################################################################### # Top-level Rules ############################################################################### @@ -93,27 +119,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && find crypto/ -name Makefile -exec \ sed 's/^ASFLAGS=/&-Wa,--noexecstack /' -i {} \; - cd $(DIR_APP) && ./Configure \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - --enginesdir=/usr/lib/openssl/engines \ - shared \ - zlib-dynamic \ - enable-camellia \ - enable-md2 \ - enable-seed \ - enable-tlsext \ - enable-rfc3779 \ - no-idea \ - no-mdc2 \ - no-rc5 \ - no-srp \ - $(CONFIGURE_ARGS) \ - -DSSL_FORBID_ENULL + cd $(DIR_APP) && ./Configure $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make depend cd $(DIR_APP) && make +ifeq "$(SSE2)" "1" + -mkdir -pv /usr/lib/sse2 + cd $(DIR_APP) && install -m 755 \ + libcrypto.so.10 libssl.so.10 /usr/lib/sse2 +else # Install everything. cd $(DIR_APP) && make install install -m 0644 $(DIR_SRC)/config/ssl/openssl.cnf /etc/ssl @@ -125,6 +140,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -pv /usr/lib/openssl rm -vfr /usr/lib/openssl/engines mv -v /usr/lib/engines /usr/lib/openssl +endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 6662096..5538712 100755 --- a/make.sh +++ b/make.sh @@ -461,6 +461,7 @@ buildipfire() { esac ipfiremake xtables-addons USPACE="1" ipfiremake openssl + [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl SSE2="1" ipfiremake openssl-compat ipfiremake libgpg-error ipfiremake libgcrypt diff --git a/src/patches/openssl-1.0.2a-rpmbuild.patch b/src/patches/openssl-1.0.2a-rpmbuild.patch index 3cab5c2..2395d86 100644 --- a/src/patches/openssl-1.0.2a-rpmbuild.patch +++ b/src/patches/openssl-1.0.2a-rpmbuild.patch @@ -1,6 +1,6 @@ -diff -up openssl-1.0.1e/Configure.rpmbuild openssl-1.0.1e/Configure ---- openssl-1.0.2a.vanilla/Configure 2015-03-19 13:30:36.000000000 +0000 -+++ openssl-1.0.2a/Configure 2015-04-19 09:53:04.381491868 +0000 +diff -Nur openssl-1.0.2a-vanilla/Configure openssl-1.0.2a/Configure +--- openssl-1.0.2a-vanilla/Configure 2015-03-19 13:30:36.000000000 +0000 ++++ openssl-1.0.2a/Configure 2015-04-23 10:31:41.336569854 +0000 @@ -348,7 +348,7 @@ #### # *-generic* is endian-neutral target, but ./config is free to @@ -10,7 +10,16 @@ diff -up openssl-1.0.1e/Configure.rpmbuild openssl-1.0.1e/Configure "linux-ppc", "gcc:-DB_ENDIAN -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ####################################################################### -@@ -1675,7 +1676,7 @@ while (<IN>) +@@ -389,7 +389,7 @@ + "linux64-mips64", "gcc:-mabi=64 -O3 -Wall -DBN_DIV3W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64", + #### IA-32 targets... + "linux-ia32-icc", "icc:-DL_ENDIAN -O2::-D_REENTRANT::-ldl -no_cpprt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +-"linux-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"linux-elf", "gcc:-DL_ENDIAN \$(CFLAGS) -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_SONAMEVER)", + "linux-aout", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out", + #### + "linux-generic64","gcc:-O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +@@ -1737,7 +1737,7 @@ elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; @@ -19,10 +28,10 @@ diff -up openssl-1.0.1e/Configure.rpmbuild openssl-1.0.1e/Configure } elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) { -diff -up openssl-1.0.1e/Makefile.org.rpmbuild openssl-1.0.1e/Makefile.org ---- openssl-1.0.1e/Makefile.org.rpmbuild 2013-02-11 16:26:04.000000000 +0100 -+++ openssl-1.0.1e/Makefile.org 2014-08-13 19:19:53.218005759 +0200 -@@ -10,6 +10,7 @@ SHLIB_VERSION_HISTORY= +diff -Nur openssl-1.0.2a-vanilla/Makefile.org openssl-1.0.2a/Makefile.org +--- openssl-1.0.2a-vanilla/Makefile.org 2015-03-19 13:30:36.000000000 +0000 ++++ openssl-1.0.2a/Makefile.org 2015-04-23 10:30:03.184371933 +0000 +@@ -10,6 +10,7 @@ SHLIB_MAJOR= SHLIB_MINOR= SHLIB_EXT= @@ -30,7 +39,7 @@ diff -up openssl-1.0.1e/Makefile.org.rpmbuild openssl-1.0.1e/Makefile.org PLATFORM=dist OPTIONS= CONFIGURE_ARGS= -@@ -333,10 +334,9 @@ clean-shared: +@@ -335,10 +336,9 @@ link-shared: @ set -e; for i in $(SHLIBDIRS); do \ $(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \ @@ -42,7 +51,7 @@ diff -up openssl-1.0.1e/Makefile.org.rpmbuild openssl-1.0.1e/Makefile.org done build-shared: do_$(SHLIB_TARGET) link-shared -@@ -347,7 +347,7 @@ do_$(SHLIB_TARGET): +@@ -349,7 +349,7 @@ libs="$(LIBKRB5) $$libs"; \ fi; \ $(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ad384c68d90a912406aae93371ddb87808c6202
by git＠ipfire.org 22 Apr '15

22 Apr '15

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 4ad384c68d90a912406aae93371ddb87808c6202 (commit) from ba1abcb658a524b3d8af3b4f8b4baad4802f3476 (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 4ad384c68d90a912406aae93371ddb87808c6202 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 22 22:15:27 2015 +0200 rootfiles: fix build on arm. i586 -> MACHINE ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/Locale-Country | 6 +++--- config/rootfiles/common/collectd | 10 +++++----- config/rootfiles/common/perl-Text-CSV_XS | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) Difference in files: diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country index 0ed312f..58c2406 100644 --- a/config/rootfiles/common/Locale-Country +++ b/config/rootfiles/common/Locale-Country @@ -33,9 +33,9 @@ usr/lib/perl5/5.12.3/Locale/Codes/Script.pm usr/lib/perl5/5.12.3/Locale/Codes/Script.pod usr/lib/perl5/5.12.3/Locale/Codes/Script_Codes.pm usr/lib/perl5/5.12.3/Locale/Codes/Script_Retired.pm -#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale -#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale/Codes -#usr/lib/perl5/5.12.3/i586-linux-thread-multi/auto/Locale/Codes/.packlist +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale/Codes +#usr/lib/perl5/5.12.3/MACHINE-linux-thread-multi/auto/Locale/Codes/.packlist #usr/share/man/man3/Locale::Codes.3 #usr/share/man/man3/Locale::Codes::API.3 #usr/share/man/man3/Locale::Codes::Changes.3 diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd index 2732494..cac4c3d 100644 --- a/config/rootfiles/common/collectd +++ b/config/rootfiles/common/collectd @@ -218,11 +218,11 @@ usr/lib/libcollectdclient.so.0.0.0 #usr/lib/perl5/Collectd/Plugins #usr/lib/perl5/Collectd/Plugins/OpenVZ.pm #usr/lib/perl5/Collectd/Unixsock.pm -#usr/lib/perl5/i586-linux-thread-multi -#usr/lib/perl5/i586-linux-thread-multi/auto -#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd -#usr/lib/perl5/i586-linux-thread-multi/auto/Collectd/.packlist -#usr/lib/perl5/i586-linux-thread-multi/perllocal.pod +#usr/lib/perl5/MACHINE-linux-thread-multi +#usr/lib/perl5/MACHINE-linux-thread-multi/auto +#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd +#usr/lib/perl5/MACHINE-linux-thread-multi/auto/Collectd/.packlist +#usr/lib/perl5/MACHINE-linux-thread-multi/perllocal.pod #usr/lib/pkgconfig/libcollectdclient.pc #usr/man/man3/Collectd::Unixsock.3 usr/sbin/collectd diff --git a/config/rootfiles/common/perl-Text-CSV_XS b/config/rootfiles/common/perl-Text-CSV_XS index ca2f642..bbc7d9b 100644 --- a/config/rootfiles/common/perl-Text-CSV_XS +++ b/config/rootfiles/common/perl-Text-CSV_XS @@ -1,8 +1,8 @@ -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Text -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/Text/CSV_XS.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Text -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Text/CSV_XS -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Text/CSV_XS/.packlist -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.bs -usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.so +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Text +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Text/CSV_XS.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/.packlist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.bs +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Text/CSV_XS/CSV_XS.so #usr/share/man/man3/Text::CSV_XS.3 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ba1abcb658a524b3d8af3b4f8b4baad4802f3476
by git＠ipfire.org 22 Apr '15

22 Apr '15

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2015