On 9/15/20 12:28 PM, Dennis Putnam wrote: > On 9/15/2020 3:06 PM, Mark Sapiro wrote: >> >> If you are in the directory that you unpacked the Mailman 2.1.34 tarball >> into, do >> >> patch -p1 < /path/to/mailman-FHS.patch >> >> > Hi Mark, > > I guess there is still something wrong: > > # patch -p1 <../mailman-FHS.patch > patching file bin/check_perms > Hunk #1 succeeded at 183 with fuzz 1 (offset 19 lines). > patching file configure.in > Hunk #1 succeeded at 321 (offset 141 lines). > Hunk #2 succeeded at 348 with fuzz 2 (offset 141 lines). > Hunk #3 succeeded at 821 (offset 147 lines). > patching file Mailman/Defaults.py.in > Hunk #1 succeeded at 1751 (offset 553 lines). > Hunk #2 succeeded at 1766 (offset 553 lines). > Hunk #3 succeeded at 1780 (offset 553 lines). > patching file Mailman/MTA/Postfix.py > Hunk #1 FAILED at 32. > 1 out of 1 hunk FAILED -- saving rejects to file Mailman/MTA/Postfix.py.rej > patching file Makefile.in > patching file misc/mailman.in > Hunk #1 FAILED at 24. > 1 out of 1 hunk FAILED -- saving rejects to file misc/mailman.in.rej > patching file misc/Makefile.in > Hunk #1 succeeded at 27 (offset 1 line). > Hunk #2 succeeded at 94 with fuzz 1 (offset 4 lines).
These warnings/errors are all because that patch is against the 2.1.5 base and you're patching 2.1.34. The succeeded at (offset) and succeeded at with fuzz messages are warnings. They will have created '.orig' files, but the patches were applied and should be OK. The FAILED patches will have to be applied manually. > # cat Postfix.py.rej > --- Mailman/MTA/Postfix.py 2003-03-31 16:49:43.000000000 -0500 > +++ Mailman/MTA/Postfix.py 2004-10-08 16:02:20.000000000 -0400 > @@ -32,8 +32,8 @@ > from Mailman.Logging.Syslog import syslog > > LOCKFILE = os.path.join(mm_cfg.LOCK_DIR, 'creator') > -ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases') > -VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman') > +ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases') > +VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman') > > try: > True, False E.g., for this one, just find the ALIASFILE = os.path.join(mm_cfg.DATA_DIR, 'aliases') VIRTFILE = os.path.join(mm_cfg.DATA_DIR, 'virtual-mailman') lines in Mailman/MTA/Postfix.py and change them to ALIASFILE = os.path.join(mm_cfg.CONFIG_DIR, 'aliases') VIRTFILE = os.path.join(mm_cfg.CONFIG_DIR, 'virtual-mailman') The other failure is the patch to misc/mailman.in. The rejected patch is --- mailman-2.1.5.orig/misc/mailman.in 2003-09-25 18:13:26.000000000 -0400 +++ mailman-2.1.5.FHS/misc/mailman.in 2004-10-06 16:15:28.000000000 -0400 @@ -24,13 +24,13 @@ # On Debian, type "update-rc.d mailman defaults" # On RedHat, and derivatives, install with "chkconfig --add mailman" # -# chkconfig: 2345 98 12 +# chkconfig: - 98 12 # description: Mailman is the GNU Mailing List Manager, a program that \ # manages electronic mail discussion groups. For more \ # on GNU Mailman see http://www.list.org # processname: mailmanctl # config: @prefix@/Mailman/mm_cfg.py -# pidfile: @prefix@/data/master-qrunner.pid +# pidfile: @PID_DIR@/master-qrunner.pid PYTHON=@PYTHON@ MAILMANHOME=@prefix@ It fails because # pidfile: @prefix@/data/master-qrunner.pid is # pidfile: @VAR_PREFIX@/data/master-qrunner.pid in 2.1.34. Again, just make the changes manually, but in this case, misc/mailman.in is just a template for building misc/mailman which in turn is a sample init.d script for starting Mailman and is probably already installed from your 2.1.15 installation. -- Mark Sapiro <m...@msapiro.net> The highway is for gamblers, San Francisco Bay Area, California better use your sense - B. Dylan
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------ Mailman-Users mailing list -- mailman-users@python.org To unsubscribe send an email to mailman-users-le...@python.org https://mail.python.org/mailman3/lists/mailman-users.python.org/ Mailman FAQ: http://wiki.list.org/x/AgA3 Security Policy: http://wiki.list.org/x/QIA9 Searchable Archives: https://www.mail-archive.com/mailman-users@python.org/ https://mail.python.org/archives/list/mailman-users@python.org/
