On Mon, Apr 06, 2015 at 01:27:38PM -0400, Okan Demirmen wrote:
> On Mon, Apr 6, 2015 at 12:44 PM, J??r??mie Courr??ges-Anglas
> <[email protected]> wrote:
> > Okan Demirmen <[email protected]> writes:
> >
> >> Hi,
> >>
> >> Here's an update to 2.1.19. Running sendmail FLAVOR here since release
> >> without issue so far.
> >
> > Hi,
> >
> > I don't run mailman and haven't tested it so far. I noticed an error
> > message when installing both mailman-- and mailman--sendmail. The same
> > thing happens when running ''make update'' with your patch applied.
> > This is on a new box that has never seen sendmail from base.
> >
> > -->8--
> > ===> Updating for mailman-2.1.19
> > Upgrading from mailman-2.1.17p0
> > mailman-2.1.19 (installing)|*****[...]******|100%ln:
> > /usr/libexec/sm.bin/mailman: No such file or directory
> > system(/bin/sh, -c, ln -sf /usr/local/lib/mailman/mail/mailman
> > /usr/libexec/sm.bin/mailman) failed: exit(1)
> > mailman-2.1.17p0->2.1.19: ok
> > Read shared items: ok
> > Look in /usr/local/share/doc/pkg-readmes for extra documentation.
> > --8<--
> >
> > Looks like something that should be fixed.
>
> ugh!!
>
> I think it might be best to remove this bit by default from PLIST:
>
> @exec ln -sf %D/lib/mailman/mail/mailman /usr/libexec/sm.bin/mailman
> @unexec-delete rm -f /usr/libexec/sm.bin/mailman
>
> If someone wants to use smrsh, then they can do so manually, just like
> they need to change sendmail config to do so. I don't think it's worth
> applying just for the FLAVOR.
>
> ...and on that note, mail/sendmail's smrsh needs to be patched to
> look in LOCALBASE now (but that's separate).
>
> > The update looks sane otherwise. Since there are no test reports so
> > far, I guess we'll go ahead with a revised diff. Maybe you could take
> > maintainership? :)
>
> Here's the revised diff:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/Makefile,v
> retrieving revision 1.80
> diff -u -p -r1.80 Makefile
> --- Makefile 22 Nov 2014 22:56:42 -0000 1.80
> +++ Makefile 6 Apr 2015 17:24:27 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= mailing list manager with web interface
>
> -DISTNAME= mailman-2.1.17
> -REVISION= 0
> +DISTNAME= mailman-2.1.19
> CATEGORIES= mail www
>
> HOMEPAGE= https://www.gnu.org/software/mailman/
> @@ -17,6 +16,9 @@ EXTRACT_SUFX= .tgz
>
> MODULES= lang/python
>
> +BUILD_DEPENDS= ${RUN_DEPENDS}
> +RUN_DEPENDS= net/py-dnspython
I am not fan of constructs like this.
I think you can explicitely declare BUILD_DEPENDS to net/py-dnspython.
> +
> NO_TEST= Yes
>
> MMDOC= ${PREFIX}/share/doc/mailman
> @@ -52,7 +54,6 @@ CONFIGURE_ARGS+=--with-mail-gid=_smtpd
> SCRIPTS= Mailman/Archiver/pipermail.py \
> Mailman/Post.py \
> bin/msgfmt.py \
> - templates/ru/s2s.py \
> tests/onebounce.py
>
> pre-configure:
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/distinfo,v
> retrieving revision 1.22
> diff -u -p -r1.22 distinfo
> --- distinfo 22 Jan 2014 21:49:52 -0000 1.22
> +++ distinfo 6 Apr 2015 17:24:27 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mailman-2.1.17.tgz) = xDCotO5Uas6IF0tCE81DlMywY73kj6jDbRQdfOEjmuc=
> -SIZE (mailman-2.1.17.tgz) = 9011239
> +SHA256 (mailman-2.1.19.tgz) = yzNCl5f3uLOz+GvVKBkuvJ3p35kCV9+NSCOExofiIBQ=
> +SIZE (mailman-2.1.19.tgz) = 9185697
> Index: patches/patch-Mailman_Defaults_py_in
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/patches/patch-Mailman_Defaults_py_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-Mailman_Defaults_py_in
> --- patches/patch-Mailman_Defaults_py_in 6 Nov 2013 17:26:08 -0000
> 1.12
> +++ patches/patch-Mailman_Defaults_py_in 6 Apr 2015 17:24:27 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Mailman_Defaults_py_in,v 1.12 2013/11/06 17:26:08 okan Exp $
> ---- Mailman/Defaults.py.in.orig Thu Oct 17 00:11:34 2013
> -+++ Mailman/Defaults.py.in Mon Oct 21 08:00:02 2013
> -@@ -521,7 +521,22 @@ SMTPPORT = 0 # de
> +--- Mailman/Defaults.py.in.orig Sat Feb 28 11:41:04 2015
> ++++ Mailman/Defaults.py.in Sun Mar 22 11:55:07 2015
> +@@ -539,7 +539,22 @@ SMTPPORT = 0 # de
>
> # Command for direct command pipe delivery to sendmail compatible program,
> # when DELIVERY_MODULE is 'Sendmail'.
> Index: patches/patch-Mailman_htmlformat_py
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/patches/patch-Mailman_htmlformat_py,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-Mailman_htmlformat_py
> --- patches/patch-Mailman_htmlformat_py 6 Nov 2013 17:26:08 -0000
> 1.6
> +++ patches/patch-Mailman_htmlformat_py 6 Apr 2015 17:24:27 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-Mailman_htmlformat_py,v 1.6 2013/11/06 17:26:08 okan Exp $
> ---- Mailman/htmlformat.py.orig Thu Oct 17 00:11:34 2013
> -+++ Mailman/htmlformat.py Mon Oct 21 08:00:02 2013
> -@@ -621,12 +621,14 @@ class DefinitionList(Container):
> +--- Mailman/htmlformat.py.orig Sat Feb 28 11:41:04 2015
> ++++ Mailman/htmlformat.py Sun Mar 22 11:55:07 2015
> +@@ -632,12 +632,14 @@ class DefinitionList(Container):
> from mm_cfg import MAILMAN_URL
> PYTHON_URL = 'http://www.python.org/'
> GNU_URL = 'http://www.gnu.org/'
> @@ -16,7 +16,7 @@ $OpenBSD: patch-Mailman_htmlformat_py,v
>
>
> def MailmanLogo():
> -@@ -640,7 +642,9 @@ def MailmanLogo():
> +@@ -651,7 +653,9 @@ def MailmanLogo():
> logo(PYTHON_POWERED)
> gnulink = '<img src="%s" alt="GNU\'s Not Unix" border=0>' % \
> logo(GNU_HEAD)
> @@ -27,7 +27,7 @@ $OpenBSD: patch-Mailman_htmlformat_py,v
> else:
> # use only textual links
> version = mm_cfg.VERSION
> -@@ -648,7 +652,8 @@ def MailmanLogo():
> +@@ -659,7 +663,8 @@ def MailmanLogo():
> _('Delivered by Mailman<br>version %(version)s'))
> pylink = Link(PYTHON_URL, _('Python Powered'))
> gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/patches/patch-configure,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-configure
> --- patches/patch-configure 21 Sep 2010 07:21:00 -0000 1.10
> +++ patches/patch-configure 6 Apr 2015 17:24:27 -0000
> @@ -1,15 +1,14 @@
> $OpenBSD: patch-configure,v 1.10 2010/09/21 07:21:00 jasper Exp $
> ---- configure.orig Mon Sep 20 23:33:13 2010
> -+++ configure Mon Sep 20 23:34:51 2010
> -@@ -3372,61 +3372,8 @@ fi
> - USERNAME=$with_username
> - { $as_echo "$as_me:$LINENO: result: $USERNAME" >&5
> +--- configure.orig Tue May 6 12:43:56 2014
> ++++ configure Sun Jan 11 10:37:11 2015
> +@@ -3543,54 +3543,8 @@ USERNAME=$with_username
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USERNAME" >&5
> $as_echo "$USERNAME" >&6; }
> -+MAILMAN_USER=$with_username
>
> -# User `mailman' must exist
> --
> --{ $as_echo "$as_me:$LINENO: checking for user name \"$USERNAME\"" >&5
> ++MAILMAN_USER=$with_username
> +
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for user name
> \"$USERNAME\"" >&5
> -$as_echo_n "checking for user name \"$USERNAME\"... " >&6; }
> -
> -# MAILMAN_USER == variable name
> @@ -44,33 +43,28 @@ $OpenBSD: patch-configure,v 1.10 2010/09
> -then
> - if test "$with_permcheck" = "yes"
> - then
> -- { { $as_echo "$as_me:$LINENO: error:
> --***** No \"$USERNAME\" user found!
> --***** Your system must have a \"$USERNAME\" user defined
> --***** (usually in your /etc/passwd file). Please see the INSTALL
> --***** file for details." >&5
> --$as_echo "$as_me: error:
> +- as_fn_error $? "
> -***** No \"$USERNAME\" user found!
> -***** Your system must have a \"$USERNAME\" user defined
> -***** (usually in your /etc/passwd file). Please see the INSTALL
> --***** file for details." >&2;}
> -- { (exit 1); exit 1; }; }
> +-***** file for details." "$LINENO" 5
> - fi
> -fi
> --{ $as_echo "$as_me:$LINENO: result: okay" >&5
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
> -$as_echo "okay" >&6; }
> -
> -
> # Check for some other gid to use than `mailman'
> - { $as_echo "$as_me:$LINENO: checking for --with-groupname" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-groupname" >&5
> $as_echo_n "checking for --with-groupname... " >&6; }
> -@@ -3446,58 +3393,7 @@ GROUPNAME=$with_groupname
> +@@ -3609,54 +3563,7 @@ GROUPNAME=$with_groupname
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GROUPNAME" >&5
> $as_echo "$GROUPNAME" >&6; }
>
> -
> +-
> -# Target group must exist
> -
> --{ $as_echo "$as_me:$LINENO: checking for group name \"$GROUPNAME\"" >&5
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for group name
> \"$GROUPNAME\"" >&5
> -$as_echo_n "checking for group name \"$GROUPNAME\"... " >&6; }
> -
> -# MAILMAN_GROUP == variable name
> @@ -105,22 +99,17 @@ $OpenBSD: patch-configure,v 1.10 2010/09
> -then
> - if test "$with_permcheck" = "yes"
> - then
> -- { { $as_echo "$as_me:$LINENO: error:
> +- as_fn_error $? "
> -***** No \"$GROUPNAME\" group found!
> -***** Your system must have a \"$GROUPNAME\" group defined
> -***** (usually in your /etc/group file). Please see the INSTALL
> --***** file for details." >&5
> --$as_echo "$as_me: error:
> --***** No \"$GROUPNAME\" group found!
> --***** Your system must have a \"$GROUPNAME\" group defined
> --***** (usually in your /etc/group file). Please see the INSTALL
> --***** file for details." >&2;}
> -- { (exit 1); exit 1; }; }
> +-***** file for details." "$LINENO" 5
> - fi
> -fi
> --{ $as_echo "$as_me:$LINENO: result: okay" >&5
> +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
> -$as_echo "okay" >&6; }
> +-
> +MAILMAN_GROUP=$with_groupname
>
> -
> - { $as_echo "$as_me:$LINENO: checking permissions on $prefixcheck" >&5
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking permissions on
> $prefixcheck" >&5
> + $as_echo_n "checking permissions on $prefixcheck... " >&6; }
> Index: patches/patch-templates_ru_s2s_py
> ===================================================================
> RCS file: patches/patch-templates_ru_s2s_py
> diff -N patches/patch-templates_ru_s2s_py
> --- patches/patch-templates_ru_s2s_py 9 Jul 2008 19:30:24 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,9 +0,0 @@
> -$OpenBSD: patch-templates_ru_s2s_py,v 1.1 2008/07/09 19:30:24 wcmaier Exp $
> ---- templates/ru/s2s.py.orig Thu Oct 10 19:25:58 2002
> -+++ templates/ru/s2s.py Wed Jul 9 13:13:53 2008
> -@@ -1,4 +1,4 @@
> --#! /usr/bin/python
> -+#!${MODPY_BIN}
> -
> - # A simple script to check the status of the translation.
> -
> Index: patches/patch-tests_onebounce_py
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/patches/patch-tests_onebounce_py,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-tests_onebounce_py
> --- patches/patch-tests_onebounce_py 9 Jul 2008 19:30:24 -0000 1.1
> +++ patches/patch-tests_onebounce_py 6 Apr 2015 17:24:27 -0000
> @@ -1,9 +1,9 @@
> $OpenBSD: patch-tests_onebounce_py,v 1.1 2008/07/09 19:30:24 wcmaier Exp $
> ---- tests/onebounce.py.orig Fri Aug 26 20:40:17 2005
> -+++ tests/onebounce.py Wed Jul 9 13:13:53 2008
> +--- tests/onebounce.py.orig Tue May 6 12:43:56 2014
> ++++ tests/onebounce.py Sun Jan 11 10:33:39 2015
> @@ -1,4 +1,4 @@
> -#! /usr/bin/env python
> +#!${MODPY_BIN}
>
> - # Copyright (C) 2002 by the Free Software Foundation, Inc.
> + # Copyright (C) 2002-2013 by the Free Software Foundation, Inc.
> #
> Index: pkg/MESSAGE
> ===================================================================
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- pkg/MESSAGE 9 Nov 2010 21:46:50 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -If you are upgrading from mailman 2.0.x make sure to read
> -${PREFIX}/share/doc/mailman/UPGRADING and run
> -${PREFIX}/lib/mailman/bin/update as root.
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/pkg/PLIST,v
> retrieving revision 1.24
> diff -u -p -r1.24 PLIST
> --- pkg/PLIST 6 Nov 2013 17:26:08 -0000 1.24
> +++ pkg/PLIST 6 Apr 2015 17:24:27 -0000
> @@ -610,6 +610,7 @@ lib/mailman/messages/sr/LC_MESSAGES/
> @mode
> lib/mailman/messages/sr/LC_MESSAGES/mailman.mo
> lib/mailman/messages/sr/LC_MESSAGES/mailman.po
> +lib/mailman/messages/sr/README.sr
> @mode 775
> lib/mailman/messages/sv/
> lib/mailman/messages/sv/LC_MESSAGES/
> @@ -993,6 +994,7 @@ lib/mailman/templates/el/verify.txt
> @mode 775
> lib/mailman/templates/en/
> @mode
> +lib/mailman/templates/en/adminaddrchgack.txt
> lib/mailman/templates/en/admindbdetails.html
> lib/mailman/templates/en/admindbpreamble.html
> lib/mailman/templates/en/admindbsummary.html
> @@ -1477,6 +1479,7 @@ lib/mailman/templates/hu/verify.txt
> @mode 775
> lib/mailman/templates/ia/
> @mode
> +lib/mailman/templates/ia/adminaddrchgack.txt
> lib/mailman/templates/ia/admindbdetails.html
> lib/mailman/templates/ia/admindbpreamble.html
> lib/mailman/templates/ia/admindbsummary.html
> @@ -1972,6 +1975,7 @@ lib/mailman/templates/ro/verify.txt
> @mode 775
> lib/mailman/templates/ru/
> @mode
> +lib/mailman/templates/ru/adminaddrchgack.txt
> lib/mailman/templates/ru/admindbdetails.html
> lib/mailman/templates/ru/admindbpreamble.html
> lib/mailman/templates/ru/admindbsummary.html
> @@ -2501,6 +2505,7 @@ lib/mailman/tests/bounces/simple_36.txt
> lib/mailman/tests/bounces/simple_37.txt
> lib/mailman/tests/bounces/simple_38.txt
> lib/mailman/tests/bounces/simple_39.txt
> +lib/mailman/tests/bounces/simple_40.txt
> lib/mailman/tests/bounces/sina_01.txt
> lib/mailman/tests/bounces/smtp32_01.txt
> lib/mailman/tests/bounces/smtp32_02.txt
> @@ -2572,7 +2577,5 @@ share/doc/pkg-readmes/${FULLPKGNAME}
> share/examples/mailman/
> share/examples/mailman/sitelist.cfg
> @sample /var/spool/mailman/data/sitelist.cfg
> -@exec ln -sf %D/lib/mailman/mail/mailman /usr/libexec/sm.bin/mailman
> -@unexec-delete rm -f /usr/libexec/sm.bin/mailman
> @extra /var/cron/tabs/_mailman
> @rcscript ${RCDIR}/mailman
> Index: pkg/UNMESSAGE
> ===================================================================
> RCS file: /cvs/ports/mail/mailman/pkg/UNMESSAGE,v
> retrieving revision 1.1
> diff -u -p -r1.1 UNMESSAGE
> --- pkg/UNMESSAGE 4 Feb 2005 09:19:35 -0000 1.1
> +++ pkg/UNMESSAGE 6 Apr 2015 17:24:27 -0000
> @@ -1,4 +1,4 @@
> -If you don't delete user _mailman, make sure to remove his crontab
> +If you don't delete user _mailman, make sure to remove the crontab
> entries with:
>
> crontab -u _mailman -r
>
--
Antoine
