main/alpine-conf: upgrade to 2.12.0

fixes #1463

4 files changed, 3 insertions, 155 deletions

diff --git a/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch b/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch
deleted file mode 100644
index 7eceeaa8c..000000000
--- a/main/alpine-conf/0001-lbu-check-permissions-when-generating-apkovl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9a18a800011faf018ff49220ae368c673c690bdc Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 17 Jul 2012 10:52:54 +0000
-Subject: [PATCH] lbu: check permissions when generating apkovl
-
-We want include files and dirs that have changed permissions.
-
-ref #1241
----
- lbu.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lbu.in b/lbu.in
-index 3fa157e..a0e68ed 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -278,7 +278,7 @@ If <dirname> nor <filename> is not specified, a package named
- }
- 
- _gen_filelist() {
--	apk audit --backup --quiet --recursive
-+	apk audit --backup --quiet --recursive --check-permissions
- }
- 
- cmd_package() {
--- 
-1.7.11.2
-
diff --git a/main/alpine-conf/0001-lbu-do-not-use-xargs.patch b/main/alpine-conf/0001-lbu-do-not-use-xargs.patch
deleted file mode 100644
index 42dac4986..000000000
--- a/main/alpine-conf/0001-lbu-do-not-use-xargs.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 15245c4a0eb62b0e1bcbac5063391e0d57a53799 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 4 Jul 2012 08:09:21 +0200
-Subject: [PATCH] lbu: do not use xargs
-
-xargs will execute the command twice if the buffer becomes long enough.
-This will break tar.
-
-We also use -z instead of piping via gzip while here.
-
-ref #1240
----
- lbu.in | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 67ad578..3fa157e 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -281,10 +281,6 @@ _gen_filelist() {
- 	apk audit --backup --quiet --recursive
- }
- 
--_gen_filelist_0() {
--	_gen_filelist | tr '\n' '\0'
--}
--
- cmd_package() {
- 	local pkg="$1"
- 	local rc=0
-@@ -311,7 +307,7 @@ cmd_package() {
- 
- 	tmppkg="$tmpdir/$(basename $pkg)"
- 
--	local tar_create="tar -c --no-recursion"
-+	local tar_create="tar -c --no-recursion -T -"
- 
- 	cd "${ROOT:-/}"
- 	# remove old package.list
-@@ -325,19 +321,17 @@ cmd_package() {
- 		echo "Archiving the following files:" >&2
- 		# we dont want to mess the tar output with the
- 		# password prompt. Lets get the tar output first.
--		_gen_filelist_0 | xargs -0 $tar_create -v > /dev/null
-+		_gen_filelist | $tar_create -v > /dev/null
- 		rc=$?
- 	fi
- 	if [ $rc -eq 0 ]; then
- 		if [ -z "$ENCRYPTION" ]; then
--			_gen_filelist_0 | xargs -0 $tar_create \
--				| gzip -c  >"$tmppkg"
-+			_gen_filelist | $tar_create -z >"$tmppkg"
- 			rc=$?
- 		else
- 			set -- enc "-$ENCRYPTION" -salt
- 			[ -n "$PASSWORD" ] && set -- "$@" -pass pass:"$PASSWORD"
--			_gen_filelist_0 | xargs -0 $tar_create \
--				| gzip -c \
-+			_gen_filelist | $tar_create -z \
- 				| $OPENSSL "$@" > "$tmppkg"
- 			rc=$?
- 		fi
--- 
-1.7.11.1
-
diff --git a/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch b/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch
deleted file mode 100644
index 55a33f2c2..000000000
--- a/main/alpine-conf/0001-setup-xen-dom0-update-to-upcoming-4.2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b007e51d7d776d7f31e7e300b7af5f56cfac18c4 Mon Sep 17 00:00:00 2001
-From: Roger Pau Monne <roger.pau@citrix.com>
-Date: Thu, 13 Sep 2012 15:18:59 +0100
-Subject: [PATCH] setup-xen-dom0: update to upcoming 4.2
-
-New version of Xen (4.2) doesn't require udev, so update the
-script to reflect those changes. Also, only include a module
-in /etc/modules if we can load it successfully.
----
- setup-xen-dom0.in | 20 +++++++-------------
- 1 file changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/setup-xen-dom0.in b/setup-xen-dom0.in
-index a9c993a..0e7b3b3 100644
---- a/setup-xen-dom0.in
-+++ b/setup-xen-dom0.in
-@@ -3,26 +3,20 @@
- # simple script to setup basic xen dom0
- 
- # kernel modules
--for mod in xen_netback xen_blkback xenfs xen-platform-pci xen_wdt tun; do
--	modprobe $mod
--	grep -q -w $mod /etc/modules || echo $mod >> /etc/modules
-+for mod in xen_netback xen_blkback xenfs xen_pciback xen_wdt tun; do
-+	if modprobe $mod; then
-+		grep -q -w $mod /etc/modules || echo $mod >> /etc/modules
-+	fi
- done
- 
- # install packages
--apk add -q xen udev
-+apk add -q xen
- 
- # setup and start services
--rc-update -q del mdev sysinit
--rc-update -q add udev sysinit
--for svc in udev-postmount xenstored xenconsoled; do
-+for svc in xenstored xenconsoled xenqemu; do
- 	rc-update -q add $svc default
- done
- 
--if ! rc-service -q udev status; then
--	rc-service udev start
--	rc-service udev-postmount start
--fi
--
- rc-service xenstored start
- rc-service xenconsoled start
--
-+rc-service xenqemu start
--- 
-1.7.12
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 3dbe0061e..f0a4df7ca 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,14 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.11.2
-pkgrel=3
+pkgver=2.12.0
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-lbu-do-not-use-xargs.patch
-	0001-lbu-check-permissions-when-generating-apkovl.patch
-	0001-setup-xen-dom0-update-to-upcoming-4.2.patch
 	"
 
 arch="all"
@@ -39,7 +36,4 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="47e37f6211817acc12aa637798da0437  alpine-conf-2.11.2.tar.bz2
-a49569f9eb9bfa630efaca4988bde07c  0001-lbu-do-not-use-xargs.patch
-97db0e60d1fd534a613e3d6cbca23a14  0001-lbu-check-permissions-when-generating-apkovl.patch
-f2f36e9b99c6102c0acc9978d049be2d  0001-setup-xen-dom0-update-to-upcoming-4.2.patch"
+md5sums="4038a3be9a785ead649d913e208e2bd8  alpine-conf-2.12.0.tar.bz2"