[Ipcop-svn] SF.net SVN: ipcop:[5275] ipcop/trunk

[<ges...@us...>]

Revision: 5275
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5275&view=rev
Author:   gespinasse
Date:     2010-12-24 16:42:07 +0000 (Fri, 24 Dec 2010)

Log Message:
-----------
Fix libcrypto exec stack, again gentoo borrowed
Let openssl a chance to use our LDFLAGS

Modified Paths:
--------------
    ipcop/trunk/lfs/openssl

Added Paths:
-----------
    ipcop/trunk/src/patches/openssl-0.9.8h_ldflags.patch

Modified: ipcop/trunk/lfs/openssl
===================================================================
--- ipcop/trunk/lfs/openssl	2010-12-24 16:01:29 UTC (rev 5274)
+++ ipcop/trunk/lfs/openssl	2010-12-24 16:42:07 UTC (rev 5275)
@@ -43,6 +43,10 @@
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
+# does not work if passed to ./config
+# fix exec stack with special CFLAGS
+CFLAGS    += -Wa,--noexecstack
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -81,7 +85,11 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	# fix LDFLAGS usage
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(PKG_NAME)-0.9.8h_ldflags.patch
 
+	# fix available on gentoo in case we upgrade binutils >2.20.1
+
 	cd $(DIR_APP) && sed -i -e 's/-O3/$(CFLAGS)/' -e 's/-mcpu=pentium//' Configure
 
 	# suppress DATE compilation timestamp, it will be replaced by "date not available"

Added: ipcop/trunk/src/patches/openssl-0.9.8h_ldflags.patch
===================================================================
--- ipcop/trunk/src/patches/openssl-0.9.8h_ldflags.patch	                        (rev 0)
+++ ipcop/trunk/src/patches/openssl-0.9.8h_ldflags.patch	2010-12-24 16:42:07 UTC (rev 5275)
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/181438
+
+make sure we respect LDFLAGS
+
+--- openssl-0.9.8h/Makefile.org
++++ openssl-0.9.8h/Makefile.org
+@@ -180,6 +181,7 @@
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
+ 		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
+ 		MAKEDEPPROG='${MAKEDEPPROG}'			\
++		LDFLAGS='${LDFLAGS}'		\
+ 		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
+ 		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
+ 		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
+--- openssl-0.9.8h/Makefile.shared
++++ openssl-0.9.8h/Makefile.shared
+@@ -153,7 +153,7 @@
+ 	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+ 	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ 
+-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
++DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+ 
+ #This is rather special.  It's a special target with which one can link
+ #applications without bothering with any features that have anything to


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.