PATCH: OpenBSD bug fixes

[Jonathan Walther]

-----BEGIN PGP SIGNED MESSAGE-----

Here are the patches the OpenBSD project applies to
solidpop3d version 0.15

The $(AM_MAKEFLAGS) addition fixes a potential bug and increases
portability.

The change from /var/spool/mail to /var/mail reflects the current
Linux standard as well as universal BSD practice.

Not sure, but I think the change from running as user spop3d to
user nobody was done for security.

Changing the log levels makes it fit in better with OpenBSD

Jonathan

$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//`; \
- -	  (cd $$subdir && $(MAKE) $$target) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target) \
 	  || exit 1; \
 	done

@@ -55,7 +55,7 @@ mostlyclean: clean

 clean-recursive:
 	@for subdir in $(SUBDIRS); do \
- -	  (cd $$subdir && $(MAKE) clean) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) clean) \
 	  || exit 1; \
 	done

@@ -66,7 +66,7 @@ distclean-pwd:

 distclean-recursive:
 	@for subdir in $(SUBDIRS); do \
- -	  (cd $$subdir && $(MAKE) distclean) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) distclean) \
 	  || exit 1; \
 	done

@@ -74,7 +74,7 @@ maintainer-clean: maintainer-clean-recur

 maintainer-clean-recursive:
 	@for subdir in $(SUBDIRS); do \
- -	  (cd $$subdir && $(MAKE) maintainer-clean) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) maintainer-clean) \
 	  || exit 1; \
 	done

@@ -85,7 +85,7 @@ install: install-recursive

 install-recursive:
 	@for subdir in $(SUBDIRS); do \
- -	  (cd $$subdir && $(MAKE) install) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) install) \
 	  || exit 1; \
 	done

@@ -93,7 +93,7 @@ uninstall: uninstall-recursive

 uninstall-recursive:
 	@for subdir in $(SUBDIRS); do \
- -	  (cd $$subdir && $(MAKE) uninstall) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) uninstall) \
 	  || exit 1; \
 	done

@@ -119,7 +119,7 @@ distdir: $(DISTFILES)
 	  mkdir $(distdir)/$$subdir \
 	  || exit 1; \
 	  chmod 755 $(distdir)/$$subdir; \
- -	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	  || exit 1; \
 	  chmod 644 $(distdir)/$$subdir/*; \
 	done
$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)
- -	$(MAKE) install-man1 install-man5 install-man8
+	$(MAKE) $(AM_MAKEFLAGS) install-man1 install-man5 install-man8
 uninstall-man:
 	@$(NORMAL_UNINSTALL)
- -	$(MAKE) uninstall-man1 uninstall-man5 uninstall-man8
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1 uninstall-man5 uninstall-man8

 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

$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
 for "jurekb" user on my system. The default is
- -.I /var/spool/mail/%s
+.I /var/mail/%s
 or
 .I Maildir
 when mailbox support is not compiled in.
$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
 \fBspop3d\fP (8). Default value is
- -.I /var/spool/mail/%s
+.I /var/mail/%s
 .TP
 .B MailDropType string
 Specify type of maildrop. The allowed values are \fImailbox\fP and
@@ -204,7 +204,7 @@ exist. Option is disabled by default.
 	DoMapping 	true
 	UnreadExpire	never
 	APOPServerName	jakis.tam.host.w.pl
- -	MailDropName	"/var/spool/mail/%s" /* It is a comment */
+	MailDropName	"/var/mail/%s" /* It is a comment */
 	MailDropType	mailbox
 	AutoLogoutTime	5s
 	UserOverride	yes
$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	Thu Aug 10 03:51:24 2000
@@ -36,7 +36,7 @@
 #define DEFWCCOUNT 5

 #ifdef MDMAILBOX
- -#define DEFMAILDROPNAME "/var/spool/mail/%s"
+#define DEFMAILDROPNAME "/var/mail/%s"
 #else
 #define DEFMAILDROPNAME "Maildir"
 #endif
@@ -50,7 +50,7 @@
 #define MAXMDTYPENAMELENGTH 40
 #define USERCFG ".spop3d"
 #define USERBULL ".spop3d-bull"
- -#define POPUSER "spop3d"
+#define POPUSER "nobody"

 #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 */

-----BEGIN PGP SIGNATURE-----
Version: 2.6.3ia
Charset: noconv

iQCVAwUBO4PMNsK9HT/YfGeBAQHBhAQAjIGul/7MJHyjx11QAh3yN+0lFSjeSMBA
pyTG0w3WI2OCit4ciut5EQECzHx5xBKfVGZHhv1FxAyrBwl5Nazf+nYXsnZ1+/Os
2YTj182vv9StUWC8E/7+CPuWh5e12dNrEALjc2Qdn6R30WDS5j8VgshdoDBn2vI1
wOqcI76P1ME=
=DmUw
-----END PGP SIGNATURE-----