diff options
author | Michael Mason <ms13sp@gmail.com> | 2009-09-03 14:38:38 +0000 |
---|---|---|
committer | Michael Mason <ms13sp@gmail.com> | 2009-09-03 14:38:38 +0000 |
commit | 22c9c968ec4fa47425f14d4c2db529ff255740a4 (patch) | |
tree | e41b63f7428eb347675526eb0eaad324b4da8f07 | |
parent | 0bd98df73a2645c34341d255f6d27e02bd7dde79 (diff) | |
parent | a9a580b46896364c171872e3e773e350b8d6f31f (diff) | |
download | aports-22c9c968ec4fa47425f14d4c2db529ff255740a4.tar.bz2 aports-22c9c968ec4fa47425f14d4c2db529ff255740a4.tar.xz |
Merge branch 'master' of git://git.alpinelinux.org/aports
-rw-r--r-- | main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch | 28 | ||||
-rw-r--r-- | main/alpine-conf/APKBUILD | 10 | ||||
-rw-r--r-- | main/apk-tools/APKBUILD | 4 | ||||
-rw-r--r-- | main/mkinitfs/0001-mkinitfs-fix-b-option.patch | 43 | ||||
-rw-r--r-- | main/mkinitfs/APKBUILD | 9 |
5 files changed, 8 insertions, 86 deletions
diff --git a/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch b/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch deleted file mode 100644 index 75ada6d4d8..0000000000 --- a/main/alpine-conf/0001-setup-acf-use-FQDN-for-selfsigned-cert.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4599ce25c2b2c491c3b4fa14ca7a082b292b1df1 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 31 Aug 2009 13:28:03 +0000 -Subject: [PATCH] setup-acf: use FQDN for selfsigned cert - -and make it possible to override the email address ---- - setup-acf.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup-acf.in b/setup-acf.in -index 92d769c..0b45be5 100644 ---- a/setup-acf.in -+++ b/setup-acf.in -@@ -73,8 +73,8 @@ prompt = no - - [ req_dn ] - OU=HTTPS server --CN=$(hostname) --emailAddress=postmaster@example.com -+CN=$(hostname -f) -+emailAddress=${EMAIL:-postmaster@example.com} - - [ cert_type ] - nsCertType = server --- -1.6.4 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 17faad189c..f7c2aca9ad 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,19 +1,16 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=2.0_beta6 -pkgrel=1 +pkgver=2.0_rc2 +pkgrel=0 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-use-FQDN-for-selfsigned-cert.patch " license="GPL-2" build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../0001-setup-acf-use-FQDN-for-selfsigned-cert.patch \ - || return 1 make || return 1 make install PREFIX= DESTDIR="$pkgdir" @@ -21,5 +18,4 @@ build() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="1f211a93c61072f1f95c7effa4330f06 alpine-conf-2.0_beta6.tar.bz2 -a2671b332863502722d91d8da6a628a7 0001-setup-acf-use-FQDN-for-selfsigned-cert.patch" +md5sums="0fadddb30736fa49852a359a770e95d1 alpine-conf-2.0_rc2.tar.bz2" diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index e9f2dfda97..a29393b1eb 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.0_rc4 +pkgver=2.0_rc5 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" @@ -36,4 +36,4 @@ static() { "$subpkgdir"/sbin/apk.static } -md5sums="04224faeb255a9ca4697643f8bd8721a apk-tools-2.0_rc4.tar.bz2" +md5sums="0d7507305586e2f4bcc4884cf6684977 apk-tools-2.0_rc5.tar.bz2" diff --git a/main/mkinitfs/0001-mkinitfs-fix-b-option.patch b/main/mkinitfs/0001-mkinitfs-fix-b-option.patch deleted file mode 100644 index c1c5b65b7c..0000000000 --- a/main/mkinitfs/0001-mkinitfs-fix-b-option.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d64e5baefc7e1ca75e6f1ca50f28e96b30991c6a Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 3 Sep 2009 09:06:54 +0000 -Subject: [PATCH] mkinitfs: fix -b option - ---- - mkinitfs.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkinitfs.in b/mkinitfs.in -index e18b59c..0332151 100755 ---- a/mkinitfs.in -+++ b/mkinitfs.in -@@ -16,7 +16,7 @@ _cp() { - local i - if [ -n "$list_sources" ]; then - for i in "$@"; do -- echo $i -+ echo "$basedir"/$i - done - return - fi -@@ -24,7 +24,7 @@ _cp() { - for i in "$@"; do - local dest="$tmpdir"/${i%/*} - mkdir -p "$dest" -- cp -flLpR "$i" "$dest" 2>/dev/null || cp -pR "$i" "$dest" -+ cp -flLpR "$basedir"/"$i" "$dest" 2>/dev/null || cp -pR "$i" "$dest" - done - } - -@@ -121,7 +121,7 @@ initfs_kmods() { - [ -z "$list_sources" ] && rm -rf "$tmpdir"/lib/modules - files=$(find_kmods) - for file in $files; do -- _cp "$basedir"/$file -+ _cp $file - done - [ -z "$list_sources" ] && depmod $kernel -b "$tmpdir" - } --- -1.6.4.2 - diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 6a22529647..d025e78c20 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,21 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.0_rc3 -pkgrel=1 +pkgver=2.0_rc4 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-mkinitfs-fix-b-option.patch " license="GPL-2" build() { cd "$srcdir"/$pkgname-$pkgver - patch -p1 -i ../0001-mkinitfs-fix-b-option.patch || return 1 make || return 1 make install DESTDIR="$pkgdir" || return 1 } -md5sums="7f0e2ec039d10a01f46a7a049d6cbea0 mkinitfs-2.0_rc3.tar.bz2 -49292145e7f94c047e705e329d2c3708 0001-mkinitfs-fix-b-option.patch" +md5sums="acb74ed639bdab5f3d5d00cb8e969710 mkinitfs-2.0_rc4.tar.bz2" |