diff options
| author | ache <ache@FreeBSD.org> | 2002-05-04 23:42:08 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2002-05-04 23:42:08 +0000 |
| commit | ae4acc1d407e1970a78f187f64fcd1521b2235d0 (patch) | |
| tree | 840bf1fa2287cc22d4cc423391905271742f0332 /www | |
| parent | de63afd0284eb8ea961b06829a324031508d2dcc (diff) | |
| download | FreeBSD-ports-ae4acc1d407e1970a78f187f64fcd1521b2235d0.zip FreeBSD-ports-ae4acc1d407e1970a78f187f64fcd1521b2235d0.tar.gz | |
Pick official proxy_http1.1_chunking.patch
Install apache.sh as apache.sh.default first
Use limits of 'www' user for apachectl
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13/Makefile | 10 | ||||
| -rw-r--r-- | www/apache13/distinfo | 1 | ||||
| -rw-r--r-- | www/apache13/files/patch-ak | 2 | ||||
| -rw-r--r-- | www/apache13/pkg-plist | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index ae2a3cf..5ce2442 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.24 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -26,8 +26,9 @@ MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ DISTNAME= apache_${PORTVERSION} -#PATCH_SITES= ${MASTER_SITES} -#PATCHFILES= apache_${PORTVERSION}-fix.diff +PATCH_SITES= http://www.apache.org/dist/httpd/patches/apply_to_1.3.24/ +PATCHFILES= proxy_http1.1_chunking.patch +PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} MAINTAINER= ache@freebsd.org @@ -80,9 +81,10 @@ pre-install: PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PKGNAME} PRE-INSTALL post-install: + @${INSTALL_DATA} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh.default @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - ${INSTALL_SCRIPT} -m 751 ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ + ${INSTALL_SCRIPT} ${WRKSRC}/apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi @${CAT} ${PKGMESSAGE} diff --git a/www/apache13/distinfo b/www/apache13/distinfo index 6e48483..128f13a 100644 --- a/www/apache13/distinfo +++ b/www/apache13/distinfo @@ -1 +1,2 @@ MD5 (apache_1.3.24.tar.gz) = ebea6588c3954731fcc318d29bc82409 +MD5 (proxy_http1.1_chunking.patch) = 52f62e5d7a8f123ef78400f21292c21f diff --git a/www/apache13/files/patch-ak b/www/apache13/files/patch-ak index 486f7ad..9f31635 100644 --- a/www/apache13/files/patch-ak +++ b/www/apache13/files/patch-ak @@ -4,7 +4,7 @@ # -------------------- -------------------- # |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| -+eval `limits -e -C daemon` >/dev/null 2>&1 ++eval `limits -e -U www` >/dev/null 2>&1 + ERROR=0 ARGV="$@" diff --git a/www/apache13/pkg-plist b/www/apache13/pkg-plist index 7872ce7..b89626e 100644 --- a/www/apache13/pkg-plist +++ b/www/apache13/pkg-plist @@ -16,7 +16,9 @@ etc/apache/mime.types.default @unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf.default; then rm -f %D/etc/apache/srm.conf; fi etc/apache/srm.conf.default @exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf -etc/rc.d/apache.sh +etc/rc.d/apache.sh.default +@exec [ -f %B/apache.sh ] || ( cp %B/%f %B/apache.sh; chmod 755 %B/apache.sh ) +@unexec if cmp -s %D/etc/rc.d/apache.sh %D/etc/rc.d/apache.sh.default; then rm -f %D/etc/rc.d/apache.sh; fi include/apache/ap.h include/apache/ap_alloc.h include/apache/ap_compat.h |
