Index: head/mail/popular/Makefile =================================================================== --- head/mail/popular/Makefile (revision 545322) +++ head/mail/popular/Makefile (revision 545323) @@ -1,37 +1,40 @@ # Created by: Pav Lucistnik # $FreeBSD$ PORTNAME= popular PORTVERSION= 1.5.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= https://www.jochentopf.com/software/popular/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= svysh.fbsd@gmail.com COMMENT= Suite of programs for setting up large POP3 server systems +LICENSE= GPLv2 + BUILD_DEPENDS= p5-XML-DOM>=0:textproc/p5-XML-DOM +USES= libtool perl5 gmake tar:bzip2 ssl CONFLICTS= pserv-[0-9]* synce-librapi2-[0-9]* CONFLICTS_INSTALL= ports-tools # bin/pcheck -USES= libtool perl5 gmake tar:bzip2 ssl GNU_CONFIGURE= yes PDM_MODULES= any master CONFIGURE_ARGS= --without-bdb --disable-docbook --with-confdir=${PREFIX}/etc/popular \ --enable-ssl --with-pdm="${PDM_MODULES}" CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib USE_RC_SUBR= pcheckd pproxy pserv 0ringd +USE_LDCONFIG= yes post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/popular/*.so @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/pproxy.rc ${STAGEDIR}${ETCDIR}/pproxy.rc.sample ${INSTALL_DATA} ${WRKSRC}/conf/pserv.rc ${STAGEDIR}${ETCDIR}/pserv.rc.sample @${MKDIR} ${STAGEDIR}${PREFIX}/include/popular ${FIND} ${WRKSRC}/src -name *.h | ${XARGS} -n 1 -J % ${INSTALL_DATA} % \ ${STAGEDIR}${PREFIX}/include/popular .include Index: head/mail/popular/files/patch-src-Makefile.in =================================================================== --- head/mail/popular/files/patch-src-Makefile.in (revision 545322) +++ head/mail/popular/files/patch-src-Makefile.in (nonexistent) @@ -1,27 +0,0 @@ ---- src/Makefile.in.orig Sat Aug 21 12:26:23 2004 -+++ src/Makefile.in Mon Jul 11 16:47:17 2005 -@@ -132,7 +132,7 @@ - have_sgml = @have_sgml@ - prefix = @prefix@ - --CFLAGS = -g -O2 -Wall -+CFLAGS += -Wall - - #LDFLAGS = -static -lc_p - -@@ -166,13 +166,13 @@ - - LDADD = @LIB_STRL@ @LIB_GETOPT@ - --pproxy_LDADD = $(LDADD) @SSL_LIBS@ -ldl -+pproxy_LDADD = $(LDADD) @SSL_LIBS@ - - pserv_LDADD = $(LDADD) @SSL_LIBS@ - - pcontrol_LDADD = $(LDADD) @LIB_READLINE@ - --ptestpdm_LDADD = $(LDADD) -ldl -+ptestpdm_LDADD = $(LDADD) - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = Property changes on: head/mail/popular/files/patch-src-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-io.c =================================================================== --- head/mail/popular/files/patch-src-io.c (revision 545322) +++ head/mail/popular/files/patch-src-io.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/io.c.orig Sat Aug 21 12:19:29 2004 -+++ src/io.c Mon Jul 11 16:16:50 2005 -@@ -307,7 +307,8 @@ - * A null byte was encountered in input from a network socket. This - * can never happen in a normal POP3 connection. */ - xlog_printf(xlog_adm, 0x0035, "null_byte_in_input ctx='%s' len=%d data='%s'", ioc->io_desc, len, buf); -- errno = EPROTO; -+ /* Uh oh, nice to overload socket errcos for application level signalization */ -+ errno = EPIPE; - return -1; - } - } Property changes on: head/mail/popular/files/patch-src-io.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-pcheckd.c =================================================================== --- head/mail/popular/files/patch-src-pcheckd.c (revision 545322) +++ head/mail/popular/files/patch-src-pcheckd.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/pcheckd.c.orig Sat Nov 22 22:27:22 2003 -+++ src/pcheckd.c Mon Jul 11 16:20:48 2005 -@@ -511,7 +511,6 @@ - case SIGQUIT: /* fallthrough */ - case SIGINT: /* fallthrough */ - case SIGTERM: /* fallthrough */ -- case SIGPWR: /* fallthrough */ - /* XLOG-DOC:INF:0078:shutdown - * pcheckd received a QUIT, INT, TER, or PWR signal and is - * shutting down. */ Property changes on: head/mail/popular/files/patch-src-pcheckd.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-popular.h =================================================================== --- head/mail/popular/files/patch-src-popular.h (revision 545322) +++ head/mail/popular/files/patch-src-popular.h (nonexistent) @@ -1,12 +0,0 @@ ---- src/popular.h.orig Thu Nov 28 14:56:03 2002 -+++ src/popular.h Mon Jul 11 16:19:50 2005 -@@ -26,9 +26,7 @@ - - *****************************************************************************/ - --#include - #include --#include - #include - #include - #include Property changes on: head/mail/popular/files/patch-src-popular.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-pproxy.c =================================================================== --- head/mail/popular/files/patch-src-pproxy.c (revision 545322) +++ head/mail/popular/files/patch-src-pproxy.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/pproxy.c.orig Mon Nov 24 20:23:30 2003 -+++ src/pproxy.c Mon Jul 11 16:21:13 2005 -@@ -580,9 +580,6 @@ - case SIGTERM: - pproxy_shutdown(SHUTDOWN_CHILDREN | SHUTDOWN_SERVER); - break; -- case SIGPWR: -- pproxy_shutdown(SHUTDOWN_DELAYED); -- break; - case SIGHUP: - logfd = xlog_reopen(conf.logfile, PPROXY_LOG_MODE); - break; Property changes on: head/mail/popular/files/patch-src-pproxy.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-util.c =================================================================== --- head/mail/popular/files/patch-src-util.c (revision 545322) +++ head/mail/popular/files/patch-src-util.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/util.c.orig Mon Apr 30 17:14:14 2001 -+++ src/util.c Wed Jun 7 13:19:59 2006 -@@ -125,7 +125,7 @@ - while (1) { - if (*tptr == '-') return -1; - value = strtol(tptr, &tptr, 10); -- if (errno) return -1; -+ if (errno && errno != EINVAL) return -1; - switch (*tptr) { - case 'd': - sec += value*60*60*24; Property changes on: head/mail/popular/files/patch-src-util.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-pserv.c =================================================================== --- head/mail/popular/files/patch-src-pserv.c (revision 545322) +++ head/mail/popular/files/patch-src-pserv.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/pserv.c.orig Sun Sep 15 14:27:16 2002 -+++ src/pserv.c Mon Jul 11 16:23:03 2005 -@@ -484,9 +484,6 @@ - case SIGTERM: - pserv_shutdown(SHUTDOWN_CHILDREN | SHUTDOWN_SERVER); - break; -- case SIGPWR: -- pserv_shutdown(SHUTDOWN_DELAYED); -- break; - case SIGHUP: - xlog_reopen(conf.logfile, PSERV_LOG_MODE); - break; Property changes on: head/mail/popular/files/patch-src-pserv.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-pdeliver.c =================================================================== --- head/mail/popular/files/patch-src-pdeliver.c (revision 545322) +++ head/mail/popular/files/patch-src-pdeliver.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/pdeliver.c.orig Mon Apr 30 14:20:34 2001 -+++ src/pdeliver.c Sat Dec 16 15:01:12 2006 -@@ -33,7 +33,7 @@ - #include "popular.h" - - --static int debug; -+int debug; - - - /***************************************************************************** Property changes on: head/mail/popular/files/patch-src-pdeliver.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src-sig.c =================================================================== --- head/mail/popular/files/patch-src-sig.c (revision 545322) +++ head/mail/popular/files/patch-src-sig.c (nonexistent) @@ -1,18 +0,0 @@ ---- src/sig.c.orig Sun Sep 15 14:27:16 2002 -+++ src/sig.c Mon Jul 11 16:21:23 2005 -@@ -114,7 +114,6 @@ - signal_set(sigHandler, SIGQUIT, 0); - signal_set(sigHandler, SIGUSR1, 0); - signal_set(sigHandler, SIGUSR2, 0); -- signal_set(sigHandler, SIGPWR, 0); - } - - -@@ -138,7 +137,6 @@ - signal_set(sigDefault, SIGQUIT, 0); - signal_set(sigDefault, SIGUSR1, 0); - signal_set(sigDefault, SIGUSR2, 0); -- signal_set(sigDefault, SIGPWR, 0); - - if (signal_remember[SIGTERM] || signal_remember[SIGINT]) { - /* XLOG-DOC:INF:0133:got_term_signal Property changes on: head/mail/popular/files/patch-src-sig.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/mail/popular/files/patch-configure =================================================================== --- head/mail/popular/files/patch-configure (revision 545322) +++ head/mail/popular/files/patch-configure (revision 545323) @@ -1,28 +1,28 @@ ---- configure.orig Sat Aug 21 12:21:50 2004 -+++ configure Mon Jul 11 17:20:12 2005 -@@ -22157,13 +22157,13 @@ +--- configure.orig 2004-08-21 10:21:50 UTC ++++ configure +@@ -22157,13 +22157,13 @@ fi -echo "$as_me:$LINENO: checking for db_create in -ldb-4.0" >&5 -echo $ECHO_N "checking for db_create in -ldb-4.0... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for db_create in -ldb4" >&5 +echo $ECHO_N "checking for db_create in -ldb4... $ECHO_C" >&6 if test "${ac_cv_lib_db_4_0_db_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb-4.0 $LIBS" +LIBS="-ldb4 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22221,7 +22221,7 @@ +@@ -22221,7 +22221,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_db_4_0_db_create" >&5 echo "${ECHO_T}$ac_cv_lib_db_4_0_db_create" >&6 if test $ac_cv_lib_db_4_0_db_create = yes; then - LIB_DB40=db-4.0 + LIB_DB40=db4 else LIB_DB40="" fi Index: head/mail/popular/files/patch-doc_man_Makefile.am =================================================================== --- head/mail/popular/files/patch-doc_man_Makefile.am (nonexistent) +++ head/mail/popular/files/patch-doc_man_Makefile.am (revision 545323) @@ -0,0 +1,26 @@ +--- doc/man/Makefile.am.orig 2020-08-19 11:43:30 UTC ++++ doc/man/Makefile.am +@@ -36,23 +36,6 @@ DB2MAN := @PERL_PATH@ $(top_srcdir)/doc/bin/docbo + LOG_RAW2MAN := @PERL_PATH@ $(top_srcdir)/doc/bin/log-raw2man + + +-.PHONY: all man clean +- +-all: man +- +-clean: +- rm -f *.1 *.7 *.8 +- +-man: $(man_MANS) +- +-%.1: %.sgml $(DB2MAN) $(ADDCREDIT) +- $(ADDCREDIT) $< | $(DB2MAN) - >$@ || rm $@ +- +-%.8: %.sgml $(DB2MAN) $(ADDCREDIT) +- $(ADDCREDIT) $< | $(DB2MAN) - >$@ || rm $@ +- +-popular-log.7: $(top_builddir)/doc/log/messagelist.raw +- $(LOG_RAW2MAN) $< >$@ || rm $@ + + + #----------------------------------------------------------------------------- Property changes on: head/mail/popular/files/patch-doc_man_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-doc_man_Makefile.in =================================================================== --- head/mail/popular/files/patch-doc_man_Makefile.in (nonexistent) +++ head/mail/popular/files/patch-doc_man_Makefile.in (revision 545323) @@ -0,0 +1,26 @@ +--- doc/man/Makefile.in.orig 2020-08-19 11:43:47 UTC ++++ doc/man/Makefile.in +@@ -352,23 +352,6 @@ mostlyclean-generic distclean-generic clean-generic \ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +-.PHONY: all man clean +- +-all: man +- +-clean: +- rm -f *.1 *.7 *.8 +- +-man: $(man_MANS) +- +-%.1: %.sgml $(DB2MAN) $(ADDCREDIT) +- $(ADDCREDIT) $< | $(DB2MAN) - >$@ || rm $@ +- +-%.8: %.sgml $(DB2MAN) $(ADDCREDIT) +- $(ADDCREDIT) $< | $(DB2MAN) - >$@ || rm $@ +- +-popular-log.7: $(top_builddir)/doc/log/messagelist.raw +- $(LOG_RAW2MAN) $< >$@ || rm $@ + + #----------------------------------------------------------------------------- + # gzip Property changes on: head/mail/popular/files/patch-doc_man_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_Makefile.in =================================================================== --- head/mail/popular/files/patch-src_Makefile.in (nonexistent) +++ head/mail/popular/files/patch-src_Makefile.in (revision 545323) @@ -0,0 +1,27 @@ +--- src/Makefile.in.orig 2004-08-21 10:26:23 UTC ++++ src/Makefile.in +@@ -132,7 +132,7 @@ VERSION = @VERSION@ + have_sgml = @have_sgml@ + prefix = @prefix@ + +-CFLAGS = -g -O2 -Wall ++CFLAGS += -Wall + + #LDFLAGS = -static -lc_p + +@@ -166,13 +166,13 @@ ptestpdm_SOURCES = ptestpdm.c popular.h pconfig.h util + + LDADD = @LIB_STRL@ @LIB_GETOPT@ + +-pproxy_LDADD = $(LDADD) @SSL_LIBS@ -ldl ++pproxy_LDADD = $(LDADD) @SSL_LIBS@ + + pserv_LDADD = $(LDADD) @SSL_LIBS@ + + pcontrol_LDADD = $(LDADD) @LIB_READLINE@ + +-ptestpdm_LDADD = $(LDADD) -ldl ++ptestpdm_LDADD = $(LDADD) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = Property changes on: head/mail/popular/files/patch-src_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_io.c =================================================================== --- head/mail/popular/files/patch-src_io.c (nonexistent) +++ head/mail/popular/files/patch-src_io.c (revision 545323) @@ -0,0 +1,12 @@ +--- src/io.c.orig 2004-08-21 10:19:29 UTC ++++ src/io.c +@@ -307,7 +307,8 @@ io_sysread(struct io_ctx *ioc, char *buf, size_t count + * A null byte was encountered in input from a network socket. This + * can never happen in a normal POP3 connection. */ + xlog_printf(xlog_adm, 0x0035, "null_byte_in_input ctx='%s' len=%d data='%s'", ioc->io_desc, len, buf); +- errno = EPROTO; ++ /* Uh oh, nice to overload socket errcos for application level signalization */ ++ errno = EPIPE; + return -1; + } + } Property changes on: head/mail/popular/files/patch-src_io.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_pcheckd.c =================================================================== --- head/mail/popular/files/patch-src_pcheckd.c (nonexistent) +++ head/mail/popular/files/patch-src_pcheckd.c (revision 545323) @@ -0,0 +1,10 @@ +--- src/pcheckd.c.orig 2003-11-22 21:27:22 UTC ++++ src/pcheckd.c +@@ -511,7 +511,6 @@ main(int argc, char *argv[]) + case SIGQUIT: /* fallthrough */ + case SIGINT: /* fallthrough */ + case SIGTERM: /* fallthrough */ +- case SIGPWR: /* fallthrough */ + /* XLOG-DOC:INF:0078:shutdown + * pcheckd received a QUIT, INT, TER, or PWR signal and is + * shutting down. */ Property changes on: head/mail/popular/files/patch-src_pcheckd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_pdeliver.c =================================================================== --- head/mail/popular/files/patch-src_pdeliver.c (nonexistent) +++ head/mail/popular/files/patch-src_pdeliver.c (revision 545323) @@ -0,0 +1,11 @@ +--- src/pdeliver.c.orig 2001-04-30 12:20:34 UTC ++++ src/pdeliver.c +@@ -33,7 +33,7 @@ + #include "popular.h" + + +-static int debug; ++int debug; + + + /***************************************************************************** Property changes on: head/mail/popular/files/patch-src_pdeliver.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_popular.h =================================================================== --- head/mail/popular/files/patch-src_popular.h (nonexistent) +++ head/mail/popular/files/patch-src_popular.h (revision 545323) @@ -0,0 +1,12 @@ +--- src/popular.h.orig 2002-11-28 13:56:03 UTC ++++ src/popular.h +@@ -26,9 +26,7 @@ + + *****************************************************************************/ + +-#include + #include +-#include + #include + #include + #include Property changes on: head/mail/popular/files/patch-src_popular.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_pproxy.c =================================================================== --- head/mail/popular/files/patch-src_pproxy.c (nonexistent) +++ head/mail/popular/files/patch-src_pproxy.c (revision 545323) @@ -0,0 +1,12 @@ +--- src/pproxy.c.orig 2003-11-24 19:23:30 UTC ++++ src/pproxy.c +@@ -580,9 +580,6 @@ main(int argc, char *argv[]) + case SIGTERM: + pproxy_shutdown(SHUTDOWN_CHILDREN | SHUTDOWN_SERVER); + break; +- case SIGPWR: +- pproxy_shutdown(SHUTDOWN_DELAYED); +- break; + case SIGHUP: + logfd = xlog_reopen(conf.logfile, PPROXY_LOG_MODE); + break; Property changes on: head/mail/popular/files/patch-src_pproxy.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_pserv.c =================================================================== --- head/mail/popular/files/patch-src_pserv.c (nonexistent) +++ head/mail/popular/files/patch-src_pserv.c (revision 545323) @@ -0,0 +1,12 @@ +--- src/pserv.c.orig 2002-09-15 12:27:16 UTC ++++ src/pserv.c +@@ -484,9 +484,6 @@ main(int argc, char *argv[]) + case SIGTERM: + pserv_shutdown(SHUTDOWN_CHILDREN | SHUTDOWN_SERVER); + break; +- case SIGPWR: +- pserv_shutdown(SHUTDOWN_DELAYED); +- break; + case SIGHUP: + xlog_reopen(conf.logfile, PSERV_LOG_MODE); + break; Property changes on: head/mail/popular/files/patch-src_pserv.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_sig.c =================================================================== --- head/mail/popular/files/patch-src_sig.c (nonexistent) +++ head/mail/popular/files/patch-src_sig.c (revision 545323) @@ -0,0 +1,18 @@ +--- src/sig.c.orig 2002-09-15 12:27:16 UTC ++++ src/sig.c +@@ -114,7 +114,6 @@ signal_init(int c) + signal_set(sigHandler, SIGQUIT, 0); + signal_set(sigHandler, SIGUSR1, 0); + signal_set(sigHandler, SIGUSR2, 0); +- signal_set(sigHandler, SIGPWR, 0); + } + + +@@ -138,7 +137,6 @@ signal_init_child() + signal_set(sigDefault, SIGQUIT, 0); + signal_set(sigDefault, SIGUSR1, 0); + signal_set(sigDefault, SIGUSR2, 0); +- signal_set(sigDefault, SIGPWR, 0); + + if (signal_remember[SIGTERM] || signal_remember[SIGINT]) { + /* XLOG-DOC:INF:0133:got_term_signal Property changes on: head/mail/popular/files/patch-src_sig.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/mail/popular/files/patch-src_util.c =================================================================== --- head/mail/popular/files/patch-src_util.c (nonexistent) +++ head/mail/popular/files/patch-src_util.c (revision 545323) @@ -0,0 +1,11 @@ +--- src/util.c.orig 2001-04-30 15:14:14 UTC ++++ src/util.c +@@ -125,7 +125,7 @@ timedesc2sec(char *desc, int min, int max) + while (1) { + if (*tptr == '-') return -1; + value = strtol(tptr, &tptr, 10); +- if (errno) return -1; ++ if (errno && errno != EINVAL) return -1; + switch (*tptr) { + case 'd': + sec += value*60*60*24; Property changes on: head/mail/popular/files/patch-src_util.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property