head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.42 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.40 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.38 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.36 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.34 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.32 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.30 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.28 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.26 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.24 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.22 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.20 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.18 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.16 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.14 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.12 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.10 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.8 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.6 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.4 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.2 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.2.0.126 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.124 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.120 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.100 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.122 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.118 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.116 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.114 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.112 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.110 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.108 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.106 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.104 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.102 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.98 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.96 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.94 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.92 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.90 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.88 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.86 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.84 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.82 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.80 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.78 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.76 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.74 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.72 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.70 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.68 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.66 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.64 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.62 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.60 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.58 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.56 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.54 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.52 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.50 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.48 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.46 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.44 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.42 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.40 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.38 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.36 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.34 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.32 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.30 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.28 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.26 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.24 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.22 pkgsrc-2008Q1:1.2.0.20 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.18 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.16 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.14 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.12 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.10 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.8 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.6 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.4 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.2 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2021.02.10.13.00.05; author cjep; state Exp; branches; next 1.2; commitid pZLDMlMQEZbYfaHC; 1.2 date 2005.12.05.20.50.58; author rillig; state Exp; branches; next 1.1; 1.1 date 2003.12.05.05.40.32; author ben; state Exp; branches; next ; desc @@ 1.3 log @PR#22362. Add Darwin support. Also avoid overlapping strcpy. Should be noted that this package needs an upgrade. There is one being developed in pkgsrc-wip. @ text @$NetBSD strcpy used on overlapping strings. Place in a string to avoid this. Fixes package on Darwin. --- src/config.parse.c.orig 1994-07-21 02:03:26.000000000 +0100 +++ src/config.parse.c 2021-02-09 14:24:32.000000000 +0000 @@@@ -55,7 +55,6 @@@@ #endif /* prototypes */ -char *mktemp(); static void configfile_descend(); #ifndef L_tmpnam @@@@ -83,6 +82,7 @@@@ { FILE *fpin, *fpout = (FILE *) NULL; char filename[MAXPATHLEN+512]; + char cpfilename[MAXPATHLEN+512]; char ignorestring[1024]; char s[MAXPATHLEN+1024]; char configfile[MAXPATHLEN+512]; @@@@ -90,6 +90,7 @@@@ char number[128]; int entrynum = 0; int err; + int fdout; /* to make code semi-reentrant */ list_reset(&prune_list); @@@@ -105,8 +106,9 @@@@ }; (void) strcpy(tmpfilename, TEMPFILE_TEMPLATE); - if ((char *) mktemp(tmpfilename) == NULL) { - perror("configfile_read: mktemp()"); + fdout = mkstemp(tmpfilename); + if (fdout == -1) { + perror("configfile_read: mkstemp()"); exit(1); } @@@@ -149,7 +151,7 @@@@ err = umask(077); /* to protect the tempfile */ - if ((fpout = fopen(tmpfilename, "w+")) == NULL) { + if ((fpout = fdopen(fdout, "w+")) == NULL) { sprintf(s, "tripwire: Couldn't open config file '%s'", configfile); perror(s); exit(1); @@@@ -221,11 +223,17 @@@@ switch (*filename) { case '!': prune_mode = PRUNE_ALL; - (void) strcpy(filename, filename+1); /* adjust name */ + /* overlapping strings - undefined behaviour, at least + * on Darwin + * (void) strcpy(filename, filename+1); + */ + (void) strcpy(cpfilename, filename+1); /* adjust name */ + (void) strcpy(filename, cpfilename); /* adjust name */ break; case '=': prune_mode = PRUNE_ONE; - (void) strcpy(filename, filename+1); /* adjust name */ + (void) strcpy(cpfilename, filename+1); /* adjust name */ + (void) strcpy(filename, cpfilename); /* adjust name */ break; default: continue; /* nothing */ @@@@ -295,7 +303,8 @@@@ /* check for leading '=', prune after one recursion */ else if (*filename == '=') { - (void) strcpy(filename, filename+1); + (void) strcpy(cpfilename, filename+1); /* adjust name */ + (void) strcpy(filename, cpfilename); /* adjust name */ prunedir++; } @ 1.2 log @Fixed pkglint warnings. The warnings are mostly quoting issues, for example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2003/12/05 05:40:32 ben Exp $ d3 5 a7 2 --- src/config.parse.c.orig 1994-07-20 18:03:26.000000000 -0700 +++ src/config.parse.c d16 9 a24 1 @@@@ -90,6 +89,7 @@@@ configfile_read(pp_list, pp_entry_list) d32 1 a32 1 @@@@ -105,8 +105,9 @@@@ configfile_read(pp_list, pp_entry_list) d44 1 a44 1 @@@@ -149,7 +150,7 @@@@ configfile_read(pp_list, pp_entry_list) d53 30 @ 1.1 log @Replace all uses of mktemp() with mkstemp() and close PR 23640. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -55,7 +55,6 @@@@ static char rcsid[] = "$Id: config.parse @