diff options
author | taca <taca> | 2001-11-15 23:24:55 +0000 |
---|---|---|
committer | taca <taca> | 2001-11-15 23:24:55 +0000 |
commit | edb27f5ec0c8170406d84185377a5c44e1851f87 (patch) | |
tree | a15dbbdb5ea633536490463e38d3808c31d5a556 | |
parent | af7bfadc4b49a51411377876660ce2c9cc1b919e (diff) | |
download | pkgsrc-edb27f5ec0c8170406d84185377a5c44e1851f87.tar.gz |
Remove yatsvrs5 since it moved to yatsvrs.
44 files changed, 0 insertions, 1380 deletions
diff --git a/mail/yatsvrs5/DEINSTALL b/mail/yatsvrs5/DEINSTALL deleted file mode 100644 index cf4240c105b..00000000000 --- a/mail/yatsvrs5/DEINSTALL +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# $Id: DEINSTALL,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - -AWK="@AWK@" -CAT="@CAT@" -CMP="@CMP@" -RM="@RM@" -RMDIR="@RMDIR@" - -YAT_CONF_DIR="@CONFDIR@" -YAT_EXAMPLES_DIR="@EXAMPLESDIR@" -EXAMPLES="@EXAMPLES@" -MIN="@YATSVR_MINGID@" -MAX="@YATSVR_MAXGID@" - -case "$2" in -DEINSTALL) - - for f in ${EXAMPLES}; do - if ${CMP} -s ${YAT_CONF_DIR}/$f ${YAT_EXAMPLES_DIR}/$f.example; then - ${RM} ${YAT_CONF_DIR}/$f - fi - done - admin=`${CAT} ${YAT_CONF_DIR}/.admin` - if [ x$admin = x'root' ]; then - ${RM} ${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} ${YAT_CONF_DIR}/.hidden-group - fi - ${RM} -f /tmp/hidden-group - ${RM} -f ${YAT_CONF_DIR}/*\~old - ${RMDIR} ${YAT_CONF_DIR} >/dev/null 2>&1 - if [ -d ${YAT_CONF_DIR} ]; then - ${CAT} <<EOF -If you would never want to use yatsvrs any more, remove ${YAT_CONF_DIR}. -EOF - fi - ;; -esac diff --git a/mail/yatsvrs5/DESCR b/mail/yatsvrs5/DESCR deleted file mode 100644 index 8f06fedb004..00000000000 --- a/mail/yatsvrs5/DESCR +++ /dev/null @@ -1,13 +0,0 @@ -YAT servers are extended POP3 server and supoprting servers. -It contains bellow programs. - - yatd YAT server; extended POP3 server - ascyd Apop shared Secret changer for Yatsvr - yatconfd YAT configuration daemon - -Yatd was was based on Berkeley's popper program and known as -yatsvr before. Yatd has own extention to POP3 protocol for -WinYAT, commercial product from JEPRO Co., Ltd. But it still -works as standard POP3 server. Extention to POP3 is documented -in attached document but in Japanese. - diff --git a/mail/yatsvrs5/INSTALL b/mail/yatsvrs5/INSTALL deleted file mode 100644 index 4f68a060e48..00000000000 --- a/mail/yatsvrs5/INSTALL +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# $Id: INSTALL,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - -PKGNAME=$1 -STAGE=$2 - -AWK="@AWK@" -CHMOD="@CHMOD@" -MKDIR="@MKDIR@" -INSTALL_DATA="@YATSVR_INSTALL_DATA@" - -YAT_CONF_DIR="@CONFDIR@" -YAT_EXAMPLES_DIR="@EXAMPLESDIR@" -DEFAULT_ADMIN="@DEFAULT_ADMIN@" -EXAMPLES="@EXAMPLES@" -MIN="@YATSVR_MINGID@" -MAX="@YATSVR_MAXGID@" - -case ${STAGE} in -PRE-INSTALL) - ;; -POST-INSTALL) - - if [ ! -d ${YAT_CONF_DIR} ]; then - ${MKDIR} -p ${YAT_CONF_DIR} - fi - for f in ${EXAMPLES}; do - if [ ! -f ${YAT_CONF_DIR}/$f ]; then - ${INSTALL_DATA} ${YAT_EXAMPLES_DIR}/$f.example \ - ${YAT_CONF_DIR}/$f - fi - done - 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 - ;; -*) - echo "Unexpected argument: ${STAGE}" - exit 1 - ;; -esac -exit 0 diff --git a/mail/yatsvrs5/MESSAGE b/mail/yatsvrs5/MESSAGE deleted file mode 100644 index 30e4ddcca7c..00000000000 --- a/mail/yatsvrs5/MESSAGE +++ /dev/null @@ -1,17 +0,0 @@ -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 ${CONFDIR}. diff --git a/mail/yatsvrs5/Makefile b/mail/yatsvrs5/Makefile deleted file mode 100644 index 4415f08c643..00000000000 --- a/mail/yatsvrs5/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ -# - -DISTNAME= yatsvrs-5.00p4 -PKGNAME= ${DISTNAME:S/p/./} -CATEGORIES= mail -MASTER_SITES= ftp://ftp.jepro.co.jp/pub/jepro/yatsvr/ - -MAINTAINER= taca@netbsd.org -HOMEPAGE= http://www.jepro.co.jp/products/yat/ -COMMENT= Extended POP3 server and some supporting servers - -CONFLICTS= ascyd-* yatsvr4-* - -GNU_CONFIGURE= yes - -YATSVR_LOGFAC?= LOG_LOCAL4 -YATSVR_MINGID?= 1001 -YATSVR_MAXGID?= 64999 -CONFDIR= /etc/yatsvr5 -OLDCONFDIR= ${PREFIX}/etc/yat -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} -CONFIGURE_ARGS+= --with-yat-sys-dir=${CONFDIR} -CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR} - -DEINSTALL_FILE= ${WRKDIR}/DEINSTALL -INSTALL_FILE= ${WRKDIR}/INSTALL - -DEFAULT_ADMIN= root - -FILES_SUBST+= AWK=${AWK:Q} -FILES_SUBST+= CAT=${CAT:Q} -FILES_SUBST+= CMP=${CMP:Q} -FILES_SUBST+= CHMOD=${CHMOD:Q} -FILES_SUBST+= MKDIR=${MKDIR:Q} -FILES_SUBST+= RM=${RM:Q} -FILES_SUBST+= RMDIR=${RMDIR:Q} -FILES_SUBST+= CONFDIR=${CONFDIR} -FILES_SUBST+= DEFAULT_ADMIN=${DEFAULT_ADMIN} -FILES_SUBST+= EXAMPLESDIR=${EXAMPLESDIR} -FILES_SUBST+= EXAMPLES=${EXAMPLES:Q} -FILES_SUBST+= YATSVR_INSTALL_DATA=${INSTALL_DATA:Q} -FILES_SUBST+= YATSVR_MINGID=${YATSVR_MINGID} -FILES_SUBST+= YATSVR_MAXGID=${YATSVR_MAXGID} -FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} - -MESSAGE_SUBST+= CONFDIR=${CONFDIR} - -post-build: - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE} - ${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} - -post-install: - ${INSTALL_DATA_DIR} ${CONFDIR} - ${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.example -.endfor - PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL - -.include "../../mk/bsd.pkg.mk" diff --git a/mail/yatsvrs5/PLIST b/mail/yatsvrs5/PLIST deleted file mode 100644 index 26da31f8229..00000000000 --- a/mail/yatsvrs5/PLIST +++ /dev/null @@ -1,13 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ -libexec/ascyd -libexec/yatd -libexec/yatconfd -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.example -share/examples/yatsvr5/yatsvrrc.example -@dirrm share/examples/yatsvr5 diff --git a/mail/yatsvrs5/distinfo b/mail/yatsvrs5/distinfo deleted file mode 100644 index 3caecac8336..00000000000 --- a/mail/yatsvrs5/distinfo +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - -SHA1 (yatsvrs-5.00p4.tar.gz) = 9271cae3883b7dd83fe8c946181e1fd560892c15 -Size (yatsvrs-5.00p4.tar.gz) = 207263 bytes -SHA1 (patch-aa) = 512c1a74ffa5eda8dfdb57063d00baf2015db982 -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-ah) = cdd32e7a7474b94601c69c4ab6a304542af7da42 -SHA1 (patch-ai) = f0f7d8fe5b6dc25fab2d9e73809b084b8e4729c6 -SHA1 (patch-aj) = fc13d80bc08a84d86e627adad167d96684151541 -SHA1 (patch-ak) = ec11aabeca579944e78053065759986cb96c1da2 -SHA1 (patch-al) = 7521f31cd1ab5c50008438fd330a691b8d707528 -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-au) = 63aa76a7a9c55c9877fe2a336903828d193c3658 -SHA1 (patch-av) = 17c9db75d587472799ec40aa7ac39cde3c10288a -SHA1 (patch-aw) = 31a7f22c6e78b87d7bec66d0dd77641884ffb107 -SHA1 (patch-ax) = 1f93f5b93584285fb3dd6e1f7e5916ef81b2ae2e -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) = 09429868c0a2f2986034b189499c99178e7256dc diff --git a/mail/yatsvrs5/patches/patch-aa b/mail/yatsvrs5/patches/patch-aa deleted file mode 100644 index 9c37412a3ad..00000000000 --- a/mail/yatsvrs5/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- Makefile.in.orig Mon Jul 9 12:18:00 2001 -+++ Makefile.in -@@ -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 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/mail/yatsvrs5/patches/patch-ab b/mail/yatsvrs5/patches/patch-ab deleted file mode 100644 index 68f67982663..00000000000 --- a/mail/yatsvrs5/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- ascyd/Makefile.in.orig Mon Jul 9 18:19:12 2001 -+++ ascyd/Makefile.in -@@ -125,18 +125,18 @@ - - 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 @@ - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs5/patches/patch-ac b/mail/yatsvrs5/patches/patch-ac deleted file mode 100644 index 9a0f3287e99..00000000000 --- a/mail/yatsvrs5/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-ad b/mail/yatsvrs5/patches/patch-ad deleted file mode 100644 index 5d67bdb3d49..00000000000 --- a/mail/yatsvrs5/patches/patch-ad +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-ae b/mail/yatsvrs5/patches/patch-ae deleted file mode 100644 index ab93c86fa17..00000000000 --- a/mail/yatsvrs5/patches/patch-ae +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-af b/mail/yatsvrs5/patches/patch-af deleted file mode 100644 index 17d8cf8a14e..00000000000 --- a/mail/yatsvrs5/patches/patch-af +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- ascyd/sighand.c.orig Mon Jun 25 14:58:32 2001 -+++ ascyd/sighand.c -@@ -60,7 +60,6 @@ - void SigHandler(iSig) - int iSig; - { -- CONST char * pMsg; - int codeErr; - - /* -@@ -72,17 +71,14 @@ - - switch (iSig) { - case SIGALRM: -- pMsg = NULL; - codeErr = ERRYS_TIMEOUT; -+ WARNING(codeErr, 0, NULL, iSig); - 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 @@ - } - #endif - -- ErrSetData(codeErr, 0, pMsg, iSig); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs5/patches/patch-ag b/mail/yatsvrs5/patches/patch-ag deleted file mode 100644 index 7f19579c474..00000000000 --- a/mail/yatsvrs5/patches/patch-ag +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- conf.h.orig Mon Jul 9 12:36:15 2001 -+++ conf.h -@@ -26,17 +26,20 @@ - - #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__) - # 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 */ diff --git a/mail/yatsvrs5/patches/patch-ah b/mail/yatsvrs5/patches/patch-ah deleted file mode 100644 index b9a4ec77ece..00000000000 --- a/mail/yatsvrs5/patches/patch-ah +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-ai b/mail/yatsvrs5/patches/patch-ai deleted file mode 100644 index f4cd1b1a6a8..00000000000 --- a/mail/yatsvrs5/patches/patch-ai +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- yatconfd/Makefile.in.orig Mon Jul 9 18:19:11 2001 -+++ yatconfd/Makefile.in -@@ -127,18 +127,18 @@ - - 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 @@ - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs5/patches/patch-aj b/mail/yatsvrs5/patches/patch-aj deleted file mode 100644 index 0c3b2df6944..00000000000 --- a/mail/yatsvrs5/patches/patch-aj +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-ak b/mail/yatsvrs5/patches/patch-ak deleted file mode 100644 index 4442c2901b1..00000000000 --- a/mail/yatsvrs5/patches/patch-ak +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ak,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-al b/mail/yatsvrs5/patches/patch-al deleted file mode 100644 index c32511f990b..00000000000 --- a/mail/yatsvrs5/patches/patch-al +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-al,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- yatconfd/yatconfd.c.orig Tue Jun 26 20:22:07 2001 -+++ yatconfd/yatconfd.c -@@ -259,7 +259,7 @@ - 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 @@ - 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, iSig); - 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 @@ - } - #endif - -- ErrSetData(codeErr, 0, pMsg, iSig); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, iSig); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs5/patches/patch-am b/mail/yatsvrs5/patches/patch-am deleted file mode 100644 index e0442f7a4d4..00000000000 --- a/mail/yatsvrs5/patches/patch-am +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-am,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- yatconfd/yc_admin.c.orig Wed Jul 4 15:26:49 2001 -+++ yatconfd/yc_admin.c -@@ -8,6 +8,7 @@ - FILE * fp; - struct yc_admin *pEntry; - unsigned len; -+ mode_t mode; - - LogDEBUG("SaveAdminData()"); - strcpy(szFilename, SysData.szSysDir); -@@ -23,7 +24,9 @@ - - strcpy(szTempname, szFilename); - strcat(szTempname, TMPFILE_SUFFIX); -+ mode = umask(077); - fp = fopen(szTempname, "w"); -+ (void)umask(mode); - if (fp == NULL) { - ErrSetData(errno, ERRFLG_SYSERR, "%s", SysData.argv[1]); - if (!ShortDiskXferCheck()) diff --git a/mail/yatsvrs5/patches/patch-an b/mail/yatsvrs5/patches/patch-an deleted file mode 100644 index 2d977be9e84..00000000000 --- a/mail/yatsvrs5/patches/patch-an +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-an,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- yatconfd/yc_getput.c.orig Mon Jun 25 17:44:22 2001 -+++ yatconfd/yc_getput.c -@@ -125,6 +125,7 @@ - unsigned flags; - int id; - int bFirst = 1; -+ mode_t mode; - - if (CheckArgc(2, 3)) - return FAILURE; -@@ -179,7 +180,9 @@ - - strcpy(szTempname, szFilename); - strcat(szTempname, TMPFILE_SUFFIX); -+ mode = umask(077); - fp = fopen(szTempname, "w"); -+ (void)umask(mode); - if (fp == NULL) { - ErrSetData(errno, ERRFLG_SYSERR, "%s", SysData.argv[1]); - if (!ShortDiskXferCheck()) diff --git a/mail/yatsvrs5/patches/patch-ao b/mail/yatsvrs5/patches/patch-ao deleted file mode 100644 index a173e30f30a..00000000000 --- a/mail/yatsvrs5/patches/patch-ao +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-ap b/mail/yatsvrs5/patches/patch-ap deleted file mode 100644 index 056c5784bdb..00000000000 --- a/mail/yatsvrs5/patches/patch-ap +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-ap,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-aq b/mail/yatsvrs5/patches/patch-aq deleted file mode 100644 index 6b339e1a007..00000000000 --- a/mail/yatsvrs5/patches/patch-aq +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2001/11/15 16:08:43 taca Exp $ - ---- yatd/Makefile.in.orig Mon Jul 9 18:19:10 2001 -+++ yatd/Makefile.in -@@ -132,18 +132,18 @@ - - 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 @@ - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: -- $(mkinstalldirs) $(DESTDIR)$(sbindir) -+ $(mkinstalldirs) $(DESTDIR)$(libexecdir) - - - mostlyclean-generic: diff --git a/mail/yatsvrs5/patches/patch-ar b/mail/yatsvrs5/patches/patch-ar deleted file mode 100644 index 7072372ba16..00000000000 --- a/mail/yatsvrs5/patches/patch-ar +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ar,v 1.1.1.1 2001/11/15 16:08:43 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/yatsvrs5/patches/patch-as b/mail/yatsvrs5/patches/patch-as deleted file mode 100644 index 5a6ea33995b..00000000000 --- a/mail/yatsvrs5/patches/patch-as +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-as,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- yatd/dfree.c.orig Mon Jul 9 11:13:56 2001 -+++ yatd/dfree.c -@@ -72,12 +72,6 @@ - - #define DEBUG_LOCAL - --#ifndef LONGLONG_OPTC --/* LONGLONG_OPTCが定義されていない場合には 空白を定義して, -- リテラルの糊として使う */ --#define LONGLONG_OPTC /* */ --#endif -- - int DFreeCheck(pPath, pSizFree, pNodFree) - char * pPath; /* ユーザーのホームディレクトリの位置 */ - OFF_T * pSizFree; /* 空きブロック数 */ -@@ -99,7 +93,7 @@ - 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 */ - -@@ -123,22 +117,21 @@ - # ifdef BSD44 - LogDEBUG("statfs() returns:"); - LogDEBUG(" type: %d", statfsBuf.f_type); -- LogDEBUG(" flags: 0x%x", statfsBuf.f_flags); -+ LogDEBUG(" flags: 0x%lx", statfsBuf.f_flags); - # ifdef __NetBSD__ - LogDEBUG(" oflags: 0x%x", statfsBuf.f_oflags); - # endif - # 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); -+ LogDEBUG(" fsid: %" LONGLONG_OPTC "u", statfsBuf.f_fsid); - #ifdef STRUCT_STATFS_HAVE_F_FSTYPENAME - LogDEBUG(" fstypename: %.256s", statfsBuf.f_fstypename); - #endif -@@ -311,7 +304,7 @@ - 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 +318,7 @@ - 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; - } -@@ -449,12 +442,12 @@ - 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; diff --git a/mail/yatsvrs5/patches/patch-at b/mail/yatsvrs5/patches/patch-at deleted file mode 100644 index 88c80ef19eb..00000000000 --- a/mail/yatsvrs5/patches/patch-at +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-at,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- yatd/entry.c.orig Mon Jul 9 09:51:31 2001 -+++ yatd/entry.c -@@ -431,7 +431,7 @@ - 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 +560,30 @@ - #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, signum); - 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 +598,7 @@ - } - #endif - -- ErrSetData(codeErr, 0, pMsg, signum); -+ ErrSetData(codeErr, 0, (codeErr == ERRYS_SIGNAL)? "#%d": NULL, signum); - Msg2Cli(FAILURE, NULL); - - exit(1); diff --git a/mail/yatsvrs5/patches/patch-au b/mail/yatsvrs5/patches/patch-au deleted file mode 100644 index 6089faa1341..00000000000 --- a/mail/yatsvrs5/patches/patch-au +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-au,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-av b/mail/yatsvrs5/patches/patch-av deleted file mode 100644 index ad7170f346c..00000000000 --- a/mail/yatsvrs5/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- yatd/fldr_etc.c.orig Tue Jun 5 17:36:00 2001 -+++ yatd/fldr_etc.c -@@ -229,7 +229,7 @@ - goto LBL_CONTINUE; - FldrSummary.nMailDel = atoi(p); - #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/yatsvrs5/patches/patch-aw b/mail/yatsvrs5/patches/patch-aw deleted file mode 100644 index 07022401ab6..00000000000 --- a/mail/yatsvrs5/patches/patch-aw +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aw,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-ax b/mail/yatsvrs5/patches/patch-ax deleted file mode 100644 index 86550e6b5fa..00000000000 --- a/mail/yatsvrs5/patches/patch-ax +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ax,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- yatd/init.c.orig Thu Jun 28 16:43:55 2001 -+++ yatd/init.c -@@ -385,7 +385,7 @@ - #else - "Invalid %s value : %d", - #endif -- YSCONF_DFLIMITSIZ, sizLimit); -+ YSCONF_DFLIMITSIZ, LONGLONG_CAST(sizLimit)); - } - else - SysData.sizLimitFree = sizLimit; -@@ -400,7 +400,7 @@ - #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/yatsvrs5/patches/patch-ay b/mail/yatsvrs5/patches/patch-ay deleted file mode 100644 index 2945ec9480b..00000000000 --- a/mail/yatsvrs5/patches/patch-ay +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ay,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-az b/mail/yatsvrs5/patches/patch-az deleted file mode 100644 index 85f153c2a5b..00000000000 --- a/mail/yatsvrs5/patches/patch-az +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-az,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-ba b/mail/yatsvrs5/patches/patch-ba deleted file mode 100644 index 4eb1c12e259..00000000000 --- a/mail/yatsvrs5/patches/patch-ba +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ba,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bb b/mail/yatsvrs5/patches/patch-bb deleted file mode 100644 index 85290e9a52e..00000000000 --- a/mail/yatsvrs5/patches/patch-bb +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-bb,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bc b/mail/yatsvrs5/patches/patch-bc deleted file mode 100644 index 96b2af2c7c3..00000000000 --- a/mail/yatsvrs5/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bd b/mail/yatsvrs5/patches/patch-bd deleted file mode 100644 index 3513679cd44..00000000000 --- a/mail/yatsvrs5/patches/patch-bd +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-bd,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-be b/mail/yatsvrs5/patches/patch-be deleted file mode 100644 index 90f09d592f1..00000000000 --- a/mail/yatsvrs5/patches/patch-be +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-be,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bf b/mail/yatsvrs5/patches/patch-bf deleted file mode 100644 index 250e1911b43..00000000000 --- a/mail/yatsvrs5/patches/patch-bf +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-bf,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bg b/mail/yatsvrs5/patches/patch-bg deleted file mode 100644 index 6bb0cb5c6de..00000000000 --- a/mail/yatsvrs5/patches/patch-bg +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bg,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bh b/mail/yatsvrs5/patches/patch-bh deleted file mode 100644 index f2b14422ae6..00000000000 --- a/mail/yatsvrs5/patches/patch-bh +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bh,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bi b/mail/yatsvrs5/patches/patch-bi deleted file mode 100644 index 7a539b0696b..00000000000 --- a/mail/yatsvrs5/patches/patch-bi +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bi,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bj b/mail/yatsvrs5/patches/patch-bj deleted file mode 100644 index 3695818eece..00000000000 --- a/mail/yatsvrs5/patches/patch-bj +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-bj,v 1.1.1.1 2001/11/15 16:08:44 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/yatsvrs5/patches/patch-bk b/mail/yatsvrs5/patches/patch-bk deleted file mode 100644 index a13b8b3bd85..00000000000 --- a/mail/yatsvrs5/patches/patch-bk +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bk,v 1.1.1.1 2001/11/15 16:08:44 taca Exp $ - ---- yatd/v2conv.c.orig Fri Jun 22 12:27:20 2001 -+++ yatd/v2conv.c -@@ -133,7 +133,7 @@ - goto LBL_CONTINUE; - V2Fldr.nMailUnseen = atoi(p); - #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 -@@ -549,7 +549,7 @@ - - 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; |