Attachment 88341 Details for Bug 125132 – file.diff

[patch] file.diff

file.diff (text/plain), 8.84 KB, created by Philip M. Gollucci on 2008-07-01 02:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2008-07-01 02:40:03 UTC

Size: 8.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/apache13-ssl/Makefile,v
>retrieving revision 1.122
>diff -u -u -r1.122 Makefile
>--- Makefile	15 Apr 2008 11:50:10 -0000	1.122
>+++ Makefile	1 Jul 2008 01:35:52 -0000
>@@ -9,6 +9,7 @@
> 
> PORTNAME=	apache+ssl
> PORTVERSION=	${APACHE_VERSION}.${APACHE_SSL_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	www security
> MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
> 		${MASTER_SITES_APACHE_SSL:S/$/:ssl/}
>@@ -17,10 +18,6 @@
> 		apache_${APACHE_VERSION}+ssl_${APACHE_SSL_VERSION}${EXTRACT_SUFX}:ssl
> EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
> 
>-#PATCH_SITES=		${MASTER_SITE_APACHE_HTTPD}
>-#PATCH_SITE_SUBDIR=	patches/apply_to_${APACHE_VERSION}
>-#PATCHFILES=
>-
> MAINTAINER=	apache@FreeBSD.org
> COMMENT=	Apache secure webserver integrating OpenSSL
> 
>@@ -28,7 +25,7 @@
> 		apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \
> 		apache+mod_ssl+mod_snmp+mod_accel-1.* \
> 		apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \
>-		caudium-devel-1.* caudium10-1.* caudium12-* \
>+		caudium-devel-1.* caudium10-1.* caudium12-1.* \
> 		ru-apache+mod_ssl-1.* ru-apache-1.*
> 
> APACHE_VERSION=		1.3.41
>@@ -36,12 +33,12 @@
> USE_OPENSSL=		yes
> USE_PERL5=		yes
> HAS_CONFIGURE=		yes
>-USE_RC_SUBR=		yes
>-RC_SCRIPTS_SUB=		PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} WWWOWN=${WWWOWN}
>+USE_RC_SUBR=		apache.sh
>+SUB_LIST+=		WWWOWN=${WWWOWN}
> MAKE_ENV+=		EXAMPLESDIR=${EXAMPLESDIR}
> USE_APACHE=		common13
> 
>-MASTER_SITES_APACHE_SSL= \
>+MASTER_SITES_APACHE_SSL=	\
> 		ftp://ftp.ox.ac.uk/pub/crypto/SSL/Apache-SSL/ \
> 		ftp://ftp.it.net.au/mirrors/crypto/SSL/Apache-SSL/ \
> 		ftp://opensores.thebunker.net/pub/mirrors/apache-ssl/
>@@ -100,10 +97,11 @@
> post-patch:
> 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} ./FixPatch ${OPENSSLBASE}
> 	@${PATCH} ${PATCH_ARGS} < ${FILESDIR}/post-patch-conf:httpd.conf-dist
>-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>-		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
> 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
> 		${WRKSRC}/src/Configure
>+.if defined(NOPORTDOCS)
>+	(cd ${WRKSRC} ; ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/no_port_docs)
>+.endif
> 
> post-install:
> 	@${ECHO_CMD} ""
>@@ -112,7 +110,6 @@
> 	@${ECHO_CMD} "  http://www.apache-ssl.org/docs.html"
> 	@${ECHO_CMD} " to know how to configure correctly apache-ssl"
> 	@${ECHO_CMD} ""
>-	@${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d
> 
> certificate:
> 	-${MKDIR} ${PREFIX}/etc/apache/certs
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/www/apache13-ssl/pkg-plist,v
>retrieving revision 1.28
>diff -u -u -r1.28 pkg-plist
>--- pkg-plist	15 Apr 2008 11:50:10 -0000	1.28
>+++ pkg-plist	1 Jul 2008 01:35:52 -0000
>@@ -4,7 +4,6 @@
> bin/htdigest
> bin/htpasswd
> @exec mkdir -p %D/etc/apache 2> /dev/null
>-etc/rc.d/apache.sh
> @unexec if cmp -s %D/etc/apache/access.conf% %D/%%EXAMPLESDIR%%/access.conf-dist; then rm -f %D/etc/apache/access.conf%; fi
> %%EXAMPLESDIR%%/access.conf-dist
> @exec [ -f %D/etc/apache/access.conf% ] || cp %D/%%EXAMPLESDIR%%/access.conf-dist %D/etc/apache/access.conf
>@@ -660,13 +659,13 @@
> @dirrm include/apache/xml
> @dirrm include/apache
> @dirrm libexec/apache
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/howto
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/images
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/misc
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/mod
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/programs
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%/vhosts
>-@dirrm %%PORTDOCS%%%%DOCSDIR%%
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/howto
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/mod
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/programs
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%/vhosts
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
> @unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
> @dirrm www/cgi-bin-dist
>Index: files/apache.sh
>===================================================================
>RCS file: files/apache.sh
>diff -N files/apache.sh
>--- files/apache.sh	20 Feb 2006 20:47:46 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,62 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $
>-#
>-
>-# PROVIDE: apache
>-# REQUIRE: NETWORKING SERVERS
>-# BEFORE: DAEMON
>-# KEYWORD: shutdown
>-
>-#
>-# Add the following lines to /etc/rc.conf to enable apache:
>-# apache_enable (bool):      Set to "NO" by default.
>-#                             Set it to "YES" to enable apache
>-# apachelimits_enable (bool):Set to "NO" by default.
>-#                             Set it to yes to run `limits $limits_args`
>-#                             just before apache starts.
>-# apache_flags (str):        Set to "" by default.
>-#                             Extra flags passed to start command.
>-# apachelimits_args (str):   Default to "-e -C daemon"
>-#                             Arguments of pre-start limits run.
>-#
>-. %%RC_SUBR%%
>-
>-name="apache"
>-rcvar=`set_rcvar`
>-
>-start_precmd="apache_precmd"
>-restart_precmd="apache_checkconfig"
>-reload_precmd="apache_checkconfig"
>-command="%%PREFIX%%/sbin/httpsd"
>-pidfile="/var/run/httpsd.pid"
>-required_files=%%PREFIX%%/etc/apache/httpsd.conf
>-
>-[ -z "$apache_enable" ]       && apache_enable="NO"
>-[ -z "$apache_flags" ]        && apache_flags=""
>-[ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
>-[ -z "$apachelimits_args" ]   && apachelimits_args="-e -C daemon"
>-
>-load_rc_config $name
>-
>-apache_checkconfig()
>-{
>-	echo "Performing sanity check on apache configuration:"
>-	${command} -t
>-}
>-
>-apache_precmd() 
>-{
>-	if checkyesno apachelimits_enable
>-	then
>-		eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null
>-	else
>-		return 0
>-        fi
>-
>-}
>-
>-sig_reload=SIGUSR1
>-
>-extra_commands="reload"
>-run_rc_command "$1"
>Index: files/apache.sh.in
>===================================================================
>RCS file: files/apache.sh.in
>diff -N files/apache.sh.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/apache.sh.in	1 Jul 2008 01:35:52 -0000
>@@ -0,0 +1,62 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: ports/www/apache13-ssl/files/apache.sh,v 1.2 2006/02/20 20:47:46 dougb Exp $
>+#
>+
>+# PROVIDE: apache
>+# REQUIRE: NETWORKING SERVERS
>+# BEFORE: DAEMON
>+# KEYWORD: shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable apache:
>+# apache_enable (bool):      Set to "NO" by default.
>+#                             Set it to "YES" to enable apache
>+# apachelimits_enable (bool):Set to "NO" by default.
>+#                             Set it to yes to run `limits $limits_args`
>+#                             just before apache starts.
>+# apache_flags (str):        Set to "" by default.
>+#                             Extra flags passed to start command.
>+# apachelimits_args (str):   Default to "-e -C daemon"
>+#                             Arguments of pre-start limits run.
>+#
>+. %%RC_SUBR%%
>+
>+name="apache"
>+rcvar=`set_rcvar`
>+
>+start_precmd="apache_precmd"
>+restart_precmd="apache_checkconfig"
>+reload_precmd="apache_checkconfig"
>+command="%%PREFIX%%/sbin/httpsd"
>+pidfile="/var/run/httpsd.pid"
>+required_files=%%PREFIX%%/etc/apache/httpsd.conf
>+
>+[ -z "$apache_enable" ]       && apache_enable="NO"
>+[ -z "$apache_flags" ]        && apache_flags=""
>+[ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
>+[ -z "$apachelimits_args" ]   && apachelimits_args="-e -C daemon"
>+
>+load_rc_config $name
>+
>+apache_checkconfig()
>+{
>+	echo "Performing sanity check on apache configuration:"
>+	${command} -t
>+}
>+
>+apache_precmd() 
>+{
>+	if checkyesno apachelimits_enable
>+	then
>+		eval `/usr/bin/limits ${apachelimits_args}` 2>/dev/null
>+	else
>+		return 0
>+        fi
>+
>+}
>+
>+sig_reload=SIGUSR1
>+
>+extra_commands="reload"
>+run_rc_command "$1"
>Index: files/no_port_docs
>===================================================================
>RCS file: files/no_port_docs
>diff -N files/no_port_docs
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/no_port_docs	1 Jul 2008 01:35:52 -0000
>@@ -0,0 +1,22 @@
>+--- Makefile.tmpl.orig	2008-07-01 01:08:04.000000000 +0000
>++++ Makefile.tmpl	2008-07-01 01:08:17.000000000 +0000
>+@@ -228,7 +228,6 @@
>+ 	$(MKDIR) $(root)$(mandir)/man8
>+ 	$(MKDIR) $(root)$(sysconfdir)
>+ 	$(MKDIR) $(root)$(htdocsdir)-dist
>+-	$(MKDIR) $(root)$(manualdir)
>+ 	$(MKDIR) $(root)$(iconsdir)
>+ 	$(MKDIR) $(root)$(cgidir)-dist
>+ 	$(MKDIR) $(root)$(includedir)
>+@@ -422,11 +421,6 @@
>+ 		(cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
>+ 		find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
>+ 		find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
>+-		echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
>+-		(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
>+-		(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
>+-		find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
>+-		find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
>+ 	if [ ! -d $(root)$(htdocsdir)/ ]; then \
>+ 		$(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
>+ 	fi
>--- apache+ssl-1.3.41.1.59_1.patch ends here ---

Actions: View | Diff

Attachments on bug 125132: 88341