aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/alpine-conf/0001-Bugfix-If-hostname-f-does-not-work-then-ssl-creation.patch26
-rw-r--r--main/alpine-conf/APKBUILD4
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 @@
-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 9c6cfc0f22..6b985d4e72 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
-pkgver=2.8.0_pre2
+pkgver=2.8.0_pre3
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
@@ -35,4 +35,4 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="579878e0cdaa7e13b98ca5dd31127aa6 alpine-conf-2.8.0_pre2.tar.bz2"
+md5sums="4471178c1f6c3e8a66e09e86c649a502 alpine-conf-2.8.0_pre3.tar.bz2"