From 7c5f8e36fb020de96613839b7cf279d0ec398232 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 3 Sep 2009 13:33:13 +0000
Subject: main/alpine-conf: upgrade to 2.0_rc2

fixes #145
fixes #150
fixes #151
---
 ...01-setup-acf-use-FQDN-for-selfsigned-cert.patch | 28 ----------------------
 main/alpine-conf/APKBUILD                          | 10 +++-----
 2 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch

(limited to 'main/alpine-conf')

diff --git a/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch b/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch
deleted file mode 100644
index 75ada6d4d..000000000
--- a/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4599ce25c2b2c491c3b4fa14ca7a082b292b1df1 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Mon, 31 Aug 2009 13:28:03 +0000
-Subject: [PATCH] setup-acf: use FQDN for selfsigned cert
-
-and make it possible to override the email address
----
- setup-acf.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup-acf.in b/setup-acf.in
-index 92d769c..0b45be5 100644
---- a/setup-acf.in
-+++ b/setup-acf.in
-@@ -73,8 +73,8 @@ prompt = no
- 
- [ req_dn ]
- OU=HTTPS server
--CN=$(hostname)
--emailAddress=postmaster@example.com
-+CN=$(hostname -f)
-+emailAddress=${EMAIL:-postmaster@example.com}
- 
- [ cert_type ]
- nsCertType = server
--- 
-1.6.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 17faad189..f7c2aca9a 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,19 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_beta6
-pkgrel=1
+pkgver=2.0_rc2
+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-setup-acf-use-FQDN-for-selfsigned-cert.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../0001-setup-acf-use-FQDN-for-selfsigned-cert.patch \
-		|| return 1
 
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
@@ -21,5 +18,4 @@ build() {
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="1f211a93c61072f1f95c7effa4330f06  alpine-conf-2.0_beta6.tar.bz2
-a2671b332863502722d91d8da6a628a7  0001-setup-acf-use-FQDN-for-selfsigned-cert.patch"
+md5sums="0fadddb30736fa49852a359a770e95d1  alpine-conf-2.0_rc2.tar.bz2"
-- 
cgit v1.2.3