[packages/etckeeper] up to 1.18.8

[glen]

commit 620379ec306b57cf2ed6beb6e71a0e15ce738966
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 22 15:47:40 2018 +0300

    up to 1.18.8

 etckeeper.spec   |  6 +++---
 use-libdir.patch | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/etckeeper.spec b/etckeeper.spec
index a77b39f..ea5b0a9 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -3,12 +3,12 @@
 # - Subpackages for backends (darcs, git, hg)
 Summary:	Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Name:		etckeeper
-Version:	1.18.5
+Version:	1.18.8
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	https://github.com/joeyh/etckeeper/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	c06a5f69cc6d53da6e280e7d9ddafb11
+Source0:	https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz
+# Source0-md5:	d3ce4568868324af81ed8c46f9a5d3eb
 Source1:	pre-install.sh
 Source2:	post-install.sh
 Patch1:		use-libdir.patch
diff --git a/use-libdir.patch b/use-libdir.patch
index fb7c5af..022dd60 100644
--- a/use-libdir.patch
+++ b/use-libdir.patch
@@ -1,5 +1,5 @@
---- etckeeper/etckeeper.orig	2015-03-14 18:24:26.000000000 +0100
-+++ etckeeper/etckeeper	2015-04-07 00:54:26.014557154 +0200
+--- etckeeper-1.18.8/etckeeper~	2018-08-22 15:47:48.000000000 +0300
++++ etckeeper-1.18.8/etckeeper	2018-08-22 15:49:36.932110437 +0300
 @@ -1,6 +1,10 @@
  #!/bin/sh
  set -e
@@ -22,24 +22,31 @@
  	exit 1
  fi
  
-@@ -122,13 +126,14 @@
+@@ -132,19 +132,20 @@
+ if [ "$(which perl 2>/dev/null)" != "" ]; then
+ 	lsscripts() {
+ 		LANG=C perl -e '
+-			$dir=shift;
++			for $dir (@ARGV) {
+ 			print join "\n", grep { ! -d $_ && -x $_ }
+ 				grep /^\Q$dir\/\E[-a-zA-Z0-9]+$/,
+ 				glob "$dir/*";
+-		' "$1"
++			}
++		' "$@"
+ 	}
  
- lsscripts() {
- 	LANG=C perl -e '
--		$dir=shift;
-+		for $dir (@ARGV) {
- 		print join "\n", grep { ! -d $_ && -x $_ }
- 			grep /^\Q$dir\/\E[-a-zA-Z0-9]+$/,
- 			glob "$dir/*";
--	' "$1"
-+		}
-+	' "$@"
- }
- 
--for script in $(lsscripts "$ETCKEEPER_CONF_DIR/$command.d"); do
-+for script in $(lsscripts "$ETCKEEPER_LIB_DIR/$command.d" "$ETCKEEPER_CONF_DIR/$command.d"); do
- 	"$script" "$@"
- done
+-	for script in $(lsscripts "$ETCKEEPER_CONF_DIR/$command.d"); do
++	for script in $(lsscripts "$ETCKEEPER_LIB_DIR/$command.d" "$ETCKEEPER_CONF_DIR/$command.d"); do
+ 		"$script" "$@"
+ 	done
+ else
+ 	# fallback if perl isn't present
+-	for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
++	for script in "$ETCKEEPER_LIB_DIR/$command.d/"* "$ETCKEEPER_CONF_DIR/$command.d/"*; do
+ 		if [ ! -d "$script" -a -x "$script" ]; then
+ 			echo "$script" | egrep -q "/[-a-zA-Z0-9]+$"
+ 			[ $? -eq 0 ] && "$script" "$@"
 --- etckeeper-1.18.4/debian/cron.daily~	2016-06-20 08:06:01.000000000 +0300
 +++ etckeeper-1.18.4/debian/cron.daily	2016-06-29 23:41:40.939927867 +0300
 @@ -3,6 +3,6 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/etckeeper.git/commitdiff/620379ec306b57cf2ed6beb6e71a0e15ce738966