Date: 26 Sep 2000 16:06:29 -0000 From: "Mario Sergio Fujikawa Ferreira" <lioux@uol.com.br> To: FreeBSD-gnats-submit@freebsd.org Cc: Sascha Gresk <sascha@free.de>, ldap@free.de Subject: ports/21563: Update port mail/qmail and mail/qmail-ldap (MAINTAINER update) Message-ID: <20000926160629.24294.qmail@Fedaykin.here>
next in thread | raw e-mail | index | archive | help
>Number: 21563
>Category: ports
>Synopsis: Update port mail/qmail and mail/qmail-ldap (MAINTAINER update)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Sep 26 09:10:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Mario Sergio Fujikawa Ferreira
>Release: FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
FreeBSD Fedaykin.here 4.1-STABLE FreeBSD 4.1-STABLE #10: Sun Sep 24 15:18:36 BRT 2000 lioux@Fedaykin.here:/usr/src/sys/compile/LIOUX i386
>Description:
This is one of my periodic maintainance updates. :)
I am updating the qmail-ldap port. The version is being bumped
from 1.03 to 1.03.20000701. I hope this is enough to avoid
a PORTEPOCH tag.
Since, my qmail port and qmail-ldap share makefile logic, I
had to update the qmail port accordingly (mainly the md5 file).
However, since I was there, I tweaked a bit the makefile from
both ports so as to permit both easier and simpler future
updates.
However, this is not worth a PORTREVISION tag. I did not
change the behavior of the qmail port in any way.
On a side note, I switched my MASTERDIR to
MASTERDIR= ${PORTSDIR}/mail/qmail
instead of using ${.CURDIR}/../qmail
It feels better but which is considered more
appropriate for porting style?
>How-To-Repeat:
n/a
>Fix:
diff -ruN /usr/ports/mail/qmail/Makefile qmail/Makefile
--- /usr/ports/mail/qmail/Makefile Sun Sep 10 10:47:23 2000
+++ qmail/Makefile Tue Sep 26 12:42:24 2000
@@ -6,7 +6,7 @@
#
PORTNAME= qmail
-PORTVERSION= 1.03
+PORTVERSION?= ${QMAIL_VERSION}
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
@@ -14,6 +14,7 @@
ftp://ftp.rifkin.technion.ac.il/pub/qmail/ \
ftp://ftp.net.ohio-state.edu/pub/networking/mail/qmail/ \
ftp://ftp.id.wustl.edu/pub/qmail/
+DISTNAME= ${PORTNAME}-${QMAIL_VERSION}
# Patch necessary to cope with non-RFC >512 dns entries
# Since AOL has been using those, the problem has skyrocketed from minor to
@@ -27,7 +28,8 @@
# A normal qmail installation puts everything into /var/qmail/.
# If you want to install to /usr/local/, then "/usr/local/qmail" is
# suggested instead of "/usr/local", but both will work.
-PREFIX= /var/qmail
+PREFIX?= /var/qmail
+QMAIL_VERSION?= 1.03
ALL_TARGET= default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
diff -ruN /usr/ports/mail/qmail/files/md5 qmail/files/md5
--- /usr/ports/mail/qmail/files/md5 Tue May 30 01:18:30 2000
+++ qmail/files/md5 Tue Sep 26 12:35:15 2000
@@ -1,3 +1,3 @@
MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
+MD5 (qmail-ldap-1.03-20000701.patch.gz) = 15bc80f2180dbaacf4286dcd3d3014f6
MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
-MD5 (qmail-ldap-1.03-20000501.patch.gz) = 3bac26caf4fbbf9a9af1919c60dd9f94
diff -ruN /usr/ports/mail/qmail-ldap/Makefile qmail-ldap/Makefile
--- /usr/ports/mail/qmail-ldap/Makefile Tue Sep 19 12:46:34 2000
+++ qmail-ldap/Makefile Tue Sep 26 13:04:02 2000
@@ -6,12 +6,12 @@
#
PORTNAME= qmail
-PORTVERSION= 1.03
+PORTVERSION= ${QMAIL_VERSION}.${LDAP_PATCH_DATE}
CATEGORIES= mail
PKGNAMESUFFIX= -ldap
PATCH_SITES= http://www.nrg4u.com/qmail/
-PATCHFILES= qmail-ldap-1.03-20000501.patch.gz
+PATCHFILES= qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz
MAINTAINER= lioux@linf.unb.br
@@ -21,10 +21,17 @@
.include <bsd.port.pre.mk>
.endif
-DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/ANTISPAM
+#PREFIX= /var/qmail-ldap
+
+DOCFILES+= ${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
+ ${WRKSRC}/QLDAPTODO ${WRKSRC}/QLDAPPICTURE \
+ ${WRKSRC}/ANTISPAM
+
+LDAP_PATCH_DATE= 20000701
# Local overrides
-MASTERDIR= ${.CURDIR}/../qmail
+MASTERDIR= ${PORTSDIR}/mail/qmail
+#MASTERDIR= ${.CURDIR}/../qmail
PATCHDIR= ${.CURDIR}/patches
PKGDIR_LOCAL= ${.CURDIR}/pkg
DESCR= ${PKGDIR_LOCAL}/DESCR
diff -ruN /usr/ports/mail/qmail-ldap/patches/patch-aa qmail-ldap/patches/patch-aa
--- /usr/ports/mail/qmail-ldap/patches/patch-aa Tue Sep 19 12:46:34 2000
+++ qmail-ldap/patches/patch-aa Tue Sep 26 12:41:18 2000
@@ -1,5 +1,5 @@
---- hier.c.ORIG Sun May 21 12:19:27 2000
-+++ hier.c Sun May 21 12:26:01 2000
+--- hier.c.ORIG Tue Sep 26 12:39:49 2000
++++ hier.c Tue Sep 26 12:41:07 2000
@@ -35,16 +35,6 @@
d(auto_qmail,"users",auto_uido,auto_gidq,0755);
d(auto_qmail,"bin",auto_uido,auto_gidq,0755);
@@ -17,7 +17,7 @@
d(auto_qmail,"alias",auto_uida,auto_gidq,02755);
-@@ -64,43 +54,6 @@
+@@ -64,46 +54,6 @@
z(auto_qmail,"queue/lock/sendmutex",0,auto_uids,auto_gidq,0600);
p(auto_qmail,"queue/lock/trigger",auto_uids,auto_gidq,0622);
@@ -56,15 +56,18 @@
- c(auto_qmail,"doc","PIC.relaygood",auto_uido,auto_gidq,0644);
- c(auto_qmail,"doc","PIC.rem2local",auto_uido,auto_gidq,0644);
- c(auto_qmail,"doc","QLDAPINSTALL",auto_uido,auto_gidq,0644);
+- c(auto_qmail,"doc","QLDAPNEWS",auto_uido,auto_gidq,0644);
+- c(auto_qmail,"doc","QLDAPTODO",auto_uido,auto_gidq,0644);
+- c(auto_qmail,"doc","QLDAPPICTURE",auto_uido,auto_gidq,0644);
- c(auto_qmail,"doc","ANTISPAM",auto_uido,auto_gidq,0644);
-
c(auto_qmail,"bin","qmail-queue",auto_uidq,auto_gidq,04711);
c(auto_qmail,"bin","qmail-lspawn",auto_uido,auto_gidq,0700);
c(auto_qmail,"bin","qmail-start",auto_uido,auto_gidq,0700);
-@@ -150,110 +103,4 @@
+@@ -153,110 +103,4 @@
c(auto_qmail,"bin","auth_pop",auto_uido,auto_gidq,0700);
c(auto_qmail,"bin","auth_imap",auto_uido,auto_gidq,0700);
- c(auto_qmail,"bin","qmail-ldaplookup",auto_uido,auto_gidq,0000);
+ c(auto_qmail,"bin","qmail-ldaplookup",auto_uido,auto_gidq,0700);
-
- c(auto_qmail,"man/man5","addresses.5",auto_uido,auto_gidq,0644);
- c(auto_qmail,"man/cat5","addresses.0",auto_uido,auto_gidq,0644);
diff -ruN /usr/ports/mail/qmail-ldap/pkg/PLIST qmail-ldap/pkg/PLIST
--- /usr/ports/mail/qmail-ldap/pkg/PLIST Tue Sep 19 12:46:35 2000
+++ qmail-ldap/pkg/PLIST Tue Sep 26 12:42:46 2000
@@ -22,6 +22,9 @@
%%DOCDIR%%/PIC.relaygood
%%DOCDIR%%/PIC.rem2local
%%DOCDIR%%/QLDAPINSTALL
+%%DOCDIR%%/QLDAPNEWS
+%%DOCDIR%%/QLDAPTODO
+%%DOCDIR%%/QLDAPPICTURE
%%DOCDIR%%/ANTISPAM
boot/home
boot/home+df
@@ -134,7 +137,7 @@
bin/auth_pop
@mode 0700
bin/auth_imap
-@mode 0000
+@mode 0700
bin/qmail-ldaplookup
@group
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000926160629.24294.qmail>