[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-17-gde8924f

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 2efa75b4b450668eeaaf475f9d629effe717f5f4
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 15 12:18:38 2011 +0100

    Fixed prxs to cope correctly with libtool.

diff --git a/debian/changelog b/debian/changelog
index e814162..2fdfb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ proftpd-dfsg (1.3.3d-3) unstable; urgency=low
     (closes: #605781)
   * Added commented TZ explicit set in proftpd.conf template. Thanks John Wright.
     (closes: #576888)
+  * [PATCH] prxs.in fixed to avoid using the shell to call libtool.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 13 Feb 2011 12:47:31 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 12:16:48 +0100
 
 proftpd-dfsg (1.3.3d-2) unstable; urgency=low
 
diff --git a/debian/patches/prxs b/debian/patches/prxs
new file mode 100644
index 0000000..f77184f
--- /dev/null
+++ b/debian/patches/prxs
@@ -0,0 +1,48 @@
+Index: proftpd-dfsg/src/prxs.in
+===================================================================
+--- proftpd-dfsg.orig/src/prxs.in	2011-02-15 12:16:15.000000000 +0100
++++ proftpd-dfsg/src/prxs.in	2011-02-15 12:16:31.000000000 +0100
+@@ -49,8 +49,6 @@
+   $libtool = $ENV{LIBTOOL};
+ }
+ 
+-my $shell = q(@SHELL@);
+-
+ my $opts = {};
+ GetOptions($opts, 'c|compile', 'i|install', 'd|clean', 'h|help', 'name=s',
+   'D=s@', 'I=s@', 'L=s@', 'l=s@', 'W=s@');
+@@ -117,7 +115,7 @@
+ 
+   my $cmds = [];
+   foreach my $src (@$srcs) {
+-    push(@$cmds, "$shell $libtool --mode=compile $compiler $cflags -c $src");
++    push(@$cmds, "$libtool --mode=compile $compiler $cflags -c $src");
+   }
+ 
+   run_cmds($cmds);
+@@ -169,14 +167,14 @@
+   }
+ 
+   $cmds = [];
+-  push(@$cmds, "$shell $libtool --mode=link $compiler -o $mod_name.la -rpath $libexecdir $ldflags $objlist $libs");
++  push(@$cmds, "$libtool --mode=link $compiler -o $mod_name.la -rpath $libexecdir $ldflags $objlist $libs");
+ 
+   run_cmds($cmds);
+ }
+ 
+ if (defined($opts->{i})) {
+   my $cmds = [];
+-  push(@$cmds, "$shell $libtool --mode=install $installer $install_strip $mod_name.la $ENV{DESTDIR}$libexecdir");
++  push(@$cmds, "$libtool --mode=install $installer $install_strip $mod_name.la $ENV{DESTDIR}$libexecdir");
+ 
+   run_cmds($cmds);
+ 
+@@ -194,7 +192,7 @@
+ 
+ if (defined($opts->{d})) {
+   my $cmds = [];
+-  push(@$cmds, "$shell $libtool --mode=clean rm -f $mod_name.la *.lo");
++  push(@$cmds, "$libtool --mode=clean rm -f $mod_name.la *.lo");
+ 
+   run_cmds($cmds);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 1ee091e..0ceaeb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ ftpstats
 mod_cap
 odbc
 mod_vroot
+prxs

-- 
ProFTPD core package