From 2f2d2b390d011cfd8598cd14d166f28bdc5efc0a Mon Sep 17 00:00:00 2001 From: danh Date: Mon, 19 Feb 2001 15:00:46 +0000 Subject: [PATCH] - bump NEED_VERSION. - update IPv6 patch from Kame (20010128). - add no_ipv6 flavor so there is an option to run without inetd. --- mail/cucipop/Makefile | 13 ++++++++--- mail/cucipop/files/md5 | 6 ++--- .../patches/{patch-aa => patch-Makefile} | 5 ++-- .../{patch-ab => patch-authenticate_c} | 15 ++++++------ .../patches/{patch-af => patch-config_h} | 7 +++--- mail/cucipop/patches/patch-cucipop.c | 13 ----------- .../patches/{patch-ad => patch-cucipop_8} | 19 +++++++-------- mail/cucipop/patches/patch-cucipop_c | 23 +++++++++++++++++++ .../patches/{patch-ae => patch-makevpopdb_8} | 5 ++-- .../patches/{patch-ac => patch-xcreat_c} | 3 ++- mail/cucipop/pkg/DESCR | 4 ++++ mail/cucipop/pkg/PLIST | 1 + 12 files changed, 71 insertions(+), 43 deletions(-) rename mail/cucipop/patches/{patch-aa => patch-Makefile} (67%) rename mail/cucipop/patches/{patch-ab => patch-authenticate_c} (82%) rename mail/cucipop/patches/{patch-af => patch-config_h} (77%) delete mode 100644 mail/cucipop/patches/patch-cucipop.c rename mail/cucipop/patches/{patch-ad => patch-cucipop_8} (79%) create mode 100644 mail/cucipop/patches/patch-cucipop_c rename mail/cucipop/patches/{patch-ae => patch-makevpopdb_8} (58%) rename mail/cucipop/patches/{patch-ac => patch-xcreat_c} (83%) diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile index b7aca9d2786..29844d14dac 100644 --- a/mail/cucipop/Makefile +++ b/mail/cucipop/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.10 2000/12/25 06:52:22 brad Exp $ +# $OpenBSD: Makefile,v 1.11 2001/02/19 15:00:46 danh Exp $ DISTNAME= cucipop-1.31 CATEGORIES= mail -NEED_VERSION= 1.336 +NEED_VERSION= 1.356 MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/ MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/ -PATCHFILES= cucipop-1.31-v6-20001122.diff.gz:0 +PATCHFILES= cucipop-1.31-v6-20010128.diff.gz:0 PATCH_DIST_STRIP= -p1 MAINTAINER= ports@openbsd.org @@ -16,7 +16,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= "no fee" PERMIT_DISTFILES_FTP= Yes +FLAVORS= no_ipv6 +FLAVOR?= + +.if ${FLAVOR:L:Mno_ipv6} +MAKE_FLAGS= CFLAGS="${CFLAGS}" LDFLAGS="" +.else MAKE_FLAGS= CFLAGS="${CFLAGS} -DINET6" LDFLAGS="" +.endif post-patch: .for f in cucipop.8 makevpopdb.8 diff --git a/mail/cucipop/files/md5 b/mail/cucipop/files/md5 index b9eb413a9f4..8f6d23c1db8 100644 --- a/mail/cucipop/files/md5 +++ b/mail/cucipop/files/md5 @@ -1,6 +1,6 @@ -MD5 (cucipop-1.31-v6-20001122.diff.gz) = 3001f8b32a7ec0fae48e5f2c94f44420 +MD5 (cucipop-1.31-v6-20010128.diff.gz) = 4f1c19bdf1a8bee1fb480306b4b64768 MD5 (cucipop-1.31.tar.gz) = e4dc7c3c6e3a4a83dde5cbbe21fee5f8 -RMD160 (cucipop-1.31-v6-20001122.diff.gz) = a58e19fa003fa486c41ce22e82d126a7b95ffb33 +RMD160 (cucipop-1.31-v6-20010128.diff.gz) = c811e848d5d1f81087af0a3b3ff8273c34f7ad66 RMD160 (cucipop-1.31.tar.gz) = dbca1b313a755544578f89586c200a0227858f92 -SHA1 (cucipop-1.31-v6-20001122.diff.gz) = 1190629f1a2467ece31809ef8282f2eb292b9cfd +SHA1 (cucipop-1.31-v6-20010128.diff.gz) = 4f580a4ddd59fb273e064bb5b26c5e155f081365 SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434 diff --git a/mail/cucipop/patches/patch-aa b/mail/cucipop/patches/patch-Makefile similarity index 67% rename from mail/cucipop/patches/patch-aa rename to mail/cucipop/patches/patch-Makefile index 8d83bd67c88..73376e8916a 100644 --- a/mail/cucipop/patches/patch-aa +++ b/mail/cucipop/patches/patch-Makefile @@ -1,6 +1,7 @@ +$OpenBSD: patch-Makefile,v 1.1 2001/02/19 15:00:48 danh Exp $ --- Makefile.orig Tue May 12 17:09:14 1998 -+++ Makefile Mon Mar 27 15:25:45 2000 -@@ -32,7 +32,7 @@ ++++ Makefile Tue Jan 30 12:43:55 2001 +@@ -32,7 +32,7 @@ REGPERM=0644 MD5_OBJ=md5/md5c.$(O) OBJS=cucipop.$(O) authenticate.$(O) atotime.$(O) locking.$(O) xcreat.$(O) \ diff --git a/mail/cucipop/patches/patch-ab b/mail/cucipop/patches/patch-authenticate_c similarity index 82% rename from mail/cucipop/patches/patch-ab rename to mail/cucipop/patches/patch-authenticate_c index a94c3909a33..3e838881593 100644 --- a/mail/cucipop/patches/patch-ab +++ b/mail/cucipop/patches/patch-authenticate_c @@ -1,6 +1,7 @@ ---- authenticate.c.orig Mon Dec 25 01:20:36 2000 -+++ authenticate.c Mon Dec 25 01:25:08 2000 -@@ -28,7 +28,7 @@ +$OpenBSD: patch-authenticate_c,v 1.1 2001/02/19 15:00:55 danh Exp $ +--- authenticate.c.orig Tue Jan 30 12:43:55 2001 ++++ authenticate.c Tue Jan 30 12:43:55 2001 +@@ -28,7 +28,7 @@ static /*const*/char rcsid[]= #else #include "config.h" @@ -9,7 +10,7 @@ #include #include -@@ -50,7 +50,7 @@ +@@ -50,7 +50,7 @@ static /*const*/char rcsid[]= #define VIRTUALUSER "vpop" #ifndef MAILSPOOLDIR @@ -18,7 +19,7 @@ #endif #ifndef MAILSPOOLHASH #define MAILSPOOLHASH 0 /* 2 would deliver to /var/spool/mail/b/a/bar */ -@@ -100,6 +100,7 @@ +@@ -100,6 +100,7 @@ static void getlogname(user,sock)const c struct sockaddr_in sockname; #endif int namelen=sizeof sockname;const char*retval=""; @@ -26,7 +27,7 @@ if(!getsockname(sock,(struct sockaddr*)&sockname,&namelen)) { #ifdef INET6 -@@ -115,16 +116,17 @@ +@@ -115,16 +116,17 @@ static void getlogname(user,sock)const c retval=hent->h_name; #endif } @@ -48,7 +49,7 @@ #ifdef VIRTUALSERVER DB_ENV dbenv;DB*db; memset(&dbenv,0,sizeof dbenv); -@@ -155,14 +157,18 @@ +@@ -155,14 +157,18 @@ freesec: { free(authi.usersecret); novirt: strcpy(auth_logname,user); } db->close(db,0); diff --git a/mail/cucipop/patches/patch-af b/mail/cucipop/patches/patch-config_h similarity index 77% rename from mail/cucipop/patches/patch-af rename to mail/cucipop/patches/patch-config_h index 21aaf38f5d6..62a03943b23 100644 --- a/mail/cucipop/patches/patch-af +++ b/mail/cucipop/patches/patch-config_h @@ -1,7 +1,8 @@ +$OpenBSD: patch-config_h,v 1.1 2001/02/19 15:00:55 danh Exp $ --- config.h.orig Tue May 12 17:09:14 1998 -+++ config.h Mon Dec 25 01:28:21 2000 ++++ config.h Tue Jan 30 12:43:56 2001 @@ -1,9 +1,9 @@ - /*$Id: patch-af,v 1.3 2000/12/25 06:37:18 brad Exp $*/ + /*$Id: patch-config_h,v 1.1 2001/02/19 15:00:55 danh Exp $*/ -#define USEdot_lock /**/ +/*#define USEdot_lock /**/ @@ -12,7 +13,7 @@ /*#define SHADOW_PASSWD /**/ /* shadow password library support */ -@@ -84,6 +84,6 @@ +@@ -84,6 +84,6 @@ typedef unsigned long uidl_t; /* f #define MAXBULLETINS 64 #define MAXSTATEAGE 8388608 /* > 3 months */ #define MEMORY_CACHE (64*1024) diff --git a/mail/cucipop/patches/patch-cucipop.c b/mail/cucipop/patches/patch-cucipop.c deleted file mode 100644 index 95ffbe6b85a..00000000000 --- a/mail/cucipop/patches/patch-cucipop.c +++ /dev/null @@ -1,13 +0,0 @@ ---- cucipop.c.orig Wed Dec 27 12:22:36 2000 -+++ cucipop.c Wed Dec 27 12:27:55 2000 -@@ -754,8 +754,8 @@ - curfd=-1; - setsockopt(serverfd,SOL_SOCKET,SO_REUSEADDR,&curfd,sizeof curfd); - if(bind(serverfd,(struct sockaddr*)&peername,sizeof peername)) -- { syslog(LOG_CRIT,"unable to bind socket %d",POP3_PORT); -- fprintf(stderr,"%s: Can't bind socket %d\n",cucipopn,POP3_PORT); -+ { syslog(LOG_CRIT,"unable to bind socket %d",htons(port)); -+ fprintf(stderr,"%s: Can't bind socket %d\n",cucipopn,htons(port)); - return EX_OSFILE; - } - fclose(stderr); diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-cucipop_8 similarity index 79% rename from mail/cucipop/patches/patch-ad rename to mail/cucipop/patches/patch-cucipop_8 index 5ccf3fd46d8..50b8d32db60 100644 --- a/mail/cucipop/patches/patch-ad +++ b/mail/cucipop/patches/patch-cucipop_8 @@ -1,21 +1,22 @@ +$OpenBSD: patch-cucipop_8,v 1.1 2001/02/19 15:00:58 danh Exp $ --- cucipop.8.orig Mon May 11 12:35:19 1998 -+++ cucipop.8 Mon Dec 25 01:41:59 2000 ++++ cucipop.8 Tue Jan 30 12:43:56 2001 @@ -48,12 +48,12 @@ .SH NAME cucipop \- Cubic Circle POP3 daemon .SH SYNOPSIS -.B /usr/sbin/cucipop -+.B !!PREFIX!!/libexec/cucipop ++.B /usr/local/libexec/cucipop .RB [ \-qaYdPUSDAT ] .RB [ "\-E \fIage\fP" ] .RB [ "\-p \fIport\fP" ] .br -.B /usr/sbin/cucipop -+.B !!PREFIX!!/libexec/cucipop ++.B /usr/local/libexec/cucipop .B \-v .ad .SH DESCRIPTION -@@ -132,12 +132,12 @@ +@@ -132,12 +132,12 @@ Bind to a different .IR port . .SH EXAMPLES Typically @@ -30,23 +31,23 @@ .Ex In order to start cucipop from within .BR inetd (8), -@@ -145,20 +145,20 @@ +@@ -145,20 +145,20 @@ the following entry in .BR inetd.conf (5) would be suitable: .Sx 1 -pop-3 stream tcp nowait root /usr/sbin/cucipop cucipop -Y -+pop3 stream tcp nowait root !!PREFIX!!/libexec/cucipop cucipop -Y ++pop3 stream tcp nowait root /usr/local/libexec/cucipop cucipop -Y .Ex If your site gets many hits from popclients, it would be preferable to start cucipop standalone as in: .Sx 1 -/usr/sbin/cucipop -Y -+!!PREFIX!!/libexec/cucipop -Y ++/usr/local/libexec/cucipop -Y .Ex Your typical BOFH setting would be: .Sx 1 -/usr/sbin/cucipop -YaSE 6w -+!!PREFIX!!/libexec/cucipop -YaSE 6w ++/usr/local/libexec/cucipop -YaSE 6w .Ex .SH FILES .TP 2.3i @@ -55,7 +56,7 @@ the default authentication .TP .B /etc/mail/vpop.db -@@ -166,25 +166,25 @@ +@@ -166,25 +166,25 @@ virtual host authentication, see the .BR makevpopdb (8) man page on how this file is created .TP diff --git a/mail/cucipop/patches/patch-cucipop_c b/mail/cucipop/patches/patch-cucipop_c new file mode 100644 index 00000000000..3d3dcc03857 --- /dev/null +++ b/mail/cucipop/patches/patch-cucipop_c @@ -0,0 +1,23 @@ +$OpenBSD: patch-cucipop_c,v 1.1 2001/02/19 15:00:58 danh Exp $ +--- cucipop.c.orig Tue Jan 30 13:37:01 2001 ++++ cucipop.c Tue Jan 30 13:40:20 2001 +@@ -741,7 +741,7 @@ usg: default:printusg(); + !debug&&(errno==ENOTSOCK||errno==EINVAL)) + { int serverfd,curfd; + signal(SIGHUP,SIG_IGN);signal(SIGPIPE,SIG_IGN);fclose(stdin); +- fclose(stdout);serverfd=socket(PF_INET,SOCK_STREAM,TCP_PROT); ++ fclose(stdout);serverfd=socket(AF_INET,SOCK_STREAM,IPPROTO_TCP); + #ifdef INET6 + /* XXX assumes INET */ + memset(&peername, 0, sizeof(peername)); +@@ -754,8 +754,8 @@ usg: default:printusg(); + curfd=-1; + setsockopt(serverfd,SOL_SOCKET,SO_REUSEADDR,&curfd,sizeof curfd); + if(bind(serverfd,(struct sockaddr*)&peername,sizeof peername)) +- { syslog(LOG_CRIT,"unable to bind socket %d",POP3_PORT); +- fprintf(stderr,"%s: Can't bind socket %d\n",cucipopn,POP3_PORT); ++ { syslog(LOG_CRIT,"unable to bind socket %d",port); ++ fprintf(stderr,"%s: Can't bind socket %d\n",cucipopn,port); + return EX_OSFILE; + } + fclose(stderr); diff --git a/mail/cucipop/patches/patch-ae b/mail/cucipop/patches/patch-makevpopdb_8 similarity index 58% rename from mail/cucipop/patches/patch-ae rename to mail/cucipop/patches/patch-makevpopdb_8 index 4ce51ff0491..15d96010f4d 100644 --- a/mail/cucipop/patches/patch-ae +++ b/mail/cucipop/patches/patch-makevpopdb_8 @@ -1,11 +1,12 @@ +$OpenBSD: patch-makevpopdb_8,v 1.1 2001/02/19 15:00:59 danh Exp $ --- makevpopdb.8.orig Sun May 10 08:57:40 1998 -+++ makevpopdb.8 Mon Dec 25 01:40:23 2000 ++++ makevpopdb.8 Tue Jan 30 12:43:56 2001 @@ -48,7 +48,7 @@ .SH NAME makevpopdb \- Creates the vpop database for cucipop .SH SYNOPSIS -.B /usr/sbin/makevpopdb -+.B !!PREFIX!!/libexec/makevpopdb ++.B /usr/local/libexec/makevpopdb .I dbasefile .ad .SH DESCRIPTION diff --git a/mail/cucipop/patches/patch-ac b/mail/cucipop/patches/patch-xcreat_c similarity index 83% rename from mail/cucipop/patches/patch-ac rename to mail/cucipop/patches/patch-xcreat_c index da9365555c3..5febb7724c6 100644 --- a/mail/cucipop/patches/patch-ac +++ b/mail/cucipop/patches/patch-xcreat_c @@ -1,5 +1,6 @@ +$OpenBSD: patch-xcreat_c,v 1.1 2001/02/19 15:00:59 danh Exp $ --- xcreat.c.orig Fri May 1 20:56:54 1998 -+++ xcreat.c Mon Mar 27 15:12:54 2000 ++++ xcreat.c Tue Jan 30 12:43:55 2001 @@ -22,7 +22,7 @@ /*#define NOuname /* uncomment if uname is not available */ /*#define NOstrpbrk /* uncomment if strpbrk is not available */ diff --git a/mail/cucipop/pkg/DESCR b/mail/cucipop/pkg/DESCR index a1e9596b1f0..fe83b822ba1 100644 --- a/mail/cucipop/pkg/DESCR +++ b/mail/cucipop/pkg/DESCR @@ -3,3 +3,7 @@ It supports both BSD-type and SysV-type mailbox formats. cucipop assumes that the mailbox it serves is not simultaneously accessed by a mailreader. Concurrency and locking issues are handled graciously if they restrict themselves to the mail delivery agent. + +Flavors: + no_ipv6 - build without IPv6 patch from Kame. This allows + cucipop to run without inetd. diff --git a/mail/cucipop/pkg/PLIST b/mail/cucipop/pkg/PLIST index 79406a4ee9d..0d3cc3f112a 100644 --- a/mail/cucipop/pkg/PLIST +++ b/mail/cucipop/pkg/PLIST @@ -1,3 +1,4 @@ +@comment $OpenBSD: PLIST,v 1.5 2001/02/19 15:01:03 danh Exp $ libexec/cucipop libexec/makevpopdb man/man8/cucipop.8