From 3002228557c336074fda050b7bbf188b11b9804c Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Tue, 20 Apr 2021 18:20:02 +0300 Subject: [PATCH] snapper: update to 0.9.0; adopt --- .../patches/0001-disable-locale-tests.patch | 29 ++-- .../0002-backport-equal-date-test.patch | 164 ------------------ .../patches/0002-fix-32bit-musl-build.patch | 13 ++ .../0003-backport-fix-jsonc-linkage.patch | 19 -- srcpkgs/snapper/template | 6 +- 5 files changed, 35 insertions(+), 196 deletions(-) delete mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch create mode 100644 srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch delete mode 100644 srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch index 05e589dbfc5d..834ffdeffcbb 100644 --- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch +++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch @@ -1,27 +1,28 @@ -These 4 tests fail with error: -std::runtime_error: locale::facet::_S_create_c_locale name not valid - diff --git testsuite/Makefile.am testsuite/Makefile.am -index d7e30b8..001f834 100644 +index ccb84d3..9774a9c 100644 --- testsuite/Makefile.am +++ testsuite/Makefile.am -@@ -7,8 +7,8 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) +@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ -- equal-date.test dbus-escape.test cmp-lt.test humanstring.test \ +- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \ - table.test table-formatter.test csv-formatter.test json-formatter.test \ -+ equal-date.test dbus-escape.test \ +- getopts.test scan-datetime.test root-prefix.test range.test limit.test ++ equal-date.test dbus-escape.test uuid.test \ + csv-formatter.test json-formatter.test \ - getopts.test ++ getopts.test scan-datetime.test root-prefix.test if ENABLE_BTRFS_QUOTA -@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt + check_PROGRAMS += qgroup1.test +@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la -humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - + uuid_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + -table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - -table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la @@ -29,3 +30,11 @@ index d7e30b8..001f834 100644 csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS) +@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils + getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la +- +-range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la +- +-limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch deleted file mode 100644 index 688ab7e1f27d..000000000000 --- a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git package/snapper.changes package/snapper.changes -index 9235de3..5570cf1 100644 ---- package/snapper.changes -+++ package/snapper.changes -@@ -1,3 +1,8 @@ -+------------------------------------------------------------------- -+Mon Jan 25 11:29:45 CET 2021 - aschnell@suse.com -+ -+- fixed testsuite for equal-date (gh#openSUSE/snapper#526) -+ - ------------------------------------------------------------------- - Thu Dec 17 12:20:59 CET 2020 - aschnell@suse.com - -diff --git testsuite/Makefile.am testsuite/Makefile.am -index d7e30b8..cfd1002 100644 ---- testsuite/Makefile.am -+++ testsuite/Makefile.am -@@ -9,7 +9,7 @@ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework - check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ - equal-date.test dbus-escape.test \ - csv-formatter.test json-formatter.test \ -- getopts.test -+ getopts.test scan-datetime.test - - if ENABLE_BTRFS_QUOTA - check_PROGRAMS += qgroup1.test -@@ -27,6 +27,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt - - equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - -+scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la -+ - csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - - json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS) -diff --git testsuite/equal-date.cc testsuite/equal-date.cc -index 42e00d8..8d8eda8 100644 ---- testsuite/equal-date.cc -+++ testsuite/equal-date.cc -@@ -5,18 +5,25 @@ - #include - - #include "../client/utils/equal-date.h" -+#include "../snapper/AppUtil.h" -+ -+using namespace snapper; - - - bool - equal_week(const char* s1, const char* s2) - { -+ // use interim time_t since strptime on musl does not set tm_yday -+ -+ time_t t1 = scan_datetime(s1, true); - struct tm tmp1; - memset(&tmp1, 0, sizeof(tmp1)); -- strptime(s1, "%Y-%m-%d", &tmp1); -+ gmtime_r(&t1, &tmp1); - -+ time_t t2 = scan_datetime(s2, true); - struct tm tmp2; - memset(&tmp2, 0, sizeof(tmp2)); -- strptime(s2, "%Y-%m-%d", &tmp2); -+ gmtime_r(&t2, &tmp2); - - return equal_week(tmp1, tmp2); - } -@@ -25,46 +32,46 @@ equal_week(const char* s1, const char* s2) - BOOST_AUTO_TEST_CASE(test1) - { - // 2012 is a leap year -- BOOST_CHECK(equal_week("2011-12-31", "2012-01-01")); -- BOOST_CHECK(equal_week("2012-01-01", "2011-12-31")); -+ BOOST_CHECK(equal_week("2011-12-31 00:00:00", "2012-01-01 00:00:00")); -+ BOOST_CHECK(equal_week("2012-01-01 00:00:00", "2011-12-31 00:00:00")); - } - - - BOOST_AUTO_TEST_CASE(test2) - { - // 2012 is a leap year -- BOOST_CHECK(equal_week("2012-12-31", "2013-01-01")); -- BOOST_CHECK(equal_week("2013-01-01", "2012-12-31")); -+ BOOST_CHECK(equal_week("2012-12-31 00:00:00", "2013-01-01 00:00:00")); -+ BOOST_CHECK(equal_week("2013-01-01 00:00:00", "2012-12-31 00:00:00")); - } - - - BOOST_AUTO_TEST_CASE(test3) - { - // Saturday and Sunday -- BOOST_CHECK(equal_week("2014-01-04", "2014-01-05")); -- BOOST_CHECK(equal_week("2014-01-05", "2014-01-04")); -+ BOOST_CHECK(equal_week("2014-01-04 00:00:00", "2014-01-05 00:00:00")); -+ BOOST_CHECK(equal_week("2014-01-05 00:00:00", "2014-01-04 00:00:00")); - - // Sunday and Monday -- BOOST_CHECK(!equal_week("2014-01-05", "2014-01-06")); -- BOOST_CHECK(!equal_week("2014-01-06", "2014-01-05")); -+ BOOST_CHECK(!equal_week("2014-01-05 00:00:00", "2014-01-06 00:00:00")); -+ BOOST_CHECK(!equal_week("2014-01-06 00:00:00", "2014-01-05 00:00:00")); - - // Monday and Tuesday -- BOOST_CHECK(equal_week("2014-01-06", "2014-01-07")); -- BOOST_CHECK(equal_week("2014-01-07", "2014-01-06")); -+ BOOST_CHECK(equal_week("2014-01-06 00:00:00", "2014-01-07 00:00:00")); -+ BOOST_CHECK(equal_week("2014-01-07 00:00:00", "2014-01-06 00:00:00")); - } - - - BOOST_AUTO_TEST_CASE(test4) - { - // 2014-12-31 is a Wednesday, 2015-01-01 is a Thursday -- BOOST_CHECK(equal_week("2014-12-31", "2015-01-01")); -- BOOST_CHECK(equal_week("2015-01-01", "2014-12-31")); -+ BOOST_CHECK(equal_week("2014-12-31 00:00:00", "2015-01-01 00:00:00")); -+ BOOST_CHECK(equal_week("2015-01-01 00:00:00", "2014-12-31 00:00:00")); - } - - - BOOST_AUTO_TEST_CASE(test5) - { - // 2017-12-31 is a Sunday, 2018-01-01 is a Monday -- BOOST_CHECK(!equal_week("2017-12-31", "2018-01-01")); -- BOOST_CHECK(!equal_week("2018-01-01", "2017-12-31")); -+ BOOST_CHECK(!equal_week("2017-12-31 00:00:00", "2018-01-01 00:00:00")); -+ BOOST_CHECK(!equal_week("2018-01-01 00:00:00", "2017-12-31 00:00:00")); - } -diff --git testsuite/scan-datetime.cc testsuite/scan-datetime.cc -new file mode 100644 -index 0000000..8f0d1c0 ---- /dev/null -+++ testsuite/scan-datetime.cc -@@ -0,0 +1,30 @@ -+ -+#define BOOST_TEST_DYN_LINK -+#define BOOST_TEST_MODULE snapper -+ -+#include -+ -+#include "../snapper/AppUtil.h" -+ -+using namespace snapper; -+ -+ -+BOOST_AUTO_TEST_CASE(test1) -+{ -+ time_t t1 = scan_datetime("2020-03-04 12:34:56", true); -+ -+ struct tm tmp1; -+ memset(&tmp1, 0, sizeof(tmp1)); -+ gmtime_r(&t1, &tmp1); -+ -+ BOOST_CHECK_EQUAL(tmp1.tm_year, 2020 - 1900); -+ BOOST_CHECK_EQUAL(tmp1.tm_mon, 3 - 1); -+ BOOST_CHECK_EQUAL(tmp1.tm_mday, 4); -+ -+ BOOST_CHECK_EQUAL(tmp1.tm_yday, 31 + 28 + 4); -+ BOOST_CHECK_EQUAL(tmp1.tm_wday, 3); -+ -+ BOOST_CHECK_EQUAL(tmp1.tm_hour, 12); -+ BOOST_CHECK_EQUAL(tmp1.tm_min, 34); -+ BOOST_CHECK_EQUAL(tmp1.tm_sec, 56); -+} diff --git a/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch new file mode 100644 index 000000000000..41eb8053a62d --- /dev/null +++ b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch @@ -0,0 +1,13 @@ +diff --git client/cleanup.cc client/cleanup.cc +index 801c0f5..e57a0a8 100644 +--- client/cleanup.cc ++++ client/cleanup.cc +@@ -51,7 +51,7 @@ struct Parameters + MinFreeLimit free_limit; + + +- void read(const ProxyConfig& config, const char* name, long int& value) ++ void read(const ProxyConfig& config, const char* name, time_t& value) + { + const map& raw = config.getAllValues(); + map::const_iterator pos = raw.find(name); diff --git a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch deleted file mode 100644 index 2582dfb1d87c..000000000000 --- a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch fixes the issue, that the build doesn't link against json-c -when --disable-zypp flag is enabled. -See openSUSE/snapper#617 - -diff --git configure.ac configure.ac -index 839d012..06e4721 100644 ---- configure.ac -+++ configure.ac -@@ -194,9 +194,7 @@ fi - - PKG_CHECK_MODULES(DBUS, dbus-1) - PKG_CHECK_MODULES(XML2, libxml-2.0) --if test "x$with_zypp" = "xyes"; then -- PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) --fi -+PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) - - AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])]) - diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 481f94c13c5e..bd58ab951c24 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,6 +1,6 @@ # Template file for 'snapper' pkgname=snapper -version=0.8.15 +version=0.9.0 revision=1 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" @@ -13,11 +13,11 @@ makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel json-c-devel" depends="dbus" short_desc="Tool for Linux filesystem snapshot management" -maintainer="Orphaned " +maintainer="FollieHiyuki " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2 +checksum=ca7b17d0213aa5281ff08d968b4e029b78bb3870eb79fd7bc7f879b17f5c969e lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ]