Commit 2cdd81fb authored by Natanael Copa's avatar Natanael Copa
Browse files

main/alpine-conf: upgrade to 2.11.3

fixes #1399
parent a0febd91
From 9a18a800011faf018ff49220ae368c673c690bdc Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 17 Jul 2012 10:52:54 +0000
Subject: [PATCH] lbu: check permissions when generating apkovl
We want include files and dirs that have changed permissions.
ref #1241
---
lbu.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lbu.in b/lbu.in
index 3fa157e..a0e68ed 100644
--- a/lbu.in
+++ b/lbu.in
@@ -278,7 +278,7 @@ If <dirname> nor <filename> is not specified, a package named
}
_gen_filelist() {
- apk audit --backup --quiet --recursive
+ apk audit --backup --quiet --recursive --check-permissions
}
cmd_package() {
--
1.7.11.2
From 15245c4a0eb62b0e1bcbac5063391e0d57a53799 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 4 Jul 2012 08:09:21 +0200
Subject: [PATCH] lbu: do not use xargs
xargs will execute the command twice if the buffer becomes long enough.
This will break tar.
We also use -z instead of piping via gzip while here.
ref #1240
---
lbu.in | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/lbu.in b/lbu.in
index 67ad578..3fa157e 100644
--- a/lbu.in
+++ b/lbu.in
@@ -281,10 +281,6 @@ _gen_filelist() {
apk audit --backup --quiet --recursive
}
-_gen_filelist_0() {
- _gen_filelist | tr '\n' '\0'
-}
-
cmd_package() {
local pkg="$1"
local rc=0
@@ -311,7 +307,7 @@ cmd_package() {
tmppkg="$tmpdir/$(basename $pkg)"
- local tar_create="tar -c --no-recursion"
+ local tar_create="tar -c --no-recursion -T -"
cd "${ROOT:-/}"
# remove old package.list
@@ -325,19 +321,17 @@ cmd_package() {
echo "Archiving the following files:" >&2
# we dont want to mess the tar output with the
# password prompt. Lets get the tar output first.
- _gen_filelist_0 | xargs -0 $tar_create -v > /dev/null
+ _gen_filelist | $tar_create -v > /dev/null
rc=$?
fi
if [ $rc -eq 0 ]; then
if [ -z "$ENCRYPTION" ]; then
- _gen_filelist_0 | xargs -0 $tar_create \
- | gzip -c >"$tmppkg"
+ _gen_filelist | $tar_create -z >"$tmppkg"
rc=$?
else
set -- enc "-$ENCRYPTION" -salt
[ -n "$PASSWORD" ] && set -- "$@" -pass pass:"$PASSWORD"
- _gen_filelist_0 | xargs -0 $tar_create \
- | gzip -c \
+ _gen_filelist | $tar_create -z \
| $OPENSSL "$@" > "$tmppkg"
rc=$?
fi
--
1.7.11.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf pkgname=alpine-conf
pkgver=2.11.2 pkgver=2.11.3
pkgrel=2 pkgrel=0
pkgdesc="Alpine configuration management scripts" pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname url=http://git.alpinelinux.org/cgit/$pkgname
depends="openrc" depends="openrc"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
0001-lbu-do-not-use-xargs.patch
0001-lbu-check-permissions-when-generating-apkovl.patch
" "
arch="all" arch="all"
...@@ -38,6 +36,4 @@ package() { ...@@ -38,6 +36,4 @@ package() {
ln -s lbu "$pkgdir"/sbin/lbu_$i ln -s lbu "$pkgdir"/sbin/lbu_$i
done done
} }
md5sums="47e37f6211817acc12aa637798da0437 alpine-conf-2.11.2.tar.bz2 md5sums="09a8315fa1a5746b961f0dd6e65cdd8d alpine-conf-2.11.3.tar.bz2"
a49569f9eb9bfa630efaca4988bde07c 0001-lbu-do-not-use-xargs.patch
97db0e60d1fd534a613e3d6cbca23a14 0001-lbu-check-permissions-when-generating-apkovl.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment