Attachment #17310 for bug #31450

View | Details | Raw Unified | Return to bug 31450
Collapse All | Expand All




# New ports collection makefile for:	apache2
# Date created:				7 April 2001
# Whom:					Hye-Shik Chang <perky@fallin.lv>
#
# $FreeBSD: ports/www/apache2/Makefile,v 1.96 2001/04/17 17:26:54 will Exp $
#

PORTNAME=	apache
PORTVERSION=	2.0.16
PORTREVISION=	2
CATEGORIES=	www ipv6
MASTER_SITES=	http://httpd.apache.org/dist/httpd/ \
		http://www.cybernic.com/mirror/dist/httpd/ \

		ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
DISTNAME=	httpd-${PORTVERSION:S/./_/g}-beta

MAINTAINER?=	perky@fallin.lv

WRKSRC=		${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
FIND?=		find


post-patch:
	@${FIND} ${WRKSRC} -name "*.orig"|${XARGS} ${RM} -f

pre-install:
	PKG_PREFIX=${PREFIX} ./pkg-install ${PKGNAME} PRE-INSTALL

post-install:
	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \




--- docs/conf/httpd-std.conf.orig	Mon Mar 26 01:54:48 2001
+++ docs/conf/httpd-std.conf	Tue Oct 23 17:12:59 2001
@@ -64,7 +64,7 @@
 # PidFile: The file in which the server should record its process
 # identification number when it starts.

 
 ### Section 2: 'Main' server configuration
 #
@@ -220,8 +242,8 @@
 #  when the value of (unsigned)Group is above 60000; 
 #  don't use Group #-1 on these systems!
 #
-User nobody
-Group #-1
+User www
+Group www
 
 #
 # ServerAdmin: Your address, where problems with the server should be




#!/bin/sh
# $FreeBSD: ports/www/apache13/pkg-deinstall,v 1.1 2001/10/21 17:33:37 ache Exp $
#

if [ "$2" != "POST-DEINSTALL" ]; then
    exit 0
fi

USER=www

if pw usershow "${USER}" 2>/dev/null 1>&2; then
	if pw userdel ${USER}; then
		echo "Delete user/group \"${USER}\"."
	else
		echo "Deleting user/group \"${USER}\" failed..."
		exit 1
	fi
fi

exit 0




#!/bin/sh
# $FreeBSD: ports/www/apache13/pkg-install,v 1.1 2001/10/21 17:33:37 ache Exp $
#

if [ "$2" != "PRE-INSTALL" ]; then
    exit 0
fi

USER=www
GROUP=${USER}
UID=80
GID=${UID}

if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
	if pw groupadd ${GROUP} -g ${GID}; then
		echo "Added group \"${GROUP}\"."
	else
		echo "Adding group \"${GROUP}\" failed..."
		exit 1
	fi
fi

if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
		-s "/sbin/nologin" -d "/nonexistent" \
		-c "World Wide Web Owner"; \
	then
		echo "Added user \"${USER}\"."
	else
		echo "Adding user \"${USER}\" failed..."
		exit 1
	fi
fi
exit 0

Return to bug 31450

Lines 1-13 Link Here

(-)apache2/Makefile (-3 / +6 lines)
1	# New ports collection makefile for: apache2	1	# New ports collection makefile for: apache2
2	# Date created: 7 April 2001	2	# Date created: 7 April 2001
3	# Whom: Hye-Shik Chang <perky@python.or.kr>	3	# Whom: Hye-Shik Chang <perky@fallin.lv>
4	#	4	#
5	# $FreeBSD: ports/www/apache2/Makefile,v 1.96 2001/04/17 17:26:54 will Exp $	5	# $FreeBSD: ports/www/apache2/Makefile,v 1.96 2001/04/17 17:26:54 will Exp $
6	#	6	#
7		7
8	PORTNAME= apache	8	PORTNAME= apache
9	PORTVERSION= 2.0.16	9	PORTVERSION= 2.0.16
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= www ipv6	11	CATEGORIES= www ipv6
12	MASTER_SITES= http://httpd.apache.org/dist/httpd/ \	12	MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
13	http://www.cybernic.com/mirror/dist/httpd/ \	13	http://www.cybernic.com/mirror/dist/httpd/ \
Lines 21-27 Link Here
21	ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/	21	ftp://ftp.cuckoo.com/pub/mirrors/apache/httpd/
22	DISTNAME= httpd-${PORTVERSION:S/./_/g}-beta	22	DISTNAME= httpd-${PORTVERSION:S/./_/g}-beta
23		23
24	MAINTAINER?= perky@python.or.kr	24	MAINTAINER?= perky@fallin.lv
25		25
26	WRKSRC= ${WRKDIR}/httpd-${PORTVERSION:S/./_/g}	26	WRKSRC= ${WRKDIR}/httpd-${PORTVERSION:S/./_/g}
27	FIND?= find	27	FIND?= find
Lines 64-69 Link Here
64		64
65	post-patch:	65	post-patch:
66	@${FIND} ${WRKSRC} -name "*.orig"\|${XARGS} ${RM} -f	66	@${FIND} ${WRKSRC} -name "*.orig"\|${XARGS} ${RM} -f
		67
		68	pre-install:
		69	PKG_PREFIX=${PREFIX} ./pkg-install ${PKGNAME} PRE-INSTALL
67		70
68	post-install:	71	post-install:
69	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \	72	@if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \

Lines 1-5 Link Here

(-)apache2/files/patch-docs:conf:httpd-std.conf (-4 / +6 lines)
1	--- docs/conf/httpd-std.conf.orig Mon Mar 26 01:54:48 2001	1	--- docs/conf/httpd-std.conf.orig Mon Mar 26 01:54:48 2001
2	+++ docs/conf/httpd-std.conf Sun Apr 8 04:26:54 2001	2	+++ docs/conf/httpd-std.conf Tue Oct 23 17:12:59 2001
3	@@ -64,7 +64,7 @@	3	@@ -64,7 +64,7 @@
4	# PidFile: The file in which the server should record its process	4	# PidFile: The file in which the server should record its process
5	# identification number when it starts.	5	# identification number when it starts.
Lines 47-58 Link Here
47		47
48	### Section 2: 'Main' server configuration	48	### Section 2: 'Main' server configuration
49	#	49	#
50	@@ -221,7 +243,7 @@	50	@@ -220,8 +242,8 @@
		51	# when the value of (unsigned)Group is above 60000;
51	# don't use Group #-1 on these systems!	52	# don't use Group #-1 on these systems!
52	#	53	#
53	User nobody	54	-User nobody
54	-Group #-1	55	-Group #-1
55	+Group nogroup	56	+User www
		57	+Group www
56		58
57	#	59	#
58	# ServerAdmin: Your address, where problems with the server should be	60	# ServerAdmin: Your address, where problems with the server should be

Line 0 Link Here

(-)apache2/pkg-deinstall (+20 lines)
	1	#!/bin/sh
	2	# $FreeBSD: ports/www/apache13/pkg-deinstall,v 1.1 2001/10/21 17:33:37 ache Exp $
	3	#
	4
	5	if [ "$2" != "POST-DEINSTALL" ]; then
	6	exit 0
	7	fi
	8
	9	USER=www
	10
	11	if pw usershow "${USER}" 2>/dev/null 1>&2; then
	12	if pw userdel ${USER}; then
	13	echo "Delete user/group \"${USER}\"."
	14	else
	15	echo "Deleting user/group \"${USER}\" failed..."
	16	exit 1
	17	fi
	18	fi
	19
	20	exit 0

Line 0 Link Here

(-)apache2/pkg-install (+34 lines)
	1	#!/bin/sh
	2	# $FreeBSD: ports/www/apache13/pkg-install,v 1.1 2001/10/21 17:33:37 ache Exp $
	3	#
	4
	5	if [ "$2" != "PRE-INSTALL" ]; then
	6	exit 0
	7	fi
	8
	9	USER=www
	10	GROUP=${USER}
	11	UID=80
	12	GID=${UID}
	13
	14	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
	15	if pw groupadd ${GROUP} -g ${GID}; then
	16	echo "Added group \"${GROUP}\"."
	17	else
	18	echo "Adding group \"${GROUP}\" failed..."
	19	exit 1
	20	fi
	21	fi
	22
	23	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
	24	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
	25	-s "/sbin/nologin" -d "/nonexistent" \
	26	-c "World Wide Web Owner"; \
	27	then
	28	echo "Added user \"${USER}\"."
	29	else
	30	echo "Adding user \"${USER}\" failed..."
	31	exit 1
	32	fi
	33	fi
	34	exit 0