diff options
| author | taca <taca> | 2005-10-31 09:53:41 +0000 |
|---|---|---|
| committer | taca <taca> | 2005-10-31 09:53:41 +0000 |
| commit | ec64d9564351bbfaa643f1cba2ca6866ae89f6bc (patch) | |
| tree | a814b4199fcf9950e3505df35787816bd73b7ea1 /www | |
| parent | 707de459e336bcc9fb4c47bbea6b823ceb7b1d7a (diff) | |
| download | pkgsrc-ec64d9564351bbfaa643f1cba2ca6866ae89f6bc.tar.gz | |
Use official patch instead of temporary one.
2005-10-26 20:31 (Minor) fails to compile with undefined reference to setenv
Bump PKGREVISION.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 10 | ||||
| -rw-r--r-- | www/squid/distinfo | 6 | ||||
| -rw-r--r-- | www/squid/patches/patch-bd | 22 |
3 files changed, 9 insertions, 29 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index 76bcbcd1cd9..1d0fbdf219c 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.163 2005/10/25 14:05:22 taca Exp $ +# $NetBSD: Makefile,v 1.164 2005/10/31 09:53:41 taca 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 HOMEPAGE= http://www.squid-cache.org/ diff --git a/www/squid/distinfo b/www/squid/distinfo index 9f21a8937a7..db87a1e19ca 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.107 2005/10/25 14:05:22 taca Exp $ +$NetBSD: distinfo,v 1.108 2005/10/31 09:53:41 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 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-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 deleted file mode 100644 index ce542e73caa..00000000000 --- a/www/squid/patches/patch-bd +++ /dev/null @@ -1,22 +0,0 @@ -$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(); |