On 2010/03/27 14:59, Jakob Schlyter wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: ja...@cvs.openbsd.org 2010/03/27 14:59:58
>
> Modified files:
> mail/postfix/stable: Makefile distinfo
> mail/postfix/stable/patches: patch-master.cf
>
> Log message:
> update to Postfix v2.7.0; from Brad
>
hmm.. going from the former snapshot, postfix-2.7.20091209, to this
will be treated by pkg_add as a downgrade (even though it's older code)
so users would need to force the upgrade if they want to stay on 2.7.x.
I think to avoid this, we probably need to add v0 markers e.g.
postfix-2.7.0v0, and when moving the snapshot to 2.8 start using
numbering something like 2.8pre20100323v0 instead. (Yes it's messy
but I don't see a better way to handle it while following the
rules for versioning, however I've cc'd ports@ in case anyone else
has a better idea...)
here's a diff doing this, updating the snapshot to 2.8 (which I've
been running here for a couple of days), and making a slightly more
clear message if you try and re-run postfix-enable after you've
already run it.
Index: Makefile.inc
===
RCS file: /cvs/ports/mail/postfix/Makefile.inc,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile.inc
--- Makefile.inc18 Jul 2009 20:26:18 - 1.70
+++ Makefile.inc27 Mar 2010 22:56:10 -
@@ -4,9 +4,9 @@ COMMENT=fast, secure sendmail replaceme
DISTNAME?= postfix-${VERSION}
.if defined(PATCHLEVEL)
-PKGNAME?= postfix-${VERSION:S/-/./}p${PATCHLEVEL}
+PKGNAME?= postfix-${VERSION:S/-/pre/}p${PATCHLEVEL}v0
.else
-PKGNAME?= postfix-${VERSION:S/-/./}
+PKGNAME?= postfix-${VERSION:S/-/pre/}v0
.endif
CATEGORIES=mail
Index: snapshot/Makefile
===
RCS file: /cvs/ports/mail/postfix/snapshot/Makefile,v
retrieving revision 1.200
diff -u -p -r1.200 Makefile
--- snapshot/Makefile 12 Dec 2009 08:35:58 - 1.200
+++ snapshot/Makefile 27 Mar 2010 22:56:10 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.200 2009/12/12 08:35:58 jakob Exp $
-VERSION= 2.7-20091209
+VERSION= 2.8-20100323
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
Index: snapshot/distinfo
===
RCS file: /cvs/ports/mail/postfix/snapshot/distinfo,v
retrieving revision 1.146
diff -u -p -r1.146 distinfo
--- snapshot/distinfo 12 Dec 2009 08:35:58 - 1.146
+++ snapshot/distinfo 27 Mar 2010 22:56:10 -
@@ -1,5 +1,5 @@
-MD5 (postfix/postfix-2.7-20091209.tar.gz) = WyFVZnFj9Edld7f/Cw8HQQ==
-RMD160 (postfix/postfix-2.7-20091209.tar.gz) = vgoAgXK0lznwPl79pa+HXPTOugg=
-SHA1 (postfix/postfix-2.7-20091209.tar.gz) = DAM/QBWCUUcnOk5yBmQ4c64wWQI=
-SHA256 (postfix/postfix-2.7-20091209.tar.gz) =
1kyrksfkwIPh6+L8HRhDfzaK7Ju3zYO8v/tN4cc2P5U=
-SIZE (postfix/postfix-2.7-20091209.tar.gz) = 3385941
+MD5 (postfix/postfix-2.8-20100323.tar.gz) = W758cm9IsQlmON+vIBrmNw==
+RMD160 (postfix/postfix-2.8-20100323.tar.gz) = QZf/4z3k7lSQXOH1Z/BfGexMvoQ=
+SHA1 (postfix/postfix-2.8-20100323.tar.gz) = DZ05z9AQocH4yb/KtV512YTvfQk=
+SHA256 (postfix/postfix-2.8-20100323.tar.gz) =
STJ/I+NuDdyu8eclPKsbluXaqW23L/GeB9qvjgnIbkY=
+SIZE (postfix/postfix-2.8-20100323.tar.gz) = 3446878
Index: snapshot/files/postfix-enable
===
RCS file: /cvs/ports/mail/postfix/snapshot/files/postfix-enable,v
retrieving revision 1.5
diff -u -p -r1.5 postfix-enable
--- snapshot/files/postfix-enable 5 Jul 2006 06:21:09 - 1.5
+++ snapshot/files/postfix-enable 27 Mar 2010 22:56:10 -
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $OpenBSD: postfix-enable,v 1.5 2006/07/05 06:21:09 jakob Exp $
+# $OpenBSD: postfix-enable,v 1.8 2008/02/01 16:37:53 jakob Exp $
if [ -f /etc/mailer.conf.postfix ]; then
if [ -f /etc/mailer.conf ]; then
@@ -19,5 +19,9 @@ if [ -f /etc/mailer.conf.postfix ]; then
echo "NOTE: do not forget to remove the \"sendmail clientmqueue runner\""
echo " from root's crontab."
else
-echo "can't find /etc/mailer.conf.postfix, postfix not enabled"
+if [ -f /etc/mailer.conf.pre-postfix ]; then
+echo "postfix appears to be already enabled, check /etc/mailer.conf"
+else
+echo "can't find /etc/mailer.conf.postfix, postfix not enabled"
+fi
fi
Index: snapshot/files/postfix-install
===
RCS file: /cvs/ports/mail/postfix/snapshot/files/postfix-install,v
retrieving revision 1.4
diff -u -p -r1.4 postfix-install
--- snapshot/files/postfix-install 15 Mar 2009 19:38:05 - 1.4
+++ snapshot/files/postfix-install 27 Mar 2010 22:56:10 -
@@ -31,6 +31,7 @@ do_mailwrapper()
{
echo "-> Creating /etc/mailer.conf.postfix"
cat
