summaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authortaca <taca>2005-10-25 14:05:22 +0000
committertaca <taca>2005-10-25 14:05:22 +0000
commit323754834d5a052dd65195c15149a9009656d1cb (patch)
tree458305adfd2bfde26589e14aed1e5f0acd3e937f /www/squid
parent6c8d61f79d4a8d3148aec73fd82b5451dfa1fa1d (diff)
downloadpkgsrc-323754834d5a052dd65195c15149a9009656d1cb.tar.gz
Add a patch to compile on SunOS from squid's bugzilla.
Bump PKGREVISION.
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/Makefile3
-rw-r--r--www/squid/distinfo3
-rw-r--r--www/squid/patches/patch-bd22
3 files changed, 26 insertions, 2 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 567862a3463..76bcbcd1cd9 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.162 2005/10/23 22:32:32 taca Exp $
+# $NetBSD: Makefile,v 1.163 2005/10/25 14:05:22 taca 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 --git a/www/squid/distinfo b/www/squid/distinfo
index 6a1dbef5ebd..9f21a8937a7 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.106 2005/10/23 22:32:32 taca Exp $
+$NetBSD: distinfo,v 1.107 2005/10/25 14:05:22 taca 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-an) = a44c492c39e249d7894d8424263deca7f5e0ea95
SHA1 (patch-ap) = 0bc9d7dceaf132a60e4089796057e2e3a65c37b8
SHA1 (patch-bb) = aa85a484f01f980c968f0436b7a2b46e4ee86d4c
SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-bd) = 34dd7658745cdc7bf07f274a3194ed4cf20c8d69
diff --git a/www/squid/patches/patch-bd b/www/squid/patches/patch-bd
new file mode 100644
index 00000000000..ce542e73caa
--- /dev/null
+++ b/www/squid/patches/patch-bd
@@ -0,0 +1,22 @@
+$NetBSD: patch-bd,v 1.1 2005/10/25 14:05:22 taca 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();