* [PR PATCH] snapper: update to 0.8.15
@ 2021-01-24 20:18 FollieHiyuki
2021-01-24 20:21 ` FollieHiyuki
` (37 more replies)
0 siblings, 38 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-24 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
There is a new pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 6205 bytes --]
From 70ec6a6501bf9aa1d500e0d00004a5d58aa314a5 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../snapper/patches/0001-musl-sterror_r.patch | 26 ------------------
.../snapper/patches/0002-musl-mktime.patch | 26 ------------------
.../patches/0004-musl-stdout_stderr.patch | 26 ------------------
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 -------------------
srcpkgs/snapper/template | 15 +++++------
5 files changed, 6 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..5ae53b8c25f 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
configure_args="--disable-zypp --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
@@ -9,23 +9,20 @@ make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS="-lintl -ljson-c"
esac
pre_configure() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
@ 2021-01-24 20:21 ` FollieHiyuki
2021-01-24 20:33 ` [PR PATCH] [Updated] " FollieHiyuki
` (36 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-24 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766425390
Comment:
Taken over from #28151. Got it built on my machine (x86-64-musl), but it fails tests. Otherwise it works and needs some testings.
There is a `--disable-systemd` flag for configure. Should we enable that?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
2021-01-24 20:21 ` FollieHiyuki
@ 2021-01-24 20:33 ` FollieHiyuki
2021-01-25 2:20 ` FollieHiyuki
` (35 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-24 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 6218 bytes --]
From 48e9f846d2ab487fd7e0eb88edbeeacf4f395461 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../snapper/patches/0001-musl-sterror_r.patch | 26 ------------------
.../snapper/patches/0002-musl-mktime.patch | 26 ------------------
.../patches/0004-musl-stdout_stderr.patch | 26 ------------------
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 -------------------
srcpkgs/snapper/template | 16 +++++------
5 files changed, 7 insertions(+), 114 deletions(-)
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..b0137e9204d 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
configure_args="--disable-zypp --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
@@ -9,23 +9,21 @@ make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
+LDFLAGS="-ljson-c"
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS+=" -lintl"
esac
pre_configure() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
2021-01-24 20:21 ` FollieHiyuki
2021-01-24 20:33 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-01-25 2:20 ` FollieHiyuki
2021-01-25 2:21 ` FollieHiyuki
` (34 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 6482 bytes --]
From 8ac19587b7aab2228f909272ac975be5524c2fbd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../snapper/patches/0001-musl-sterror_r.patch | 26 ------------------
.../snapper/patches/0002-musl-mktime.patch | 26 ------------------
.../patches/0004-musl-stdout_stderr.patch | 26 ------------------
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 -------------------
srcpkgs/snapper/template | 21 +++++++--------
5 files changed, 9 insertions(+), 117 deletions(-)
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..83811bf6b2c 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,31 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
+LDFLAGS="-ljson-c"
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS+=" -lintl"
esac
pre_configure() {
@@ -43,8 +42,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (2 preceding siblings ...)
2021-01-25 2:20 ` FollieHiyuki
@ 2021-01-25 2:21 ` FollieHiyuki
2021-01-25 3:47 ` FollieHiyuki
` (33 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 2:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766425390
Comment:
Taken over from #28151. Got it built on my machine (x86-64-musl), but it fails tests. Otherwise it works and needs some testings.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (3 preceding siblings ...)
2021-01-25 2:21 ` FollieHiyuki
@ 2021-01-25 3:47 ` FollieHiyuki
2021-01-25 4:01 ` FollieHiyuki
` (32 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 3:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766425390
Comment:
Got it built on my machine (x86-64-musl), but it fails locale tests. Otherwise it works and needs some testings.
Seems to fix openSUSE/snapper#474 which is happening with our current 0.8.14.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (4 preceding siblings ...)
2021-01-25 3:47 ` FollieHiyuki
@ 2021-01-25 4:01 ` FollieHiyuki
2021-01-25 4:29 ` FollieHiyuki
` (31 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 4:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766425390
Comment:
Got it built on my machine (x86-64-musl), but it fails locale tests. Otherwise it works and needs some testings.
Seems to fix openSUSE/snapper#474 which is happening with our current 0.8.14.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (5 preceding siblings ...)
2021-01-25 4:01 ` FollieHiyuki
@ 2021-01-25 4:29 ` FollieHiyuki
2021-01-25 4:34 ` FollieHiyuki
` (30 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 4:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766532041
Comment:
This update seems to fix openSUSE/snapper#474 which is happening for our current 0.8.14, but I'm not so sure. Testers are welcome.
According to openSUSE/snapper#526, the last 4 tests fail because of locale vars in our build environment.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (6 preceding siblings ...)
2021-01-25 4:29 ` FollieHiyuki
@ 2021-01-25 4:34 ` FollieHiyuki
2021-01-25 4:37 ` FollieHiyuki
` (29 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 4:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766532041
Comment:
This update seems to fix openSUSE/snapper#474 which is happening for our current 0.8.14, but I'm not so sure. Testers are welcome.
According to openSUSE/snapper#526, the last 4 tests fail because of missing locale vars in our build environment.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (7 preceding siblings ...)
2021-01-25 4:34 ` FollieHiyuki
@ 2021-01-25 4:37 ` FollieHiyuki
2021-01-25 8:08 ` FollieHiyuki
` (28 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 4:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766532041
Comment:
This update seems to fix openSUSE/snapper#474 which is happening for our current 0.8.14, but I'm not so sure. Testers are welcome.
According to openSUSE/snapper#526, the last 4 tests fail because of missing locales in our build environment.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (8 preceding siblings ...)
2021-01-25 4:37 ` FollieHiyuki
@ 2021-01-25 8:08 ` FollieHiyuki
2021-01-25 13:24 ` ericonr
` (27 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 8:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766532041
Comment:
According to openSUSE/snapper#526, the last 4 tests fail because of missing locales in our build environment.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (9 preceding siblings ...)
2021-01-25 8:08 ` FollieHiyuki
@ 2021-01-25 13:24 ` ericonr
2021-01-25 19:05 ` [PR PATCH] [Updated] " FollieHiyuki
` (26 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-25 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-766813495
Comment:
Backporting https://github.com/openSUSE/snapper/pull/621 seems reasonable, I think.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (10 preceding siblings ...)
2021-01-25 13:24 ` ericonr
@ 2021-01-25 19:05 ` FollieHiyuki
2021-01-25 19:13 ` FollieHiyuki
` (25 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 12538 bytes --]
From 4c8306312767de49726b138af747363939b26bcc Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../snapper/patches/0001-musl-sterror_r.patch | 26 ---
.../snapper/patches/0002-musl-mktime.patch | 26 ---
.../patches/0004-musl-stdout_stderr.patch | 26 ---
.../backport_equal-date_testsuite.patch | 164 ++++++++++++++++++
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 ---
srcpkgs/snapper/template | 21 +--
6 files changed, 173 insertions(+), 117 deletions(-)
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
create mode 100644 srcpkgs/snapper/patches/backport_equal-date_testsuite.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/backport_equal-date_testsuite.patch b/srcpkgs/snapper/patches/backport_equal-date_testsuite.patch
new file mode 100644
index 00000000000..b8c967d8632
--- /dev/null
+++ b/srcpkgs/snapper/patches/backport_equal-date_testsuite.patch
@@ -0,0 +1,164 @@
+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 cmp-lt.test humanstring.test \
+ table.test table-formatter.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
++
+ humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+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 <boost/test/unit_test.hpp>
+
+ #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 <boost/test/unit_test.hpp>
++
++#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/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..83811bf6b2c 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,31 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
+LDFLAGS="-ljson-c"
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS+=" -lintl"
esac
pre_configure() {
@@ -43,8 +42,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (11 preceding siblings ...)
2021-01-25 19:05 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-01-25 19:13 ` FollieHiyuki
2021-01-28 4:46 ` ericonr
` (24 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-25 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-767047691
Comment:
Patch added.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (12 preceding siblings ...)
2021-01-25 19:13 ` FollieHiyuki
@ 2021-01-28 4:46 ` ericonr
2021-01-28 16:15 ` FollieHiyuki
` (23 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 4:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-768796685
Comment:
There is still a failing test, do you think it's simple to at least disable it?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (13 preceding siblings ...)
2021-01-28 4:46 ` ericonr
@ 2021-01-28 16:15 ` FollieHiyuki
2021-01-28 19:23 ` [PR PATCH] [Updated] " FollieHiyuki
` (22 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-769196878
Comment:
We can patch the Makefile to not run those 4 tests, I think.
Will try.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (14 preceding siblings ...)
2021-01-28 16:15 ` FollieHiyuki
@ 2021-01-28 19:23 ` FollieHiyuki
2021-01-28 19:34 ` FollieHiyuki
` (21 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 19:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 14153 bytes --]
From fa81b36198c2d4e0a0aa4f315a0175f7402f8138 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../patches/0001-disable-locale-tests.patch | 28 +++
.../snapper/patches/0001-musl-sterror_r.patch | 26 ---
.../0002-backport-equal-date-test.patch | 164 ++++++++++++++++++
.../snapper/patches/0002-musl-mktime.patch | 26 ---
.../patches/0004-musl-stdout_stderr.patch | 26 ---
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 ---
srcpkgs/snapper/template | 21 +--
7 files changed, 201 insertions(+), 117 deletions(-)
create mode 100644 srcpkgs/snapper/patches/0001-disable-locale-tests.patch
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
create mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
new file mode 100644
index 00000000000..9b35899c99e
--- /dev/null
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -0,0 +1,28 @@
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..001f834 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -7,8 +7,8 @@ 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 \
+- table.test table-formatter.test csv-formatter.test json-formatter.test \
++ equal-date.test dbus-escape.test \
++ csv-formatter.test json-formatter.test \
+ getopts.test
+
+ if ENABLE_BTRFS_QUOTA
+@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+-humanstring_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
+-
+ 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 a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
new file mode 100644
index 00000000000..5c0842c4a30
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
@@ -0,0 +1,164 @@
+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
++
+ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
+
+ getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+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 <boost/test/unit_test.hpp>
+
+ #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 <boost/test/unit_test.hpp>
++
++#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-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..83811bf6b2c 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,31 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
+LDFLAGS="-ljson-c"
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS+=" -lintl"
esac
pre_configure() {
@@ -43,8 +42,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (15 preceding siblings ...)
2021-01-28 19:23 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-01-28 19:34 ` FollieHiyuki
2021-01-28 19:38 ` FollieHiyuki
` (20 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 14159 bytes --]
From 035227163e411d068fc8efa8df07bfed5a7588e1 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../patches/0001-disable-locale-tests.patch | 28 +++
.../snapper/patches/0001-musl-sterror_r.patch | 26 ---
.../0002-backport-equal-date-test.patch | 164 ++++++++++++++++++
.../snapper/patches/0002-musl-mktime.patch | 26 ---
.../patches/0004-musl-stdout_stderr.patch | 26 ---
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 ---
srcpkgs/snapper/template | 21 +--
7 files changed, 201 insertions(+), 117 deletions(-)
create mode 100644 srcpkgs/snapper/patches/0001-disable-locale-tests.patch
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
create mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
new file mode 100644
index 00000000000..9b35899c99e
--- /dev/null
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -0,0 +1,28 @@
+diff --git testsuite/Makefile.am testsuite/Makefile.am
+index d7e30b8..001f834 100644
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -7,8 +7,8 @@ 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 \
+- table.test table-formatter.test csv-formatter.test json-formatter.test \
++ equal-date.test dbus-escape.test \
++ csv-formatter.test json-formatter.test \
+ getopts.test
+
+ if ENABLE_BTRFS_QUOTA
+@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+-humanstring_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
+-
+ 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 a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
new file mode 100644
index 00000000000..688ab7e1f27
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
@@ -0,0 +1,164 @@
+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 <boost/test/unit_test.hpp>
+
+ #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 <boost/test/unit_test.hpp>
++
++#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-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..83811bf6b2c 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,31 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
+LDFLAGS="-ljson-c"
case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+ *-musl)
makedepends+=" gettext-devel"
- LDFLAGS="-lintl"
+ LDFLAGS+=" -lintl"
esac
pre_configure() {
@@ -43,8 +42,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (16 preceding siblings ...)
2021-01-28 19:34 ` FollieHiyuki
@ 2021-01-28 19:38 ` FollieHiyuki
2021-01-28 20:03 ` [PR REVIEW] " ericonr
` (19 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#issuecomment-769325479
Comment:
I added a patch to disable running those tests
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (17 preceding siblings ...)
2021-01-28 19:38 ` FollieHiyuki
@ 2021-01-28 20:03 ` ericonr
2021-01-28 20:03 ` ericonr
` (18 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 256 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566371900
Comment:
Could you try exporting `LIBS="-lintl"` only for musl? Having to put `-ljson-c` there explicitly seems wrong.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (18 preceding siblings ...)
2021-01-28 20:03 ` [PR REVIEW] " ericonr
@ 2021-01-28 20:03 ` ericonr
2021-01-28 20:03 ` ericonr
` (17 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566372552
Comment:
Any idea why these fail?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (19 preceding siblings ...)
2021-01-28 20:03 ` ericonr
@ 2021-01-28 20:03 ` ericonr
2021-01-28 20:21 ` FollieHiyuki
` (16 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566372210
Comment:
And if possible switch to `"$XBPS_TARGET_LIBC" = musl`
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (20 preceding siblings ...)
2021-01-28 20:03 ` ericonr
@ 2021-01-28 20:21 ` FollieHiyuki
2021-01-28 20:23 ` FollieHiyuki
` (15 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566382708
Comment:
Here is the error (for all 4 of them):
`std::runtime_error: locale::facet::_S_create_c_locale name not valid`
Honestly I have no idea
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (21 preceding siblings ...)
2021-01-28 20:21 ` FollieHiyuki
@ 2021-01-28 20:23 ` FollieHiyuki
2021-01-28 20:25 ` ericonr
` (14 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566383702
Comment:
At first I thought we didnt need to link against json-c, since `pkg-config` is a dependency. But the build fails without it for some reason
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (22 preceding siblings ...)
2021-01-28 20:23 ` FollieHiyuki
@ 2021-01-28 20:25 ` ericonr
2021-01-28 20:25 ` ericonr
` (13 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566384509
Comment:
Ah, that's a libstdc++ on musl thingy. Thanks. I will try to get them worked out upstream. Could you include the error string above the patch?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (23 preceding siblings ...)
2021-01-28 20:25 ` ericonr
@ 2021-01-28 20:25 ` ericonr
2021-01-28 20:27 ` FollieHiyuki
` (12 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566384796
Comment:
Alternatively, try doing `do_check() { LANG=C make check }`
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (24 preceding siblings ...)
2021-01-28 20:25 ` ericonr
@ 2021-01-28 20:27 ` FollieHiyuki
2021-01-28 21:11 ` FollieHiyuki
` (11 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566385446
Comment:
Yes will do after I tinker with json-c
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (25 preceding siblings ...)
2021-01-28 20:27 ` FollieHiyuki
@ 2021-01-28 21:11 ` FollieHiyuki
2021-01-28 21:12 ` FollieHiyuki
` (10 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566409122
Comment:
Exporting `LANG=C` doesn't work, so I will keep the patch
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (26 preceding siblings ...)
2021-01-28 21:11 ` FollieHiyuki
@ 2021-01-28 21:12 ` FollieHiyuki
2021-01-28 21:14 ` FollieHiyuki
` (9 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566409789
Comment:
Found the issue. Snapper doesn't link to json-c if `--disable-zypp` is enabled. I will backport openSUSE/snapper#617 as well
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (27 preceding siblings ...)
2021-01-28 21:12 ` FollieHiyuki
@ 2021-01-28 21:14 ` FollieHiyuki
2021-01-28 21:20 ` ericonr
` (8 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566383702
Comment:
At first I thought we didnt need to link against json-c, since `pkg-config` is a dependency. But the build fails without it for some reason
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (28 preceding siblings ...)
2021-01-28 21:14 ` FollieHiyuki
@ 2021-01-28 21:20 ` ericonr
2021-01-28 21:21 ` ericonr
` (7 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 21:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566414689
Comment:
Wonderful
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (29 preceding siblings ...)
2021-01-28 21:20 ` ericonr
@ 2021-01-28 21:21 ` ericonr
2021-01-28 21:40 ` [PR PATCH] [Updated] " FollieHiyuki
` (6 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566415141
Comment:
Hm, shame. It had been enough to fix `qpdf`, whose test suite had similar issues.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (30 preceding siblings ...)
2021-01-28 21:21 ` ericonr
@ 2021-01-28 21:40 ` FollieHiyuki
2021-01-28 21:46 ` [PR REVIEW] " FollieHiyuki
` (5 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages snapper
https://github.com/void-linux/void-packages/pull/28192
snapper: update to 0.8.15
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28192.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapper-28192.patch --]
[-- Type: text/x-diff, Size: 15430 bytes --]
From fa9d2756526eecab726891b3d8223a0f84b00f2d Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sun, 24 Jan 2021 23:13:06 +0300
Subject: [PATCH] snapper: update to 0.8.15
---
.../patches/0001-disable-locale-tests.patch | 31 ++++
.../snapper/patches/0001-musl-sterror_r.patch | 26 ---
.../0002-backport-equal-date-test.patch | 164 ++++++++++++++++++
.../snapper/patches/0002-musl-mktime.patch | 26 ---
.../0003-backport-fix-jsonc-linkage.patch | 19 ++
.../patches/0004-musl-stdout_stderr.patch | 26 ---
srcpkgs/snapper/patches/musl_u_int-type.patch | 27 ---
srcpkgs/snapper/template | 22 +--
8 files changed, 223 insertions(+), 118 deletions(-)
create mode 100644 srcpkgs/snapper/patches/0001-disable-locale-tests.patch
delete mode 100644 srcpkgs/snapper/patches/0001-musl-sterror_r.patch
create mode 100644 srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
delete mode 100644 srcpkgs/snapper/patches/0002-musl-mktime.patch
create mode 100644 srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
delete mode 100644 srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
delete mode 100644 srcpkgs/snapper/patches/musl_u_int-type.patch
diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
new file mode 100644
index 00000000000..05e589dbfc5
--- /dev/null
+++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -0,0 +1,31 @@
+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
+--- testsuite/Makefile.am
++++ testsuite/Makefile.am
+@@ -7,8 +7,8 @@ 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 \
+- table.test table-formatter.test csv-formatter.test json-formatter.test \
++ equal-date.test dbus-escape.test \
++ csv-formatter.test json-formatter.test \
+ getopts.test
+
+ if ENABLE_BTRFS_QUOTA
+@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
+
+ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+-humanstring_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
+-
+ 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 a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch b/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
deleted file mode 100644
index 3bd9be5872e..00000000000
--- a/srcpkgs/snapper/patches/0001-musl-sterror_r.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a4068f03b471777151c4eb43fc70c3b6ebf8df3a Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:23:38 -0600
-Subject: [PATCH 1/4] musl-sterror_r
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 553065c..2897276 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -223,7 +223,7 @@ namespace snapper
- string
- stringerror(int errnum)
- {
--#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
-+#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
- char buf1[100];
- if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
- return string(buf1);
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
new file mode 100644
index 00000000000..688ab7e1f27
--- /dev/null
+++ b/srcpkgs/snapper/patches/0002-backport-equal-date-test.patch
@@ -0,0 +1,164 @@
+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 <boost/test/unit_test.hpp>
+
+ #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 <boost/test/unit_test.hpp>
++
++#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-musl-mktime.patch b/srcpkgs/snapper/patches/0002-musl-mktime.patch
deleted file mode 100644
index 25850a519a3..00000000000
--- a/srcpkgs/snapper/patches/0002-musl-mktime.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6385e34fb13dbfabd0b4b93f7670eac0c490637f Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:24:08 -0600
-Subject: [PATCH 2/4] musl-mktime
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/AppUtil.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snapper/AppUtil.cc b/snapper/AppUtil.cc
-index 2897276..64812d7 100644
---- snapper/AppUtil.cc
-+++ snapper/AppUtil.cc
-@@ -288,7 +288,7 @@ namespace snapper
- const char* p = strptime(str.c_str(), "%F %T", &s);
- if (!p || *p != '\0')
- return (time_t)(-1);
-- return utc ? timegm(&s) : timelocal(&s);
-+ return utc ? timegm(&s) : mktime(&s);
- }
-
-
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
new file mode 100644
index 00000000000..2582dfb1d87
--- /dev/null
+++ b/srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch
@@ -0,0 +1,19 @@
+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/patches/0004-musl-stdout_stderr.patch b/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
deleted file mode 100644
index 0524aa1c0fb..00000000000
--- a/srcpkgs/snapper/patches/0004-musl-stdout_stderr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d519c3c94a029d6891b0703ce5adb6ea0ac8b9fa Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:27:17 -0600
-Subject: [PATCH 4/4] musl-stdout_stderr
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- snapper/SystemCmd.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
-index 3d38604..72bbb2b 100644
---- snapper/SystemCmd.h
-+++ snapper/SystemCmd.h
-@@ -32,6 +32,8 @@
- #include <list>
- #include <boost/noncopyable.hpp>
-
-+#undef stdout
-+#undef stderr
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/patches/musl_u_int-type.patch b/srcpkgs/snapper/patches/musl_u_int-type.patch
deleted file mode 100644
index 66cb63b2f12..00000000000
--- a/srcpkgs/snapper/patches/musl_u_int-type.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7ddd58ee5e6b7c3a8df3086ff5a6d17d19362761 Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 18 Dec 2019 18:35:55 -0600
-Subject: [PATCH] musl-_u_int-types
-
-Signed-off-by: Nathan Owens <ndowens04@gmail.com>
----
- client/utils/JsonFormatter.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git client/utils/JsonFormatter.h client/utils/JsonFormatter.h
-index 79f7672..501b77d 100644
---- client/utils/JsonFormatter.h
-+++ client/utils/JsonFormatter.h
-@@ -25,6 +25,9 @@
- #include <string>
- #include <vector>
- #include <utility>
-+#ifndef __GLIBC__
-+#include <sys/types.h>
-+#endif
-
- namespace snapper
- {
---
-2.24.1
-
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index 292cfed6a19..481f94c13c5 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,32 +1,30 @@
# Template file for 'snapper'
pkgname=snapper
-version=0.8.14
-revision=2
+version=0.8.15
+revision=1
build_style=gnu-configure
-configure_args="--disable-zypp --with-conf=/etc/conf.d"
+configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
make_dirs="/etc/snapper/configs 0755 root root"
hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt
gettext pkg-config"
makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
- libmount-devel libxml2-devel pam-devel"
+ libmount-devel libxml2-devel pam-devel ncurses-devel ncurses-libtinfo-devel
+ json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
-checksum=d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6
+checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
lib32disabled=yes
-case "$XBPS_TARGET_MACHINE" in
- *-musl) # We define MUSL_LIBC to pick the correct return type
- # for strerror_r(2) which is int (XSI-compliant)
- CXXFLAGS="-DMUSL_LIBC=1"
- # We also link against libintl
+if [ "$XBPS_TARGET_LIBC" = musl ]
+then
makedepends+=" gettext-devel"
LDFLAGS="-lintl"
-esac
+fi
pre_configure() {
# rename cron scripts
@@ -43,8 +41,6 @@ pre_configure() {
post_install() {
vinstall data/sysconfig.snapper 644 etc/conf.d snapper
vsv snapperd
-
- rm -rf -- "${DESTDIR}"/usr/lib/systemd
}
libsnapper_package() {
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (31 preceding siblings ...)
2021-01-28 21:40 ` [PR PATCH] [Updated] " FollieHiyuki
@ 2021-01-28 21:46 ` FollieHiyuki
2021-01-28 21:53 ` FollieHiyuki
` (4 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566385446
Comment:
Yes will do after I tinker with json-c
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (32 preceding siblings ...)
2021-01-28 21:46 ` [PR REVIEW] " FollieHiyuki
@ 2021-01-28 21:53 ` FollieHiyuki
2021-01-28 21:53 ` FollieHiyuki
` (3 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566432269
Comment:
I believe this issue doesn't happen on musl alone. CI failed for x86-64 and i386 as well.
I can't test locally on those archs sadly to confirm.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (33 preceding siblings ...)
2021-01-28 21:53 ` FollieHiyuki
@ 2021-01-28 21:53 ` FollieHiyuki
2021-01-28 22:11 ` ericonr
` (2 subsequent siblings)
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566432269
Comment:
I believe this issue doesn't happen on musl alone. CI failed for x86-64 and i386 as well.
I can't test locally on those archs to confirm.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (34 preceding siblings ...)
2021-01-28 21:53 ` FollieHiyuki
@ 2021-01-28 22:11 ` ericonr
2021-01-28 23:10 ` FollieHiyuki
2021-01-31 2:12 ` [PR PATCH] [Merged]: " ericonr
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-28 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566441979
Comment:
You can make a masterdir for `x86_64` with `./xbps-src binary-bootstrap x86_64`.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (35 preceding siblings ...)
2021-01-28 22:11 ` ericonr
@ 2021-01-28 23:10 ` FollieHiyuki
2021-01-31 2:12 ` [PR PATCH] [Merged]: " ericonr
37 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-28 23:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New review comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28192#discussion_r566470125
Comment:
Thanks. Those tests fail locally in x86_64 masterdir for me.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Merged]: snapper: update to 0.8.15
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
` (36 preceding siblings ...)
2021-01-28 23:10 ` FollieHiyuki
@ 2021-01-31 2:12 ` ericonr
37 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-31 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]
There's a merged pull request on the void-packages repository
snapper: update to 0.8.15
https://github.com/void-linux/void-packages/pull/28192
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15.
2021-01-24 16:10 [PR PATCH] " ailiop-git
` (2 preceding siblings ...)
2021-01-24 20:07 ` FollieHiyuki
@ 2021-01-24 20:21 ` ericonr
3 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-24 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28151#issuecomment-766425379
Comment:
Superseded by #28192
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15.
2021-01-24 16:10 [PR PATCH] " ailiop-git
2021-01-24 17:56 ` ericonr
2021-01-24 17:57 ` ericonr
@ 2021-01-24 20:07 ` FollieHiyuki
2021-01-24 20:21 ` ericonr
3 siblings, 0 replies; 43+ messages in thread
From: FollieHiyuki @ 2021-01-24 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/28151#issuecomment-766423549
Comment:
I was working on this for a few days and got it built on my machine. Can I take over and make another PR? It still fails some tests with locale though
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15.
2021-01-24 16:10 [PR PATCH] " ailiop-git
2021-01-24 17:56 ` ericonr
@ 2021-01-24 17:57 ` ericonr
2021-01-24 20:07 ` FollieHiyuki
2021-01-24 20:21 ` ericonr
3 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-24 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28151#issuecomment-766402942
Comment:
I don't think the Musl stuff is still necessary, I have worked a bit with upstream to be more standards compliant.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: snapper: update to 0.8.15.
2021-01-24 16:10 [PR PATCH] " ailiop-git
@ 2021-01-24 17:56 ` ericonr
2021-01-24 17:57 ` ericonr
` (2 subsequent siblings)
3 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-01-24 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28151#issuecomment-766402942
Comment:
I don't think the Musl stuff is still necessary, I have worked with upstream to be more standards compliant.
^ permalink raw reply [flat|nested] 43+ messages in thread
end of thread, other threads:[~2021-01-31 2:12 UTC | newest]
Thread overview: 43+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-24 20:18 [PR PATCH] snapper: update to 0.8.15 FollieHiyuki
2021-01-24 20:21 ` FollieHiyuki
2021-01-24 20:33 ` [PR PATCH] [Updated] " FollieHiyuki
2021-01-25 2:20 ` FollieHiyuki
2021-01-25 2:21 ` FollieHiyuki
2021-01-25 3:47 ` FollieHiyuki
2021-01-25 4:01 ` FollieHiyuki
2021-01-25 4:29 ` FollieHiyuki
2021-01-25 4:34 ` FollieHiyuki
2021-01-25 4:37 ` FollieHiyuki
2021-01-25 8:08 ` FollieHiyuki
2021-01-25 13:24 ` ericonr
2021-01-25 19:05 ` [PR PATCH] [Updated] " FollieHiyuki
2021-01-25 19:13 ` FollieHiyuki
2021-01-28 4:46 ` ericonr
2021-01-28 16:15 ` FollieHiyuki
2021-01-28 19:23 ` [PR PATCH] [Updated] " FollieHiyuki
2021-01-28 19:34 ` FollieHiyuki
2021-01-28 19:38 ` FollieHiyuki
2021-01-28 20:03 ` [PR REVIEW] " ericonr
2021-01-28 20:03 ` ericonr
2021-01-28 20:03 ` ericonr
2021-01-28 20:21 ` FollieHiyuki
2021-01-28 20:23 ` FollieHiyuki
2021-01-28 20:25 ` ericonr
2021-01-28 20:25 ` ericonr
2021-01-28 20:27 ` FollieHiyuki
2021-01-28 21:11 ` FollieHiyuki
2021-01-28 21:12 ` FollieHiyuki
2021-01-28 21:14 ` FollieHiyuki
2021-01-28 21:20 ` ericonr
2021-01-28 21:21 ` ericonr
2021-01-28 21:40 ` [PR PATCH] [Updated] " FollieHiyuki
2021-01-28 21:46 ` [PR REVIEW] " FollieHiyuki
2021-01-28 21:53 ` FollieHiyuki
2021-01-28 21:53 ` FollieHiyuki
2021-01-28 22:11 ` ericonr
2021-01-28 23:10 ` FollieHiyuki
2021-01-31 2:12 ` [PR PATCH] [Merged]: " ericonr
-- strict thread matches above, loose matches on Subject: below --
2021-01-24 16:10 [PR PATCH] " ailiop-git
2021-01-24 17:56 ` ericonr
2021-01-24 17:57 ` ericonr
2021-01-24 20:07 ` FollieHiyuki
2021-01-24 20:21 ` ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).