kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/www/apache6/Makefile

173 lines
5.3 KiB
Makefile
Raw Normal View History

Update "apache6" package to version 1.3.27. This version fixes many bugs discovered in version 1.3.26 including these security fixes: - SECURITY: CAN-2002-0840 (cve.mitre.org) Prevent a cross-site scripting vulnerability in the default error page. The issue could only be exploited if the directive UseCanonicalName is set to Off and a server is being run at a domain that allows wildcard DNS. [Matthew Murphy] - SECURITY CAN-2002-0843 (cve.mitre.org) Fix some possible overflows in ab.c that could be exploited by a malicious server. Reported by David Wagner. [Jim Jagielski] - SECURITY CAN-2002-0839 (cve.mitre.org) Add the new directive 'ShmemUIDisUser'. By default, Apache will no longer set the uid/gid of SysV shared memory scoreboard to User/Group, and it will therefore stay the uid/gid of the parent Apache process. This is actually the way it should be, however, some implementations may still require this, which can be enabled by 'ShmemUIDisUser On'. Reported by iDefense. [Jim Jagielski]
2002-10-06 14:49:59 +02:00
# $NetBSD: Makefile,v 1.59 2002/10/06 12:49:59 tron Exp $
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
#
provide and enable IPv6-ready apache. This is provided as separate package because: # 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)
1999-07-23 20:19:29 +02:00
# This package does not compile in mod_ssl support hooks, as it conflicts
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
# with IPv6-enable patch.
#
# IPv6-enable patch conflicts with third-party modules anyway, due to
provide and enable IPv6-ready apache. This is provided as separate package because: # 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)
1999-07-23 20:19:29 +02:00
# sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs)
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
DISTNAME= apache_${APACHE_VERSION}
PKGNAME= apache6-${APACHE_VERSION}
Update "apache6" package to version 1.3.27. This version fixes many bugs discovered in version 1.3.26 including these security fixes: - SECURITY: CAN-2002-0840 (cve.mitre.org) Prevent a cross-site scripting vulnerability in the default error page. The issue could only be exploited if the directive UseCanonicalName is set to Off and a server is being run at a domain that allows wildcard DNS. [Matthew Murphy] - SECURITY CAN-2002-0843 (cve.mitre.org) Fix some possible overflows in ab.c that could be exploited by a malicious server. Reported by David Wagner. [Jim Jagielski] - SECURITY CAN-2002-0839 (cve.mitre.org) Add the new directive 'ShmemUIDisUser'. By default, Apache will no longer set the uid/gid of SysV shared memory scoreboard to User/Group, and it will therefore stay the uid/gid of the parent Apache process. This is actually the way it should be, however, some implementations may still require this, which can be enabled by 'ShmemUIDisUser On'. Reported by iDefense. [Jim Jagielski]
2002-10-06 14:49:59 +02:00
APACHE_VERSION= 1.3.27
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
CATEGORIES= www
Fix MASTER_SITES
2001-04-14 21:50:04 +02:00
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
http://www.apache.de/dist/httpd/ \
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
http://www.netbsd.org/images/logos/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sitedrivenby.gif
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
Update "apache6" package to version 1.3.27. This version fixes many bugs discovered in version 1.3.26 including these security fixes: - SECURITY: CAN-2002-0840 (cve.mitre.org) Prevent a cross-site scripting vulnerability in the default error page. The issue could only be exploited if the directive UseCanonicalName is set to Off and a server is being run at a domain that allows wildcard DNS. [Matthew Murphy] - SECURITY CAN-2002-0843 (cve.mitre.org) Fix some possible overflows in ab.c that could be exploited by a malicious server. Reported by David Wagner. [Jim Jagielski] - SECURITY CAN-2002-0839 (cve.mitre.org) Add the new directive 'ShmemUIDisUser'. By default, Apache will no longer set the uid/gid of SysV shared memory scoreboard to User/Group, and it will therefore stay the uid/gid of the parent Apache process. This is actually the way it should be, however, some implementations may still require this, which can be enabled by 'ShmemUIDisUser On'. Reported by iDefense. [Jim Jagielski]
2002-10-06 14:49:59 +02:00
PATCH_SITES+= ${MASTER_SITE_LOCAL}
apache with IPv6 patch, for 1.3.26. proxy module was disabled as the IPv6 patch for the module is broken.
2002-06-20 09:24:17 +02:00
PATCHFILES+= ${IPV6_PATCH}
IPV6_PATCH= apache-1.3.26-ipv6.diff.gz
PATCH_DIST_STRIP= -p1
provide and enable IPv6-ready apache. This is provided as separate package because: # 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)
1999-07-23 20:19:29 +02:00
Update "apache6" package to version 1.3.27. This version fixes many bugs discovered in version 1.3.26 including these security fixes: - SECURITY: CAN-2002-0840 (cve.mitre.org) Prevent a cross-site scripting vulnerability in the default error page. The issue could only be exploited if the directive UseCanonicalName is set to Off and a server is being run at a domain that allows wildcard DNS. [Matthew Murphy] - SECURITY CAN-2002-0843 (cve.mitre.org) Fix some possible overflows in ab.c that could be exploited by a malicious server. Reported by David Wagner. [Jim Jagielski] - SECURITY CAN-2002-0839 (cve.mitre.org) Add the new directive 'ShmemUIDisUser'. By default, Apache will no longer set the uid/gid of SysV shared memory scoreboard to User/Group, and it will therefore stay the uid/gid of the parent Apache process. This is actually the way it should be, however, some implementations may still require this, which can be enabled by 'ShmemUIDisUser On'. Reported by iDefense. [Jim Jagielski]
2002-10-06 14:49:59 +02:00
MAINTAINER= packages@netbsd.org
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
HOMEPAGE= http://httpd.apache.org/
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
COMMENT= Apache HTTP (Web) server with IPv6 support
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
CONFLICTS= apache-[0-9]* apache-*ssl-[0-9]* apache6-[0-9]*
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
pull official patch from apache.org. make it 1.3.17.1
2001-02-06 13:50:19 +01:00
EXTRACT_ONLY= ${DISTFILES:N*.gif:N*.diff.gz}
Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2.
2002-08-25 23:50:52 +02:00
USE_BUILDLINK2= YES
Make this look more like the apache Makefile: * Buildlinkify * Use pkgsrc expat so that there are no symbol conflicts when an expat XML parser is loaded by a DSO.
2001-10-17 21:27:27 +02:00
HAS_CONFIGURE= YES
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
apache with IPv6 patch, for 1.3.26. proxy module was disabled as the IPv6 patch for the module is broken.
2002-06-20 09:24:17 +02:00
CONFIGURE_ARGS+= --enable-module=most \
enable mod_so for use with php. From: Dawid Szymanski <dawszy@tgr.lubin.edu.pl>
2002-06-20 11:45:27 +02:00
--enable-module=auth_db \
--enable-module=so \
apache with IPv6 patch, for 1.3.26. proxy module was disabled as the IPv6 patch for the module is broken.
2002-06-20 09:24:17 +02:00
--disable-module=auth_dbm \
--enable-rule=INET6
enable mod_so for use with php. From: Dawid Szymanski <dawszy@tgr.lubin.edu.pl>
2002-06-20 11:45:27 +02:00
# proxy module is broken with the IPv6 patch
apache with IPv6 patch, for 1.3.26. proxy module was disabled as the IPv6 patch for the module is broken.
2002-06-20 09:24:17 +02:00
CONFIGURE_ARGS+= --disable-module=proxy
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
CONFIGURE_ARGS+= --without-confadjust
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
CONFIGURE_ARGS+= --with-perl=${PERL5}
CONFIGURE_ARGS+= --with-port=80
Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in /etc/mk.conf to any string of legal compiler flags to tune different aspects of the built httpd.
2001-05-18 08:01:35 +02:00
CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}"
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
use apache 1.3.11 + IPv6 patch as base version. for changes between 1.3.9 to 1.3.11, please see commit logs for pkgsrc/www/apache, or apache changelogs.
2000-02-21 08:14:44 +01:00
BUILD_DEFS+= USE_INET6
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.include "../../mk/bsd.prefs.mk"
Compare "${USE_INET6}" explicitly with "YES" so that you can override settings at the command line.
1999-09-04 00:00:52 +02:00
.if !defined(USE_INET6) || ${USE_INET6} != YES
don't mark it as BROKEN on non-IPv6-hosts, IGNORE it
2000-01-26 17:04:18 +01:00
IGNORE= "IPv6 only build"
provide and enable IPv6-ready apache. This is provided as separate package because: # 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)
1999-07-23 20:19:29 +02:00
.endif
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
.if empty(STRIPFLAG)
CONFIGURE_ARGS+= --without-execstrip
.endif
PKG_SYSCONFDIR is where the configuration files for a package may be found. This value may be customized in various ways: PKG_SYSCONFBASE is the main config directory under which all package configuration files are to be found. PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found. PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a particular package. Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the default location of ${PREFIX}/etc. This obsoletes the use of CONFDIR, which was active for only 6 days, so no need to have a workaround to still accept old CONFDIR settings.
2001-11-25 19:59:45 +01:00
PKG_SYSCONFSUBDIR?= httpd
Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files).
2001-04-14 21:42:53 +02:00
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
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}
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen <eric@cirr.com> (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 22:20:26 +01:00
APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
APACHE_SUEXEC_PATH= /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
APACHE_SUEXEC_CONFIGURE_ARGS+= \
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
--suexec-caller=${APACHE_USER} \
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen <eric@cirr.com> (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 22:20:26 +01:00
--suexec-safepath='${APACHE_SUEXEC_PATH}' \
Allow changing document root for suexec through ${APACHE_SUEXEC_DOCROOT}. Closes pkg/12852 by Eric Schnoebelen <eric@milo.cirr.com>.
2001-05-08 19:28:08 +02:00
--suexec-docroot=${APACHE_SUEXEC_DOCROOT}
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen <eric@cirr.com> (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 22:20:26 +01:00
CONFIGURE_ARGS+= --enable-suexec \
${APACHE_SUEXEC_CONFIGURE_ARGS:M--suexec-*}
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
PLIST_SRC= ${PKGDIR}/PLIST.suexec
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen <eric@cirr.com> (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 22:20:26 +01:00
BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.endif
Minimize the diffs between the apache and apache6 packages: - Whitespace changes to Makefile - From the commit log for apache/Makefile: Don't do the dance with ROOT_GROUP. Apache extension modules installed by apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}", which should do the right thing regardless of the platform. ${INSTALL} is replaced with the full path to the install program used by pkgsrc, which should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris. This should fix pkg/14232 by Pierre Bourgin.
2001-10-22 20:10:28 +02:00
# 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).
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
PLIST_SRC+= ${PKGDIR}/PLIST
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
.if defined(NOPIC)
PLIST_SUBST+= SHLIBS="@comment "
.else
PLIST_SUBST+= SHLIBS=""
.endif
Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in /etc/mk.conf to any string of legal compiler flags to tune different aspects of the built httpd.
2001-05-18 08:01:35 +02:00
APACHE_CUSTOM_CFLAGS?= # empty
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in /etc/mk.conf to any string of legal compiler flags to tune different aspects of the built httpd.
2001-05-18 08:01:35 +02:00
APACHE_CUSTOM_CFLAGS+= -DBUFFERED_LOGS
APACHE_CUSTOM_CFLAGS+= -O6 -fomit-frame-pointer -fexpensive-optimizations
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.endif
Explicitly turn on large file support, as some Apache modules have problems when it is not enabled, notably mod_perl. Fixes pkg/18070 from myself, ok'd by wiz. Bump PKGREVISION.
2002-09-26 03:48:29 +02:00
# Explicitly turn on large file support
APACHE_CUSTOM_CFLAGS+= -D_LARGEFILE_SOURCE
APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64
Only link -lgcc whole-archive on NetBSD ELF platforms, to allow a.out platforms to correctly links this package.
2001-10-20 19:46:50 +02:00
# 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.
Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are: On NetBSD, 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. This makes php4-sablot work with mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.
2001-10-16 06:11:06 +02:00
#
Only link -lgcc whole-archive on NetBSD ELF platforms, to allow a.out platforms to correctly links this package.
2001-10-20 19:46:50 +02:00
.if (${OPSYS} == "NetBSD") && (${OBJECT_FMT} == "ELF")
Use --whole-archive, not -whole-archive, as the latter isn't recognized by a.out ld.
2001-10-16 06:47:06 +02:00
LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
Update apache{,6} to 1.3.20nb1. Changes from version 1.3.20 are: On NetBSD, 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. This makes php4-sablot work with mod_php4.so (from ap-php4) on ELF platforms when loaded by Apache's httpd.
2001-10-16 06:11:06 +02:00
MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
.endif
Add the patches for Solaris from apache/Makefile rev1.44.
2000-02-22 18:43:23 +01:00
.if (${OPSYS} == "SunOS")
Make this look more like the apache Makefile: * Buildlinkify * Use pkgsrc expat so that there are no symbol conflicts when an expat XML parser is loaded by a DSO.
2001-10-17 21:27:27 +02:00
LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib
Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2.
2002-08-25 23:50:52 +02:00
CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_PREFIX.db}/include/db2"
Add the patches for Solaris from apache/Makefile rev1.44.
2000-02-22 18:43:23 +01:00
CONFIGURE_ENV+= LIBS="-ldbm -ldb2"
Make this look more like the apache Makefile: * Buildlinkify * Use pkgsrc expat so that there are no symbol conflicts when an expat XML parser is loaded by a DSO.
2001-10-17 21:27:27 +02:00
BUILDLINK_DEPENDS.db= db>=2.7.7
Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2.
2002-08-25 23:50:52 +02:00
.include "../../databases/db/buildlink2.mk"
Add the patches for Solaris from apache/Makefile rev1.44.
2000-02-22 18:43:23 +01:00
.endif
Introduce a new make variable APACHE_CUSTOM_CFLAGS that can be set in /etc/mk.conf to any string of legal compiler flags to tune different aspects of the built httpd.
2001-05-18 08:01:35 +02:00
BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
BUILD_DEFS+= APACHE_PERF_TUNING
BUILD_DEFS+= APACHE_SUEXEC
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
PKG_GROUPS= ${APACHE_GROUP}
PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in bsd.pkg.install.mk: * Remove old DEINSTALL/INSTALL scripts. * Move some text printed at POST-INSTALL time into the MESSAGE file. * Adjust rc.d scripts to respect rc.conf settings, so that the script may be directly copied into /etc/rc.d.
2001-11-19 17:23:08 +01:00
EGDIR= ${PREFIX}/share/examples/httpd
Record build options in the BuildInfo file via BUILD_DEFS. These can be displayed using the -B option to pkg_info(1).
1999-08-18 10:28:09 +02:00
PKG_SYSCONFDIR is where the configuration files for a package may be found. This value may be customized in various ways: PKG_SYSCONFBASE is the main config directory under which all package configuration files are to be found. PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found. PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a particular package. Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the default location of ${PREFIX}/etc. This obsoletes the use of CONFDIR, which was active for only 6 days, so no need to have a workaround to still accept old CONFDIR settings.
2001-11-25 19:59:45 +01:00
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 now just lists the filenames (see bsd.pkg.install.mk).
2001-11-21 16:44:22 +01:00
RCD_SCRIPTS= apache
Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in bsd.pkg.install.mk: * Remove old DEINSTALL/INSTALL scripts. * Move some text printed at POST-INSTALL time into the MESSAGE file. * Adjust rc.d scripts to respect rc.conf settings, so that the script may be directly copied into /etc/rc.d.
2001-11-19 17:23:08 +01:00
Update apache packages with some common changes: Give Apache a user and group by default, not only with suexec. The variables for this have changed from APACHE_SUEXEC_USER and APACHE_SUEXEC_GROUP to APACHE_USER and APACHE_GROUP. Mention 'Apache' in COMMENT. Use variables for the version number instead of copying it around. Bump PKGREVISION. For apache{,6}: Change paths to /var/httpd instead of /var/spool/httpd. Honour STRIPFLAG. Add --without-confadjust as configure argument. Enable the 'define' module. For apache: Enable proxy module on NOPIC platforms. Some of these changes are based on pkg/17469 by Greg A. Woods, some on comments by Johnny Lam. Reviewed by Johnny Lam.
2002-07-30 20:40:14 +02:00
OWN_DIRS+= ${PREFIX}/lib/httpd
OWN_DIRS+= /var/httpd
OWN_DIRS+= /var/log/httpd
In package Makefiles, create FILES_SUBST instead of duplicating sed expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s" instead of "diff -q" since the former is more portable across OSes.
2001-07-13 09:09:17 +02:00
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
pre-patch:
In package Makefiles, create FILES_SUBST instead of duplicating sed expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s" instead of "diff -q" since the former is more portable across OSes.
2001-07-13 09:09:17 +02:00
${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
post-patch:
Minimize the diffs between the apache and apache6 packages: - Whitespace changes to Makefile - From the commit log for apache/Makefile: Don't do the dance with ROOT_GROUP. Apache extension modules installed by apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}", which should do the right thing regardless of the platform. ${INSTALL} is replaced with the full path to the install program used by pkgsrc, which should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris. This should fix pkg/14232 by Pierre Bourgin.
2001-10-22 20:10:28 +02:00
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
listen to both IPv4 and IPv6 wildcard by default. workarounds PR12655.
2001-07-16 17:41:51 +02:00
cp ${WRKSRC}/conf/httpd.conf-dist ${WRKSRC}/conf/httpd.conf-dist-
Minimize the diffs between the apache and apache6 packages: - Whitespace changes to Makefile - From the commit log for apache/Makefile: Don't do the dance with ROOT_GROUP. Apache extension modules installed by apxs are now installed with "${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP}", which should do the right thing regardless of the platform. ${INSTALL} is replaced with the full path to the install program used by pkgsrc, which should be /usr/bin/install on NetBSD, and /usr/ucb/install on Solaris. This should fix pkg/14232 by Pierre Bourgin.
2001-10-22 20:10:28 +02:00
${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
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
pre-configure:
(1) Create new variable "APACHE_SUEXEC_CONFIGURE_ARGS" that may contain --suexec-* configure options that are passed directly to the Apache configure script. This may be used to tune the suEXEC configuration in more restrictive ways, e.g. --suexec-uidmin=1000. This solution is more open-ended than the fix proposed in pkg/14973. Also, we don't duplicate all of the options from the Apache configure script in pkgsrc bsd.pkg.defaults.mk. This closes pkg/14973 by Eric Schnoebelen <eric@cirr.com> (2) For namespace consistency, deprecate APACHE_USER in favor of APACHE_SUEXEC_USER. Move APACHE_USER into bsd.pkg.obsolete.mk. (3) Create the suEXEC user when the functionality is enabled in the server so that CGI scripts will work properly. This closes pkg/14903 by Wojciech Puchar <wojtek@3miasto.net>
2001-12-26 22:20:26 +01:00
@${SED} ${FILES_SUBST_SED} \
Make apache and apache6 package skeletons look more similar. Change maintainer of apache6 package back to itojun@netbsd.org.
2001-04-29 23:21:13 +02:00
${FILESDIR}/config.layout > ${WRKDIR}/config.layout
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
pre-install:
In package Makefiles, create FILES_SUBST instead of duplicating sed expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s" instead of "diff -q" since the former is more portable across OSes.
2001-07-13 09:09:17 +02:00
${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
post-install:
Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files).
2001-04-14 21:42:53 +02:00
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/httpd
In package Makefiles, create FILES_SUBST instead of duplicating sed expression for substituting in DEINSTALL/INSTALL scripts. Use "${CMP} -s" instead of "diff -q" since the former is more portable across OSes.
2001-07-13 09:09:17 +02:00
for file in httpd.conf magic mime.types; do \
PKG_SYSCONFDIR is where the configuration files for a package may be found. This value may be customized in various ways: PKG_SYSCONFBASE is the main config directory under which all package configuration files are to be found. PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found. PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a particular package. Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the default location of ${PREFIX}/etc. This obsoletes the use of CONFDIR, which was active for only 6 days, so no need to have a workaround to still accept old CONFDIR settings.
2001-11-25 19:59:45 +01:00
${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default \
Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files).
2001-04-14 21:42:53 +02:00
${PREFIX}/share/examples/httpd; \
PKG_SYSCONFDIR is where the configuration files for a package may be found. This value may be customized in various ways: PKG_SYSCONFBASE is the main config directory under which all package configuration files are to be found. PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the configuration files for a particular package may be found. PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a particular package. Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the default location of ${PREFIX}/etc. This obsoletes the use of CONFDIR, which was active for only 6 days, so no need to have a workaround to still accept old CONFDIR settings.
2001-11-25 19:59:45 +01:00
${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \
Use APACHE_SYSCONFDIR to set sysconfdir (the location of config files).
2001-04-14 21:42:53 +02:00
done
upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog.
2001-02-06 11:58:18 +01:00
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2.
2002-08-25 23:50:52 +02:00
.include "../../textproc/expat/buildlink2.mk"
Adapt to use shared INSTALL/DEINSTALL scripts by using the logic in bsd.pkg.install.mk: * Remove old DEINSTALL/INSTALL scripts. * Move some text printed at POST-INSTALL time into the MESSAGE file. * Adjust rc.d scripts to respect rc.conf settings, so that the script may be directly copied into /etc/rc.d.
2001-11-19 17:23:08 +01:00
.include "../../mk/bsd.pkg.install.mk"
import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package.
1999-07-23 19:53:29 +02:00
.include "../../mk/bsd.pkg.mk"
Reference in a new issue Copy permalink