From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 17:42:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5593C771; Sat, 5 Jul 2014 17:42:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 36DBD2D43; Sat, 5 Jul 2014 17:42:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65HgP53070090; Sat, 5 Jul 2014 17:42:25 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65HgNCE070076; Sat, 5 Jul 2014 17:42:23 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201407051742.s65HgNCE070076@svn.freebsd.org> From: TAKATSU Tomonari Date: Sat, 5 Jul 2014 17:42:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360783 - in head/japanese/mailman: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 17:42:25 -0000 Author: tota Date: Sat Jul 5 17:42:23 2014 New Revision: 360783 URL: http://svnweb.freebsd.org/changeset/ports/360783 QAT: https://qat.redports.org/buildarchive/r360783/ Log: - Support STAGEDIR - Add DOCS to OPTIONS_DEFINE - Drop EXIM3 option - Unmute INSTALL_DATA and CP - Update pkg-plist - Replace tab with a single space after WWW: in pkg-descr - Sync with mail/mailman as possible * Drop INTEGRATION option, which would at best be confusing * When Postfix integration is chosen, add BUILD and RUN_DEPENDS on Postfix because we need the postconf program * Fix a few minor glitches in FreeBSD-post-install-notes * Install a dummy one-line text file into PYTHON_SITELIBDIR so that Python's upgrade-site-packages would reinstall Mailman * Add "status" support for rc.d script * Change pre-fetch: to pre-everything:: * Revise formatting of pre-everything text to make clear it displays default values, not current values * Update pkg-install.in, pkg-deinstall.in and pkg-message.in Modified: head/japanese/mailman/Makefile head/japanese/mailman/files/FreeBSD-post-install-notes head/japanese/mailman/files/mailman.in head/japanese/mailman/files/pkg-deinstall.in head/japanese/mailman/files/pkg-install.in head/japanese/mailman/files/pkg-message.in head/japanese/mailman/pkg-descr head/japanese/mailman/pkg-plist Modified: head/japanese/mailman/Makefile ============================================================================== --- head/japanese/mailman/Makefile Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/Makefile Sat Jul 5 17:42:23 2014 (r360783) @@ -3,6 +3,7 @@ PORTNAME= mailman PORTVERSION= 2.1.14.j7 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= japanese mail MASTER_SITES= http://www.python.jp/doc/contrib/mailman/_static/ \ @@ -24,7 +25,7 @@ PORTSCOUT= limit:.*\.j\d+$$ USE_AUTOTOOLS= autoconf USES= gettext -USE_PYTHON= yes +USE_PYTHON= 2 USE_RC_SUBR= mailman GNU_CONFIGURE_PREFIX= ${MAILMANDIR} @@ -66,42 +67,34 @@ PORTDOCS= ACKNOWLEDGMENTS BUGS FAQ INSTA mailman-member.txt \ FreeBSD-post-install-notes -OPTIONS_DEFINE= INTEGRATION NAMAZU2 +OPTIONS_DEFINE= DOCS NAMAZU2 -OPTIONS_SINGLE= MTA -OPTIONS_SINGLE_MTA= SENDMAIL EXIM3 EXIM4 POSTFIX COURIER +OPTIONS_SINGLE= MTA +OPTIONS_SINGLE_MTA= SENDMAIL EXIM4 POSTFIX COURIER -INTEGRATION_DESC= integrating postfix and mailman -NAMAZU2_DESC= make private archives searchable with namazu2 -SENDMAIL_DESC= for use with sendmail -EXIM3_DESC= for use with exim3 -EXIM4_DESC= for use with exim4 -POSTFIX_DESC= for use with postfix -COURIER_DESC= for use with courier +NAMAZU2_DESC= Make private archives searchable with namazu2 +MTA_DESC= Integrate with which MTA? +SENDMAIL_DESC= for use with sendmail +EXIM4_DESC= for use with exim4 +POSTFIX_DESC= for use with postfix +COURIER_DESC= for use with courier OPTIONS_DEFAULT= SENDMAIL -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSENDMAIL} MAIL_GID?= mailnull .endif -.if ${PORT_OPTIONS:MEXIM3} -MAIL_GID?= nobody -.endif - .if ${PORT_OPTIONS:MEXIM4} MAIL_GID?= mail .endif .if ${PORT_OPTIONS:MPOSTFIX} -.if ${PORT_OPTIONS:MINTEGRATION} +RUN_DEPENDS+= ${LOCALBASE}/sbin/postconf:${PORTSDIR}/mail/postfix +BUILD_DEPENDS+= ${LOCALBASE}/sbin/postconf:${PORTSDIR}/mail/postfix MAIL_GID?= mailman -.else -MAIL_GID?= nobody -.endif EXTRA_PATCHES+= ${FILESDIR}/postfix-verp.diff .endif @@ -114,16 +107,22 @@ RUN_DEPENDS+= mknmz:${PORTSDIR}/japanese EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mailman-Cgi-private.py .endif -pre-fetch: +pre-everything:: @${ECHO} "" @${ECHO} "You may change the following build options:" - @${ECHO} "MM_USERNAME=mailman The username of the Mailman user." - @${ECHO} "MM_USERID=91 The user ID of the Mailman user." - @${ECHO} "MM_GROUPNAME=mailman The group to which the Mailman user will belong." - @${ECHO} "MM_GROUPID=MM_USERID The group ID for the Mailman user." - @${ECHO} "MM_DIR=mailman Mailman will be installed in ${PREFIX}/${MM_DIR}." - @${ECHO} "CGI_GID=www The group name or id under which your web server executes CGI scripts." - @${ECHO} "IMGDIR=www/icons Icon images will be installed in ${PREFIX}/${IMGDIR}." + @${ECHO} "" + @${ECHO} "Option Default Value Description" + @${ECHO} "------------- --------------- ------------------------------------------------" + @${ECHO} "MM_USERNAME mailman The username of the Mailman user." + @${ECHO} "MM_USERID 91 The user ID of the Mailman user." + @${ECHO} "MM_GROUPNAME mailman The group to which the Mailman user will belong." + @${ECHO} "MM_GROUPID \$$MM_USERID The group ID for the Mailman user." + @${ECHO} "MM_DIR mailman Mailman will be installed in" + @${ECHO} " ${PREFIX}/${MM_DIR}." + @${ECHO} "CGI_GID www The group name or id under which your web" + @${ECHO} " server executes CGI scripts." + @${ECHO} "IMGDIR www/icons Icon images will be installed in" + @${ECHO} " ${PREFIX}/${IMGDIR}." @${ECHO} "" post-patch: @@ -134,32 +133,43 @@ post-patch: pre-configure: @${ECHO} "DEFAULT_SERVER_LANGUAGE = 'ja'" >> ${WRKSRC}/Mailman/mm_cfg.py.dist.in @${ECHO} "GLOBAL_PIPELINE.insert(1, 'iso2022jpfix')" >> ${WRKSRC}/Mailman/mm_cfg.py.dist.in -.if ${PORT_OPTIONS:MPOSTFIX} && ${PORT_OPTIONS:MINTEGRATION} +.if ${PORT_OPTIONS:MPOSTFIX} @${ECHO} "MTA = 'Postfix'" >> ${WRKSRC}/Mailman/mm_cfg.py.dist.in .endif post-install: - @${RM} -f ${MAILMANDIR}/pythonlib/*.egg-info -.for dir in cron scripts - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MAILMANDIR}/${dir} +.for i in admin admindb confirm create edithtml listinfo options private \ + rmlist roster subscribe + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/cgi-bin/${i} +.endfor + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/mail/mailman + ${STRIP_CMD} ${STAGEDIR}${MAILMANDIR}/pythonlib/pykf.so +# Compile additional Python scripts: +.for dir in Mailman bin pythonlib + (cd ${STAGEDIR}${MAILMANDIR} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${MAILMANDIR}/${dir} ${dir}) .endfor - @${CHGRP} -R ${MM_GROUPNAME} ${MAILMANDIR} - @${MKDIR} ${PREFIX}/${IMGDIR} + @${RM} -f ${STAGEDIR}${MAILMANDIR}/pythonlib/*.egg-info + # mm_cfg.py is handled by pkg-plist: + @${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.py + @${RM} -f ${STAGEDIR}${MAILMANDIR}/Mailman/mm_cfg.pyc + @${MKDIR} ${STAGEDIR}${PREFIX}/${IMGDIR} .for imgfile in ${IMGFILES} - @${CP} ${MAILMANDIR}/icons/${imgfile} ${PREFIX}/${IMGDIR} + ${CP} ${STAGEDIR}${MAILMANDIR}/icons/${imgfile} ${STAGEDIR}${PREFIX}/${IMGDIR} .endfor - @uudecode -p ${FILESDIR}/powerlogo.gif.uue > \ - ${PREFIX}/${IMGDIR}/powerlogo.gif -.if !defined(NOPORTDOCS) - @${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/ - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${DOCSDIR} + uudecode -p ${FILESDIR}/powerlogo.gif.uue > \ + ${STAGEDIR}${PREFIX}/${IMGDIR}/powerlogo.gif +.if ${PORT_OPTIONS:MDOCS} + ${CP} -R ${WRKSRC}/doc/* ${WRKSRC}/ + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/FreeBSD-post-install-notes ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOCS:NFreeBSD-post-install-notes} - @${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} .endfor .endif - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${ECHO} "This marker file ensures that Python's upgrade-site-packages handles ${PKGNAME}." >${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mailman-info.txt .if ${PORT_OPTIONS:MPOSTFIX} @if [ "x`${LOCALBASE}/sbin/postconf -h myhostname`" != "xlocalhost" ]; then \ ${ECHO_CMD} ""; \ Modified: head/japanese/mailman/files/FreeBSD-post-install-notes ============================================================================== --- head/japanese/mailman/files/FreeBSD-post-install-notes Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/files/FreeBSD-post-install-notes Sat Jul 5 17:42:23 2014 (r360783) @@ -21,6 +21,7 @@ VERY IMPORTANT NOTE The Mailman port has a number of build time options. Getting the values of some of these right is CRUCIAL if you want your Mailman installation to work! + 1) General post-installation instructions You should find two files named "INSTALL" and "README" in the same @@ -37,7 +38,7 @@ some of these right is CRUCIAL if you wa Mailman port works well with either Apache 1.3.x or Apache 2.x as installed from their respective ports (www/apache13 and www/apache2). - If you're using Apache, you need to add at least two lines to your + If you are using Apache, you need to add at least two lines to your httpd.conf. Assuming that you installed the Mailman port in the default location (/usr/local/mailman), they are: @@ -86,10 +87,6 @@ some of these right is CRUCIAL if you wa exim_user = mailnull exim_group = mail - For Exim 3.x, the value of MAIL_GID has to be set to 'nobody' (or 65534) - when building the Mailman port, so you have to choose EXIM3 on build options - to set it to you. - For Exim 4.x, the value of MAIL_GID has to be set to 'mail' (or 6) when building the Mailman port, so you have to choose EXIM4 on build options to set it to you. @@ -117,8 +114,8 @@ some of these right is CRUCIAL if you wa # /usr/local/etc/rc.d/mailman start Troubleshooting: If you ever see an error message such as the following - in your Exim's mainlog, it's a sure sign that Exim and Mailman disagree - about the GID under which mail is delivered: + in your Exim's mainlog, that is a sure sign that Exim and Mailman + disagree about the GID under which mail is delivered: ** testlist@your.host.com R=mailman_router T=mailman_transport: Child process of mailman_transport transport returned 2 from command: @@ -152,10 +149,11 @@ some of these right is CRUCIAL if you wa Mailman port with Qmail. Please submit any such information to the maintainer of the Mailman port. + 4) Apache configuration - You should add the follow lines in you httpd.conf to mailman interface - works correctly: + You should add the follow lines to your httpd.conf so + that the mailman interface works correctly: Options FollowSymLinks ExecCGI @@ -169,4 +167,4 @@ some of these right is CRUCIAL if you wa # apachectl restart. -- Jean Milanez Melo - (Mailman port maintainer) + (former Mailman port maintainer) Modified: head/japanese/mailman/files/mailman.in ============================================================================== --- head/japanese/mailman/files/mailman.in Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/files/mailman.in Sat Jul 5 17:42:23 2014 (r360783) @@ -23,7 +23,8 @@ load_rc_config $name start_cmd=${name}_start stop_cmd=${name}_stop -extra_commands="reload" +status_cmd=${name}_status +extra_commands="reload status" mailman_start() { %%MAILMANDIR%%/bin/mailmanctl -s -q start @@ -35,4 +36,15 @@ mailman_stop() { || echo ${name} not running? \(check ${pidfile}\) } +mailman_status() { + local retcode=0 + if [ -f $pidfile ] && ps -p $(cat $pidfile) > /dev/null; then + echo $name is running as pid $(cat $pidfile). + else + echo $name is not running. + retcode=1 + fi + return $retcode +} + run_rc_command "$1" Modified: head/japanese/mailman/files/pkg-deinstall.in ============================================================================== --- head/japanese/mailman/files/pkg-deinstall.in Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/files/pkg-deinstall.in Sat Jul 5 17:42:23 2014 (r360783) @@ -5,26 +5,25 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in - DEINSTALL) - echo "---> Starting deinstall script:" + echo "---> Starting deinstall script" if /usr/bin/crontab -u "%%USER%%" -l | \ - /usr/bin/diff - %%MAILMANDIR%%/cron/crontab.in >/dev/null 2>&1 ; then + /usr/bin/diff -B -b - "%%MAILMANDIR%%/cron/crontab.in" >/dev/null 2>&1 ; then echo "---> Zeroing crontab for \"%%USER%%\"" - /usr/bin/crontab -u "%%USER%%" /dev/null + /usr/bin/crontab -u "%%USER%%" -r /var/cron/allow.new - mv /var/cron/allow.new /var/cron/allow + grep -v "^%%USER%%$" /var/cron/allow > /var/cron/allow.new$$ + mv /var/cron/allow.new$$ /var/cron/allow fi else - echo "---> Crontab for \"%%USER%%\" not removed: please deinstall" - echo "---> manually if you no-longer wish to use Mailman. eg:" - echo "---> /usr/bin/crontab -u "%%USER%%" -r" + echo "---> Crontab for \"%%USER%%\" modified, not removed: please deinstall" + echo "---> it manually if you no longer wish to use Mailman. E.g.:" + echo "---> /usr/bin/crontab -u \"%%USER%%\" -r" fi echo "---> Preserving the \"last_mailman_version\" file" - /bin/cp -f %%MAILMANDIR%%/data/last_mailman_version /var/tmp/ + /bin/mv -f "%%MAILMANDIR%%/data/last_mailman_version" /var/tmp/ # If the errorlog is the only existing logfile, delete it. (If Mailman's # qrunner had not been running, then the process of trying to stop the @@ -33,20 +32,22 @@ DEINSTALL) # errorlog will exist.) if [ "`echo %%MAILMANDIR%%/logs/*`" = "%%MAILMANDIR%%/logs/error" ]; then echo "---> Deleting errorlog (It is the only existing logfile.)" - /bin/rm -f %%MAILMANDIR%%/logs/error + /bin/rm -f "%%MAILMANDIR%%/logs/error" fi ;; POST-DEINSTALL) - echo "---> Starting post-deinstall script:" + echo "---> Starting post-deinstall script" - if [ -d %%MAILMANDIR%% ]; then + # try to kill all empty directories - necessary on pkg_add-based systems + find "%%MAILMANDIR%%" -depth -type d -exec rmdir '{}' + >/dev/null 2>&1 || : + if [ -d "%%MAILMANDIR%%" ]; then echo '---> %%MAILMANDIR%% is not empty - this installation may have active lists!' + ls -lRB "%%MAILMANDIR%%" | head -n200 || : echo "---> Restoring \"last_mailman_version\" file" - [ -d %%MAILMANDIR%%/data ] || /bin/mkdir %%MAILMANDIR%%/data - /bin/mv -f /var/tmp/last_mailman_version %%MAILMANDIR%%/data/ + /bin/mkdir -p "%%MAILMANDIR%%/data" + /bin/mv -f /var/tmp/last_mailman_version "%%MAILMANDIR%%/data/" fi ;; - esac Modified: head/japanese/mailman/files/pkg-install.in ============================================================================== --- head/japanese/mailman/files/pkg-install.in Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/files/pkg-install.in Sat Jul 5 17:42:23 2014 (r360783) @@ -7,18 +7,26 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) - echo "---> Starting post-install script:" + echo "---> Starting post-install script" + + MYTMP="$(mktemp -d "${TMPDIR-/tmp}/mminstall.XXXXXXXXXX")" || exit 1 + trap "rm -rf \"$MYTMP\"" EXIT /bin/chmod g+s "%%MAILMANDIR%%" || exit 1 + echo "---> Running update" + + LC_ALL=C "%%MAILMANDIR%%/bin/update" || exit 1 + echo "---> Checking crontab(5) file for user \"%%USER%%\"" if [ -e /var/cron/allow ]; then - echo "%%USER%%" >> /var/cron/allow + grep -q "^%%USER%%\$" /var/cron/allow || \ + printf '%s\n' "%%USER%%" >> /var/cron/allow fi - if /usr/bin/crontab -u "%%USER%%" -l >/tmp/mmctab$$ 2>&1 ; then - if test -s /tmp/mmctab$$; then + if /usr/bin/crontab -u "%%USER%%" -l >"$MYTMP/crontab" 2>&1 ; then + if test -s "$MYTMP/crontab"; then echo "---> \"%%USER%%\" already has a crontab. Not overwriting it" echo "---> Please merge any changes from the standard crontab file" echo "---> %%MAILMANDIR%%/cron/crontab.in" @@ -30,10 +38,10 @@ POST-INSTALL) echo "---> Creating crontab(5) file for user \"%%USER%%\"" /usr/bin/crontab -u "%%USER%%" "%%MAILMANDIR%%/cron/crontab.in" || exit 1 fi - rm -f /tmp/mmctab$$ + rm -f "$MYTMP/crontab" echo "---> Checking (and fixing) file and directory permissions" - %%MAILMANDIR%%/bin/check_perms -f >/dev/null 2>&1 + "%%MAILMANDIR%%/bin/check_perms" -f >/dev/null ;; esac Modified: head/japanese/mailman/files/pkg-message.in ============================================================================== --- head/japanese/mailman/files/pkg-message.in Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/files/pkg-message.in Sat Jul 5 17:42:23 2014 (r360783) @@ -7,23 +7,22 @@ extensive post-installation instructions %%DOCSDIR%%/FreeBSD-post-install-notes -Note (1): If you use an alternate (non-Sendmail) MTA, you MUST be sure -that the correct value of MAIL_GID was used when this port or package -was built. Performing a "make config" in the Mailman port directory -you can choose your MTA with the correct MAIL_GID. +Note (1): If you use an alternate MTA (meaning "not Sendmail"), you MUST +be sure that the correct value of MAIL_GID was used when this port or +package was built. You can choose your MTA with the correct MAIL_GID by +running "make config" in the Mailman port directory. -Note (2): The entire Mailman installation resides under %%MAILMANDIR%% +Note (2): The entire Mailman installation resides under %%MAILMANDIR%%. The command-line scripts necessary to administer Mailman have been -installed in %%MAILMANDIR%%/bin +installed in %%MAILMANDIR%%/bin. Note (3): As of version 2.1, Mailman's queue runner runs as a daemon and is started by a script in %%LOCALBASE%%/etc/rc.d In order to make private archives searchable with namazu2, you need copy or link %%LOCALBASE%%/libexec/namazu.cgi to -%%MAILMANDIR%%/archives/private// and configure .namazurc +%%MAILMANDIR%%/archives/private// and configure .namazurc to refer to %%LOCALBASE%%/etc/namazu/namazu-sample. -See also -http://www.python.jp/pipermail/mailman-users-jp/2004-August/001008.html -written in Japanese. +You can also see the Japanese document in + ---------------------------------------------------------------------------- Modified: head/japanese/mailman/pkg-descr ============================================================================== --- head/japanese/mailman/pkg-descr Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/pkg-descr Sat Jul 5 17:42:23 2014 (r360783) @@ -10,4 +10,4 @@ Security and Features: clone_member to properly handle banned addresses. - and so on -WWW: http://www.python.jp/doc/contrib/mailman/releases.html +WWW: http://www.python.jp/doc/contrib/mailman/releases.html Modified: head/japanese/mailman/pkg-plist ============================================================================== --- head/japanese/mailman/pkg-plist Sat Jul 5 17:37:58 2014 (r360782) +++ head/japanese/mailman/pkg-plist Sat Jul 5 17:42:23 2014 (r360783) @@ -1,6 +1,4 @@ @stopdaemon mailman -@unexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py %D/%%MMDIR%%/Mailman/mm_cfg.py.dist; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi -@unexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc @exec mkdir -p %D/%%MMDIR%%/archives @exec mkdir -p %D/%%MMDIR%%/archives/private @exec mkdir -p %D/%%MMDIR%%/archives/public @@ -307,9 +305,10 @@ %%MMDIR%%/Mailman/htmlformat.pyc %%MMDIR%%/Mailman/i18n.py %%MMDIR%%/Mailman/i18n.pyc -@exec [ -f %B/mm_cfg.py ] || cp %B/%f %B/mm_cfg.py +@unexec if cmp -s %D/%%MMDIR%%/Mailman/mm_cfg.py.dist %D/%%MMDIR%%/Mailman/mm_cfg.py; then rm -f %D/%%MMDIR%%/Mailman/mm_cfg.py; fi %%MMDIR%%/Mailman/mm_cfg.py.dist -%%MMDIR%%/Mailman/mm_cfg.pyc +@exec if [ ! -f %B/mm_cfg.py ] ; then cp -p %D/%F %B/mm_cfg.py; fi +@unexec rm -f %D/%%MMDIR%%/Mailman/mm_cfg.pyc %%MMDIR%%/Mailman/versions.py %%MMDIR%%/Mailman/versions.pyc %%MMDIR%%/bin/add_members @@ -371,9 +370,8 @@ %%MMDIR%%/cron/mailpasswds %%MMDIR%%/cron/nightly_gzip %%MMDIR%%/cron/paths.py -%%MMDIR%%/cron/paths.pyc +@unexec rm -f %%MMDIR%%/cron/paths.pyc %%MMDIR%%/cron/senddigests -%%MMDIR%%/data/last_mailman_version %%MMDIR%%/data/sitelist.cfg %%MMDIR%%/icons/PythonPowered.png %%MMDIR%%/icons/gnu-head-tiny.jpg @@ -530,7 +528,6 @@ %%MMDIR%%/scripts/mailman %%MMDIR%%/scripts/owner %%MMDIR%%/scripts/paths.py -%%MMDIR%%/scripts/paths.pyc %%MMDIR%%/scripts/post %%MMDIR%%/scripts/request %%MMDIR%%/scripts/subscribe @@ -2246,6 +2243,7 @@ %%MMDIR%%/tests/test_security_mgr.py %%MMDIR%%/tests/test_smtp.py %%MMDIR%%/tests/testall.py +%%PYTHON_SITELIBDIR%%/mailman-info.txt @dirrm %%MMDIR%%/tests/msgs @dirrm %%MMDIR%%/tests/bounces @dirrm %%MMDIR%%/tests