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@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