X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=use-libdir.patch;h=a643d850fb0d605a605addbacca856374ab26c49;hb=8611c61e7c359e116b98be0d9828262ec818bf53;hp=df5dcecfe6d8edbbc34abe563a87094d12b9dcb9;hpb=7150bf21db96ba9d7967b3b0a8d4750c2e37fdaf;p=packages%2Fetckeeper.git

diff --git a/use-libdir.patch b/use-libdir.patch
index df5dcec..a643d85 100644
--- a/use-libdir.patch
+++ b/use-libdir.patch
@@ -1,5 +1,5 @@
---- etckeeper-1.1/etckeeper	2012-12-28 18:09:51.000000000 +0200
-+++ etckeeper-1.1/etckeeper	2013-05-07 13:05:25.000000000 +0300
+--- etckeeper/etckeeper.orig	2015-03-14 18:24:26.000000000 +0100
++++ etckeeper/etckeeper	2015-04-07 00:54:26.014557154 +0200
 @@ -1,6 +1,10 @@
  #!/bin/sh
  set -e
@@ -11,7 +11,7 @@
  if [ -z "$ETCKEEPER_CONF_DIR" ]; then
  	ETCKEEPER_CONF_DIR=/etc/etckeeper
  fi
-@@ -71,8 +75,8 @@
+@@ -84,8 +88,8 @@
  	command=pre-install
  fi
  
@@ -22,10 +22,10 @@
  	exit 1
  fi
  
-@@ -109,13 +113,14 @@
+@@ -122,13 +126,14 @@
  
  lsscripts() {
- 	perl -e '
+ 	LANG=C perl -e '
 -		$dir=shift;
 +		for $dir (@ARGV) {
  		print join "\n", grep { ! -d $_ && -x $_ }
@@ -37,7 +37,6 @@
  }
  
 -for script in $(lsscripts "$ETCKEEPER_CONF_DIR/$command.d"); do
--	"$script" "$@"
 +for script in $(lsscripts "$ETCKEEPER_LIB_DIR/$command.d" "$ETCKEEPER_CONF_DIR/$command.d"); do
-+	"$script" "$@"
+ 	"$script" "$@"
  done