main/alpine-conf: upgrade to 3.9.0

8 files changed, 4 insertions, 243 deletions

diff --git a/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch b/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
deleted file mode 100644
index 7369c46d49..0000000000
--- a/main/alpine-conf/0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ad9996810186cbed04ec0c185bd3c998622a0a4f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
-Date: Thu, 16 Jan 2020 11:09:28 +0100
-Subject: [PATCH] lbu: fix wrong cipher match in check_openssl for 'lbu commit
- -e'
-
-fixes #10451
----
- lbu.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lbu.in b/lbu.in
-index f439cf2..fb4fbe5 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -126,7 +126,7 @@ check_openssl() {
-        [ -z "$ENCRYPTION" ] && return 0
-        OPENSSL=$(which openssl 2>/dev/null) || die "openssl was not found"
- 
--       $OPENSSL enc -ciphers | grep "^$ENCRYPTION$" > /dev/null \
-+       $OPENSSL list -1 -cipher-commands | grep "^$ENCRYPTION$" > /dev/null \
-                || die "Cipher $ENCRYPTION is not supported"
- }
- 
--- 
-2.25.0
-
diff --git a/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch b/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch
deleted file mode 100644
index cbc91b2b8d..0000000000
--- a/main/alpine-conf/0001-libalpine-make-vecho-and-qecho-return-success.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5d90f33f62375f23367d3c5a7badd2d7f1031744 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 24 Jan 2020 11:49:04 +0000
-Subject: [PATCH] libalpine: make vecho and qecho return success
-
-vecho should return success even if $VERBOSE is empty. Similar, qecho
-should return success even if $QUIET is empty.
-
-fixes !4
----
- libalpine.sh.in | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libalpine.sh.in b/libalpine.sh.in
-index d7b79fa..0f96b9f 100644
---- a/libalpine.sh.in
-+++ b/libalpine.sh.in
-@@ -26,12 +26,16 @@ echon () {
- 
- # echo if in verbose mode
- vecho() {
--       [ -n "$VERBOSE" ] && echo "$@"
-+       if [ -n "$VERBOSE" ]; then
-+               echo "$@"
-+       fi
- }
- 
- # echo unless quiet mode
- qecho() {
--       [ -z "$QUIET" ] && echo "$@"
-+       if [ -z "$QUIET" ]; then
-+               echo "$@"
-+       fi
- }
- 
- # echo to stderr
--- 
-2.25.0
-
diff --git a/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch b/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch
deleted file mode 100644
index 5426f62017..0000000000
--- a/main/alpine-conf/0001-libalpine-use-correct-exit-code-in-trap.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 6bcb2c2b0860779dc44d8dd27259f9edc6c9e6e8 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Nov 2019 16:29:52 +0100
-Subject: [PATCH] libalpine: use correct exit code in trap
-
-save exit state before cleaning up tempdir so we get the correct exit
-code.
-
-This fixes the problem where lbu exit with success on errors where disk
-is full or similar.
----
- libalpine.sh.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libalpine.sh.in b/libalpine.sh.in
-index f3857e2..d7b79fa 100644
---- a/libalpine.sh.in
-+++ b/libalpine.sh.in
-@@ -50,7 +50,7 @@ init_tmpdir() {
-        local __tmpd="/tmp/$PROGRAM-${$}-$(date +%s)-$RANDOM"
-        umask 077 || die "umask"
-        mkdir -p "$__tmpd" || exit 1
--       trap "rm -fr \"$__tmpd\"; exit" 0
-+       trap "rc=\$?; rm -fr \"$__tmpd\"; exit \$rc" 0
-        umask $omask
-        eval "$1=\"$__tmpd\""
- }
--- 
-2.24.0
-
diff --git a/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch b/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
deleted file mode 100644
index e37241230f..0000000000
--- a/main/alpine-conf/0001-setup-apkrepos-use-cdn-as-default-answer.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5358f24b8ba5c359db504421d09fc16cf9e7f8cf Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 11 Dec 2019 18:01:26 +0000
-Subject: [PATCH] setup-apkrepos: use cdn as default answer
-
-use '1', which should be dl-cdn, as the default answer
----
- setup-apkrepos.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-apkrepos.in b/setup-apkrepos.in
-index 81e768e..1b05978 100644
---- a/setup-apkrepos.in
-+++ b/setup-apkrepos.in
-@@ -175,7 +175,7 @@ if [ -r "$APKREPOS_PATH" ]; then
- fi
- 
- get_alpine_release
--default_answer=f
-+default_answer=1
- changed=false
- 
- if [ $# -gt 0 ]; then
--- 
-2.24.1
-
diff --git a/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch b/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch
deleted file mode 100644
index 49d42167a5..0000000000
--- a/main/alpine-conf/0001-setup-disk-let-user-set-ROOT_SIZE.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93ce697c0075aeb51db9b78c0d47e10213aa1885 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 6 Dec 2019 15:53:45 +0000
-Subject: [PATCH] setup-disk: let user set ROOT_SIZE
-
-allow user set rootfs size via ROOT_SIZE. For lvm it will be passed
-directly to lvmcreate. For the sfdisk partitions it will be a number in
-MiB.
----
- setup-disk.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 5eb8638..b309919 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -989,7 +989,7 @@ native_disk_install_lvm() {
- 
-        setup_lvm_volume_group $vgname $@ || return 1
-        setup_lvm_swap $vgname
--       lvcreate --quiet -n ${root_dev##*/} -l 100%FREE $vgname
-+       lvcreate --quiet -n ${root_dev##*/} -l ${ROOT_SIZE:-100%FREE} $vgname
-        rc-update add lvm boot
-        setup_root $root_dev $BOOT_DEV
- }
-@@ -1002,7 +1002,7 @@ native_disk_install() {
-        local prep_size=8
-        local boot_size=${BOOT_SIZE:-100}
-        local swap_size=${SWAP_SIZE}
--       local root_size=
-+       local root_size=${ROOT_SIZE}
-        local root_dev= boot_dev= swap_dev=
-        init_progs $(select_bootloader) || return 1
-        confirm_erase $@ || return 1
--- 
-2.24.0
-
diff --git a/main/alpine-conf/0001-update-kernel-fallback-to-old-dtbdir-if-new-one-does.patch b/main/alpine-conf/0001-update-kernel-fallback-to-old-dtbdir-if-new-one-does.patch
deleted file mode 100644
index 5a11874504..0000000000
--- a/main/alpine-conf/0001-update-kernel-fallback-to-old-dtbdir-if-new-one-does.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0c0ded1d885431bf4509222368278ec6644bf646 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 16 Apr 2020 15:18:03 +0300
-Subject: [PATCH] update-kernel: fallback to old dtbdir if new one does not
- exist
-
-This allows running update-kernel on new alpine and to create
-images from stable branch by overriding repository files.
-
-Fixes: 3fd2ce43 "update-kernel: fix dtbs dir"
----
- update-kernel.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index 3d13d25..d9b774f 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -265,6 +265,7 @@ KVER_FLAVOR=
- [ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
- KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
- DTBDIR=$ROOT/boot/dtbs-$FLAVOR
-+[ -d "$DTBDIR" ] || DTBDIR=$ROOT/usr/lib/linux-$KVER
- depmod -b $ROOT "$KVER"
- 
- 
--- 
-2.26.1
-
diff --git a/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch b/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch
deleted file mode 100644
index a117698c5f..0000000000
--- a/main/alpine-conf/0001-update-kernel-fix-dtbs-dir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3fd2ce439dda613a56e3d130c192040a88817787 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 18 Dec 2019 15:23:10 +0000
-Subject: [PATCH] update-kernel: fix dtbs dir
-
----
- update-kernel.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index 0079182..3d13d25 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -264,7 +264,7 @@ fi
- KVER_FLAVOR=
- [ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
- KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
--DTBDIR=$ROOT/usr/lib/linux-$KVER
-+DTBDIR=$ROOT/boot/dtbs-$FLAVOR
- depmod -b $ROOT "$KVER"
- 
- 
-@@ -341,8 +341,8 @@ if [ -d "$DTBDIR" ]; then
-        _opwd=$PWD
-        case "$MEDIA,$FLAVOR" in
-        yes,rpi*) _dtb="$DESTDIR/" ;;
--       yes,*)    _dtb="$DESTDIR/boot/dtbs" ;;
--       *,*)      _dtb="$DESTDIR/dtbs" ;;
-+       yes,*)    _dtb="$DESTDIR/boot/dtbs-$FLAVOR" ;;
-+       *,*)      _dtb="$DESTDIR/dtbs/dtbs-$FLAVOR" ;;
-        esac
-        mkdir -p "$_dtb"
-        _dtb=$(realpath "$_dtb")
--- 
-2.24.1
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 8dfb8f0cad..39424ad5ae 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,21 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.8.3
-pkgrel=7
+pkgver=3.9.0
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url="https://git.alpinelinux.org/alpine-conf/about"
 arch="all"
 license="MIT"
 depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
-source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
-        0001-libalpine-use-correct-exit-code-in-trap.patch
-        0001-setup-disk-let-user-set-ROOT_SIZE.patch
-        0001-setup-apkrepos-use-cdn-as-default-answer.patch
-        0001-update-kernel-fix-dtbs-dir.patch
-        0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
-        0001-libalpine-make-vecho-and-qecho-return-success.patch
-        0001-update-kernel-fallback-to-old-dtbdir-if-new-one-does.patch
-        "
+source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.bz2"
 
 builddir="$srcdir"/$pkgname-$pkgver
 build() {
@@ -31,11 +23,4 @@ package() {
         done
 }
 
-sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a4e677cdae91fa4f0098dadd388eba679a99d98e140354ab7681bb85f9dfa  alpine-conf-3.8.3.tar.xz
-b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb  0001-libalpine-use-correct-exit-code-in-trap.patch
-bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d  0001-setup-disk-let-user-set-ROOT_SIZE.patch
-a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa  0001-setup-apkrepos-use-cdn-as-default-answer.patch
-e6d7ef82f2c875866dba6c8d18c6b8d9909c0a56081252ff1a1b0bfba2a493a3550377e20fa2975e5b6aa4e52f2607730b7ed158dd419751fad2368d9fa0ece5  0001-update-kernel-fix-dtbs-dir.patch
-d2f961761f237240bb046d9a56c07927d2011b5b62c9d84542d45ac144a09aa08e186efe759d66929a2796e416442db8a339e4bdf9e88643c2bf15f4125fe280  0001-lbu-fix-wrong-cipher-match-in-check_openssl-for-lbu-.patch
-8f99efff4f6e3a77b10e4a806ea6cf1ebc81577773314af7d2d8e36b646856a2e5786afbd92841a84af07830e42c7a336c221b1ea97a004963d189767cd348f0  0001-libalpine-make-vecho-and-qecho-return-success.patch
-38547de0594534cccee9dd12ebeaa6a951facb7e320a64af39ad6c33694d1b66925a848d62bef91afe655c26a6bb045d047619b4fd5df345b5407dbeb4540a6d  0001-update-kernel-fallback-to-old-dtbdir-if-new-one-does.patch"
+sha512sums="c7f7ba8341d7c84aa85f521624de511acbea42337377693099156750462a380e0116c9bde2d3a1595c8942c024f1421e7106566c4c0415c734513ddf5ec08cb2  alpine-conf-3.9.0.tar.bz2"