ports/188630: mail/automx update to 0.10.1
Andrew Fyfe
andrew at neptune-one.net
Mon Apr 14 22:20:00 UTC 2014
>Number: 188630
>Category: ports
>Synopsis: mail/automx update to 0.10.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 14 22:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Andrew Fyfe
>Release: FreeBSD 10.0-RELEASE-p1 amd64
>Organization:
>Environment:
FreeBSD soa 10.0-RELEASE-p1 FreeBSD 10.0-RELEASE-p1 #0: Tue Apr 8 06:45:06 UTC 2014 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
* Update to version 0.10.1
* Update automx-test patch
* Fetch upstream files from github
* Add missing dependencies
* Remove apache as a dependency (allows other web servers to be used)
* Add py-memcahced as an optional dependency
* Add INSTALL and BASIC_CONFIGURATION_README to docs
* Change the post install message to direct to the INSTALL file rather than dumping it to the console
>How-To-Repeat:
N/A
>Fix:
N/A
Patch attached with submission follows:
diff -Naur mail/automx.orig/Makefile mail/automx/Makefile
--- mail/automx.orig/Makefile 2014-01-13 21:00:02.000000000 +0000
+++ mail/automx/Makefile 2014-04-14 21:44:41.000000000 +0100
@@ -1,33 +1,37 @@
# $FreeBSD: head/mail/automx/Makefile 339634 2014-01-13 21:00:02Z rene $
PORTNAME= automx
-PORTVERSION= 0.9.2
+PORTVERSION= 0.10.1
CATEGORIES= mail
-MASTER_SITES= http://www.automx.org/download/
MAINTAINER= crees at FreeBSD.org
COMMENT= Handles mail account profile requests from mail clients
LICENSE= GPLv3
-RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_wsgi.so:${PORTSDIR}/www/mod_wsgi2 \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
+ ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
- wget:${PORTSDIR}/ftp/wget
+ ${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto \
+ wget:${PORTSDIR}/ftp/wget \
+ dig:${PORTSDIR}/dns/bind-tools
+
+GH_ACCOUNT= sys4
+GH_TAGNAME= v${PORTVERSION}
+GH_COMMIT= a438a2b
-USE_APACHE_RUN= 22+
USE_PYTHON= yes
+USE_GITHUB= yes
NO_BUILD= yes
PORTDATA= *
PORTDOCS= *
-PKGMESSAGE= ${WRKDIR}/pkg-message
+OPTIONS_DEFINE= MEMCACHE
-.include <bsd.port.options.mk>
+MEMCACHE_DESC= Add memcahce support
+MEMCACHE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}memcached>=0:${PORTSDIR}/databases/py-memcached
-post-patch:
-# Generate pkg-message from INSTALL file; include lines from Section 5 onwards
- line=$$(${SED} -ne '/^Web Server/=' ${WRKSRC}/INSTALL) && \
- ${SED} -ne "$$line,\$$p" ${WRKSRC}/INSTALL > ${PKGMESSAGE}
+.include <bsd.port.options.mk>
do-install:
${MKDIR} ${STAGEDIR}${DATADIR}
@@ -42,5 +46,7 @@
.endfor
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[^m]*" ${STAGEDIR}${DOCSDIR})
+ ${INSTALL_MAN} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_MAN} ${WRKSRC}/BASIC_CONFIGURATION_README ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff -Naur mail/automx.orig/distinfo mail/automx/distinfo
--- mail/automx.orig/distinfo 2014-01-22 15:30:13.000000000 +0000
+++ mail/automx/distinfo 2014-04-14 20:13:10.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (automx-0.9.2.tar.gz) = 98cd634ea019f993bd5e361697b03c725f0172e3d34cc19e2e5c2c43a287c665
-SIZE (automx-0.9.2.tar.gz) = 55622
+SHA256 (automx-0.10.1.tar.gz) = 3277bde52675d5e7ebf5f198fd1c9b6929fade4f5a7986bca925d5735bbb47ad
+SIZE (automx-0.10.1.tar.gz) = 410315
diff -Naur mail/automx.orig/files/patch-src-automx-test mail/automx/files/patch-src-automx-test
--- mail/automx.orig/files/patch-src-automx-test 2013-12-21 21:18:36.000000000 +0000
+++ mail/automx/files/patch-src-automx-test 2014-04-14 22:21:28.000000000 +0100
@@ -1,38 +1,37 @@
---- src/automx-test.orig 2013-03-30 18:45:31.000000000 +0000
-+++ src/automx-test 2013-12-21 20:34:11.520592847 +0000
+--- src/automx-test.orig 2014-01-03 08:38:38.000000000 +0000
++++ src/automx-test 2014-04-14 22:20:41.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# automx - auto configuration service
# Copyright (c) 2011-2013 [*] sys4 AG
-@@ -18,19 +18,20 @@
- # You should have received a copy of the GNU General Public License
+@@ -19,17 +19,19 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+ #
+# Ported to sh to avoid a dependency on bash by crees at FreeBSD.org
+#
- #
- VERSION="0.9.2"
+ VERSION="0.10.1"
trap clean_exit EXIT
-function clean_exit() {
- [[ -f "$OLREQUEST" ]] && rm "$OLREQUEST"
- [[ -f "$MBREQUEST" ]] && rm "$MBREQUEST"
+- [[ -f "$MBCRESPONSE" ]] && rm "$MBCRESPONSE"
+clean_exit() {
-+ rm -f "$OLREQUEST" "$MBREQUEST"
++ [ -f "$OLREQUEST" ] && rm "$OLREQUEST"
++ [ -f "$MBREQUEST" ] && rm "$MBREQUEST"
++ [ -f "$MBCRESPONSE" ] && rm "$MBCRESPONSE"
}
# We need a mail address
-if [[ $1 ]]; then
+if [ -n "$1" ]; then
PROFILE="$1"
--else
-+else
+ else
echo "Provide the mail address for which configuration settings should be retrieved."
- read -ep "Mail address: " PROFILE
- fi
-@@ -43,7 +44,7 @@
+@@ -44,7 +46,7 @@
# Test Mozilla schema
AUTOCONF="autoconfig.$DOMAIN"
@@ -41,7 +40,7 @@
CON="http://$AUTOCONF/mail/config-v1.1.xml?emailaddress=$PROFILE"
echo
echo "Testing Autoconfig ..."
-@@ -59,13 +60,12 @@
+@@ -60,13 +62,13 @@
# Test Microsoft schema
AUTODISC="autodiscover.$DOMAIN"
@@ -49,30 +48,27 @@
+if [ -z "$(dig +short $AUTODISC)" ]; then
# default domain does not exist, try to discover non-default
AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
-- AUTODISC="${AUTODISC//* /}"
-- AUTODISC="${AUTODISC%.*}"
-+ AUTODISC="$(echo $AUTODISC | sed 's,[^ ]* ,,g;s,\.[^.]*$,,')"
+ AUTODISC="${AUTODISC//* /}"
+ AUTODISC="${AUTODISC%.*}"
fi
-if [[ $AUTODISC ]]; then
+if [ -n "$AUTODISC" ]; then
# Test Microsoft Outlook schema
CON="https://$AUTODISC/autodiscover/autodiscover.xml"
cat <<-REQ >$OLREQUEST
-@@ -76,7 +76,7 @@
- <EMailAddress>$PROFILE</EMailAddress>
- </Request>
- </Autodiscover>
-- REQ
-+REQ
-
- echo
- echo "Testing Autodiscover (Microsoft Outlook(tm)) ..."
-@@ -94,7 +94,7 @@
- <EMailAddress>$PROFILE</EMailAddress>
- </Request>
- </Autodiscover>
-- REQ
-+REQ
-
- echo
- echo "Testing Autodiscover (mobilesync) ..."
+@@ -111,13 +113,13 @@
+
+ # Test mobileconfig schema
+ AUTODISC="autodiscover.$DOMAIN"
+-if [[ -z $(dig +short $AUTODISC) ]]; then
++if [ -z "$(dig +short $AUTODISC)" ]; then
+ # default domain does not exist, try to discover non-default
+ AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
+ AUTODISC="${AUTODISC//* /}"
+ AUTODISC="${AUTODISC%.*}"
+ fi
+-if [[ $AUTODISC ]]; then
++if [ -n "$AUTODISC" ]; then
+ # Test Apple mobileconfig schema
+ CON="https://$AUTODISC/mobileconfig"
+
diff -Naur mail/automx.orig/pkg-message mail/automx/pkg-message
--- mail/automx.orig/pkg-message 1970-01-01 01:00:00.000000000 +0100
+++ mail/automx/pkg-message 2014-04-14 21:58:56.000000000 +0100
@@ -0,0 +1,3 @@
+See INSTALL and BASIC_CONFIGURATION_README in /usr/local/share/doc/automx/
+for instructions on how to configure automx.
+
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list