You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2005/02/09 02:33:54 UTC
svn commit: r152971 - in spamassassin/trunk: Makefile.PL spamassassin.raw
Author: quinlan
Date: Tue Feb 8 17:33:52 2005
New Revision: 152971
URL: http://svn.apache.org/viewcvs?view=rev&rev=152971
Log:
bug 4124: try to work around untainting issue by using absolute paths
Modified:
spamassassin/trunk/Makefile.PL
spamassassin/trunk/spamassassin.raw
Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/Makefile.PL?view=diff&r1=152970&r2=152971
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Tue Feb 8 17:33:52 2005
@@ -1077,6 +1077,7 @@
-DPREFIX="$(I_PREFIX)" \
-DDEF_RULES_DIR="$(I_DATADIR)" \
-DLOCAL_RULES_DIR="$(I_CONFDIR)" \
+ -DINSTALLBIN="$(INSTALLBIN)" \
-DINSTALLSITELIB="$(I_LIBDIR)" \
-DCONTACT_ADDRESS="$(CONTACT_ADDRESS)"
Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?view=diff&r1=152970&r2=152971
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Tue Feb 8 17:33:52 2005
@@ -21,6 +21,11 @@
use File::Spec;
+# try running directly
+if (-f "@@INSTALLBIN@@/sa-filter") {
+ exec "@@INSTALLBIN@@/sa-filter", @ARGV;
+}
+
# try to find binary
eval {
my @bin = File::Spec->splitpath($0);
@@ -30,9 +35,6 @@
$bin =~ s|//sa-filter|/sa-filter|;
exec $bin, @ARGV;
};
-
-# try using the PATH
-exec 'sa-filter', @ARGV;
# die
die "ERROR! unable to locate sa-filter script!\n";