Add APOP patch from Dug Song as a flavor, requested by Attila Nagy <bra@fsn.hu>

Note that the apop flavor does APOP authentication _only_,
complain to Dug Song if that bothers you. :-)
This commit is contained in:
camield 2000-08-04 09:51:00 +00:00
parent 0b1cea4fcf
commit ba5efa316b
6 changed files with 66 additions and 45 deletions

View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.12 2000/06/16 23:06:09 espie Exp $
# $OpenBSD: Makefile,v 1.13 2000/08/04 09:51:00 camield Exp $
DISTNAME= popa3d-0.4
HOMEPAGE= http://www.openwall.com/popa3d/
CATEGORIES= net mail
NEED_VERSION= 1.294
NEED_VERSION= 1.218
MAINTAINER= cd@sentia.nl
MASTER_SITES= ${HOMEPAGE} \
MASTER_SITES= http://www.openwall.com/popa3d/ \
ftp://ftp.openwall.com/popa3d/ \
ftp://ftp.false.com/security/popa3d/ \
ftp://ftp.dataforce.net/pub/solar/
@ -16,10 +14,28 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
ALL_TARGET= popa3d
FAKE= Yes
NO_CONFIGURE= Yes
MAKE_FLAGS= CC=${CC} LD=${CC} CFLAGS="-c ${CFLAGS}"
FLAVORS= apop
FLAVOR?=
.if ${FLAVOR:L:Mapop}
MASTER_SITES0= http://www.monkey.org/~dugsong/
PATCHFILES= popa3d-0.4-apop.patch-1:0
PATCH_DIST_STRIP= -p1
.else
# the original Makefile does not have an 'all' target
ALL_TARGET=popa3d
.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/popa3d ${PREFIX}/libexec
.if ${FLAVOR:L:Mapop}
${INSTALL_PROGRAM} ${WRKSRC}/popauth ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/popauth.8 ${PREFIX}/man/man8
.endif
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
MD5 (popa3d-0.4-apop.patch-1) = b2a0a1c92e07fbbaf1761ed2706b494e
MD5 (popa3d-0.4.tar.gz) = 4ce2ed209abeaeaae7724d8d24bb7dbf
RMD160 (popa3d-0.4-apop.patch-1) = 24180a2821384b2431ef56c488079d3f8d9bbfc4
RMD160 (popa3d-0.4.tar.gz) = 869ea1d25a626ce9248061894c47c1b1aacfdd9c
SHA1 (popa3d-0.4-apop.patch-1) = a2550c8ddef695c8bdd3ee113abf54e8858f2c4d
SHA1 (popa3d-0.4.tar.gz) = 47df1be78048b68b6ce7b552cccd76579d576710

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-Makefile,v 1.1 2000/08/04 09:51:00 camield Exp $
This patch is generated with diff -U2 and some careful hand-editing,
making it apply cleanly on both flavors.
--- params.h.realorig Tue Feb 1 07:16:24 2000
+++ params.h Wed Aug 2 20:50:55 2000
@@ -34,5 +34,5 @@
* and its UID must not be used for any other purpose.
*/
-#define POP_USER "popa3d"
+#define POP_USER "nobody"
/*
@@ -63,5 +63,5 @@
* Note: password aging is not supported.
*/
-#define AUTH_SHADOW 1
+#define AUTH_SHADOW 0
/*
@@ -70,5 +76,6 @@
* for valid usernames. Adjust it for your crypt(3).
*/
-#define AUTH_DUMMY_SALT "xx"
+/* echo -n "dummyblowfishsalt" | encrypt -b 7 */
+#define AUTH_DUMMY_SALT "$2a$07$.SZB2Z1e3w0fyDRiRd8k/eHANXfEMcuNLZNva1iUFCzjVF0CzHbkq"
/*
@@ -82,5 +89,5 @@
* spools are currently supported.
*/
-#define MAIL_SPOOL_PATH "/var/spool/mail"
+#define MAIL_SPOOL_PATH "/var/mail"
/*

View File

@ -1,38 +0,0 @@
--- params.h.orig Thu Feb 3 15:45:32 2000
+++ params.h Thu Feb 3 15:59:36 2000
@@ -33,7 +33,7 @@
* An unprivileged dummy user to run as before authentication. The user
* and its UID must not be used for any other purpose.
*/
-#define POP_USER "popa3d"
+#define POP_USER "nobody"
/*
* Sessions will be closed if idle for longer than POP_TIMEOUT seconds.
@@ -62,14 +62,15 @@
* Do we have shadow passwords? (Not for *BSD.)
* Note: password aging is not supported.
*/
-#define AUTH_SHADOW 1
+#define AUTH_SHADOW 0
/*
* A salt used to waste some CPU time on dummy crypt(3) calls and make
* it harder (but still far from impossible, on most systems) to check
* for valid usernames. Adjust it for your crypt(3).
*/
-#define AUTH_DUMMY_SALT "xx"
+/* echo -n "dummyblowfishsalt" | encrypt -b 7 */
+#define AUTH_DUMMY_SALT "$2a$07$.SZB2Z1e3w0fyDRiRd8k/eHANXfEMcuNLZNva1iUFCzjVF0CzHbkq"
/*
* Message to return to the client when authentication fails. You can
@@ -81,7 +82,7 @@
* Your mail spool directory. Note: only local (non-NFS) mode 775 mail
* spools are currently supported.
*/
-#define MAIL_SPOOL_PATH "/var/spool/mail"
+#define MAIL_SPOOL_PATH "/var/mail"
/*
* How do we talk to syslogd? These should be fine for most systems.

View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PFRAG.apop,v 1.1 2000/08/04 09:51:00 camield Exp $
bin/popauth
man/man8/popauth.8

View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2000/06/14 07:30:45 camield Exp $
@comment $OpenBSD: PLIST,v 1.3 2000/08/04 09:51:00 camield Exp $
libexec/popa3d
%%apop%%