diff options
author | Henrik Riomar <henrik.riomar@gmail.com> | 2017-06-22 18:00:29 +0200 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2017-06-23 06:44:59 +0000 |
commit | 44d17f7d656f648da4748a810201b29938611cf4 (patch) | |
tree | 8e446951090d5e17c71582c5dffc292e62d7faea /testing | |
parent | 46815f8223c46804257eda6cd2811f6f6b38c7cc (diff) | |
download | aports-44d17f7d656f648da4748a810201b29938611cf4.tar.bz2 aports-44d17f7d656f648da4748a810201b29938611cf4.tar.xz |
testing/etckeeper: upgrade to 1.18.7
* Perl is now optional (will be used if installed)
* test suite added upstream (requires option !checkroot)
* Drop fix now included upstream
Diffstat (limited to 'testing')
-rw-r--r-- | testing/etckeeper/0001-30store-metadata-fix-bug-when-listfile-is-empty.patch | 30 | ||||
-rw-r--r-- | testing/etckeeper/APKBUILD | 20 |
2 files changed, 12 insertions, 38 deletions
diff --git a/testing/etckeeper/0001-30store-metadata-fix-bug-when-listfile-is-empty.patch b/testing/etckeeper/0001-30store-metadata-fix-bug-when-listfile-is-empty.patch deleted file mode 100644 index 6b74f97e29..0000000000 --- a/testing/etckeeper/0001-30store-metadata-fix-bug-when-listfile-is-empty.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4ba839ff1898331f55947dcbee4b132a6bc96f18 Mon Sep 17 00:00:00 2001 -From: Henrik Riomar <henrik.riomar@gmail.com> -Date: Wed, 15 Mar 2017 18:26:32 +0100 -Subject: [PATCH] 30store-metadata: fix bug when $listfile is empty - -(cherry picked from commit fad539b0ed762a7f6bc1bd94e64351ef56a25f2a) ---- - pre-commit.d/30store-metadata | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/pre-commit.d/30store-metadata b/pre-commit.d/30store-metadata -index 6d7d4b1..1e624dc 100755 ---- a/pre-commit.d/30store-metadata -+++ b/pre-commit.d/30store-metadata -@@ -20,7 +20,11 @@ filter_ignore() { - ;; - git) - (git ls-files -oi --exclude-standard; git ls-files -oi --exclude-standard --directory) | sort | uniq > "$listfile" || true -- sed 's/^\.\///' | grep -xFvf "$listfile" -+ if [ -s "$listfile" ]; then -+ sed 's/^\.\///' | grep -xFvf "$listfile" -+ else -+ cat - -+ fi - ;; - esac - rm -f "$listfile" --- -2.1.4 - diff --git a/testing/etckeeper/APKBUILD b/testing/etckeeper/APKBUILD index 22ce22de52..c949dd5f23 100644 --- a/testing/etckeeper/APKBUILD +++ b/testing/etckeeper/APKBUILD @@ -2,19 +2,19 @@ # Maintainer: Henrik Riomar <henrik.riomar@gmail.com> pkgname=etckeeper -pkgver=1.18.6 -pkgrel=4 +pkgver=1.18.7 +pkgrel=0 pkgdesc="Store /etc in git." url="http://etckeeper.branchable.com" arch="noarch" license="GPL2" -depends="findutils git perl" +checkdepends="bats fakeroot" +depends="findutils git" subpackages="$pkgname-doc" -options="!check" +options="!checkroot" install="$pkgname.post-install $pkgname.pre-deinstall" source="$pkgname-$pkgver.tar.gz::https://git.joeyh.name/index.cgi/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz apk-commit_hook - 0001-30store-metadata-fix-bug-when-listfile-is-empty.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -26,6 +26,11 @@ prepare() { sed -i 's/_PACKAGE_MANAGER=.*/_PACKAGE_MANAGER=apk/' etckeeper.conf } +check() { + cd "$builddir" + make test +} + package() { cd "$builddir" @@ -41,6 +46,5 @@ package() { "$pkgdir"/etc/apk/commit_hooks.d/"$pkgname" } -sha512sums="a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c etckeeper-1.18.6.tar.gz -2b1a29d31b6e7cf4ddb05de9b5e088b5747c2abfb2d63f9bddd25f4b7dc8503d457df7fd644afe5bd6fea6a5285a111a47c0489d24378b483c1e026cc11c6bf7 apk-commit_hook -5db81313cf103c63560726c88ff68575206fb9df3b60050c93b9c4be6033630fac60626a36dbd6ae15eb458e967d07b83b21b3b891149081ff82f62d13c86063 0001-30store-metadata-fix-bug-when-listfile-is-empty.patch" +sha512sums="44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a etckeeper-1.18.7.tar.gz +2b1a29d31b6e7cf4ddb05de9b5e088b5747c2abfb2d63f9bddd25f4b7dc8503d457df7fd644afe5bd6fea6a5285a111a47c0489d24378b483c1e026cc11c6bf7 apk-commit_hook" |