Attachment #23338 for bug #40188

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





VERSION_APACHE=	1.3.26
VERSION_MODSSL=	2.8.10
VERSION_RA=	30.15

#
# some defaults
#

DATADIR=${PREFIX}/www
DOCUMENT_ROOT=${DATADIR}/data
DEFAULT_PATH?=/bin:/usr/bin:${PREFIX}/bin

#
# suexec support
#
.if defined(WITH_APACHE_SUEXEC)

APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
APACHE_SUEXEC_USERDIR?=public_html

SUEXEC_CONF= \
	 --enable-suexec \
	 --suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
	 --suexec-caller=www \
	 --suexec-uidmin=1000 \
	 --suexec-gidmin=1000 \
	 --suexec-logfile=/var/log/httpd-suexec.log \
	 --suexec-userdir=${APACHE_SUEXEC_USERDIR} \
	 --suexec-safepath=${DEFAULT_PATH}

.if defined(APACHE_SUEXEC_UMASK)
SUEXEC_CONF+=	--suexec-umask=${APACHE_SUEXEC_UMASK}
.endif

PLIST_SUB+=	SUEXEC=""
SUEXEC_MAN=	suexec.8

.else # WITH_APACHE_SUEXEC

SUEXEC_CONF=
PLIST_SUB+=	SUEXEC="@comment "
SUEXEC_MAN=

.endif # WITH_APACHE_SUEXEC


#
# Configutre parameters
#

USE_PERL5=	yes
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	\
		 --prefix=${PREFIX} \
		 --server-uid=www \
		 --server-gid=www \
		 --with-perl=${PERL} \
		 --with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
		 --without-confadjust
		--enable-shared=remain \
		--enable-module=most \
		--enable-module=auth_db \
		--enable-module=ssl \
		--disable-shared=ssl \
		--enable-module=define \
		--disable-shared=define \
		--disable-module=auth_dbm

OPTIM=		-DHARD_SERVER_LIMIT=512 \
		-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
		-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\" \
		-DACCEPT_FILTER_NAME=\\"httpready\\"

.if defined(WITH_DSO_MODULES)
CONFIGURE_ARGS+= \
		 --enable-shared=max \
		 --disable-shared=so \
		 --disable-shared=charset \
		 --enable-module=most \
		 --enable-module=auth_db \
		 --enable-module=mmap_static \
		 --enable-module=define \
		 --disable-module=auth_dbm \
		 ${SUEXEC_CONF}

PLIST_SUB+=	 DSO_MOD=""
.else
CONFIGURE_ARGS+= \
		 --enable-shared=remain \
		 --enable-module=most \
		 --enable-module=auth_db \
		 --enable-module=mmap_static \
		 --enable-module=define \
		 --disable-shared=define \
		 --enable-module=ssl \
		 --disable-shared=ssl \
		 --disable-module=auth_dbm \
		 ${SUEXEC_CONF}

PLIST_SUB+=	 DSO_MOD="@comment "
.endif

OPTIM=		 -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
		 -DDEFAULT_PATH=\\"${DEFAULT_PATH}\\"

.if defined(APACHE_HARD_SERVER_LIMIT)                                                                                   
OPTIM+=		 -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
.else
OPTIM+=		 -DHARD_SERVER_LIMIT=512
.endif


.if defined(APACHE_PERF_TUNING)
OPTIM+=		-DBUFFERED_LOGS
CFLAGS+=	-O6 -fomit-frame-pointer
.endif

CONFIGURE_ENV=	CFLAGS='${CFLAGS}' \


INSTALL_TARGET=	install-quiet

MAN1=		dbmmanage.1 htdigest.1 htpasswd.1
MAN8=		ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
		${SUEXEC_MAN}

TYPE=	test
CRT=
KEY=

pre-fetch:
	@${ECHO_MSG} ""
.if defined(WITH_DSO_MODULES)
	@${ECHO_MSG} "Build all modules (except mod_so and mod_charest) as DSO."
		--suexec-caller=nobody \
		--suexec-logfile=/var/log/suexec.log \
		--suexec-uidmin=50000 \
		--suexec-gidmin=60000
MAN8+=		suexec.8
.else
	@${ECHO_MSG} "You could define WITH_DSO_MODULES to build all modules as DSO."
.endif
.if defined(APACHE_PERF_TUNING)
	@${ECHO_MSG} "Build Apache for maximum performance."
.else
	@${ECHO_MSG} "You could define APACHE_PERF_TUNING to build Apache for maximum performace."
.endif
.if defined(APACHE_HARD_SERVER_LIMIT)
	@${ECHO_MSG} "Build Apache with HARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}"
.else
	@${ECHO_MSG} "You could define APACHE_HARD_SERVER_LIMIT, default one is 512"
.endif
.if defined(WITH_APACHE_SUEXEC)
	@${ECHO_MSG} "Build apache with suexec support"
	@${ECHO_MSG} "   suexec docroot:  ${APACHE_SUEXEC_DOCROOT}"
	@${ECHO_MSG} "   suexec userdir:  ${APACHE_SUEXEC_USERDIR}"
	@${ECHO_MSG} "   suexec safepath: ${DEFAULT_PATH}"
	@${ECHO_MSG} "   These values could be defined as APACHE_SUEXEC_DOCROOT, APACHE_SUEXEC_USERDIR and DEFAULT_PATH."
.else
	@${ECHO_MSG} "You could define WITH_APACHE_SUEXEC to build suexec support."
.endif
	@${ECHO_MSG} ""

pre-patch:
	@cd ${WRKDIR}/apache_${VERSION_APACHE} \

Lines 1-3 Link Here

(-)apache13-modssl/distinfo (-1 / +1 lines)
1	MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6	1	MD5 (apache_1.3.26.tar.gz) = 52e9b875597a208fca9d393e710087b6
2	MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4	2	MD5 (mod_ssl-2.8.10-1.3.26.tar.gz) = 11260700ab52fb7ff54a25f14052eed4
3	MD5 (patches_1.3.26rusPL30.14.tar.gz) = 6fbe1a4dc2b14911dc1bbe9b22e639bd	3	MD5 (patches_1.3.26rusPL30.15.tar.gz) = 5ccfb76804631e4cf1c9df71eb1f96e2




libexec/apache/mod_headers.so
libexec/apache/mod_info.so
libexec/apache/mod_mime_magic.so
libexec/apache/mod_mmap_static.so
libexec/apache/mod_rewrite.so
libexec/apache/mod_speling.so
libexec/apache/mod_unique_id.so
libexec/apache/mod_usertrack.so
libexec/apache/mod_vhost_alias.so
%%DSO_MOD%%libexec/apache/mod_access.so
%%DSO_MOD%%libexec/apache/mod_actions.so
%%DSO_MOD%%libexec/apache/mod_alias.so
%%DSO_MOD%%libexec/apache/mod_asis.so
%%DSO_MOD%%libexec/apache/mod_auth.so
%%DSO_MOD%%libexec/apache/mod_autoindex.so
%%DSO_MOD%%libexec/apache/mod_cgi.so
%%DSO_MOD%%libexec/apache/mod_define.so
%%DSO_MOD%%libexec/apache/mod_dir.so
%%DSO_MOD%%libexec/apache/mod_env.so
%%DSO_MOD%%libexec/apache/mod_imap.so
%%DSO_MOD%%libexec/apache/mod_include.so
%%DSO_MOD%%libexec/apache/mod_log_config.so
%%DSO_MOD%%libexec/apache/mod_mime.so
%%DSO_MOD%%libexec/apache/mod_negotiation.so
%%DSO_MOD%%libexec/apache/mod_setenvif.so
%%DSO_MOD%%libexec/apache/libssl.so
%%DSO_MOD%%libexec/apache/mod_status.so
%%DSO_MOD%%libexec/apache/mod_userdir.so
sbin/ab
sbin/apachectl
sbin/apxs
sbin/httpd
sbin/logresolve
sbin/rotatelogs
%%SUEXEC%%sbin/suexec
share/doc/apache/apache_pb.gif
share/doc/apache/ra-powered.gif
@exec mkdir -p %D/www

Return to bug 40188

Lines 55-89 Link Here

(-)apache13-modssl/Makefile (-36 / +123 lines)
55		55
56	VERSION_APACHE= 1.3.26	56	VERSION_APACHE= 1.3.26
57	VERSION_MODSSL= 2.8.10	57	VERSION_MODSSL= 2.8.10
58	VERSION_RA= 30.14	58	VERSION_RA= 30.15
		59
		60	#
		61	# some defaults
		62	#
		63
		64	DATADIR=${PREFIX}/www
		65	DOCUMENT_ROOT=${DATADIR}/data
		66	DEFAULT_PATH?=/bin:/usr/bin:${PREFIX}/bin
		67
		68	#
		69	# suexec support
		70	#
		71	.if defined(WITH_APACHE_SUEXEC)
		72
		73	APACHE_SUEXEC_DOCROOT?=${DOCUMENT_ROOT}
		74	APACHE_SUEXEC_USERDIR?=public_html
		75
		76	SUEXEC_CONF= \
		77	--enable-suexec \
		78	--suexec-docroot=${APACHE_SUEXEC_DOCROOT} \
		79	--suexec-caller=www \
		80	--suexec-uidmin=1000 \
		81	--suexec-gidmin=1000 \
		82	--suexec-logfile=/var/log/httpd-suexec.log \
		83	--suexec-userdir=${APACHE_SUEXEC_USERDIR} \
		84	--suexec-safepath=${DEFAULT_PATH}
		85
		86	.if defined(APACHE_SUEXEC_UMASK)
		87	SUEXEC_CONF+= --suexec-umask=${APACHE_SUEXEC_UMASK}
		88	.endif
		89
		90	PLIST_SUB+= SUEXEC=""
		91	SUEXEC_MAN= suexec.8
		92
		93	.else # WITH_APACHE_SUEXEC
		94
		95	SUEXEC_CONF=
		96	PLIST_SUB+= SUEXEC="@comment "
		97	SUEXEC_MAN=
		98
		99	.endif # WITH_APACHE_SUEXEC
		100
		101
		102	#
		103	# Configutre parameters
		104	#
59		105
60	USE_PERL5= yes
61	HAS_CONFIGURE= yes	106	HAS_CONFIGURE= yes
62	CONFIGURE_ARGS= --prefix=${PREFIX} \	107	CONFIGURE_ARGS= \
63	--server-uid=www \	108	--prefix=${PREFIX} \
64	--server-gid=www \	109	--server-uid=www \
65	--with-perl=${PERL} \	110	--server-gid=www \
66	--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \	111	--with-perl=${PERL} \
67	--suexec-docroot=${PREFIX}/www/data \	112	--with-layout=${FILESDIR}/FreeBSD.layout:FreeBSD \
68	--without-confadjust \	113	--without-confadjust
69	--enable-shared=remain \
70	--enable-module=most \
71	--enable-module=auth_db \
72	--enable-module=ssl \
73	--disable-shared=ssl \
74	--enable-module=define \
75	--disable-shared=define \
76	--disable-module=auth_dbm
77		114
78	OPTIM= -DHARD_SERVER_LIMIT=512 \	115	OPTIM= -DHARD_SERVER_LIMIT=512 \
79	-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \	116	-DDOCUMENT_LOCATION=\\"${PREFIX}/www/data/\\" \
80	-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\" \	117	-DDEFAULT_PATH=\\"${PREFIX}/bin:/bin:/usr/bin\\" \
81	-DACCEPT_FILTER_NAME=\\"httpready\\"	118	-DACCEPT_FILTER_NAME=\\"httpready\\"
82		119
83	.if defined(WITH_APACHE_PERF_TUNING) && ${WITH_APACHE_PERF_TUNING} == YES	120	.if defined(WITH_DSO_MODULES)
84	OPTIM+= -DBUFFERED_LOGS -DFD_SETSIZE=1024	121	CONFIGURE_ARGS+= \
85	CFLAGS+= -O6 -funroll-loops -fstrength-reduce -fomit-frame-pointer \	122	--enable-shared=max \
86	-fexpensive-optimizations -ffast-math	123	--disable-shared=so \
		124	--disable-shared=charset \
		125	--enable-module=most \
		126	--enable-module=auth_db \
		127	--enable-module=mmap_static \
		128	--enable-module=define \
		129	--disable-module=auth_dbm \
		130	${SUEXEC_CONF}
		131
		132	PLIST_SUB+= DSO_MOD=""
		133	.else
		134	CONFIGURE_ARGS+= \
		135	--enable-shared=remain \
		136	--enable-module=most \
		137	--enable-module=auth_db \
		138	--enable-module=mmap_static \
		139	--enable-module=define \
		140	--disable-shared=define \
		141	--enable-module=ssl \
		142	--disable-shared=ssl \
		143	--disable-module=auth_dbm \
		144	${SUEXEC_CONF}
		145
		146	PLIST_SUB+= DSO_MOD="@comment "
		147	.endif
		148
		149	OPTIM= -DDOCUMENT_LOCATION=\\"${DOCUMENT_ROOT}\\" \
		150	-DDEFAULT_PATH=\\"${DEFAULT_PATH}\\"
		151
		152	.if defined(APACHE_HARD_SERVER_LIMIT)
		153	OPTIM+= -DHARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}
		154	.else
		155	OPTIM+= -DHARD_SERVER_LIMIT=512
		156	.endif
		157
		158
		159	.if defined(APACHE_PERF_TUNING)
		160	OPTIM+= -DBUFFERED_LOGS
		161	CFLAGS+= -O6 -fomit-frame-pointer
87	.endif	162	.endif
88		163
89	CONFIGURE_ENV= CFLAGS='${CFLAGS}' \	164	CONFIGURE_ENV= CFLAGS='${CFLAGS}' \
Lines 94-122 Link Here
94		169
95	INSTALL_TARGET= install-quiet	170	INSTALL_TARGET= install-quiet
96		171
97	MAN1= dbmmanage.1 htdigest.1 htpasswd.1	172	MAN1= dbmmanage.1 htdigest.1 htpasswd.1
98	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8	173	MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 \
		174	${SUEXEC_MAN}
99		175
100	TYPE= test	176	TYPE= test
101	CRT=	177	CRT=
102	KEY=	178	KEY=
103		179
104	pre-extract:	180	pre-fetch:
105	.if defined(WITH_SUEXEC)	181	@${ECHO_MSG} ""
106	@${ECHO} "Be sure to edit suexec specific arguments to configure in the Makefile."	182	.if defined(WITH_DSO_MODULES)
107	CONFIGURE_ARGS+=--enable-suexec \	183	@${ECHO_MSG} "Build all modules (except mod_so and mod_charest) as DSO."
108	--suexec-caller=nobody \
109	--suexec-logfile=/var/log/suexec.log \
110	--suexec-uidmin=50000 \
111	--suexec-gidmin=60000
112	MAN8+= suexec.8
113	.else	184	.else
114	@${ECHO} "Define WITH_SUEXEC to build with suexec support."	185	@${ECHO_MSG} "You could define WITH_DSO_MODULES to build all modules as DSO."
115	.endif	186	.endif
116		187	.if defined(APACHE_PERF_TUNING)
117	.if defined(APACHE_CONFIGURE_ARGS)	188	@${ECHO_MSG} "Build Apache for maximum performance."
118	CONFIGURE_ARGS+= ${APACHE_CONFIGURE_ARGS}	189	.else
		190	@${ECHO_MSG} "You could define APACHE_PERF_TUNING to build Apache for maximum performace."
		191	.endif
		192	.if defined(APACHE_HARD_SERVER_LIMIT)
		193	@${ECHO_MSG} "Build Apache with HARD_SERVER_LIMIT=${APACHE_HARD_SERVER_LIMIT}"
		194	.else
		195	@${ECHO_MSG} "You could define APACHE_HARD_SERVER_LIMIT, default one is 512"
		196	.endif
		197	.if defined(WITH_APACHE_SUEXEC)
		198	@${ECHO_MSG} "Build apache with suexec support"
		199	@${ECHO_MSG} " suexec docroot: ${APACHE_SUEXEC_DOCROOT}"
		200	@${ECHO_MSG} " suexec userdir: ${APACHE_SUEXEC_USERDIR}"
		201	@${ECHO_MSG} " suexec safepath: ${DEFAULT_PATH}"
		202	@${ECHO_MSG} " These values could be defined as APACHE_SUEXEC_DOCROOT, APACHE_SUEXEC_USERDIR and DEFAULT_PATH."
		203	.else
		204	@${ECHO_MSG} "You could define WITH_APACHE_SUEXEC to build suexec support."
119	.endif	205	.endif
		206	@${ECHO_MSG} ""
120		207
121	pre-patch:	208	pre-patch:
122	@cd ${WRKDIR}/apache_${VERSION_APACHE} \	209	@cd ${WRKDIR}/apache_${VERSION_APACHE} \

Lines 245-261 Link Here

(-)apache13-modssl/pkg-plist (+21 lines)
245	libexec/apache/mod_headers.so	245	libexec/apache/mod_headers.so
246	libexec/apache/mod_info.so	246	libexec/apache/mod_info.so
247	libexec/apache/mod_mime_magic.so	247	libexec/apache/mod_mime_magic.so
		248	libexec/apache/mod_mmap_static.so
248	libexec/apache/mod_rewrite.so	249	libexec/apache/mod_rewrite.so
249	libexec/apache/mod_speling.so	250	libexec/apache/mod_speling.so
250	libexec/apache/mod_unique_id.so	251	libexec/apache/mod_unique_id.so
251	libexec/apache/mod_usertrack.so	252	libexec/apache/mod_usertrack.so
252	libexec/apache/mod_vhost_alias.so	253	libexec/apache/mod_vhost_alias.so
		254	%%DSO_MOD%%libexec/apache/mod_access.so
		255	%%DSO_MOD%%libexec/apache/mod_actions.so
		256	%%DSO_MOD%%libexec/apache/mod_alias.so
		257	%%DSO_MOD%%libexec/apache/mod_asis.so
		258	%%DSO_MOD%%libexec/apache/mod_auth.so
		259	%%DSO_MOD%%libexec/apache/mod_autoindex.so
		260	%%DSO_MOD%%libexec/apache/mod_cgi.so
		261	%%DSO_MOD%%libexec/apache/mod_define.so
		262	%%DSO_MOD%%libexec/apache/mod_dir.so
		263	%%DSO_MOD%%libexec/apache/mod_env.so
		264	%%DSO_MOD%%libexec/apache/mod_imap.so
		265	%%DSO_MOD%%libexec/apache/mod_include.so
		266	%%DSO_MOD%%libexec/apache/mod_log_config.so
		267	%%DSO_MOD%%libexec/apache/mod_mime.so
		268	%%DSO_MOD%%libexec/apache/mod_negotiation.so
		269	%%DSO_MOD%%libexec/apache/mod_setenvif.so
		270	%%DSO_MOD%%libexec/apache/libssl.so
		271	%%DSO_MOD%%libexec/apache/mod_status.so
		272	%%DSO_MOD%%libexec/apache/mod_userdir.so
253	sbin/ab	273	sbin/ab
254	sbin/apachectl	274	sbin/apachectl
255	sbin/apxs	275	sbin/apxs
256	sbin/httpd	276	sbin/httpd
257	sbin/logresolve	277	sbin/logresolve
258	sbin/rotatelogs	278	sbin/rotatelogs
		279	%%SUEXEC%%sbin/suexec
259	share/doc/apache/apache_pb.gif	280	share/doc/apache/apache_pb.gif
260	share/doc/apache/ra-powered.gif	281	share/doc/apache/ra-powered.gif
261	@exec mkdir -p %D/www	282	@exec mkdir -p %D/www