Date: Friday, March 19, 2021 @ 15:23:23 Author: mtorromeo Revision: 894655
archrelease: copy trunk to community-x86_64 Added: snapper/repos/community-x86_64/PKGBUILD (from rev 894654, snapper/trunk/PKGBUILD) snapper/repos/community-x86_64/conf-d.patch (from rev 894654, snapper/trunk/conf-d.patch) snapper/repos/community-x86_64/cron-rename.patch (from rev 894654, snapper/trunk/cron-rename.patch) snapper/repos/community-x86_64/drift-file-path.patch (from rev 894654, snapper/trunk/drift-file-path.patch) snapper/repos/community-x86_64/usr-paths.patch (from rev 894654, snapper/trunk/usr-paths.patch) Deleted: snapper/repos/community-x86_64/PKGBUILD snapper/repos/community-x86_64/conf-d.patch snapper/repos/community-x86_64/cron-rename.patch snapper/repos/community-x86_64/drift-file-path.patch snapper/repos/community-x86_64/jsonc-config-fix.patch snapper/repos/community-x86_64/usr-paths.patch ------------------------+ PKGBUILD | 119 ++++++++++++++++++++++------------------------- conf-d.patch | 98 +++++++++++++++++++------------------- cron-rename.patch | 30 +++++------ drift-file-path.patch | 20 +++---- jsonc-config-fix.patch | 13 ----- usr-paths.patch | 74 ++++++++++++++--------------- 6 files changed, 169 insertions(+), 185 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-03-19 15:23:14 UTC (rev 894654) +++ PKGBUILD 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,61 +0,0 @@ -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> -# Contributor: Tom Kuther <gim...@sonnenkinder.org> - -pkgname=snapper -pkgver=0.8.15 -pkgrel=1 -pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping." -arch=('x86_64') -url="http://snapper.io" -license=('GPL2') -depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl' 'json-c') -makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd') -optdepends=('pam: pam_snapper') -backup=('etc/conf.d/snapper') -source=("https://github.com/openSUSE/snapper/archive/v$pkgver/$pkgname-$pkgver.tar.gz" - "conf-d.patch" - "cron-rename.patch" - "drift-file-path.patch" - "usr-paths.patch" - "jsonc-config-fix.patch") -sha256sums=('fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2' - '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106' - 'df980fe0faa6a21f8df59b90d486e50e4fc766de808049e77a52d1a73d139b82' - '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6' - 'a49de7878ee5420bec934542699e9b57861666686d05406dc863f6a557f7f253' - 'e44531677707871999bc6522b533f5581ec40e9a08412c291c77ab795a4727c3') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/conf-d.patch" - patch -p1 -i "$srcdir/cron-rename.patch" - patch -p1 -i "$srcdir/drift-file-path.patch" - patch -p1 -i "$srcdir/usr-paths.patch" - patch -p1 -i "$srcdir/jsonc-config-fix.patch" -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - aclocal - libtoolize --force --automake --copy - autoheader - automake --add-missing --copy - autoconf - ./configure --prefix=/usr \ - --sbindir=/usr/bin \ - --with-conf=/etc/conf.d \ - --disable-zypp \ - --disable-silent-rules - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 data/sysconfig.snapper \ - "$pkgdir"/etc/conf.d/snapper - - rm -rf "$pkgdir/usr/lib/snapper/testsuite/" -} Copied: snapper/repos/community-x86_64/PKGBUILD (from rev 894654, snapper/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-03-19 15:23:23 UTC (rev 894655) @@ -0,0 +1,58 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Tom Kuther <gim...@sonnenkinder.org> + +pkgname=snapper +pkgver=0.8.16 +pkgrel=1 +pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping." +arch=('x86_64') +url="http://snapper.io" +license=('GPL2') +depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl' 'json-c') +makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd') +optdepends=('pam: pam_snapper') +backup=('etc/conf.d/snapper') +source=("https://github.com/openSUSE/snapper/archive/v$pkgver/$pkgname-$pkgver.tar.gz" + "conf-d.patch" + "cron-rename.patch" + "drift-file-path.patch" + "usr-paths.patch") +sha256sums=('391aeca9f95b1da64833a844e6e3779a8e5d955d74eba59e314dbb591bd215cd' + '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106' + 'df980fe0faa6a21f8df59b90d486e50e4fc766de808049e77a52d1a73d139b82' + '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6' + 'a49de7878ee5420bec934542699e9b57861666686d05406dc863f6a557f7f253') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -p1 -i "$srcdir/conf-d.patch" + patch -p1 -i "$srcdir/cron-rename.patch" + patch -p1 -i "$srcdir/drift-file-path.patch" + patch -p1 -i "$srcdir/usr-paths.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + aclocal + libtoolize --force --automake --copy + autoheader + automake --add-missing --copy + autoconf + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --with-conf=/etc/conf.d \ + --disable-zypp \ + --disable-silent-rules + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 data/sysconfig.snapper \ + "$pkgdir"/etc/conf.d/snapper + + rm -rf "$pkgdir/usr/lib/snapper/testsuite/" +} Deleted: conf-d.patch =================================================================== --- conf-d.patch 2021-03-19 15:23:14 UTC (rev 894654) +++ conf-d.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,49 +0,0 @@ -diff --git a/scripts/pam_snapper_userdel.sh b/scripts/pam_snapper_userdel.sh -index 30be9be..1ffa63e 100755 ---- a/scripts/pam_snapper_userdel.sh -+++ b/scripts/pam_snapper_userdel.sh -@@ -40,7 +40,7 @@ fi - if [ ${DRYRUN} == 0 ] ; then - # Delete the snapper configuration - # This deletes $SNAPPERCFGDIR/home_${MYUSER} -- # removes "home_${MYUSER}" from /etc/sysconfig/snapper -+ # removes "home_${MYUSER}" from /etc/conf.d/snapper - # and deletes all snapshots - ${CMD_SNAPPER} -c home_${MYUSER} delete-config - # Delete the USER's home subvolume -diff --git a/scripts/snapper-daily b/scripts/snapper-daily -index 27e7a10..2ee7fff 100755 ---- a/scripts/snapper-daily -+++ b/scripts/snapper-daily -@@ -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/scripts/snapper-hourly b/scripts/snapper-hourly -index bc6cd4d..1ef49ff 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 - - Copied: snapper/repos/community-x86_64/conf-d.patch (from rev 894654, snapper/trunk/conf-d.patch) =================================================================== --- conf-d.patch (rev 0) +++ conf-d.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -0,0 +1,49 @@ +diff --git a/scripts/pam_snapper_userdel.sh b/scripts/pam_snapper_userdel.sh +index 30be9be..1ffa63e 100755 +--- a/scripts/pam_snapper_userdel.sh ++++ b/scripts/pam_snapper_userdel.sh +@@ -40,7 +40,7 @@ fi + if [ ${DRYRUN} == 0 ] ; then + # Delete the snapper configuration + # This deletes $SNAPPERCFGDIR/home_${MYUSER} +- # removes "home_${MYUSER}" from /etc/sysconfig/snapper ++ # removes "home_${MYUSER}" from /etc/conf.d/snapper + # and deletes all snapshots + ${CMD_SNAPPER} -c home_${MYUSER} delete-config + # Delete the USER's home subvolume +diff --git a/scripts/snapper-daily b/scripts/snapper-daily +index 27e7a10..2ee7fff 100755 +--- a/scripts/snapper-daily ++++ b/scripts/snapper-daily +@@ -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/scripts/snapper-hourly b/scripts/snapper-hourly +index bc6cd4d..1ef49ff 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 + + Deleted: cron-rename.patch =================================================================== --- cron-rename.patch 2021-03-19 15:23:14 UTC (rev 894654) +++ cron-rename.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,15 +0,0 @@ -diff --git a/scripts/Makefile.am b/scripts/Makefile.am -index 2222483..4736c73 100644 ---- a/scripts/Makefile.am -+++ b/scripts/Makefile.am -@@ -17,8 +17,8 @@ endif - EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py $(pam_snapper_SCRIPTS) - - install-data-local: -- install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper -- install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper -+ install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/snapper -+ install -D snapper-daily $(DESTDIR)/etc/cron.daily/snapper - - if HAVE_ZYPP - install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py Copied: snapper/repos/community-x86_64/cron-rename.patch (from rev 894654, snapper/trunk/cron-rename.patch) =================================================================== --- cron-rename.patch (rev 0) +++ cron-rename.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -0,0 +1,15 @@ +diff --git a/scripts/Makefile.am b/scripts/Makefile.am +index 2222483..4736c73 100644 +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -17,8 +17,8 @@ endif + EXTRA_DIST = snapper-hourly snapper-daily zypp-plugin.py $(pam_snapper_SCRIPTS) + + install-data-local: +- install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/suse.de-snapper +- install -D snapper-daily $(DESTDIR)/etc/cron.daily/suse.de-snapper ++ install -D snapper-hourly $(DESTDIR)/etc/cron.hourly/snapper ++ install -D snapper-daily $(DESTDIR)/etc/cron.daily/snapper + + if HAVE_ZYPP + install -D zypp-plugin.py $(DESTDIR)/usr/lib/zypp/plugins/commit/snapper.py Deleted: drift-file-path.patch =================================================================== --- drift-file-path.patch 2021-03-19 15:23:14 UTC (rev 894654) +++ drift-file-path.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,10 +0,0 @@ -diff --git a/data/base.txt b/data/base.txt -index c75fde9..e1d5303 100644 ---- a/data/base.txt -+++ b/data/base.txt -@@ -2,4 +2,4 @@ - /etc/mtab - /var/lib/logrotate.status - /var/lib/misc/random-seed --/var/lib/ntp/drift/ntp.drift -+/var/lib/ntp/ntp.drift Copied: snapper/repos/community-x86_64/drift-file-path.patch (from rev 894654, snapper/trunk/drift-file-path.patch) =================================================================== --- drift-file-path.patch (rev 0) +++ drift-file-path.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -0,0 +1,10 @@ +diff --git a/data/base.txt b/data/base.txt +index c75fde9..e1d5303 100644 +--- a/data/base.txt ++++ b/data/base.txt +@@ -2,4 +2,4 @@ + /etc/mtab + /var/lib/logrotate.status + /var/lib/misc/random-seed +-/var/lib/ntp/drift/ntp.drift ++/var/lib/ntp/ntp.drift Deleted: jsonc-config-fix.patch =================================================================== --- jsonc-config-fix.patch 2021-03-19 15:23:14 UTC (rev 894654) +++ jsonc-config-fix.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 839d012..eead71d 100644 ---- a/configure.ac -+++ b/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 - - AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])]) Deleted: usr-paths.patch =================================================================== --- usr-paths.patch 2021-03-19 15:23:14 UTC (rev 894654) +++ usr-paths.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -1,37 +0,0 @@ -diff --git a/data/Makefile.am b/data/Makefile.am -index e2036ba..c80b269 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -18,7 +18,7 @@ install-data-local: - install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt - install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt - -- install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf -+ install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/usr/share/dbus-1/system.d/org.opensuse.Snapper.conf - install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service - - install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service -diff --git a/data/org.opensuse.Snapper.service b/data/org.opensuse.Snapper.service -index 39d7333..6c49474 100644 ---- a/data/org.opensuse.Snapper.service -+++ b/data/org.opensuse.Snapper.service -@@ -1,5 +1,5 @@ - # DBus service activation config - [D-BUS Service] - Name=org.opensuse.Snapper --Exec=/usr/sbin/snapperd -+Exec=/usr/bin/snapperd - User=root -diff --git a/pam/Makefile.am b/pam/Makefile.am -index befccf8..dd1652c 100644 ---- a/pam/Makefile.am -+++ b/pam/Makefile.am -@@ -8,7 +8,7 @@ AM_CFLAGS = -D_GNU_SOURCE -Wwrite-strings - - AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) - --securelibdir = $(shell echo /`basename $(libdir)`/security) -+securelibdir = $(shell echo /usr/`basename $(libdir)`/security) - - securelib_LTLIBRARIES = pam_snapper.la - Copied: snapper/repos/community-x86_64/usr-paths.patch (from rev 894654, snapper/trunk/usr-paths.patch) =================================================================== --- usr-paths.patch (rev 0) +++ usr-paths.patch 2021-03-19 15:23:23 UTC (rev 894655) @@ -0,0 +1,37 @@ +diff --git a/data/Makefile.am b/data/Makefile.am +index e2036ba..c80b269 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -18,7 +18,7 @@ install-data-local: + install -D -m 644 lvm.txt $(DESTDIR)/etc/snapper/filters/lvm.txt + install -D -m 644 x11.txt $(DESTDIR)/etc/snapper/filters/x11.txt + +- install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/etc/dbus-1/system.d/org.opensuse.Snapper.conf ++ install -D -m 644 org.opensuse.Snapper.conf $(DESTDIR)/usr/share/dbus-1/system.d/org.opensuse.Snapper.conf + install -D -m 644 org.opensuse.Snapper.service $(DESTDIR)/usr/share/dbus-1/system-services/org.opensuse.Snapper.service + + install -D -m 644 timeline.service $(DESTDIR)/usr/lib/systemd/system/snapper-timeline.service +diff --git a/data/org.opensuse.Snapper.service b/data/org.opensuse.Snapper.service +index 39d7333..6c49474 100644 +--- a/data/org.opensuse.Snapper.service ++++ b/data/org.opensuse.Snapper.service +@@ -1,5 +1,5 @@ + # DBus service activation config + [D-BUS Service] + Name=org.opensuse.Snapper +-Exec=/usr/sbin/snapperd ++Exec=/usr/bin/snapperd + User=root +diff --git a/pam/Makefile.am b/pam/Makefile.am +index befccf8..dd1652c 100644 +--- a/pam/Makefile.am ++++ b/pam/Makefile.am +@@ -8,7 +8,7 @@ AM_CFLAGS = -D_GNU_SOURCE -Wwrite-strings + + AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + +-securelibdir = $(shell echo /`basename $(libdir)`/security) ++securelibdir = $(shell echo /usr/`basename $(libdir)`/security) + + securelib_LTLIBRARIES = pam_snapper.la +