X-Original-To: alpine-aports@lists.alpinelinux.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072061.outbound.protection.outlook.com [40.92.72.61]) by lists.alpinelinux.org (Postfix) with ESMTP id 95067F8169A for ; Fri, 1 Feb 2019 23:35:36 +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=1vXpCTFD9uw7Cb1wF/J/qwa3ktGr5vFdZ8/558Ln0pw=; b=VGcbvDDyfSqQU8kV1EuZSzHJJjOu36cAzCneoNqNOXBsBQ74wp68nxTxukqUiwl0osDVHr7Q1WEtBSHDv8av79yO4+DniKry5NtuvpJEbIikKmxjMlTrI+rtARgnGsZ+zAk2oJRO6sYR/Uudv85wrNgvDd6ixEnNX4lvoAzb69Udy481OBeQVHMq/N8sSu/A6pmGOzmX8RkyEIH4ZBR8DDmTiDiUP50uT1nNcmmURymKBdeFd+m6Wf8uDr7tB8asplTLPHihf8f32F4h645Kw3zER1u5CVCf0bQKKsu40jNRbyE5AjTC975k1T+zA2b2nHYDXslbb6TxW4mCcSrt3g== Received: from VE1EUR03FT061.eop-EUR03.prod.protection.outlook.com (10.152.18.53) by VE1EUR03HT147.eop-EUR03.prod.protection.outlook.com (10.152.18.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17; Fri, 1 Feb 2019 23:35:35 +0000 Received: from VI1PR02MB4784.eurprd02.prod.outlook.com (10.152.18.55) by VE1EUR03FT061.mail.protection.outlook.com (10.152.19.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17 via Frontend Transport; Fri, 1 Feb 2019 23:35:35 +0000 Received: from VI1PR02MB4784.eurprd02.prod.outlook.com ([fe80::e42e:be68:60e3:d8e9]) by VI1PR02MB4784.eurprd02.prod.outlook.com ([fe80::e42e:be68:60e3:d8e9%3]) with mapi id 15.20.1558.026; Fri, 1 Feb 2019 23:35:34 +0000 From: Stefan R. To: "alpine-aports@lists.alpinelinux.org" CC: Stefan R. Subject: [alpine-aports] [PATCH] update snapper to 0.8.2 Thread-Topic: [PATCH] update snapper to 0.8.2 Thread-Index: AQHUuobUneUFAlKOm0GNWb3R2/scwg== Date: Fri, 1 Feb 2019 23:35:34 +0000 Message-ID: Accept-Language: de-AT, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1P194CA0001.EURP194.PROD.OUTLOOK.COM (2603:10a6:800:be::11) To VI1PR02MB4784.eurprd02.prod.outlook.com (2603:10a6:803:91::27) x-incomingtopheadermarker: OriginalChecksum:B39721F7B5FADFA38F5DCE62CDB63710281E1738897C78F1BA6C9DD6D1989771;UpperCasedChecksum:E5C174A37A943877CCC948CF3BDE9442006F7CFCF3031F333AB30A24CFDD0BD9;SizeAsReceived:8367;Count:63 x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-tmn: [2B/R7JZwiJXCSnPMHgahmkodeiYdVSF/] x-microsoft-original-message-id: <20190201233531.8752-1-kroko87@hotmail.com> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;VE1EUR03HT147;6:CHfm3/06HL4h8lTc59rqcNolgjAWjUTkpnEFEiHe2t1zgHc0d4WrHlih2WCNYC0WsOf5Tp4TAwWagUoxhp9geK/t/jIEACktCXmAEFuxzV8vN94pPVOoJHHfn9BYP1D6/IF1CsfFsd7yWahIT8C54QS2FOuQsNI4fVUKfwCBUr0/7BU47mUrTKHaIxxUvmkQ2p7pW+CMW8bqNn2PMWttOmfg+pNScZA3WUrrTLHkVqNzjqE7fvi2ReKHiIzStR7YeHOKid1p6IC1F8rM5BDsAoUpZkQKnMEcO/Bz11m/o2pTqgRgJwNp3uflWYSh0kUwHjUWG5cFTvSaYCj5poCp3tP4fWVWZ6Q1fHLPH1anR6I2rJspYoGJyPCU/LcQtDLE5Tc6Ztnxa9XKOJVz7EAV7sebNCyjniEL56r6TcLXYa7qMG7Mp+r2yvuwKKZphMVHjqly9aitJCo4GcWkU7IcPg==;5:IN/asWjybNZVVW//x1L3mC6o6If12kRW2vKQXMtB7Kh0JtsmP+RuvKzmrvxNXutxi7Tn8+EVExN/OFVf1afe0XjNSCRaU8qK5ctVINW6s2TAWEMHjNjDcPOzESSS2vVY80yg3+CBLwlyuy7dKuY0K3cNCiAkitB8e6JpSh44QDN/icpY+iHmKewmG2bXxYPJ9G52FHLQjLBcs+1Ale24Xg==;7:Hi3gKtejMSxEDomaWEBLOVH6il135qHQAq1DcIgXDzfbytnypYfHv3+Wyi6DKCg7ZUakSCUk05b3l1MD2k52toCx2Dr7z9q8iJO2/f1CK0UHrNgCI9301Ed6261h/mffxZPTbRFjHtVgodpzGmkkLw== x-incomingheadercount: 63 x-eopattributedmessage: 0 x-ms-exchange-slblob-mailprops: lHNTL7xaWTiE1/CF6pSNsz067teIVFOUghAtGOc5tpXnjVv2er8tAFH0C5pIUZM9uVOEH5kpen7fJDc7O11BUIbIcCSddkoQu0dl+mTsemt47CRUMEa3leMkqLFfMvySDeHG78rw9ms6BEQyYtUz2XqSjn1q55b+JwzJehsR/VXrfANujkSmtrfv/9BvGs1mLQ+0T8+pU7mldrIi0Lm7s53BS2dzn1GZaema4KbLVFrrriOXy4NpRsB6qqgowKR9UxLG3fegxSllkBX2S3j5vPSfU/22N1zR107/ughqP5wdXFwABgv+Q5BYnctiSCDEthE5FJILTNdwcsrLnY2gqtjpLd/s4UAga2SfILNlKlT0bHtVRo1wLKzcy2IyoVBljvRX6x3X1PZQJcyJYDd/O2Luzi867uzgKZgXi7BCipWAQ4PmHi3HzgDMfpaVyR9Q2Rt/0X7XjQEUFqZjQbL1FpsoieZS/ujdUSXnB8GP6eq4RJyJQruMdJ/EBBzCe/hvqSuUzejSQPX1YiRiqOKGcwT2aHtq7hJCGIy5UtFhDwZhBXyMKXa0ODHHQGjMWqeIh6790UdLko0gNyd6SofekvT/x6bBARAYVhGgHzcqZu/1Koi1pdCMDa37ha9ZFpq45MVusmbYHqWnxrHYs7pSmIARrCF4BSfwCU0TsjHbt4Z95LNncr6YRABb1SZ/ZIUASrhsVfmKB3Jk8kOVb0taj/yH0nOGAL8bQo/1ls/vAa6vcXd/+XtOWtt9VJsj/V7QmAo0TsIaiN1g7IcZsS+qkD3h2m+91bhBWwA/iEmiGyseEIZT8OPfVKq1yYLh72ML09RhKLB2JFXYYu9bomzeWqHfskImetVLos3UOGoiSDS7m9jgDQ2/kt+6QjIW1VD0k+I/Ccotmj0il7dhnAo/LYXdrm1jByoFkpYSglZSQ7Ao97fdr6vudJCYfeahP35nYNriwFCATZI= x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(201702181274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045);SRVR:VE1EUR03HT147; x-ms-traffictypediagnostic: VE1EUR03HT147: x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(4566010)(82015058);SRVR:VE1EUR03HT147;BCL:0;PCL:0;RULEID:;SRVR:VE1EUR03HT147; x-microsoft-antispam-message-info: 2OQHKjMSXeLJtcIqTGX4CRkdfLu/4Vg7QWwonWt1XaLVXRtjEGwpGpWSI3+n3xZV 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: 3a6ecbb3-3406-49b1-c22d-08d6889df646 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: c001924d-3e68-4f40-89c2-901a49278da7 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2019 23:35:34.1888 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT147 --- testing/snapper/APKBUILD | 16 +++++++++------- testing/snapper/musl-boost.patch | 4 ++-- testing/snapper/musl-dbus.patch | 8 ++++++++ testing/snapper/musl-posix.patch | 8 ++++---- 4 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 testing/snapper/musl-dbus.patch diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index 7d1ebfe865..dbd58e2f4d 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista # Maintainer: Francesco Colista pkgname=3Dsnapper -pkgver=3D0.5.4 -pkgrel=3D1 +pkgver=3D0.8.2 +pkgrel=3D0 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 @@ -24,7 +24,8 @@ source=3D"$pkgname-$pkgver.tar.gz::https://github.com/ope= nSUSE/snapper/archive/v$p musl-types.patch musl-boost.patch remove-systemd.patch - fix-poll_h.patch" + fix-poll_h.patch + musl-dbus.patch" =20 builddir=3D"$srcdir/$pkgname-$pkgver" =20 @@ -63,14 +64,15 @@ package() { make DESTDIR=3D"$pkgdir" install } =20 -sha512sums=3D"fab50b09c46e0a45c81efa26b05b5898b0ec8e7e89da9c7db1014b204e9f= 50f829c6573d606b44e647a868961529f0cee7ac994e04e17d6ce58c2300d23d5288 snapp= er-0.5.4.tar.gz -f6da045474d6d4836d62c57e5db445bc790c2c1d1e9336edabcb62164eed1790db7870b343= c66835e7e5b12b740bf0a18dc0da0259ad22616bd4eafc85f81a80 musl-posix.patch +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 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 -03fba131b3beca83cbe9432c4d297757dfa0d3f6172690c361860c19feae48b96fba625238= 118e5c3eec55385ab4b85faf6143507f3d12171a6870dc65844ed3 musl-boost.patch +a0c25dc1cc7ec1cc512f41302ecd293b2207902a79b9d2ee3b92585d1aab554f5c0546add8= fb12ad3b5936636f3a86516287ac1667122c6045f5ef33fcbfc14b musl-boost.patch 719c0dbc8c9c008928a496184a7d22d08afd25ababede62d73bf4df09d32e3f1ca92cab443= 7d73b183f9faefdfeeab69ec324ed4d3d0ce6c7647d85ef8bfb653 remove-systemd.patc= h -2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f345= 6bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch" +2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f345= 6bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch +11627af9713013dfc4cbdca5a5be644cd49fe205edcaa6eaf64507903edd241f262e40e97a= 091b0f8ee3b495fe2c8fb904e4dbcc0e4e5bfabcc16c66654f561b musl-dbus.patch" diff --git a/testing/snapper/musl-boost.patch b/testing/snapper/musl-boost.= patch index a4e9177bcf..f549e52341 100644 --- a/testing/snapper/musl-boost.patch +++ b/testing/snapper/musl-boost.patch @@ -19,8 +19,8 @@ index 2a6a4c2..e007710 100644 Types.cc Types.h =20 snapperd_LDADD =3D ../snapper/libsnapper.la ../dbus/libdbus.la -lrt --snapperd_LDFLAGS =3D -lboost_system -lboost_thread -+snapperd_LDFLAGS =3D -lboost_system-mt -lboost_thread-mt +-snapperd_LDFLAGS =3D -lboost_system -lboost_thread -lpthread ++snapperd_LDFLAGS =3D -lboost_system-mt -lboost_thread-mt -lpthread diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am index 81104bf..d88644e 100644 --- a/testsuite-cmp/Makefile.am diff --git a/testing/snapper/musl-dbus.patch b/testing/snapper/musl-dbus.pa= tch new file mode 100644 index 0000000000..cf2334f650 --- /dev/null +++ b/testing/snapper/musl-dbus.patch @@ -0,0 +1,8 @@ +--- a/dbus/Makefile.am ++++ b/dbus/Makefile.am +@@ -12,4 +12,4 @@ + DBusMainLoop.cc DBusMainLoop.h +=20 + libdbus_la_LIBADD =3D $(DBUS_LIBS) +-libdbus_la_LDFLAGS =3D -lboost_system -lboost_thread ++libdbus_la_LDFLAGS =3D -lboost_system-mt -lboost_thread-mt diff --git a/testing/snapper/musl-posix.patch b/testing/snapper/musl-posix.= patch index 248ea74374..132d489c6d 100644 --- a/testing/snapper/musl-posix.patch +++ b/testing/snapper/musl-posix.patch @@ -2,18 +2,18 @@ diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc index 052235d..ab81983 100644 --- a/snapper/AppUtil.cc +++ b/snapper/AppUtil.cc -@@ -223,16 +223,10 @@ namespace snapper +@@ -223,16 +223,10 @@ string stringerror(int errnum) { --#if (_POSIX_C_SOURCE >=3D 200112L || _XOPEN_SOURCE >=3D 600) && ! _GNU_SO= URCE +-#if (_POSIX_C_SOURCE >=3D 200112L) && ! _GNU_SOURCE char buf1[100]; - if (strerror_r(errno, buf1, sizeof(buf1)-1) =3D=3D 0) + if (strerror_r(errnum, buf1, sizeof(buf1) - 1) =3D=3D 0) return string(buf1); return string("strerror failed"); -#else - char buf1[100]; -- const char* buf2 =3D strerror_r(errno, buf1, sizeof(buf1)-1); +- const char* buf2 =3D strerror_r(errnum, buf1, sizeof(buf1) - 1); - return string(buf2); -#endif } --=20 2.20.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---