[arch-commits] Commit in snapper/repos (6 files)

Mon Jun 13 10:55:17 UTC 2022

Date: Monday, June 13, 2022 @ 10:55:17
  Author: felixonmars
Revision: 1237451

archrelease: copy trunk to community-staging-x86_64

Added:
  snapper/repos/community-staging-x86_64/
  snapper/repos/community-staging-x86_64/PKGBUILD
    (from rev 1237450, snapper/trunk/PKGBUILD)
  snapper/repos/community-staging-x86_64/conf-d.patch
    (from rev 1237450, snapper/trunk/conf-d.patch)
  snapper/repos/community-staging-x86_64/cron-rename.patch
    (from rev 1237450, snapper/trunk/cron-rename.patch)
  snapper/repos/community-staging-x86_64/drift-file-path.patch
    (from rev 1237450, snapper/trunk/drift-file-path.patch)
  snapper/repos/community-staging-x86_64/usr-paths.patch
    (from rev 1237450, snapper/trunk/usr-paths.patch)

-----------------------+
 PKGBUILD              |   59 ++++++++++++++++++++++++++++++++++++++++++++++++
 conf-d.patch          |   49 +++++++++++++++++++++++++++++++++++++++
 cron-rename.patch     |   14 +++++++++++
 drift-file-path.patch |   10 ++++++++
 usr-paths.patch       |   12 +++++++++
 5 files changed, 144 insertions(+)

Copied: snapper/repos/community-staging-x86_64/PKGBUILD (from rev 1237450, snapper/trunk/PKGBUILD)
===================================================================

--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2022-06-13 10:55:17 UTC (rev 1237451)
@@ -0,0 +1,59 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Tom Kuther <gimpel at sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.10.2
+pkgrel=2
+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=('85cfecebe5c5023abce8cb7f985be59e5a5159d2f8dd637f3cca46c17124d7aa'
+            '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106'
+            '0e76f2aef9ac05d719e25c2d60e7eba4b533778a57fe98fd047f256c6845f65f'
+            '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6'
+            '710da7638a1c123a6985398a15cd7c03432fc3b2d781e2d7a20a1a52669eed95')
+
+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 \
+              --with-pam-security=/usr/lib/security \
+              --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-staging-x86_64/conf-d.patch (from rev 1237450, snapper/trunk/conf-d.patch)
===================================================================
--- community-staging-x86_64/conf-d.patch	                        (rev 0)
+++ community-staging-x86_64/conf-d.patch	2022-06-13 10:55:17 UTC (rev 1237451)
@@ -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
+ 
+ 

Copied: snapper/repos/community-staging-x86_64/cron-rename.patch (from rev 1237450, snapper/trunk/cron-rename.patch)
===================================================================
--- community-staging-x86_64/cron-rename.patch	                        (rev 0)
+++ community-staging-x86_64/cron-rename.patch	2022-06-13 10:55:17 UTC (rev 1237451)
@@ -0,0 +1,14 @@
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 506f74a..407382c 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -17,7 +17,7 @@ endif
+ EXTRA_DIST = snapper-hourly snapper-daily bash-completion.bash $(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
+ 	install -D --mode a+r,u+w bash-completion.bash $(DESTDIR)/usr/share/bash-completion/completions/snapper
+ 

Copied: snapper/repos/community-staging-x86_64/drift-file-path.patch (from rev 1237450, snapper/trunk/drift-file-path.patch)
===================================================================
--- community-staging-x86_64/drift-file-path.patch	                        (rev 0)
+++ community-staging-x86_64/drift-file-path.patch	2022-06-13 10:55:17 UTC (rev 1237451)
@@ -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

Copied: snapper/repos/community-staging-x86_64/usr-paths.patch (from rev 1237450, snapper/trunk/usr-paths.patch)
===================================================================
--- community-staging-x86_64/usr-paths.patch	                        (rev 0)
+++ community-staging-x86_64/usr-paths.patch	2022-06-13 10:55:17 UTC (rev 1237451)
@@ -0,0 +1,12 @@
+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
+ 

