Subject: [alpine-aports] [PATCH] update snapper to 0.8.2

From: Stefan R. <[email-masked]>
Date: Fri, 1 Feb 2019 23:35:34 +0000

---
 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 <[email-masked]>
 # Maintainer: Francesco Colista <[email-masked]>
 pkgname=snapper
-pkgver=0.5.4
-pkgrel=1
+pkgver=0.8.2
+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,7 +24,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/snapper/archive/v$p
 	musl-types.patch
 	musl-boost.patch
 	remove-systemd.patch
-	fix-poll_h.patch"
+	fix-poll_h.patch
+	musl-dbus.patch"
 
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -63,14 +64,15 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="fab50b09c46e0a45c81efa26b05b5898b0ec8e7e89da9c7db1014b204e9f50f829c6573d606b44e647a868961529f0cee7ac994e04e17d6ce58c2300d23d5288  snapper-0.5.4.tar.gz
-f6da045474d6d4836d62c57e5db445bc790c2c1d1e9336edabcb62164eed1790db7870b343c66835e7e5b12b740bf0a18dc0da0259ad22616bd4eafc85f81a80  musl-posix.patch
+sha512sums="53e801e5e3c939a63833fab143c665e2289e128004dd67dcc98826b994d2150b268af021505b0f98982d66ea520a2d98279da15a904a003f2a0a1f1fac80124f  snapper-0.8.2.tar.gz
+a9eec8105e94c4eb097aa293754b0de45420a297ad845933a7be66b3ff49af409dd427e9bd1de569c49982c619211d1e90183ed8bf8550acb0fa9d83176e22bf  musl-posix.patch
 ddcd279f77007fe905df27b904dc84c8c2eebf0cf42c9f992fdc992e2912ddaab59712c13a798243c4f81727c04ef8e0993773686ab0c682e41726a2bcad962b  musl-mode_t.patch
 57479b51c821f880c2fc6d50ac59a3f9c2dc49a1da509e643a4e3f93491fb50220b97cacf0c09943b5b3b9cce531a3d5d11b8d0d146aa06ef21c1acb139cb193  musl-mktime.patch
 ed393b476a679ebc8f130e34826958a30aa98dc7ac77c0c324a486cc3ed8539584552a305e2ddcb810626c6ab3478e634c77762395e2560abc935cd18e882beb  musl-stdout_stderr.patch
 d5305df362df7db3b882cb491d32d11f479d1d56b21a39bc5e0cbdf7cdf70341eb566e7374bb9acc6d4fa1db027d4f009857fed21ef48ed311efaaa1be7b6329  musl-_nl_msg_cat_cntr.patch
 8278c469def65e58cb2aee039882d1d237b4b404386472f9540da11a1d3cddd60dda08a99074f9f418b328ce2c4ac73d3190a74a6fe3e00eab9adb4fed87a4ec  musl-__isleap.patch
 8bc2b42bbee927ce88f77e71a9594da3b6e54e92008e5603c6d8db35b3ec37add456bcc52d7d6a913c69a395c73bd3f6a3934ea549d4cc0097cb65613f61ed48  musl-types.patch
-03fba131b3beca83cbe9432c4d297757dfa0d3f6172690c361860c19feae48b96fba625238118e5c3eec55385ab4b85faf6143507f3d12171a6870dc65844ed3  musl-boost.patch
+a0c25dc1cc7ec1cc512f41302ecd293b2207902a79b9d2ee3b92585d1aab554f5c0546add8fb12ad3b5936636f3a86516287ac1667122c6045f5ef33fcbfc14b  musl-boost.patch
 719c0dbc8c9c008928a496184a7d22d08afd25ababede62d73bf4df09d32e3f1ca92cab4437d73b183f9faefdfeeab69ec324ed4d3d0ce6c7647d85ef8bfb653  remove-systemd.patch
-2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f3456bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d  fix-poll_h.patch"
+2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f3456bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d  fix-poll_h.patch
+11627af9713013dfc4cbdca5a5be644cd49fe205edcaa6eaf64507903edd241f262e40e97a091b0f8ee3b495fe2c8fb904e4dbcc0e4e5bfabcc16c66654f561b  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
  
  snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
--snapperd_LDFLAGS = -lboost_system -lboost_thread
-+snapperd_LDFLAGS = -lboost_system-mt -lboost_thread-mt
+-snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
++snapperd_LDFLAGS = -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.patch
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
+ 
+ libdbus_la_LIBADD = $(DBUS_LIBS)
+-libdbus_la_LDFLAGS = -lboost_system -lboost_thread
++libdbus_la_LDFLAGS = -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 >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE
+-#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
  	char buf1[100];
- 	if (strerror_r(errno, buf1, sizeof(buf1)-1) == 0)
+ 	if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
  	    return string(buf1);
  	return string("strerror failed");
 -#else
 -	char buf1[100];
--	const char* buf2 = strerror_r(errno, buf1, sizeof(buf1)-1);
+-	const char* buf2 = strerror_r(errnum, buf1, sizeof(buf1) - 1);
 -	return string(buf2);
 -#endif
      }
-- 
2.20.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---