[pkgsrc/pkgsrc-2005Q3]: pkgsrc/www/squid Pullup ticket 874 - requested by Tak...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f0c9d66eaff
branches:  pkgsrc-2005Q3
changeset: 499646:3f0c9d66eaff
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Nov 01 22:06:59 2005 +0000

description:
Pullup ticket 874 - requested by Takahiro Kambe
portability fix for squid

Revisions pulled up:
- pkgsrc/www/squid/Makefile             1.164
- pkgsrc/www/squid/distinfo             1.108
- pkgsrc/www/squid/patches/patch-bd     removed

   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Mon Oct 31 09:53:41 UTC 2005

   Modified Files:
        pkgsrc/www/squid: Makefile distinfo
   Removed Files:
        pkgsrc/www/squid/patches: patch-bd

   Log Message:
   Use official patch instead of temporary one.

   2005-10-26 20:31 (Minor) fails to compile with undefined reference to setenv

   Bump PKGREVISION.

diffstat:

 www/squid/Makefile         |  10 +++++-----
 www/squid/distinfo         |   6 ++++--
 www/squid/patches/patch-bd |  22 ----------------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diffs (73 lines):

diff -r 689beb01cce4 -r 3f0c9d66eaff www/squid/Makefile
--- a/www/squid/Makefile        Tue Nov 01 21:51:55 2005 +0000
+++ b/www/squid/Makefile        Tue Nov 01 22:06:59 2005 +0000
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.160.2.2 2005/10/25 18:04:33 salo Exp $
+# $NetBSD: Makefile,v 1.160.2.3 2005/11/01 22:06:59 salo Exp $
 
 DISTNAME=      squid-2.5.STABLE12
 PKGNAME=       squid-2.5.12
-PKGREVISION=   1
+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/ \
                ftp://ftp1.au.squid-cache.org/pub/squid/squid-2/STABLE/
 EXTRACT_SUFX=  .tar.bz2
 
-#PATCH_SITES=  http://www.squid-cache.org/Versions/v2/2.5/bugs/
-#PATCHFILES=
-#PATCH_DIST_STRIP= -p1
+PATCH_SITES=   http://www.squid-cache.org/Versions/v2/2.5/bugs/
+PATCHFILES=    squid-2.5.STABLE12-setenv.patch
+PATCH_DIST_STRIP= -p1
 
 MAINTAINER=    taca%NetBSD.org@localhost
 HOMEPAGE=      http://www.squid-cache.org/
diff -r 689beb01cce4 -r 3f0c9d66eaff www/squid/distinfo
--- a/www/squid/distinfo        Tue Nov 01 21:51:55 2005 +0000
+++ b/www/squid/distinfo        Tue Nov 01 22:06:59 2005 +0000
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.104.2.2 2005/10/25 18:04:33 salo Exp $
+$NetBSD: distinfo,v 1.104.2.3 2005/11/01 22:06:59 salo Exp $
 
 SHA1 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 57a046ca0eda0f649d259c2c161dc95c81a5dc09
 RMD160 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 0b332612d90d74681e47505a2afbfb6c962807a4
 Size (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 1075111 bytes
+SHA1 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = d59827280c5e1a73e659a1d127484e0901d34b48
+RMD160 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 8698afef7b19402baffd81cecd0dbe143c500556
+Size (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 934 bytes
 SHA1 (patch-aa) = 25d47b8ab8618af2b1d2a40f1dc3630cdc14038c
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0
@@ -16,4 +19,3 @@
 SHA1 (patch-ap) = 0bc9d7dceaf132a60e4089796057e2e3a65c37b8
 SHA1 (patch-bb) = aa85a484f01f980c968f0436b7a2b46e4ee86d4c
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
-SHA1 (patch-bd) = 34dd7658745cdc7bf07f274a3194ed4cf20c8d69
diff -r 689beb01cce4 -r 3f0c9d66eaff www/squid/patches/patch-bd
--- a/www/squid/patches/patch-bd        Tue Nov 01 21:51:55 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-bd,v 1.1.2.2 2005/10/25 18:04:33 salo Exp $
-
---- src/cache_cf.c.orig        2005-09-29 06:42:33.000000000 +0900
-+++ src/cache_cf.c
-@@ -440,8 +440,15 @@ configDoConfigure(void)
-                   Config.effectiveUser);
-           Config2.effectiveUserID = pwd->pw_uid;
-           Config2.effectiveGroupID = pwd->pw_gid;
--          if (pwd->pw_dir && *pwd->pw_dir)
--              setenv("HOME", pwd->pw_dir, 1);
-+#if HAVE_PUTENV
-+          if (pwd->pw_dir && *pwd->pw_dir) {
-+              int len;
-+              char *env_str = xcalloc((len = strlen(pwd->pw_dir) + 6), 1);
-+              snprintf(env_str, len, "HOME=%s", pwd->pw_dir);
-+              putenv(env_str);
-+              xfree(env_str);
-+          }
-+#endif
-       }
-     } else {
-       Config2.effectiveUserID = geteuid();