diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2019-10-23 09:25:09 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2019-10-23 09:25:09 +0000 |
| commit | 66a0a541d83acb73b22c9133a9c86175019b6f48 (patch) | |
| tree | fc53fb15c40e692b13441b75f78c3b2262710f37 | |
| parent | f62f9a1c3c80c60a5caba0beeb77d2f30689e38e (diff) | |
| download | aports-66a0a541d83acb73b22c9133a9c86175019b6f48.tar.bz2 aports-66a0a541d83acb73b22c9133a9c86175019b6f48.tar.xz | |
testing/snapper: upgrade to 0.8.5
| -rw-r--r-- | testing/snapper/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/snapper/regex.patch | 50 |
2 files changed, 5 insertions, 57 deletions
diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index 4b1c580f49..f38f1800c5 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=snapper -pkgver=0.8.3 -pkgrel=1 +pkgver=0.8.5 +pkgrel=0 pkgdesc="Manage filesystem snapshots and allow undo of system modifications" url="https://snapper.io" arch="all !armhf !armv7" # armhf: fails to build @@ -24,8 +24,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/snapper/archive/v$p musl-__isleap.patch musl-types.patch remove-systemd.patch - fix-poll_h.patch - regex.patch" + fix-poll_h.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -69,7 +68,7 @@ package() { install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="60d82854a323d4a872344a147efca7344a1bbcd9f9c5e607d037f335472f83070d7d4662c53b0fbcbaedea1bf008b63226beec7318a85b7b7343eff7009f34af snapper-0.8.3.tar.gz +sha512sums="1575d3443f816f888822f929f26b124cca7e4f67bf48171dd9345e3ebaf6c72599c8056464cbc38473649c312df97264d398689bea90bc86bfa147082f6463b4 snapper-0.8.5.tar.gz a9eec8105e94c4eb097aa293754b0de45420a297ad845933a7be66b3ff49af409dd427e9bd1de569c49982c619211d1e90183ed8bf8550acb0fa9d83176e22bf musl-posix.patch ddcd279f77007fe905df27b904dc84c8c2eebf0cf42c9f992fdc992e2912ddaab59712c13a798243c4f81727c04ef8e0993773686ab0c682e41726a2bcad962b musl-mode_t.patch f2581e1b5f05a43daea77b27b0c383d4f201bffb485ef1af9e6fcbe26e8dfa44bab36c23ca2d8ea7963fba0c3507d014bdbf1bc0c582c790b9e627fc97b62820 musl-mktime.patch @@ -78,5 +77,4 @@ d5305df362df7db3b882cb491d32d11f479d1d56b21a39bc5e0cbdf7cdf70341eb566e7374bb9acc 8278c469def65e58cb2aee039882d1d237b4b404386472f9540da11a1d3cddd60dda08a99074f9f418b328ce2c4ac73d3190a74a6fe3e00eab9adb4fed87a4ec musl-__isleap.patch 8bc2b42bbee927ce88f77e71a9594da3b6e54e92008e5603c6d8db35b3ec37add456bcc52d7d6a913c69a395c73bd3f6a3934ea549d4cc0097cb65613f61ed48 musl-types.patch 61401ac8e91b838231e018490af61e7fe8c954750eaff4a9ff4e435aea78531cfa2882e354cb088a3a43951d869bdf7c516969a437195362f700e655878bcd71 remove-systemd.patch -2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f3456bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch -6f70b20b1fdc4e935deaef9bc8978068041732e5296d0c9924cbd09f1b3bd0a46e4579f6b3542d7e1f17081dd88960cad7d19e56420f8d91ba906fa1f19f4842 regex.patch" +2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f3456bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch" diff --git a/testing/snapper/regex.patch b/testing/snapper/regex.patch deleted file mode 100644 index 97dc7fa4af..0000000000 --- a/testing/snapper/regex.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/snapper/AsciiFile.cc.orig -+++ b/snapper/AsciiFile.cc -@@ -211,7 +211,7 @@ - - string line = key + "=\"" + value + "\""; - -- Regex rx('^' + Regex::ws + key + '=' + "(['\"]?)([^'\"]*)\\1" + Regex::ws + '$'); -+ Regex rx('^' + Regex::ws + key + '=' + "(\"[^'\"]*\"|'[^'\"]*'|[^'\"]*)" + Regex::ws + '$'); - - vector<string>::iterator it = find_if(lines(), regex_matches(rx)); - if (it == lines().end()) -@@ -226,12 +226,15 @@ - bool - SysconfigFile::getValue(const string& key, string& value) const - { -- Regex rx('^' + Regex::ws + key + '=' + "(['\"]?)([^'\"]*)\\1" + Regex::ws + '$'); -+ Regex rx('^' + Regex::ws + key + '=' + "(\"[^'\"]*\"|'[^'\"]*'|[^'\"]*)" + Regex::ws + '$'); - - if (find_if(lines(), regex_matches(rx)) == lines().end()) - return false; - -- value = rx.cap(2); -+ value = rx.cap(1); -+ if (!value.empty() && (value.front() == '"' || value.front() == '\'')) { -+ value = std::string(value.begin() + 1, value.end() - 1); -+ } - y2mil("key:" << key << " value:" << value); - return true; - } -@@ -295,12 +298,18 @@ - { - map<string, string> ret; - -- Regex rx('^' + Regex::ws + "([0-9A-Z_]+)" + '=' + "(['\"]?)([^'\"]*)\\2" + Regex::ws + '$'); -+ Regex rx('^' + Regex::ws + "([0-9A-Z_]+)" + '=' + "(\"[^'\"]*\"|'[^'\"]*'|[^'\"]*)" + Regex::ws + '$'); - - for (vector<string>::const_iterator it = Lines_C.begin(); it != Lines_C.end(); ++it) - { - if (rx.match(*it)) -- ret[rx.cap(1)] = rx.cap(3); -+ { -+ string value = rx.cap(2); -+ if (!value.empty() && (value.front() == '"' || value.front() == '\'')) { -+ value = std::string(value.begin() + 1, value.end() - 1); -+ } -+ ret[rx.cap(1)] = value; -+ } - } - - return ret; |