summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2009-02-11 17:59:32 +0000
committerdrochner <drochner@pkgsrc.org>2009-02-11 17:59:32 +0000
commit7ab0297da9d40457c3539ac4fb6821d23153e817 (patch)
tree4f841bf718da834b1cce5fa8c0248c3230db5d85 /www
parent4ba2de44238f40cdc0e010375ef0e719d397de90 (diff)
downloadpkgsrc-7ab0297da9d40457c3539ac4fb6821d23153e817.tar.gz
replace my quick-and-dirty setgroups/initgroups patch by the upstream
version, to ease further updates
Diffstat (limited to 'www')
-rw-r--r--www/privoxy/distinfo4
-rw-r--r--www/privoxy/patches/patch-af21
2 files changed, 16 insertions, 9 deletions
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index cf9bb648c63..330cb06cf86 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2009/02/04 21:30:53 drochner Exp $
+$NetBSD: distinfo,v 1.11 2009/02/11 17:59:32 drochner Exp $
SHA1 (privoxy-3.0.10-stable-src.tar.gz) = 0ce51a8dc938fe6412daa7f6edf159b98fd66d54
RMD160 (privoxy-3.0.10-stable-src.tar.gz) = 91c8d56b71a5c606554bf509827197d689d8fc10
Size (privoxy-3.0.10-stable-src.tar.gz) = 1957465 bytes
SHA1 (patch-aa) = c263d2a4b9522a33613f82ab2bc18d5c2b554b21
SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
-SHA1 (patch-af) = 8d572ece2f2d5cedcc7694ddda0b79e4453671ff
+SHA1 (patch-af) = cb4249abd1c2f4f5d256ab4c3b56d04213ee820f
diff --git a/www/privoxy/patches/patch-af b/www/privoxy/patches/patch-af
index 88c7fa30a83..a3ad2ef59cb 100644
--- a/www/privoxy/patches/patch-af
+++ b/www/privoxy/patches/patch-af
@@ -1,15 +1,22 @@
-$NetBSD: patch-af,v 1.1 2009/02/04 21:20:39 drochner Exp $
+$NetBSD: patch-af,v 1.2 2009/02/11 17:59:32 drochner Exp $
---- ./jcc.c.orig 2007-12-16 19:32:46.000000000 +0100
+--- ./jcc.c.orig 2008-06-27 13:13:56.000000000 +0200
+++ ./jcc.c
-@@ -3299,6 +3299,10 @@ int main(int argc, const char *argv[])
+@@ -3349,6 +3349,17 @@ int main(int argc, const char *argv[])
{
log_error(LOG_LEVEL_FATAL, "Cannot setgid(): Insufficient permissions.");
}
-+ if (grp)
-+ setgroups(1, &grp->gr_gid);
-+ else
-+ initgroups(pw->pw_name, pw->pw_gid);
++ if (NULL != grp)
++ {
++ if (setgroups(1, &grp->gr_gid))
++ {
++ log_error(LOG_LEVEL_FATAL, "setgroups() failed: %E");
++ }
++ }
++ else if (initgroups(pw->pw_name, pw->pw_gid))
++ {
++ log_error(LOG_LEVEL_FATAL, "initgroups() failed: %E");
++ }
if (do_chroot)
{
if (!pw->pw_dir)