From ad72d658cd2f8b6856e5bede5c9fb193f47c6c99 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 5 Oct 2003 04:25:14 +0000 Subject: - Add --enable-shadow since this package could work on platform which have shadow password (SunOS at least). - Reduce warning with GCC 3.3.1. - Bump package revision. --- mail/yatsvrs/Makefile | 4 +++- mail/yatsvrs/distinfo | 17 +++++++++-------- mail/yatsvrs/patches/patch-af | 12 ++++++------ mail/yatsvrs/patches/patch-ag | 13 +++++++++++-- mail/yatsvrs/patches/patch-al | 12 ++++++------ mail/yatsvrs/patches/patch-as | 27 ++++++++++++++++++--------- mail/yatsvrs/patches/patch-at | 12 ++++++------ mail/yatsvrs/patches/patch-ax | 17 +++++++++++++---- mail/yatsvrs/patches/patch-bk | 28 +++++++++++++++++++++++----- mail/yatsvrs/patches/patch-bm | 31 +++++++++++++++++++++++++++++++ 10 files changed, 126 insertions(+), 47 deletions(-) create mode 100644 mail/yatsvrs/patches/patch-bm (limited to 'mail/yatsvrs') diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile index de5bf8dc7bd..13d381f9c68 100644 --- a/mail/yatsvrs/Makefile +++ b/mail/yatsvrs/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2003/07/17 21:47:14 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/10/05 04:25:14 taca Exp $ # DISTNAME= yatsvrs-5.00p6 PKGNAME= ${DISTNAME:S/p/./} +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.jone-system.com/pub/jepro/yatsvr/ @@ -28,6 +29,7 @@ CONFIGURE_ARGS+= --enable-popper-xmit CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC} CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR} +CONFIGURE_ARGS+= --enable-shadow-password DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo index 494d3bc4791..9e15a498485 100644 --- a/mail/yatsvrs/distinfo +++ b/mail/yatsvrs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/04/01 04:43:33 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2003/10/05 04:25:14 taca Exp $ SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes @@ -7,25 +7,25 @@ SHA1 (patch-ab) = b460344ec577ef0a61d84bffbcf6c2c2e6fb2afb SHA1 (patch-ac) = e34b2364f0039a135a7ebcd24c84b6d101581489 SHA1 (patch-ad) = 392b8f6abd208c9387b2953792af2638aacbae23 SHA1 (patch-ae) = 20f860d23b990eebe0c0e4a3f36ae658032a0c61 -SHA1 (patch-af) = deb5a7b2228e5b0259351fbccbd75b1625555702 -SHA1 (patch-ag) = 6f38cbdf7e6e30c49bfe9e84956e4d6057c382e1 +SHA1 (patch-af) = e91f015118fb5ab95fccecf09205198894f89395 +SHA1 (patch-ag) = 8f339d58bea6ee8d04c3df7258b6ecb901602852 SHA1 (patch-ah) = cdd32e7a7474b94601c69c4ab6a304542af7da42 SHA1 (patch-ai) = f0f7d8fe5b6dc25fab2d9e73809b084b8e4729c6 SHA1 (patch-aj) = fc13d80bc08a84d86e627adad167d96684151541 SHA1 (patch-ak) = ec11aabeca579944e78053065759986cb96c1da2 -SHA1 (patch-al) = 7521f31cd1ab5c50008438fd330a691b8d707528 +SHA1 (patch-al) = eed8524c6dfabdb03cabd556abfa38b4f16aecac SHA1 (patch-am) = b440b15414710b67d218a6a57621b20c35002cb9 SHA1 (patch-an) = 1df8dd35e14a46bfc3c4daad49f4766757295ba5 SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211 SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc SHA1 (patch-aq) = a09b4f8869e2231b3715155b85b690901926a4e5 SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66 -SHA1 (patch-as) = 4685b499fabc766425d0ee43b687fb89a9ada884 -SHA1 (patch-at) = 1a3d5b1f93335e9446048294a27807d555702e5e +SHA1 (patch-as) = f02a1402188c9def494dbea60b874bfdd04a7c50 +SHA1 (patch-at) = cecd3a6c32e225cb55046dee951bd0b09660fdc7 SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658 SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2 SHA1 (patch-aw) = 31a7f22c6e78b87d7bec66d0dd77641884ffb107 -SHA1 (patch-ax) = 1f93f5b93584285fb3dd6e1f7e5916ef81b2ae2e +SHA1 (patch-ax) = 70ff600e44ae05e27b240fb285da7a848baa4543 SHA1 (patch-ay) = 7af5466cf2f2630ab34b1638cf45fbf7247f731d SHA1 (patch-az) = 29790a4630628b95900d260a30f1b2db21d54975 SHA1 (patch-ba) = f309f85700bfdf487899aac178fb99e7173b6748 @@ -38,5 +38,6 @@ SHA1 (patch-bg) = 3b75fc375e4bb4121292f562b609038bbf2276f8 SHA1 (patch-bh) = a9160a6156c2e8ea783dc11bdb5df6663f274192 SHA1 (patch-bi) = a17c470217673bb1f40e446a2867ced0a8c26cf3 SHA1 (patch-bj) = 50728ec84bee5177f60695fe3cff4c595636b300 -SHA1 (patch-bk) = 06cbe5966a98cd5279e7d2d378704f4629dde9c8 +SHA1 (patch-bk) = f3ae9b2bc8ef898e85739f8a2361752062c545f7 SHA1 (patch-bl) = 37b01451503a5b8035ea872b349ef4dff89cccd4 +SHA1 (patch-bm) = e5d8e27c820e1d23254e3b8250def76045029b4d diff --git a/mail/yatsvrs/patches/patch-af b/mail/yatsvrs/patches/patch-af index 71cbf6bf9a3..8cf42f8da73 100644 --- a/mail/yatsvrs/patches/patch-af +++ b/mail/yatsvrs/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-af,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- ascyd/sighand.c.orig Mon Jun 25 14:58:32 2001 +--- ascyd/sighand.c.orig 2001-06-25 16:28:21.000000000 +0900 +++ ascyd/sighand.c -@@ -60,7 +60,6 @@ +@@ -60,7 +60,6 @@ void SigUnblock() void SigHandler(iSig) int iSig; { @@ -10,13 +10,13 @@ $NetBSD: patch-af,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ int codeErr; /* -@@ -72,17 +71,14 @@ +@@ -72,17 +71,14 @@ void SigHandler(iSig) switch (iSig) { case SIGALRM: - pMsg = NULL; codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL, iSig); ++ WARNING(codeErr, 0, NULL); break; - case SIGHUP: - case SIGTERM: @@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ if (SysData.Flags.lock) SessionUnlock(); -@@ -94,7 +90,7 @@ +@@ -94,7 +90,7 @@ void SigHandler(iSig) } #endif diff --git a/mail/yatsvrs/patches/patch-ag b/mail/yatsvrs/patches/patch-ag index 267d3d53aac..5195500c8bc 100644 --- a/mail/yatsvrs/patches/patch-ag +++ b/mail/yatsvrs/patches/patch-ag @@ -1,6 +1,6 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-ag,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- conf.h.orig Mon Jul 9 12:36:15 2001 +--- conf.h.orig 2001-07-09 18:19:03.000000000 +0900 +++ conf.h @@ -26,17 +26,20 @@ @@ -24,3 +24,12 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ #else # error #endif /* SIZEOF_OFF_T == SIZEOF_LONG_LONG */ +@@ -522,7 +525,7 @@ + + #ifndef HAVE_MEMMOVE + #include "common/memmove.h" +-#endif HAVE_MEMMOVE ++#endif /* HAVE_MEMMOVE */ + + #ifdef LOGWTMP + #include diff --git a/mail/yatsvrs/patches/patch-al b/mail/yatsvrs/patches/patch-al index 124b04ed512..7622367cf75 100644 --- a/mail/yatsvrs/patches/patch-al +++ b/mail/yatsvrs/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-al,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- yatconfd/yatconfd.c.orig Tue Jun 26 20:22:07 2001 +--- yatconfd/yatconfd.c.orig 2001-06-26 20:25:22.000000000 +0900 +++ yatconfd/yatconfd.c -@@ -259,7 +259,7 @@ +@@ -259,7 +259,7 @@ int main (argc, argv) Msg2Cli(SUCCESS, "%.512s @%.256s", szGreeting , SysData.szMyHost); #else @@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ szGreeting, SysData.pid, SysData.timeStart, SysData.szMyHost); #endif -@@ -360,32 +360,26 @@ +@@ -360,32 +360,26 @@ int main (argc, argv) static void SigHandler(iSig) int iSig; { @@ -38,7 +38,7 @@ $NetBSD: patch-al,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ case SIGALRM: - pMsg = NULL; codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL, iSig); ++ WARNING(codeErr, 0, NULL); break; - case SIGHUP: - case SIGTERM: @@ -52,7 +52,7 @@ $NetBSD: patch-al,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ UnLockAll(); -@@ -396,7 +390,7 @@ +@@ -396,7 +390,7 @@ static void SigHandler(iSig) } #endif diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as index bea9ff4722e..5d1d5a389fe 100644 --- a/mail/yatsvrs/patches/patch-as +++ b/mail/yatsvrs/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-as,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- yatd/dfree.c.orig Mon Jul 9 11:13:56 2001 +--- yatd/dfree.c.orig 2001-07-09 12:32:52.000000000 +0900 +++ yatd/dfree.c -@@ -72,12 +72,6 @@ +@@ -72,12 +72,6 @@ quota_get_inode_current __P(( struct dqb #define DEBUG_LOCAL @@ -15,7 +15,7 @@ $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ int DFreeCheck(pPath, pSizFree, pNodFree) char * pPath; /* ユーザーのホームディレクトリの位置 */ OFF_T * pSizFree; /* 空きブロック数 */ -@@ -99,7 +93,7 @@ +@@ -99,7 +93,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree nodLimit = *pNodFree; /* リミットのノード数を指定する */ #ifdef DEBUG_LOCAL @@ -24,7 +24,7 @@ $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ sizLimit, nodLimit, sizeof (OFF_T)); #endif /* DEBUG_LOCAL */ -@@ -123,22 +117,21 @@ +@@ -123,22 +117,21 @@ int DFreeCheck(pPath, pSizFree, pNodFree # ifdef BSD44 LogDEBUG("statfs() returns:"); LogDEBUG(" type: %d", statfsBuf.f_type); @@ -52,11 +52,11 @@ $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ + LogDEBUG(" bavail: %ld", statfsBuf.f_bavail); + LogDEBUG(" files: %ld", statfsBuf.f_files); + LogDEBUG(" ffree: %ld", statfsBuf.f_ffree); -+ LogDEBUG(" fsid: %" LONGLONG_OPTC "u", statfsBuf.f_fsid); ++ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsid.val[0], statfsBuf.f_fsid.val[1]); #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); #endif -@@ -311,7 +304,7 @@ +@@ -311,7 +304,7 @@ int FuncDFree() nodFree = SysData.nodLimitFree; #ifdef DEBUG_LOCAL @@ -65,7 +65,7 @@ $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ sizFree, nodFree); #endif -@@ -325,7 +318,7 @@ +@@ -325,7 +318,7 @@ int FuncDFree() if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){ return FAILURE; } @@ -74,7 +74,16 @@ $NetBSD: patch-as,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ #endif /* DONT_CHECKDFREE */ return SUCCESS; } -@@ -449,12 +442,12 @@ +@@ -427,7 +420,7 @@ static inline quota_size_t quota_get_ino + + #ifdef STRUCT_DQBLK_CURRENT_FILES + retval = (quota_size_t)quota_block->dqb_curfiles; +-#endif STRUCT_DQBLK_CURRENT_FILES ++#endif /* STRUCT_DQBLK_CURRENT_FILES */ + + return retval; + } +@@ -449,12 +442,12 @@ static int quotactl_wrapper(pPath,quota_ switch( status ){ case SUCCESS: LogDEBUG("quotactl() returns:"); diff --git a/mail/yatsvrs/patches/patch-at b/mail/yatsvrs/patches/patch-at index cf2019d8be0..c8dc2dfea02 100644 --- a/mail/yatsvrs/patches/patch-at +++ b/mail/yatsvrs/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-at,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- yatd/entry.c.orig Mon Jul 9 09:51:31 2001 +--- yatd/entry.c.orig 2001-07-09 12:32:52.000000000 +0900 +++ yatd/entry.c -@@ -431,7 +431,7 @@ +@@ -431,7 +431,7 @@ int main (argc, argv) Msg2Cli(SUCCESS, "%.512s @%.256s", szGreeting , SysData.szMyHost); #else @@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ szGreeting, SysData.pid, SysData.timeStart, SysData.szMyHost); #endif -@@ -560,34 +560,30 @@ +@@ -560,34 +560,30 @@ int main (argc, argv) #ifdef HAVE_SIGACTION static void signal_handler(int signum){ @@ -36,7 +36,7 @@ $NetBSD: patch-at,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ switch (signum) { case SIGALRM: codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL, signum); ++ WARNING(codeErr, 0, NULL); break; - case SIGHUP: - case SIGTERM: @@ -50,7 +50,7 @@ $NetBSD: patch-at,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ if (SysData.Flags.pidFile) DelPidFile(1); -@@ -602,7 +598,7 @@ +@@ -602,7 +598,7 @@ static void signal_handler(int signum){ } #endif diff --git a/mail/yatsvrs/patches/patch-ax b/mail/yatsvrs/patches/patch-ax index 951ca05d613..49fca2647fd 100644 --- a/mail/yatsvrs/patches/patch-ax +++ b/mail/yatsvrs/patches/patch-ax @@ -1,8 +1,17 @@ -$NetBSD: patch-ax,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ +$NetBSD: patch-ax,v 1.2 2003/10/05 04:25:15 taca Exp $ ---- yatd/init.c.orig Thu Jun 28 16:43:55 2001 +--- yatd/init.c.orig 2001-12-19 22:43:44.000000000 +0900 +++ yatd/init.c -@@ -385,7 +385,7 @@ +@@ -5,7 +5,7 @@ + + #ifdef HAVE_MNTENT_H + #include +-#endif HAVE_MNTENT_H ++#endif + + /* #define DEBUG_LOCAL 1 */ + +@@ -385,7 +385,7 @@ int InitByYatsvrRc(fSys) #else "Invalid %s value : %d", #endif @@ -11,7 +20,7 @@ $NetBSD: patch-ax,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ } else SysData.sizLimitFree = sizLimit; -@@ -400,7 +400,7 @@ +@@ -400,7 +400,7 @@ int InitByYatsvrRc(fSys) #endif if ((nodLimit < MINLIMITNODFREE) || (MAXLIMITNODFREE < nodLimit)) { WARNING(ERRYS_DUMMY, 0, diff --git a/mail/yatsvrs/patches/patch-bk b/mail/yatsvrs/patches/patch-bk index f6f1221caf5..2d3638a9119 100644 --- a/mail/yatsvrs/patches/patch-bk +++ b/mail/yatsvrs/patches/patch-bk @@ -1,8 +1,8 @@ -$NetBSD: patch-bk,v 1.2 2001/12/21 03:55:13 taca Exp $ +$NetBSD: patch-bk,v 1.3 2003/10/05 04:25:15 taca Exp $ ---- yatd/v2conv.c.orig Wed Dec 19 22:56:15 2001 -+++ yatd/v2conv.c Fri Dec 21 00:39:21 2001 -@@ -148,7 +148,7 @@ +--- yatd/v2conv.c.orig 2001-12-19 22:56:15.000000000 +0900 ++++ yatd/v2conv.c +@@ -148,7 +148,7 @@ static void V2GetSummary(pFldrParent) } #ifdef DEBUG_LOCAL @@ -11,7 +11,25 @@ $NetBSD: patch-bk,v 1.2 2001/12/21 03:55:13 taca Exp $ V2Fldr.szName, V2Fldr.mtime, V2Fldr.nMail, V2Fldr.nMailUnseen); #endif -@@ -564,7 +564,7 @@ +@@ -389,7 +389,7 @@ int V2FldrScan() + } + else if (errno != ENOENT) + WARNING(errno, ERRFLG_SYSERR, +- "stat(%.256s) failed", szV2MboxFile, SYS_ERRMSG); ++ "stat(%.256s) failed/%s", szV2MboxFile, SYS_ERRMSG); + } + + LBL_SKIPUCBMBOX: +@@ -421,7 +421,7 @@ int V2FldrScan() + strcpy(pFileName, pDirect->d_name); + if (stat(szV2MboxFile, &statBuf) == -1) { + WARNING(errno, ERRFLG_SYSERR, +- "stat(%.256s) failed", szV2MboxFile, SYS_ERRMSG); ++ "stat(%.256s) failed/%s", szV2MboxFile, SYS_ERRMSG); + continue; + } + if ((statBuf.st_mode & S_IFMT) == S_IFREG) { +@@ -564,7 +564,7 @@ int FuncCnv2() if (Cnv2(SysData.argv[1])) return FAILURE; diff --git a/mail/yatsvrs/patches/patch-bm b/mail/yatsvrs/patches/patch-bm new file mode 100644 index 00000000000..02646fd5a79 --- /dev/null +++ b/mail/yatsvrs/patches/patch-bm @@ -0,0 +1,31 @@ +$NetBSD: patch-bm,v 1.1 2003/10/05 04:25:15 taca Exp $ + +--- yatd/xmit.c.orig 2001-06-22 16:49:59.000000000 +0900 ++++ yatd/xmit.c +@@ -43,7 +43,7 @@ int FuncXmit () + /* Receive the message */ + #ifdef DEBUG_LOCAL + LogDEBUG("Receiving mail message"); +-#endif DEBUG_LOCAL ++#endif + while (CatchPopLineWithSig(Buffer, MAXLINELEN, stdin) != NULL) { + if ((fputs(Buffer, fp) == EOF) || (fputs("\n", fp) == EOF)) { + if (SkipPopGabage(stdin)) { +@@ -70,7 +70,7 @@ int FuncXmit () + + #ifdef DEBUG_LOCAL + LogDEBUG("Forking for \"%.256s\"",MAIL_COMMAND); +-#endif DEBUG_LOCAL ++#endif + /* Send the message */ + switch (pid = fork()) { + case 0: +@@ -87,7 +87,7 @@ int FuncXmit () + #ifdef DEBUG_LOCAL + if (!SysData.fDebug) + unlink (szTmp); +-#endif DEBUG_LOCAL ++#endif + ErrSetData(errno, ERRFLG_SYSERR, "fork() failed"); + return FAILURE; + default: -- cgit v1.2.3