X-Original-To: alpine-aports@lists.alpinelinux.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064080.outbound.protection.outlook.com [40.92.64.80]) by lists.alpinelinux.org (Postfix) with ESMTP id 4ED89F8315A for ; Mon, 11 Feb 2019 13:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IvAWXTaBF2PiT310b5pEWZviT18UGWfRFxqvJWpFzE4=; b=cO8jlw+jvbvslJ6NtkFb5igYqRfUjD06n84XS9gdl+NUKeRd+9JFbyyGqyYGWJ3j7t0nvH7HnvRqwTfafpQGHaZVEQ6tL00YMUGdRDyG8suaLvkZ2sJEDjcKAxFbZqjk7VITS/duYE0VXTqHfea1cs1RR4zcxe08LT3SE8b3OiPG6YVapcGAcKfIqPxzNYy8h/VVevhr9fQ0P5MQcT+SHeBTAjPKcziiDvb7UBdg8i32CMOJNI1F4wmT5jpS9CDnotjvyl7r8Sh8x9r1SEhWDc8VeFFUv7v1l3ouepTzx5JDm3Fo+qdYd1fQTYaIknVldrN11KtC5tR1Ql0kdHKwmg== Received: from HE1EUR01FT028.eop-EUR01.prod.protection.outlook.com (10.152.0.52) by HE1EUR01HT221.eop-EUR01.prod.protection.outlook.com (10.152.1.127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1580.10; Mon, 11 Feb 2019 13:07:56 +0000 Received: from VI1PR02MB4784.eurprd02.prod.outlook.com (10.152.0.52) by HE1EUR01FT028.mail.protection.outlook.com (10.152.0.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.10 via Frontend Transport; Mon, 11 Feb 2019 13:07:56 +0000 Received: from VI1PR02MB4784.eurprd02.prod.outlook.com ([fe80::dc54:cf8f:1a73:ce2b]) by VI1PR02MB4784.eurprd02.prod.outlook.com ([fe80::dc54:cf8f:1a73:ce2b%4]) with mapi id 15.20.1601.023; Mon, 11 Feb 2019 13:07:56 +0000 From: Stefan R. To: "alpine-aports@lists.alpinelinux.org" CC: Stefan R. Subject: [alpine-aports] [PATCH] testing/snapper: config and musl fixes Thread-Topic: [PATCH] testing/snapper: config and musl fixes Thread-Index: AQHUwgrN2VWVE/k9g0Wa+CG1qryPXg== Date: Mon, 11 Feb 2019 13:07:56 +0000 Message-ID: Accept-Language: de-AT, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1PR04CA0128.eurprd04.prod.outlook.com (2603:10a6:803:f0::26) To VI1PR02MB4784.eurprd02.prod.outlook.com (2603:10a6:803:91::27) x-incomingtopheadermarker: OriginalChecksum:9DD3EAF6A667C4A19043C3DC7E06FC8C651531215D3F5C87A04F9E5D16ABEDE3;UpperCasedChecksum:D2BF6ACF44A74DB9D3E239BE92B345D4264E947A32111A5DC4BEFF6AF435D811;SizeAsReceived:8383;Count:63 x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-tmn: [GeaEGVGtXnz69bnudlTaLh9KOnEtJydy] x-microsoft-original-message-id: <20190211130734.16031-1-kroko87@hotmail.com> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;HE1EUR01HT221;6:P8226M/muIDgsw9JZTOFCfzBsIXUPB1tFE/Tbo9Xu5WOs6JKDFHv0Oe6AmGD6uFf/Md+v4oic1soTM54a/aECTyESp0vfh82SNo1pte+Kkzedwm77BsXeu3u4+S8QJafE0Tph+z2651tC9OuoyZV47xrg9d5C+d6Edtgx4SHUGLMk5ReVuld4X5GZUNwFOf/x2tJ6mvcmM7Y0H1lRW5k/cFy0eKYWISOsNNgLDtchoBvlVQ19tG754xP23kI6GBx49kTgt5HCWCdI7Tif8VEkOTlu/f8riN3/QevtA/P0/mmmaFlpSBgpbUGvSQJ4lRyxQx/rRDREx6D4r/WFU1g9xIZJDVnZSojqa05duVLh6Mur9ymkKoHgijhmT9c37Y3J6x8rwz9sWnJFx/aQ8jJ4QYyiaaFZ6gv4XcIb1pIl6kveDIUai1AanpxI4WIEbqc1RNTUXxj/svAcVXcW5KLlQ==;5:800NitJM5eKrTNrR4NIQLwaWOZmTmxGfKV/jAMOxA1hhVSPxESzfTd1owv3OvsaQ/zvTXvdSYrCs2F1d0uQTIN9k9EKPQD/z+dZa9xBB9chuXLN++mioIoj+eIoy+lpY9jXfVjrLZIa7w51Vko6+ks1GjUirkgeDPUF998CBKSygPTvmGjJU8OVPCQxx4rj1ucc4RF7fqGgeAS3JOCHKKg==;7:Rd69hU2PLiNQqhCTGLeCwP3ZPDw7J5ydcfFaUBmCCmXiw4IObVN7EER9T0QK5mLjw3r3hcqzzUlj8EwTI4r3OxNErMeXH4znyTmKFKL68zixIInMhycBnt2i+jTfjSmmavygGQdjdrwGfVh7UgJmGA== x-incomingheadercount: 63 x-eopattributedmessage: 0 x-ms-exchange-slblob-mailprops: =?iso-8859-1?Q?7FNIAzWC7TrzIQI2j+hmSu4a1V+nxIDdRF3B3+xJ9GvYANJtBeNPJyZS4C?= =?iso-8859-1?Q?eyLj2UaDCv75jZmWVJk1hfepm2YDee6hHwhLLxM04K0WfnqSCjBUEO53BO?= =?iso-8859-1?Q?ZM6KL26Secr8+XRj6CB9i0u/6+o2czaFSrzdayfdj7DoENwnKJ5+D7jvtD?= =?iso-8859-1?Q?CoA92X8biVpW4qnEZE2Kyq549zfDrlCsS+1P4YOBk78lQHZJvdJw0QDfBz?= =?iso-8859-1?Q?KrUdRPfjsNy2JK0KMRLrwG0xXs52gmvG+0QazV3qd6Xqphb2nGt6aCtFnh?= =?iso-8859-1?Q?GhQAK8G+XtGusl5dBQzBAlOHywD0eznxb1geZQa4S4A6bvwLNJ7wZ9pJWZ?= =?iso-8859-1?Q?kGqvwTyEd2lFzjxrCUcoAWJbBWNkzVpG8bGcVHFdZjG5ENfRmAxzpSH/A2?= =?iso-8859-1?Q?Z5MzPYaZex9G+czXQWww/OG/J0Rv+t0rew0dUra33L7vOFJ6AfpDBpStp2?= =?iso-8859-1?Q?JgR5Yp2c+5N8gEwKQYEpTtYmf2XxD0dQ2WhDjqsF1kJyIV/24NFwXR5NfK?= =?iso-8859-1?Q?irqlQPHcI4HWoUj0fmhRjTNs2thHJk9y991kDksPHyvQOpQK07AnhTTo11?= =?iso-8859-1?Q?hCLMHWqK0kkNCyxpm9BDNLZAcB/VmAqzkY7WA4e8ZaKHB2MjG9CjBHOkQ5?= =?iso-8859-1?Q?mjgWsVWxGDuUKDKI00uULuVc7D6n01FKaH061FEAM3qnZwO4yFpaCL/Bt8?= =?iso-8859-1?Q?O/awJwOx9rQMDtq+m5tJgBMcgVSizExhPKhf4SLuXKWTracLr3VuzCLv4K?= =?iso-8859-1?Q?fT2yWhu8zvyM2d+xxgizIFjk43DYckyM0IavLkKh0017Ou5/dipCIwFUqE?= =?iso-8859-1?Q?iPwh7h95zD6TLVCe9hItGYzZvZR84AQfAqWe1QIHTXckYBx37p5JWO3mcz?= =?iso-8859-1?Q?MCXhid38KlMriyVzluejkJEdIMt0668/zwgkaUxmcaHVOloolUjju66QHD?= =?iso-8859-1?Q?0r0LjSGC5SddPvy5o5O9DA6rADTU1RQWUPFgYutuwkTY8CjwNS9NjZscMj?= =?iso-8859-1?Q?pt05uWDhpPTRvTXSKbC5KXfg2LGFbyovb6N+kQR4/YKyNPGZ1Bxqw7g8jA?= =?iso-8859-1?Q?uLgawYCb84EYxJ9TWMwrdirFt3KbVBW/2fAnZlRSfV3JQAGXLntSjFc=3D?= x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(201702181274)(2017031322404)(2017031323274)(2017031324274)(1601125500)(1603101475)(1701031045);SRVR:HE1EUR01HT221; x-ms-traffictypediagnostic: HE1EUR01HT221: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(4566010)(82015058);SRVR:HE1EUR01HT221;BCL:0;PCL:0;RULEID:;SRVR:HE1EUR01HT221; x-microsoft-antispam-message-info: m0FGDPGaI3ia7wPyVfDWuH/npMGPoNbtOcJeEHiVr0ITNWxpzFXRv2nJDqTsGQxs Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-OriginatorOrg: hotmail.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-Network-Message-Id: 63b49c13-d1f7-4e5e-b6b4-08d69021efd6 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Feb 2019 13:07:55.0699 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR01HT221 Add dbus as dependency. Readd dbus config files in remove-systemd.patch. Fix conjob paths in scripts/Makefile.am. Install data/sysconfig.snapper to /etc/conf.d/snapper. Disable ext4 support, because it is experimental and not support with stand= ard kernel and tools. Fix regex (because the '?' operator isn't supported). Fix strptime in snapper/AppUtil.cc, because musl doesn't support '%F'. --- testing/snapper/APKBUILD | 20 +++++++---- testing/snapper/musl-mktime.patch | 12 ++++--- testing/snapper/regex.patch | 50 ++++++++++++++++++++++++++++ testing/snapper/remove-systemd.patch | 13 +++----- 4 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 testing/snapper/regex.patch diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index dbd58e2f4d..3f50e05178 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -2,13 +2,14 @@ # Maintainer: Francesco Colista pkgname=3Dsnapper pkgver=3D0.8.2 -pkgrel=3D0 +pkgrel=3D1 pkgdesc=3D"Manage filesystem snapshots and allow undo of system modificati= ons" url=3D"https://snapper.io" arch=3D"all !armhf !armv7" # armhf: fails to build license=3D"GPL-2.0" # 3 tests are failing options=3D"!check" +depends=3D"dbus" makedepends=3D"automake autoconf libtool bash btrfs-progs-dev e2fsprogs-dev dbus-dev acl-dev=20 lvm2-dev libxml2-dev boost-dev bsd-compat-headers @@ -25,7 +26,8 @@ source=3D"$pkgname-$pkgver.tar.gz::https://github.com/ope= nSUSE/snapper/archive/v$p musl-boost.patch remove-systemd.patch fix-poll_h.patch - musl-dbus.patch" + musl-dbus.patch + regex.patch" =20 builddir=3D"$srcdir/$pkgname-$pkgver" =20 @@ -34,6 +36,8 @@ prepare() { autoreconf -fi # rename cron scripts sed -i -e 's@suse.de-@@g' scripts/Makefile.am + # copy cron scripts to /etc/periodic/* instead of /etc/cron.* + sed -i -e 's/cron\./periodic\//g' scripts/Makefile.am # fix config location in cron scripts sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-daily sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-hourly @@ -50,7 +54,8 @@ build() { --disable-silent-rules \ --with-conf=3D/etc/conf.d \ --disable-pam \ - --disable-zypp + --disable-zypp \ + --disable-ext4 make } =20 @@ -62,17 +67,20 @@ check() { package() { cd "$builddir" make DESTDIR=3D"$pkgdir" install + + install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/$pkgname } =20 sha512sums=3D"53e801e5e3c939a63833fab143c665e2289e128004dd67dcc98826b994d2= 150b268af021505b0f98982d66ea520a2d98279da15a904a003f2a0a1f1fac80124f snapp= er-0.8.2.tar.gz a9eec8105e94c4eb097aa293754b0de45420a297ad845933a7be66b3ff49af409dd427e9bd= 1de569c49982c619211d1e90183ed8bf8550acb0fa9d83176e22bf musl-posix.patch ddcd279f77007fe905df27b904dc84c8c2eebf0cf42c9f992fdc992e2912ddaab59712c13a= 798243c4f81727c04ef8e0993773686ab0c682e41726a2bcad962b musl-mode_t.patch -57479b51c821f880c2fc6d50ac59a3f9c2dc49a1da509e643a4e3f93491fb50220b97cacf0= c09943b5b3b9cce531a3d5d11b8d0d146aa06ef21c1acb139cb193 musl-mktime.patch +f2581e1b5f05a43daea77b27b0c383d4f201bffb485ef1af9e6fcbe26e8dfa44bab36c23ca= 2d8ea7963fba0c3507d014bdbf1bc0c582c790b9e627fc97b62820 musl-mktime.patch ed393b476a679ebc8f130e34826958a30aa98dc7ac77c0c324a486cc3ed8539584552a305e= 2ddcb810626c6ab3478e634c77762395e2560abc935cd18e882beb musl-stdout_stderr.= patch d5305df362df7db3b882cb491d32d11f479d1d56b21a39bc5e0cbdf7cdf70341eb566e7374= bb9acc6d4fa1db027d4f009857fed21ef48ed311efaaa1be7b6329 musl-_nl_msg_cat_cn= tr.patch 8278c469def65e58cb2aee039882d1d237b4b404386472f9540da11a1d3cddd60dda08a990= 74f9f418b328ce2c4ac73d3190a74a6fe3e00eab9adb4fed87a4ec musl-__isleap.patch 8bc2b42bbee927ce88f77e71a9594da3b6e54e92008e5603c6d8db35b3ec37add456bcc52d= 7d6a913c69a395c73bd3f6a3934ea549d4cc0097cb65613f61ed48 musl-types.patch a0c25dc1cc7ec1cc512f41302ecd293b2207902a79b9d2ee3b92585d1aab554f5c0546add8= fb12ad3b5936636f3a86516287ac1667122c6045f5ef33fcbfc14b musl-boost.patch -719c0dbc8c9c008928a496184a7d22d08afd25ababede62d73bf4df09d32e3f1ca92cab443= 7d73b183f9faefdfeeab69ec324ed4d3d0ce6c7647d85ef8bfb653 remove-systemd.patc= h +61401ac8e91b838231e018490af61e7fe8c954750eaff4a9ff4e435aea78531cfa2882e354= cb088a3a43951d869bdf7c516969a437195362f700e655878bcd71 remove-systemd.patc= h 2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f345= 6bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch -11627af9713013dfc4cbdca5a5be644cd49fe205edcaa6eaf64507903edd241f262e40e97a= 091b0f8ee3b495fe2c8fb904e4dbcc0e4e5bfabcc16c66654f561b musl-dbus.patch" +11627af9713013dfc4cbdca5a5be644cd49fe205edcaa6eaf64507903edd241f262e40e97a= 091b0f8ee3b495fe2c8fb904e4dbcc0e4e5bfabcc16c66654f561b musl-dbus.patch +6f70b20b1fdc4e935deaef9bc8978068041732e5296d0c9924cbd09f1b3bd0a46e4579f6b3= 542d7e1f17081dd88960cad7d19e56420f8d91ba906fa1f19f4842 regex.patch" diff --git a/testing/snapper/musl-mktime.patch b/testing/snapper/musl-mktim= e.patch index 48fbc0802e..22cbff4888 100644 --- a/testing/snapper/musl-mktime.patch +++ b/testing/snapper/musl-mktime.patch @@ -2,10 +2,14 @@ According to http://ftp.gnu.org/old-gnu/Manuals/glibc-2.2= .3/html_chapter/libc_21 timelocal(2) is functionally identical to mktime(2), but more mnemonically named. There is no timelocal(2) defined in musl libc. =20 ---- a/snapper/AppUtil.cc 2015-02-18 18:54:03.000000000 +0100 -+++ b/snapper/AppUtil.cc 2015-08-30 10:39:31.318158599 +0200 -@@ -274,7 +274,7 @@ - const char* p =3D strptime(str.c_str(), "%F %T", &s); +--- a/snapper/AppUtil.cc ++++ b/snapper/AppUtil.cc +@@ -279,10 +279,10 @@ + { + struct tm s; + memset(&s, 0, sizeof(s)); +- const char* p =3D strptime(str.c_str(), "%F %T", &s); ++ const char* p =3D strptime(str.c_str(), "%Y-%m-%d %T", &s); if (!p || *p !=3D '\0') return (time_t)(-1); - return utc ? timegm(&s) : timelocal(&s); diff --git a/testing/snapper/regex.patch b/testing/snapper/regex.patch new file mode 100644 index 0000000000..97dc7fa4af --- /dev/null +++ b/testing/snapper/regex.patch @@ -0,0 +1,50 @@ +--- a/snapper/AsciiFile.cc.orig ++++ b/snapper/AsciiFile.cc +@@ -211,7 +211,7 @@ +=20 + string line =3D key + "=3D\"" + value + "\""; +=20 +- Regex rx('^' + Regex::ws + key + '=3D' + "(['\"]?)([^'\"]*)\\1" + Regex:= :ws + '$'); ++ Regex rx('^' + Regex::ws + key + '=3D' + "(\"[^'\"]*\"|'[^'\"]*'|[^'\"]*= )" + Regex::ws + '$'); +=20 + vector::iterator it =3D find_if(lines(), regex_matches(rx)); + if (it =3D=3D lines().end()) +@@ -226,12 +226,15 @@ + bool + SysconfigFile::getValue(const string& key, string& value) const + { +- Regex rx('^' + Regex::ws + key + '=3D' + "(['\"]?)([^'\"]*)\\1" + Regex:= :ws + '$'); ++ Regex rx('^' + Regex::ws + key + '=3D' + "(\"[^'\"]*\"|'[^'\"]*'|[^'\"]*= )" + Regex::ws + '$'); +=20 + if (find_if(lines(), regex_matches(rx)) =3D=3D lines().end()) + return false; +=20 +- value =3D rx.cap(2); ++ value =3D rx.cap(1); ++ if (!value.empty() && (value.front() =3D=3D '"' || value.front() =3D=3D = '\'')) { ++ value =3D std::string(value.begin() + 1, value.end() - 1); ++ } + y2mil("key:" << key << " value:" << value); + return true; + } +@@ -295,12 +298,18 @@ + { + map ret; +=20 +- Regex rx('^' + Regex::ws + "([0-9A-Z_]+)" + '=3D' + "(['\"]?)([^'\"]*)\\= 2" + Regex::ws + '$'); ++ Regex rx('^' + Regex::ws + "([0-9A-Z_]+)" + '=3D' + "(\"[^'\"]*\"|'[^'\"= ]*'|[^'\"]*)" + Regex::ws + '$'); +=20 + for (vector::const_iterator it =3D Lines_C.begin(); it !=3D Line= s_C.end(); ++it) + { + if (rx.match(*it)) +- ret[rx.cap(1)] =3D rx.cap(3); ++ { ++ string value =3D rx.cap(2); ++ if (!value.empty() && (value.front() =3D=3D '"' || value.front() =3D=3D= '\'')) { ++ value =3D std::string(value.begin() + 1, value.end() - 1); ++ } ++ ret[rx.cap(1)] =3D value; ++ } + } +=20 + return ret; diff --git a/testing/snapper/remove-systemd.patch b/testing/snapper/remove-= systemd.patch index 5f39a3a254..8f84cba64f 100644 --- a/testing/snapper/remove-systemd.patch +++ b/testing/snapper/remove-systemd.patch @@ -1,14 +1,9 @@ -diff --git a/data/Makefile.am b/data/Makefile.am -index e2036ba..0af20ff 100644 ---- a/data/Makefile.am +--- a/data/Makefile.am.orig +++ b/data/Makefile.am -@@ -18,16 +18,6 @@ install-data-local: - install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt - install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt +@@ -21,13 +21,6 @@ + install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system= .d/org.opensuse.Snapper.conf + install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus= -1/system-services/org.opensuse.Snapper.service =20 -- install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system= .d/org.opensuse.Snapper.conf -- install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus= -1/system-services/org.opensuse.Snapper.service -- - install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/sna= pper-timeline.service - install -D -m 644 timeline.timer $(DESTDIR)/usr/lib/systemd/system/snapp= er-timeline.timer - install -D -m 644 cleanup.service $(DESTDIR)/usr/lib/systemd/system/snap= per-cleanup.service --=20 2.20.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---