pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2004Q3]: pkgsrc/www Pullup ticket 160 - requested by Thomas Kl...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cd77f826de57
branches: pkgsrc-2004Q3
changeset: 480759:cd77f826de57
user: salo <salo%pkgsrc.org@localhost>
date: Sat Nov 27 16:51:05 2004 +0000
description:
Pullup ticket 160 - requested by Thomas Klausner
remove apache6 package
removed from -current because of too many vulnerabilities and no newer
version available (people are expected to switch to apache2).
diffstat:
www/Makefile | 3 +-
www/apache6/DESCR | 6 -
www/apache6/Makefile | 196 ----------
www/apache6/PLIST | 626 ----------------------------------
www/apache6/PLIST.suexec | 3 -
www/apache6/distinfo | 17 -
www/apache6/files/ap_include_extern.h | 83 ----
www/apache6/files/apache.sh | 47 --
www/apache6/files/config.layout | 21 -
www/apache6/patches/patch-aa | 56 ---
www/apache6/patches/patch-ab | 18 -
www/apache6/patches/patch-ac | 37 --
www/apache6/patches/patch-ae | 53 --
www/apache6/patches/patch-af | 21 -
www/apache6/patches/patch-ah | 14 -
www/apache6/patches/patch-ai | 14 -
www/apache6/patches/patch-aj | 37 --
www/apache6/patches/patch-ak | 13 -
18 files changed, 1 insertions(+), 1264 deletions(-)
diffs (truncated from 1347 to 300 lines):
diff -r a43d45d037e7 -r cd77f826de57 www/Makefile
--- a/www/Makefile Sat Nov 27 16:45:43 2004 +0000
+++ b/www/Makefile Sat Nov 27 16:51:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.344 2004/09/19 04:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.344.2.1 2004/11/27 16:51:05 salo Exp $
#
COMMENT= Packages related to the World Wide Web
@@ -43,7 +43,6 @@
SUBDIR+= ap2-transform
SUBDIR+= apache
SUBDIR+= apache2
-SUBDIR+= apache6
SUBDIR+= apachetop
SUBDIR+= apc-gui
SUBDIR+= asWedit
diff -r a43d45d037e7 -r cd77f826de57 www/apache6/DESCR
--- a/www/apache6/DESCR Sat Nov 27 16:45:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-The Apache HTTP Server Project is a collaborative software development
-effort aimed at creating a robust, commercial-grade, featureful, and
-freely-available source code implementation of an HTTP (Web) server.
-
-This package is IPv6 ready. The Apache module API is slightly modified,
-so some third-party modules may not work.
diff -r a43d45d037e7 -r cd77f826de57 www/apache6/Makefile
--- a/www/apache6/Makefile Sat Nov 27 16:45:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-# $NetBSD: Makefile,v 1.90 2004/08/27 06:29:11 jlam Exp $
-#
-# This package does not compile in mod_ssl support hooks, as it conflicts
-# with IPv6-enable patch.
-#
-# IPv6-enable patch conflicts with third-party modules anyway, due to
-# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
-
-DISTNAME= apache_${APACHE_VERSION}
-PKGNAME= apache6-${APACHE_VERSION}
-APACHE_VERSION= 1.3.29
-PKGREVISION= #
-CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
- ${MASTER_SITE_APACHE:=httpd/old/}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NETBSD_LOGO}
-
-PATCH_SITES+= http://www.tendra.org/~asmodai/ipv6/
-PATCHFILES+= apache-1.3.29-v6-20031028.diff.gz
-
-NETBSD_LOGO= sitedrivenby.gif
-SITES_${NETBSD_LOGO}= # defined
-
-MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://httpd.apache.org/
-COMMENT= Apache HTTP (Web) server with IPv6 support
-
-CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
-
-EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
-USE_BUILDLINK3= YES
-USE_PKGINSTALL= YES
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
-CONFIGURE_ARGS+= --enable-module=most \
- --enable-module=auth_db \
- --enable-module=so \
- --disable-module=auth_dbm \
- --enable-rule=INET6
-# proxy module is broken with the IPv6 patch
-CONFIGURE_ARGS+= --disable-module=proxy
-CONFIGURE_ARGS+= --without-confadjust
-CONFIGURE_ARGS+= --with-perl=${PERL5}
-CONFIGURE_ARGS+= --with-port=80
-CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}"
-CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}"
-
-BUILD_DEFS+= USE_INET6
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !defined(USE_INET6) || ${USE_INET6} != YES
-PKG_FAIL_REASON= "IPv6 only build"
-.endif
-
-.if empty(STRIPFLAG)
-CONFIGURE_ARGS+= --without-execstrip
-.endif
-
-PKG_SYSCONFSUBDIR?= httpd
-
-APACHE_USER?= www
-APACHE_GROUP?= www
-BUILD_DEFS+= APACHE_USER
-BUILD_DEFS+= APACHE_GROUP
-
-CONFIGURE_ARGS+= --server-uid=${APACHE_USER}
-CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP}
-
-.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
-APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
-APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-APACHE_SUEXEC_CONFIGURE_ARGS+= \
- --suexec-caller=${APACHE_USER} \
- --suexec-safepath='${APACHE_SUEXEC_PATH}' \
- --suexec-docroot=${APACHE_SUEXEC_DOCROOT}
-CONFIGURE_ARGS+= --enable-suexec \
- ${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
-PLIST_SRC= ${PKGDIR}/PLIST.suexec
-BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
-.endif
-
-# Note that there is NO static compile module hook here. This is intentional.
-# Under Apache 1.3, modules can be compiled to link dynamically to the server
-# using the "apxs" program. See apxs(8).
-
-PLIST_SRC+= ${PKGDIR}/PLIST
-
-.if defined(NOPIC)
-PLIST_SUBST+= SHLIBS="@comment "
-.else
-PLIST_SUBST+= SHLIBS=""
-.endif
-
-APACHE_CUSTOM_CFLAGS?= # empty
-
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
-APACHE_CUSTOM_CFLAGS+= -DBUFFERED_LOGS
-APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
-.endif
-
-# Explicitly turn on large file support
-APACHE_CUSTOM_CFLAGS+= -D_LARGEFILE_SOURCE
-APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
-
-.include "../../mk/compiler.mk"
-
-# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
-# certain symbols from the C++ implementation (__get_eh_context, etc.)
-# referenced by DSOs written in C++ will resolve correctly.
-#
-.if ${OPSYS} == "NetBSD"
-. if ${OBJECT_FMT} == "ELF"
-LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK}
-MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
-# if we are using gcc3, we need to link against libgcc_s, too. This
-# ensures modules can resolve symbols they require from gcc.
-. if !empty(CC_VERSION:Mgcc-3*)
-USE_GCC_SHLIB= # defined
-LINK_LIBGCC_LDFLAGS+= -lgcc_s
-. endif
-. endif
-.endif
-
-# Use operating system's db1 functions (where available)
-USE_DB185= # defined
-
-.include "../../databases/db/buildlink3.mk"
-BUILDLINK_DEPENDS.db= db>=2.7.7
-
-.if defined(BUILDLINK_PREFIX.db_DEFAULT)
-CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
-
-# on Solaris, we also need libdbm
-. if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= LIBS="-ldbm -ldb2"
-LDFLAGS+= ${COMPILER_RPATH_FLAG}/usr/ucblib -L/usr/ucblib
-. else
-CONFIGURE_ENV+= LIBS="-ldb2"
-. endif
-.endif
-
-BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
-BUILD_DEFS+= APACHE_PERF_TUNING
-BUILD_DEFS+= APACHE_SUEXEC
-
-PKG_GROUPS= ${APACHE_GROUP}
-PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
-
-EGDIR= ${PREFIX}/share/examples/httpd
-
-CONF_FILES= ${EGDIR}/httpd.conf.default ${PKG_SYSCONFDIR}/httpd.conf
-SUPPORT_FILES= ${EGDIR}/magic.default ${PKG_SYSCONFDIR}/magic
-SUPPORT_FILES+= ${EGDIR}/mime.types.default ${PKG_SYSCONFDIR}/mime.types
-RCD_SCRIPTS= apache
-
-OWN_DIRS+= ${PREFIX}/lib/httpd
-OWN_DIRS+= /var/httpd
-OWN_DIRS+= /var/log/httpd
-
-pre-patch:
- @${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-patch:
- @cd ${WRKSRC}/src/support; \
- ${SED} -e "s|@INSTALL@|"`${TYPE} ${INSTALL} | ${AWK} '{ print $$NF }'`" -c -o ${LIBOWN} -g ${LIBGRP}|" \
- apxs.pl > apxs.pl.sed; \
- ${MV} apxs.pl.sed apxs.pl
- @cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
- @${SED} -e "s|#Listen ::|Listen ::|" \
- -e "s|#Listen 0.0.0.0|Listen 0.0.0.0|" \
- ${WRKSRC}/conf/httpd.conf-dist- \
- > ${WRKSRC}/conf/httpd.conf-dist
-
-pre-configure:
- @${SED} ${FILES_SUBST_SED} \
- ${FILESDIR}/config.layout > ${WRKDIR}/config.layout
-
-pre-install:
- @${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
- for file in httpd.conf magic mime.types; do \
- ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \
- ${PREFIX}/share/examples/httpd; \
- ${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \
- done
- ${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
- ${CHMOD} ${NONBINMODE} ${PREFIX}/libexec/cgi-bin/printenv \
- ${PREFIX}/libexec/cgi-bin/test-cgi
-
-.include "../../devel/libmm/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r a43d45d037e7 -r cd77f826de57 www/apache6/PLIST
--- a/www/apache6/PLIST Sat Nov 27 16:45:43 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,626 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2004/04/23 22:07:59 reed Exp $
-bin/checkgid
-bin/dbmmanage
-bin/htdigest
-bin/htpasswd
-include/httpd/ap.h
-include/httpd/ap_alloc.h
-include/httpd/ap_compat.h
-include/httpd/ap_config.h
-include/httpd/ap_config_auto.h
-include/httpd/ap_ctype.h
-include/httpd/ap_ebcdic.h
-include/httpd/ap_md5.h
-include/httpd/ap_mmn.h
-include/httpd/ap_sha1.h
-include/httpd/buff.h
-include/httpd/compat.h
-include/httpd/conf.h
-include/httpd/explain.h
-include/httpd/fnmatch.h
-include/httpd/hsregex.h
-include/httpd/http_conf_globals.h
-include/httpd/http_config.h
-include/httpd/http_core.h
-include/httpd/http_log.h
-include/httpd/http_main.h
-include/httpd/http_protocol.h
-include/httpd/http_request.h
-include/httpd/http_vhost.h
-include/httpd/httpd.h
-include/httpd/multithread.h
-include/httpd/os-inline.c
-include/httpd/os.h
-include/httpd/rfc1413.h
-include/httpd/sa_len.h
-include/httpd/sockaddr_storage.h
-include/httpd/scoreboard.h
-include/httpd/util_date.h
-include/httpd/util_md5.h
-include/httpd/util_script.h
-include/httpd/util_uri.h
-include/httpd/xml/asciitab.h
-include/httpd/xml/hashtable.h
-include/httpd/xml/iasciitab.h
-include/httpd/xml/latin1tab.h
-include/httpd/xml/nametab.h
-include/httpd/xml/utf8tab.h
-include/httpd/xml/xmldef.h
-include/httpd/xml/xmlparse.h
-include/httpd/xml/xmlrole.h
-include/httpd/xml/xmltok.h
-include/httpd/xml/xmltok_impl.h
-${SHLIBS}lib/httpd/httpd.exp
-libexec/cgi-bin/printenv
-libexec/cgi-bin/test-cgi
-man/man1/dbmmanage.1
-man/man1/htdigest.1
-man/man1/htpasswd.1
-man/man8/ab.8
-man/man8/apachectl.8
-man/man8/apxs.8
-man/man8/httpd.8
-man/man8/logresolve.8
-man/man8/rotatelogs.8
-sbin/ab
-sbin/apachectl
-sbin/apxs
-sbin/httpd
-sbin/logresolve
Home |
Main Index |
Thread Index |
Old Index