diff options
48 files changed, 0 insertions, 1562 deletions
diff --git a/mail/yatsvrs/DEINSTALL b/mail/yatsvrs/DEINSTALL deleted file mode 100644 index a7e9d0d4d0c..00000000000 --- a/mail/yatsvrs/DEINSTALL +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# $Id: DEINSTALL,v 1.3 2004/12/15 13:18:02 taca Exp $ - -YAT_CONF_DIR="@PKG_SYSCONFDIR@" -DEFAULT_ADMIN="@DEFAULT_ADMIN@" -MIN="@YATSVR_MINGID@" -MAX="@YATSVR_MAXGID@" - -case "$2" in -DEINSTALL) - - admin=`${CAT} ${YAT_CONF_DIR}/.admin` - if [ "$admin" = "${DEFAULT_ADMIN}" ]; then - ${RM} -f ${YAT_CONF_DIR}/.admin - fi - ${AWK} -F: '$1 !~ /^no/ { if ($3 < '$MIN' || $3 > '$MAX') print $1}' \ - /etc/group > /tmp/hidden-group - if ${CMP} -s ${YAT_CONF_DIR}/.hidden-group /tmp/hidden-group; then - ${RM} -f ${YAT_CONF_DIR}/.hidden-group - fi - ${RM} -f /tmp/hidden-group - ${RM} -f ${YAT_CONF_DIR}/*\~old - ;; -esac diff --git a/mail/yatsvrs/DESCR b/mail/yatsvrs/DESCR deleted file mode 100644 index 7932372dbd7..00000000000 --- a/mail/yatsvrs/DESCR +++ /dev/null @@ -1,12 +0,0 @@ -YAT is an extended POP3 server and supporting servers. -It contains the following programs. - - yatd YAT server; extended POP3 server - ascyd Apop shared Secret changer for Yatsvr - yatconfd YAT configuration daemon - -Yatd was based on Berkeley's popper program and previously known as -yatsvr. Yatd has its own extension to the POP3 protocol for -WinYAT, a commercial product from JEPRO Co., Ltd, but it still -works as standard POP3 server. The extension to POP3 is documented -in an attached Japanese document. diff --git a/mail/yatsvrs/INSTALL b/mail/yatsvrs/INSTALL deleted file mode 100644 index c5ae1d5b672..00000000000 --- a/mail/yatsvrs/INSTALL +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# $Id: INSTALL,v 1.4 2004/12/15 13:18:02 taca Exp $ - -YAT_CONF_DIR="@PKG_SYSCONFDIR@" -DEFAULT_ADMIN="@DEFAULT_ADMIN@" -MIN="@YATSVR_MINGID@" -MAX="@YATSVR_MAXGID@" - -case ${STAGE} in -POST-INSTALL) - if [ ! -f ${YAT_CONF_DIR}/.admin ]; then - echo ${DEFAULT_ADMIN} > ${YAT_CONF_DIR}/.admin - ${CHMOD} 0600 ${YAT_CONF_DIR}/.admin - fi - # hack for restrict groups - ${AWK} -F: '$1 !~ /^no/ { if ($3 < '$MIN' || $3 > '$MAX') print $1}' \ - /etc/group > ${YAT_CONF_DIR}/.hidden-group - ${CHMOD} 0600 ${YAT_CONF_DIR}/.hidden-group - ;; -esac diff --git a/mail/yatsvrs/MESSAGE b/mail/yatsvrs/MESSAGE deleted file mode 100644 index fe58349a395..00000000000 --- a/mail/yatsvrs/MESSAGE +++ /dev/null @@ -1,22 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/07/15 22:57:29 heinz Exp $ - -1. Add /etc/services those services. - -yatconf 54111/tcp -ascy 54106/tcp - - Since those port numbers are not official one, please choose - appropriate values for your environment. - -2. Please install inetd.conf(5)'s entry like bellow. - -pop3 stream tcp nowait root ${LOCALBASE}/libexec/yatd yatd -yatconf stream tcp nowait root ${LOCALBASE}/libexec/yatconfd yatconfd -ascy stream tcp nowait root ${LOCALBASE}/libexec/ascyd ascyd - - You should add appropriate options. - -3. Edit yatsvrrc and yatrc2 in ${PKG_SYSCONFDIR}. - -=========================================================================== diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile deleted file mode 100644 index 0875b86530a..00000000000 --- a/mail/yatsvrs/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# $NetBSD: Makefile,v 1.17 2008/05/30 02:32:47 taca Exp $ -# - -DISTNAME= yatsvrs-5.00p6 -PKGNAME= ${DISTNAME:S/p/./} -PKGREVISION= 4 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.back-street.net/pub/misc/ - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= # not available -COMMENT= Extended POP3 server and some supporting servers - -CONFLICTS= ascyd-* yatsvr4-* - -GNU_CONFIGURE= yes -DOCS= IMPORTANT README UPDATE doc/YATCONF doc/YATEXT4 -DOCDIR= ${PREFIX}/share/doc/yatsvr5 -EXAMPLES= yatrc2 yatsvrrc -EXAMPLESDIR= ${PREFIX}/share/examples/yatsvr5 - -CONFIGURE_ARGS+= --enable-popper-xmit -CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC:Q} -CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR:Q} -CONFIGURE_ARGS+= --enable-shadow-password - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_YATADMIN:Q} -FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID:Q} -FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID:Q} - -.for f in ${EXAMPLES} -CONF_FILES+= ${EXAMPLESDIR}/${f} ${PKG_SYSCONFDIR}/${f} -.endfor -OWN_DIRS+= ${PKG_SYSCONFDIR} - -.include "../../mk/bsd.prefs.mk" - -YATSVR_LOGFAC?= LOG_LOCAL4 -YATSVR_MINGID?= 1001 -YATSVR_MAXGID?= 64999 -DEFAULT_YATADMIN?= root -PKG_SYSCONFSUBDIR?= yatsvr5 -OLDCONFDIR?= ${PKG_SYSCONFBASE}/yat - -post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR} -.endfor - ${INSTALL_DATA_DIR} ${EXAMPLESDIR} -.for f in ${EXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/sample/${f} ${EXAMPLESDIR}/${f} -.endfor - -.include "../../mk/bsd.pkg.mk" diff --git a/mail/yatsvrs/PLIST b/mail/yatsvrs/PLIST deleted file mode 100644 index 0eb3ce347dd..00000000000 --- a/mail/yatsvrs/PLIST +++ /dev/null @@ -1,13 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2005/10/23 21:45:16 rillig Exp $ -libexec/ascyd -libexec/yatconfd -libexec/yatd -share/doc/yatsvr5/IMPORTANT -share/doc/yatsvr5/README -share/doc/yatsvr5/UPDATE -share/doc/yatsvr5/YATCONF -share/doc/yatsvr5/YATEXT4 -@dirrm share/doc/yatsvr5 -share/examples/yatsvr5/yatrc2 -share/examples/yatsvr5/yatsvrrc -@dirrm share/examples/yatsvr5 diff --git a/mail/yatsvrs/distinfo b/mail/yatsvrs/distinfo deleted file mode 100644 index 11a270f2c85..00000000000 --- a/mail/yatsvrs/distinfo +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: distinfo,v 1.12 2006/09/22 18:58:59 joerg Exp $ - -SHA1 (yatsvrs-5.00p6.tar.gz) = be94b29c8631acc1d7b3c4313501b6d674e6b43f -RMD160 (yatsvrs-5.00p6.tar.gz) = 9920ac63a2477100ddc54196c76d6d700b144642 -Size (yatsvrs-5.00p6.tar.gz) = 210067 bytes -SHA1 (patch-aa) = 33b8ed3f600c6d4ce4492b88d004fb1f954fdc24 -SHA1 (patch-ab) = e5db32324dc4d801f468db985ac99e687c41089d -SHA1 (patch-ac) = e34b2364f0039a135a7ebcd24c84b6d101581489 -SHA1 (patch-ad) = 392b8f6abd208c9387b2953792af2638aacbae23 -SHA1 (patch-ae) = 20f860d23b990eebe0c0e4a3f36ae658032a0c61 -SHA1 (patch-af) = e91f015118fb5ab95fccecf09205198894f89395 -SHA1 (patch-ag) = a0327cf05d1bf0142087af454d6a62f29a069eab -SHA1 (patch-ah) = cdd32e7a7474b94601c69c4ab6a304542af7da42 -SHA1 (patch-ai) = 43ec227de986c3f2170deceb24444974773bb3a3 -SHA1 (patch-aj) = fc13d80bc08a84d86e627adad167d96684151541 -SHA1 (patch-ak) = ec11aabeca579944e78053065759986cb96c1da2 -SHA1 (patch-al) = eed8524c6dfabdb03cabd556abfa38b4f16aecac -SHA1 (patch-am) = 4e6c7112fe380aafbe275c18dd85e794e058ec9b -SHA1 (patch-ao) = f697fe18121dcee1a279b5e4e8d318789cef8211 -SHA1 (patch-ap) = f42ade29527d1910f271c10797f6bd8d9f3710cc -SHA1 (patch-aq) = ea2d7d2f21ebe3aea163d6de0a95060be2ecc381 -SHA1 (patch-ar) = 8f26f7a180790070e1137c9840c1e0edcfc02a66 -SHA1 (patch-as) = 5156e666d446cecf582aab900f911e568f7e8d8a -SHA1 (patch-at) = 73704aa7d506c5a97f4fef3cc03e6ac8e983497e -SHA1 (patch-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658 -SHA1 (patch-av) = 4c87a76438f97fcafa29083c37d3a225bd219cc2 -SHA1 (patch-aw) = 31a7f22c6e78b87d7bec66d0dd77641884ffb107 -SHA1 (patch-ax) = 70ff600e44ae05e27b240fb285da7a848baa4543 -SHA1 (patch-ay) = 7af5466cf2f2630ab34b1638cf45fbf7247f731d -SHA1 (patch-az) = 29790a4630628b95900d260a30f1b2db21d54975 -SHA1 (patch-ba) = f309f85700bfdf487899aac178fb99e7173b6748 -SHA1 (patch-bb) = 97f52dc43b6ac426e26268d21e1133e6e7a7174f -SHA1 (patch-bc) = e98bfffaf407b909a197dd39763287bc8c548303 -SHA1 (patch-bd) = 69d9c81055c9d4abe54dba867e901172cd174179 -SHA1 (patch-be) = e2bd65bf1c4345e2a81749237d22104c99ce6a71 -SHA1 (patch-bf) = 5f45a4799834d49d52d5ffe781967e1ccc2d793b -SHA1 (patch-bg) = 3b75fc375e4bb4121292f562b609038bbf2276f8 -SHA1 (patch-bh) = a9160a6156c2e8ea783dc11bdb5df6663f274192 -SHA1 (patch-bi) = a17c470217673bb1f40e446a2867ced0a8c26cf3 -SHA1 (patch-bj) = 50728ec84bee5177f60695fe3cff4c595636b300 -SHA1 (patch-bk) = f3ae9b2bc8ef898e85739f8a2361752062c545f7 -SHA1 (patch-bl) = 37b01451503a5b8035ea872b349ef4dff89cccd4 -SHA1 (patch-bm) = e5d8e27c820e1d23254e3b8250def76045029b4d -SHA1 (patch-bn) = bef58405d86167fb566942cdef24182be67e46c8 -SHA1 (patch-bo) = 95b8c7de41628700bd52c6428e92d489087df8b1 -SHA1 (patch-bp) = ae6cf703bca51589fe15d11f3f8aac3c04454f34 diff --git a/mail/yatsvrs/patches/patch-aa b/mail/yatsvrs/patches/patch-aa deleted file mode 100644 index 27f3c0d9f93..00000000000 --- a/mail/yatsvrs/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2001/12/21 03:55:13 taca Exp $ - ---- Makefile.in.orig Thu Dec 20 21:31:50 2001 -+++ Makefile.in Fri Dec 21 00:34:46 2001 -@@ -68,7 +68,7 @@ - YAT5SYSDIR = @YAT5SYSDIR@ - YATSYSDIROLD = @YATSYSDIROLD@ - --SUBDIRS = common yatd yatconfd ascyd doc sample -+SUBDIRS = common yatd yatconfd ascyd doc - EXTRA_DIST = conf.h pkg_ver.h IMPORTANT INSTALL README UPDATE pkg_ver.h.in yatsvr5.00.spec.in yatsvr5.00.spec - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/mail/yatsvrs/patches/patch-ab b/mail/yatsvrs/patches/patch-ab deleted file mode 100644 index feb8e81d5ab..00000000000 --- a/mail/yatsvrs/patches/patch-ab +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2005/01/08 09:39:57 taca Exp $ - ---- ascyd/Makefile.in.orig 2001-12-20 21:31:52.000000000 +0900 -+++ ascyd/Makefile.in -@@ -68,7 +68,7 @@ VERSION = @VERSION@ - YAT5SYSDIR = @YAT5SYSDIR@ - YATSYSDIROLD = @YATSYSDIROLD@ - --AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror -+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" - - sbin_PROGRAMS = ascyd - ascyd_SOURCES = apop.c ascy.h entry.c error.c etc.c greeting.c init.c lock.c message.c msg2cmd.c newpass.c newsecret.c pass.c prototype.h quit.c sighand.c user.c ver.c version.h -@@ -125,18 +125,18 @@ maintainer-clean-sbinPROGRAMS: - - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - - .c.o: -@@ -263,7 +263,7 @@ all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs/patches/patch-ac b/mail/yatsvrs/patches/patch-ac deleted file mode 100644 index 360dcfff737..00000000000 --- a/mail/yatsvrs/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- ascyd/entry.c.orig Tue Jun 26 20:23:15 2001 -+++ ascyd/entry.c -@@ -188,7 +188,7 @@ - Msg2Cli(ASCY_SUCCESS, "%.512s @%.256s", - szGreeting , SysData.szMyHost); - #else -- Msg2Cli(ASCY_SUCCESS, "%.512s <%u.%u@%.256s>", -+ Msg2Cli(ASCY_SUCCESS, "%.512s <%u.%ld@%.256s>", - szGreeting, - SysData.pid, SysData.timeStart, SysData.szMyHost); - #endif diff --git a/mail/yatsvrs/patches/patch-ad b/mail/yatsvrs/patches/patch-ad deleted file mode 100644 index 878ea6e6ed5..00000000000 --- a/mail/yatsvrs/patches/patch-ad +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- ascyd/message.c.orig Mon Jun 25 14:57:45 2001 -+++ ascyd/message.c -@@ -9,13 +9,13 @@ - */ - int Msg2Cli( - #ifdef STDC_HEADERS -- int stat, CONST char * pFmt, ... -+ int status, CONST char * pFmt, ... - #else -- stat, pFmt, va_alist -+ status, pFmt, va_alist - #endif - ) - #ifndef STDC_HEADERS -- int stat; -+ int status; - CONST char * pFmt; - va_dcl - #endif -@@ -32,7 +32,7 @@ - if (feof(stdout) || ferror(stdout)) - SysData.Flags.errCliIO = 1; - -- sprintf(szMsg, "%d ", stat); -+ sprintf(szMsg, "%d ", status); - p = index(szMsg, '\0'); - *p++ = ' '; - *p = '\0'; -@@ -89,7 +89,7 @@ - else - LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg); - va_end(ap); -- return stat; -+ return status; - } - - /* diff --git a/mail/yatsvrs/patches/patch-ae b/mail/yatsvrs/patches/patch-ae deleted file mode 100644 index eb00bf5376c..00000000000 --- a/mail/yatsvrs/patches/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- ascyd/prototype.h.orig Fri Jun 22 21:16:55 2001 -+++ ascyd/prototype.h -@@ -32,12 +32,18 @@ - char *strlwr __P((char *)); - int atoi2 __P((char *)); - --void LogDEBUG __P((CONST char * pFmt, ...)); --void LogNOTICE __P((CONST char * pFmt, ...)); --int Msg2Cli __P((int stat, CONST char * pFmt, ...)); --void Str2Cli __P((CONST char * pFmt, ...)); --void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)); --void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)); -+void LogDEBUG __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void LogNOTICE __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+int Msg2Cli __P((int, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 2, 3))); -+void Str2Cli __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); -+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); - - /* etc.c */ - char * CatchLine __P((char *, int, FILE *)); diff --git a/mail/yatsvrs/patches/patch-af b/mail/yatsvrs/patches/patch-af deleted file mode 100644 index 8cf42f8da73..00000000000 --- a/mail/yatsvrs/patches/patch-af +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/10/05 04:25:15 taca Exp $ - ---- ascyd/sighand.c.orig 2001-06-25 16:28:21.000000000 +0900 -+++ ascyd/sighand.c -@@ -60,7 +60,6 @@ void SigUnblock() - void SigHandler(iSig) - int iSig; - { -- CONST char * pMsg; - int codeErr; - - /* -@@ -72,17 +71,14 @@ void SigHandler(iSig) - - switch (iSig) { - case SIGALRM: -- pMsg = NULL; - codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL); - break; -- case SIGHUP: -- case SIGTERM: - default: - codeErr = ERRYS_SIGNAL; -- pMsg = "#%d"; -+ WARNING(codeErr, 0, "#%d", iSig); - break; - } -- WARNING(codeErr, 0, pMsg, iSig); - - if (SysData.Flags.lock) - SessionUnlock(); -@@ -94,7 +90,7 @@ void SigHandler(iSig) - } - #endif - -- ErrSetData(codeErr, 0, pMsg, iSig); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs/patches/patch-ag b/mail/yatsvrs/patches/patch-ag deleted file mode 100644 index 92d3f3d2dfb..00000000000 --- a/mail/yatsvrs/patches/patch-ag +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2006/01/08 19:30:02 joerg Exp $ - ---- conf.h.orig 2001-07-09 09:19:03.000000000 +0000 -+++ conf.h -@@ -26,30 +26,33 @@ - - #if SIZEOF_OFF_T == SIZEOF_LONG_LONG - # define LONGLONG_OFF_T -+# define LONGLONG_CAST(c) (long long)(c) - # ifndef LONGLONG_OPTC --# if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) -+# if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - # define LONGLONG_OPTC "q" - # elif defined( __sun__ ) - # define LONGLONG_OPTC "ll" - # else --# define LONGLONG_OPTC "ul" -+# define LONGLONG_OPTC "lu" - # endif - # endif /* LONGLONG_OPTC */ - #elif SIZEOF_OFF_T == SIZEOF_LONG - # undef LONGLONG_OFF_T -+# define LONGLONG_CAST(c) (c) -+# define LONGLONG_OPTC /* */ - #else - # error - #endif /* SIZEOF_OFF_T == SIZEOF_LONG_LONG */ - - /* symbol BSD44 */ --#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #define BSD44 - #else - #undef BSD44 - #endif - - /* symbol Ignore Mnt Quota */ --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #define IGNORE_MNT_QUOTA - #else - #undef IGNORE_MNT_QUOTA -@@ -522,7 +525,7 @@ - - #ifndef HAVE_MEMMOVE - #include "common/memmove.h" --#endif HAVE_MEMMOVE -+#endif /* HAVE_MEMMOVE */ - - #ifdef LOGWTMP - #include <utmp.h> diff --git a/mail/yatsvrs/patches/patch-ah b/mail/yatsvrs/patches/patch-ah deleted file mode 100644 index 50116cdf792..00000000000 --- a/mail/yatsvrs/patches/patch-ah +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- sample/yatrc2.orig Wed Jul 4 12:34:11 2001 -+++ sample/yatrc2 -@@ -27,18 +27,18 @@ - - # Default Kanji code - [KANJI] -- files: JIS, JIS, ^[$B, ^[(J -+ files: JIS, JIS, ^[$B, ^[(B - - # Common aliases - [ALIAS] -- $B%a!<%k4IM}<T(B: postmaster@your.domain.jp -- $B%K%e!<%94IM}<T(B: news@your.domain.jp -- $B%7%9%F%`4IM}<T(B: root@your.domain.jp -- Web$B4IM}<T(B: webmaster@your.domain.jp -+# $B%a!<%k4IM}<T(B: postmaster@your.domain.jp -+# $B%K%e!<%94IM}<T(B: news@your.domain.jp -+# $B%7%9%F%`4IM}<T(B: root@your.domain.jp -+# Web$B4IM}<T(B: webmaster@your.domain.jp - - # Common alias group - [ALIASGRP] -- $B4IM}?M(B: $B%a!<%k4IM}<T(B $B%K%e!<%94IM}<T(B $B%7%9%F%`4IM}<T(B -+# $B4IM}?M(B: $B%a!<%k4IM}<T(B $B%K%e!<%94IM}<T(B $B%7%9%F%`4IM}<T(B - - # customization - [CUSTOM] diff --git a/mail/yatsvrs/patches/patch-ai b/mail/yatsvrs/patches/patch-ai deleted file mode 100644 index d9b67e5b750..00000000000 --- a/mail/yatsvrs/patches/patch-ai +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2005/01/08 09:39:57 taca Exp $ - ---- yatconfd/Makefile.in.orig 2001-12-20 21:31:51.000000000 +0900 -+++ yatconfd/Makefile.in -@@ -68,7 +68,7 @@ VERSION = @VERSION@ - YAT5SYSDIR = @YAT5SYSDIR@ - YATSYSDIROLD = @YATSYSDIROLD@ - --AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes -+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" - - - sbin_PROGRAMS = yatconfd -@@ -127,18 +127,18 @@ maintainer-clean-sbinPROGRAMS: - - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - - .c.o: -@@ -268,7 +268,7 @@ all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs/patches/patch-aj b/mail/yatsvrs/patches/patch-aj deleted file mode 100644 index 099540c643f..00000000000 --- a/mail/yatsvrs/patches/patch-aj +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatconfd/message.c.orig Mon Jun 25 17:45:45 2001 -+++ yatconfd/message.c -@@ -9,13 +9,13 @@ - */ - int Msg2Cli( - #ifdef STDC_HEADERS -- int stat, CONST char * pFmt, ... -+ int status, CONST char * pFmt, ... - #else -- stat, pFmt, va_alist -+ status, pFmt, va_alist - #endif - ) - #ifndef STDC_HEADERS -- int stat; -+ int status; - CONST char * pFmt; - va_dcl - #endif -@@ -32,7 +32,7 @@ - if (feof(stdout) || ferror(stdout)) - SysData.Flags.errCliIO = 1; - -- strcpy(szMsg, stat==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE); -+ strcpy(szMsg, status==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE); - p = strchr(szMsg, '\0'); - *p++ = ' '; - *p = '\0'; -@@ -89,7 +89,7 @@ - else - LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg); - va_end(ap); -- return stat; -+ return status; - } - - /* diff --git a/mail/yatsvrs/patches/patch-ak b/mail/yatsvrs/patches/patch-ak deleted file mode 100644 index 8484881f038..00000000000 --- a/mail/yatsvrs/patches/patch-ak +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatconfd/yatconf.h.orig Mon Jul 9 09:43:11 2001 -+++ yatconfd/yatconf.h -@@ -279,12 +279,18 @@ - char * strlwr __P((char *)); - int atoi2 __P((char *)); - --void LogDEBUG __P((CONST char * pFmt, ...)); --void LogNOTICE __P((CONST char * pFmt, ...)); --int Msg2Cli __P((int stat, CONST char * pFmt, ...)); --void Str2Cli __P((CONST char * pFmt, ...)); --void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)); --void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)); -+void LogDEBUG __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void LogNOTICE __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+int Msg2Cli __P((int, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 2, 3))); -+void Str2Cli __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); -+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); - - /* etc.c */ - char * CatchLine __P((char *, int, FILE *)); diff --git a/mail/yatsvrs/patches/patch-al b/mail/yatsvrs/patches/patch-al deleted file mode 100644 index 7622367cf75..00000000000 --- a/mail/yatsvrs/patches/patch-al +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-al,v 1.2 2003/10/05 04:25:15 taca Exp $ - ---- yatconfd/yatconfd.c.orig 2001-06-26 20:25:22.000000000 +0900 -+++ yatconfd/yatconfd.c -@@ -259,7 +259,7 @@ int main (argc, argv) - Msg2Cli(SUCCESS, "%.512s @%.256s", - szGreeting , SysData.szMyHost); - #else -- Msg2Cli(SUCCESS, "%.512s <%u.%u@%.256s>", -+ Msg2Cli(SUCCESS, "%.512s <%u.%ld@%.256s>", - szGreeting, - SysData.pid, SysData.timeStart, SysData.szMyHost); - #endif -@@ -360,32 +360,26 @@ int main (argc, argv) - static void SigHandler(iSig) - int iSig; - { -- CONST char * pMsg; - int codeErr; - -- /* POSIX シグナルでは,シグナルハンドラが呼び出されている間はシグナ -- ルは呼ばれない */ -- /* -- static int fSigHandled = 0; -- if (fSigHandled) -+#if 0 -+ static int fSigHandled = 0; -+ if (fSigHandled) - return ; -- fSigHandled = 1; -- SigBlock(); -- */ -+ fSigHandled = 1; -+ SigBlock(); -+#endif - - switch (iSig) { - case SIGALRM: -- pMsg = NULL; - codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL); - break; -- case SIGHUP: -- case SIGTERM: - default: - codeErr = ERRYS_SIGNAL; -- pMsg = "#%d"; -+ WARNING(codeErr, 0, "#%d", iSig); - break; - } -- WARNING(codeErr, 0, pMsg, iSig); - - UnLockAll(); - -@@ -396,7 +390,7 @@ static void SigHandler(iSig) - } - #endif - -- ErrSetData(codeErr, 0, pMsg, iSig); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs/patches/patch-am b/mail/yatsvrs/patches/patch-am deleted file mode 100644 index 8f6e681514f..00000000000 --- a/mail/yatsvrs/patches/patch-am +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-am,v 1.4 2006/02/24 19:12:18 joerg Exp $ - ---- config.h.in.orig 2006-02-24 18:59:41.000000000 +0000 -+++ config.h.in -@@ -99,8 +99,10 @@ - /* Define if you have the statfs function. */ - #undef HAVE_STATFS - -+#if !defined(__DragonFly__) - /* Define if you have the statvfs function. */ - #undef HAVE_STATVFS -+#endif - - /* Define if you have the strcasecmp function. */ - #undef HAVE_STRCASECMP -@@ -186,8 +188,10 @@ - /* Define if you have the <sys/quota.h> header file. */ - #undef HAVE_SYS_QUOTA_H - -+#if !defined(__DragonFly__) - /* Define if you have the <sys/statvfs.h> header file. */ - #undef HAVE_SYS_STATVFS_H -+#endif - - /* Define if you have the <sys/time.h> header file. */ - #undef HAVE_SYS_TIME_H diff --git a/mail/yatsvrs/patches/patch-ao b/mail/yatsvrs/patches/patch-ao deleted file mode 100644 index ade4d8a78f2..00000000000 --- a/mail/yatsvrs/patches/patch-ao +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatconfd/yc_grplst.c.orig Fri Jun 8 17:56:12 2001 -+++ yatconfd/yc_grplst.c -@@ -12,7 +12,7 @@ - char *p, *p2; - int i; - -- LogDEBUG("SetMembers(%x\t%.256s)", pEntry, pszData); -+ LogDEBUG("SetMembers(%p\t%.256s)", pEntry, pszData); - if ((p = strdup(pszData)) == NULL) { - ErrSetData(ENOMEM, ERRFLG_SYSERR, NULL); - WARNING(ENOMEM, ERRFLG_SYSERR, NULL); -@@ -47,7 +47,7 @@ - pEntry->member[i] = NULL; - break; - } -- LogDEBUG("End of SetMembers(%x\t%.256s)", pEntry, pszData); -+ LogDEBUG("End of SetMembers(%p\t%.256s)", pEntry, pszData); - return pEntry->buffer; - } - -@@ -56,7 +56,7 @@ - struct yc_admin *pEntry; - static struct yc_admin **ppEntry, *pLast; - -- LogDEBUG("AddEntry(%x, %.1000s)", ppEntry1st, pszData); -+ LogDEBUG("AddEntry(%p, %.1000s)", ppEntry1st, pszData); - if (ppEntry1st != NULL) { - ppEntry = ppEntry1st; - diff --git a/mail/yatsvrs/patches/patch-ap b/mail/yatsvrs/patches/patch-ap deleted file mode 100644 index e80ea9ffccb..00000000000 --- a/mail/yatsvrs/patches/patch-ap +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatconfd/yc_user.c.orig Mon Jun 4 15:43:51 2001 -+++ yatconfd/yc_user.c -@@ -84,8 +84,6 @@ - return ENOMEM; - } - --static CONST char *pszFmt; -- - static int _FuncUser() - { - if (CheckArgc(2, 2)) -@@ -105,8 +103,6 @@ - ErrSetData(ENOMEM, ERRFLG_FATAL | ERRFLG_SYSERR, NULL); - return FAILURE; - } -- -- Msg2Cli(SUCCESS, pszFmt, SysData.szUser); - return SUCCESS; - } - -@@ -115,6 +111,10 @@ - */ - int FuncUser() - { -- pszFmt = "'%.256s' is welcome here."; -- return _FuncUser(); -+ int status; -+ -+ status = _FuncUser(); -+ if (status == SUCCESS) -+ Msg2Cli(SUCCESS, "'%.256s' is welcome here.", SysData.szUser); -+ return status; - } diff --git a/mail/yatsvrs/patches/patch-aq b/mail/yatsvrs/patches/patch-aq deleted file mode 100644 index 54a3413da0e..00000000000 --- a/mail/yatsvrs/patches/patch-aq +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2005/01/08 09:39:57 taca Exp $ - ---- yatd/Makefile.in.orig 2001-12-20 21:31:51.000000000 +0900 -+++ yatd/Makefile.in -@@ -68,7 +68,7 @@ VERSION = @VERSION@ - YAT5SYSDIR = @YAT5SYSDIR@ - YATSYSDIROLD = @YATSYSDIROLD@ - --AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" -Wall -Wstrict-prototypes # -Werror -+AM_CPPFLAGS = -I../common -DYATSYSDIROLD=\"@YATSYSDIROLD@\" -DYAT5SYSDIR=\"$(YAT5SYSDIR)\" - - - sbin_PROGRAMS = yatd -@@ -132,18 +132,18 @@ maintainer-clean-sbinPROGRAMS: - - install-sbinPROGRAMS: $(sbin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - - uninstall-sbinPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(sbin_PROGRAMS)'; for p in $$list; do \ -- rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - - .c.o: -@@ -371,7 +371,7 @@ all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs/patches/patch-ar b/mail/yatsvrs/patches/patch-ar deleted file mode 100644 index 8629649a7b9..00000000000 --- a/mail/yatsvrs/patches/patch-ar +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/apop.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/apop.c -@@ -43,7 +43,7 @@ - char szApopFile[MAXPATHLEN], szBuf[MAXLINELEN]; - FILE *fp; - char *p; -- int nLen; -+ size_t nLen; - - sprintf(szApopFile, "%.512s/%.64s", - SysData.pUserHomeDir, YATAPOPFILE); -@@ -56,7 +56,7 @@ - GOTO LBL_ERROR; - if ((p = strchr(szBuf, '\n')) != NULL) - *p = '\0'; -- Base64DecodeLine(pszSecret, (size_t *)&nLen, szBuf); -+ Base64DecodeLine(pszSecret, &nLen, szBuf); - - fclose(fp); - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-as b/mail/yatsvrs/patches/patch-as deleted file mode 100644 index 95a94e81f4c..00000000000 --- a/mail/yatsvrs/patches/patch-as +++ /dev/null @@ -1,138 +0,0 @@ -$NetBSD: patch-as,v 1.5 2006/09/22 18:58:59 joerg Exp $ - ---- yatd/dfree.c.orig 2001-07-09 03:32:52.000000000 +0000 -+++ yatd/dfree.c -@@ -39,6 +39,13 @@ typedef u_long quota_size_t; - # include <sys/quota.h> - #endif /* HAVE_SYS_QUOTA_H */ - -+#ifdef __DragonFly__ -+#include <sys/param.h> -+#if __DragonFly_version >= 160000 -+#define dqblk ufs_dqblk -+#endif -+#endif -+ - static int - quotactl_wrapper __P((const char *pPath, struct dqblk *quota_block)); - static int -@@ -72,12 +79,6 @@ quota_get_inode_current __P(( struct dqb - - #define DEBUG_LOCAL - --#ifndef LONGLONG_OPTC --/* LONGLONG_OPTCが定義されていない場合には 空白を定義して, -- リテラルの糊として使う */ --#define LONGLONG_OPTC /* */ --#endif -- - int DFreeCheck(pPath, pSizFree, pNodFree) - char * pPath; /* ユーザーのホームディレクトリの位置 */ - OFF_T * pSizFree; /* 空きブロック数 */ -@@ -99,7 +100,7 @@ int DFreeCheck(pPath, pSizFree, pNodFree - nodLimit = *pNodFree; /* リミットのノード数を指定する */ - - #ifdef DEBUG_LOCAL -- LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%d, sizof(OFF_T):%d", -+ LogDEBUG("sizLimit:%" LONGLONG_OPTC "d, nodLimit:%ld, sizof(OFF_T):%d", - sizLimit, nodLimit, sizeof (OFF_T)); - #endif /* DEBUG_LOCAL */ - -@@ -122,23 +123,30 @@ int DFreeCheck(pPath, pSizFree, pNodFree - #ifdef DEBUG_LOCAL - # ifdef BSD44 - LogDEBUG("statfs() returns:"); -+# ifdef HAVE_STATVFS -+ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flag); -+# else - LogDEBUG(" type: %d", statfsBuf.f_type); -- LogDEBUG(" flags: 0x%x", statfsBuf.f_flags); --# ifdef __NetBSD__ -+ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flags); -+# ifdef __NetBSD__ - LogDEBUG(" oflags: 0x%x", statfsBuf.f_oflags); --# endif -+# endif /* __NetBSD__ */ -+# endif /* HAVE_STATVFS */ - # ifdef BSDOS1 - LogDEBUG(" fsize: %d", statfsBuf.f_fsize); - # endif -- LogDEBUG(" bsize: %d", statfsBuf.f_bsize); -- LogDEBUG(" iosize: %d", statfsBuf.f_iosize); -- LogDEBUG(" blocks: %d", statfsBuf.f_blocks); -- LogDEBUG(" bfree: %d", statfsBuf.f_bfree); -- LogDEBUG(" bavail: %d", statfsBuf.f_bavail); -- LogDEBUG(" files: %d", statfsBuf.f_files); -- LogDEBUG(" ffree: %d", statfsBuf.f_ffree); -- LogDEBUG(" fsid: %d", statfsBuf.f_fsid); -- LogDEBUG(" owner %d", statfsBuf.f_owner); -+ LogDEBUG(" bsize: %ld", statfsBuf.f_bsize); -+ LogDEBUG(" iosize: %ld", statfsBuf.f_iosize); -+ LogDEBUG(" blocks: %ld", statfsBuf.f_blocks); -+ LogDEBUG(" bfree: %ld", statfsBuf.f_bfree); -+ LogDEBUG(" bavail: %ld", statfsBuf.f_bavail); -+ LogDEBUG(" files: %ld", statfsBuf.f_files); -+ LogDEBUG(" ffree: %ld", statfsBuf.f_ffree); -+# ifdef HAVE_STATVFS -+ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsidx.__fsid_val[0], statfsBuf.f_fsidx.__fsid_val[1]); -+# else -+ LogDEBUG(" fsid: %d-%d", statfsBuf.f_fsid.val[0], statfsBuf.f_fsid.val[1]); -+# endif /* HAVE_STATVFS */ - #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME - LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); - #endif -@@ -311,7 +319,7 @@ int FuncDFree() - nodFree = SysData.nodLimitFree; - - #ifdef DEBUG_LOCAL -- LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%d", -+ LogDEBUG("FuncDFree(): sizFree:%" LONGLONG_OPTC "d, nodFree:%ld", - sizFree, nodFree); - #endif - -@@ -325,7 +333,7 @@ int FuncDFree() - if (DFreeCheck(SysData.szUserFldrDir, &sizFree, &nodFree)){ - return FAILURE; - } -- Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %d", sizFree, nodFree); -+ Msg2Cli(SUCCESS, "%" LONGLONG_OPTC "d %ld", sizFree, nodFree); - #endif /* DONT_CHECKDFREE */ - return SUCCESS; - } -@@ -427,7 +435,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 +457,12 @@ static int quotactl_wrapper(pPath,quota_ - switch( status ){ - case SUCCESS: - LogDEBUG("quotactl() returns:"); -- LogDEBUG(" bhardlimit: %d",quota_get_block_hard_limit(quota_block)); -- LogDEBUG(" bsoftlimit: %d",quota_get_block_soft_limit(quota_block)); -- LogDEBUG(" curblocks : %d",quota_get_block_current(quota_block)); -- LogDEBUG(" ihardlimit: %d",quota_get_inode_hard_limit(quota_block)); -- LogDEBUG(" isoftlimit: %d",quota_get_inode_soft_limit(quota_block)); -- LogDEBUG(" curinodes : %d", quota_get_inode_current(quota_block)); -+ LogDEBUG(" bhardlimit: %ld",quota_get_block_hard_limit(quota_block)); -+ LogDEBUG(" bsoftlimit: %ld",quota_get_block_soft_limit(quota_block)); -+ LogDEBUG(" curblocks : %ld",quota_get_block_current(quota_block)); -+ LogDEBUG(" ihardlimit: %ld",quota_get_inode_hard_limit(quota_block)); -+ LogDEBUG(" isoftlimit: %ld",quota_get_inode_soft_limit(quota_block)); -+ LogDEBUG(" curinodes : %ld", quota_get_inode_current(quota_block)); - return SUCCESS; - case FAILURE: - return FAILURE; -@@ -494,7 +502,7 @@ static int quotactl_systemcall_support( - status = quotactl(QCMD(Q_GETQUOTA, USRQUOTA),SysData.szMntFrom, - SysData.pPwd->pw_uid, (caddr_t)quota_block); - --#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) -+#elif defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - - /* Get disk quota limits and current usage for the user or group - (as determined by the command type) with identifier id. addr diff --git a/mail/yatsvrs/patches/patch-at b/mail/yatsvrs/patches/patch-at deleted file mode 100644 index ef4c0d823ad..00000000000 --- a/mail/yatsvrs/patches/patch-at +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-at,v 1.3 2004/12/15 13:18:02 taca Exp $ - ---- yatd/entry.c.orig 2001-07-09 12:32:52.000000000 +0900 -+++ yatd/entry.c -@@ -106,6 +106,7 @@ struct SYS_DAT SysData = { - - { 0, 0 }, /* flags */ - -+ 0, /* allow_xtnd */ - }; - - /* Autherization-User state commands */ -@@ -338,7 +339,7 @@ int CheckArgs(argc, argv) - LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7, - }; - -- while ((c = getopt(argc, argv, "d01234567s:")) != EOF) { -+ while ((c = getopt(argc, argv, "d01234567s:x")) != EOF) { - switch (c) { - case 'd': /* DEBUG option */ - SysData.fDebug = 1; -@@ -346,6 +347,9 @@ int CheckArgs(argc, argv) - case 's': /* System Directory */ - strcpy(SysData.szSysDir, optarg); - break; -+ case 'x': -+ SysData.allow_xtnd = 1; -+ break; - default: - if ((c < '0') || ('7' < c)) { - fprintf(stderr, "Usage: %.256s [-d]\n", argv[0]); -@@ -431,7 +435,7 @@ int main (argc, argv) - Msg2Cli(SUCCESS, "%.512s @%.256s", - szGreeting , SysData.szMyHost); - #else -- Msg2Cli(SUCCESS, "%.512s <%u.%u@%.256s>", -+ Msg2Cli(SUCCESS, "%.512s <%u.%ld@%.256s>", - szGreeting, - SysData.pid, SysData.timeStart, SysData.szMyHost); - #endif -@@ -560,34 +564,30 @@ int main (argc, argv) - #ifdef HAVE_SIGACTION - - static void signal_handler(int signum){ -- CONST char * pMsg; - int codeErr; - - /* sigaction - handler is not re-entrant */ - -- /* -+#if 0 - static int fSigHandled = 0; - if (fSigHandled){ - return ; - } - fSigHandled = 1; - SigBlock(); -- */ -+#endif - -- pMsg = NULL; - syslog( LOG_DEBUG , "signal_handler call "); - switch (signum) { - case SIGALRM: - codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL); - break; -- case SIGHUP: -- case SIGTERM: - default: - codeErr = ERRYS_SIGNAL; -- pMsg = "#%d"; -+ WARNING(codeErr, 0, "#%d", signum); - break; - } -- WARNING(codeErr, 0, pMsg, signum); - - if (SysData.Flags.pidFile) - DelPidFile(1); -@@ -602,7 +602,7 @@ static void signal_handler(int signum){ - } - #endif - -- ErrSetData(codeErr, 0, pMsg, signum); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, signum); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs/patches/patch-au b/mail/yatsvrs/patches/patch-au deleted file mode 100644 index 73f16575e29..00000000000 --- a/mail/yatsvrs/patches/patch-au +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/env.c.orig Tue Jun 5 17:35:24 2001 -+++ yatd/env.c -@@ -277,7 +277,7 @@ - if (SysData.argc > 1) { - if (strcasecmp(SysData.argv[1], YATENV_NOW) == 0) { - timeNow = time(NULL); -- Msg2Cli(SUCCESS, "%.256s %d", SysData.argv[1], timeNow); -+ Msg2Cli(SUCCESS, "%.256s %ld", SysData.argv[1], timeNow); - } - else if ((pEnv = GetYatEnv(pFldr, SysData.argv[1])) && pEnv->pszValue) - Msg2Cli(SUCCESS, "%.256s %.256s", pEnv->pszName, pEnv->pszValue); -@@ -291,7 +291,7 @@ - Str2Cli("%.256s %.256s", pEnv->pszName, pEnv->pszValue); - } - timeNow = time(NULL); -- Str2Cli("%.256s %d", YATENV_NOW, timeNow); -+ Str2Cli("%.256s %ld", YATENV_NOW, timeNow); - EOM2Cli(); - } - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-av b/mail/yatsvrs/patches/patch-av deleted file mode 100644 index 0150ebbf33f..00000000000 --- a/mail/yatsvrs/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.2 2001/12/21 03:55:13 taca Exp $ - ---- yatd/fldr_etc.c.orig Wed Dec 19 23:08:04 2001 -+++ yatd/fldr_etc.c Fri Dec 21 00:36:45 2001 -@@ -275,7 +275,7 @@ - } - - #ifdef DEBUG_LOCAL -- LogDEBUG("<<<Summary: %.256s %u %u %u", -+ LogDEBUG("<<<Summary: %.256s %ld %d %d", - FldrSummary.szName, FldrSummary.mtime, - FldrSummary.nMail, FldrSummary.nMailUnseen); - #endif diff --git a/mail/yatsvrs/patches/patch-aw b/mail/yatsvrs/patches/patch-aw deleted file mode 100644 index d8a2b758938..00000000000 --- a/mail/yatsvrs/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/inc.c.orig Fri Jun 22 12:05:02 2001 -+++ yatd/inc.c -@@ -650,7 +650,7 @@ - GOTO LBL_ERROR; - } - -- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).", -+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).", - SysData.pFldrCur->nMailAvail, - SysData.pFldrCur->sizMailsAvail); - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-ax b/mail/yatsvrs/patches/patch-ax deleted file mode 100644 index 49fca2647fd..00000000000 --- a/mail/yatsvrs/patches/patch-ax +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2003/10/05 04:25:15 taca Exp $ - ---- yatd/init.c.orig 2001-12-19 22:43:44.000000000 +0900 -+++ yatd/init.c -@@ -5,7 +5,7 @@ - - #ifdef HAVE_MNTENT_H - #include <mntent.h> --#endif HAVE_MNTENT_H -+#endif - - /* #define DEBUG_LOCAL 1 */ - -@@ -385,7 +385,7 @@ int InitByYatsvrRc(fSys) - #else - "Invalid %s value : %d", - #endif -- YSCONF_DFLIMITSIZ, sizLimit); -+ YSCONF_DFLIMITSIZ, LONGLONG_CAST(sizLimit)); - } - else - SysData.sizLimitFree = sizLimit; -@@ -400,7 +400,7 @@ int InitByYatsvrRc(fSys) - #endif - if ((nodLimit < MINLIMITNODFREE) || (MAXLIMITNODFREE < nodLimit)) { - WARNING(ERRYS_DUMMY, 0, -- "Invalid %s value : %d", YSCONF_DFLIMITNOD, nodLimit); -+ "Invalid %s value : %ld", YSCONF_DFLIMITNOD, nodLimit); - } - else - SysData.nodLimitFree = nodLimit; diff --git a/mail/yatsvrs/patches/patch-ay b/mail/yatsvrs/patches/patch-ay deleted file mode 100644 index 8a90a91c874..00000000000 --- a/mail/yatsvrs/patches/patch-ay +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/list.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/list.c -@@ -36,12 +36,12 @@ - #else - "%u %u", - #endif -- i, pMail->lLength); -+ i, LONGLONG_CAST(pMail->lLength)); - return SUCCESS; - } - - /* begin of scan list */ -- Msg2Cli(SUCCESS, "%u messages (%u octets)", -+ Msg2Cli(SUCCESS, "%u messages (%lu octets)", - pFldr->nMailAvail, pFldr->sizMailsAvail); - - for (i = 0; i < pFldr->nMail; i++) { -@@ -56,7 +56,7 @@ - #else - "%u %u", - #endif -- i+1, pMail->lLength); -+ i+1, LONGLONG_CAST(pMail->lLength)); - } - - EOM2Cli(); -@@ -93,12 +93,12 @@ - #else - "%u %u %s", - #endif -- i, pMail->lLength, MarkMkStr(szMark, pMail)); -+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail)); - return SUCCESS; - } - - /* begin of scan list */ -- Msg2Cli(SUCCESS, "%u messages (%u octets)", -+ Msg2Cli(SUCCESS, "%u messages (%ld octets)", - pFldr->nMailAvail, pFldr->sizMailsAvail); - - for (i = 0; i < pFldr->nMail; i++) { -@@ -113,7 +113,7 @@ - #else - "%u %lu %s", - #endif -- i+1, pMail->lLength, MarkMkStr(szMark, pMail)); -+ i+1, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail)); - } - - EOM2Cli(); -@@ -144,7 +144,7 @@ - iStart = 0; - - /* begin of scan list */ -- Msg2Cli(SUCCESS, "%u messages (%u octets)", -+ Msg2Cli(SUCCESS, "%u messages (%ld octets)", - pFldr->nMailAvail, pFldr->sizMailsAvail); - - for (i = iStart; i <= iEnd; i++) { -@@ -159,8 +159,8 @@ - #else - "%u %s %lu %s", - #endif -- i+1, MakeUniqID(szID, pFldr, pMail->id), pMail->lLength, -- MarkMkStr(szMark, pMail)); -+ i+1, MakeUniqID(szID, pFldr, pMail->id), -+ LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail)); - } - - EOM2Cli(); diff --git a/mail/yatsvrs/patches/patch-az b/mail/yatsvrs/patches/patch-az deleted file mode 100644 index 4f9357b0857..00000000000 --- a/mail/yatsvrs/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/mark.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/mark.c -@@ -81,7 +81,7 @@ - #else - "%u %u %s", - #endif -- i, pMail->lLength, MarkMkStr(szMark, pMail)); -+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail)); - - return SUCCESS; - } -@@ -140,7 +140,7 @@ - #else - "%u %u %s", - #endif -- i, pMail->lLength, MarkMkStr(szMark, pMail)); -+ i, LONGLONG_CAST(pMail->lLength), MarkMkStr(szMark, pMail)); - - return SUCCESS; - } diff --git a/mail/yatsvrs/patches/patch-ba b/mail/yatsvrs/patches/patch-ba deleted file mode 100644 index 28a8fec2370..00000000000 --- a/mail/yatsvrs/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/mbchg.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/mbchg.c -@@ -41,7 +41,7 @@ - return FAILURE; - } - -- Msg2Cli(SUCCESS, "%d message(s) (%d octets).", -+ Msg2Cli(SUCCESS, "%d message(s) (%ld octets).", - pFldr->nMailAvail, - pFldr->sizMailsAvail); - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-bb b/mail/yatsvrs/patches/patch-bb deleted file mode 100644 index a2c34da6cb5..00000000000 --- a/mail/yatsvrs/patches/patch-bb +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/message.c.orig Fri Jun 8 16:29:24 2001 -+++ yatd/message.c -@@ -9,10 +9,10 @@ - */ - - #ifdef STDC_HEADERS --int Msg2Cli(int stat, CONST char * pFmt, ...) -+int Msg2Cli(int status, CONST char * pFmt, ...) - #else --int Msg2Cli(stat, pFmt, va_alist) -- int stat; -+int Msg2Cli(status, pFmt, va_alist) -+ int status; - CONST char * pFmt; - va_dcl - #endif -@@ -33,7 +33,7 @@ - if (feof(stdout) || ferror(stdout)) - SysData.Flags.errCliIO = 1; - -- strcpy(szMsg, stat==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE); -+ strcpy(szMsg, status==SUCCESS ? ANS_POSITIVE : ANS_NEGATIVE); - p = index(szMsg, '\0'); - *p++ = ' '; - *p = '\0'; -@@ -89,7 +89,7 @@ - else - LogNOTICE("<<<NO CONNECTION>>> %.512s", szMsg); - va_end(ap); -- return stat; -+ return status; - } - - /* diff --git a/mail/yatsvrs/patches/patch-bc b/mail/yatsvrs/patches/patch-bc deleted file mode 100644 index 32c0631a782..00000000000 --- a/mail/yatsvrs/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/pass.c.orig Wed Jun 27 20:58:17 2001 -+++ yatd/pass.c -@@ -187,7 +187,7 @@ - } - } - -- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).", -+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).", - pFldr->nMailAvail, pFldr->sizMailsAvail); - - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-bd b/mail/yatsvrs/patches/patch-bd deleted file mode 100644 index 115212cd1c8..00000000000 --- a/mail/yatsvrs/patches/patch-bd +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-bd,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/prototype.h.orig Mon Jul 2 12:51:50 2001 -+++ yatd/prototype.h -@@ -22,12 +22,18 @@ - #endif - char * strlwr __P((char *)); - --void LogDEBUG __P((CONST char * pFmt, ...)); --void LogNOTICE __P((CONST char * pFmt, ...)); --int Msg2Cli __P((int stat, CONST char * pFmt, ...)); --void Str2Cli __P((CONST char * pFmt, ...)); --void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)); --void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)); -+void LogDEBUG __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void LogNOTICE __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+int Msg2Cli __P((int, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 2, 3))); -+void Str2Cli __P((CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 1, 2))); -+void ErrSetData __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); -+void WARNING __P((int codeErr, int Flags, CONST char * pFmt, ...)) -+ __attribute__((__format__(__printf__, 3, 4))); - - /* etc.c */ - char * CatchLine __P((char *, int, FILE *)); diff --git a/mail/yatsvrs/patches/patch-be b/mail/yatsvrs/patches/patch-be deleted file mode 100644 index 1afdd042e40..00000000000 --- a/mail/yatsvrs/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/rset.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/rset.c -@@ -121,7 +121,7 @@ - pFldr->iMailLast = pFldr->iMailLast0; - FldrMarkUpdate(pFldr); - -- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).", -+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).", - pFldr->nMailAvail, - pFldr->sizMailsAvail); - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-bf b/mail/yatsvrs/patches/patch-bf deleted file mode 100644 index 58a134074ad..00000000000 --- a/mail/yatsvrs/patches/patch-bf +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bf,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/store.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/store.c -@@ -168,7 +168,13 @@ - Msg2Cli(SUCCESS, "Please send message to store."); - if (net2Fldr(pFldr, stdin, 0)) - return FAILURE; -- Msg2Cli(SUCCESS, "%d %d", -- pFldr->nMail, (pFldr->pArryMail[pFldr->nMail-1])->lLength); -+ Msg2Cli(SUCCESS, -+#ifdef LONGLONG_OFF_T -+ "%d %" LONGLONG_OPTC "u", -+#else -+ "%d %u", -+#endif -+ pFldr->nMail, -+ LONGLONG_CAST(((pFldr->pArryMail[pFldr->nMail-1])->lLength))); - return SUCCESS; - } diff --git a/mail/yatsvrs/patches/patch-bg b/mail/yatsvrs/patches/patch-bg deleted file mode 100644 index ae89bacdb97..00000000000 --- a/mail/yatsvrs/patches/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bg,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/tcplib.c.orig Fri Jun 22 20:05:49 2001 -+++ yatd/tcplib.c -@@ -71,7 +71,7 @@ - - if ((pHent=gethostbyaddr((char *)&(pSck->inAddr), sizeof (struct in_addr), - AF_INET)) == NULL) { -- WARNING(ERRYS_DUMMY, 0, "gethostbyaddr(%d) failed", pszHost); -+ WARNING(ERRYS_DUMMY, 0, "gethostbyaddr(%s) failed", pszHost); - pSck->pszHost = NULL; - } - else if ((pSck->pszHost = strdup(pHent->h_name)) == NULL) { diff --git a/mail/yatsvrs/patches/patch-bh b/mail/yatsvrs/patches/patch-bh deleted file mode 100644 index b043f868e42..00000000000 --- a/mail/yatsvrs/patches/patch-bh +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bh,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/uidl.c.orig Mon Jun 4 15:43:51 2001 -+++ yatd/uidl.c -@@ -38,12 +38,12 @@ - if (MailCheckFlags(pMail)) - return FAILURE; - -- Msg2Cli(SUCCESS, "%u %.256s", i, MakeUniqID(Buffer, pFldr, pMail->id)); -+ Msg2Cli(SUCCESS, "%d %.256s", i, MakeUniqID(Buffer, pFldr, pMail->id)); - return SUCCESS; - } - - /* begin of scan list */ -- Msg2Cli(SUCCESS, "%u messages (%u octets)", -+ Msg2Cli(SUCCESS, "%u messages (%ld octets)", - pFldr->nMailAvail, pFldr->sizMailsAvail); - - for (i = 0; i < pFldr->nMail; i++) { diff --git a/mail/yatsvrs/patches/patch-bi b/mail/yatsvrs/patches/patch-bi deleted file mode 100644 index 47a6985d9de..00000000000 --- a/mail/yatsvrs/patches/patch-bi +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bi,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/update.c.orig Mon Jul 9 11:56:40 2001 -+++ yatd/update.c -@@ -301,7 +301,7 @@ - GOTO LBL_CONTINUE; - LogDEBUG("#%.256s %.80s", - pFldr->szName, ctime(&(statBuf.st_mtime))); -- LogDEBUG("%.256s %u %d %d %d\n", -+ LogDEBUG("%.256s %ld %d %d %d\n", - pFldr->szName, statBuf.st_mtime, - pFldr->nMailAvail, pFldr->nMailUnseen, pFldr->nMailDel); - fprintf(fp, "%.256s %lu %d %u %d\n", diff --git a/mail/yatsvrs/patches/patch-bj b/mail/yatsvrs/patches/patch-bj deleted file mode 100644 index d2d0dfde8d0..00000000000 --- a/mail/yatsvrs/patches/patch-bj +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-bj,v 1.1.1.1 2001/11/15 23:21:31 taca Exp $ - ---- yatd/user.c.orig Mon Jul 2 14:12:43 2001 -+++ yatd/user.c -@@ -86,8 +86,6 @@ - return ENOMEM; - } - --static CONST char *pszFmt; -- - static int _FuncUser() - { - if (CheckArgc(2, 2)) -@@ -105,8 +103,6 @@ - ErrSetData(ENOMEM, ERRFLG_FATAL | ERRFLG_SYSERR, NULL); - return FAILURE; - } -- -- Msg2Cli(SUCCESS, pszFmt, SysData.szUser); - return SUCCESS; - } - -@@ -115,23 +111,35 @@ - */ - int FuncUser() - { -- pszFmt = "'%.256s' is welcome here."; -- return _FuncUser(); -+ int status; -+ -+ status = _FuncUser(); -+ if (status == SUCCESS) -+ Msg2Cli(status, "'%.256s' is welcome here.", SysData.szUser); -+ return status; - } - /* - * 'kill' command - */ - int FuncUserKill() - { -- pszFmt = "Kill you, '%.256s'."; -- return _FuncUser(); -+ int status; -+ -+ status = _FuncUser(); -+ if (status == SUCCESS) -+ Msg2Cli(status, "Kill you, '%.256s'.", SysData.szUser); -+ return status; - } - /* - * 'kill9' command - */ - int FuncUserKill9() - { -- pszFmt = "Go to hell!, '%.256s'."; -+ int status; -+ - SysData.Flags.kill9 = 1; -- return _FuncUser(); -+ status = _FuncUser(); -+ if (status == SUCCESS) -+ Msg2Cli(status, "Go to hell!, '%.256s'.", SysData.szUser); -+ return status; - } diff --git a/mail/yatsvrs/patches/patch-bk b/mail/yatsvrs/patches/patch-bk deleted file mode 100644 index 2d3638a9119..00000000000 --- a/mail/yatsvrs/patches/patch-bk +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2003/10/05 04:25:15 taca Exp $ - ---- 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 -- LogDEBUG("<<<V2 Summary: %.256s %u %u %u", -+ LogDEBUG("<<<V2 Summary: %.256s %ld %u %u", - V2Fldr.szName, V2Fldr.mtime, - V2Fldr.nMail, V2Fldr.nMailUnseen); - #endif -@@ -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; -- Msg2Cli(SUCCESS, "You have %d message(s) (%d octets).", -+ Msg2Cli(SUCCESS, "You have %d message(s) (%ld octets).", - SysData.pFldrCur->nMailAvail, - SysData.pFldrCur->sizMailsAvail); - return SUCCESS; diff --git a/mail/yatsvrs/patches/patch-bl b/mail/yatsvrs/patches/patch-bl deleted file mode 100644 index 903f14c00b2..00000000000 --- a/mail/yatsvrs/patches/patch-bl +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2002/04/01 04:43:34 dmcmahill Exp $ - ---- common/base64.c.orig Fri Jun 22 03:49:56 2001 -+++ common/base64.c -@@ -110,7 +110,7 @@ - p = strchr(Base64Charset, c); - if (p == NULL) - return 0; -- return (((unsigned)p - (unsigned)Base64Charset) & 077); -+ return (((unsigned long)p - (unsigned long)Base64Charset) & 077); - } - - int Base64DecodeLine(pDst0, pnLen, pSrc0) diff --git a/mail/yatsvrs/patches/patch-bm b/mail/yatsvrs/patches/patch-bm deleted file mode 100644 index 02646fd5a79..00000000000 --- a/mail/yatsvrs/patches/patch-bm +++ /dev/null @@ -1,31 +0,0 @@ -$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: diff --git a/mail/yatsvrs/patches/patch-bn b/mail/yatsvrs/patches/patch-bn deleted file mode 100644 index 085a83967b4..00000000000 --- a/mail/yatsvrs/patches/patch-bn +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bn,v 1.2 2005/01/08 09:39:57 taca Exp $ - ---- configure.orig 2001-12-20 16:23:50.000000000 +0900 -+++ configure -@@ -1016,9 +1016,9 @@ else - CFLAGS= - fi - fi -- -- -- -+if test $ac_cv_prog_gcc = yes; then -+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes" -+fi - - echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 - echo "configure:1025: checking for ${CC-cc} option to accept ANSI C" >&5 -@@ -3929,6 +3929,10 @@ test -n "$MAIL_COMMAND" && break - done - test -n "$MAIL_COMMAND" || MAIL_COMMAND="no" - -+ case "${OPSYS}" in -+ IRIX|SunOS) MAIL_COMMAND="/usr/lib/sendmail";; -+ *) MAIL_COMMAND="/usr/sbin/sendmail";; -+ esac - if test "$MAIL_COMMAND" = "no" ; then - { echo "configure: error: configure script cannot find sendmail. " 1>&2; exit 1; } - else diff --git a/mail/yatsvrs/patches/patch-bo b/mail/yatsvrs/patches/patch-bo deleted file mode 100644 index 2f96ce6732b..00000000000 --- a/mail/yatsvrs/patches/patch-bo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2004/12/15 13:18:02 taca Exp $ - ---- yatd/xtnd.c.orig 2001-06-04 15:43:51.000000000 +0900 -+++ yatd/xtnd.c -@@ -23,6 +23,10 @@ int FuncXtnd() - { - struct CMD_DAT * pCmd; - -+ if (SysData.allow_xtnd == 0) { -+ return (*FuncNoCmd)(); -+ } -+ - ArgShift(1); - if (SysData.argc <= 0) { - ErrSetData(ERRYS_XTNDNUL, 0, NULL); diff --git a/mail/yatsvrs/patches/patch-bp b/mail/yatsvrs/patches/patch-bp deleted file mode 100644 index 356a3fa4a60..00000000000 --- a/mail/yatsvrs/patches/patch-bp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bp,v 1.1 2004/12/15 13:18:02 taca Exp $ - ---- yatd/yatsvr.h.orig 2001-07-09 12:32:52.000000000 +0900 -+++ yatd/yatsvr.h -@@ -371,6 +371,7 @@ struct SYS_DAT { - unsigned pop3AuthFail: 1; /* pop3 authentication is failed */ - unsigned newByUidl : 1; /* determine new mail by UIDL */ - } Flags; /* flags */ -+ int allow_xtnd; /* allow XTND commands */ - }; - - #define ERRFLG_SYSERR BIT(0) |