From 55d552afcc883762e1b547c9c806bf33dd0c119e Mon Sep 17 00:00:00 2001 From: danh Date: Tue, 15 Aug 2000 20:36:57 +0000 Subject: [PATCH] general port cleanup; added apop flavor; changed default syslog facility and level --- mail/solid-pop3d/Makefile | 27 ++++++++++---- mail/solid-pop3d/patches/patch-Makefile_in | 19 +++++----- .../solid-pop3d/patches/patch-man_Makefile_in | 7 ++-- mail/solid-pop3d/patches/patch-man_spop3d_8 | 5 +-- .../patches/patch-man_spop3d_conf_5 | 5 +-- mail/solid-pop3d/patches/patch-src_const_h | 12 ++++++- mail/solid-pop3d/pkg/COMMENT | 2 +- mail/solid-pop3d/pkg/DESCR | 35 ++++++++++--------- mail/solid-pop3d/pkg/MESSAGE | 2 +- 9 files changed, 72 insertions(+), 42 deletions(-) diff --git a/mail/solid-pop3d/Makefile b/mail/solid-pop3d/Makefile index 2e0820a7846..c87f3cb0676 100644 --- a/mail/solid-pop3d/Makefile +++ b/mail/solid-pop3d/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2000/08/07 03:59:10 brad Exp $ +# $OpenBSD: Makefile,v 1.5 2000/08/15 20:36:57 danh Exp $ DISTNAME= solid-pop3d-0.15 -CATEGORIES= net mail -NEED_VERSION= 1.310 -MASTER_SITES= http://solidpop3d.pld.org.pl/ - +CATEGORIES= mail +NEED_VERSION= 1.319 HOMEPAGE= http://solidpop3d.pld.org.pl/ MAINTAINER= danh@openbsd.org @@ -14,9 +12,26 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MASTER_SITES= ${HOMEPAGE} \ + ftp://ftp.rudykot.pl/pub/solidpop3d/ \ + ftp://sedez.iq.pl/pub/solidpop3d/ \ + ftp://dione.ids.pl/pub/solidpop3d/ + +FLAVORS= apop +FLAVOR?= + +SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --localstatedir="/var/spool/spop3d" --mandir="${PREFIX}/man" \ --enable-last --enable-bulletins --enable-nonip --enable-ipv6 \ - --enable-logextend --enable-statistics + --enable-resolve --enable-connect --enable-logextend \ + --enable-statistics + +# enable support for APOP authentication. +.if ${FLAVOR:L:Mapop} +CONFIGURE_ARGS+= --enable-userconfig --enable-apop +.else +CONFIGURE_ARGS+= --disable-userconfig --disable-apop +.endif .include diff --git a/mail/solid-pop3d/patches/patch-Makefile_in b/mail/solid-pop3d/patches/patch-Makefile_in index 2d235931b3c..d2c8b8f550e 100644 --- a/mail/solid-pop3d/patches/patch-Makefile_in +++ b/mail/solid-pop3d/patches/patch-Makefile_in @@ -1,6 +1,7 @@ ---- Makefile.in.orig Tue Jun 20 15:51:42 2000 -+++ Makefile.in Tue Jun 20 15:53:43 2000 -@@ -45,7 +45,7 @@ +$OpenBSD: patch-Makefile_in,v 1.2 2000/08/15 20:36:58 danh Exp $ +--- Makefile.in.orig Fri Apr 21 12:29:57 2000 ++++ Makefile.in Thu Aug 10 03:45:11 2000 +@@ -45,7 +45,7 @@ all: all-recursive all-recursive: @for subdir in $(SUBDIRS); do \ target=`echo $@ | sed s/-recursive//`; \ @@ -9,7 +10,7 @@ || exit 1; \ done -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ mostlyclean: clean clean-recursive: @for subdir in $(SUBDIRS); do \ @@ -18,7 +19,7 @@ || exit 1; \ done -@@ -66,7 +66,7 @@ +@@ -66,7 +66,7 @@ distclean-pwd: distclean-recursive: @for subdir in $(SUBDIRS); do \ @@ -27,7 +28,7 @@ || exit 1; \ done -@@ -74,7 +74,7 @@ +@@ -74,7 +74,7 @@ maintainer-clean: maintainer-clean-recur maintainer-clean-recursive: @for subdir in $(SUBDIRS); do \ @@ -36,7 +37,7 @@ || exit 1; \ done -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ install: install-recursive install-recursive: @for subdir in $(SUBDIRS); do \ @@ -45,7 +46,7 @@ || exit 1; \ done -@@ -93,7 +93,7 @@ +@@ -93,7 +93,7 @@ uninstall: uninstall-recursive uninstall-recursive: @for subdir in $(SUBDIRS); do \ @@ -54,7 +55,7 @@ || exit 1; \ done -@@ -119,7 +119,7 @@ +@@ -119,7 +119,7 @@ distdir: $(DISTFILES) mkdir $(distdir)/$$subdir \ || exit 1; \ chmod 755 $(distdir)/$$subdir; \ diff --git a/mail/solid-pop3d/patches/patch-man_Makefile_in b/mail/solid-pop3d/patches/patch-man_Makefile_in index a617fe0c332..45d8e039328 100644 --- a/mail/solid-pop3d/patches/patch-man_Makefile_in +++ b/mail/solid-pop3d/patches/patch-man_Makefile_in @@ -1,6 +1,7 @@ ---- man/Makefile.in.orig Tue Jun 20 16:11:13 2000 -+++ man/Makefile.in Tue Jun 20 16:11:49 2000 -@@ -157,10 +157,10 @@ +$OpenBSD: patch-man_Makefile_in,v 1.2 2000/08/15 20:36:58 danh Exp $ +--- man/Makefile.in.orig Tue Apr 18 12:03:55 2000 ++++ man/Makefile.in Thu Aug 10 03:45:11 2000 +@@ -157,10 +157,10 @@ uninstall-man8: done install-man: $(MANS) @$(NORMAL_INSTALL) diff --git a/mail/solid-pop3d/patches/patch-man_spop3d_8 b/mail/solid-pop3d/patches/patch-man_spop3d_8 index 00bbc1a8cbb..359e3755a52 100644 --- a/mail/solid-pop3d/patches/patch-man_spop3d_8 +++ b/mail/solid-pop3d/patches/patch-man_spop3d_8 @@ -1,5 +1,6 @@ ---- man/spop3d.8.orig Mon Jun 19 10:12:57 2000 -+++ man/spop3d.8 Mon Jun 19 10:13:38 2000 +$OpenBSD: patch-man_spop3d_8,v 1.2 2000/08/15 20:36:58 danh Exp $ +--- man/spop3d.8.orig Tue Apr 18 12:03:56 2000 ++++ man/spop3d.8 Thu Aug 10 03:45:11 2000 @@ -70,7 +70,7 @@ and is expanded to .I /home/jurekb/Mail/bugtraq diff --git a/mail/solid-pop3d/patches/patch-man_spop3d_conf_5 b/mail/solid-pop3d/patches/patch-man_spop3d_conf_5 index 14e2f01670f..4f814d43f9c 100644 --- a/mail/solid-pop3d/patches/patch-man_spop3d_conf_5 +++ b/mail/solid-pop3d/patches/patch-man_spop3d_conf_5 @@ -1,5 +1,6 @@ ---- man/spop3d.conf.5.orig Mon Jun 19 10:14:10 2000 -+++ man/spop3d.conf.5 Mon Jun 19 10:14:43 2000 +$OpenBSD: patch-man_spop3d_conf_5,v 1.2 2000/08/15 20:36:58 danh Exp $ +--- man/spop3d.conf.5.orig Sun Apr 30 16:56:18 2000 ++++ man/spop3d.conf.5 Thu Aug 10 03:45:11 2000 @@ -107,7 +107,7 @@ Users can authenticate themselves with A .B MailDropName string Specify path to maildrop. The format is the same as for \fB-n\fP option in diff --git a/mail/solid-pop3d/patches/patch-src_const_h b/mail/solid-pop3d/patches/patch-src_const_h index 3fc3be9d961..b05468df61d 100644 --- a/mail/solid-pop3d/patches/patch-src_const_h +++ b/mail/solid-pop3d/patches/patch-src_const_h @@ -1,5 +1,6 @@ +$OpenBSD: patch-src_const_h,v 1.2 2000/08/15 20:36:58 danh Exp $ --- src/const.h.orig Tue Apr 18 12:04:05 2000 -+++ src/const.h Mon Jun 19 10:42:31 2000 ++++ src/const.h Thu Aug 10 03:51:24 2000 @@ -36,7 +36,7 @@ #define DEFWCCOUNT 5 @@ -18,3 +19,12 @@ #define PER_SOURCE 5 #define MAX_SESSIONS 50 +@@ -59,6 +59,6 @@ + #define POP3_PORT 110 + + #define POP_IDENT "spop3d" +-#define POP_PRIORITY LOG_NOTICE +-#define POP_FACILITY LOG_LOCAL0 ++#define POP_PRIORITY LOG_INFO ++#define POP_FACILITY LOG_DAEMON + #endif /* const.h */ diff --git a/mail/solid-pop3d/pkg/COMMENT b/mail/solid-pop3d/pkg/COMMENT index 823e2f6fc3a..e5ab484565f 100644 --- a/mail/solid-pop3d/pkg/COMMENT +++ b/mail/solid-pop3d/pkg/COMMENT @@ -1 +1 @@ -Solid POP3 server +flexible POP3 server diff --git a/mail/solid-pop3d/pkg/DESCR b/mail/solid-pop3d/pkg/DESCR index e0766da4906..955c504b192 100644 --- a/mail/solid-pop3d/pkg/DESCR +++ b/mail/solid-pop3d/pkg/DESCR @@ -1,22 +1,23 @@ -The Solid POP3 Server is an implementation of a Post Office Protocol version 3 -server that has flexibility as its main goal. The server is easily configurable -and has support for few features such as: +The Solid POP3 Server is an implementation of a Post Office Protocol +version 3 server that has flexibility as its main goal. The server is +easily configurable and has support for few features such as: - - APOP authentication scheme - - virtual hosting - - maildir and mailbox handling - - bulletins + - APOP authentication scheme + - virtual hosting + - maildir and mailbox handling + - bulletins - expiration of messages -Each user can specify his maildrop (its position and type). The format used in -specification of maildrop's position should handle almost all widely-used system -configurations. The server also seems to be fast, however no tests have been -performed, so it's rather relative feeling. The design used is very similar to -the design of Solar Designer's POPA3D server. This solution let's minimalize -size of code working with root privileges. The code was also heavily checked for -buffer overflow leaks and file races. None have been found as for now. All -operations on files are done with user privileges. There is no SUID APOP secrets -database management program (as in QPOP). Each user can specify his secret in -his own home directory. +Each user can specify his maildrop (its position and type). The format +used in specification of maildrop's position should handle almost all +widely-used system configurations. The server also seems to be fast, +however no tests have been performed, so it's rather relative feeling. +The design used is very similar to the design of Solar Designer's POPA3D +server. This solution let's minimalize size of code working with root +privileges. The code was also heavily checked for buffer overflow leaks +and file races. None have been found as for now. All operations on files +are done with user privileges. There is no SUID APOP secrets database +management program (as in QPOP). Each user can specify his secret in his +own home directory. WWW: ${HOMEPAGE} diff --git a/mail/solid-pop3d/pkg/MESSAGE b/mail/solid-pop3d/pkg/MESSAGE index 6bf5ade27f3..3747ee9f6ac 100644 --- a/mail/solid-pop3d/pkg/MESSAGE +++ b/mail/solid-pop3d/pkg/MESSAGE @@ -1,5 +1,5 @@ +--------------- -| You'll also have to edit /etc/inetd.conf manually and add +| You'll have to edit /etc/inetd.conf manually and add | lines like the following: | | pop3 stream tcp nowait root ${PREFIX}/sbin/spop3d spop3d