summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChocobo12020-02-28 04:52:38 +0800
committerChocobo12020-02-28 05:04:13 +0800
commit104e350b51ce4b024181da62e5e7ebdf44ddd080 (patch)
tree9b3877fc5cd086f1aba10cf21ed3126db2ee3d4e
parent06aee81afb7d1d1134865d82890a659cd3aff71b (diff)
downloadaur-104e350b51ce4b024181da62e5e7ebdf44ddd080.tar.gz
upgpkg: openssl-git 1.1.1.r2775.g30a4cda5e0-1
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD106
-rw-r--r--ca-dir.patch31
3 files changed, 57 insertions, 101 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e17a20c373f..b7f699b4ac2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
pkgbase = openssl-git
- pkgdesc = The Open Source toolkit for Secure Sockets Layer and Transport Layer Security. TLS(1.3), RC5, MD2 enabled. - Git Version
- pkgver = 1.1.1.dev.20170712.084f9a7046
+ pkgdesc = Toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols
+ pkgver = 1.1.1.r2775.g30a4cda5e0
pkgrel = 1
- url = https://www.openssl.org
- arch = i686
+ url = https://www.openssl.org/
arch = x86_64
- license = custom:BSD
+ license = apache
+ makedepends = git
+ depends = glibc
depends = perl
optdepends = ca-certificates
provides = openssl
- provides = openssl-git
conflicts = openssl
- replaces = openssl
+ options = staticlibs
backup = etc/ssl/openssl.cnf
source = git+https://github.com/openssl/openssl.git
- source = ca-dir.patch
- validpgpkeys = 8657ABB260F056B1E5190839D9C4D26D0E604491
- md5sums = SKIP
- md5sums = 02b53865fb70faef763e262b4971aa4b
+ source = ca-dir.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ca-dir.patch?h=packages/openssl
+ sha256sums = SKIP
+ sha256sums = SKIP
pkgname = openssl-git
diff --git a/PKGBUILD b/PKGBUILD
index fdae0f9a395..998fb84a9fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,69 @@
-# $Id$
+# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
+# Former maintainer: Eden Rose <eenov1988@gmail.com>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: Eden Rose <eenov1988@gmail.com>
-_pkgname=openssl
pkgname=openssl-git
-_ver=1.1.0f
-# use a pacman compatible version scheme
-pkgver=1.1.1.dev.20170712.084f9a7046
-#pkgver=$_ver
+pkgver=1.1.1.r2775.g30a4cda5e0
pkgrel=1
-pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security. TLS(1.3), RC5, MD2 enabled. - Git Version'
-arch=('i686' 'x86_64')
-url='https://www.openssl.org'
-license=('custom:BSD')
-depends=('perl')
-conflicts=('openssl')
-replaces=('openssl')
-provides=('openssl' 'openssl-git')
+pkgdesc="Toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols"
+arch=('x86_64')
+url="https://www.openssl.org/"
+license=('apache')
+depends=('glibc' 'perl')
+makedepends=('git')
optdepends=('ca-certificates')
+provides=('openssl')
+conflicts=('openssl')
backup=('etc/ssl/openssl.cnf')
-source=(git+https://github.com/openssl/openssl.git
- "ca-dir.patch")
-md5sums=('SKIP'
- '02b53865fb70faef763e262b4971aa4b')
-validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491')
-
+options=('staticlibs')
+source=("git+https://github.com/openssl/openssl.git"
+ "ca-dir.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ca-dir.patch?h=packages/openssl")
+sha256sums=('SKIP'
+ 'SKIP')
-pkgver() {
-cd "$srcdir/$_pkgname"
-
- DATE="$(date +%Y%m%d)"
- VER1=$(cat README | grep "OpenSSL" | head -1 | sed -e 's/ /\n/g' | tail -1 | sed -e 's/-/./g')
- PV=$(git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null || echo `git rev-parse --short HEAD`) ### get GIT version
- echo "$VER1"."$DATE"."$PV"
-}
+prepare() {
+ cd "openssl"
+ patch -Np0 -i "$srcdir/ca-dir.patch"
+}
-prepare() {
- cd "$srcdir/$_pkgname"
+pkgver() {
+ cd "openssl"
- # set ca dir to /etc/ssl by default
- patch -p0 -i $srcdir/ca-dir.patch
+ git describe --long --tags | sed 's/^OpenSSL_//;s/\([^-]*-g\)/r\1/;s/-/./g;s/_/./g'
}
build() {
- cd "$srcdir/$_pkgname"
+ cd "openssl"
- if [ "${CARCH}" == 'x86_64' ]; then
- openssltarget='linux-x86_64'
- optflags='enable-ec_nistp_64_gcc_128'
- elif [ "${CARCH}" == 'i686' ]; then
- openssltarget='linux-elf'
- optflags=''
- fi
-
-
- # mark stack as non-executable: http://bugs.archlinux.org/task/12434
- ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
- shared zlib-dynamic threads enable-md2 enable-rc5 enable-tls enable-tls1_3 enable-tls1_2 enable-tls1_1 ${optflags} \
- "${openssltarget}" "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
-
- make depend
- make
+ ./Configure \
+ --prefix="/usr" \
+ --libdir="lib" \
+ --openssldir="/etc/ssl" \
+ enable-ec_nistp_64_gcc_128 \
+ linux-x86_64 \
+ "-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+ make depend
+ make
}
check() {
- cd "$srcdir/$_pkgname"
- # the test fails due to missing write permissions in /etc/ssl
- # revert this patch for make test
- patch -p0 -R -i $srcdir/ca-dir.patch
- make test
- patch -p0 -i $srcdir/ca-dir.patch
+ cd "openssl"
+
+ # the test fails due to missing write permissions in /etc/ssl
+ # revert this patch for make test
+ #patch -Np0 -R -i "$srcdir/ca-dir.patch"
+ #make test
+ #patch -Np0 -i "$srcdir/ca-dir.patch"
}
package() {
- cd "$srcdir/$_pkgname"
- make DESTDIR=$pkgdir MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs install_man_docs
- install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ cd "openssl"
+
+ make \
+ DESTDIR="$pkgdir" \
+ install_sw \
+ install_ssldirs \
+ install_man_docs
}
diff --git a/ca-dir.patch b/ca-dir.patch
deleted file mode 100644
index 1daba849b4c..00000000000
--- a/ca-dir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- apps/CA.pl.in 2016-09-26 11:46:04.000000000 +0200
-+++ apps/CA.pl.in 2016-11-01 16:02:16.709616823 +0100
-@@ -33,7 +33,7 @@
- my $PKCS12 = "$openssl pkcs12";
-
- # default openssl.cnf file has setup as per the following
--my $CATOP = "./demoCA";
-+my $CATOP = "/etc/ssl";
- my $CAKEY = "cakey.pem";
- my $CAREQ = "careq.pem";
- my $CACERT = "cacert.pem";
---- apps/openssl.cnf 2016-09-26 11:46:04.000000000 +0200
-+++ apps/openssl.cnf 2016-11-01 16:02:48.378503427 +0100
-@@ -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.
-@@ -323,7 +323,7 @@
- [ tsa_config1 ]
-
- # These are used by the TSA reply generation only.
--dir = ./demoCA # TSA root directory
-+dir = /etc/ssl # TSA root directory
- serial = $dir/tsaserial # The current serial number (mandatory)
- crypto_device = builtin # OpenSSL engine to use for signing
- signer_cert = $dir/tsacert.pem # The TSA signing certificate