diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-07 13:24:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-03-07 13:24:16 +0000 |
| commit | 11ecc62278b65c6db8d6dec66a61c43f2118f47a (patch) | |
| tree | 4dc058e1351e60c02a012f16556fc9bf511c4b40 | |
| parent | 3f32504885104e22136d768852e72173e38158b9 (diff) | |
| download | aports-11ecc62278b65c6db8d6dec66a61c43f2118f47a.tar.bz2 aports-11ecc62278b65c6db8d6dec66a61c43f2118f47a.tar.xz | |
main/alpine-conf: fix for setup-acf
fixes #530
(cherry picked from commit d50cd6eee4aeb3f54c40a806175726304f6cf765)
Conflicts:
main/alpine-conf/APKBUILD
| -rw-r--r-- | main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch | 26 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 8 |
2 files changed, 31 insertions, 3 deletions
diff --git a/main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch b/main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch new file mode 100644 index 0000000000..3d21e503de --- /dev/null +++ b/main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch @@ -0,0 +1,26 @@ +From 325534f013c9b1a46d7587048f913a1984c46802 Mon Sep 17 00:00:00 2001 +From: Mika Havela <mika.havela@gmail.com> +Date: Wed, 9 Feb 2011 10:21:15 +0100 +Subject: [PATCH] Bugfix: If hostname -f does not work, then ssl creation will break and acf won't work + +FQDN hostname might not be set in /etc/hosts and this could cause 'hostname -f' to fail. Even this does not happen too often, it still is a possibility. This patch prevents the problem. +--- + setup-acf.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/setup-acf.in b/setup-acf.in +index 4f2afec..c6f621e 100644 +--- a/setup-acf.in ++++ b/setup-acf.in +@@ -75,7 +75,7 @@ prompt = no + + [ req_dn ] + OU=HTTPS server +-CN=$(hostname -f) ++CN=$(hostname -f || hostname) + emailAddress=${EMAIL:-postmaster@example.com} + + [ cert_type ] +-- +1.7.3.5 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index ab17d1e55b..08c56505cd 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,12 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=2.5.4 -pkgrel=1 +pkgrel=2 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 +source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 editor.patch + 0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch " arch="noarch" license="GPL-2" @@ -37,4 +38,5 @@ package() { done } md5sums="91a2b8a150917cc06f6c9ec839b70bb0 alpine-conf-2.5.4.tar.bz2 -c6f425ae21ff983f94b64eef8c236b22 editor.patch" +c6f425ae21ff983f94b64eef8c236b22 editor.patch +e26e1250fdd31edebd1303ea51dd635c 0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch" |