Date: Wed, 19 Aug 2020 13:17:39 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545323 - in head/mail/popular: . files Message-ID: <202008191317.07JDHdpP053293@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Wed Aug 19 13:17:38 2020 New Revision: 545323 URL: https://svnweb.freebsd.org/changeset/ports/545323 Log: mail/popular: Prepare for textproc/p5-XML-Parser update Also: - Bump PORTREVISION - Skip build of man pages, which are already present in the distribution - Add LICENSE - Add USE_LDCONFIG - Regenerate patches to follow the standard - Pass maintainership to the submitter PR: 248725 Submitted by: Sergei Vyshenski <svysh.fbsd@gmail.com> Added: head/mail/popular/files/patch-doc_man_Makefile.am (contents, props changed) head/mail/popular/files/patch-doc_man_Makefile.in (contents, props changed) head/mail/popular/files/patch-src_Makefile.in (contents, props changed) head/mail/popular/files/patch-src_io.c (contents, props changed) head/mail/popular/files/patch-src_pcheckd.c (contents, props changed) head/mail/popular/files/patch-src_pdeliver.c (contents, props changed) head/mail/popular/files/patch-src_popular.h (contents, props changed) head/mail/popular/files/patch-src_pproxy.c (contents, props changed) head/mail/popular/files/patch-src_pserv.c (contents, props changed) head/mail/popular/files/patch-src_sig.c (contents, props changed) head/mail/popular/files/patch-src_util.c (contents, props changed) Deleted: head/mail/popular/files/patch-src-Makefile.in head/mail/popular/files/patch-src-io.c head/mail/popular/files/patch-src-pcheckd.c head/mail/popular/files/patch-src-pdeliver.c head/mail/popular/files/patch-src-popular.h head/mail/popular/files/patch-src-pproxy.c head/mail/popular/files/patch-src-pserv.c head/mail/popular/files/patch-src-sig.c head/mail/popular/files/patch-src-util.c Modified: head/mail/popular/Makefile head/mail/popular/files/patch-configure Modified: head/mail/popular/Makefile ============================================================================== --- head/mail/popular/Makefile Wed Aug 19 13:04:48 2020 (r545322) +++ head/mail/popular/Makefile Wed Aug 19 13:17:38 2020 (r545323) @@ -3,19 +3,21 @@ 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 \ @@ -24,6 +26,7 @@ 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 Modified: head/mail/popular/files/patch-configure ============================================================================== --- head/mail/popular/files/patch-configure Wed Aug 19 13:04:48 2020 (r545322) +++ head/mail/popular/files/patch-configure Wed Aug 19 13:17:38 2020 (r545323) @@ -1,6 +1,6 @@ ---- 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 @@ -17,7 +17,7 @@ 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 Added: head/mail/popular/files/patch-doc_man_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-doc_man_Makefile.am Wed Aug 19 13:17:38 2020 (r545323) @@ -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 $@ + + + #----------------------------------------------------------------------------- Added: head/mail/popular/files/patch-doc_man_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-doc_man_Makefile.in Wed Aug 19 13:17:38 2020 (r545323) @@ -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 Added: head/mail/popular/files/patch-src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_Makefile.in Wed Aug 19 13:17:38 2020 (r545323) @@ -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 = Added: head/mail/popular/files/patch-src_io.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_io.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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; + } + } Added: head/mail/popular/files/patch-src_pcheckd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_pcheckd.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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. */ Added: head/mail/popular/files/patch-src_pdeliver.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_pdeliver.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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; + + + /***************************************************************************** Added: head/mail/popular/files/patch-src_popular.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_popular.h Wed Aug 19 13:17:38 2020 (r545323) @@ -0,0 +1,12 @@ +--- src/popular.h.orig 2002-11-28 13:56:03 UTC ++++ src/popular.h +@@ -26,9 +26,7 @@ + + *****************************************************************************/ + +-#include <alloca.h> + #include <arpa/inet.h> +-#include <crypt.h> + #include <ctype.h> + #include <dirent.h> + #include <dlfcn.h> Added: head/mail/popular/files/patch-src_pproxy.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_pproxy.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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; Added: head/mail/popular/files/patch-src_pserv.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_pserv.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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; Added: head/mail/popular/files/patch-src_sig.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_sig.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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 Added: head/mail/popular/files/patch-src_util.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/popular/files/patch-src_util.c Wed Aug 19 13:17:38 2020 (r545323) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008191317.07JDHdpP053293>