aboutsummaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-02-22 14:50:14 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-02-22 14:50:14 +0000
commitd50cd6eee4aeb3f54c40a806175726304f6cf765 (patch)
tree306350c6dc8d79ed059163de0f8916f2efadfb74 /main/alpine-conf
parent2f615791320847ce15ccdb11b6c3b4f213161062 (diff)
downloadaports-d50cd6eee4aeb3f54c40a806175726304f6cf765.tar.bz2
aports-d50cd6eee4aeb3f54c40a806175726304f6cf765.tar.xz
main/alpine-conf: fix for setup-acf
ref #530
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch26
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 30 insertions, 2 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 e80ed9797f..860bb145d9 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,11 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.5.5
-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.git/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch
"
arch="noarch"
license="GPL-2"
@@ -35,4 +36,5 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="63b062e5d3b2d21af88b4c87166cea98 alpine-conf-2.5.5.tar.bz2"
+md5sums="63b062e5d3b2d21af88b4c87166cea98 alpine-conf-2.5.5.tar.bz2
+e26e1250fdd31edebd1303ea51dd635c 0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch"