Revision: 6720
http://ipcop.svn.sourceforge.net/ipcop/?rev=6720&view=rev
Author: gespinasse
Date: 2012-07-30 08:47:45 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Upgrade Net-SSLeay to 1.48
Replacing the stray-libz patch with a sed is easier to maintain.
Let compilation use our optimization value -Os
Modified Paths:
--------------
ipcop/trunk/lfs/Net-SSLeay
Removed Paths:
-------------
ipcop/trunk/src/patches/Net-SSLeay-1.45_no-stray-libz-link.patch
Modified: ipcop/trunk/lfs/Net-SSLeay
===================================================================
--- ipcop/trunk/lfs/Net-SSLeay 2012-07-28 12:30:14 UTC (rev 6719)
+++ ipcop/trunk/lfs/Net-SSLeay 2012-07-30 08:47:45 UTC (rev 6720)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = Net-SSLeay
-VER = 1.45
+VER = 1.48
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 05415acd0eae23bccdeb35d9d976cc15
+$(DL_FILE)_MD5 = 4e10d9da28f26732e37807820bf72af5
install : $(TARGET)
@@ -81,7 +81,9 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(THISAPP)_no-stray-libz-link.patch
+ # Remove stray libz link as openssl compiled with zlib-dynamic use zlib
as en engine, not a linked lib
+ # Reset OPTIMIZE as it pass -O2 last when our CFLAGS hold -Os first
+ cd $(DIR_APP) && sed -i -e 's/ z //g' -e 's/\-O2 \-g//'
inc/Module/Install/PRIVATE/Net/SSLeay.pm
# PERL_MM_USE_DEFAULT=1 is the way to answer 'no' to Makefile.PL for
external tests question.
cd $(DIR_APP) && PERL_MM_USE_DEFAULT=1 perl Makefile.PL
Deleted: ipcop/trunk/src/patches/Net-SSLeay-1.45_no-stray-libz-link.patch
===================================================================
--- ipcop/trunk/src/patches/Net-SSLeay-1.45_no-stray-libz-link.patch
2012-07-28 12:30:14 UTC (rev 6719)
+++ ipcop/trunk/src/patches/Net-SSLeay-1.45_no-stray-libz-link.patch
2012-07-30 08:47:45 UTC (rev 6720)
@@ -1,13 +0,0 @@
---- a/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2012-02-14 18:24:54.000000000
+0100
-+++ b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2012-02-14 18:25:39.000000000
+0100
-@@ -95,8 +95,8 @@
- $opts->{optimize} = '-O2 -g';
- push @{ $opts->{lib_links} },
- ($rsaref
-- ? qw( ssl crypto RSAglue rsaref z )
-- : qw( ssl crypto z )
-+ ? qw( ssl crypto RSAglue rsaref )
-+ : qw( ssl crypto )
- );
-
- if (($Config{cc} =~ /aCC/i) && $^O eq 'hpux') {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
