aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/easy-rsa/APKBUILD4
-rw-r--r--community/nodejs-current/APKBUILD2
-rw-r--r--community/tomcat-native/APKBUILD2
-rw-r--r--main/ca-certificates/APKBUILD4
-rw-r--r--main/libressl/APKBUILD6
-rw-r--r--main/nodejs/APKBUILD2
-rw-r--r--main/openssl1.0/0002-busybox-basename.patch (renamed from main/openssl/0002-busybox-basename.patch)0
-rw-r--r--main/openssl1.0/0003-use-termios.patch (renamed from main/openssl/0003-use-termios.patch)0
-rw-r--r--main/openssl1.0/0004-fix-default-ca-path-for-apps.patch (renamed from main/openssl/0004-fix-default-ca-path-for-apps.patch)0
-rw-r--r--main/openssl1.0/0005-fix-parallel-build.patch (renamed from main/openssl/0005-fix-parallel-build.patch)0
-rw-r--r--main/openssl1.0/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch (renamed from main/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch)0
-rw-r--r--main/openssl1.0/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch (renamed from main/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch)0
-rw-r--r--main/openssl1.0/0009-no-rpath.patch (renamed from main/openssl/0009-no-rpath.patch)0
-rw-r--r--main/openssl1.0/0010-ssl-env-zlib.patch (renamed from main/openssl/0010-ssl-env-zlib.patch)0
-rw-r--r--main/openssl1.0/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch (renamed from main/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch)0
-rw-r--r--main/openssl1.0/1002-backport-changes-from-upstream-padlock-module.patch (renamed from main/openssl/1002-backport-changes-from-upstream-padlock-module.patch)0
-rw-r--r--main/openssl1.0/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch (renamed from main/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch)0
-rw-r--r--main/openssl1.0/1004-crypto-engine-autoload-padlock-dynamic-engine.patch (renamed from main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch)0
-rw-r--r--main/openssl1.0/APKBUILD (renamed from main/openssl/APKBUILD)18
-rw-r--r--main/openssl1.0/CVE-2018-0732.patch (renamed from main/openssl/CVE-2018-0732.patch)0
20 files changed, 24 insertions, 14 deletions
diff --git a/community/easy-rsa/APKBUILD b/community/easy-rsa/APKBUILD
index ab97f72551f..6def34e7161 100644
--- a/community/easy-rsa/APKBUILD
+++ b/community/easy-rsa/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=easy-rsa
pkgver=3.0.4
-pkgrel=0
+pkgrel=1
pkgdesc="Simple shell based CA utility"
url="https://github.com/OpenVPN/easy-rsa"
arch="noarch"
license="GPL-2.0"
-depends="openssl"
+depends="openssl1.0"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/OpenVPN/easy-rsa/archive/v$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgver"
diff --git a/community/nodejs-current/APKBUILD b/community/nodejs-current/APKBUILD
index 9b926ba6d8d..7d39556c037 100644
--- a/community/nodejs-current/APKBUILD
+++ b/community/nodejs-current/APKBUILD
@@ -21,7 +21,7 @@ license="MIT"
depends="ca-certificates"
depends_dev="libuv"
# gold is needed for mksnapshot
-makedepends="$depends_dev python2 openssl-dev zlib-dev libuv-dev linux-headers
+makedepends="$depends_dev python2 openssl1.0-dev zlib-dev libuv-dev linux-headers
paxmark binutils-gold http-parser-dev ca-certificates c-ares-dev"
subpackages="$pkgname-dev $pkgname-doc"
provides="nodejs"
diff --git a/community/tomcat-native/APKBUILD b/community/tomcat-native/APKBUILD
index 779656ce6e0..88abe69fd93 100644
--- a/community/tomcat-native/APKBUILD
+++ b/community/tomcat-native/APKBUILD
@@ -9,7 +9,7 @@ url="http://tomcat.apache.org/native-doc/"
arch="all"
license="Apache-2.0"
depends="openjdk8-jre-base"
-makedepends="apr-dev chrpath openjdk8 openssl-dev"
+makedepends="apr-dev chrpath openjdk8 openssl1.0-dev"
subpackages="$pkgname-dev"
source="http://www-eu.apache.org/dist/tomcat/tomcat-connectors/native/$pkgver/source/$pkgname-$pkgver-src.tar.gz"
builddir="$srcdir/$pkgname-$pkgver-src/native"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index d51025abb9c..775f3e32caf 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
pkgver=20171114
-pkgrel=3
+pkgrel=4
pkgdesc="Common CA certificates PEM files"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
@@ -12,7 +12,7 @@ depends=""
makedepends="python3 libressl-dev"
subpackages="$pkgname-doc"
# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them
-replaces="libcrypto1.0 openssl"
+replaces="libcrypto1.0 openssl openssl1.0"
options="!fhs !check"
triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d"
install="$pkgname.post-deinstall"
diff --git a/main/libressl/APKBUILD b/main/libressl/APKBUILD
index 3ca944f6a51..4327df05c48 100644
--- a/main/libressl/APKBUILD
+++ b/main/libressl/APKBUILD
@@ -12,7 +12,7 @@
pkgname=libressl
pkgver=2.7.4
_namever=${pkgname}${pkgver%.*}
-pkgrel=0
+pkgrel=1
pkgdesc="Version of the TLS/crypto stack forked from OpenSSL"
url="http://www.libressl.org/"
arch="all"
@@ -21,7 +21,7 @@ depends=""
makedepends_build="automake autoconf libtool"
makedepends_host="linux-headers"
makedepends="$makedepends_host $makedepends_build"
-replaces="openssl"
+replaces="openssl openssl1.0"
subpackages="$pkgname-dbg $_namever-libcrypto:_libs $_namever-libssl:_libs
$_namever-libtls:_libs $pkgname-dev $pkgname-doc"
source="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/$pkgname-$pkgver.tar.gz
@@ -67,7 +67,7 @@ package() {
dev() {
default_dev
- replaces="openssl-dev"
+ replaces="openssl1.0-dev"
}
_libs() {
diff --git a/main/nodejs/APKBUILD b/main/nodejs/APKBUILD
index 0ac59bad227..b342778bce2 100644
--- a/main/nodejs/APKBUILD
+++ b/main/nodejs/APKBUILD
@@ -34,7 +34,7 @@ license="MIT"
depends="ca-certificates"
depends_dev="libuv"
# gold is needed for mksnapshot
-makedepends="$depends_dev python2 openssl-dev zlib-dev libuv-dev linux-headers
+makedepends="$depends_dev python2 openssl1.0-dev zlib-dev libuv-dev linux-headers
paxmark binutils-gold http-parser-dev ca-certificates c-ares-dev"
subpackages="$pkgname-dev $pkgname-doc npm::noarch"
provides="nodejs-lts=$pkgver" # for backward compatibility
diff --git a/main/openssl/0002-busybox-basename.patch b/main/openssl1.0/0002-busybox-basename.patch
index 9bbc284f312..9bbc284f312 100644
--- a/main/openssl/0002-busybox-basename.patch
+++ b/main/openssl1.0/0002-busybox-basename.patch
diff --git a/main/openssl/0003-use-termios.patch b/main/openssl1.0/0003-use-termios.patch
index 3312d185675..3312d185675 100644
--- a/main/openssl/0003-use-termios.patch
+++ b/main/openssl1.0/0003-use-termios.patch
diff --git a/main/openssl/0004-fix-default-ca-path-for-apps.patch b/main/openssl1.0/0004-fix-default-ca-path-for-apps.patch
index c2c53184a6b..c2c53184a6b 100644
--- a/main/openssl/0004-fix-default-ca-path-for-apps.patch
+++ b/main/openssl1.0/0004-fix-default-ca-path-for-apps.patch
diff --git a/main/openssl/0005-fix-parallel-build.patch b/main/openssl1.0/0005-fix-parallel-build.patch
index 70073fd1952..70073fd1952 100644
--- a/main/openssl/0005-fix-parallel-build.patch
+++ b/main/openssl1.0/0005-fix-parallel-build.patch
diff --git a/main/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch b/main/openssl1.0/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
index daa6df02f8f..daa6df02f8f 100644
--- a/main/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+++ b/main/openssl1.0/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
diff --git a/main/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch b/main/openssl1.0/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
index ff3d25eff00..ff3d25eff00 100644
--- a/main/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+++ b/main/openssl1.0/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
diff --git a/main/openssl/0009-no-rpath.patch b/main/openssl1.0/0009-no-rpath.patch
index 56df75b7915..56df75b7915 100644
--- a/main/openssl/0009-no-rpath.patch
+++ b/main/openssl1.0/0009-no-rpath.patch
diff --git a/main/openssl/0010-ssl-env-zlib.patch b/main/openssl1.0/0010-ssl-env-zlib.patch
index 9eae15d727a..9eae15d727a 100644
--- a/main/openssl/0010-ssl-env-zlib.patch
+++ b/main/openssl1.0/0010-ssl-env-zlib.patch
diff --git a/main/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch b/main/openssl1.0/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
index ef46faa8485..ef46faa8485 100644
--- a/main/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+++ b/main/openssl1.0/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
diff --git a/main/openssl/1002-backport-changes-from-upstream-padlock-module.patch b/main/openssl1.0/1002-backport-changes-from-upstream-padlock-module.patch
index f63bbcd1ce1..f63bbcd1ce1 100644
--- a/main/openssl/1002-backport-changes-from-upstream-padlock-module.patch
+++ b/main/openssl1.0/1002-backport-changes-from-upstream-padlock-module.patch
diff --git a/main/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch b/main/openssl1.0/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
index 5a2cdd633ae..5a2cdd633ae 100644
--- a/main/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+++ b/main/openssl1.0/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
diff --git a/main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl1.0/1004-crypto-engine-autoload-padlock-dynamic-engine.patch
index 66f37451e5b..66f37451e5b 100644
--- a/main/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch
+++ b/main/openssl1.0/1004-crypto-engine-autoload-padlock-dynamic-engine.patch
diff --git a/main/openssl/APKBUILD b/main/openssl1.0/APKBUILD
index 91c9d2312ea..d0f7765c89a 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl1.0/APKBUILD
@@ -1,7 +1,8 @@
# Maintainer: Timo Teras <timo.teras@iki.fi>
-pkgname=openssl
+pkgname=openssl1.0
+_pkgname=openssl
pkgver=1.0.2o
-pkgrel=1
+pkgrel=0
pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
url="https://www.openssl.org"
arch="all"
@@ -10,8 +11,10 @@ depends_dev="zlib-dev"
makedepends_build="perl"
makedepends_host="zlib-dev"
makedepends="$makedepends_host $makedepends_build"
+provides="openssl" # for backward compatibility
+replaces="openssl" # for backward compatibility
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl"
-source="http://www.openssl.org/source/$pkgname-$pkgver.tar.gz
+source="http://www.openssl.org/source/$_pkgname-$pkgver.tar.gz
0002-busybox-basename.patch
0003-use-termios.patch
0004-fix-default-ca-path-for-apps.patch
@@ -25,7 +28,7 @@ source="http://www.openssl.org/source/$pkgname-$pkgver.tar.gz
1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
CVE-2018-0732.patch
"
-builddir="$srcdir/$pkgname-$pkgver"
+builddir="$srcdir/$_pkgname-$pkgver"
# secfixes:
# 1.0.2h-r0:
@@ -110,6 +113,13 @@ package() {
rm "$pkgdir"/usr/bin/c_rehash
}
+dev() {
+ provides="openssl-dev" # for backward compatibility
+ replaces="openssl-dev" # for backward compatibility
+
+ default_dev
+}
+
libcrypto() {
pkgdesc="Crypto library from openssl"
diff --git a/main/openssl/CVE-2018-0732.patch b/main/openssl1.0/CVE-2018-0732.patch
index 148e7c3bc1a..148e7c3bc1a 100644
--- a/main/openssl/CVE-2018-0732.patch
+++ b/main/openssl1.0/CVE-2018-0732.patch
generated by cgit v1.2.3 (git 2.41.0) at 2024-04-19 22:05:04 +0000