main/alpine-conf: upgrade to 2.11.1

(cherry picked from commit 571fed649d04952cb84417f571d5ae8911495604)

4 files changed, 3 insertions, 107 deletions

diff --git a/main/alpine-conf/0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch b/main/alpine-conf/0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch
deleted file mode 100644
index 318fd1c7f..000000000
--- a/main/alpine-conf/0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 75da3188df294bb666e0697e03b705d944ddef2b Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 30 Apr 2012 07:38:43 +0000
-Subject: [PATCH] lbu: do not include /var/lib/apk/world in apkovl
-
-We depend on newer version of apk-tools anyways.
----
- lbu.in |    3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index faba771..67ad578 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -279,9 +279,6 @@ If <dirname> nor <filename> is not specified, a package named
- 
- _gen_filelist() {
- 	apk audit --backup --quiet --recursive
--	if [ -f var/lib/apk/world ]; then
--		echo var/lib/apk/world
--	fi
- }
- 
- _gen_filelist_0() {
--- 
-1.7.10
-
diff --git a/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch b/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch
deleted file mode 100644
index 522c01dc6..000000000
--- a/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 26f7fb4ef3ccbcb7fedbcffd65751bc882073510 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 2 May 2012 13:40:02 +0000
-Subject: [PATCH] setup-acf: install packages before creating acf password
-
-the acfpasswd utility needs to be installed first
----
- setup-acf.in |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/setup-acf.in b/setup-acf.in
-index 91113c5..1ca8bf2 100644
---- a/setup-acf.in
-+++ b/setup-acf.in
-@@ -30,6 +30,9 @@ while [ $# -gt 0 ]; do
- 	shift
- done
- 
-+# install packages 
-+apk add mini_httpd $pkgs || exit 1
-+
- if [ "$create_passwd" != "no" ]; then
- 	mkdir -p /etc/acf
- 	if [ -f /etc/acf/passwd ]; then
-@@ -40,9 +43,6 @@ if [ "$create_passwd" != "no" ]; then
- 	acfpasswd -s root
- fi
- 
--# install packages 
--apk add mini_httpd $pkgs || exit 1
--
- # setup mini_httpd and start it
- if [ -d /var/www/localhost/htdocs ]; then
- 	mv /var/www/localhost/htdocs /var/www/localhost/htdocs.old
--- 
-1.7.10
-
diff --git a/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch b/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
deleted file mode 100644
index 4481c3270..000000000
--- a/main/alpine-conf/0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4b22b926721293e23fa645c742f5f274a601de9f Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 2 May 2012 08:49:56 +0000
-Subject: [PATCH] setup-acf: use new location for mini_httpd.conf
-
----
- setup-acf.in |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup-acf.in b/setup-acf.in
-index 9e1489f..91113c5 100644
---- a/setup-acf.in
-+++ b/setup-acf.in
-@@ -87,7 +87,7 @@ EOF
- 	mv $CRTFILE $PEMFILE
- fi
- 
--cat >/etc/mini_httpd.conf <<EOF
-+cat >/etc/mini_httpd/mini_httpd.conf <<EOF
- nochroot
- dir=/var/www/localhost/htdocs
- user=nobody
-@@ -97,7 +97,7 @@ port=443
- ssl
- EOF
- if [ -n "$address" ]; then
--	echo "host=$address" >> /etc/mini_httpd.conf
-+	echo "host=$address" >> /etc/mini_httpd/mini_httpd.conf
- fi
- 
- rc-update -q add mini_httpd default
--- 
-1.7.10
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e8f5f6e5c..bab882beb 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.0
-pkgrel=3
+pkgver=2.11.1
+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-include-var-lib-apk-world-in-apkovl.patch
-	0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
-	0001-setup-acf-install-packages-before-creating-acf-passw.patch
 	"
 
 arch="all"
@@ -39,7 +36,4 @@ package() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="b26bf91d4c3df7baf5ede8ab4f54225a  alpine-conf-2.11.0.tar.bz2
-8ffcadf4c724296fb2d86d91ba965187  0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch
-ea6008b3c6d07c816f4eb3a185b7785d  0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
-a00dbf1e5dd14980fad6eb7d5edb587d  0001-setup-acf-install-packages-before-creating-acf-passw.patch"
+md5sums="399dbc7c1eedd4b9e7539b141be82b75  alpine-conf-2.11.1.tar.bz2"