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

165 lines
5.6 KiB
Makefile
Raw Normal View History

Fix installation so that existing config files are preserved when building from source instead of installing from a binary package (problem noted in private email by George Coulouris <george@coulouris.org>. Also move the ownership of SSL-related config directories to the www/ap-ssl package.
2002-01-01 07:12:05 +01:00
# $NetBSD: Makefile,v 1.87 2002/01/01 06:12:05 jlam Exp $
Initial version of apache web server package: 1.3b3.
1998-03-05 09:02:22 +01:00
#
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
DISTNAME= apache_1.3.22
PKGNAME= apache-1.3.22
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
CATEGORIES= www
Fix MASTER_SITES
2001-04-14 21:50:04 +02:00
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
http://www.apache.de/dist/httpd/ \
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
http://www.netbsd.org/images/logos/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
sitedrivenby.gif
Initial version of apache web server package: 1.3b3.
1998-03-05 09:02:22 +01: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
MASTER_SITES+= http://www.modssl.org/source/ \
ftp://ftp.uni-trier.de/pub/unix/security/mod_ssl/source/
DISTFILES+= ${MODSSL_DISTNAME}${EXTRACT_SUFX}
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
MODSSL_DISTNAME= mod_ssl-2.8.5-1.3.22
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
MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME}
Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl. EAPI didn't change so no need to change Apache's version number. Also standardize package builds to have Apache listen on ports 80/443 regardless of UID of user that builds the package, and make MAINTAINER point to me.
2000-09-12 16:17:31 +02:00
MAINTAINER= jlam@netbsd.org
Update apache to 1.3.17. Important changes from version 1.3.14 include: -) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI mis-interaction seems to be gone and I wasn't able to reproduce it on my system. *) Fix the declaration of the module structure in mod_example. *) Fix the handling of variable expansion look-ahead in mod_rewrite, i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of more complicated nested RewriteMap lookups. *) mod_status now respects ?refresh=n of 1 or greater. If the given refresh value is not a number, ?refresh is set to 1 second. *) Accomodate an out-of-space condition in the piped logs and the rotatelogs.c code, and no longer churn log processes for this condition. *) Make cgi-bin work as a regular directory when using mod_vhost_alias with no VirtualScriptAlias directives. *) Move the check of the Expect request header field after the hook for ap_post_read_request, since that is the only opportunity for modules to handle Expect extensions. *) Eliminate caching problems of mod_autoindex results, so the last modified date of the directory is returned as the Last-Modified and ETag HTTP header tags are sent if IndexOptions TrackModified directive/option is used. *) Correct an issue with Alias and ScriptAlias directives that file path arguments were not normalized in canonical form. This correction makes no attempt to normalize regular expression forms of Alias or ScriptAlias. *) Add a new LogFormat directive, %c, that will log connection status at the end of the response. *) Update the mime.types file to the registered media types as of 2000-10-19. *) Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc.
2001-02-02 17:39:56 +01:00
HOMEPAGE= http://httpd.apache.org/
Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT.
2001-02-17 18:21:28 +01:00
COMMENT= HTTP (Web) server
Initial version of apache web server package: 1.3b3.
1998-03-05 09:02:22 +01:00
Mechanical changes to 375 files to change dependency patterns of the form foo-* to foo-[0-9]*. This is to cause the dependencies to match only the packages whose base package name is "foo", and not those named "foo-bar". A concrete example is p5-Net-* matching p5-Net-DNS as well as p5-Net. Also change dependency examples in Packages.txt to reflect this.
2001-09-28 01:17:41 +02:00
CONFLICTS= apache-*modssl-[0-9]* apache6-[0-9]*
Initial version of apache web server package: 1.3b3.
1998-03-05 09:02:22 +01:00
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
EXTRACT_ONLY= ${DISTFILES:N*.gif}
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
USE_BUILDLINK_ONLY= YES
HAS_CONFIGURE= YES
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
CONFIGURE_ARGS+= --with-layout="${WRKDIR}/config.layout:pkgsrc"
CONFIGURE_ARGS+= --enable-module=most \
Update apache to 1.3.17. Important changes from version 1.3.14 include: -) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI mis-interaction seems to be gone and I wasn't able to reproduce it on my system. *) Fix the declaration of the module structure in mod_example. *) Fix the handling of variable expansion look-ahead in mod_rewrite, i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of more complicated nested RewriteMap lookups. *) mod_status now respects ?refresh=n of 1 or greater. If the given refresh value is not a number, ?refresh is set to 1 second. *) Accomodate an out-of-space condition in the piped logs and the rotatelogs.c code, and no longer churn log processes for this condition. *) Make cgi-bin work as a regular directory when using mod_vhost_alias with no VirtualScriptAlias directives. *) Move the check of the Expect request header field after the hook for ap_post_read_request, since that is the only opportunity for modules to handle Expect extensions. *) Eliminate caching problems of mod_autoindex results, so the last modified date of the directory is returned as the Last-Modified and ETag HTTP header tags are sent if IndexOptions TrackModified directive/option is used. *) Correct an issue with Alias and ScriptAlias directives that file path arguments were not normalized in canonical form. This correction makes no attempt to normalize regular expression forms of Alias or ScriptAlias. *) Add a new LogFormat directive, %c, that will log connection status at the end of the response. *) Update the mime.types file to the registered media types as of 2000-10-19. *) Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc.
2001-02-02 17:39:56 +01:00
--enable-module=auth_db \
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
--disable-module=auth_dbm
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
CONFIGURE_ARGS+= --enable-rule=EAPI \
--disable-module=ssl
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
CONFIGURE_ARGS+= --with-perl=${PERL5}
Update apache to 1.3.17. Important changes from version 1.3.14 include: -) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI mis-interaction seems to be gone and I wasn't able to reproduce it on my system. *) Fix the declaration of the module structure in mod_example. *) Fix the handling of variable expansion look-ahead in mod_rewrite, i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of more complicated nested RewriteMap lookups. *) mod_status now respects ?refresh=n of 1 or greater. If the given refresh value is not a number, ?refresh is set to 1 second. *) Accomodate an out-of-space condition in the piped logs and the rotatelogs.c code, and no longer churn log processes for this condition. *) Make cgi-bin work as a regular directory when using mod_vhost_alias with no VirtualScriptAlias directives. *) Move the check of the Expect request header field after the hook for ap_post_read_request, since that is the only opportunity for modules to handle Expect extensions. *) Eliminate caching problems of mod_autoindex results, so the last modified date of the directory is returned as the Last-Modified and ETag HTTP header tags are sent if IndexOptions TrackModified directive/option is used. *) Correct an issue with Alias and ScriptAlias directives that file path arguments were not normalized in canonical form. This correction makes no attempt to normalize regular expression forms of Alias or ScriptAlias. *) Add a new LogFormat directive, %c, that will log connection status at the end of the response. *) Update the mime.types file to the registered media types as of 2000-10-19. *) Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc.
2001-02-02 17:39:56 +01:00
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}"
Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication.
1998-10-03 23:01:14 +02:00
- Check configuration variables properly so that enabling "suexec" support really works. - Add proxy module, "suexec" binary and manual page to package list dynamically.
1999-05-11 18:04:03 +02:00
.include "../../mk/bsd.prefs.mk"
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
- Check configuration variables properly so that enabling "suexec" support really works. - Add proxy module, "suexec" binary and manual page to package list dynamically.
1999-05-11 18:04:03 +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_USER?= www
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_SUEXEC_USER} \
--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-*}
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02: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
PKG_USERS= ${APACHE_SUEXEC_USER}:nogroup::Apache\\ suEXEC\\ user
BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication.
1998-10-03 23:01:14 +02:00
.endif
Update apache to 1.3.20. Relevant changes from version 1.3.19 include: NetBSD Packages Collection (pkgsrc) changes: * Modify French page in same way as the English page. Translation provided by Remi Zara <remi_zara@mac.com> in private e-mail. * Use EAPI patches from mod_ssl-2.8.4-1.3.20. * Unify repeated SED replacement info for config.layout, apache.sh, DEINSTALL, and INSTALL into one location, FILES_SUBST. * Modify patch to apxs to use 0:0 instead of root:wheel, as some non-NetBSD systems don't have a wheel group. The general bug fixes: * Eliminate a potential segfault if an invalid floating point value is passed to the ap_snprintf() function, on platforms supporting isnan() and isinf(). * Fix a possible segfault at startup in the detection of a default ServerName or IP string when no ServerName was specified. * Fixed mod_proxy to retain empty headers, as allowed by RFC2068. * Properly resolve the location of ndbm on Linux and some glibc2 builds, where ndbm.h is in the nonstandard db1/ subdir. The main new features include: * Enhanced rotatelogs to allow a UTC offset to be specified, and the format logfile names with human-readable date/time stamps. * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all* normal URI escaping. Note incautious use can give unexpected results or introduce security risks. * Added the '\' character to RewriteRule to allow escaping of special characters. Allows embedding of both the '$' and '%' characters in the results, so 'foo\$1' translates to 'foo$1' rather than 'foo\<value of $1>'. * Added the -V flag to suexec, to display the compile-time settings with which it was built. (Only valid for root or the HTTPD_USER username.) * Introduced EBCDIC conversion configuration options, controlling the conversion based on MIME type or file suffix.
2001-06-09 08:36:42 +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).
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
.if !defined(NOPIC)
Update build to work with mod_ssl-2.6.6-1.3.12 to keep in sync with ap-ssl. EAPI didn't change so no need to change Apache's version number. Also standardize package builds to have Apache listen on ports 80/443 regardless of UID of user that builds the package, and make MAINTAINER point to me.
2000-09-12 16:17:31 +02:00
CONFIGURE_ARGS+= --enable-module=so # requires dlopen()
CONFIGURE_ARGS+= --enable-shared=proxy
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
CONFIGURE_ARGS+= --enable-shared=define # from mod_ssl pkg.addon
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
PLIST_SRC+= ${PKGDIR}/PLIST.shared
.else
CONFIGURE_ARGS+= --disable-module=proxy
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
CONFIGURE_ARGS+= --disable-shared=define
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
.endif
PLIST_SRC+= ${PKGDIR}/PLIST
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
Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication.
1998-10-03 23:01:14 +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
Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication.
1998-10-03 23:01:14 +02:00
.endif
Initial version of apache web server package: 1.3b3.
1998-03-05 09:02:22 +01: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
# 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")
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
LINK_LIBGCC_LDFLAGS= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
.endif
Solaris needs a dependence for db-2.7.7 and fix the broken [ -e test on Solaris.
2000-02-22 18:38:16 +01:00
.if (${OPSYS} == "SunOS")
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
LDFLAGS+= -Wl,-R/usr/ucblib -L/usr/ucblib
CONFIGURE_ENV+= INCLUDES="-I${BUILDLINK_DIR}/include/db2"
Solaris needs a dependence for db-2.7.7 and fix the broken [ -e test on Solaris.
2000-02-22 18:38:16 +01:00
CONFIGURE_ENV+= LIBS="-ldbm -ldb2"
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
BUILDLINK_DEPENDS.db= db>=2.7.7
.include "../../databases/db/buildlink.mk"
Solaris needs a dependence for db-2.7.7 and fix the broken [ -e test on Solaris.
2000-02-22 18:38:16 +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
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
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
Make the INSTALL/DEINSTALL scripts handle configuration files like cups: copy sample config files to default config files, and remove the config files on deinstall if they're identical to the sample ones.
2000-12-22 20:41:52 +01: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
Fix installation so that existing config files are preserved when building from source instead of installing from a binary package (problem noted in private email by George Coulouris <george@coulouris.org>. Also move the ownership of SSL-related config directories to the www/ap-ssl package.
2002-01-01 07:12:05 +01:00
OWN_DIRS= /var/log/httpd
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
OWN_DIRS+= /var/spool/httpd
OWN_DIRS_PERMS+= /var/spool/httpd/proxy nobody nobody 0755
Include bsd.prefs.mk, in case VERS_ID is set in /etc/mk.conf
1998-06-03 16:01:11 +02:00
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
post-extract:
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
${CP} ${FILESDIR}/ap_include_extern.h ${WRKSRC}/src/include
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
${CP} ${MODSSL_SRC}/pkg.addon/*.c ${WRKSRC}/src/modules/extra
${CP} ${MODSSL_SRC}/pkg.addon/*.html ${WRKSRC}/htdocs/manual/mod
${CP} ${MODSSL_SRC}/pkg.eapi/*.c ${WRKSRC}/src/ap
${CP} ${MODSSL_SRC}/pkg.eapi/*.h ${WRKSRC}/src/include
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
pre-patch:
Update apache to 1.3.17. Important changes from version 1.3.14 include: -) Remove patch to avoid dlclose()ing on NetBSD. The mod_perl vs. perl CGI mis-interaction seems to be gone and I wasn't able to reproduce it on my system. *) Fix the declaration of the module structure in mod_example. *) Fix the handling of variable expansion look-ahead in mod_rewrite, i.e. syntax like %{LA-U:REMOTE_USER}, and also fix the parsing of more complicated nested RewriteMap lookups. *) mod_status now respects ?refresh=n of 1 or greater. If the given refresh value is not a number, ?refresh is set to 1 second. *) Accomodate an out-of-space condition in the piped logs and the rotatelogs.c code, and no longer churn log processes for this condition. *) Make cgi-bin work as a regular directory when using mod_vhost_alias with no VirtualScriptAlias directives. *) Move the check of the Expect request header field after the hook for ap_post_read_request, since that is the only opportunity for modules to handle Expect extensions. *) Eliminate caching problems of mod_autoindex results, so the last modified date of the directory is returned as the Last-Modified and ETag HTTP header tags are sent if IndexOptions TrackModified directive/option is used. *) Correct an issue with Alias and ScriptAlias directives that file path arguments were not normalized in canonical form. This correction makes no attempt to normalize regular expression forms of Alias or ScriptAlias. *) Add a new LogFormat directive, %c, that will log connection status at the end of the response. *) Update the mime.types file to the registered media types as of 2000-10-19. *) Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc.
2001-02-02 17:39:56 +01:00
cd ${WRKSRC} && ${CAT} \
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
${MODSSL_SRC}/pkg.addon/addon.patch \
${MODSSL_SRC}/pkg.eapi/eapi.patch \
${MODSSL_SRC}/pkg.sslcfg/sslcfg.patch \
${MODSSL_SRC}/pkg.sslmod/sslmod.patch \
${MODSSL_SRC}/pkg.sslsup/sslsup.patch \
Update Apache and mod_ssl using new build layout (see post to tech-pkg for details). No security fixes in Apache 1.3.3, so immediate upgrade from 1.3.2 is not necessary.
1998-12-03 18:23:51 +01:00
| ${PATCH} ${PATCH_ARGS}
Update apache to 1.3.20. Relevant changes from version 1.3.19 include: NetBSD Packages Collection (pkgsrc) changes: * Modify French page in same way as the English page. Translation provided by Remi Zara <remi_zara@mac.com> in private e-mail. * Use EAPI patches from mod_ssl-2.8.4-1.3.20. * Unify repeated SED replacement info for config.layout, apache.sh, DEINSTALL, and INSTALL into one location, FILES_SUBST. * Modify patch to apxs to use 0:0 instead of root:wheel, as some non-NetBSD systems don't have a wheel group. The general bug fixes: * Eliminate a potential segfault if an invalid floating point value is passed to the ap_snprintf() function, on platforms supporting isnan() and isinf(). * Fix a possible segfault at startup in the detection of a default ServerName or IP string when no ServerName was specified. * Fixed mod_proxy to retain empty headers, as allowed by RFC2068. * Properly resolve the location of ndbm on Linux and some glibc2 builds, where ndbm.h is in the nonstandard db1/ subdir. The main new features include: * Enhanced rotatelogs to allow a UTC offset to be specified, and the format logfile names with human-readable date/time stamps. * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all* normal URI escaping. Note incautious use can give unexpected results or introduce security risks. * Added the '\' character to RewriteRule to allow escaping of special characters. Allows embedding of both the '$' and '%' characters in the results, so 'foo\$1' translates to 'foo$1' rather than 'foo\<value of $1>'. * Added the -V flag to suexec, to display the compile-time settings with which it was built. (Only valid for root or the HTTPD_USER username.) * Introduced EBCDIC conversion configuration options, controlling the conversion based on MIME type or file suffix.
2001-06-09 08:36:42 +02:00
cd ${WRKSRC} && ${TAIL} +160 \
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
${MODSSL_SRC}/pkg.ssldoc/ssldoc.patch \
Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl now makes use of OpenSSL.
1999-04-30 19:05:19 +02:00
| ${PATCH} ${PATCH_ARGS}
Solaris doesn't know about xargs -0
2001-07-09 04:45:09 +02:00
${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
Fix up apache and apache-modssl pkgs: - Now that bsd.pkg.mk filters out dlopen style .so's on NOPIC systems, re-merge the PLIST. - Rewrite apache-modssl's Makefile and PLIST to share apache's, reducing logic duplication.
1998-10-03 23:01:14 +02:00
Define a ROOT_GROUP, which defaults to root on SunOS, otherwise to wheel. Using -o 0 and -g 0 doesn't work with the ucb install on Solaris.
2001-10-19 11:52:22 +02:00
post-patch:
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:02:51 +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
Define a ROOT_GROUP, which defaults to root on SunOS, otherwise to wheel. Using -o 0 and -g 0 doesn't work with the ucb install on Solaris.
2001-10-19 11:52:22 +02:00
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01: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} \
Update apache to 1.3.19. The pkgsrc-related changes include adding a config.layout file instead of specifying every directory as on option to the Apache configure script. This layout file might be useful later when we package Apache 2.x. I also reordered a few lines so that it's easier to diff apache/Makefile and apache6/Makefile (hi itojun!). Also build the mod_define shared module from the mod_ssl sources. Relevant changes from version 1.3.17.1 include: *) Rewrite ap_unparse_uri_components() to make it safer and more readable *) Under certain circumstances, Apache did not supply the right response headers when requiring authentication. *) Clean up some end-of-loop not reached warnings *) Add the correct language tag for interoperation with the Taiwanese versions of MSIE and Netscape. *) Workaround enabled for a core dump which appeared in broken NameVirtualHost configurations. *) Sporadic core dump in ap_default_port_for_scheme() with internal requests *) SECURITY: The default installation could lead to mod_negotiation and mod_dir/mod_autoindex displaying a directory listing instead of the index.html.* files, if a very long path was created artificially by using many slashes. Now a 403 FORBIDDEN is returned. *) Trailing slashes (if they exist) are now removed from ServerRoot, because there were known problems with them. *) TPF startup/shutdown fixes. *) Correct a typo in httpd.conf. *) Get the correct IP address if ServerName isn't set and we can't find a fully-qualified domain name at startup. *) Fix pointer arithmetic in mod_rewrite map expansion. *) Fixed a problem with file extensions being truncated during the call to ap_os_canonical_filename().
2001-03-13 21:52:26 +01:00
${FILESDIR}/config.layout > ${WRKDIR}/config.layout
Update apache to 1.3.14. Changes from version 1.3.12 are listed below. The security fixes are: * A problem with the Rewrite module, mod_rewrite, allowed access to any file on the web server under certain circumstances * The handling of Host: headers in mass virtual hosting configurations, mod_vhost_alias, could allow access to any file on the server * If a cgi-bin directory is under the document root, the source to the scripts inside it could be sent if using mass virtual hosting The main new features include: * Support for a directory-based configuration system. If any of the configuration directives point to directories instead of files, all files in that directory (and in subdirectories) will be also parsed as configuration files * Support name-based virtual hosting without needing to specify an IP address in the Apache configuration file. This enables sites that use dynamic IP addresses to support name-based virtual hosting as well as allowing identical machines to share a configuration file, say in a load-balanced cluster * The SetEnvIf and BrowserMatch range of directives are now able to be used in .htaccess files. * Administrators who are nervous about their full server version details being public can use the new keyword 'ProductOnly' in the ServerTokens directive. This keyword forces the server to only return the string "Apache" as the server version. * The new digest authentication module, mod_auth_digest has had a number of fixes and upgrades applied
2000-10-13 23:46:45 +02:00
pre-install:
Solaris doesn't know about xargs -0
2001-07-09 04:45:09 +02:00
${FIND} ${WRKSRC}/htdocs -name '*.orig' -print | ${XARGS} ${RM} -f
(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} ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
Update apache to 1.3.14. Changes from version 1.3.12 are listed below. The security fixes are: * A problem with the Rewrite module, mod_rewrite, allowed access to any file on the web server under certain circumstances * The handling of Host: headers in mass virtual hosting configurations, mod_vhost_alias, could allow access to any file on the server * If a cgi-bin directory is under the document root, the source to the scripts inside it could be sent if using mass virtual hosting The main new features include: * Support for a directory-based configuration system. If any of the configuration directives point to directories instead of files, all files in that directory (and in subdirectories) will be also parsed as configuration files * Support name-based virtual hosting without needing to specify an IP address in the Apache configuration file. This enables sites that use dynamic IP addresses to support name-based virtual hosting as well as allowing identical machines to share a configuration file, say in a load-balanced cluster * The SetEnvIf and BrowserMatch range of directives are now able to be used in .htaccess files. * Administrators who are nervous about their full server version details being public can use the new keyword 'ProductOnly' in the ServerTokens directive. This keyword forces the server to only return the string "Apache" as the server version. * The new digest authentication module, mod_auth_digest has had a number of fixes and upgrades applied
2000-10-13 23:46:45 +02:00
* Create the http/logs and http/proxy directories when pkg_add'ing the package (albeit in a rather kludgy way). * Update order of @dirrm statements in PLIST files so that the pkg_delete deletes the directories properly. * Note in description that proxy support is in.
1998-07-21 23:34:09 +02:00
post-install:
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
.if !defined(NOPIC)
cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
.endif
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
Update apache to 1.3.20. Relevant changes from version 1.3.19 include: NetBSD Packages Collection (pkgsrc) changes: * Modify French page in same way as the English page. Translation provided by Remi Zara <remi_zara@mac.com> in private e-mail. * Use EAPI patches from mod_ssl-2.8.4-1.3.20. * Unify repeated SED replacement info for config.layout, apache.sh, DEINSTALL, and INSTALL into one location, FILES_SUBST. * Modify patch to apxs to use 0:0 instead of root:wheel, as some non-NetBSD systems don't have a wheel group. The general bug fixes: * Eliminate a potential segfault if an invalid floating point value is passed to the ap_snprintf() function, on platforms supporting isnan() and isinf(). * Fix a possible segfault at startup in the detection of a default ServerName or IP string when no ServerName was specified. * Fixed mod_proxy to retain empty headers, as allowed by RFC2068. * Properly resolve the location of ndbm on Linux and some glibc2 builds, where ndbm.h is in the nonstandard db1/ subdir. The main new features include: * Enhanced rotatelogs to allow a UTC offset to be specified, and the format logfile names with human-readable date/time stamps. * Added the NOESCAPE (NS) flag to RewriteRule, to disable *all* normal URI escaping. Note incautious use can give unexpected results or introduce security risks. * Added the '\' character to RewriteRule to allow escaping of special characters. Allows embedding of both the '$' and '%' characters in the results, so 'foo\$1' translates to 'foo$1' rather than 'foo\<value of $1>'. * Added the -V flag to suexec, to display the compile-time settings with which it was built. (Only valid for root or the HTTPD_USER username.) * Introduced EBCDIC conversion configuration options, controlling the conversion based on MIME type or file suffix.
2001-06-09 08:36:42 +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
* This package left cruft after deinstalling. Add DEINSTALL script to remind package admin where the cruft is that may need to be manually removed. * Factor out the making of extra directories and the copying of config files into a separate INSTALL script. * Rearrange the Makefile a bit to handle changes in the PLIST. * Remove erroneous information from pkg/DESCR.
2000-09-06 08:17:55 +02:00
${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
Install rc.d control script as "foo" instead of "foo.sh" to comply with how NetBSD's rc.d system interprets script names. Also add appropriate REQUIRE and PROVIDE sections to allow direct use in NetBSD's rc.d system.
2000-09-20 07:14:10 +02:00
${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
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:02:51 +02:00
${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
* Create the http/logs and http/proxy directories when pkg_add'ing the package (albeit in a rather kludgy way). * Update order of @dirrm statements in PLIST files so that the pkg_delete deletes the directories properly. * Note in description that proxy support is in.
1998-07-21 23:34:09 +02:00
Update apache to 1.3.22. Relevant changes from version 1.3.20 include using the pkgsrc expat library instead of the builtin one (this is to avoid conflicts between expat libraries when an expat XML parser is loaded by either mod_perl or mod_php), and: Security vulnerabilities * A vulnerability was found in the split-logfile support program. A request with a specially crafted Host: header could allow any file with a .log extension on the system to be written to. * A vulnerability was found when Multiviews are used to negotiate the directory index. In some configurations, requesting a URI with a QUERY_STRING of M=D could return a directory listing rather than the expected index page. General bug fixes and improvements * Bug fixes * The supplied icons are now also distributed in PNG format * New directives have been added to the mod_usertrack module, The first, CookieDomain, can be used to customise the Domain attribute. * A new directive, AcceptMutex, allows run-time configuration of the mutex type used for accept serialization. * mod_auth has been enhanced to allow access to a document to be controlled based on the owner of the file being served. * A new directive, AcceptFilter, has been added to control BSD accept filters at run-time. The functionality can postpone the requirement for a child process to handle a new connection until an HTTP request has arrived, therefore increasing the number of connections that a given number of child processes can handle
2001-10-17 21:17:00 +02:00
.include "../../textproc/expat/buildlink.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"
Update to 1.3b7 and rework the Makefile: - Now uses APACI, Apache's GNU-autoconf-style (but not GNU autoconf) configuration system to configure, build, and install - Enables build and install of all `support' tools - Enables use of shared modules, and compiles mod_include dynamically - Installs the Apache user manual by default.
1998-06-04 21:38:36 +02:00
.include "../../mk/bsd.pkg.mk"
Reference in a new issue Copy permalink