head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.2 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.5.0.114 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.112 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.110 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.108 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.106 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.104 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.102 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.100 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.98 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.96 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.94 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.92 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.90 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.88 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.86 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.84 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.82 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.80 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.78 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.76 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.74 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.72 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.68 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.48 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.70 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.66 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.64 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.62 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.60 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.58 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.56 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.54 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.52 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.50 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.46 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.44 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.42 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.40 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.38 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.36 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.34 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.32 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.30 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.28 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.26 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.24 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.22 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.20 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.18 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.16 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.14 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.12 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.10 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.8 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.6 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.4 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.2 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.4.0.8 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.6 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.4 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.2 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.3.0.68 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.66 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.64 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.62 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.60 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.58 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.56 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.54 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.52 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.50 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.48 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.46 pkgsrc-2008Q1:1.3.0.44 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.42 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.40 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.38 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.36 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.34 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.32 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.30 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.28 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.26 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3; locks; strict; comment @# @; 1.6 date 2026.03.18.17.04.39; author nia; state Exp; branches; next 1.5; commitid ejuBk9kvcVRgLtyG; 1.5 date 2011.12.11.11.53.23; author marino; state Exp; branches; next 1.4; 1.4 date 2010.10.30.23.48.36; author spz; state Exp; branches; next 1.3; 1.3 date 2000.02.05.19.51.44; author wiz; state Exp; branches; next 1.2; 1.2 date 2000.01.09.01.28.07; author wiz; state Exp; branches; next 1.1; 1.1 date 99.11.27.16.50.03; author hubertf; state Exp; branches; next ; desc @@ 1.6 log @majordomo: Fix build with recent GCC @ text @$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,11 @@@@ static char rcs_header[] = "$Header: /so #include #include - -#if defined(sun) && defined(sparc) +#include +#include #include -#endif - +#include +#include #ifndef STRCHR # include @@@@ -57,6 +57,7 @@@@ char * new_env[] = { int new_env_size = 7; /* to prevent overflow problems */ +int main(argc, argv, env) int argc; char * argv[]; @@@@ -65,6 +66,9 @@@@ main(argc, argv, env) { char * prog; int e, i; +#ifdef MAJORDOMO_USER + struct passwd *majordomuser; +#endif if (argc < 2) { fprintf(stderr, "USAGE: %s program [ ...]\n", argv[0]); @@@@ -115,7 +119,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 +126,16 @@@@ main(argc, argv, env) } #endif +#ifdef MAJORDOMO_USER + if ((majordomuser = getpwnam(MAJORDOMO_USER)) == NULL) { + fprintf(stderr, "%s: error user %s not found, errno %d", argv[0], + MAJORDOMO_USER, errno); + } else { + setgid(majordomuser->pw_gid); + setuid(majordomuser->pw_uid); + } +#else #ifdef POSIX_GID setgid(POSIX_GID); #else @@@@ -135,6 +147,7 @@@@ main(argc, argv, env) #else setuid(geteuid()); #endif +#endif if ((getuid() != geteuid()) || (getgid() != getegid())) { fprintf(stderr, "%s: error: Not running with proper UID and GID.\n", argv[0]); @ 1.5 log @mail/majordomo: Eliminate extern int errno Now it builds on DragonFly and maybe other platforms too. Contribution: Chris Turner @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.4 2010/10/30 23:48:36 spz Exp $ d8 1 a8 1 @@@@ -15,11 +15,17 @@@@ static char rcs_header[] = "$Header: /so d12 2 a15 3 -#if defined(sun) && defined(sparc) +#if (defined(sun) && defined(sparc)) || defined(__NetBSD__) d17 2 a18 3 #endif +#ifdef __NetBSD__ a20 1 +#endif d24 9 a32 1 @@@@ -65,6 +71,9 @@@@ main(argc, argv, env) d42 1 a42 1 @@@@ -115,7 +124,6 @@@@ main(argc, argv, env) d50 1 a50 1 @@@@ -123,7 +131,16 @@@@ main(argc, argv, env) d67 1 a67 1 @@@@ -135,6 +152,7 @@@@ main(argc, argv, env) @ 1.4 log @make the wrapper use getpwnam to determine uid and gid of the majordomo user adjust the Makefile to fit package beautification and lint shutup (like eg comments for some patches) @ text @d1 1 a1 1 $NetBSD$ d8 1 a8 1 @@@@ -15,11 +15,16 @@@@ static char rcs_header[] = "$Header: /so d13 1 d27 1 a27 1 @@@@ -65,6 +70,9 @@@@ main(argc, argv, env) d37 9 a45 1 @@@@ -123,7 +131,17 @@@@ main(argc, argv, env) a50 1 + extern int errno; d62 1 a62 1 @@@@ -135,6 +153,7 @@@@ main(argc, argv, env) @ 1.3 log @fixed RCS tag @ text @d2 8 a9 3 --- wrapper.c.orig Sat Nov 27 17:43:56 1999 +++ wrapper.c Sat Nov 27 17:45:54 1999 @@@@ -16,10 +16,14 @@@@ d12 1 d26 36 @ 1.2 log @RCS tags added @ text @d1 1 a1 1 $NetBSD @ 1.1 log @ - Add note that majordom can be removed from /etc/group - Call 'digest' from correct dir. Addresses PR 8814 by Berndt Josef Wulf - Add some headers to wrapper.c to fix several compile time warnings; partly submitted in PR 8756 by Berndt Josef Wulf @ text @d1 1 @