From 6f3bb12a2c0424e284993d7bb19b744327160a39 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 8 Mar 2010 16:35:11 -0500 Subject: [PATCH] openssl: Updated (0.9.8l -> 0.9.8m) - SECURITY --- security/openssl/lib64.patch | 158 ---------------------------------- security/openssl/openssl.desc | 6 +- 2 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 security/openssl/lib64.patch diff --git a/security/openssl/lib64.patch b/security/openssl/lib64.patch deleted file mode 100644 index 68789d708..000000000 --- a/security/openssl/lib64.patch +++ /dev/null @@ -1,158 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../openssl/lib64.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - - -lib64 support. Uses the same variable, LIBDIR, as the Debian one but also -installs the engins in the correct dir. LIBDIR must be defined additionaly. -Done in T2 with the gcc wrapper. - - - Rene Rebe - ---- openssl-0.9.8a/Makefile.org 2005-10-11 12:21:48.000000000 +0200 -+++ openssl-0.9.8a/Makefile.org 2006-01-11 17:49:27.000000000 +0100 -@@ -170,7 +170,7 @@ - CC='${CC}' CFLAG='${CFLAG}' \ - AS='${CC}' ASFLAG='${CFLAG} -c' \ - AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \ -- SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib' \ -+ SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/${LIBDIR}' \ - INSTALL_PREFIX='${INSTALL_PREFIX}' \ - INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}' \ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \ -@@ -282,7 +282,7 @@ - libcrypto.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ -- echo 'libdir=$${exec_prefix}/lib'; \ -+ echo 'libdir=$${exec_prefix}/${LIBDIR}'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL-libcrypto'; \ -@@ -295,7 +295,7 @@ - libssl.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ -- echo 'libdir=$${exec_prefix}/lib'; \ -+ echo 'libdir=$${exec_prefix}/${LIBDIR}'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL'; \ -@@ -308,7 +308,7 @@ - openssl.pc: Makefile - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ -- echo 'libdir=$${exec_prefix}/lib'; \ -+ echo 'libdir=$${exec_prefix}/${LIBDIR}'; \ - echo 'includedir=$${prefix}/include'; \ - echo ''; \ - echo 'Name: OpenSSL'; \ -@@ -458,9 +458,9 @@ - - install_sw: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ -- $(INSTALL_PREFIX)$(INSTALLTOP)/lib \ -- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \ -- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \ -+ $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR} \ -+ $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/engines \ -+ $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig \ - $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ -@@ -475,10 +475,10 @@ - do \ - if [ -f "$$i" ]; then \ - ( echo installing $$i; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \ -+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i ); \ - fi; \ - done; - @set -e; if [ -n "$(SHARED_LIBS)" ]; then \ -@@ -488,22 +488,22 @@ - if [ -f "$$i" -o -f "$$i.a" ]; then \ - ( echo installing $$i; \ - if [ "$(PLATFORM)" != "Cygwin" ]; then \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ -+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i; \ - else \ - c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ - cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ -+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/$$i; \ - fi ); \ - fi; \ - done; \ - ( here="`pwd`"; \ -- cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ -+ cd $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}; \ - $(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \ - if [ "$(INSTALLTOP)" != "/usr" ]; then \ - echo 'OpenSSL shared libraries have been installed in:'; \ -@@ -512,12 +512,12 @@ - sed -e '1,/^$$/d' doc/openssl-shared.txt; \ - fi; \ - fi -- cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig -- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc -- cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig -- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc -- cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig -- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc -+ cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig -+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig/libcrypto.pc -+ cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig -+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig/libssl.pc -+ cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig -+ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/${LIBDIR}/pkgconfig/openssl.pc - - install_docs: - @$(PERL) $(TOP)/util/mkdir-p.pl \ ---- openssl-0.9.8a/engines/Makefile.orig 2006-02-04 02:49:34.000000000 +0100 -+++ openssl-0.9.8a/engines/Makefile 2006-05-07 12:31:40.000000000 +0200 -@@ -97,13 +97,13 @@ - *DSO_DL*) sfx="sl";; \ - *) sfx="bad";; \ - esac; \ -- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ -+ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ - else \ - sfx="so"; \ -- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ - fi; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \ - done; \ - fi - diff --git a/security/openssl/openssl.desc b/security/openssl/openssl.desc index f8b9afded..cce8a1e05 100644 --- a/security/openssl/openssl.desc +++ b/security/openssl/openssl.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../openssl/openssl.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -35,7 +35,7 @@ [L] OpenSource [S] Stable -[V] 0.9.8l +[V] 0.9.8m [P] X -?---5---9 104.600 -[D] 4065377437 openssl-0.9.8l.tar.gz http://openssl.org/source/ +[D] 3103632108 openssl-0.9.8m.tar.gz http://openssl.org/source/