From owner-ports-jp@jp.freebsd.org  Sat Apr  7 17:19:10 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id RAA67358;
	Sat, 7 Apr 2001 17:19:10 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from mx.ma.nma.ne.jp (mx.ma.nma.ne.jp [61.125.128.21])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with SMTP id RAA67351
	for <ports-jp@jp.freebsd.org>; Sat, 7 Apr 2001 17:19:09 +0900 (JST)
	(envelope-from don@ma.nma.ne.jp)
Message-Id: <200104070819.RAA67351@castle.jp.freebsd.org>
Received: (qmail 13245 invoked from network); 7 Apr 2001 17:18:58 +0900
Received: from unknown (HELO apc) (61.125.131.226)
  by mx.ma.nma.ne.jp with SMTP; 7 Apr 2001 17:18:58 +0900
Date: Sat, 07 Apr 2001 17:18:58 +0900
From: IWATSUKI Hiroyuki <don@ma.nma.ne.jp>
To: ports-jp@jp.freebsd.org
Organization: Natsume Co., Ltd.
In-Reply-To: <200104070724.QAA64949@castle.jp.freebsd.org>
References: <200104070724.QAA64949@castle.jp.freebsd.org>
X-Mailer: Datula version 1.51.08.01 for Windows
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+010328
X-Sequence: ports-jp 10908
Subject: [ports-jp 10908] Re: www/apache13
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: don@ma.nma.ne.jp

$B4d7n$H?=$7$^$9!#(B

$B$9$_$^$;$s!"CfESH>C<$J>uBV$N%Q%C%A$rAw$C$F$7$^$$$^$7$?!#(B

--- Makefile.orig       Sat Apr  7 09:41:51 2001
+++ Makefile    Sat Apr  7 17:03:55 2001
@@ -35,13 +35,19 @@
 # Set APACHE_PERF_TUNING env. variable to YES to get maximum performance
 #
 
+HTTPD_USER?=   www
+HTTPD_GRUOP?=  www
+USER_WEB_DIR?= public_html
+PLIST=         ${WRKDIR}/PLIST
+
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS=        \
                --prefix=${PREFIX} \
                --server-gid=nogroup \
                --with-perl=${PERL} \
                --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
-               --suexec-docroot=${PREFIX}/www/data \
+               --server-uid=${HTTPD_USER} \
+               --server-gid=${HTTPD_GROUP} \
                --without-confadjust \
                --enable-module=most \
                --enable-module=auth_db \
@@ -63,6 +69,23 @@
 
 MAN1=          dbmmanage.1 htdigest.1 htpasswd.1
 MAN8=          ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8
+
+.if defined(SUEXEC)
+CONFIGURE_ARGS+=       --enable-suexec \
+                       --suexec-caller=${HTTPD_USER} \
+                       --suexec-docroot=${PREFIX}/www/data \
+                       --suexec-logfile=/var/log/httpd-suexec.log \
+                       --suexec-userdir=${USER_WEB_DIR} \
+                       --suexec-safepath='/bin:/usr/bin:${PREFIX}/bin'
+MAN8+= suexec.8
+.endif
+
+post-configure:
+.if defined(SUEXEC)
+       ${CP} ${PKGDIR}/pkg-plist ${PLIST}
+.else
+       ${CAT} ${PKGDIR}/pkg-plist | ${GREP} -v sbin/suexec > ${PLIST}
+.endif
 
 post-install:
        @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \
--- pkg-plist.orig      Wed Mar  7 07:51:34 2001
+++ pkg-plist   Sat Apr  7 17:03:45 2001
@@ -100,6 +100,7 @@
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+sbin/suexec
 share/doc/apache/README.rus
 @exec mkdir -p %D/www
 @exec ln -fs %B %D/www/data.default

-- 
$B4d7nGnG7(B <don@ma.nma.ne.jp>
