Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ca-certificates and openssl update

Browse Source
This commit is contained in:
alihanozturk
2017-01-08 19:26:37 +03:00
parent 534fc7ea02
commit e095249526
5 changed files with 84 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/ca-certificates/pspec.xml
+8 -1
View File
@@ -11,7 +11,7 @@
<IsA>app:web</IsA>
<Summary>Common CA certificates</Summary>
<Description>Common CA certificates</Description>
<Archive sha1sum="4525a194736c6691dbd59fa87281b722837b4768" type="tarxz">http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz</Archive>
<Archive sha1sum="b190ca8849697e842e69401b28d4ee27130d8c4d" type="tarxz">http://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz</Archive>
</Source>
<Package>
@@ -31,6 +31,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-01-08</Date>
<Version>20160130</Version>
<Comment>Version Bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-27</Date>
<Version>20160104</Version>
system/base/openssl/files/ca-dir.patch
+33
View File
@@ -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.
system/base/openssl/files/no-rpath.patch
+11
View File
@@ -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
system/base/openssl/files/openssl-include.patch
+20 -19
View File
@@ -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'; \
system/base/openssl/pspec.xml
+12 -2
View File
@@ -13,9 +13,10 @@
<IsA>library</IsA>
<Summary>Toolkit for SSL v2/v3 and TLS v1</Summary>
<Description>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.</Description>
<Archive sha1sum="36af23887402a5ea4ebef91df8e61654906f58f2" type="targz">ftp://ftp.openssl.org/source/openssl-1.0.2g.tar.gz</Archive>
<Archive sha1sum="bdfbdb416942f666865fa48fe13c2d0e588df54f" type="targz">https://www.openssl.org/source/openssl-1.0.2j.tar.gz</Archive>
<AdditionalFiles>
<AdditionalFile target="openssl-1.0.0-beta4-ca-dir.patch">openssl-1.0.0-beta4-ca-dir.patch</AdditionalFile>
<!-- <AdditionalFile target="ca-dir.patch">ca-dir.patch</AdditionalFile> -->
</AdditionalFiles>
<BuildDependencies>
<Dependency>zlib-devel</Dependency>
@@ -26,10 +27,12 @@
<Patches>
<Patch level="1">openssl-1.0.0a-ldflags-norpath.patch</Patch>
<Patch level="1">openssl-1.0.0-beta4-ca-dir.patch</Patch>
<!-- <Patch level="1">no-rpath.patch</Patch> -->
<!-- <Patch level="1">ca-dir.patch</Patch> -->
<Patch level="1">openssl-1.0.0-beta5-enginesdir.patch</Patch>
<Patch>openssl-1.0.2-ipv6.patch</Patch>
<!--<Patch>openssl-1.0.2-s_client-verify.patch</Patch>-->
<Patch>openssl-include.patch</Patch>
<!-- <Patch>openssl-include.patch</Patch> -->
<!--Patch>openssl_fix_for_x32.patch</Patch-->
<Patch>openssl_fix_for_x32_2.patch</Patch>
<Patch>openssl-ca-certificates.patch</Patch>
@@ -92,6 +95,13 @@
</Package>
<History>
<Update release="3">
<Date>2017-01-08</Date>
<Version>1.0.2j</Version>
<Comment>Version bump.</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-27</Date>
<Version>1.0.2g</Version>