[Git][debian-proftpd-team/proftpd][master] Issue #1079: Improve prxs detection of `configure` scripts for modules.

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
dc6b68b7 by Hilmar Preusse at 2020-09-06T19:55:57+02:00
Issue #1079: Improve prxs detection of `configure` scripts for modules.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pr_1094.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -11,6 +11,8 @@ proftpd-dfsg (1.3.7a-2) UNRELEASED; urgency=medium
     - 3c73f39f0db6724db597646eb6e476278f76edf5.diff
       Bug 4405 - Memory use-after-free in mod_sftp causes unexpected
       login/authentication issues.
+    - debian/patches/pr_1094.diff: Improve prxs detection of `configure`
+      scripts for modules.
 
   * Add patch from Andreas Trottmann <andreas.trottmann at werft22.com> to
     reintroduce "SQLAUthTypes Backend" with MySQL database


=====================================
debian/patches/pr_1094.diff
=====================================
@@ -0,0 +1,57 @@
+From dfd5abe7b47648311c8bca4e9a3f6e90582b5143 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Sun, 30 Aug 2020 09:07:07 -0700
+Subject: [PATCH] Issue #1079: Improve prxs detection of `configure` scripts
+ for modules.
+
+---
+ src/prxs.in | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+Index: proftpd/src/prxs.in
+===================================================================
+--- proftpd.orig/src/prxs.in	2020-09-06 19:53:55.818043780 +0200
++++ proftpd/src/prxs.in	2020-09-06 19:53:55.802035781 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ 
+ # ---------------------------------------------------------------------------
+-# Copyright (C) 2008-2012 TJ Saunders <tj at castaglia.org>
++# Copyright (C) 2008-2020 TJ Saunders <tj at castaglia.org>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -16,8 +16,6 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
+-#
+-#  $Id: prxs.in,v 1.10 2012-09-19 00:11:39 castaglia Exp $
+ # ---------------------------------------------------------------------------
+ 
+ use strict;
+@@ -101,7 +99,11 @@
+ 
+       if ($file =~ /\/?mod_[^\/]+\.c$/) {
+         $configure_script = $file;
+-        $configure_script =~ s/\/?mod_[^\/]+\.c$/\/configure/;
++        $configure_script =~ s/(\/?)mod_[^\/]+\.c$/\1configure/;
++
++        if ($configure_script !~ /^\//) {
++          $configure_script = './' . $configure_script;
++        }
+       }
+ 
+       my $obj = $file;
+@@ -123,7 +125,10 @@
+     # Check for any configure script for this module.  If present, error out
+     # for now.
+     if (-f $configure_script) {
+-      print STDERR "Cannot compile $mod_name using prxs; use $configure_script instead\n";
++      print STDERR "Cannot compile $mod_name using prxs; use existing $configure_script script instead:\n\n";
++      print STDERR "  $configure_script\n";
++      print STDERR "  make\n";
++      print STDERR "  make install\n";
+       exit 1;
+     }
+   }


=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@ upstream_1063
 upstream_1070
 upstream_1061
 3c73f39f0db6724db597646eb6e476278f76edf5.diff
+pr_1094.diff



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/dc6b68b70204485c96f1bc07e61b45a5a3e6e609

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/dc6b68b70204485c96f1bc07e61b45a5a3e6e609
You're receiving this email because of your account on salsa.debian.org.