![[BACK]](/icons/back.gif){kind=icon}
Up to [NetBSD + pkgsrc-wip] / pkgsrc / www / apache
Request diff between arbitrary revisions - Display revisions graphically
Keyword substitution: kv
Default branch: MAIN
Set BUILDLINK_ABI_DEPENDS correctly (with +=, not ?=) It turns out there were a lot of these.
Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time.
Pullup ticket 1761 - requested by wiz
security update for apache
Revisions pulled up:
- pkgsrc/www/apache/Makefile 1.186, 1.187
- pkgsrc/www/apache/buildlink3.mk 1.16
- pkgsrc/www/apache/distinfo 1.52
- pkgsrc/www/apache/module.mk 1.11
- pkgsrc/www/apache/patches/patch-ap removed
Module Name: pkgsrc
Committed By: rillig
Date: Sun Jul 2 10:43:19 UTC 2006
Modified Files:
pkgsrc/www/apache: Makefile buildlink3.mk module.mk
Log Message:
Fixed some easy pkglint warnings.
---
Module Name: pkgsrc
Committed By: wiz
Date: Wed Jul 19 22:45:14 UTC 2006
Modified Files:
pkgsrc/www/apache: Makefile distinfo
Removed Files:
pkgsrc/www/apache/patches: patch-ap
Log Message:
Update to 1.3.36:
Changes with Apache 1.3.36
*) Reverted SVN rev #396294 due to unwanted regression.
The new feature introduced in 1.3.35 (Allow usage of the
"Include" configuration directive within previously "Include"d
files) has been removed in the meantime.
(http://svn.apache.org/viewcvs?rev=396294&viewàev)
Changes with Apache 1.3.35
*) SECURITY: CVE-2005-3352 (cve.mitre.org)
mod_imap: Escape untrusted referer header before outputting in HTML
to avoid potential cross-site scripting. Change also made to
ap_escape_html so we escape quotes. Reported by JPCERT.
[Mark Cox]
*) core: Allow usage of the "Include" configuration directive within
previously "Include"d files. [Colm MacCarthaigh]
*) HTML-escape the Expect error message. Not classed as security as
an attacker has no way to influence the Expect header a victim will
send to a target site. Reported by Thiago Zaninotti [Mark Cox]
*) mod_cgi: Remove block on OPTIONS method so that scripts can
respond to OPTIONS directly rather than via server default.
[Roy Fielding] PR 15242
Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto
Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile.
Fixed some easy pkglint warnings.
We don't support apache6, it went away ages ago.
Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day).
Recursive revision bump / recommended bump for gettext ABI change.
Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because of the shlib major bump. PKGREVISION++ for the dependencies.
Ran "pkglint --autofix", which corrected some of the quoting issues in CONFIGURE_ARGS.
Get rid of USE_PERL5. The new way to express needing the Perl executable around at either build-time or at run-time is: USE_TOOLS+= perl # build-time USE_TOOLS+= perl:run # run-time Also remove some places where perl5/buildlink3.mk was being included by a package Makefile, but all that the package wanted was the Perl executable.
when Apache is built with dlcompat present, the installed httpd/os.h header file #includes <dlfcn.h>, so we need to include dlopen.buildlink3.mk so that dlfcn.h can be found by packages which use httpd/os.h. XXX this is not entirely correct, but works around the problem XXX sufficiently. the problem is that Darwin (7.7.x) has dlopen() and XXX friends but does not provide prototypes in dlfcn.h (or anywhere else).
Apply patch (requested by taca in ticket #31): define BUILDLINK_PKGBASE.
Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>, e.g. "BUILDLINK_PKGBASE.gtk?= gtk+". This is mandated by the example buildlink[23].mk files in bsd.buildlink[23].mk.
Reorder location and setting of BUILDLINK_PACKAGES to match template buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
Fix pasto(?) in BUILDLINK_PKGSRCDIR.apache's value.
Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives a value only once due to the multiple inclusion protection in the bulldlink3.mk files. In the case where a package includes several buildlink3.mk files that each want a slightly different version of another dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the strictest <pkg> dependency to be matched.
Use S/+$// instead of C/\+$// to save a backslash. Very highly recommended by seb :)
Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.
Initial sprinkling of work-in-progress buildlink3.mk files for using the buildlink3 framework.