[arch-commits] Commit in snapper/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Tue Jun 8 17:33:03 UTC 2021
Date: Tuesday, June 8, 2021 @ 17:33:03
Author: felixonmars
Revision: 959741
archrelease: copy trunk to community-staging-x86_64
Added:
snapper/repos/community-staging-x86_64/
snapper/repos/community-staging-x86_64/PKGBUILD
(from rev 959738, snapper/trunk/PKGBUILD)
snapper/repos/community-staging-x86_64/conf-d.patch
(from rev 959739, snapper/trunk/conf-d.patch)
snapper/repos/community-staging-x86_64/cron-rename.patch
(from rev 959739, snapper/trunk/cron-rename.patch)
snapper/repos/community-staging-x86_64/drift-file-path.patch
(from rev 959740, snapper/trunk/drift-file-path.patch)
snapper/repos/community-staging-x86_64/usr-paths.patch
(from rev 959740, snapper/trunk/usr-paths.patch)
-----------------------+
PKGBUILD | 58 ++++++++++++++++++++++++++++++++++++++++++++++++
conf-d.patch | 49 ++++++++++++++++++++++++++++++++++++++++
cron-rename.patch | 15 ++++++++++++
drift-file-path.patch | 10 ++++++++
usr-paths.patch | 24 +++++++++++++++++++
5 files changed, 156 insertions(+)
Copied: snapper/repos/community-staging-x86_64/PKGBUILD (from rev 959738, snapper/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-06-08 17:33:03 UTC (rev 959741)
@@ -0,0 +1,58 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Tom Kuther <gimpel at sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.9.0
+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=('ca7b17d0213aa5281ff08d968b4e029b78bb3870eb79fd7bc7f879b17f5c969e'
+ '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106'
+ 'df980fe0faa6a21f8df59b90d486e50e4fc766de808049e77a52d1a73d139b82'
+ '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6'
+ '9044decfb1a0bc4ccd640492e8caa4b360a2ea40b8ac5a90a344dc50e1855c0b')
+
+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/"
+}
Copied: snapper/repos/community-staging-x86_64/conf-d.patch (from rev 959739, snapper/trunk/conf-d.patch)
===================================================================
--- community-staging-x86_64/conf-d.patch (rev 0)
+++ community-staging-x86_64/conf-d.patch 2021-06-08 17:33:03 UTC (rev 959741)
@@ -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 959739, snapper/trunk/cron-rename.patch)
===================================================================
--- community-staging-x86_64/cron-rename.patch (rev 0)
+++ community-staging-x86_64/cron-rename.patch 2021-06-08 17:33:03 UTC (rev 959741)
@@ -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
Copied: snapper/repos/community-staging-x86_64/drift-file-path.patch (from rev 959740, snapper/trunk/drift-file-path.patch)
===================================================================
--- community-staging-x86_64/drift-file-path.patch (rev 0)
+++ community-staging-x86_64/drift-file-path.patch 2021-06-08 17:33:03 UTC (rev 959741)
@@ -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 959740, snapper/trunk/usr-paths.patch)
===================================================================
--- community-staging-x86_64/usr-paths.patch (rev 0)
+++ community-staging-x86_64/usr-paths.patch 2021-06-08 17:33:03 UTC (rev 959741)
@@ -0,0 +1,24 @@
+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
+
More information about the arch-commits
mailing list