diff --git a/system/base/ca-certificates/pspec.xml b/system/base/ca-certificates/pspec.xml index f1980a86..3a9e4c79 100644 --- a/system/base/ca-certificates/pspec.xml +++ b/system/base/ca-certificates/pspec.xml @@ -11,7 +11,7 @@ app:web Common CA certificates Common CA certificates - http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz + http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz @@ -31,6 +31,13 @@ + + 2017-01-08 + 20160130 + Version Bump + PisiLinux Community + admin@pisilinux.org + 2016-04-27 20160104 diff --git a/system/base/openssl/files/ca-dir.patch b/system/base/openssl/files/ca-dir.patch new file mode 100644 index 00000000..0efded8a --- /dev/null +++ b/system/base/openssl/files/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/system/base/openssl/files/no-rpath.patch b/system/base/openssl/files/no-rpath.patch new file mode 100644 index 00000000..ebd95e23 --- /dev/null +++ b/system/base/openssl/files/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 diff --git a/system/base/openssl/files/openssl-include.patch b/system/base/openssl/files/openssl-include.patch index adea6f8e..f07c029f 100644 --- a/system/base/openssl/files/openssl-include.patch +++ b/system/base/openssl/files/openssl-include.patch @@ -1,30 +1,31 @@ diff -ruN openssl-1.0.2.orig/Makefile.org openssl-1.0.2/Makefile.org --- openssl-1.0.2.orig/Makefile.org 2015-01-22 15:58:06.000000000 +0100 +++ openssl-1.0.2/Makefile.org 2015-01-27 16:04:30.564519915 +0100 -@@ -360,7 +360,7 @@ +@@ -370,8 +370,8 @@ @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ + echo 'exec_prefix=$${prefix}'; \ + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ +- echo 'includedir=$${prefix}/include'; \ ++ echo 'includedir=$${prefix}/include/openssl'; \ + echo 'enginesdir=$${libdir}/engines'; \ + echo ''; \ + echo 'Name: OpenSSL-libcrypto'; \ + echo 'Description: OpenSSL cryptography library'; \ +@@ -385,7 +385,7 @@ + @ ( echo 'prefix=$(INSTALLTOP)'; \ + echo 'exec_prefix=$${prefix}'; \ + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ + echo 'includedir=$${prefix}/include/openssl'; \ echo ''; \ - echo 'Name: OpenSSL-libcrypto'; \ - echo 'Description: OpenSSL cryptography library'; \ -@@ -374,7 +374,7 @@ + echo 'Name: OpenSSL-libssl'; \ + echo 'Description: Secure Sockets Layer and cryptography libraries'; \ +@@ -399,7 +399,7 @@ @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ + echo 'exec_prefix=$${prefix}'; \ + echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ - echo 'includedir=$${prefix}/include'; \ + echo 'includedir=$${prefix}/include/openssl'; \ echo ''; \ - echo 'Name: OpenSSL-libssl'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries'; \ -@@ -388,7 +388,7 @@ - @ ( echo 'prefix=$(INSTALLTOP)'; \ - echo 'exec_prefix=$${prefix}'; \ - echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \ -- echo 'includedir=$${prefix}/include'; \ -+ echo 'includedir=$${prefix}/include/openssl'; \ - echo ''; \ - echo 'Name: OpenSSL'; \ - echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ + echo 'Name: OpenSSL'; \ + echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ diff --git a/system/base/openssl/pspec.xml b/system/base/openssl/pspec.xml index db860345..928b6534 100644 --- a/system/base/openssl/pspec.xml +++ b/system/base/openssl/pspec.xml @@ -13,9 +13,10 @@ library Toolkit for SSL v2/v3 and TLS v1 OpenSSL is a cryptography toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) network protocols and related cryptography standards required by them. - ftp://ftp.openssl.org/source/openssl-1.0.2g.tar.gz + https://www.openssl.org/source/openssl-1.0.2j.tar.gz openssl-1.0.0-beta4-ca-dir.patch + zlib-devel @@ -26,10 +27,12 @@ openssl-1.0.0a-ldflags-norpath.patch openssl-1.0.0-beta4-ca-dir.patch + + openssl-1.0.0-beta5-enginesdir.patch openssl-1.0.2-ipv6.patch - openssl-include.patch + openssl_fix_for_x32_2.patch openssl-ca-certificates.patch @@ -92,6 +95,13 @@ + + 2017-01-08 + 1.0.2j + Version bump. + PisiLinux Community + admin@pisilinux.org + 2016-04-27 1.0.2g