summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-21 01:08:29 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-21 01:08:29 +0000
commit608f6f5d805997996b2e5e7ee4a11faf3be1c60c (patch)
tree531f6a1e60b972005d164c1ab70d1f67ad349bfa
parent70d3beb6d20bd159cacaa9ba99e8f06f2761d959 (diff)
downloadpackages-608f6f5d805997996b2e5e7ee4a11faf3be1c60c.tar.gz
packages-608f6f5d805997996b2e5e7ee4a11faf3be1c60c.tar.bz2
packages-608f6f5d805997996b2e5e7ee4a11faf3be1c60c.tar.xz
packages-608f6f5d805997996b2e5e7ee4a11faf3be1c60c.zip
system/o*: modernise, fix metadata
-rw-r--r--system/openrc/APKBUILD3
-rw-r--r--system/openssl/APKBUILD15
2 files changed, 3 insertions, 15 deletions
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index 6c41d9f99..2b1c5f520 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -38,18 +38,15 @@ prepare() {
}
build() {
- cd "$builddir"
export BRANDING="Adélie Linux"
make LIBEXECDIR=/lib/rc MKNET=no
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make LIBEXECDIR=/lib/rc DESTDIR="$pkgdir/" install
# we cannot have anything turned on by default
diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD
index 513b87d0d..3a777064b 100644
--- a/system/openssl/APKBUILD
+++ b/system/openssl/APKBUILD
@@ -6,16 +6,14 @@ pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
url="https://www.openssl.org/"
arch="all"
license="OpenSSL"
-depends=
+depends=""
+depends_dev="zlib-dev"
+checkdepends="perl"
makedepends_build="perl"
makedepends_host="zlib-dev"
makedepends="$makedepends_host $makedepends_build"
-depends_dev="zlib-dev"
-checkdepends="perl"
-
subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.0:libcrypto
libssl1.0:libssl"
-
source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
0003-use-termios.patch
0004-fix-default-ca-path-for-apps.patch
@@ -71,8 +69,6 @@ source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
# - CVE-2019-1563
build() {
- local _target _optflags
-
# openssl will prepend crosscompile always core CC et al
CC=${CC#${CROSS_COMPILE}}
CXX=${CXX#${CROSS_COMPILE}}
@@ -137,11 +133,6 @@ libssl() {
done
}
-dev() {
- provides="libressl-dev=9999"
- default_dev
-}
-
sha512sums="0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71 openssl-1.0.2t.tar.gz
58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch
c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch