diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-16 10:58:30 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-16 10:58:30 +0000 |
| commit | 54d62d5414e10237a6589b0750c8e89d10c395af (patch) | |
| tree | 290085e8b285dfba0018794f1fb6b597854948ae | |
| parent | Open /dev/null as stdout and stderr before envoking sendmail (diff) | |
Install the exec wrappers into $(prefix)/sbin/fpstatic
| -rw-r--r-- | www/mod_frontpage/files/patch-Makefile.PL | 12 | ||||
| -rw-r--r-- | www/mod_frontpage/files/patch-Makefile.in | 23 |
2 files changed, 31 insertions, 4 deletions
diff --git a/www/mod_frontpage/files/patch-Makefile.PL b/www/mod_frontpage/files/patch-Makefile.PL index 3d45591deedb..576ccc9e3172 100644 --- a/www/mod_frontpage/files/patch-Makefile.PL +++ b/www/mod_frontpage/files/patch-Makefile.PL @@ -1,5 +1,5 @@ --- Makefile.PL.orig Tue Mar 12 22:07:07 2002 -+++ Makefile.PL Thu May 16 11:52:08 2002 ++++ Makefile.PL Thu May 16 12:21:00 2002 @@ -9,14 +9,28 @@ # FP extensions 5.0 from Martin Blapp <mbr@freebsd.org> # @@ -45,8 +45,14 @@ } else { $defaultid=99; } if ($uid < $defaultid) { -@@ -162,7 +176,8 @@ - $_=~ s|"\$\(fpstatic_bin\)|\\\\\"$sbindir\/fpstatic\\\\|; +@@ -158,11 +172,12 @@ + $_=~ s|\$\(fpexec_logexec\)|$errorlog|; + $_=~ s|\$\(fpexec_userdir\)|$userdir|; + $_=~ s|\$\(fpexec_docroot\)|$documentroot|; +-$_=~ s|"\$\(fpexec_bin\)|\\\\\"$sbindir\/fpexec\\\\|; +-$_=~ s|"\$\(fpstatic_bin\)|\\\\\"$sbindir\/fpstatic\\\\|; ++$_=~ s|"\$\(fpexec_bin\)|\\\\\"$prefix\/sbin\/fpexec\\\\|; ++$_=~ s|"\$\(fpstatic_bin\)|\\\\\"$prefix\/sbin\/fpstatic\\\\|; $_=~ s|\$\(httpdconf\)|$httpdconf|; $_=~ s|\$\(libexecdir\)|$libexecdir|; -if ($flavor eq "FreeBSD") { $_=~ s|root.root|root:wheel|;} diff --git a/www/mod_frontpage/files/patch-Makefile.in b/www/mod_frontpage/files/patch-Makefile.in index c2ba2b40feeb..15710c2196df 100644 --- a/www/mod_frontpage/files/patch-Makefile.in +++ b/www/mod_frontpage/files/patch-Makefile.in @@ -1,5 +1,5 @@ --- Makefile.in.orig Tue Mar 12 22:07:06 2002 -+++ Makefile.in Thu May 16 11:27:06 2002 ++++ Makefile.in Thu May 16 12:17:42 2002 @@ -22,8 +22,9 @@ -DFP_LOG_EXEC=\"$(fpexec_logexec)\" \ -DFP_USERDIR_SUFFIX=\"$(fpexec_userdir)\" \ @@ -12,3 +12,24 @@ -DFP_USER=\"bin\" \ -DFP_GROUP=\"bin\" \ -DFP_HTACCESS=\".htaccess\" \ +@@ -49,8 +50,8 @@ + # and activate it in the Apache configuration + install: all + $(APXS) -i -a -n 'frontpage' mod_frontpage.so +- $(install) -m 4550 -o root -g $(fpexec_gidcaller) fpexec $(sbindir)/fpexec +- $(install) -m 0555 -o root -g $(fpexec_gidcaller) fpstatic $(sbindir)/fpstatic ++ $(install) -m 4550 -o root -g $(fpexec_gidcaller) fpexec $(prefix)/sbin/fpexec ++ $(install) -m 0555 -o root -g $(fpexec_gidcaller) fpstatic $(prefix)/sbin/fpstatic + touch $(fpexec_logexec) + chown $(fpexec_uidcaller) $(fpexec_logexec) + +@@ -73,7 +74,7 @@ + $(APACHECTL) stop + + uninstall: +- rm -f $(sbindir)/fpexec +- rm -f $(sbindir)/fpstatic ++ rm -f $(prefix)/sbin/fpexec ++ rm -f $(prefix)/sbin/fpstatic + rm -f $(libexecdir)/mod_frontpage.so + $(APXS) -e -A -n 'frontpage' mod_frontpage.so |