summaryrefslogtreecommitdiff
path: root/mail/cucipop
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-06-19 21:07:42 +0000
committerjlam <jlam@pkgsrc.org>2007-06-19 21:07:42 +0000
commitb21026e1815c55e54c20c6763cfb4ba18a70027a (patch)
tree84e454a46c4fa9d0ccfd170bdae07ea15ae14e35 /mail/cucipop
parent059b31c9f641dcef3e42db9ce3ea8864cc240455 (diff)
downloadpkgsrc-b21026e1815c55e54c20c6763cfb4ba18a70027a.tar.gz
* makevpopdb(8) does not need to be setgid anything. It is supposed to be
run as "root". * Remove unnecessary passing of ROOT_USER and ROOT_GROUP to the distribution Makefile. Instead, we simply use BSD_INSTALL_* macros to do the installation and use SPECIAL_PERMS to clean up and special permissions after the fact. * Add a TODO section to the package Makefile that highlights the things that need to be done to fix this package. * Fix MESSAGE to refer to ${PREFIX}, not ${LOCALBASE}, for the location of the installed files. Bump PKGREVISION to 3 due to change in permissions for makevpopdb.
Diffstat (limited to 'mail/cucipop')
-rw-r--r--mail/cucipop/MESSAGE6
-rw-r--r--mail/cucipop/Makefile23
-rw-r--r--mail/cucipop/distinfo4
-rw-r--r--mail/cucipop/patches/patch-ad21
4 files changed, 36 insertions, 18 deletions
diff --git a/mail/cucipop/MESSAGE b/mail/cucipop/MESSAGE
index 7ae2e915b2b..6f5b2dca36c 100644
--- a/mail/cucipop/MESSAGE
+++ b/mail/cucipop/MESSAGE
@@ -1,15 +1,15 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/29 15:16:22 grant Exp $
+$NetBSD: MESSAGE,v 1.4 2007/06/19 21:07:42 jlam Exp $
Please note that this package includes shareware software.
In order to enable the POP service, you should add the following
line to your /etc/inetd.conf:
- pop3 stream tcp nowait root ${LOCALBASE}/sbin/cucipop cucipop -Y
+ pop3 stream tcp nowait root ${PREFIX}/sbin/cucipop cucipop -Y
And for IPv6:
- pop3 stream tcp6 nowait root ${LOCALBASE}/sbin/cucipop cucipop -Y
+ pop3 stream tcp6 nowait root ${PREFIX}/sbin/cucipop cucipop -Y
===========================================================================
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index cd47ad6e0eb..9c9543ea574 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2007/06/15 18:15:17 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/06/19 21:07:42 jlam Exp $
#
DISTNAME= cucipop-1.31
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail
MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
@@ -13,15 +13,26 @@ PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= The Cubic Circle POP3 mail server
-
LICENSE= cucipop-license
-MAKE_ENV+= ROOT_USER=${ROOT_USER:Q}
-MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q}
-
REQD_DIRS+= ${PREFIX}/share/cucipop/bulletins
+
+# cucipop(8) needs to be able to create dotlocks in the mail spool
+# directory. The appropriate permissions should be set on sbin/cucipop
+# so that it can do this.
+#
SPECIAL_PERMS+= ${PREFIX}/sbin/cucipop ${ROOT_USER} ${ROOT_GROUP} 2555
+# XXX TODO:
+# XXX
+# XXX (1) sbin/cucipop doesn't need to be setid anything if the mail spool
+# XXX is world-writable.
+# XXX (2) Needs to honor ${PKG_SYSCONFDIR} for location of vpop.db.
+# XXX It currently looks in SENDMAILLIB == /etc/mail.
+# XXX (3) It needs to use _PATH_MAILDIR from <paths.h> if available
+# XXX instead of hardcoding /var/mail.
+#
+
PKG_OPTIONS_VAR= PKG_OPTIONS.cucipop
PKG_SUPPORTED_OPTIONS= db inet6
diff --git a/mail/cucipop/distinfo b/mail/cucipop/distinfo
index 2e1c151ae14..d86c82fb7ed 100644
--- a/mail/cucipop/distinfo
+++ b/mail/cucipop/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/01/08 15:12:11 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/06/19 21:07:42 jlam Exp $
SHA1 (cucipop-1.31.tar.gz) = d9b5dc2960e96ad1ee63f0a6f8879165f4477434
RMD160 (cucipop-1.31.tar.gz) = dbca1b313a755544578f89586c200a0227858f92
@@ -9,7 +9,7 @@ Size (cucipop-1.31-v6-20010223.diff.gz) = 1713 bytes
SHA1 (patch-aa) = baf7a7a262d8d50d404bcc1eed9fe8da72a7b927
SHA1 (patch-ab) = 3dcbfb7525bd59a1a5ede8cabe286f1bc3704cca
SHA1 (patch-ac) = 5d768b6b0badf8357bdb6668efb144bc14f98318
-SHA1 (patch-ad) = 2acb395d031e5919cacbcf178d58fe8ec4a75e0b
+SHA1 (patch-ad) = 3755ac6cfd60c192eff2fe406c4ff8e9daba43f9
SHA1 (patch-ae) = 30715d0e00ed4862601ea0cb69fdb797a9eb234a
SHA1 (patch-af) = 3521a623741f7dda8d8c837e9dd46e070b1719a4
SHA1 (patch-ag) = 9c6bb228b5a00ef241cd3edd57a7d523f5474f42
diff --git a/mail/cucipop/patches/patch-ad b/mail/cucipop/patches/patch-ad
index 208631d2ced..2a7565591a1 100644
--- a/mail/cucipop/patches/patch-ad
+++ b/mail/cucipop/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2003/07/15 17:32:33 jmmv Exp $
+$NetBSD: patch-ad,v 1.6 2007/06/19 21:07:42 jlam Exp $
---- Makefile.orig Tue May 12 17:09:14 1998
+--- Makefile.orig 1998-05-12 17:09:14.000000000 -0400
+++ Makefile
@@ -2,3 +2,3 @@
-BASENAME= /usr
+BASENAME= ${PREFIX}
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ GCC_WARNINGS = -O2 -pedantic -Wreturn-ty
-CFLAGS = -O -DUSE_DB #$(GCC_WARNINGS)
-LDFLAGS = -lcrypt -ldb2
@@ -18,10 +18,17 @@ $NetBSD: patch-ad,v 1.5 2003/07/15 17:32:33 jmmv Exp $
-CUCIPOPLIB=/var/lib/cucipop
+CUCIPOPLIB=${PREFIX}/share/cucipop
CUCIPOPBULLETINS=$(CUCIPOPLIB)/bulletins
-@@ -24,4 +24,4 @@
+@@ -24,6 +24,2 @@ MANDIR=$(BASENAME)/man/man8
-INSTALL=install -o root -m
-BINPERM=02755 -s -g mail
-+INSTALL=install -c -o ${ROOT_USER} -m
-+BINPERM=02755 -s -g ${ROOT_GROUP}
- REGPERM=0644
+-REGPERM=0644
+-
+ #
+@@ -70,4 +66,4 @@ $(MD5_OBJ): md5/md5c.c md5/md5.h
+ install: $(BINS) $(MANS)
+- $(INSTALL) $(BINPERM) $(BINS) $(BINDIR)
+- $(INSTALL) $(REGPERM) $(MANS) $(MANDIR)
++ $(BSD_INSTALL_PROGRAM) $(BINS) $(BINDIR)
++ $(BSD_INSTALL_DATA) $(MANS) $(MANDIR)
+ mkdir $(CUCIPOPLIB) 2>/dev/null; exit 0