head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.4 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.2 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.6.0.104 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.102 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.100 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.98 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.96 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.94 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.92 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.90 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.88 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.86 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.84 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.82 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.80 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.78 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.76 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.74 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.72 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.70 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.68 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.66 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.64 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.60 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.40 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.62 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.58 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.56 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.54 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.52 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.50 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.48 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.46 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.44 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.42 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.38 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.36 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.34 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.32 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.30 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.28 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.26 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.24 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.22 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.20 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.18 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.16 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.14 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.12 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.10 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.8 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.6 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.4 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.2 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.5.0.74 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.72 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.70 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.68 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.66 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.64 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.62 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.60 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.58 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.56 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.54 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.52 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.50 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.48 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.46 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.44 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.42 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.40 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.38 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.36 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 FreeBSD-current-1997-11-19:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 2025.10.12.00.57.39; author mrg; state Exp; branches; next 1.6; commitid IKX5SIrJGeYgsdeG; 1.6 date 2012.12.30.05.38.55; author dholland; state Exp; branches; next 1.5; 1.5 date 2004.03.04.15.04.41; author cjep; state Exp; branches; next 1.4; 1.4 date 2004.02.28.20.04.40; author snj; state Exp; branches; next 1.3; 1.3 date 2004.02.25.03.58.43; author snj; state Exp; branches; next 1.2; 1.2 date 98.08.07.11.09.41; author agc; state Exp; branches 1.2.10.1; next 1.1; 1.1 date 97.11.19.13.03.40; author agc; state Exp; branches 1.1.1.1; next ; 1.2.10.1 date 2004.02.26.16.22.03; author agc; state Exp; branches; next 1.2.10.2; 1.2.10.2 date 2004.03.05.16.25.45; author agc; state Exp; branches; next ; 1.1.1.1 date 97.11.19.13.03.40; author agc; state Exp; branches; next ; desc @@ 1.7 log @make build with GCC 14. phew! it's a lot of standard things: - missing headers - missing types - conflicting types @ text @$NetBSD: patch-ae,v 1.6 2012/12/30 05:38:55 dholland Exp $ - use required standard headers - make sure index() is available - don't provide own declarations of standard functions - fix path to sendmail (although, is this really adequately MI?) - buffer length fix - port for GCC 14 --- metamail/splitmail.c.orig 1994-01-31 14:23:14.000000000 -0800 +++ metamail/splitmail.c 2025-10-11 17:24:38.158624097 -0700 @@@@ -21,14 +21,26 @@@@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE ******************************************************* */ #include +#include +#include +#include #include #include #include #include #include +#ifndef index +#define index(a, b) strchr(a, b) +#endif + #define MINCHUNKSIZE 20000 /* Better be enough to hold the headers, or we die! */ -extern char *malloc(), *index(), *getmyname(); +extern char *getmyname(); + +int ShareThisHeader(); +void HandleOnePart(); +int ULstrcmp(); +int IllegalContentType(); #ifdef AMIGA #define Prototype extern @@@@ -40,11 +52,11 @@@@ extern char *malloc(), *index(), *getmyn #define NORMALDELIVERYCMD NormalDeliveryCmd #define VERBOSEDELIVERYCMD VerboseDeliveryCmd #else -extern char *getenv(); -#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi" -#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi" +#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi" +#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi" #endif +void usageexit() { fprintf(stderr, "Usage: splitmail [-d] [-v] [-s splitsize] [-i id-suffix] [-p prefix] [file-name]\n"); exit(-1); @@@@ -67,7 +79,9 @@@@ char *s; } } +int main(argc, argv) +int argc; char **argv; { int i, DoDeliver=0, SplitSize=DEFAULT_SPLIT_SIZE, dum, InNewline=1, bytesread, whichpart=1, Verbose=0, numparts = -1, c; @@@@ -194,7 +208,7 @@@@ char **argv; s = endofheader(from); /* would be index(from, '\n'), but need to check for continuation lines */ *s = '\0'; - if (ShareThisHeader(from, SubjectBuf, &OrigID)) { + if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) { strcat(SharedHeaders, from); strcat(SharedHeaders, "\n"); } @@@@ -238,6 +252,7 @@@@ char **argv; return(0); } +void HandleOnePart(DoDeliver, deliverycmd, prefix, numparts, whichpart, SharedHeaders, SubjectBuf, id, MessageID, bigbuf, OrigID) int DoDeliver, numparts, whichpart; char *deliverycmd, *prefix, *SharedHeaders, *SubjectBuf, *id, *MessageID, *bigbuf, *OrigID; @@@@ -339,9 +354,11 @@@@ static char *SharedHeads[] = { NULL }; -ShareThisHeader(s, SubjectBuf, OrigID) +int +ShareThisHeader(s, SubjectBuf, size, OrigID) char *s; char *SubjectBuf; +size_t size; char **OrigID; { int i; @@@@ -361,7 +378,8 @@@@ char **OrigID; } if (!ULstrcmp(s, "subject")) { *colon = ':'; - strcpy(SubjectBuf, ++colon); + strncpy(SubjectBuf, ++colon, size); + SubjectBuf[size - 1] = '\0'; return(0); } if (!ULstrcmp(s, "content-type")) { @@@@ -379,6 +397,7 @@@@ char **OrigID; static char *tspecials = "()<>@@,;:\\\"/[]?.="; +int IllegalContentType(ctype) char *ctype; { @ 1.6 log @Add required standard headers. XXX: this package should be terminated with prejudice @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2004/03/04 15:04:41 cjep Exp $ d8 1 d10 3 a12 3 --- metamail/splitmail.c.orig 1994-01-31 22:23:14.000000000 +0000 +++ metamail/splitmail.c @@@@ -21,14 +21,20 @@@@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE d18 1 d32 5 d40 1 a40 1 @@@@ -40,9 +46,8 @@@@ extern char *malloc(), *index(), *getmyn d51 1 d53 13 a65 1 @@@@ -194,7 +199,7 @@@@ char **argv; d74 9 a82 1 @@@@ -339,9 +344,10 @@@@ static char *SharedHeads[] = { d87 1 d95 1 a95 1 @@@@ -361,7 +367,8 @@@@ char **OrigID; d105 8 @ 1.5 log @Lint: add NetBSD RCS tags @ text @d1 34 a34 4 $NetBSD$ --- metamail/splitmail.c.orig Mon Jan 31 23:23:14 1994 +++ metamail/splitmail.c Sat Feb 28 20:08:44 2004 @@@@ -41,8 +41,8 @@@@ d37 1 a37 1 extern char *getenv(); d45 1 a45 1 @@@@ -194,7 +194,7 @@@@ d54 1 a54 1 @@@@ -339,9 +339,10 @@@@ d66 1 a66 1 @@@@ -361,7 +362,8 @@@@ @ 1.4 log @Properly fix last. From Christian Weisgerber. @ text @d1 1 @ 1.3 log @* Apply security patch from http://www.securityfocus.com/archive/1/354362/2004-02-15/2004-02-21/2 * Bump PKGREVISION to 2. * Make patches only modify one file each * Fix some spelling errors * Use ${SED} instead of sed, and ${CHMOD} instead of chmod * Set CFLAGS.SunOS instead of doing the bsd.prefs.mk dance @ text @d1 3 a3 5 $NetBSD$ --- metamail/splitmail.c.orig 1994-01-31 14:23:14.000000000 -0800 +++ metamail/splitmail.c 2004-02-24 10:49:02.000000000 -0800 @@@@ -41,8 +41,8 @@@@ extern char *malloc(), *index(), *getmyn d14 22 a35 1 @@@@ -361,7 +361,8 @@@@ char **OrigID; d40 2 a41 2 + strncpy(SubjectBuf, ++colon, sizeof(SubjectBuf)); + SubjectBuf[sizeof(SubjectBuf) - 1] = '\0'; @ 1.2 log @Add NetBSD RCS Ids. @ text @d3 23 a25 21 *** metamail/splitmail.c.orig Sun Jun 18 13:13:56 1995 --- metamail/splitmail.c Sun Jun 18 13:14:48 1995 *************** *** 41,48 **** #define VERBOSEDELIVERYCMD VerboseDeliveryCmd #else extern char *getenv(); ! #define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi" ! #define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi" #endif usageexit() { --- 41,48 ---- #define VERBOSEDELIVERYCMD VerboseDeliveryCmd #else extern char *getenv(); ! #define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi" ! #define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi" #endif usageexit() { @ 1.2.10.1 log @Pull up certain parts of the following mods via patch and hand-editing to the pkgsrc-2003Q4 branch, requested by Soren Jacobson. Module Name: pkgsrc Committed By: snj Date: Wed Feb 25 03:58:43 UTC 2004 Modified Files: pkgsrc/mail/metamail: Makefile distinfo pkgsrc/mail/metamail/patches: patch-ad patch-ae patch-af patch-ag patch-ah Added Files: pkgsrc/mail/metamail/patches: patch-ai patch-aj patch-ak patch-al patch-am patch-an patch-ao Removed Files: pkgsrc/mail/metamail/patches: patch-ac Log Message: * Apply security patch from http://www.securityfocus.com/archive/1/354362/2004-02-15/2004-02-21/2 * Bump PKGREVISION to 2. * Make patches only modify one file each * Fix some spelling errors * Use ${SED} instead of sed, and ${CHMOD} instead of chmod @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2004/02/25 03:58:43 snj Exp $ d3 21 a23 23 --- metamail/splitmail.c.orig 1994-01-31 14:23:14.000000000 -0800 +++ metamail/splitmail.c 2004-02-24 10:49:02.000000000 -0800 @@@@ -41,8 +41,8 @@@@ extern char *malloc(), *index(), *getmyn #define VERBOSEDELIVERYCMD VerboseDeliveryCmd #else extern char *getenv(); -#define NORMALDELIVERYCMD "/usr/lib/sendmail -t -oi" -#define VERBOSEDELIVERYCMD "/usr/lib/sendmail -t -v -oi" +#define NORMALDELIVERYCMD "/usr/sbin/sendmail -t -oi" +#define VERBOSEDELIVERYCMD "/usr/sbin/sendmail -t -v -oi" #endif usageexit() { @@@@ -361,7 +361,8 @@@@ char **OrigID; } if (!ULstrcmp(s, "subject")) { *colon = ':'; - strcpy(SubjectBuf, ++colon); + strncpy(SubjectBuf, ++colon, sizeof(SubjectBuf)); + SubjectBuf[sizeof(SubjectBuf) - 1] = '\0'; return(0); } if (!ULstrcmp(s, "content-type")) { @ 1.2.10.2 log @Pullup further security fix to the pkgsrc-2003Q4 branch, requested by Soren Jacobsen. Module Name: pkgsrc Committed By: snj Date: Sat Feb 28 20:04:40 UTC 2004 Modified Files: pkgsrc/mail/metamail: Makefile distinfo pkgsrc/mail/metamail/patches: patch-ae Log Message: Properly fix last. From Christian Weisgerber. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- metamail/splitmail.c.orig Mon Jan 31 23:23:14 1994 +++ metamail/splitmail.c Sat Feb 28 20:08:44 2004 @@@@ -41,8 +41,8 @@@@ d16 1 a16 22 @@@@ -194,7 +194,7 @@@@ s = endofheader(from); /* would be index(from, '\n'), but need to check for continuation lines */ *s = '\0'; - if (ShareThisHeader(from, SubjectBuf, &OrigID)) { + if (ShareThisHeader(from, SubjectBuf, sizeof(SubjectBuf), &OrigID)) { strcat(SharedHeaders, from); strcat(SharedHeaders, "\n"); } @@@@ -339,9 +339,10 @@@@ NULL }; -ShareThisHeader(s, SubjectBuf, OrigID) +ShareThisHeader(s, SubjectBuf, size, OrigID) char *s; char *SubjectBuf; +size_t size; char **OrigID; { int i; @@@@ -361,7 +362,8 @@@@ d21 2 a22 2 + strncpy(SubjectBuf, ++colon, size); + SubjectBuf[size - 1] = '\0'; @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Initial import of the metamail-2.7 FreeBSD port into the NetBSD packages collection. @ text @@