aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-08-20 07:33:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-08-20 07:33:02 +0000
commita47c94f8a1eb11ba687435e5669667e27e9c2081 (patch)
tree32cc05033c97850b720921b9a47abf7a0bb79f01 /main
parentb3efdc9605bc300a463347f99c52fb5a93c03ddf (diff)
downloadaports-a47c94f8a1eb11ba687435e5669667e27e9c2081.tar.bz2
aports-a47c94f8a1eb11ba687435e5669667e27e9c2081.tar.xz
main/alpine-conf: fix password generation for setup-acf
Diffstat (limited to 'main')
-rw-r--r--main/alpine-conf/0001-setup-acf-fix-password-generation.patch25
-rw-r--r--main/alpine-conf/APKBUILD8
2 files changed, 31 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-acf-fix-password-generation.patch b/main/alpine-conf/0001-setup-acf-fix-password-generation.patch
new file mode 100644
index 0000000000..6132c08adb
--- /dev/null
+++ b/main/alpine-conf/0001-setup-acf-fix-password-generation.patch
@@ -0,0 +1,25 @@
+From b7ac1f3f8b4ddb7cc4a585bc8b7ebdaa2dd8ae16 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 20 Aug 2009 07:31:21 +0000
+Subject: [PATCH] setup-acf: fix password generation
+
+---
+ setup-acf.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup-acf.in b/setup-acf.in
+index 8c386ee..92d769c 100644
+--- a/setup-acf.in
++++ b/setup-acf.in
+@@ -37,7 +37,7 @@ if [ "$create_passwd" != "no" ]; then
+ fi
+ # this will show password on process list but we assume user is alone
+ # on the box at this stage
+- _md5passwd=$(echo -n "$_password" | md5sum)
++ _md5passwd=$(echo -n "$_password" | md5sum | cut -d' ' -f1)
+ echo "root:$_md5passwd:Admin account:ADMIN" >/etc/acf/passwd
+ fi
+
+--
+1.6.4
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 5f3abd948e..510d0849ec 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,20 +1,24 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=2.0_beta5
-pkgrel=0
+pkgrel=1
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-setup-acf-fix-password-generation.patch
"
license="GPL-2"
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 -i ../0001-setup-acf-fix-password-generation.patch || return 1
+
make || return 1
make install PREFIX= DESTDIR="$pkgdir"
for i in commit exclude include status update; do
ln -s lbu "$pkgdir"/sbin/lbu_$i
done
}
-md5sums="92e6d2fee0c183c873627c2261d13845 alpine-conf-2.0_beta5.tar.bz2"
+md5sums="92e6d2fee0c183c873627c2261d13845 alpine-conf-2.0_beta5.tar.bz2
+99d5a1c2386e35a1b5443e3b3d8a1157 0001-setup-acf-fix-password-generation.patch"