<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c2b5cef06e6e5f298ac23a941adb89d360ea88f8">https://github.com/macports/macports-ports/commit/c2b5cef06e6e5f298ac23a941adb89d360ea88f8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c2b5cef sympa: update to version 6.2.54 using github
</span>c2b5cef is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c2b5cef06e6e5f298ac23a941adb89d360ea88f8
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue May 12 14:26:47 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> sympa: update to version 6.2.54 using github
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add perl variants, default +perl5_28
</span><span style='display:block; white-space:pre;color:#404040;'> * update patches, dependencies, notes, etc
</span>---
mail/sympa/Portfile | 77 ++++++++++++---------
.../sympa/files/patch-src-etc-script-sympa.in.diff | 80 +++++++++++-----------
mail/sympa/files/patch-src-lib-confdef.pm.diff | 38 ----------
3 files changed, 83 insertions(+), 112 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/sympa/Portfile b/mail/sympa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9802dba..fce57f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/sympa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/sympa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,12 @@
</span>
PortSystem 1.0
PortGroup perl5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup sympa-community sympa 6.2.54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name sympa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.1.23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span> set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26
</span> categories mail
license GPL-2
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +19,15 @@ long_description An advanced perl-based mail list manager with a web interfac
</span> that supports LDAP authentication and LDAP extraction of \
list subscribers and owners.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.sympa.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.sympa.org/distribution/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.sympa.org/distribution/old/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c91d78b1c1c93f2a5490779a54b676438a089ca0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6bd54e6dcf9b003575b01202952edba28a392af90ff8cf908e1d3e6417e5a733 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12759734
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0c65549bc01e154081554a7d9ff8bb11db1d0ccc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3d15aa8816dafcc4017cc06e52def44d5461498a05e9ef7634498b0993234ae4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.require_variant yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.conflict_variants yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26 5.28 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.default_branch 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.create_variants ${perl5.branches}
</span>
depends_lib port:apache2 \
port:mod_fcgid \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,13 +37,20 @@ depends_lib port:apache2 \
</span> port:p${perl5.major}-authcas \
port:p${perl5.major}-cgi \
port:p${perl5.major}-cgi-fast \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-clone \
</span> port:p${perl5.major}-crypt-ciphersaber \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-crypt-eksblowfish \
</span> port:p${perl5.major}-crypt-openssl-x509 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-crypt-smime \
</span> port:p${perl5.major}-data-password \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-datetime-format-mail \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-datetime-timezone \
</span> port:p${perl5.major}-dbi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-digest-md5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-encode \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-encode-locale \
</span> port:p${perl5.major}-fcgi \
port:p${perl5.major}-file-copy-recursive \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-file-nfslock \
</span> port:p${perl5.major}-html-formatter \
port:p${perl5.major}-html-stripscripts-parser \
port:p${perl5.major}-html-tree \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,35 +58,41 @@ depends_lib port:apache2 \
</span> port:p${perl5.major}-io-socket-ssl \
port:p${perl5.major}-libintl-perl \
port:p${perl5.major}-libwww-perl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-mailtools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-lwp-protocol-https \
</span> port:p${perl5.major}-mail-dkim \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-mailtools \
</span> port:p${perl5.major}-mhonarc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-mime-base64 \
</span> port:p${perl5.major}-mime-charset \
port:p${perl5.major}-mime-encwords \
port:p${perl5.major}-mime-lite-html \
port:p${perl5.major}-mime-tools \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-net-cidr \
</span> port:p${perl5.major}-net-dns \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-net-netmask \
</span> port:p${perl5.major}-perl-ldap \
port:p${perl5.major}-soap-lite \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-socket6 \
</span> port:p${perl5.major}-template-toolkit \
port:p${perl5.major}-term-progressbar \
port:p${perl5.major}-time-hires \
port:p${perl5.major}-unicode-linebreak \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-unicode-utf8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-uri \
</span> port:p${perl5.major}-xml-libxml
pre-patch {
copy ${filespath}/httpd-sympa.conf ${worksrcpath}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-etc-script-sympa.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-lib-confdef.pm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-etc-script-sympa.in.diff
</span>
post-patch {
reinplace "s|__MP_PREFIX__|${prefix}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/httpd-sympa.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/lib/confdef.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/httpd-sympa.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#mhonarc|mhonarc|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/sympa.conf.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/mhonarc|${prefix}/bin/mhonarc-${perl5.major}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/sympa.conf.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/t/data/sympa.conf
</span> }
configure.args --with-perl=${perl5.bin} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +118,8 @@ set httpd_conf ${prefix}/etc/apache2/httpd.conf
</span>
# Keep these empty directories
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/var/lib/${name}/arc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/etc/${name}/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/lib/${name}/arc \
</span> ${destroot}${prefix}/var/lib/${name}/bounce \
${destroot}${prefix}/var/lib/${name}/list_data \
${destroot}${prefix}/var/lock/subsys \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,10 +128,10 @@ destroot.keepdirs ${destroot}${prefix}/var/lib/${name}/arc \
</span> ${destroot}${prefix}/var/spool/${name}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/INSTALL ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 ${worksrcpath}/INSTALL.md ${destroot}${prefix}/share/doc/${name}
</span> xinstall -d ${destroot}${extra}
xinstall -m 644 ${worksrcpath}/httpd-sympa.conf ${destroot}${extra}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/etc/sympa/sympa.conf ${destroot}${prefix}/etc/sympa/wwsympa.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/etc/sympa/sympa/sympa.conf
</span> }
variant postgresql description {Install optional dependencies for PostgreSQL database support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,26 +152,23 @@ if {![variant_isset postgresql] && ![variant_isset sqlite]} {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# create default configuration file if it doesn't already exist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# create default configuration files if they don't already exist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach cfile "sympa.conf wwsympa.conf" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/etc/sympa/${cfile}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/sbin/sympa_wizard.pl --create ${cfile}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/sympa/sympa/sympa.conf]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/sbin/sympa_wizard.pl --create sympa.conf"
</span> }
}
notes "
You can find the reference documentation at:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.sympa.org/manual_${branch}/index
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://sympa-community.github.io/manual/
</span>
Check that you have all the required perl modules:
$ ${prefix}/sbin/sympa_wizard.pl --check
First installation:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Check the INSTALL file:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/share/doc/sympa/INSTALL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Review the installation instructions:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://sympa-community.github.io/manual/install.html
</span> Run the wizard to customize the default configuration files
$ sudo ${prefix}/sbin/sympa_wizard.pl
Create the sympa database and tables using the script for your database at
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,7 +196,5 @@ First installation:
</span>
Upgrading to a new version:
Run this script to upgrade your existing data structures:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/sbin/sympa.pl --upgrade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo ${prefix}/sbin/sympa.pl --upgrade
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/sympa/files/patch-src-etc-script-sympa.in.diff b/mail/sympa/files/patch-src-etc-script-sympa.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f4291e..43d0c7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/sympa/files/patch-src-etc-script-sympa.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/sympa/files/patch-src-etc-script-sympa.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/etc/script/sympa.in.orig 2010-11-16 23:25:42.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/etc/script/sympa.in 2014-12-09 00:04:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,10 +33,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/etc/script/sympa.in.orig 2019-01-29 00:00:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/etc/script/sympa.in 2020-05-14 11:52:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,10 +45,14 @@
</span> fi
# OSTYPE *is* defined on Solaris 10! (bug #3149)
+# OSTYPE has many variants on darwin platforms
case "$OSTYPE" in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *solaris*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSTYPE=SunOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OSTYPE=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *solaris*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSTYPE=SunOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSTYPE=darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ -f /etc/SuSE-release ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSDIST='Suse'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,8 +70,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span> esac
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f /etc/SuSE-release ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,8 +63,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sympaconf="--CONFIG--"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wwsympaconf="--WWSCONFIG--"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -##'echo -n' not supported with SH on Solaris
-if [ ${OSTYPE} = "SunOS" ]; then
+##'echo -n' not supported with SH on Solaris or darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,41 +26,39 @@
</span> echo_opt=""
else
echo_opt="-n"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -159,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$pids" != "" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for pid in $pids; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- killcount=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- running=`ps -A | grep "$pid ..* $1\\.pl"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ running=`ps -A | grep "$pid.*$1\\.pl"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while [ "$running" != "" ]; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ $killcount -gt 10 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ ${use_functions} ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,13 +175,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +102,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$OSTYPE" = "BSD" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]]"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- running=`ps -A | grep "$pid ..* $comm"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ running=`ps -A | grep "$pid.*$comm"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$running" != "" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runningpids="$runningpids $pid"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -220,7 +224,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$OSTYPE" = "BSD" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]]"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- running=`ps -A | grep "$pid ..* $comm"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ running=`ps -A | grep "$pid.*$comm"`
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kill -TERM $pid >/dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- running=`ps -A | grep "$pid ..* $1\\.pl"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ running=`ps -A | grep "$pid.*$1\\.pl"`
</span> if [ "$running" = "" ]; then
runcount=`expr $runcount + 1`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,7 +234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "$OSTYPE" = "BSD" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ running=`ps -axw | grep "^[[:space:]]*$pid[[:space:]]"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- running=`ps -A | grep "$pid ..* $comm"`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ running=`ps -A | grep "$pid .*$comm"`
</span> fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sleep 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- running=`ps -A | grep "$pid ..* $1\\.pl"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ running=`ps -A | grep "$pid.*$1\\.pl"`
</span> if [ "$running" = "" ]; then
runcount=`expr $runcount + 1`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -204,8 +208,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -258,7 +262,7 @@
</span>
# Check that networking is up.
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ ${OSTYPE} != "Slack" -a ${OSTYPE} != "FreeBSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "darwin7.0" -a ${OSTYPE} != "Debian" -a ${OSTYPE} != "Suse" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ ${NETWORKING} = "no" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# NETWORKING is not defined on any darwin platforms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Just in case fix 'expected unary operator' error if $NETWORKING is null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ ${OSTYPE} != "Slack" -a ${OSTYPE} != "FreeBSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "darwin" -a ${OSTYPE} != "Debian" -a ${OSTYPE} != "Suse" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ "${NETWORKING}" = "no" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ ${OSTYPE} != "Linux" -a ${OSTYPE} != "BSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "Darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ ${OSTYPE} != "Linux" -a ${OSTYPE} != "BSD" -a ${OSTYPE} != "SunOS" -a ${OSTYPE} != "darwin" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ "${NETWORKING}" = "no" ]
</span> then
exit 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/sympa/files/patch-src-lib-confdef.pm.diff b/mail/sympa/files/patch-src-lib-confdef.pm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6325443..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/sympa/files/patch-src-lib-confdef.pm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/confdef.pm.orig 2014-09-10 07:08:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/confdef.pm 2014-12-10 11:43:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -459,7 +459,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'name' => 'sendmail',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'default' => '/usr/sbin/sendmail',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'default' => '__MP_PREFIX__/sbin/sendmail',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'query' => 'Path to the MTA (sendmail, postfix, exim or qmail)',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'file' => 'sympa.conf',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'edit' => '1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1203,7 +1203,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'name' => 'openssl',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'sample' => '/usr/bin/ssl',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'sample' => '__MP_PREFIX__/bin/openssl',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'query' => 'Path to OpenSSL',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'file' => 'sympa.conf',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'edit' => '1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1221,7 +1221,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'name' => 'cafile',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'sample' => '/usr/local/apache/conf/ssl.crt/ca-bundle.crt',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'sample' => '/__MP_PREFIX__/apache2/conf/ssl.crt/ca-bundle.crt',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'query' => 'File containing bundled trusted CA certificates',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'file' => 'sympa.conf',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'edit' => '1',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1481,7 +1481,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'name' => 'mhonarc',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'default' => '/usr/bin/mhonarc',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'default' => '__MP_PREFIX__/bin/mhonarc',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'query' => 'Path to MHonArc mail2html plugin',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'file' => 'wwsympa.conf',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'edit' => '1',
</span></pre><pre style='margin:0'>
</pre>