diff options
| -rw-r--r-- | www/mod_frontpage/Makefile | 7 | ||||
| -rw-r--r-- | www/mod_frontpage/distinfo | 2 | ||||
| -rw-r--r-- | www/mod_frontpage/files/patch-Makefile.PL | 22 | ||||
| -rw-r--r-- | www/mod_frontpage/files/patch-Makefile.in | 29 | ||||
| -rw-r--r-- | www/mod_frontpage/files/patch-mod_frontpage.c | 11 |
5 files changed, 15 insertions, 56 deletions
diff --git a/www/mod_frontpage/Makefile b/www/mod_frontpage/Makefile index b7e7a3b36826..f106acd0a6a3 100644 --- a/www/mod_frontpage/Makefile +++ b/www/mod_frontpage/Makefile @@ -5,13 +5,14 @@ # $FreeBSD$ PORTNAME= mod_frontpage -PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 CATEGORIES= www -MASTER_SITES= http://people.freebsd.org/~mbr/distfiles/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/mirfak/g} +DISTFILES= ${PORTNAME}_mirfak-${PORTVERSION}.tar.gz MAINTAINER= mbr@FreeBSD.org +WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION} AP_PORT?= apache13 BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${AP_PORT} diff --git a/www/mod_frontpage/distinfo b/www/mod_frontpage/distinfo index cb80170ca20b..443e09d73a80 100644 --- a/www/mod_frontpage/distinfo +++ b/www/mod_frontpage/distinfo @@ -1 +1 @@ -MD5 (mod_frontpage-1.6.1.tar.gz) = ca2bc12b8398b1d82dc94fe7fda42e74 +MD5 (mod_frontpage_mirfak-1.6.2.tar.gz) = 5dbae3d1d706c24f3ffcd3f5121c517a diff --git a/www/mod_frontpage/files/patch-Makefile.PL b/www/mod_frontpage/files/patch-Makefile.PL index 59faa42dcaa7..4ebd456a5c26 100644 --- a/www/mod_frontpage/files/patch-Makefile.PL +++ b/www/mod_frontpage/files/patch-Makefile.PL @@ -1,12 +1,10 @@ ---- Makefile.PL Sun Feb 3 12:20:53 2002 -+++ Makefile.PL Tue Feb 5 18:19:43 2002 -@@ -110,7 +110,8 @@ - $_=~ s|\$\(install\)|$install|; - #$_=~ s|\$\(\)|$|; - #$_=~ s|\$\(\)|$|; --$_=~ s|\$\(fpexec_caller\)|$user|; -+$_=~ s|\$\(fpexec_uidcaller\)|$user|; -+$_=~ s|\$\(fpexec_gidcaller\)|$group|; - $_=~ s|\$\(fpexec_uidmin\)|$uid|; - $_=~ s|\$\(fpexec_gidmin\)|$gid|; - $_=~ s|\$\(fpexec_logexec\)|$errorlog|; +--- Makefile.PL.orig Sat May 4 14:25:20 2002 ++++ Makefile.PL Sat May 4 14:25:23 2002 +@@ -10,6 +10,7 @@ + # + + $flavor=`uname`; ++chop $flavor; + if (-e "/etc/mandrake-release") {$flavor="Mandrake";} + + if ($flavor eq "FreeBSD") { $thechoice="/usr/local/sbin/httpd"; diff --git a/www/mod_frontpage/files/patch-Makefile.in b/www/mod_frontpage/files/patch-Makefile.in deleted file mode 100644 index 3e4a3d6835b0..000000000000 --- a/www/mod_frontpage/files/patch-Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- Makefile.in Mon Feb 4 21:19:21 2002 -+++ Makefile.in Tue Feb 5 18:19:23 2002 -@@ -16,7 +16,7 @@ - DEF= -DFPEXEC_BIN=\"$(fpexec_bin)\" \ - -DFPSTATIC_BIN=\"$(fpstatic_bin)\" - --DEF2= -DFP_HTTPD_USER=\"$(fpexec_caller)\" \ -+DEF2= -DFP_HTTPD_USER=\"$(fpexec_uidcaller)\" \ - -DFP_UID_MIN=$(fpexec_uidmin) \ - -DFP_GID_MIN=$(fpexec_gidmin) \ - -DFP_LOG_EXEC=\"$(fpexec_logexec)\" \ -@@ -49,14 +49,10 @@ - # and activate it in the Apache configuration - install: all - $(APXS) -i -a -n 'frontpage' mod_frontpage.so -- $(install) fpexec $(sbindir)/fpexec -- chown root.root $(sbindir)/fpexec -- chmod 4711 $(sbindir)/fpexec -- $(install) fpstatic $(sbindir)/fpstatic -- chown root.root $(sbindir)/fpstatic -- chmod 755 $(sbindir)/fpstatic -+ $(install) -m 4550 -o root -g $(fpexec_gidcaller) fpexec $(sbindir)/fpexec -+ $(install) -m 0555 -o root -g $(fpexec_gidcaller) fpstatic $(sbindir)/fpstatic - touch $(fpexec_logexec) -- chown $(fpexec_caller) $(fpexec_logexec) -+ chown $(fpexec_uidcaller) $(fpexec_logexec) - - # cleanup - clean: diff --git a/www/mod_frontpage/files/patch-mod_frontpage.c b/www/mod_frontpage/files/patch-mod_frontpage.c index 946bf27fd8fb..dac6c0490fbc 100644 --- a/www/mod_frontpage/files/patch-mod_frontpage.c +++ b/www/mod_frontpage/files/patch-mod_frontpage.c @@ -9,14 +9,3 @@ */ if (c->admindisabled == -1) c->admindisabled = TRUE; -@@ -491,10 +491,6 @@ - return log_scripterror (r, c, FORBIDDEN, APLOG_ERR|APLOG_NOERRNO, - "fpEXEC stub writable by group or others"); - } -- if (!(r->finfo.st_mode & S_IXOTH)) { -- return log_scripterror (r, c, FORBIDDEN, APLOG_ERR|APLOG_NOERRNO, -- "fpEXEC stub not executable by others"); -- } - if (((r->finfo.st_mode & S_ISGID)) - && (r->finfo.st_gid != 0)) { - return log_scripterror (r, c, FORBIDDEN, APLOG_ERR|APLOG_NOERRNO, |