diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-03 08:58:45 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-03 08:59:05 +0000 |
commit | 7016b23025fc387306f35a04391fe2bcd8eebcc2 (patch) | |
tree | 59f3fe7732869aabfddc06e270551b364b0cb644 | |
parent | b8e89bf9186c574777c21c841eaa13998d145cfe (diff) | |
download | alpine_aports-7016b23025fc387306f35a04391fe2bcd8eebcc2.tar.bz2 alpine_aports-7016b23025fc387306f35a04391fe2bcd8eebcc2.tar.xz alpine_aports-7016b23025fc387306f35a04391fe2bcd8eebcc2.zip |
main/alpine-conf: upgrade to 2.5.4
ref #472
ref #480
-rw-r--r-- | main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch | 46 | ||||
-rw-r--r-- | main/alpine-conf/APKBUILD | 11 |
2 files changed, 4 insertions, 53 deletions
diff --git a/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch b/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch deleted file mode 100644 index 422a322de4..0000000000 --- a/main/alpine-conf/0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From d43136f093e2893457c4e0d944925c97ba86effc Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Mon, 22 Nov 2010 14:42:36 +0000 | ||
4 | Subject: [PATCH] lbu: fix lbu status for encrypted apkovls | ||
5 | |||
6 | http://redmine.alpinelinux.org/issues/480 | ||
7 | --- | ||
8 | lbu.in | 7 ++++++- | ||
9 | 1 files changed, 6 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/lbu.in b/lbu.in | ||
12 | index 527b9e7..309a8ab 100644 | ||
13 | --- a/lbu.in | ||
14 | +++ b/lbu.in | ||
15 | @@ -140,6 +140,9 @@ unpack_apkovl() { | ||
16 | local count=0 | ||
17 | mkdir -p "$dest" | ||
18 | mount_once "$mnt" | ||
19 | + if [ -n "$ENCRYPTION" ]; then | ||
20 | + f="$f.$ENCRYPTION" | ||
21 | + fi | ||
22 | if [ ! -f "$mnt/$f" ]; then | ||
23 | return 1 | ||
24 | fi | ||
25 | @@ -147,7 +150,6 @@ unpack_apkovl() { | ||
26 | tar -C "$dest" -zxf "$mnt/$f" | ||
27 | return | ||
28 | fi | ||
29 | - f="$f.$ENCRYPTION" | ||
30 | check_openssl | ||
31 | while [ $count -lt 3 ]; do | ||
32 | $OPENSSL enc -d -$ENCRYPTION -in "$mnt/$f" | tar \ | ||
33 | @@ -564,7 +566,10 @@ cmd_status() { | ||
34 | unpack_apkovl "$tmp/a" | ||
35 | |||
36 | # generate new apkovl and extract to tmpdir/b | ||
37 | + local save_encryption="$ENCRYPTION" | ||
38 | + ENCRYPTION= | ||
39 | cmd_package - | tar -C "$tmp/b" -zx | ||
40 | + ENCRYPTION="$save_encryption" | ||
41 | |||
42 | # show files that exists in a but not in b as deleted | ||
43 | local f | ||
44 | -- | ||
45 | 1.7.3.2 | ||
46 | |||
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 2db83fdc77..a32c86e434 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD | |||
@@ -1,13 +1,11 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=alpine-conf | 2 | pkgname=alpine-conf |
3 | pkgver=2.5.3 | 3 | pkgver=2.5.4 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Alpine configuration management scripts" | 5 | pkgdesc="Alpine configuration management scripts" |
6 | url=http://git.alpinelinux.org/cgit/$pkgname | 6 | url=http://git.alpinelinux.org/cgit/$pkgname |
7 | depends="openrc" | 7 | depends="openrc" |
8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 8 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" |
9 | 0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch | ||
10 | " | ||
11 | license="GPL-2" | 9 | license="GPL-2" |
12 | 10 | ||
13 | _builddir="$srcdir"/$pkgname-$pkgver | 11 | _builddir="$srcdir"/$pkgname-$pkgver |
@@ -35,5 +33,4 @@ package() { | |||
35 | ln -s lbu "$pkgdir"/sbin/lbu_$i | 33 | ln -s lbu "$pkgdir"/sbin/lbu_$i |
36 | done | 34 | done |
37 | } | 35 | } |
38 | md5sums="d1b94aa7ee65f31693cd1996c6bef4d6 alpine-conf-2.5.3.tar.bz2 | 36 | md5sums="91a2b8a150917cc06f6c9ec839b70bb0 alpine-conf-2.5.4.tar.bz2" |
39 | 1ada3c97ecceb791e5f082223f6326b5 0001-lbu-fix-lbu-status-for-encrypted-apkovls.patch" | ||