rpms/rsnapshot/devel rsnapshot-fix-include-conf.patch, NONE, 1.1 rsnapshot.spec, 1.15, 1.16

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/rsnapshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25319

Modified Files:
	rsnapshot.spec 
Added Files:
	rsnapshot-fix-include-conf.patch 
Log Message:
* Sun Sep 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.3.1-4
- The include_conf directive doesn't handle backticks as documented.
  This is already fixed upstream in cvs but not in a release yet.


rsnapshot-fix-include-conf.patch:
 rsnapshot-program.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rsnapshot-fix-include-conf.patch ---
diff -up rsnapshot-1.3.1/rsnapshot-program.pl.orig rsnapshot-1.3.1/rsnapshot-program.pl
--- rsnapshot-1.3.1/rsnapshot-program.pl.orig	2009-09-06 16:28:38.000000000 +0200
+++ rsnapshot-1.3.1/rsnapshot-program.pl	2009-09-06 16:27:51.000000000 +0200
@@ -504,8 +504,8 @@ sub parse_config_file {
 	# open the config file
 	my $config_file = shift() || $config_file;
 	my $CONFIG;
-	if($config_file =~ /^`.*`$/) {
-	    open($CONFIG, "$config_file|") ||
+	if($config_file =~ /^`(.*)`$/) {
+	    open($CONFIG, "$1|") ||
 	        bail("Couldn't execute \"$config_file\" to get config information\nAre you sure you have permission?");
 	} else {
 	    $CONFIG = IO::File->new($config_file)


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rsnapshot.spec	27 Jul 2009 03:16:00 -0000	1.15
+++ rsnapshot.spec	6 Sep 2009 14:32:09 -0000	1.16
@@ -6,7 +6,7 @@
 
 Name:           rsnapshot
 Version:        1.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Local and remote filesystem snapshot utility
 Group:          Applications/System
 License:        GPLv2+
@@ -17,6 +17,7 @@ BuildArch:      noarch
 # This patch enables a few defaults in the config file that make sense to have
 # enabled in linux.
 Patch0:         rsnapshot.conf.patch
+Patch1:		rsnapshot-fix-include-conf.patch
 BuildRequires:  rsync
 BuildRequires:  openssh-clients
 Requires:       openssh-clients
@@ -29,6 +30,7 @@ filesystems.  It uses hard links to save
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 # Disable the config-file testing during configure because it freaks out if
 # you're building as non-root on a system that actually has rsnapshot installed.
@@ -87,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep 06 2009 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.3.1-4
+- The include_conf directive doesn't handle backticks as documented.
+  This is already fixed upstream in cvs but not in a release yet.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild