[arch-commits] Commit in snapper/repos (7 files)
Felix Yan
felixonmars at archlinux.org
Sun Dec 6 22:24:20 UTC 2020
Date: Sunday, December 6, 2020 @ 22:24:20
Author: felixonmars
Revision: 771279
archrelease: copy trunk to community-staging-x86_64
Added:
snapper/repos/community-staging-x86_64/
snapper/repos/community-staging-x86_64/PKGBUILD
(from rev 771278, snapper/trunk/PKGBUILD)
snapper/repos/community-staging-x86_64/conf-d.patch
(from rev 771278, snapper/trunk/conf-d.patch)
snapper/repos/community-staging-x86_64/cron-rename.patch
(from rev 771278, snapper/trunk/cron-rename.patch)
snapper/repos/community-staging-x86_64/drift-file-path.patch
(from rev 771278, snapper/trunk/drift-file-path.patch)
snapper/repos/community-staging-x86_64/macro-iterator-fix.patch
(from rev 771278, snapper/trunk/macro-iterator-fix.patch)
snapper/repos/community-staging-x86_64/usr-paths.patch
(from rev 771278, snapper/trunk/usr-paths.patch)
--------------------------+
PKGBUILD | 61 ++++++++++
conf-d.patch | 49 ++++++++
cron-rename.patch | 15 ++
drift-file-path.patch | 10 +
macro-iterator-fix.patch | 264 +++++++++++++++++++++++++++++++++++++++++++++
usr-paths.patch | 37 ++++++
6 files changed, 436 insertions(+)
Copied: snapper/repos/community-staging-x86_64/PKGBUILD (from rev 771278, snapper/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-12-06 22:24:20 UTC (rev 771279)
@@ -0,0 +1,61 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Tom Kuther <gimpel at sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.8.14
+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')
+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"
+ "macro-iterator-fix.patch"
+ "usr-paths.patch")
+sha256sums=('d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6'
+ '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106'
+ 'df980fe0faa6a21f8df59b90d486e50e4fc766de808049e77a52d1a73d139b82'
+ '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6'
+ 'c894c041964eeb55d461d1476486b878851556892b93a6fa1738743f46027e9d'
+ '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/macro-iterator-fix.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 771278, snapper/trunk/conf-d.patch)
===================================================================
--- community-staging-x86_64/conf-d.patch (rev 0)
+++ community-staging-x86_64/conf-d.patch 2020-12-06 22:24:20 UTC (rev 771279)
@@ -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 771278, snapper/trunk/cron-rename.patch)
===================================================================
--- community-staging-x86_64/cron-rename.patch (rev 0)
+++ community-staging-x86_64/cron-rename.patch 2020-12-06 22:24:20 UTC (rev 771279)
@@ -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 771278, snapper/trunk/drift-file-path.patch)
===================================================================
--- community-staging-x86_64/drift-file-path.patch (rev 0)
+++ community-staging-x86_64/drift-file-path.patch 2020-12-06 22:24:20 UTC (rev 771279)
@@ -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/macro-iterator-fix.patch (from rev 771278, snapper/trunk/macro-iterator-fix.patch)
===================================================================
--- community-staging-x86_64/macro-iterator-fix.patch (rev 0)
+++ community-staging-x86_64/macro-iterator-fix.patch 2020-12-06 22:24:20 UTC (rev 771279)
@@ -0,0 +1,264 @@
+diff --git a/client/Command.h b/client/Command.h
+index 9ce7760..53cb601 100644
+--- a/client/Command.h
++++ b/client/Command.h
+@@ -23,6 +23,7 @@
+ #define SNAPPER_CLI_COMMAND_H
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+
+ #include "client/GlobalOptions.h"
+diff --git a/client/Options.h b/client/Options.h
+index 10bfe1d..f94688f 100644
+--- a/client/Options.h
++++ b/client/Options.h
+@@ -23,6 +23,7 @@
+ #define SNAPPER_CLI_OPTIONS_H
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+
+ #include "client/utils/GetOpts.h"
+diff --git a/client/cleanup.cc b/client/cleanup.cc
+index e1d5f5b..0c2a084 100644
+--- a/client/cleanup.cc
++++ b/client/cleanup.cc
+@@ -22,6 +22,7 @@
+
+
+ #include <iostream>
++#include <iterator>
+ #include <vector>
+
+ #include "dbus/DBusMessage.h"
+diff --git a/client/commands.h b/client/commands.h
+index 11cbc0e..9db78dd 100644
+--- a/client/commands.h
++++ b/client/commands.h
+@@ -22,6 +22,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <map>
+
+diff --git a/client/proxy.h b/client/proxy.h
+index 606105e..828a786 100644
+--- a/client/proxy.h
++++ b/client/proxy.h
+@@ -25,6 +25,7 @@
+
+
+ #include <memory>
++#include <iterator>
+ #include <vector>
+ #include <list>
+ #include <map>
+diff --git a/client/types.h b/client/types.h
+index 9217eac..86fc101 100644
+--- a/client/types.h
++++ b/client/types.h
+@@ -22,6 +22,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <map>
+
+diff --git a/dbus/DBusMessage.h b/dbus/DBusMessage.h
+index 09190d0..bf5c519 100644
+--- a/dbus/DBusMessage.h
++++ b/dbus/DBusMessage.h
+@@ -28,6 +28,7 @@
+ #include <dbus/dbus.h>
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <list>
+ #include <map>
+diff --git a/snapper/Acls.h b/snapper/Acls.h
+index 6aa5d7e..4bed783 100644
+--- a/snapper/Acls.h
++++ b/snapper/Acls.h
+@@ -22,6 +22,7 @@
+ #define SNAPPER_ACLS_H
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <sys/acl.h>
+
+diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h
+index 75947a1..3b52d65 100644
+--- a/snapper/AppUtil.h
++++ b/snapper/AppUtil.h
+@@ -32,6 +32,7 @@
+ #include <string>
+ #include <list>
+ #include <map>
++#include <iterator>
+ #include <vector>
+ #include <stdexcept>
+ #include <chrono>
+diff --git a/snapper/AsciiFile.h b/snapper/AsciiFile.h
+index 63e0abb..930333a 100644
+--- a/snapper/AsciiFile.h
++++ b/snapper/AsciiFile.h
+@@ -25,6 +25,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <map>
+
+diff --git a/snapper/BtrfsUtils.h b/snapper/BtrfsUtils.h
+index dd3dd17..65dc21a 100644
+--- a/snapper/BtrfsUtils.h
++++ b/snapper/BtrfsUtils.h
+@@ -27,6 +27,7 @@
+
+ #include <stdint.h>
+ #include <string>
++#include <iterator>
+ #include <vector>
+
+
+diff --git a/snapper/Compare.h b/snapper/Compare.h
+index 0b56c85..fbff80c 100644
+--- a/snapper/Compare.h
++++ b/snapper/Compare.h
+@@ -25,6 +25,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <functional>
+
+diff --git a/snapper/Enum.h b/snapper/Enum.h
+index f2abd7f..279d370 100644
+--- a/snapper/Enum.h
++++ b/snapper/Enum.h
+@@ -25,6 +25,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <algorithm>
+ #include <exception>
+diff --git a/snapper/File.h b/snapper/File.h
+index ade271b..9cf7547 100644
+--- a/snapper/File.h
++++ b/snapper/File.h
+@@ -27,6 +27,7 @@
+ #include <sys/stat.h>
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+
+
+diff --git a/snapper/FileUtils.h b/snapper/FileUtils.h
+index 21eed79..c318251 100644
+--- a/snapper/FileUtils.h
++++ b/snapper/FileUtils.h
+@@ -26,6 +26,7 @@
+
+ #include <fcntl.h>
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <functional>
+ #include <boost/thread.hpp>
+diff --git a/snapper/Filesystem.h b/snapper/Filesystem.h
+index fb8f020..dcd904d 100644
+--- a/snapper/Filesystem.h
++++ b/snapper/Filesystem.h
+@@ -26,6 +26,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <utility>
+
+diff --git a/snapper/LvmCache.cc b/snapper/LvmCache.cc
+index f610b60..f62d32c 100644
+--- a/snapper/LvmCache.cc
++++ b/snapper/LvmCache.cc
+@@ -20,6 +20,7 @@
+
+ #include "config.h"
+
++#include <iterator>
+ #include <vector>
+ #include <boost/algorithm/string.hpp>
+
+diff --git a/snapper/LvmCache.h b/snapper/LvmCache.h
+index 5d5e3e3..24a2abf 100644
+--- a/snapper/LvmCache.h
++++ b/snapper/LvmCache.h
+@@ -24,6 +24,7 @@
+ #include <map>
+ #include <set>
+ #include <string>
++#include <iterator>
+ #include <vector>
+
+ #include <boost/noncopyable.hpp>
+diff --git a/snapper/Snapper.h b/snapper/Snapper.h
+index cd36e75..49cafb7 100644
+--- a/snapper/Snapper.h
++++ b/snapper/Snapper.h
+@@ -25,6 +25,7 @@
+ #define SNAPPER_SNAPPER_H
+
+
++#include <iterator>
+ #include <vector>
+ #include <boost/noncopyable.hpp>
+
+diff --git a/snapper/SnapperTypes.h b/snapper/SnapperTypes.h
+index 6b482ce..f670a78 100644
+--- a/snapper/SnapperTypes.h
++++ b/snapper/SnapperTypes.h
+@@ -25,6 +25,7 @@
+
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <ostream>
+ #include <boost/algorithm/string.hpp>
+diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h
+index 3d38604..a11a3a4 100644
+--- a/snapper/SystemCmd.h
++++ b/snapper/SystemCmd.h
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+
+ #include <string>
++#include <iterator>
+ #include <vector>
+ #include <list>
+ #include <boost/noncopyable.hpp>
+diff --git a/snapper/XAttributes.h b/snapper/XAttributes.h
+index 434b4d9..014fe4d 100644
+--- a/snapper/XAttributes.h
++++ b/snapper/XAttributes.h
+@@ -24,6 +24,7 @@
+
+ #include <stdint.h>
+ #include <map>
++#include <iterator>
+ #include <vector>
+ #include <string>
+ #include <ostream>
Copied: snapper/repos/community-staging-x86_64/usr-paths.patch (from rev 771278, snapper/trunk/usr-paths.patch)
===================================================================
--- community-staging-x86_64/usr-paths.patch (rev 0)
+++ community-staging-x86_64/usr-paths.patch 2020-12-06 22:24:20 UTC (rev 771279)
@@ -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
+
More information about the arch-commits
mailing list