head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.174 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.172 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.170 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.168 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.166 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.164 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.162 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.160 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.158 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.156 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.154 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.152 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.150 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.148 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.146 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.144 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.142 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.140 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.138 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.136 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.134 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.132 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.130 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.126 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.106 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.128 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.124 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.122 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.120 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.118 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.116 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.114 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.112 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.110 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.108 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.104 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.102 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.100 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.98 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.96 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.94 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.92 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.90 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.88 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.86 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.84 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.82 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.80 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.78 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.76 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.74 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.72 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.70 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.68 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.66 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.64 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.62 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.60 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.58 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.56 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.54 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.52 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.50 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.48 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.46 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.44 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.42 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.40 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.38 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.36 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.34 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.32 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.30 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.28 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.18 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.16 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.14 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.12 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.10 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.6 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2:1.1.0.2 buildlink2-base:1.1 netbsd-1-5-PATCH003:1.1; locks; strict; comment @# @; 1.2 date 2005.03.01.14.53.41; author wiz; state Exp; branches; next 1.1; 1.1 date 2001.10.31.14.44.43; author tv; state Exp; branches 1.1.18.1; next ; 1.1.18.1 date 2005.03.01.20.32.38; author snj; state Exp; branches; next ; desc @@ 1.2 log @Apply fix for CAN-2005-0160 and CAN-2005-0161. Bump PKGREVISION. @ text @$NetBSD: patch-ad,v 1.1 2001/10/31 14:44:43 tv Exp $ --- unace.c.orig 1998-07-01 10:29:00.000000000 +0200 +++ unace.c @@@@ -240,6 +240,7 @@@@ INT read_arc_head(void) // searc INT open_archive(INT print_err) // opens archive (or volume) { CHAR av_str[80]; + unsigned int copylen; archan = open(aname, O_RDONLY | O_BINARY); // open file @@@@ -263,8 +264,11 @@@@ INT open_archive(INT print_err) sprintf(av_str, "\ncreated on %d.%d.%d by ", ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr)); printf(av_str); - strncpy(av_str, mhead.AV, mhead.AV_SIZE); - av_str[mhead.AV_SIZE] = 0; + copylen = mhead.AV_SIZE; + if (copylen > 79) + copylen = 79; + strncpy(av_str, mhead.AV, copylen); + av_str[copylen] = 0; printf("%s\n\n", av_str); } comment_out("Main comment:"); // print main comment @@@@ -300,7 +304,7 @@@@ void get_next_volname(void) INT proc_vol(void) // opens volume { INT i; - CHAR s[80]; + CHAR s[PATH_MAX + 80]; // if f_allvol_pr is 2 we have -y and should never ask if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr) @@@@ -428,7 +432,7 @@@@ void extract_files(int nopath, int test) if (head.HEAD_TYPE == FILE_BLK) { comment_out("File comment:"); // show file comment - ace_fname(file, &head, nopath); // get file name + ace_fname(file, &head, nopath, sizeof(file)); // get file name printf("\n%s", file); flush; dcpr_init_file(); // initialize decompression of file @@@@ -496,7 +500,7 @@@@ void list_files(int verbose) if (head.HEAD_TYPE == FILE_BLK) { ULONG ti=fhead.FTIME; - ace_fname(file, &head, verbose ? 0 : 1); // get file name + ace_fname(file, &head, verbose ? 0 : 1, sizeof(file)); // get file name size += fhead.SIZE; psize += @@@@ -512,7 +516,7 @@@@ void list_files(int verbose) tpsize+= fhead.PSIZE; } if (!f_err) - printf("%02u.%02u.%02u|%02u:%02u|%c%c%9lu|%9lu|%4u%%|%c%s\n", + printf("%02u.%02u.%02u|%02u:%02u|%c%c%9u|%9u|%4u%%|%c%s\n", ts_day (ti), ts_month(ti), ts_year(ti)%100, ts_hour(ti), ts_min (ti), fhead.HEAD_FLAGS & ACE_SP_BEF ? '<' : ' ', @@@@ -525,7 +529,7 @@@@ void list_files(int verbose) } if (!f_err) { - printf("\n %9lu|%9lu|%4u%%| %u file%s", + printf("\n %9u|%9u|%4u%%| %u file%s", psize, size, percentage(psize, size), @@@@ -588,7 +592,8 @@@@ int main(INT argc, CHAR * argv[]) init_unace(); // initialize unace - strcpy(aname, argv[arg_cnt]); // get archive name + strncpy(aname, argv[arg_cnt], sizeof(aname) - 4); // get archive name + aname[sizeof(aname) - 5] = '\0'; if (!(s = (CHAR *) strrchr(aname, DIRSEP))) s = aname; if (!strrchr(s, '.')) @ 1.1 log @Clean out my pkgsrc diffs: Update unace to 1.2b, and make this compile and (mostly) run on LP64. @ text @d1 1 a1 1 $NetBSD$ d3 52 a54 3 --- unace.c.orig Mon Oct 8 10:49:26 2001 +++ unace.c Mon Oct 8 10:50:15 2001 @@@@ -512,7 +512,7 @@@@ d63 1 a63 1 @@@@ -525,7 +525,7 @@@@ d72 10 @ 1.1.18.1 log @Pullup ticket 323 - requested by Thomas Klausner security fix for unace Revisions pulled up: - pkgsrc/archivers/unace/Makefile 1.14 - pkgsrc/archivers/unace/distinfo 1.6 - pkgsrc/archivers/unace/patches/patch-ad 1.2 - pkgsrc/archivers/unace/patches/patch-ae 1.1 - pkgsrc/archivers/unace/patches/patch-af 1.1 Module Name: pkgsrc Committed By: wiz Date: Tue Mar 1 14:53:41 UTC 2005 Modified Files: pkgsrc/archivers/unace: Makefile distinfo pkgsrc/archivers/unace/patches: patch-ad Added Files: pkgsrc/archivers/unace/patches: patch-ae patch-af Log Message: Apply fix for CAN-2005-0160 and CAN-2005-0161. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2001/10/31 14:44:43 tv Exp $ d3 3 a5 52 --- unace.c.orig 1998-07-01 10:29:00.000000000 +0200 +++ unace.c @@@@ -240,6 +240,7 @@@@ INT read_arc_head(void) // searc INT open_archive(INT print_err) // opens archive (or volume) { CHAR av_str[80]; + unsigned int copylen; archan = open(aname, O_RDONLY | O_BINARY); // open file @@@@ -263,8 +264,11 @@@@ INT open_archive(INT print_err) sprintf(av_str, "\ncreated on %d.%d.%d by ", ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr)); printf(av_str); - strncpy(av_str, mhead.AV, mhead.AV_SIZE); - av_str[mhead.AV_SIZE] = 0; + copylen = mhead.AV_SIZE; + if (copylen > 79) + copylen = 79; + strncpy(av_str, mhead.AV, copylen); + av_str[copylen] = 0; printf("%s\n\n", av_str); } comment_out("Main comment:"); // print main comment @@@@ -300,7 +304,7 @@@@ void get_next_volname(void) INT proc_vol(void) // opens volume { INT i; - CHAR s[80]; + CHAR s[PATH_MAX + 80]; // if f_allvol_pr is 2 we have -y and should never ask if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr) @@@@ -428,7 +432,7 @@@@ void extract_files(int nopath, int test) if (head.HEAD_TYPE == FILE_BLK) { comment_out("File comment:"); // show file comment - ace_fname(file, &head, nopath); // get file name + ace_fname(file, &head, nopath, sizeof(file)); // get file name printf("\n%s", file); flush; dcpr_init_file(); // initialize decompression of file @@@@ -496,7 +500,7 @@@@ void list_files(int verbose) if (head.HEAD_TYPE == FILE_BLK) { ULONG ti=fhead.FTIME; - ace_fname(file, &head, verbose ? 0 : 1); // get file name + ace_fname(file, &head, verbose ? 0 : 1, sizeof(file)); // get file name size += fhead.SIZE; psize += @@@@ -512,7 +516,7 @@@@ void list_files(int verbose) d14 1 a14 1 @@@@ -525,7 +529,7 @@@@ void list_files(int verbose) a22 10 @@@@ -588,7 +592,8 @@@@ int main(INT argc, CHAR * argv[]) init_unace(); // initialize unace - strcpy(aname, argv[arg_cnt]); // get archive name + strncpy(aname, argv[arg_cnt], sizeof(aname) - 4); // get archive name + aname[sizeof(aname) - 5] = '\0'; if (!(s = (CHAR *) strrchr(aname, DIRSEP))) s = aname; if (!strrchr(s, '.')) @