[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: c6eed6583a02c19992ac131b7a71439da5d6da31 Author: Yixun Lan gentoo org> AuthorDate: Sun Apr 28 03:48:58 2024 + Commit: Yixun Lan gentoo org> CommitDate: Sun Apr 28 08:23:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6eed658 app-backup/snapper: add 0.11.0 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 + .../snapper/files/snapper-0.11.0-cron-confd.patch | 18 + app-backup/snapper/snapper-0.11.0.ebuild | 90 ++ 3 files changed, 109 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index e975685fd561..dd6d2ce24c65 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,2 +1,3 @@ DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8 +DIST snapper-0.11.0.tar.gz 445685 BLAKE2B 301e6d745d8d6d7acc6ca0c9fc431a0e46700aabd9882785bb2be38152693f9dbe897f85f6ad724c9529a0754b6146b53dda0a24141b386e59e7737855bc5da2 SHA512 fe86be4ceb1439b5be3fa61f5bc037bc51a5fe47451d0698851f83e2783d6c245ef8d40a33f79b03e8d1d8b63433743c35938ad7dca0747e0e1f650a5a766c40 diff --git a/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch new file mode 100644 index ..c1fc5c692c71 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.11.0-cron-confd.patch @@ -0,0 +1,18 @@ +diff --git a/scripts/snapper-hourly b/scripts/snapper-hourly +index 36a41f5..f36d8ec 100755 +--- a/scripts/snapper-hourly b/scripts/snapper-hourly +@@ -9,10 +9,10 @@ export PATH + + + # +-# get information from /etc/sysconfig/snapper ++# get information from /etc/conf.d/snapper + # +-if [ -f /etc/sysconfig/snapper ] ; then +-. /etc/sysconfig/snapper ++if [ -f /etc/conf.d/snapper ] ; then ++. /etc/conf.d/snapper + fi + + diff --git a/app-backup/snapper/snapper-0.11.0.ebuild b/app-backup/snapper/snapper-0.11.0.ebuild new file mode 100644 index ..0e9331554272 --- /dev/null +++ b/app-backup/snapper/snapper-0.11.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="Command-line program for btrfs and lvm snapshot management" +HOMEPAGE="http://snapper.io/; +SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="lvm pam test systemd xattr" +RESTRICT="test" + +BDEPEND="app-text/docbook-xsl-stylesheets + dev-libs/libxslt + sys-devel/gettext + virtual/pkgconfig" + +RDEPEND="dev-libs/boost:= + dev-libs/json-c:= + dev-libs/libxml2 + dev-libs/icu:= + sys-apps/acl + sys-apps/dbus + sys-apps/util-linux + >=sys-fs/btrfs-progs-3.17.1 + sys-libs/zlib + virtual/libintl + lvm? ( sys-fs/lvm2 ) + pam? ( sys-libs/pam ) + xattr? ( sys-apps/attr )" + +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-cron-confd.patch + "${FILESDIR}"/${PN}-0.10.1-testsuite.patch +) + +src_prepare() { + default + + sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ + -i data/Makefile.* \ + || die "Failed to fix systemd services and timers installation path" + eautoreconf +} + +src_configure() { + # ext4 code does not work anymore + # snapper does not build without btrfs + local myeconfargs=( + --disable-silent-rules + --with-conf="/etc/conf.d" + --enable-zypp + --enable-rollback + --enable-btrfs-quota + --disable-ext4 + --enable-btrfs + --enable-doc + $(use_enable lvm) + $(use_enable pam) + $(use_enable test tests) + $(use_enable systemd) + $(use_enable xattr xattrs) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + # Existing configuration file required to function + keepdir /etc/snapper/configs + newconfd data/sysconfig.snapper snapper + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + elog "In order to use Snapper, you need to set up" + elog "at least one config first. To
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: ef3449391b82e023ebfe4d00addd88de3793dd6a Author: Yixun Lan gentoo org> AuthorDate: Tue Dec 5 08:09:29 2023 + Commit: Yixun Lan gentoo org> CommitDate: Tue Dec 5 12:11:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef344939 app-backup/snapper: drop 0.10.3, 0.10.5-r1 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 2 - .../snapper/files/snapper-0.10.3-boost-1.81.patch | 19 - app-backup/snapper/snapper-0.10.3.ebuild | 90 -- app-backup/snapper/snapper-0.10.5-r1.ebuild| 89 - 4 files changed, 200 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index c0712373e9a5..e975685fd561 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,2 @@ -DIST snapper-0.10.3.tar.gz 409277 BLAKE2B bc4963081a24572015ff888b5cb85f3afa071e487a89e89f1a72d5b96391be69ad982c79ddfd71f020203d0c50ca07d67cbeb535cd6e57bc3d6ee269ef5c788e SHA512 74cb04d045304021564a0452769fdcde1764595a52e30947396c37fe4c36b3fba08d10505734bc0bd631986e933ee2bfaf67c871cba93a96e498fbfe5e2c6985 -DIST snapper-0.10.5.tar.gz 422114 BLAKE2B 35c4772fc84920755d5fe87cad4a73792692ab7a55bcbcae65f20bf2e0cbcfb79429a423a5b55a89dbfeba1ff0474741c884bc632daa997fbb86cec52b68e3ef SHA512 e710069374b805394d691f8060d2852e35960a965fd49bb59768ebcc53a615af1f36269adac2d916b5e3f1b3e42fb2a53049d8f1b8a6a8430e992fa0de49c235 DIST snapper-0.10.6.tar.gz 423867 BLAKE2B a7d0f8c62c60c0d03bf108a8c0692dd209f170cf8227512cbc3b80eb9f58ecca845aa585859032bc6582d67e4c6ff15b75443a9ee9291d1b970efec15513571f SHA512 6eedfb9408260331f042f0a429a1104136cb88dac450f320641b0941cd06faf52f67cad2397cf4122f919876bb994455da0cfd3bb099f82217050e07b4c77d2e DIST snapper-0.10.7.tar.gz 428482 BLAKE2B 43c48d978296901f6584cef258ec3723de97b1d6b4b4a5b6bc39649f28b3300919616c65b8fcdb97b3ebcab08d04e4583713eef146721367de24513e80113b45 SHA512 bf098c941735b60554ff0711fa43b30ef3634e01178f5ee8ad44c65b757c3366bd5bf568cef3a787b2ddcc2fc63090056109250480e6bd360ebf27a8343373b8 diff --git a/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch b/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch deleted file mode 100644 index 80896f02e46e.. --- a/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/886505 -https://github.com/openSUSE/snapper/commit/0f8a3dff903eeb30072b9b9809cf072d3c84d1fc - -From 0f8a3dff903eeb30072b9b9809cf072d3c84d1fc Mon Sep 17 00:00:00 2001 -From: Arvin Schnell -Date: Tue, 15 Nov 2022 14:39:29 +0100 -Subject: [PATCH] - fix build with boost 1.81 - a/zypp-plugin/snapper-zypp-plugin.cc -+++ b/zypp-plugin/snapper-zypp-plugin.cc -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include - #include - - diff --git a/app-backup/snapper/snapper-0.10.3.ebuild b/app-backup/snapper/snapper-0.10.3.ebuild deleted file mode 100644 index b58714c373f4.. --- a/app-backup/snapper/snapper-0.10.3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -DESCRIPTION="Command-line program for btrfs and lvm snapshot management" -HOMEPAGE="http://snapper.io/; -SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv x86" -IUSE="doc lvm pam test systemd xattr" -RESTRICT="test" - -RDEPEND="dev-libs/boost:= - dev-libs/json-c:= - dev-libs/libxml2 - dev-libs/icu:= - sys-apps/acl - sys-apps/dbus - sys-apps/util-linux - >=sys-fs/btrfs-progs-3.17.1 - sys-libs/zlib - virtual/libintl - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - xattr? ( sys-apps/attr )" - -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${PN}-0.10.1-testsuite.patch - "${FILESDIR}"/${P}-boost-1.81.patch -) - -src_prepare() { - default - - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ - -i data/Makefile.* \ - || die "Failed to fix systemd services and timers installation path" - eautoreconf -} - -src_configure() { - # ext4 code does not work anymore - # snapper does not build without btrfs - local myeconfargs=( - --disable-silent-rules - --with-conf="/etc/conf.d" - --enable-zypp - --enable-rollback - --enable-btrfs-quota - --disable-ext4 - --enable-btrfs - $(use_enable doc) - $(use_enable lvm) - $(use_enable pam) - $(use_enable test tests) -
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: d1c3c687906c9c845c00951d0996554ac6ef6b03 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 05:22:49 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 05:22:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1c3c687 app-backup/snapper: fix build w/ boost 1.81 Closes: https://bugs.gentoo.org/886505 Signed-off-by: Sam James gentoo.org> .../snapper/files/snapper-0.10.3-boost-1.81.patch | 19 +++ app-backup/snapper/snapper-0.10.3.ebuild | 1 + 2 files changed, 20 insertions(+) diff --git a/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch b/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch new file mode 100644 index ..80896f02e46e --- /dev/null +++ b/app-backup/snapper/files/snapper-0.10.3-boost-1.81.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/886505 +https://github.com/openSUSE/snapper/commit/0f8a3dff903eeb30072b9b9809cf072d3c84d1fc + +From 0f8a3dff903eeb30072b9b9809cf072d3c84d1fc Mon Sep 17 00:00:00 2001 +From: Arvin Schnell +Date: Tue, 15 Nov 2022 14:39:29 +0100 +Subject: [PATCH] - fix build with boost 1.81 + +--- a/zypp-plugin/snapper-zypp-plugin.cc b/zypp-plugin/snapper-zypp-plugin.cc +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include + #include + + diff --git a/app-backup/snapper/snapper-0.10.3.ebuild b/app-backup/snapper/snapper-0.10.3.ebuild index a9b14fb5e9d2..b58714c373f4 100644 --- a/app-backup/snapper/snapper-0.10.3.ebuild +++ b/app-backup/snapper/snapper-0.10.3.ebuild @@ -38,6 +38,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/cron-confd.patch "${FILESDIR}"/${PN}-0.10.1-testsuite.patch + "${FILESDIR}"/${P}-boost-1.81.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 910d65baea8f0f40b9ffbd1a6e07307ba2fd85bc Author: Sam James gentoo org> AuthorDate: Fri Sep 2 05:51:53 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 2 05:51:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910d65ba app-backup/snapper: fix build w/ musl and gcc-12 Closes: https://bugs.gentoo.org/862094 Signed-off-by: Sam James gentoo.org> .../snapper/files/snapper-0.10.2-gcc12-time.patch | 27 ++ app-backup/snapper/snapper-0.10.2.ebuild | 1 + 2 files changed, 28 insertions(+) diff --git a/app-backup/snapper/files/snapper-0.10.2-gcc12-time.patch b/app-backup/snapper/files/snapper-0.10.2-gcc12-time.patch new file mode 100644 index ..672e6a1566a1 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.10.2-gcc12-time.patch @@ -0,0 +1,27 @@ +https://github.com/openSUSE/snapper/pull/743 + +From 3415229fd29fa3e5247e30ba1ac632e91e603c9f Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Fri, 2 Sep 2022 06:48:56 +0100 +Subject: [PATCH] Fix build with GCC 12 (and musl) + +``` +DBusMessage.h:239:34: error: 'time_t' has not been declared + 239 | Hihi& operator>>(Hihi& hihi, time_t& data); +``` + +Include to grab time_t. + +Bug: https://bugs.gentoo.org/862094 +Signed-off-by: Sam James +--- a/dbus/DBusMessage.h b/dbus/DBusMessage.h +@@ -27,6 +27,7 @@ + + #include + ++#include + #include + #include + #include + diff --git a/app-backup/snapper/snapper-0.10.2.ebuild b/app-backup/snapper/snapper-0.10.2.ebuild index f8c9f634d9d5..d10d4e399808 100644 --- a/app-backup/snapper/snapper-0.10.2.ebuild +++ b/app-backup/snapper/snapper-0.10.2.ebuild @@ -38,6 +38,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/cron-confd.patch "${FILESDIR}"/${PN}-0.10.1-testsuite.patch + "${FILESDIR}"/${PN}-0.10.2-gcc12-time.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 5166dee47eaff100e9c4ca4660e15c427ea64164 Author: Yixun Lan gentoo org> AuthorDate: Tue Apr 26 08:37:36 2022 + Commit: Yixun Lan gentoo org> CommitDate: Tue Apr 26 08:41:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5166dee4 app-backup/snapper: drop 0.10.0 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 - .../snapper/files/snapper-0.10.0-testsuite.patch | 84 - app-backup/snapper/snapper-0.10.0.ebuild | 88 -- 3 files changed, 173 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 901f27a4c64b..9218501d7501 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,3 +1,2 @@ -DIST snapper-0.10.0.tar.gz 404564 BLAKE2B 2dd3f889cf445e06975b5a6f1088d07445510c6905dacecd5b75c0b92c155d399b9b6ed07e466303e4ea3e4b3e6aa72f57b9a34fc2b3aa97c328d886732a375c SHA512 eb0b8568f90907a84dd6f6e135f26cddbafbb8a420f2e4c3ad657d4d782ff35517da93c375d9796dbac1a03983e8b88084280347b51eadf869294dcc080dbfeb DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 diff --git a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch b/app-backup/snapper/files/snapper-0.10.0-testsuite.patch deleted file mode 100644 index 643c98bf1a70.. --- a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 3f5c911..a8c9c95 100644 a/configure.ac -+++ b/configure.ac -@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" - - PAM_SECURITY=${libdir}/security - -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), -+ [with_tests=$enableval],[with_tests=yes]) -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) -+if test "x$with_tests" = "xyes"; then -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) -+fi -+ - AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]), - [with_pam_security=$withval], [with_pam_security=no]) - AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"]) -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am -index 81104bf..9c29477 100644 a/testsuite-cmp/Makefile.am -+++ b/testsuite-cmp/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-cmp - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) - AM_LDFLAGS = -lboost_system - -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc - - EXTRA_DIST = $(noinst_SCRIPTS) - -+endif -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am -index ceb0862..9a72775 100644 a/testsuite-real/Makefile.am -+++ b/testsuite-real/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-real - # - -+if ENABLE_TESTS - CXXFLAGS += -std=gnu++11 - - AM_CPPFLAGS = -I$(top_srcdir) -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc - - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) - -+endif -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index ccb84d3..409e265 100644 a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework -@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la - range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - - limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la -+endif -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am -index 7b52e13..71cb545 100644 a/zypp-plugin/testsuite/Makefile.am -+++ b/zypp-plugin/testsuite/Makefile.am -@@ -1,3 +1,5 @@ -+ -+if ENABLE_TESTS - if HAVE_ZYPP - TEST_LOG_DRIVER = $(SHELL) tap-driver.sh - -@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) - - EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh - endif -+endif diff --git a/app-backup/snapper/snapper-0.10.0.ebuild b/app-backup/snapper/snapper-0.10.0.ebuild deleted file mode 100644 index 11fe4ff862dd.. --- a/app-backup/snapper/snapper-0.10.0.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 7f5469d0475d8a655cc380d78731a59fa4d5e1e2 Author: Yixun Lan gentoo org> AuthorDate: Tue Apr 26 08:34:53 2022 + Commit: Yixun Lan gentoo org> CommitDate: Tue Apr 26 08:41:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5469d0 app-backup/snapper: add 0.10.1 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 + .../snapper/files/snapper-0.10.1-testsuite.patch | 84 + app-backup/snapper/snapper-0.10.1.ebuild | 88 ++ 3 files changed, 173 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 5ba939cd025f..901f27a4c64b 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,2 +1,3 @@ DIST snapper-0.10.0.tar.gz 404564 BLAKE2B 2dd3f889cf445e06975b5a6f1088d07445510c6905dacecd5b75c0b92c155d399b9b6ed07e466303e4ea3e4b3e6aa72f57b9a34fc2b3aa97c328d886732a375c SHA512 eb0b8568f90907a84dd6f6e135f26cddbafbb8a420f2e4c3ad657d4d782ff35517da93c375d9796dbac1a03983e8b88084280347b51eadf869294dcc080dbfeb +DIST snapper-0.10.1.tar.gz 407628 BLAKE2B 84b4c027762a11cbf5f49af3e94bc0e494e83e61aa35c3873d0ab98b0c232897b6d002ef28181ad3b2567cc88b84424f570e7b24278c546fb39452e399ad7333 SHA512 39f4d95e98b736510b6bea56eebc8275618a0ad3221d7fae9cd0f46f8a4af574700a6123a438918d522d65758ad50020f80c925395ae3ab84b7ad3eb924592c0 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 diff --git a/app-backup/snapper/files/snapper-0.10.1-testsuite.patch b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch new file mode 100644 index ..84ff2ce1978a --- /dev/null +++ b/app-backup/snapper/files/snapper-0.10.1-testsuite.patch @@ -0,0 +1,84 @@ +diff --git a/configure.ac b/configure.ac +index 39def82..9b96a32 100644 +--- a/configure.ac b/configure.ac +@@ -174,6 +174,13 @@ if test "x$enable_coverage" = "xyes"; then + LDFLAGS="${LDFLAGS} --coverage" + fi + ++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), ++ [with_tests=$enableval],[with_tests=yes]) ++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) ++if test "x$with_tests" = "xyes"; then ++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) ++fi ++ + PKG_CHECK_MODULES(DBUS, dbus-1) + PKG_CHECK_MODULES(XML2, libxml-2.0) + PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) +diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +index 81104bf..9c29477 100644 +--- a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-cmp + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) + AM_LDFLAGS = -lboost_system + +@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc + + EXTRA_DIST = $(noinst_SCRIPTS) + ++endif +diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +index a3bb2e3..c4e88f4 100644 +--- a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-real + # + ++if ENABLE_TESTS + CXXFLAGS += -std=gnu++11 + + AM_CPPFLAGS = -I$(top_srcdir) +@@ -56,3 +57,4 @@ ascii_file_SOURCES = ascii-file.cc + + EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) + ++endif +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index ccb84d3..409e265 100644 +--- a/testsuite/Makefile.am b/testsuite/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + + LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework +@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la + range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la ++endif +diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +index 7b52e13..71cb545 100644 +--- a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +@@ -1,3 +1,5 @@ ++ ++if ENABLE_TESTS + if HAVE_ZYPP + TEST_LOG_DRIVER = $(SHELL) tap-driver.sh + +@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) + + EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh + endif ++endif diff --git a/app-backup/snapper/snapper-0.10.1.ebuild b/app-backup/snapper/snapper-0.10.1.ebuild new file mode 100644 index ..11fe4ff862dd --- /dev/null +++ b/app-backup/snapper/snapper-0.10.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 43a05f7490fa0a1d8f6660a1bded74cedc0568ae Author: Yixun Lan gentoo org> AuthorDate: Thu Apr 21 03:06:34 2022 + Commit: Yixun Lan gentoo org> CommitDate: Thu Apr 21 03:28:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a05f74 app-backup/snapper: add 0.10.0 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 + .../snapper/files/snapper-0.10.0-testsuite.patch | 84 + app-backup/snapper/snapper-0.10.0.ebuild | 88 ++ 3 files changed, 173 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index caae74396a11..5ba939cd025f 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1 +1,2 @@ +DIST snapper-0.10.0.tar.gz 404564 BLAKE2B 2dd3f889cf445e06975b5a6f1088d07445510c6905dacecd5b75c0b92c155d399b9b6ed07e466303e4ea3e4b3e6aa72f57b9a34fc2b3aa97c328d886732a375c SHA512 eb0b8568f90907a84dd6f6e135f26cddbafbb8a420f2e4c3ad657d4d782ff35517da93c375d9796dbac1a03983e8b88084280347b51eadf869294dcc080dbfeb DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 diff --git a/app-backup/snapper/files/snapper-0.10.0-testsuite.patch b/app-backup/snapper/files/snapper-0.10.0-testsuite.patch new file mode 100644 index ..643c98bf1a70 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.10.0-testsuite.patch @@ -0,0 +1,84 @@ +diff --git a/configure.ac b/configure.ac +index 3f5c911..a8c9c95 100644 +--- a/configure.ac b/configure.ac +@@ -84,6 +84,13 @@ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" + + PAM_SECURITY=${libdir}/security + ++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), ++ [with_tests=$enableval],[with_tests=yes]) ++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) ++if test "x$with_tests" = "xyes"; then ++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) ++fi ++ + AC_ARG_WITH([pam-security], AC_HELP_STRING([--pam-security], [Use a custom pam security directory (default is $libdir/security)]), + [with_pam_security=$withval], [with_pam_security=no]) + AS_IF([test "x$with_pam_security" != xno], [PAM_SECURITY="${with_pam_security}"]) +diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +index 81104bf..9c29477 100644 +--- a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-cmp + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) + AM_LDFLAGS = -lboost_system + +@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc + + EXTRA_DIST = $(noinst_SCRIPTS) + ++endif +diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +index ceb0862..9a72775 100644 +--- a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-real + # + ++if ENABLE_TESTS + CXXFLAGS += -std=gnu++11 + + AM_CPPFLAGS = -I$(top_srcdir) +@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc + + EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) + ++endif +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index ccb84d3..409e265 100644 +--- a/testsuite/Makefile.am b/testsuite/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + + LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework +@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la + range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la ++endif +diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +index 7b52e13..71cb545 100644 +--- a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +@@ -1,3 +1,5 @@ ++ ++if ENABLE_TESTS + if HAVE_ZYPP + TEST_LOG_DRIVER = $(SHELL) tap-driver.sh + +@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) + + EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh + endif ++endif diff --git a/app-backup/snapper/snapper-0.10.0.ebuild b/app-backup/snapper/snapper-0.10.0.ebuild new file mode 100644 index ..11fe4ff862dd --- /dev/null +++ b/app-backup/snapper/snapper-0.10.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="Command-line program for btrfs and lvm snapshot management" +HOMEPAGE="http://snapper.io/; +SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: da0f4c3b66e8c7273cd4b80a6286a08bc160d7f0 Author: Yixun Lan gentoo org> AuthorDate: Tue Dec 7 08:36:38 2021 + Commit: Yixun Lan gentoo org> CommitDate: Tue Dec 7 08:36:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0f4c3b app-backup/snapper: drop olds Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 3 - .../snapper/files/snapper-0.8.15-testsuite.patch | 83 .../snapper/files/snapper-0.9.0-testsuite.patch| 83 app-backup/snapper/snapper-0.8.15-r2.ebuild| 89 -- app-backup/snapper/snapper-0.8.16-r1.ebuild| 89 -- app-backup/snapper/snapper-0.9.0-r1.ebuild | 89 -- 6 files changed, 436 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 2bdc33b55a9c..caae74396a11 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1 @@ -DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c -DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae -DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412 DIST snapper-0.9.1.tar.gz 400387 BLAKE2B fe9d25f573dc99e0eb6c876fa2ebb34140ea8177c72a65af65bd4b6621b81bcab71ee03948696d311444cad4c69d21db70161f67ef3917aea93e39ad54b10444 SHA512 447a024570bbb834adfc789aa5b12b037838fcf50f8d26f87a9a10b250541a589be3b24b01f990625021b8ff5b2eade0f2eda5e992f76113c62bd5e8a27c1293 diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch deleted file mode 100644 index 237e0705c98d.. --- a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 839d012..ceac54d 100644 a/configure.ac -+++ b/configure.ac -@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) - - CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" - -+AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), -+ [with_tests=$enableval],[with_tests=yes]) -+AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) -+if test "x$with_tests" = "xyes"; then -+ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) -+fi - - AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), - [with_btrfs=$enableval],[with_btrfs=yes]) -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am -index 81104bf..9c29477 100644 a/testsuite-cmp/Makefile.am -+++ b/testsuite-cmp/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-cmp - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) - AM_LDFLAGS = -lboost_system - -@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc - - EXTRA_DIST = $(noinst_SCRIPTS) - -+endif -diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am -index 717313a..527843d 100644 a/testsuite-real/Makefile.am -+++ b/testsuite-real/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite-real - # - -+if ENABLE_TESTS - CXXFLAGS += -std=gnu++0x - - AM_CPPFLAGS = -I$(top_srcdir) -@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc - - EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) - -+endif -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index d7e30b8..72ef5ee 100644 a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -2,6 +2,7 @@ - # Makefile.am for snapper/testsuite - # - -+if ENABLE_TESTS - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - - LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework -@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils - getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la - - lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la -+endif -diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am -index 7b52e13..71cb545 100644 a/zypp-plugin/testsuite/Makefile.am -+++
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 65035cde3a2de724c85e5da1871a4ae49e96a93b Author: Yixun Lan gentoo org> AuthorDate: Sun Jun 6 22:32:44 2021 + Commit: Yixun Lan gentoo org> CommitDate: Mon Jun 7 00:57:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65035cde app-backup/snapper: version bump, 0.9.0 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 + .../snapper/files/snapper-0.9.0-testsuite.patch| 83 app-backup/snapper/snapper-0.9.0.ebuild| 89 ++ 3 files changed, 173 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 28f2896b3d4..bf2b882ed4e 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,2 +1,3 @@ DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae +DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412 diff --git a/app-backup/snapper/files/snapper-0.9.0-testsuite.patch b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch new file mode 100644 index 000..7aa089569b4 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.9.0-testsuite.patch @@ -0,0 +1,83 @@ +diff --git a/configure.ac b/configure.ac +index 06e4721..c89d0aa 100644 +--- a/configure.ac b/configure.ac +@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) + + CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" + ++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), ++ [with_tests=$enableval],[with_tests=yes]) ++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) ++if test "x$with_tests" = "xyes"; then ++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) ++fi + + AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), + [with_btrfs=$enableval],[with_btrfs=yes]) +diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +index 81104bf..9c29477 100644 +--- a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-cmp + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) + AM_LDFLAGS = -lboost_system + +@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc + + EXTRA_DIST = $(noinst_SCRIPTS) + ++endif +diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +index 717313a..527843d 100644 +--- a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-real + # + ++if ENABLE_TESTS + CXXFLAGS += -std=gnu++0x + + AM_CPPFLAGS = -I$(top_srcdir) +@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc + + EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) + ++endif +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index ccb84d3..409e265 100644 +--- a/testsuite/Makefile.am b/testsuite/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + + LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework +@@ -48,3 +49,4 @@ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la + range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la ++endif +diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +index 7b52e13..71cb545 100644 +--- a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +@@ -1,3 +1,5 @@ ++ ++if ENABLE_TESTS + if HAVE_ZYPP + TEST_LOG_DRIVER = $(SHELL) tap-driver.sh + +@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS) + + EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh + endif ++endif diff --git a/app-backup/snapper/snapper-0.9.0.ebuild b/app-backup/snapper/snapper-0.9.0.ebuild new file mode 100644 index 000..3a46790c0d3 --- /dev/null +++ b/app-backup/snapper/snapper-0.9.0.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 168e12d457e434c0f36cacf784bdf01f8c80a6ec Author: Yixun Lan gentoo org> AuthorDate: Sun Jun 6 06:34:12 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sun Jun 6 06:34:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168e12d4 app-backup/snapper: drop old Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest | 2 - app-backup/snapper/files/snapper-0.5.6-swap.patch | 36 -- app-backup/snapper/snapper-0.5.6-r1.ebuild| 77 - app-backup/snapper/snapper-0.8.9-r1.ebuild| 81 --- 4 files changed, 196 deletions(-) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 79ab289556a..28f2896b3d4 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,2 @@ -DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae -DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d diff --git a/app-backup/snapper/files/snapper-0.5.6-swap.patch b/app-backup/snapper/files/snapper-0.5.6-swap.patch deleted file mode 100644 index aa24330d730..000 --- a/app-backup/snapper/files/snapper-0.5.6-swap.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 22bc1d808ebb6c3958e8231a36b73cd45a7f2c30 -Author: Spencer Janssen -Date: Mon Dec 3 17:33:49 2018 -0600 - -Work around btrfs v4.19 - -Addresses #459 - -diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc -index cb9f7b3..c05557b 100644 a/snapper/Btrfs.cc -+++ b/snapper/Btrfs.cc -@@ -41,6 +41,9 @@ - #include - #include - #include -+#ifdef swap -+#undef swap -+#endif - #include - #include - #endif -diff --git a/snapper/BtrfsUtils.cc b/snapper/BtrfsUtils.cc -index bada3f8..9edc325 100644 a/snapper/BtrfsUtils.cc -+++ b/snapper/BtrfsUtils.cc -@@ -34,6 +34,9 @@ - #ifdef HAVE_LIBBTRFS - #include - #include -+#ifdef swap -+#undef swap -+#endif - #endif - #include - #include diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild deleted file mode 100644 index c6f5ffca2a5..000 --- a/app-backup/snapper/snapper-0.5.6-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Command-line program for btrfs and lvm snapshot management" -HOMEPAGE="http://snapper.io/; -SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="lvm pam xattr" - -RDEPEND="dev-libs/boost:=[threads] - dev-libs/libxml2 - dev-libs/icu:= - sys-apps/acl - sys-apps/dbus - sys-apps/util-linux - >=sys-fs/btrfs-progs-3.17.1 - sys-libs/zlib - virtual/libintl - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - xattr? ( sys-apps/attr )" - -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/cron-confd.patch - "${FILESDIR}"/${P}-swap.patch -) - -src_prepare() { - default - - sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \ - -i data/Makefile.* \ - || die "Failed to fix systemd services and timers installation path" -} - -src_configure() { - # ext4 code does not work anymore - # snapper does not build without btrfs - local myeconfargs=( - --with-conf="/etc/conf.d" - --disable-zypp - --enable-rollback - --disable-ext4 - --enable-btrfs - $(use_enable lvm) - $(use_enable pam) - $(use_enable xattr xattrs) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - #
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 44b450a6bd0d4356a031e1707893cfbc05c0978d Author: Yixun Lan gentoo org> AuthorDate: Thu Jan 14 08:09:42 2021 + Commit: Yixun Lan gentoo org> CommitDate: Thu Jan 14 08:19:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b450a6 app-backup/snapper: version bump, 0.8.15 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest| 1 + .../snapper/files/snapper-0.8.15-testsuite.patch | 83 + app-backup/snapper/snapper-0.8.15.ebuild | 87 ++ 3 files changed, 171 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 3162b303dc6..8a9ee2e4833 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -1,4 +1,5 @@ DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e +DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c DIST snapper-0.8.6.tar.bz2 607016 BLAKE2B 3e496fa22b1ecce2079d79caeb530ca1538febcc6bdf04aa0256e5b43bb546ea66436e60eeaae6722bc869c60579bc47c556671c5878dd671c266102516f04bb SHA512 f01a309a8dcfff455bf480ff297108e8ec3603d469d50f08740176e22bc2b8dd211de678fa8ce12c1ccd828348a35c6d347ca51b829d7b8c30b3fbaba4e9e2d9 DIST snapper-0.8.7.tar.bz2 622381 BLAKE2B 82d1a9c91beb309e87acfa914b55b2ff5900edc023a5ecd6f2bee6b1a15adb1336656f3f1fffea4a9971aa449b7825750e6c680806d4574faada5bba0a6d14f1 SHA512 6fa63c2453f93a724f0ac23d84ff2c5aafc654463e84a4f767bb8a75a0d4fb7ca7314811179d5fefce0df4441298c67b473596aa720d86eeefa43011b727 DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch new file mode 100644 index 000..237e0705c98 --- /dev/null +++ b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch @@ -0,0 +1,83 @@ +diff --git a/configure.ac b/configure.ac +index 839d012..ceac54d 100644 +--- a/configure.ac b/configure.ac +@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) + + CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'" + ++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]), ++ [with_tests=$enableval],[with_tests=yes]) ++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"]) ++if test "x$with_tests" = "xyes"; then ++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support]) ++fi + + AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), + [with_btrfs=$enableval],[with_btrfs=yes]) +diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +index 81104bf..9c29477 100644 +--- a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-cmp + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) + AM_LDFLAGS = -lboost_system + +@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc + + EXTRA_DIST = $(noinst_SCRIPTS) + ++endif +diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +index 717313a..527843d 100644 +--- a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite-real + # + ++if ENABLE_TESTS + CXXFLAGS += -std=gnu++0x + + AM_CPPFLAGS = -I$(top_srcdir) +@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc + + EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) + ++endif +diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am +index d7e30b8..72ef5ee 100644 +--- a/testsuite/Makefile.am b/testsuite/Makefile.am +@@ -2,6 +2,7 @@ + # Makefile.am for snapper/testsuite + # + ++if ENABLE_TESTS + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + + LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework +@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils + getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la + + lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la ++endif +diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am +index
[gentoo-commits] repo/gentoo:master commit in: app-backup/snapper/, app-backup/snapper/files/
commit: 52932ec67c365fa358d893e2af8353aeed186982 Author: Yixun Lan gentoo org> AuthorDate: Wed Oct 16 03:22:48 2019 + Commit: Yixun Lan gentoo org> CommitDate: Wed Oct 16 03:22:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52932ec6 app-backup/snapper: version bump 0.8.4, add bash-completion support In this version, we also add bash-completion support But it's rather better to push bash-completion support to upstream, instead of maintaining it downstream. thanks 'Xu Weiping' for the contribution Closes: https://bugs.gentoo.org/697480 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Yixun Lan gentoo.org> app-backup/snapper/Manifest | 1 + app-backup/snapper/files/snapper.bash | 200 app-backup/snapper/snapper-0.8.4.ebuild | 78 + 3 files changed, 279 insertions(+) diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest index 42fbbd958b9..1aec298782a 100644 --- a/app-backup/snapper/Manifest +++ b/app-backup/snapper/Manifest @@ -2,3 +2,4 @@ DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee DIST snapper-0.8.1.tar.bz2 591061 BLAKE2B 5f9ae50469f43e930de4c4479428c94b24441832bd713847c6792ff583fb79badfa341b53cc63abfedb787367b22b715de9f83f9172dec945f7b3071c06137ba SHA512 9fa20311f346de54c4f5d1cabb42dce5c677eaac03b3fac2a6049f408553911f5a968b1920fd014f3318ebb6911f2e6bce06463e976b468927e250e16fe783a0 DIST snapper-0.8.2.tar.bz2 591558 BLAKE2B 552c07d1d83e6a8db1e1661b523aeb7164335bb6ebbeb07489325b6d23d8a5def730ac1cf0da06ab65b7a9fc1284d0d05ca0f875bc897504c1bbb45698b40294 SHA512 d968490782a47112f7ba2474555cafe450833cf055734186c79991dd836f9c5d8d669a6c65dd29b05da298e46f65e0ac5c4a1dae3b548a01dbf1b11d7e00c462 DIST snapper-0.8.3.tar.bz2 592405 BLAKE2B 7694a6c79e4beaf307801ccd97a6cd1c3c6078e68653e9a5eda3ddcd087ef32f8302d380ee550ac5c7259c7e23ddb15bf9f2d01267d5691fe10e0335d490a258 SHA512 409a8464c10905da1407ce3bf68ad1d7df53480da4f8e98e40ef4ee5cb5170bb99c07fabb367510eb2a19744a827dc9a33cf74de05fbb2fc5f22fe3dc4adef6d +DIST snapper-0.8.4.tar.bz2 594555 BLAKE2B b176420be06dea2dca73fafbebb362bb27d9b793868f84466dae020cea9d1c61c7a3896de6e0701d1e924eed8c13b1b11a7bbc3047ca41c9aaee260a438ddce3 SHA512 9e3708a2b015470798731e105ab843f21c5273f0f2f4e183afde538ad4998892c4d79996e1963e74d0a09d10b9b3057faed5e2f501a1d9a5a4b1fa36ba88bb7e diff --git a/app-backup/snapper/files/snapper.bash b/app-backup/snapper/files/snapper.bash new file mode 100644 index 000..e5ca4134342 --- /dev/null +++ b/app-backup/snapper/files/snapper.bash @@ -0,0 +1,200 @@ +_snapper() +{ +local configdir="/etc/snapper/configs" +local cur prev words cword +_init_completion || return + +local GLOGAL_SNAPPER_OPTIONS=' +-q --quiet +-v --verbose +--utc +--iso +-t --table-style +-c --config +-r --root +--no-dbus +--version +--help +' + +# see if the user selected a command already +local COMMANDS=( +"list-configs" "create-config" "delete-config" "set-config" +"list" "ls" +"create" "modify" "delete" "remove" "rm" +"mount" "umount" +"status" "diff" "xadiff" +"undochange" "rollback" +"setup-quota" +"cleanup") + +local command i +for (( i=0; i < ${#words[@]}-1; i++ )); do +if [[ ${COMMANDS[@]} =~ ${words[i]} ]]; then +command=${words[i]} +break +fi +done + +case $prev in +--version|--help) +return 0 +;; +esac + +# supported options per command +if [[ "$cur" == -* ]]; then +case $command in +create-config) +COMPREPLY=( $( compgen -W '--fstype -f + --templete -t' -- "$cur" ) ) +return 0 +;; +list|ls) +COMPREPLY=( $( compgen -W '--type -t + --all-configs -a' -- "$cur" ) ) +return 0 +;; +create) +COMPREPLY=( $( compgen -W '--type -t + --pre-number + --print-number -p + --description -d + --cleanup-algorithm -c + --userdata -u + --command' -- "$cur" ) ) +return 0 +;; +modify) +COMPREPLY=( $( compgen -W '--description -d + --cleanup-algorithm -c + --userdata -u' -- "$cur" ) ) +return 0 +;; +delete|remove|rm) +COMPREPLY=( $( compgen -W '--sync -s + ' -- "$cur" ) ) +return 0 +;; +status) +COMPREPLY=( $( compgen -W '--output -o +' -- "$cur" ) ) +return 0 +;; +