summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsibel <lesibel@free.fr>2011-01-21 17:27:42 +0100
committersibel <lesibel@free.fr>2011-01-21 17:27:42 +0100
commitdce023229bba342f53f4f21e9127e7313c4e9c7f (patch)
treee8e27f13e8cdac4bc4ee583a176e6241134cc997 /base
parente32b3e7c6237dc5818c904f54f47ee8c1f5d20ab (diff)
downloadnutyx-extra-dce023229bba342f53f4f21e9127e7313c4e9c7f.tar.gz
nutyx-extra-dce023229bba342f53f4f21e9127e7313c4e9c7f.tar.bz2
nutyx-extra-dce023229bba342f53f4f21e9127e7313c4e9c7f.tar.xz
nutyx-extra-dce023229bba342f53f4f21e9127e7313c4e9c7f.zip
openssl, correction port
Diffstat (limited to 'base')
-rw-r--r--base/openssl/.footprint48
-rw-r--r--base/openssl/.md5sum2
-rwxr-xr-xbase/openssl/Pkgfile9
-rw-r--r--base/openssl/openssl-1.0.0c-ca-dir.patch33
-rw-r--r--base/openssl/openssl-1.0.0c-no-rpath.patch11
5 files changed, 77 insertions, 26 deletions
diff --git a/base/openssl/.footprint b/base/openssl/.footprint
index 716558c80..48f60750f 100644
--- a/base/openssl/.footprint
+++ b/base/openssl/.footprint
@@ -98,30 +98,30 @@ drwxr-xr-x root/root usr/include/openssl/
-rw-r--r-- root/root usr/include/openssl/x509.h
-rw-r--r-- root/root usr/include/openssl/x509_vfy.h
-rw-r--r-- root/root usr/include/openssl/x509v3.h
-drwxr-xr-x root/root usr/lib64/
-drwxr-xr-x root/root usr/lib64/engines/
--r-xr-xr-x root/root usr/lib64/engines/lib4758cca.so
--r-xr-xr-x root/root usr/lib64/engines/libaep.so
--r-xr-xr-x root/root usr/lib64/engines/libatalla.so
--r-xr-xr-x root/root usr/lib64/engines/libcapi.so
--r-xr-xr-x root/root usr/lib64/engines/libchil.so
--r-xr-xr-x root/root usr/lib64/engines/libcswift.so
--r-xr-xr-x root/root usr/lib64/engines/libgmp.so
--r-xr-xr-x root/root usr/lib64/engines/libgost.so
--r-xr-xr-x root/root usr/lib64/engines/libnuron.so
--r-xr-xr-x root/root usr/lib64/engines/libpadlock.so
--r-xr-xr-x root/root usr/lib64/engines/libsureware.so
--r-xr-xr-x root/root usr/lib64/engines/libubsec.so
--rw-r--r-- root/root usr/lib64/libcrypto.a
-lrwxrwxrwx root/root usr/lib64/libcrypto.so -> libcrypto.so.1.0.0
--r-xr-xr-x root/root usr/lib64/libcrypto.so.1.0.0
--rw-r--r-- root/root usr/lib64/libssl.a
-lrwxrwxrwx root/root usr/lib64/libssl.so -> libssl.so.1.0.0
--r-xr-xr-x root/root usr/lib64/libssl.so.1.0.0
-drwxr-xr-x root/root usr/lib64/pkgconfig/
--rw-r--r-- root/root usr/lib64/pkgconfig/libcrypto.pc
--rw-r--r-- root/root usr/lib64/pkgconfig/libssl.pc
--rw-r--r-- root/root usr/lib64/pkgconfig/openssl.pc
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/engines/
+-r-xr-xr-x root/root usr/lib/engines/lib4758cca.so
+-r-xr-xr-x root/root usr/lib/engines/libaep.so
+-r-xr-xr-x root/root usr/lib/engines/libatalla.so
+-r-xr-xr-x root/root usr/lib/engines/libcapi.so
+-r-xr-xr-x root/root usr/lib/engines/libchil.so
+-r-xr-xr-x root/root usr/lib/engines/libcswift.so
+-r-xr-xr-x root/root usr/lib/engines/libgmp.so
+-r-xr-xr-x root/root usr/lib/engines/libgost.so
+-r-xr-xr-x root/root usr/lib/engines/libnuron.so
+-r-xr-xr-x root/root usr/lib/engines/libpadlock.so
+-r-xr-xr-x root/root usr/lib/engines/libsureware.so
+-r-xr-xr-x root/root usr/lib/engines/libubsec.so
+-rw-r--r-- root/root usr/lib/libcrypto.a
+lrwxrwxrwx root/root usr/lib/libcrypto.so -> libcrypto.so.1.0.0
+-r-xr-xr-x root/root usr/lib/libcrypto.so.1.0.0
+-rw-r--r-- root/root usr/lib/libssl.a
+lrwxrwxrwx root/root usr/lib/libssl.so -> libssl.so.1.0.0
+-r-xr-xr-x root/root usr/lib/libssl.so.1.0.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/libcrypto.pc
+-rw-r--r-- root/root usr/lib/pkgconfig/libssl.pc
+-rw-r--r-- root/root usr/lib/pkgconfig/openssl.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
diff --git a/base/openssl/.md5sum b/base/openssl/.md5sum
index 093560fbc..9b302971d 100644
--- a/base/openssl/.md5sum
+++ b/base/openssl/.md5sum
@@ -1 +1,3 @@
+3bf51be3a1bbd262be46dc619f92aa90 openssl-1.0.0c-ca-dir.patch
+dc78d3d06baffc16217519242ce92478 openssl-1.0.0c-no-rpath.patch
ff8fb85610aef328315a9decbb2712e4 openssl-1.0.0c.tar.gz
diff --git a/base/openssl/Pkgfile b/base/openssl/Pkgfile
index 52ddbe4cb..72a8894fc 100755
--- a/base/openssl/Pkgfile
+++ b/base/openssl/Pkgfile
@@ -6,15 +6,20 @@
name=openssl
version=1.0.0c
release=1
-source=(http://www.openssl.org/source/$name-$version.tar.gz)
+source=(http://www.openssl.org/source/$name-$version.tar.gz
+ openssl-1.0.0c-ca-dir.patch
+ openssl-1.0.0c-no-rpath.patch)
build() {
unset MAKEFLAGS
cd $name-$version
+ patch -p0 -i ../openssl-1.0.0c-no-rpath.patch
+ patch -p0 -i ../openssl-1.0.0c-ca-dir.patch
./config --prefix=/usr \
--openssldir=/etc/ssl \
- shared enable-md2
+ --libdir=lib \
+ shared zlib enable-md2 -Wa,--noexecstack
make
make INSTALL_PREFIX=$PKG MANDIR=/usr/share/man MANSUFFIX=ssl install
cp -v -r certs $PKG/etc/ssl
diff --git a/base/openssl/openssl-1.0.0c-ca-dir.patch b/base/openssl/openssl-1.0.0c-ca-dir.patch
new file mode 100644
index 000000000..41d1386d3
--- /dev/null
+++ b/base/openssl/openssl-1.0.0c-ca-dir.patch
@@ -0,0 +1,33 @@
+--- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
++++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
+@@ -53,7 +53,7 @@
+ $X509="$openssl x509";
+ $PKCS12="$openssl pkcs12";
+
+-$CATOP="./demoCA";
++$CATOP="/etc/ssl";
+ $CAKEY="cakey.pem";
+ $CAREQ="careq.pem";
+ $CACERT="cacert.pem";
+--- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
++++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
+@@ -68,7 +68,7 @@
+ X509="$OPENSSL x509"
+ PKCS12="openssl pkcs12"
+
+-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
++if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
+ CAKEY=./cakey.pem
+ CAREQ=./careq.pem
+ CACERT=./cacert.pem
+--- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
++++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
+@@ -39,7 +39,7 @@
+ ####################################################################
+ [ CA_default ]
+
+-dir = ./demoCA # Where everything is kept
++dir = /etc/ssl # Where everything is kept
+ certs = $dir/certs # Where the issued certs are kept
+ crl_dir = $dir/crl # Where the issued crl are kept
+ database = $dir/index.txt # database index file.
diff --git a/base/openssl/openssl-1.0.0c-no-rpath.patch b/base/openssl/openssl-1.0.0c-no-rpath.patch
new file mode 100644
index 000000000..ebd95e23d
--- /dev/null
+++ b/base/openssl/openssl-1.0.0c-no-rpath.patch
@@ -0,0 +1,11 @@
+--- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
++++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100
+@@ -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="$(CFLAGS)"
+
+ #This is rather special. It's a special target with which one can link
+ #applications without bothering with any features that have anything to