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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d301341abf4c
branches:  pkgsrc-2005Q3
changeset: 499622:d301341abf4c
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Oct 25 18:04:33 2005 +0000

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

Revisions pulled up:
- pkgsrc/www/squid/Makefile             1.163
- pkgsrc/www/squid/distinfo             1.107
- pkgsrc/www/squid/patches/patch-bd     1.1

   Module Name:         pkgsrc
   Committed By:        taca
   Date:                Tue Oct 25 14:05:22 UTC 2005

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

   Log Message:
   Add a patch to compile on SunOS from squid's bugzilla.

   Bump PKGREVISION.

diffstat:

 www/squid/Makefile         |   3 ++-
 www/squid/distinfo         |   3 ++-
 www/squid/patches/patch-bd |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r 55294b94354f -r d301341abf4c www/squid/Makefile
--- a/www/squid/Makefile        Tue Oct 25 11:06:10 2005 +0000
+++ b/www/squid/Makefile        Tue Oct 25 18:04:33 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.160.2.1 2005/10/24 00:57:29 seb Exp $
+# $NetBSD: Makefile,v 1.160.2.2 2005/10/25 18:04:33 salo Exp $
 
 DISTNAME=      squid-2.5.STABLE12
 PKGNAME=       squid-2.5.12
+PKGREVISION=   1
 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/ \
diff -r 55294b94354f -r d301341abf4c www/squid/distinfo
--- a/www/squid/distinfo        Tue Oct 25 11:06:10 2005 +0000
+++ b/www/squid/distinfo        Tue Oct 25 18:04:33 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104.2.1 2005/10/24 00:57:29 seb Exp $
+$NetBSD: distinfo,v 1.104.2.2 2005/10/25 18:04:33 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
@@ -16,3 +16,4 @@
 SHA1 (patch-ap) = 0bc9d7dceaf132a60e4089796057e2e3a65c37b8
 SHA1 (patch-bb) = aa85a484f01f980c968f0436b7a2b46e4ee86d4c
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-bd) = 34dd7658745cdc7bf07f274a3194ed4cf20c8d69
diff -r 55294b94354f -r d301341abf4c www/squid/patches/patch-bd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/squid/patches/patch-bd        Tue Oct 25 18:04:33 2005 +0000
@@ -0,0 +1,22 @@
+$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();