Date: Tue, 12 Mar 2002 07:44:48 -0800 (PST) From: Petr Rehor <petr.rehor@i.cz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/35819: Update russian/apache13-modssl to apache-1.3.23, mod_charset-30.11 and modssl-2.8.7 Message-ID: <200203121544.g2CFimB80540@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 35819
>Category: ports
>Synopsis: Update russian/apache13-modssl to apache-1.3.23, mod_charset-30.11 and modssl-2.8.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 12 07:50:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Petr Rehor
>Release: FreeBSD 4.5-RELEASE-p2 i386
>Organization:
ICZ Czech Republic
>Environment:
FreeBSD noc.decros.cz 4.5-RELEASE-p2 FreeBSD 4.5-RELEASE-p2 #0: Fri Mar 8 22:22:02 CET 2002 reho@noc.decros.cz:/usr/obj/usr/src/sys/NOC i386
>Description:
Update russian/apache13-modssl to apache-1.3.23, mod_charset-30.11 and
modssl-2.8.7 and sync with www/apache13-modssl.
>How-To-Repeat:
>Fix:
diff -ruN russian/apache13-modssl/Makefile.orig russian/apache13-modssl/Makefile
--- russian/apache13-modssl/Makefile.orig Tue Feb 19 19:26:27 2002
+++ russian/apache13-modssl/Makefile Tue Mar 12 15:56:10 2002
@@ -32,9 +32,9 @@
LIB_DEPENDS= mm.11:${PORTSDIR}/devel/mm
-VERSION_APACHE= 1.3.22
-VERSION_MODSSL= 2.8.5
-RA_VERSION= 30.9
+VERSION_APACHE= 1.3.23
+VERSION_MODSSL= 2.8.7
+RA_VERSION= 30.11
USE_PERL5= yes
HAS_CONFIGURE= yes
@@ -98,8 +98,10 @@
&& ./configure --with-apache=../${DISTNAME} --expert
post-patch:
- @cd ${WRKSRC} \
- && find . -type f -name "*.orig" -print | xargs ${RM} -f
+# @${PERL} -pi -e 's|-print|-print0|;s|xargs|xargs -0|' \
+# ${WRKSRC}/Makefile.tmpl
+# @cd ${WRKSRC} \
+# && find . -type f -name "*.orig" -print | xargs ${RM} -f
post-build:
@cd ${WRKSRC} \
diff -ruN russian/apache13-modssl/distinfo.orig russian/apache13-modssl/distinfo
--- russian/apache13-modssl/distinfo.orig Fri Nov 9 09:07:02 2001
+++ russian/apache13-modssl/distinfo Tue Mar 12 15:03:41 2002
@@ -1,2 +1,2 @@
-MD5 (apache_1.3.22rusPL30.9.tar.gz) = 9c76252ae3a97227364a027acdff6c51
-MD5 (mod_ssl-2.8.5-1.3.22.tar.gz) = 5139c874e759b8410a29f9dcb4b578e5
+MD5 (apache_1.3.23rusPL30.11.tar.gz) = 50021488bcc4e4f1bb5d8e0b6333301b
+MD5 (mod_ssl-2.8.7-1.3.23.tar.gz) = 3e3a6a630cf56daa44f33d6da8bc5e65
diff -ruN russian/apache13-modssl/files/patch-ab.orig russian/apache13-modssl/files/patch-ab
--- russian/apache13-modssl/files/patch-ab.orig Fri Nov 9 09:07:02 2001
+++ russian/apache13-modssl/files/patch-ab Tue Mar 12 15:27:13 2002
@@ -44,7 +44,7 @@
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+# fi
-+ $(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
++# $(LN) -sf $(root)$(manualdir) $(root)$(htdocsdir).default/manual
+ if [ ! -d $(root)$(htdocsdir)/ ]; then \
+ $(LN) -sf $(root)$(htdocsdir).default $(root)$(htdocsdir); \
fi
@@ -71,7 +71,7 @@
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
-@@ -608,15 +617,15 @@
+@@ -608,11 +617,11 @@
-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
@@ -87,8 +87,3 @@
-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
-e 's;conf/tables;$(sysconfdir)/tables;g' \
-e 's;User nobody;User $(conf_user);' \
-- -e 's;Group #-1;Group $(conf_group);' \
-+ -e 's;Group "#-1";Group $(conf_group);' \
- -e 's;Port 80;Port $(conf_port);' \
- -e 's;Listen 80;Listen $(conf_port);' \
- -e 's;Listen 443;Listen $(conf_port_ssl);' \
diff -ruN russian/apache13-modssl/files/patch-ag.orig russian/apache13-modssl/files/patch-ag
--- russian/apache13-modssl/files/patch-ag.orig Fri Nov 9 09:07:02 2001
+++ russian/apache13-modssl/files/patch-ag Tue Mar 12 14:05:23 2002
@@ -53,25 +53,3 @@
#
# Optionally add a line containing the server version and virtual host
-@@ -793,13 +808,17 @@
- # For example, the PHP 3.x module (not part of the Apache distribution - see
- # http://www.php.net) will typically use:
- #
-- #AddType application/x-httpd-php3 .php3
-- #AddType application/x-httpd-php3-source .phps
-+ <IfModule mod_php3.c>
-+ AddType application/x-httpd-php3 .php3
-+ AddType application/x-httpd-php3-source .php3s
-+ </IfModule>
- #
- # And for PHP 4.x, use:
- #
-- #AddType application/x-httpd-php .php
-- #AddType application/x-httpd-php-source .phps
-+ <IfModule mod_php4.c>
-+ AddType application/x-httpd-php .php
-+ AddType application/x-httpd-php-source .phps
-+ </IfModule>
-
- AddType application/x-tar .tgz
-
diff -ruN russian/apache13-modssl/files/rc.apache.sh.orig russian/apache13-modssl/files/rc.apache.sh
--- russian/apache13-modssl/files/rc.apache.sh.orig Sun Dec 31 12:50:50 2000
+++ russian/apache13-modssl/files/rc.apache.sh Tue Nov 6 10:18:16 2001
@@ -1,16 +1,20 @@
#!/bin/sh
-case $1 in
-start)
- !!PREFIX!!/sbin/apachectl startssl > /dev/null && echo -n ' apache'
- ;;
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+ echo "$0: Cannot determine the PREFIX" >&2
+ exit 1
+fi
+case "$1" in
+start)
+ [ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl startssl > /dev/null && echo -n ' apache'
+ ;;
stop)
- !!PREFIX!!/sbin/apachectl stop > /dev/null
- ;;
-
+ [ -r /var/run/httpd.pid ] && ${PREFIX}/sbin/apachectl stop > /dev/null && echo -n ' apache'
+ ;;
*)
- echo "usage: `basename $0` {start|stop}" >&2
- exit 64
- ;;
+ echo "Usage: `basename $0` {start|stop}" >&2
+ ;;
esac
+
+exit 0
diff -ruN russian/apache13-modssl/pkg-plist.orig russian/apache13-modssl/pkg-plist
--- russian/apache13-modssl/pkg-plist.orig Fri Nov 9 09:07:02 2001
+++ russian/apache13-modssl/pkg-plist Tue Mar 12 13:41:54 2002
@@ -1,3 +1,4 @@
+bin/checkgid
bin/dbmmanage
bin/htdigest
bin/htpasswd
@@ -278,7 +279,6 @@
www/data.default/apache_pb.gif
www/data.default/ra-powered.gif
@exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
-www/data.default/index.html
www/data.default/index.html.ca
www/data.default/index.html.cz
www/data.default/index.html.de
@@ -310,7 +310,6 @@
www/data.default/index.html.se
www/data.default/index.html.zh.Big5
share/doc/apache/LICENSE
-@exec [ -e %D/www/data.default/manual ] || ln -fs %B %D/www/data.default/manual
share/doc/apache/bind.html.en
share/doc/apache/bind.html.fr
share/doc/apache/bind.html.html
@@ -336,6 +335,7 @@
share/doc/apache/handler.html.en
share/doc/apache/handler.html.ja.jis
share/doc/apache/header.html
+share/doc/apache/howto/auth.html
share/doc/apache/howto/cgi.html.en
share/doc/apache/howto/cgi.html.ja.jis
share/doc/apache/howto/footer.html
@@ -428,7 +428,9 @@
share/doc/apache/mod/mod_cookies.html
share/doc/apache/mod/mod_define.html
share/doc/apache/mod/mod_digest.html
-share/doc/apache/mod/mod_dir.html
+share/doc/apache/mod/mod_dir.html.en
+share/doc/apache/mod/mod_dir.html.html
+share/doc/apache/mod/mod_dir.html.ja.jis
share/doc/apache/mod/mod_dld.html
share/doc/apache/mod/mod_env.html.en
share/doc/apache/mod/mod_env.html.html
@@ -550,6 +552,7 @@
share/doc/apache/server-wide.html.en
share/doc/apache/server-wide.html.ja.jis
share/doc/apache/sections.html
+share/doc/apache/sitemap.html
share/doc/apache/sourcereorg.html
share/doc/apache/stopping.html.en
share/doc/apache/stopping.html.fr
@@ -824,7 +827,6 @@
@exec mkdir -p %D/www/proxy
@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
-@unexec if [ -L %D/www/data.default/manual ]; then rm -f %D/www/data.default/manual; fi
@exec cd %D/etc/apache/ssl.crt && make >/dev/null 2>&1
@unexec rm -f %D/etc/apache/ssl.crt/[0-9a-fA-F]*.[0-9]*
@dirrm etc/apache/ssl.crt
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203121544.g2CFimB80540>