diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-19 14:54:10 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-19 14:58:20 +0000 |
commit | 1c81c3f0f0547e8ef60ecff804ff263d806445c9 (patch) | |
tree | 19b9efc16accf7c480e1cb6d9aa66b3b9b276725 | |
parent | 5e52436c44adabe0e5986dc80ab42c6bc17101f4 (diff) | |
download | alpine_aports-1c81c3f0f0547e8ef60ecff804ff263d806445c9.tar.bz2 alpine_aports-1c81c3f0f0547e8ef60ecff804ff263d806445c9.tar.xz alpine_aports-1c81c3f0f0547e8ef60ecff804ff263d806445c9.zip |
main/alpine-conf: upgrade to 2.8.0_pre3
-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 | 4 |
2 files changed, 2 insertions, 28 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 deleted file mode 100644 index 3d21e503de..0000000000 --- a/main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 325534f013c9b1a46d7587048f913a1984c46802 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mika Havela <mika.havela@gmail.com> | ||
3 | Date: Wed, 9 Feb 2011 10:21:15 +0100 | ||
4 | Subject: [PATCH] Bugfix: If hostname -f does not work, then ssl creation will break and acf won't work | ||
5 | |||
6 | 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. | ||
7 | --- | ||
8 | setup-acf.in | 2 +- | ||
9 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/setup-acf.in b/setup-acf.in | ||
12 | index 4f2afec..c6f621e 100644 | ||
13 | --- a/setup-acf.in | ||
14 | +++ b/setup-acf.in | ||
15 | @@ -75,7 +75,7 @@ prompt = no | ||
16 | |||
17 | [ req_dn ] | ||
18 | OU=HTTPS server | ||
19 | -CN=$(hostname -f) | ||
20 | +CN=$(hostname -f || hostname) | ||
21 | emailAddress=${EMAIL:-postmaster@example.com} | ||
22 | |||
23 | [ cert_type ] | ||
24 | -- | ||
25 | 1.7.3.5 | ||
26 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 9c6cfc0f22..6b985d4e72 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.8.0_pre2 | 3 | pkgver=2.8.0_pre3 |
4 | pkgrel=0 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
@@ -35,4 +35,4 @@ package() { | |||
35 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 35 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
36 | done | 36 | done |
37 | } | 37 | } |
38 | md5sums="579878e0cdaa7e13b98ca5dd31127aa6 alpine-conf-2.8.0_pre2.tar.bz2" | 38 | md5sums="4471178c1f6c3e8a66e09e86c649a502 alpine-conf-2.8.0_pre3.tar.bz2" |