main/alpine-conf: upgrade to 2.5

fixes #407

2 files changed, 4 insertions, 27 deletions

diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index bab4a16c64..5261892962 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.4
-pkgrel=1
+pkgver=2.5
+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
-        setup-acf.patch"
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
 license="GPL-2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -34,5 +33,4 @@ package() {
                 ln -s lbu "$pkgdir"/sbin/lbu_$i
         done
 }
-md5sums="4c8db8948a21b0435f577d1e0f8d7c8e  alpine-conf-2.4.tar.bz2
-882e555ab6f319846930f933d7fe0dd0  setup-acf.patch"
+md5sums="24cd19783bfa63d0cefb8c10577bb6fb  alpine-conf-2.5.tar.bz2"
diff --git a/main/alpine-conf/setup-acf.patch b/main/alpine-conf/setup-acf.patch
deleted file mode 100644
index d317adb383..0000000000
--- a/main/alpine-conf/setup-acf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit cd1dc75d09e5ac8f5e55100e5b9099c85a91db7f
-Author: Natanael Copa <ncopa@alpinelinux.org>
-Date:   Tue Jul 20 09:02:05 2010 +0000
-
-    setup-acf: install openssl
-    
-    so we can generate the certificate
-
-diff --git a/setup-acf.in b/setup-acf.in
-index 5144a21..4f2afec 100644
---- a/setup-acf.in
-+++ b/setup-acf.in
-@@ -11,7 +11,7 @@ usage() {
-        exit 0;
- }
- 
--pkgs="acf-core acf-alpine-baselayout acf-apk-tools"
-+pkgs="acf-core acf-alpine-baselayout acf-apk-tools openssl"
- 
- while getopts "ae:hl:n" opt ; do
-        case $opt in