diff options
| -rw-r--r-- | mail/majordomo/Makefile | 4 | ||||
| -rw-r--r-- | mail/majordomo/distinfo | 4 | ||||
| -rw-r--r-- | mail/majordomo/patches/patch-ak | 20 |
3 files changed, 18 insertions, 10 deletions
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile index 9dde58b49cc..1fd7aebbcd7 100644 --- a/mail/majordomo/Makefile +++ b/mail/majordomo/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2011/10/28 06:16:12 spz Exp $ +# $NetBSD: Makefile,v 1.45 2011/12/11 11:53:23 marino Exp $ DISTNAME= majordomo-1.94.5 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= mail MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \ ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/ diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo index 884c57a4941..e69301778ef 100644 --- a/mail/majordomo/distinfo +++ b/mail/majordomo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2011/10/28 06:16:12 spz Exp $ +$NetBSD: distinfo,v 1.17 2011/12/11 11:53:23 marino Exp $ SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00 RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4 @@ -13,7 +13,7 @@ SHA1 (patch-ag) = 759a32dacb26221d83de97b463b2131b0f52a914 SHA1 (patch-ah) = ac08fa5d2fa321afe7fdf72783f8f2c887073bcd SHA1 (patch-ai) = b890754ba3b0b1311f82745ecc8949b127fe0ee2 SHA1 (patch-aj) = e423f61f6b493ae6ae30dda8b0de3ffa10caeefe -SHA1 (patch-ak) = b33b0fc9e013642cc842c6d7ee70f590281764ae +SHA1 (patch-ak) = ea8a6b5e7ae563dd91fcb727d8c2634bdc65de02 SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76 SHA1 (patch-am) = 74e46f28cb152e152594d949b0116f1370dd1ae3 SHA1 (patch-an) = 2e9a38d7d9eb46f472cec555349f19cad0a5036b diff --git a/mail/majordomo/patches/patch-ak b/mail/majordomo/patches/patch-ak index d422d2be757..94224edb4e5 100644 --- a/mail/majordomo/patches/patch-ak +++ b/mail/majordomo/patches/patch-ak @@ -1,15 +1,16 @@ -$NetBSD: patch-ak,v 1.4 2010/10/30 23:48:36 spz Exp $ +$NetBSD: patch-ak,v 1.5 2011/12/11 11:53:23 marino Exp $ add necessary headers make it use getpwnam to find uid and gid to set to instead of hardwiring these --- wrapper.c.orig 1997-08-27 15:01:12.000000000 +0000 +++ wrapper.c -@@ -15,11 +15,16 @@ static char rcs_header[] = "$Header: /so +@@ -15,11 +15,17 @@ static char rcs_header[] = "$Header: /so #include <stdio.h> #include <sysexits.h> +#include <pwd.h> ++#include <errno.h> -#if defined(sun) && defined(sparc) +#if (defined(sun) && defined(sparc)) || defined(__NetBSD__) @@ -23,7 +24,7 @@ make it use getpwnam to find uid and gid to set to instead of hardwiring these #ifndef STRCHR # include <string.h> -@@ -65,6 +70,9 @@ main(argc, argv, env) +@@ -65,6 +71,9 @@ main(argc, argv, env) { char * prog; int e, i; @@ -33,13 +34,20 @@ make it use getpwnam to find uid and gid to set to instead of hardwiring these if (argc < 2) { fprintf(stderr, "USAGE: %s program [<arg> ...]\n", argv[0]); -@@ -123,7 +131,17 @@ main(argc, argv, env) +@@ -115,7 +124,6 @@ main(argc, argv, env) + int groups[] = { POSIX_GID, 0 }; + if (setgroups(1, groups) == -1) { + #endif +- extern int errno; + + fprintf(stderr, "%s: error setgroups failed errno %d", argv[0], + errno); +@@ -123,7 +131,16 @@ main(argc, argv, env) } #endif +#ifdef MAJORDOMO_USER + if ((majordomuser = getpwnam(MAJORDOMO_USER)) == NULL) { -+ extern int errno; + fprintf(stderr, "%s: error user %s not found, errno %d", argv[0], + MAJORDOMO_USER, errno); @@ -51,7 +59,7 @@ make it use getpwnam to find uid and gid to set to instead of hardwiring these #ifdef POSIX_GID setgid(POSIX_GID); #else -@@ -135,6 +153,7 @@ main(argc, argv, env) +@@ -135,6 +152,7 @@ main(argc, argv, env) #else setuid(geteuid()); #endif |