[pkgsrc/pkgsrc-2005Q2]: pkgsrc/www/squid Pullup ticket 738 - requested by Tak...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/www/squid Pullup ticket 738 - requested by Tak...
From: salo <salo%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:59:40 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5aec740cc3c4
branches:  pkgsrc-2005Q2
changeset: 496073:5aec740cc3c4
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Sep 10 11:16:41 2005 +0000

description:
Pullup ticket 738 - requested by Takahiro Kambe
security fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile             1.155, 1.157
- pkgsrc/www/squid/PLIST                1.19
- pkgsrc/www/squid/distinfo             1.100, 1.101
- pkgsrc/www/squid/patches/patch-aa     1.17
- pkgsrc/www/squid/patches/patch-ag     1.20
- pkgsrc/www/squid/patches/patch-an     1.8
- pkgsrc/www/squid/patches/patch-ap     1.1
- pkgsrc/www/squid/patches/patch-bb     1.7
- pkgsrc/www/squid/patches/patch-cd     1.10, 1.11

   Module Name: pkgsrc
   Committed By:        taca
   Date:                Tue Aug  9 15:48:30 UTC 2005

   Modified Files:
        pkgsrc/www/squid: Makefile PLIST distinfo
        pkgsrc/www/squid/patches: patch-aa patch-cd
   Added Files:
        pkgsrc/www/squid/patches: patch-ap

   Log Message:
   - Add missing optional installed files.
   - Slightly simplify installation of example configurations.
   - Add official patches.

   * 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
                                option doesn't work
   * 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
   * 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
   * 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
                                group specified
   * 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
                                it needs to,
   * 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
   * 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
                                outside the Squid MIB
   * 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
                                if the type of a cache_dir is changed
   * 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
                                with redireection
   * 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
                                if access to NAT device not granted
   * 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
                                after patch for bug 1157
   * 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
                                CVSincorrect HTTP headers
   * 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

   Bump PKGREVISION.
---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Sun Sep  4 05:07:05 UTC 2005

   Modified Files:
        pkgsrc/www/squid: Makefile distinfo
        pkgsrc/www/squid/patches: patch-ag patch-an patch-bb patch-cd

   Log Message:
   Update squid package to 2.5.10nb2.

   - pkgsrc changes: check IP filter's header file <ipl.h> as well as
                  <netinet/ipl.h>.

   - Apply recent official patches including a security fix for DoS noted by
     http://secunia.com/advisories/16674/

   * 2005-09-03 09:41 (Minor) E-mail sent when cache dies is blocked from
                           many antispam rules
   * 2005-09-03 09:41 (Minor) Solaris 10 SPARC transparent proxy build problem
                           with ipfilter
   * 2005-09-01 22:57 (Minor) snmo cacheClientTable fails on "long" IP
                           addresses
   * 2005-09-01 22:49 (Minor) squid_ldap_auth -U does not work
   * 2005-09-01 22:44 (Major) assertion failed:
                           store.c:523: "e->store_status == STORE_PENDING"
   * 2005-09-01 22:39 (Cosmetic) Greek translation of error messages
   * 2005-09-01 22:31 (Minor) Some odd FTP servers respond with 250
                           where 226 is expected
   * 2005-09-01 22:26 (Cosmetic) Fails to compile with glibc -D_FORTIFY_SOURCE=2
   * 2005-09-01 22:18 (Cosmetic) Odd URLs when failing to forward request via
                              parent and several error messages inconsistent
                              in reported request details
   * 2005-09-01 22:09 (Minor) More chroot_dir and squid -k reconfigure issues
   * 2005-09-01 21:56 (Medium) assertion failed:
        StatHist.c:93: ((int) floor (0.99L + statHistVal(H, 0) - min)) == 0
   * 2005-09-01 20:27 (Major) Segmentation fault in sslConnectTimeout
   * 2005-08-19 09:31 (Minor) sync redeclarations when support for ARP acls
   * 2005-08-14 17:05 (Cosmetic) New 'mail_program' configuration option in
                              squid.conf

diffstat:

 www/squid/Makefile         |  42 +++++++++++++++++++-
 www/squid/PLIST            |   3 +-
 www/squid/distinfo         |  94 +++++++++++++++++++++++++++++++++++++++++++--
 www/squid/patches/patch-aa |  20 +++------
 www/squid/patches/patch-ag |  16 ++++--
 www/squid/patches/patch-an |  16 ++++--
 www/squid/patches/patch-ap |  13 ++++++
 www/squid/patches/patch-bb |  16 ++++++-
 www/squid/patches/patch-cd |  32 ++++++++-------
 9 files changed, 199 insertions(+), 53 deletions(-)

diffs (truncated from 519 to 300 lines):

diff -r 1b480a649311 -r 5aec740cc3c4 www/squid/Makefile
--- a/www/squid/Makefile        Sat Sep 10 07:48:11 2005 +0000
+++ b/www/squid/Makefile        Sat Sep 10 11:16:41 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.153 2005/06/07 14:19:10 taca Exp $
+# $NetBSD: Makefile,v 1.153.2.1 2005/09/10 11:16:41 salo Exp $
 
 DISTNAME=      squid-2.5.STABLE10
 PKGNAME=       squid-2.5.10
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.5/ \
                ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -9,7 +10,34 @@
 EXTRACT_SUFX=  .tar.bz2
 
 PATCH_SITES=   http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=    squid-2.5.STABLE10-content_length.patch
+PATCHFILES=    squid-2.5.STABLE10-content_length.patch \
+               squid-2.5.STABLE10-spanish.patch \
+               squid-2.5.STABLE10-internal_date.patch \
+               squid-2.5.STABLE10-chroot-2.patch \
+               squid-2.5.STABLE10-transparent-2.patch \
+               squid-2.5.STABLE10-redirect_flags.patch \
+               squid-2.5.STABLE10-cache_dir_change.patch \
+               squid-2.5.STABLE10-snmp_getnext.patch \
+               squid-2.5.STABLE10-ftp_title-2.patch \
+               squid-2.5.STABLE10-ftp_basehref.patch \
+               squid-2.5.STABLE10-wbinfo_groups.patch \
+               squid-2.5.STABLE10-64bit_cleanup.patch \
+               squid-2.5.STABLE10-wb_ntlm_auth_silent.patch \
+               squid-2.5.STABLE10-buildenv.patch \
+               squid-2.5.STABLE10-mail_program.patch \
+               squid-2.5.STABLE10-arp_ipfilter-2.patch \
+               squid-2.5.STABLE10-sslConnectTimeout.patch \
+               squid-2.5.STABLE10-statHistAssert.patch \
+               squid-2.5.STABLE10-chroot_dir.patch \
+               squid-2.5.STABLE10-errmsg.patch \
+               squid-2.5.STABLE10-FORTIFY_SOURCE.patch \
+               squid-2.5.STABLE10-ftp_250.patch \
+               squid-2.5.STABLE10-Greek.patch \
+               squid-2.5.STABLE10-STORE_PENDING.patch \
+               squid-2.5.STABLE10-ldap_auth-U.patch \
+               squid-2.5.STABLE10-cacheClientTable.patch \
+               squid-2.5.STABLE10-Solaris_IPFilter.patch \
+               squid-2.5.STABLE10-mail_from.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
@@ -48,9 +76,12 @@
 PKG_USERS=     ${SQUID_USER}:${SQUID_GROUP}::Squid\\ Web-Cache\\ pseudo-user
 CONF_FILES+=   ${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=   ${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
+CONF_FILES+=   ${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
 OWN_DIRS=      ${DATADIR}
 OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
                 ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
+EXAMPLES_FILES=        src/mime.conf.default src/squid.conf.default \
+               helpers/basic_auth/MSNT/msntauth.conf.default
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -83,6 +114,7 @@
 #
 # ntlm auth helpers (except no_check and winbind)
 #
+OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth
 OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 #
 # external acl helpers (except ldap_group, wbinfo_group and winbind_group)
@@ -90,12 +122,16 @@
 OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
 
 pre-install:
-       @${INSTALL_DATA_DIR} ${EXAMPLESDIR}
        @${INSTALL_DATA_DIR} ${PREFIX}/share/squid
        @${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors
        @${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 
 post-install:
+       @${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+.for f in ${EXAMPLES_FILES}
+       cd ${WRKSRC} && \
+       ${INSTALL_DATA} ${f} ${EXAMPLESDIR}/`basename ${f} .default`
+.endfor
        @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
        ${INSTALL_DATA_DIR} ${DOCDIR}
        @cd ${WRKSRC};                                          \
diff -r 1b480a649311 -r 5aec740cc3c4 www/squid/PLIST
--- a/www/squid/PLIST   Sat Sep 10 07:48:11 2005 +0000
+++ b/www/squid/PLIST   Sat Sep 10 11:16:41 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/06/05 14:20:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.18.2.1 2005/09/10 11:16:41 salo Exp $
 bin/squidclient
 libexec/cachemgr.cgi
 man/man8/cachemgr.cgi.8
@@ -11,6 +11,7 @@
 share/doc/squid/debug-sections.txt
 share/examples/rc.d/squid
 share/examples/squid/mime.conf
+share/examples/squid/msntauth.conf
 share/examples/squid/squid.conf
 @dirrm share/doc/squid
 @dirrm share/examples/squid
diff -r 1b480a649311 -r 5aec740cc3c4 www/squid/distinfo
--- a/www/squid/distinfo        Sat Sep 10 07:48:11 2005 +0000
+++ b/www/squid/distinfo        Sat Sep 10 11:16:41 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2005/06/07 14:19:10 taca Exp $
+$NetBSD: distinfo,v 1.99.2.1 2005/09/10 11:16:41 salo Exp $
 
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = a0092570938032f66e7f636d1a6a02dd2383a643
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = e1409a2fcd52e1c928d74740c98396886b5ef927
@@ -6,16 +6,98 @@
 SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 197a8b7cbd288c491a2a766d846653930c4e9275
 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 68889eca3b7aa9094125f864be2ad66bc8031f50
 Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-content_length.patch) = 1879 bytes
-SHA1 (patch-aa) = 4d697ea43975e7c98bdf6ff5b18d82b944bdd6b2
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 054b9bc37328071c4ccb9e1b3ec8b893f36aa3f2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 80ef1444ad53028e122a195a0e0328a35fa8dafe
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-spanish.patch) = 17111 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 5ce31f06f1c9d07d845679e83cdfd45610e10a89
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 1b12f4f120af55456a523a3a17c7cc939d65afe5
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-internal_date.patch) = 8150 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = e6eb56e9a93528b32bdd7d1964aae4673e9c340d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = b71367a6bec8fe7558e2d39d604eacd545fef887
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot-2.patch) = 3500 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 4b7971b009d12f931a01f2ceff6742fb88be5d0a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 710494240e519cc6b89f02c8135f918c62144b57
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-transparent-2.patch) = 4008 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = f6ebe02e82f54704c70600dead9ac6c4c96064d6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = 19c79b0c4e0c866599d4f88080981bf9ede49683
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-redirect_flags.patch) = 945 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = a181a0eece077b8e1c0a3ea976b39fb4318c721a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = c191c101183662ac63f1dd1f32accdf3d6699a87
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-cache_dir_change.patch) = 2843 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = 1e31f5ed2515d5b386a0ead620f6c17724f8ef48
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = e25d7fa0815a60aaf3a1ad29dad010322b766ce0
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-snmp_getnext.patch) = 1012 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = 445816d0657e595efef192052dae13c97ddd347e
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = c0694b84c9ad9813c8def34507efb9b3815c944e
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_title-2.patch) = 4240 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 0e9f378d8a49758544499307a99ba7bfc685512d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 2540214b456b9c4a7066b5e8143605a1f1180528
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_basehref.patch) = 8250 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = c4025826802fa4373e586dfe37c8ed3de02234e5
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = 0d9333410f5be6ab3e637a0a8f6d840e04d734da
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-wbinfo_groups.patch) = 1245 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = 48e910184ea0802f8db67869e2d9d921efe67b4a
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = c16dd8d0e0967eab9b22c47ca3ac519de47a0c19
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-64bit_cleanup.patch) = 21491 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 2cc566b084e74337aac78ec95d5158c4d1d7908c
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 914aecf88caaba3d252a2f2eee29df2c441f5987
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-wb_ntlm_auth_silent.patch) = 2035 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 433b03e172cde2e4893c8a1f943329a164f6bcc8
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 67688fb7ee4aee8923439684053b08f742522a82
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-buildenv.patch) = 4025 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = 8f3e593c93ca2c64b4ee7335ea17f9b3076cf33d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = b108754a8152cd79e3ddc86320763378667df7c9
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_program.patch) = 1922 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = cd24bc66430229eb22fdec387aa935d2b382dd99
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = aace4c841ec36cd23112cd1ad1328e1d19ac40bf
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-arp_ipfilter-2.patch) = 883 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = eda5f6937e601b1ed93f964b7e6555c7f34fe833
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = 76e21355755b49752860dc46c02186eff7b0775f
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-sslConnectTimeout.patch) = 426 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = 03a1df28b8f2aab047dd01635bf5776ffa3f63b6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = c973786d43e05d78336068f00e4b1e46ae3b8cfa
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-statHistAssert.patch) = 738 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = 8d4d087f55c10c0209e9cc35e24f21366d725db2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = ec1c67faac72f4cd039bb417c4e7bc35534241c3
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-chroot_dir.patch) = 685 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 95dbd1962bf67cda7b9923b01efba4f5f994e447
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 9ad6e2bf38d127ae6033aff34854288c789c8a80
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-errmsg.patch) = 19050 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 02acaa18f50953ab7f3a0598829722ee0048d422
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 8ee593bbac0621d96208263e14716709b6faafc5
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-FORTIFY_SOURCE.patch) = 2397 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = aecb14cf3b2d5502b86ed979f464597b25db5bac
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = 84969264f8aaa113c57965f72b15e57463ed0e00
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ftp_250.patch) = 2090 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = c0106d9327eb1d9a3d5cb28b5509886d8c4f1fa7
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = b88104efac09ee808d4f606bd1855d680163ec81
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Greek.patch) = 37463 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = 8b0c50c5ae3d64382548620864736c340767484d
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = dbfb58902943ff7f5f4e05f319f20685d3ae6179
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-STORE_PENDING.patch) = 9169 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = fc786458e8d56f2afc934f7d503d9af0e4cd358f
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = 6996acb25c3370140d114137a64a03e355e0336d
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-ldap_auth-U.patch) = 1380 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 1b09b265c23955c008456276a09b291c567cae0c
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 4773824bd1d5e47af3137f3ec4f851766e8738ee
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-cacheClientTable.patch) = 632 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 898720e6b412859232346317ff1d2df2c2486ec2
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 55003aba24e74f7a1e93dc56a2801f6e2b5e235f
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-Solaris_IPFilter.patch) = 1607 bytes
+SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 92cbdc4ae9edf22f8eedd66603fed81ed4e300e6
+RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 2aa39b1f4ccf940250514cef58609209878c39ff
+Size (squid-2.5.10-2005060500/squid-2.5.STABLE10-mail_from.patch) = 1863 bytes
+SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c
 SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653
-SHA1 (patch-ag) = e0874f435b1741f9fbc88170198c4f1102ab1798
+SHA1 (patch-ag) = 815ea5faa2425aa66f5648f702148427bbfd53ad
 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707
 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7
 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120
-SHA1 (patch-an) = 8c9fc0f542859341fe1790dd70be7e624d46fe99
-SHA1 (patch-bb) = 0fbd2ce31546289edad3b1e5ea5de408d359d3a1
+SHA1 (patch-an) = c5bfcd3d8955e5f58cf18bcdc412e05c89082e89
+SHA1 (patch-ap) = f57cd1137c3e5419f3788c391292421ca8a91a57
+SHA1 (patch-bb) = 6bed55283acf8828de75b1fc05b20d6ef7ef965e
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-cd) = c58d741b140be632ce3857a86e304f21f7c06e96
+SHA1 (patch-cd) = f97ae58a084b75a3dda558f6e8c7c306cbb6b625
diff -r 1b480a649311 -r 5aec740cc3c4 www/squid/patches/patch-aa
--- a/www/squid/patches/patch-aa        Sat Sep 10 07:48:11 2005 +0000
+++ b/www/squid/patches/patch-aa        Sat Sep 10 11:16:41 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
+$NetBSD: patch-aa,v 1.16.2.1 2005/09/10 11:16:41 salo Exp $
 
---- src/Makefile.in.orig       2005-04-25 23:25:05.000000000 +0900
+--- src/Makefile.in.orig       2005-04-24 09:12:08.000000000 +0900
 +++ src/Makefile.in
-@@ -383,14 +383,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -384,14 +384,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
  DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
  DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
  DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -18,11 +18,10 @@
 +DEFAULT_ICON_DIR = $(datadir)/squid/icons
 +DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
 +DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
-+EXAMPLES_DIR = $(datadir)/examples/squid
  
  DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
  
-@@ -855,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
+@@ -856,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
  uninstall-info-am:
  install-dataDATA: $(data_DATA)
        @$(NORMAL_INSTALL)
@@ -48,7 +47,7 @@
        done
  install-sysconfDATA: $(sysconf_DATA)
        @$(NORMAL_INSTALL)
-@@ -1067,7 +1068,7 @@ info-am:
+@@ -1068,7 +1068,7 @@ info-am:
  install-data-am: install-data-local install-dataDATA
  
  install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
@@ -57,7 +56,7 @@
  
  install-info: install-info-recursive
  
-@@ -1085,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1086,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
  
  uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
        uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +65,7 @@
  
  uninstall-info: uninstall-info-recursive
  
-@@ -1168,26 +1169,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1169,26 +1169,7 @@ repl_modules.c: repl_modules.sh Makefile
  auth_modules.c: auth_modules.sh Makefile
        @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
  
@@ -91,11 +90,6 @@
 -      fi
 -      $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 +install-data-local: install-dataDATA
-+      @mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
-+      @echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
-+              $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
-+      @echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
-+              $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
  
  uninstall-local:
        @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
diff -r 1b480a649311 -r 5aec740cc3c4 www/squid/patches/patch-ag
--- a/www/squid/patches/patch-ag        Sat Sep 10 07:48:11 2005 +0000
+++ b/www/squid/patches/patch-ag        Sat Sep 10 11:16:41 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-ag,v 1.19.2.1 2005/09/10 11:16:41 salo Exp $
 
---- configure.orig     2005-05-17 07:41:14.000000000 +0900
+--- configure.orig     2005-09-02 10:23:02.000000000 +0900
 +++ configure
 @@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then
  #define SQUID_SNMP 1
@@ -11,7 +11,11 @@
Prev by Date: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/doc #756
Next by Date: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/lang/ruby18-base Pullup ticket #769 - requeste...
Previous by Thread: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/doc #756
Next by Thread: [pkgsrc/pkgsrc-2005Q2]: pkgsrc/lang/ruby18-base Pullup ticket #769 - requeste...
Indexes:
Home | Main Index | Thread Index | Old Index