[pkgsrc/pkgsrc-2004Q4]: pkgsrc Pullup ticket 277 - requested by Matthias Scheler

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2004Q4]: pkgsrc Pullup ticket 277 - requested by Matthias Scheler
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:04:19 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/41b3d2084ebb
branches:  pkgsrc-2004Q4
changeset: 485886:41b3d2084ebb
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Feb 10 15:22:24 2005 +0000

description:
Pullup ticket 277 - requested by Matthias Scheler
security fix for apache2

Revisions pulled up:
- pkgsrc/devel/apr/Makefile           1.31
- pkgsrc/devel/apr/distinfo           1.11
- pkgsrc/www/apache2/Makefile         1.66 (merged by hand)
- pkgsrc/www/apache2/Makefile.common  1.13
- pkgsrc/www/apache2/PLIST            1.27
- pkgsrc/www/apache2/distinfo         1.36 (merged by hand)
- pkgsrc/www/apache2/patches/patch-aa 1.14
- pkgsrc/www/apache2/patches/patch-as removed
- pkgsrc/www/apache2/patches/patch-at removed

   Module Name: pkgsrc
   Committed By:        tron
   Date:                Wed Feb  9 14:52:12 UTC 2005

   Modified Files:
        pkgsrc/devel/apr: Makefile distinfo

   Log Message:
   Update "apr" package to version 0.9.6.2.0.53. Changes since
   version 0.9.5.2.0.52:
   - Add apr_threadattr_stacksize_set() for overriding the default
     stack size for threads created by apr_thread_create().
   - Add an RPM spec file.
   - Add a build script to create a solaris package.
---
   Module Name: pkgsrc
   Committed By:        tron
   Date:                Wed Feb  9 14:57:52 UTC 2005

   Modified Files:
        pkgsrc/www/apache2: Makefile Makefile.common PLIST distinfo
        pkgsrc/www/apache2/patches: patch-aa
   Removed Files:
        pkgsrc/www/apache2/patches: patch-as patch-at

   Log Message:
   Update "apache2" package to version 2.0.53. Changes since version 2.0.52:
   - Fix --with-apr=/usr and/or --with-apr-util=/usr.  Bug report 29740.
     [Max Bowsher <maxb ukf.net>]
   - mod_proxy: Fix ProxyRemoteMatch directive.  Bug report 33170.
     [Rici Lake <rici ricilake.net>]
   - mod_proxy: Respect errors reported by pre_connection hooks.
     [Jeff Trawick]
   - --with-module can now take more than one module to be statically
     linked: --with-module=<modtype>:<modfile>,<modtype>:<modfile>,...
     If the <modtype>-subdirectory doesn't exist it will be created and
     populated with a standard Makefile.in.  [Erik Abele]
   - Fix the RPM spec file so that an RPM build now works. An RPM
     build now requires system installations of APR and APR-util.
     Remove some arbitrary moving around of binaries - the RPM now
     maps to the ASF build of httpd.
     [Graham Leggett]
   - mod_dumpio, an I/O logging/dumping module, added to the
     modules/expermimental subdirectory.  [Jim Jagielski]
   - mod_auth_ldap: Handle the inconsistent way in which the MS LDAP
     library handles special characters.  Bug report 24437.
     [Jess Holle]
   - Win32 MPM: Correct typo in debugging output.  [William Rowe]
   - conf: Remove AddDefaultCharset from the default configuration because
     setting a site-wide default does more harm than good.
     Bug report 23421. [Roy Fielding]
   - Add charset to example CGI scripts.  [Roy Fielding]
   - mod_ssl: fail quickly if SSL connection is aborted rather than
     making many doomed ap_pass_brigade calls.
     Bug report 32699.  [Joe Orton]
   - Remove compiled-in upper limit on LimitRequestFieldSize.
     [Bill Stoddard]
   - Start keeping track of time-taken-to-process-request again for
     mod_status if ExtendedStatus is enabled. [Jim Jagielski]
   - mod_proxy: Handle client-aborted connections correctly.
     Bug report 32443.  [Janne Hietamäki, Joe Orton]
   - Fix handling of files >2Gb on all platforms (or builds) where
     apr_off_t is larger than apr_size_t.
     Bug report 28898.  [Joe Orton]
   - mod_include: Fix bug which could truncate variable expansions
     of N*64 characters by one byte.  Bug report 32985.  [Joe Orton]
   - Correct handling of certain bucket types in ap_save_brigade, fixing
     possible segfaults in mod_cgi with #include virtual.
     Bug report 31247.  [Joe Orton]
   - Allow for the use of --with-module=foo:bar where the ./modules/foo
     directory is local only. Assumes, of course, that the required
     files are in ./modules/foo, but makes it easier to statically
     build/log "external" modules.  [Jim Jagielski]
   - Util_ldap: Implemented the util_ldap_cache_getuserdn() API so that
     ldap authorization only modules have access to the util_ldap
     user cache without having to require ldap authentication as well.
     Bug report 31898.  [Jari Ahonen jah progress.com, Brad Nicholes]
   - mod_auth_ldap: Added the directive "Requires ldap-attribute" that
     allows the module to only authorize a user if the attribute value
     specified matches the value of the user object. Bug report 31913
     [Ryan Morgan <rmorgan pobox.com>]
   - SECURITY: CAN-2004-0942 (cve.mitre.org)
     Fix for memory consumption DoS in handling of MIME folded request
     headers.  [Joe Orton]
   - SECURITY: CAN-2004-0885 (cve.mitre.org)
     mod_ssl: Fix a bug which allowed an SSLCipherSuite setting to be
     bypassed during an SSL renegotiation.  Bug report 31505.
     [Hartmut Keil <Hartmut.Keil adnovum.ch>, Joe Orton]
   - mod_ssl: Fail at startup rather than segfault at runtime if a
     client cert is configured with an encrypted private key.
     Bug report 24030.  [Joe Orton]
   - apxs: fix handling of -Wc/-Wl and "-o mod_foo.so".
     Bug report 31448 [Joe Orton]
   - mod_ldap: Fix format strings to use %APR_PID_T_FMT instead of %d.
     [Jeff Trawick]
   - mod_cache: CacheDisable will only disable the URLs it was meant to
     disable, not all caching. Bug report 31128.
     [Edward Rudd <eddie omegaware.com>, Paul Querna]
   - mod_cache: Try to correctly follow RFC 2616 13.3 on validating stale
     cache responses.  [Justin Erenkrantz]
   - mod_rewrite: Handle per-location rules when r->filename is unset.
     Previously this would segfault or simply not match as expected,
     depending on the platform.  [Jeff Trawick]
   - mod_rewrite: Fix 0 bytes write into random memory position.
     Bug report 31036. [André Malo]
   - mod_disk_cache: Do not store aborted content.  Bug report 21492.
     [Rüdiger Plüm <r.pluem t-online.de>]
   - mod_disk_cache: Correctly store cached content type.
     Bug report 30278.
     [Rüdiger Plüm <r.pluem t-online.de>]
   - mod_ldap: prevent the possiblity of an infinite loop in the LDAP
     statistics display. Bug report 29216. [Graham Leggett]
   - mod_ldap: fix a bogus error message to tell the user which file
     is causing a potential problem with the LDAP shared memory cache.
     Bug report 31431 [Graham Leggett]
   - mod_disk_cache: Do not store hop-by-hop headers.  [Justin Erenkrantz]
   - Fix the re-linking issue when purging elements from the LDAP cache
     Bug report 24801.  [Jess Holle <jessh ptc.com>]
   - mod_disk_cache: Fix races in saving responses.  [Justin Erenkrantz]
   - Fix Expires handling in mod_cache.  [Justin Erenkrantz]
   - Alter mod_expires to run at a different filter priority to allow
     proper Expires storage by mod_cache.  [Justin Erenkrantz]

diffstat:

 devel/apr/Makefile           |   3 +-
 devel/apr/distinfo           |   6 ++--
 www/apache2/Makefile         |   3 +-
 www/apache2/Makefile.common  |   4 +-
 www/apache2/PLIST            |  57 ++++++++++++++++++++++++++++++++++++++-----
 www/apache2/distinfo         |  10 +++----
 www/apache2/patches/patch-aa |  28 ++++++++++----------
 www/apache2/patches/patch-as |  26 --------------------
 www/apache2/patches/patch-at |  19 --------------
 9 files changed, 75 insertions(+), 81 deletions(-)

diffs (truncated from 419 to 300 lines):

diff -r eb573b002806 -r 41b3d2084ebb devel/apr/Makefile
--- a/devel/apr/Makefile        Mon Feb 07 05:49:24 2005 +0000
+++ b/devel/apr/Makefile        Thu Feb 10 15:22:24 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2004/11/23 00:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.30.2.1 2005/02/10 15:22:24 salo Exp $
 
 .include "../../www/apache2/Makefile.common"
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
-PKGREVISION=   1
 CATEGORIES=    devel
 
 HOMEPAGE=      http://apr.apache.org/
diff -r eb573b002806 -r 41b3d2084ebb devel/apr/distinfo
--- a/devel/apr/distinfo        Mon Feb 07 05:49:24 2005 +0000
+++ b/devel/apr/distinfo        Thu Feb 10 15:22:24 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2004/10/02 15:47:02 reed Exp $
+$NetBSD: distinfo,v 1.10.2.1 2005/02/10 15:22:24 salo Exp $
 
-SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
-Size (httpd-2.0.52.tar.gz) = 6918995 bytes
+SHA1 (httpd-2.0.53.tar.gz) = e58a84887f1cd727d0091b185c0bd3e641f75df9
+Size (httpd-2.0.53.tar.gz) = 6946727 bytes
 SHA1 (patch-an) = 64006f0f1b5c3f20df6f47624e56aac0d99ae056
 SHA1 (patch-ao) = 25d44b0028772535da908895444d2bfe56f44120
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
diff -r eb573b002806 -r 41b3d2084ebb www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Feb 07 05:49:24 2005 +0000
+++ b/www/apache2/Makefile      Thu Feb 10 15:22:24 2005 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2004/12/18 08:42:12 adrianp Exp $
+# $NetBSD: Makefile,v 1.61.2.1 2005/02/10 15:22:24 salo Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               apache-${APACHE_VERSION}
-PKGREVISION=           5
 CATEGORIES=            www
 
 HOMEPAGE=              http://httpd.apache.org/
diff -r eb573b002806 -r 41b3d2084ebb www/apache2/Makefile.common
--- a/www/apache2/Makefile.common       Mon Feb 07 05:49:24 2005 +0000
+++ b/www/apache2/Makefile.common       Thu Feb 10 15:22:24 2005 +0000
@@ -1,8 +1,8 @@
 DISTNAME=              httpd-${APACHE_VERSION}
 # When updating this version be sure to update the checksum and remove
 # any PKGREVISION for devel/apr also.
-APACHE_VERSION=                2.0.52
-APR_VERSION=            0.9.5
+APACHE_VERSION=                2.0.53
+APR_VERSION=            0.9.6
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
                        ${MASTER_SITE_APACHE:=httpd/old/} \
                        http://www.NetBSD.org/images/logos/
diff -r eb573b002806 -r 41b3d2084ebb www/apache2/PLIST
--- a/www/apache2/PLIST Mon Feb 07 05:49:24 2005 +0000
+++ b/www/apache2/PLIST Thu Feb 10 15:22:24 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2004/11/24 07:39:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.26.2.1 2005/02/10 15:22:24 salo Exp $
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -374,17 +374,21 @@
 share/httpd/manual/LICENSE
 share/httpd/manual/bind.html
 share/httpd/manual/bind.html.en
+share/httpd/manual/bind.html.es
 share/httpd/manual/bind.html.ja.euc-jp
 share/httpd/manual/bind.html.ko.euc-kr
 share/httpd/manual/bind.xml
+share/httpd/manual/bind.xml.es
 share/httpd/manual/bind.xml.ja
 share/httpd/manual/bind.xml.ko
 share/httpd/manual/bind.xml.meta
 share/httpd/manual/configuring.html
+share/httpd/manual/configuring.html.de
 share/httpd/manual/configuring.html.en
 share/httpd/manual/configuring.html.ja.euc-jp
 share/httpd/manual/configuring.html.ko.euc-kr
 share/httpd/manual/configuring.xml
+share/httpd/manual/configuring.xml.de
 share/httpd/manual/configuring.xml.ja
 share/httpd/manual/configuring.xml.ko
 share/httpd/manual/configuring.xml.meta
@@ -398,9 +402,11 @@
 share/httpd/manual/content-negotiation.xml.meta
 share/httpd/manual/custom-error.html
 share/httpd/manual/custom-error.html.en
+share/httpd/manual/custom-error.html.es
 share/httpd/manual/custom-error.html.ja.euc-jp
 share/httpd/manual/custom-error.html.ko.euc-kr
 share/httpd/manual/custom-error.xml
+share/httpd/manual/custom-error.xml.es
 share/httpd/manual/custom-error.xml.ja
 share/httpd/manual/custom-error.xml.ko
 share/httpd/manual/custom-error.xml.meta
@@ -505,10 +511,12 @@
 share/httpd/manual/filter.xml.meta
 share/httpd/manual/filter.xml.ru
 share/httpd/manual/glossary.html
+share/httpd/manual/glossary.html.de
 share/httpd/manual/glossary.html.en
 share/httpd/manual/glossary.html.es
 share/httpd/manual/glossary.html.ko.euc-kr
 share/httpd/manual/glossary.xml
+share/httpd/manual/glossary.xml.de
 share/httpd/manual/glossary.xml.es
 share/httpd/manual/glossary.xml.ko
 share/httpd/manual/glossary.xml.meta
@@ -588,6 +596,12 @@
 share/httpd/manual/images/mod_rewrite_fig2.png
 share/httpd/manual/images/pixel.gif
 share/httpd/manual/images/right.gif
+share/httpd/manual/images/ssl_intro_fig1.gif
+share/httpd/manual/images/ssl_intro_fig1.png
+share/httpd/manual/images/ssl_intro_fig2.gif
+share/httpd/manual/images/ssl_intro_fig2.png
+share/httpd/manual/images/ssl_intro_fig3.gif
+share/httpd/manual/images/ssl_intro_fig3.png
 share/httpd/manual/images/sub.gif
 share/httpd/manual/images/up.gif
 share/httpd/manual/index.html
@@ -638,9 +652,11 @@
 share/httpd/manual/license.xml.meta
 share/httpd/manual/logs.html
 share/httpd/manual/logs.html.en
+share/httpd/manual/logs.html.es
 share/httpd/manual/logs.html.ja.euc-jp
 share/httpd/manual/logs.html.ko.euc-kr
 share/httpd/manual/logs.xml
+share/httpd/manual/logs.xml.es
 share/httpd/manual/logs.xml.ja
 share/httpd/manual/logs.xml.ko
 share/httpd/manual/logs.xml.meta
@@ -896,6 +912,10 @@
 share/httpd/manual/mod/mod_disk_cache.xml
 share/httpd/manual/mod/mod_disk_cache.xml.ko
 share/httpd/manual/mod/mod_disk_cache.xml.meta
+share/httpd/manual/mod/mod_dumpio.html
+share/httpd/manual/mod/mod_dumpio.html.en
+share/httpd/manual/mod/mod_dumpio.xml
+share/httpd/manual/mod/mod_dumpio.xml.meta
 share/httpd/manual/mod/mod_echo.html
 share/httpd/manual/mod/mod_echo.html.en
 share/httpd/manual/mod/mod_echo.html.ja.euc-jp
@@ -940,7 +960,9 @@
 share/httpd/manual/mod/mod_file_cache.xml.meta
 share/httpd/manual/mod/mod_headers.html
 share/httpd/manual/mod/mod_headers.html.en
+share/httpd/manual/mod/mod_headers.html.ko.euc-kr
 share/httpd/manual/mod/mod_headers.xml
+share/httpd/manual/mod/mod_headers.xml.ko
 share/httpd/manual/mod/mod_headers.xml.meta
 share/httpd/manual/mod/mod_imap.html
 share/httpd/manual/mod/mod_imap.html.en
@@ -957,8 +979,10 @@
 share/httpd/manual/mod/mod_info.html
 share/httpd/manual/mod/mod_info.html.en
 share/httpd/manual/mod/mod_info.html.ja.euc-jp
+share/httpd/manual/mod/mod_info.html.ko.euc-kr
 share/httpd/manual/mod/mod_info.xml
 share/httpd/manual/mod/mod_info.xml.ja
+share/httpd/manual/mod/mod_info.xml.ko
 share/httpd/manual/mod/mod_info.xml.meta
 share/httpd/manual/mod/mod_isapi.html
 share/httpd/manual/mod/mod_isapi.html.en
@@ -1115,9 +1139,11 @@
 share/httpd/manual/mod/mpm_common.html
 share/httpd/manual/mod/mpm_common.html.de
 share/httpd/manual/mod/mpm_common.html.en
+share/httpd/manual/mod/mpm_common.html.es
 share/httpd/manual/mod/mpm_common.html.ja.euc-jp
 share/httpd/manual/mod/mpm_common.xml
 share/httpd/manual/mod/mpm_common.xml.de
+share/httpd/manual/mod/mpm_common.xml.es
 share/httpd/manual/mod/mpm_common.xml.ja
 share/httpd/manual/mod/mpm_common.xml.meta
 share/httpd/manual/mod/mpm_netware.html
@@ -1325,6 +1351,26 @@
 share/httpd/manual/programs/suexec.xml
 share/httpd/manual/programs/suexec.xml.ko
 share/httpd/manual/programs/suexec.xml.meta
+share/httpd/manual/rewrite/index.html
+share/httpd/manual/rewrite/index.html.en
+share/httpd/manual/rewrite/index.xml
+share/httpd/manual/rewrite/index.xml.meta
+share/httpd/manual/rewrite/rewrite_guide.html
+share/httpd/manual/rewrite/rewrite_guide.html.en
+share/httpd/manual/rewrite/rewrite_guide.xml
+share/httpd/manual/rewrite/rewrite_guide.xml.meta
+share/httpd/manual/rewrite/rewrite_guide_advanced.html
+share/httpd/manual/rewrite/rewrite_guide_advanced.html.en
+share/httpd/manual/rewrite/rewrite_guide_advanced.xml
+share/httpd/manual/rewrite/rewrite_guide_advanced.xml.meta
+share/httpd/manual/rewrite/rewrite_intro.html
+share/httpd/manual/rewrite/rewrite_intro.html.en
+share/httpd/manual/rewrite/rewrite_intro.xml
+share/httpd/manual/rewrite/rewrite_intro.xml.meta
+share/httpd/manual/rewrite/rewrite_tech.html
+share/httpd/manual/rewrite/rewrite_tech.html.en
+share/httpd/manual/rewrite/rewrite_tech.xml
+share/httpd/manual/rewrite/rewrite_tech.xml.meta
 share/httpd/manual/sections.html
 share/httpd/manual/sections.html.en
 share/httpd/manual/sections.html.ja.euc-jp
@@ -1335,9 +1381,11 @@
 share/httpd/manual/sections.xml.meta
 share/httpd/manual/server-wide.html
 share/httpd/manual/server-wide.html.en
+share/httpd/manual/server-wide.html.es
 share/httpd/manual/server-wide.html.ja.euc-jp
 share/httpd/manual/server-wide.html.ko.euc-kr
 share/httpd/manual/server-wide.xml
+share/httpd/manual/server-wide.xml.es
 share/httpd/manual/server-wide.xml.ja
 share/httpd/manual/server-wide.xml.ko
 share/httpd/manual/server-wide.xml.meta
@@ -1377,12 +1425,6 @@
 share/httpd/manual/ssl/ssl_intro.xml
 share/httpd/manual/ssl/ssl_intro.xml.ja
 share/httpd/manual/ssl/ssl_intro.xml.meta
-share/httpd/manual/ssl/ssl_intro_fig1.gif
-share/httpd/manual/ssl/ssl_intro_fig1.png
-share/httpd/manual/ssl/ssl_intro_fig2.gif
-share/httpd/manual/ssl/ssl_intro_fig2.png
-share/httpd/manual/ssl/ssl_intro_fig3.gif
-share/httpd/manual/ssl/ssl_intro_fig3.png
 share/httpd/manual/stopping.html
 share/httpd/manual/stopping.html.de
 share/httpd/manual/stopping.html.en
@@ -1558,6 +1600,7 @@
 @dirrm share/httpd/manual/misc
 @dirrm share/httpd/manual/platform
 @dirrm share/httpd/manual/programs
+@dirrm share/httpd/manual/rewrite
 @dirrm share/httpd/manual/style/css
 @dirrm share/httpd/manual/style/lang
 @dirrm share/httpd/manual/style/latex
diff -r eb573b002806 -r 41b3d2084ebb www/apache2/distinfo
--- a/www/apache2/distinfo      Mon Feb 07 05:49:24 2005 +0000
+++ b/www/apache2/distinfo      Thu Feb 10 15:22:24 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2004/12/18 08:42:12 adrianp Exp $
+$NetBSD: distinfo,v 1.33.2.1 2005/02/10 15:22:24 salo Exp $
 
-SHA1 (httpd-2.0.52.tar.gz) = 2a22fde052adc7d7258f999cd7dd8a7592ff36e7
-Size (httpd-2.0.52.tar.gz) = 6918995 bytes
-SHA1 (patch-aa) = 8ff497da17144d191e633d59274bf2f7e0e7c08c
+SHA1 (httpd-2.0.53.tar.gz) = e58a84887f1cd727d0091b185c0bd3e641f75df9
+Size (httpd-2.0.53.tar.gz) = 6946727 bytes
+SHA1 (patch-aa) = bff1ef591f5361e7169ff9005dcf86437b9dac23
 SHA1 (patch-ad) = 27fa3655d6ba4840296e79fa6fd96cd9de79a33a
 SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01
 SHA1 (patch-ai) = d728490b66032d8bb2aa8d4ccdeca3d45f7c2b08
@@ -10,5 +10,3 @@
 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc
 SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426
 SHA1 (patch-ar) = c6769617cd9111f6d233d68883c71988a36fbbce
-SHA1 (patch-as) = c6fb574d5d96024e641816569f059bca4368fcec
-SHA1 (patch-at) = dd9a3eb14b3e20876eca6eff968e82326a53b7d9
diff -r eb573b002806 -r 41b3d2084ebb www/apache2/patches/patch-aa
--- a/www/apache2/patches/patch-aa      Mon Feb 07 05:49:24 2005 +0000
+++ b/www/apache2/patches/patch-aa      Thu Feb 10 15:22:24 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2004/11/26 23:07:59 jlam Exp $
+$NetBSD: patch-aa,v 1.13.2.1 2005/02/10 15:22:24 salo Exp $
 
---- Makefile.in.orig   2004-08-26 09:01:18.000000000 -0400
-+++ Makefile.in
-@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
+--- Makefile.in.orig   2004-11-24 19:31:09.000000000 +0000
++++ Makefile.in        2005-02-09 13:55:40.000000000 +0000
+@@ -4,7 +4,7 @@
  
  PROGRAM_NAME         = $(progname)
  PROGRAM_SOURCES      = modules.c
@@ -11,7 +11,7 @@
  PROGRAM_DEPENDENCIES = \
    $(BUILTIN_LIBS) \
    $(MPM_LIB) \
-@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
+@@ -14,7 +14,7 @@
  PROGRAMS        = $(PROGRAM_NAME)
  TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)
  PHONY_TARGETS   = $(srcdir)/buildmark.c
@@ -20,7 +20,7 @@
        install-other install-cgi install-include install-suexec install-man \
        install-build
  
-@@ -71,6 +71,7 @@ install-conf:
+@@ -71,6 +71,7 @@
                                        < $$i; \
                        fi \
                ) > $(DESTDIR)$(sysconfdir)/$$i; \
@@ -28,7 +28,7 @@
                chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
                file=`echo $$i|sed s/-std//`; \
Prev by Date: [pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/squid Pullup ticket 274 - requested by Tak...
Next by Date: [pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/squid Pullup ticket 280 - requested by Tak...
Previous by Thread: [pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/squid Pullup ticket 274 - requested by Tak...
Next by Thread: [pkgsrc/pkgsrc-2004Q4]: pkgsrc/www/squid Pullup ticket 280 - requested by Tak...
Indexes:
Home | Main Index | Thread Index | Old Index