diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-31 13:35:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-31 13:35:39 +0000 |
| commit | 1055b3bb592ddada4a65c6fad6b76a7e7d7381e7 (patch) | |
| tree | dc6ed9262869dcbebf742377e5062bb3f2eeecf6 /main/alpine-conf | |
| parent | 91ff21db0a1a924cf94b56c79eb49c9f5b068af2 (diff) | |
| download | aports-1055b3bb592ddada4a65c6fad6b76a7e7d7381e7.tar.bz2 aports-1055b3bb592ddada4a65c6fad6b76a7e7d7381e7.tar.xz | |
main/alpine-conf: use FQDN for setup-acf's self-signed cert
fixes #144
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-setup-acf-fix-password-generation.patch | 25 | ||||
| -rw-r--r-- | main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch | 28 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 8 |
3 files changed, 34 insertions, 27 deletions
diff --git a/main/alpine-conf/0001-setup-acf-fix-password-generation.patch b/main/alpine-conf/0001-setup-acf-fix-password-generation.patch deleted file mode 100644 index 6132c08ad..000000000 --- a/main/alpine-conf/0001-setup-acf-fix-password-generation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b7ac1f3f8b4ddb7cc4a585bc8b7ebdaa2dd8ae16 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 20 Aug 2009 07:31:21 +0000 -Subject: [PATCH] setup-acf: fix password generation - ---- - setup-acf.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/setup-acf.in b/setup-acf.in -index 8c386ee..92d769c 100644 ---- a/setup-acf.in -+++ b/setup-acf.in -@@ -37,7 +37,7 @@ if [ "$create_passwd" != "no" ]; then - fi - # this will show password on process list but we assume user is alone - # on the box at this stage -- _md5passwd=$(echo -n "$_password" | md5sum) -+ _md5passwd=$(echo -n "$_password" | md5sum | cut -d' ' -f1) - echo "root:$_md5passwd:Admin account:ADMIN" >/etc/acf/passwd - fi - --- -1.6.4 - 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 new file mode 100644 index 000000000..75ada6d4d --- /dev/null +++ b/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch @@ -0,0 +1,28 @@ +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 dcb316efd..17faad189 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,16 +1,19 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.0_beta6 -pkgrel=0 +pkgrel=1 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" @@ -18,4 +21,5 @@ build() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="1f211a93c61072f1f95c7effa4330f06 alpine-conf-2.0_beta6.tar.bz2" +md5sums="1f211a93c61072f1f95c7effa4330f06 alpine-conf-2.0_beta6.tar.bz2 +a2671b332863502722d91d8da6a628a7 0001-setup-acf-use-FQDN-for-selfsigned-cert.patch" |