summaryrefslogtreecommitdiffstats
path: root/main/alpine-conf
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-05-02 13:45:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-05-02 13:45:57 +0000
commit430ca68a8aa570df864a98e2ee5945ba4d798600 (patch)
treed4837390283d5d0dff4517643f7e8a296c7ed1ca /main/alpine-conf
parentd393a47ef1f0cd4992b211a7e605a126659036bd (diff)
downloadaports-430ca68a8aa570df864a98e2ee5945ba4d798600.tar.bz2
aports-430ca68a8aa570df864a98e2ee5945ba4d798600.tar.xz
main/alpine-conf: fix setup-acf
install packages before generating acf password
Diffstat (limited to 'main/alpine-conf')
-rw-r--r--main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch37
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 41 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch b/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch
new file mode 100644
index 000000000..522c01dc6
--- /dev/null
+++ b/main/alpine-conf/0001-setup-acf-install-packages-before-creating-acf-passw.patch
@@ -0,0 +1,37 @@
+From 26f7fb4ef3ccbcb7fedbcffd65751bc882073510 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 2 May 2012 13:40:02 +0000
+Subject: [PATCH] setup-acf: install packages before creating acf password
+
+the acfpasswd utility needs to be installed first
+---
+ setup-acf.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup-acf.in b/setup-acf.in
+index 91113c5..1ca8bf2 100644
+--- a/setup-acf.in
++++ b/setup-acf.in
+@@ -30,6 +30,9 @@ while [ $# -gt 0 ]; do
+ shift
+ done
+
++# install packages
++apk add mini_httpd $pkgs || exit 1
++
+ if [ "$create_passwd" != "no" ]; then
+ mkdir -p /etc/acf
+ if [ -f /etc/acf/passwd ]; then
+@@ -40,9 +43,6 @@ if [ "$create_passwd" != "no" ]; then
+ acfpasswd -s root
+ fi
+
+-# install packages
+-apk add mini_httpd $pkgs || exit 1
+-
+ # setup mini_httpd and start it
+ if [ -d /var/www/localhost/htdocs ]; then
+ mv /var/www/localhost/htdocs /var/www/localhost/htdocs.old
+--
+1.7.10
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 1235b3375..e8f5f6e5c 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,13 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.11.0
-pkgrel=2
+pkgrel=3
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-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch
0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
+ 0001-setup-acf-install-packages-before-creating-acf-passw.patch
"
arch="all"
@@ -40,4 +41,5 @@ package() {
}
md5sums="b26bf91d4c3df7baf5ede8ab4f54225a alpine-conf-2.11.0.tar.bz2
8ffcadf4c724296fb2d86d91ba965187 0001-lbu-do-not-include-var-lib-apk-world-in-apkovl.patch
-ea6008b3c6d07c816f4eb3a185b7785d 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch"
+ea6008b3c6d07c816f4eb3a185b7785d 0001-setup-acf-use-new-location-for-mini_httpd.conf.patch
+a00dbf1e5dd14980fad6eb7d5edb587d 0001-setup-acf-install-packages-before-creating-acf-passw.patch"