Date: Sun, 8 Apr 2001 19:12:47 -0500 (CDT) From: "Scot W. Hetzel" <hetzels@westbend.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26444: [maintainer] - Update Apache sites for www/apache13-fp Message-ID: <200104090012.f390Cl723507@spare.westbend.net>
next in thread | raw e-mail | index | archive | help
>Number: 26444 >Category: ports >Synopsis: Update Apache sites for www/apache13-fp [maintainer] >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Apr 08 17:20:00 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Scot W. Hetzel >Release: FreeBSD 4.3-RC i386 >Organization: West Bend Internet >Environment: System: FreeBSD spare.westbend.net 4.3-RC FreeBSD 4.3-RC #0: Mon Apr 2 23:03:53 CDT 2001 root@spare.westbend.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: The apache distribution directory was moved on Apr 5. Updated util.c patch to v1.97. This update also fixes the port so that it will build on 5-CURRENT and changes the .z -> .Z for the FP Exts so that bento can detect the file on the Microsoft FTP server, due to the FTP server is case sensitivity when bento is trying to determine if the file exists on the server. Also PR 17139, and PR 25673 can also be closed. >How-To-Repeat: >Fix: Changed files: Makefile, distinfo, files/patch-fj diff -ruN apache13-fp.orig/Makefile apache13-fp/Makefile --- apache13-fp.orig/Makefile Thu Mar 8 06:35:09 2001 +++ apache13-fp/Makefile Sun Apr 8 18:43:22 2001 @@ -7,26 +7,27 @@ PORTNAME= apache_fp PORTVERSION= 1.3.19 +PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= http://www.apache.org/dist/ \ +MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.microsoft.com/products/frontpage/ \ ftp://www.westbend.net/Mirrors/ftp.microsoft.com/Products/frontpage/ \ http://www.freebsd.org/gifs/ \ http://officeupdate.microsoft.com/frontpage/wpp/serk/ \ - ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \ - ftp://ftp.rge.com/pub/infosystems/apache/dist/ \ - ftp://apache.compuex.com/pub/apache/dist/ \ - ftp://apache.arctic.org/pub/apache/dist/ \ - ftp://ftp.epix.net/pub/apache/dist/ \ - ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \ - ftp://ftp.connectnet.com/pub/www/apache/ \ - ftp://apache.technomancer.com/mirrors/apache/dist/ \ - ftp://ftp.raver.net/pub/ftp.apache.org/ \ - ftp://www3.service.digital.com/apache/dist/ \ - ftp://galileo.galilei.com/pub/apache/ \ - ftp://ftp.mtnranch.net/pub/apache/dist/ \ - ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \ - ftp://apache.nextpath.com/pub/apache/dist/ + ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ + ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \ + ftp://apache.compuex.com/pub/apache/dist/httpd/ \ + ftp://apache.arctic.org/pub/apache/dist/httpd/ \ + ftp://ftp.epix.net/pub/apache/dist/httpd/ \ + ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \ + ftp://ftp.connectnet.com/pub/www/apache/httpd/ \ + ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \ + ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \ + ftp://www3.service.digital.com/apache/dist/httpd/ \ + ftp://galileo.galilei.com/pub/apache/httpd/ \ + ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \ + ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \ + ftp://apache.nextpath.com/pub/apache/dist/httpd/ DISTNAME= apache_${PORTVERSION} DISTFILES= ${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif @@ -37,27 +38,26 @@ APACHE= ${DISTNAME}${EXTRACT_SUFX} +.include <bsd.port.pre.mk> -.if !defined(ARCH) -ARCH!= /usr/bin/uname -m -.endif +ONLY_FOR_ARCHS= i386 alpha .if ${ARCH} == i386 .ifdef WANT_FREEBSD_EXT -FRONTPAGE= fp40.freebsd.tar.z +FRONTPAGE= fp40.freebsd.tar.Z +.if ${OSVERSION} < 500016 PKGMESSAGE= pkg-message.freebsd +.endif .else -FRONTPAGE= fp40.bsdi.tar.z +FRONTPAGE= fp40.bsdi.tar.Z EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi +.if ${OSVERSION} < 50016 PKGMESSAGE= pkg-message.bsdi .endif +.endif .elif ${ARCH} == alpha -FRONTPAGE= fp40.alpha.tar.z +FRONTPAGE= fp40.alpha.tar.Z EXTRA_PATCHES= ${FILESDIR}/change_server.alpha ${FILESDIR}/fp_install.alpha -.else -.BEGIN: - @${ECHO} "Unsupported system ${ARCH}" - @${FALSE} .endif EXTRACT_ONLY= ${APACHE} @@ -139,6 +139,7 @@ MAN8+= suexec.8 .endif +.if ${OSVERSION} < 500016 pre-extract: @if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \ ${ECHO} ; \ @@ -161,6 +162,7 @@ ${FALSE} ; \ fi .endif +.endif post-extract: @${ECHO} "===> Extracting FrontPage install scripts" @@ -211,8 +213,10 @@ @${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist @${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM} @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL +.if ${OSVERSION} < 500016 .if ${ARCH} == i386 @${CAT} ${PKGMESSAGE} .endif +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN apache13-fp.orig/distinfo apache13-fp/distinfo --- apache13-fp.orig/distinfo Thu Mar 8 06:35:09 2001 +++ apache13-fp/distinfo Sun Apr 8 18:44:26 2001 @@ -1,6 +1,6 @@ MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855 -MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4 -MD5 (fp40.freebsd.tar.z) = 8893bec896e36d3f4a0e20b52ad9f5d7 -MD5 (fp40.alpha.tar.z) = 6e6832c9dbe0975420020c06da9ae44e +MD5 (fp40.bsdi.tar.Z) = f469ea85b69d69f80f32c58fb0d273c4 +MD5 (fp40.freebsd.tar.Z) = 8893bec896e36d3f4a0e20b52ad9f5d7 +MD5 (fp40.alpha.tar.Z) = 6e6832c9dbe0975420020c06da9ae44e MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62 MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6 diff -ruN apache13-fp.orig/files/patch-fj apache13-fp/files/patch-fj --- apache13-fp.orig/files/patch-fj Thu Mar 22 18:20:45 2001 +++ apache13-fp/files/patch-fj Sun Apr 8 18:10:46 2001 @@ -9,7 +9,28 @@ pos = x; break; } -@@ -2040,7 +2040,6 @@ +@@ -2013,12 +2013,14 @@ + int x; + + if (!strchr(p->h_name, '.')) { +- for (x = 0; p->h_aliases[x]; ++x) { +- if (strchr(p->h_aliases[x], '.') && +- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) +- return ap_pstrdup(a, p->h_aliases[x]); +- } +- return NULL; ++ if (p->h_aliases) { ++ for (x = 0; p->h_aliases[x]; ++x) { ++ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') && ++ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name)))) ++ return ap_pstrdup(a, p->h_aliases[x]); ++ } ++ } ++ return NULL; + } + return ap_pstrdup(a, (void *) p->h_name); + } +@@ -2040,7 +2042,6 @@ ap_log_error(APLOG_MARK, APLOG_WARNING, NULL, "%s: gethostname() failed to determine ServerName\n", ap_server_argv0); @@ -17,12 +38,20 @@ } else { -@@ -2048,7 +2047,7 @@ +@@ -2048,14 +2049,14 @@ if ((!(p = gethostbyname(str))) || (!(server_hostname = find_fqdn(a, p)))) { /* Recovery - return the default servername by IP: */ - if (p->h_addr_list[0]) { -+ if (p && p->h_addr_list[0]) { ++ if (p && p->h_addr_list && p->h_addr_list[0]) { ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]); server_hostname = ap_pstrdup(a, str); /* We will drop through to report the IP-named server */ + } + } + else +- /* Since we found a fdqn, return it with no logged message. */ ++ /* Since we found a fqdn, return it with no logged message. */ + return server_hostname; + } + >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?200104090012.f390Cl723507>