Date: Sun, 24 Aug 2014 13:53:44 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365923 - in head/mail/perdition: . files Message-ID: <201408241353.s7ODrihO021179@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Sun Aug 24 13:53:43 2014 New Revision: 365923 URL: http://svnweb.freebsd.org/changeset/ports/365923 QAT: https://qat.redports.org/buildarchive/r365923/ Log: mail/perdition: update to 2.1 PR: 192770 Submitted by: Brian Mastenbrook Added: head/mail/perdition/files/patch-perdition-acap_token.c (contents, props changed) head/mail/perdition/files/patch-perdition-str.c (contents, props changed) head/mail/perdition/files/patch-perdition-str.h (contents, props changed) head/mail/perdition/files/perdition.managesieve.in (contents, props changed) Modified: head/mail/perdition/Makefile head/mail/perdition/distinfo head/mail/perdition/files/patch-etc-perdition-Makefile.in head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in head/mail/perdition/pkg-plist Modified: head/mail/perdition/Makefile ============================================================================== --- head/mail/perdition/Makefile Sun Aug 24 13:51:49 2014 (r365922) +++ head/mail/perdition/Makefile Sun Aug 24 13:53:43 2014 (r365923) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= perdition -PORTVERSION= 1.18 -PORTREVISION= 6 +PORTVERSION= 2.1 CATEGORIES= mail net security MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/ @@ -15,7 +14,7 @@ LIB_DEPENDS= libpopt.so:${PORTSDIR}/deve libvanessa_socket.so:${PORTSDIR}/devel/libvanessa_socket \ libvanessa_adt.so:${PORTSDIR}/devel/libvanessa_adt -USES= gettext libtool shebangfix +USES= gettext libtool pkgconfig shebangfix SHEBANG_FILES= ${WRKSRC}/perdition/db/ldap/perditiondb_ldap_makedb \ ${WRKSRC}/perdition/db/mysql/perditiondb_mysql_makedb \ ${WRKSRC}/perdition/db/odbc/perditiondb_odbc_makedb \ Modified: head/mail/perdition/distinfo ============================================================================== --- head/mail/perdition/distinfo Sun Aug 24 13:51:49 2014 (r365922) +++ head/mail/perdition/distinfo Sun Aug 24 13:53:43 2014 (r365923) @@ -1,2 +1,2 @@ -SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa -SIZE (perdition-1.18.tar.gz) = 602933 +SHA256 (perdition-2.1.tar.gz) = 645fbb3bb1d001f5aec95d2848b23e245aeacc79119f0b392bc57cd896d79fe8 +SIZE (perdition-2.1.tar.gz) = 701062 Modified: head/mail/perdition/files/patch-etc-perdition-Makefile.in ============================================================================== --- head/mail/perdition/files/patch-etc-perdition-Makefile.in Sun Aug 24 13:51:49 2014 (r365922) +++ head/mail/perdition/files/patch-etc-perdition-Makefile.in Sun Aug 24 13:53:43 2014 (r365923) @@ -1,15 +1,15 @@ ---- etc/perdition/Makefile.in.orig 2012-03-20 05:07:55.000000000 -0700 -+++ etc/perdition/Makefile.in 2012-12-12 16:48:33.000000000 -0800 -@@ -303,14 +303,17 @@ +--- etc/perdition/Makefile.in.orig 2014-08-17 16:56:17.272880606 -0500 ++++ etc/perdition/Makefile.in 2014-08-17 17:01:19.661130306 -0500 +@@ -370,14 +370,17 @@ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" || exit $$?; \ -+ for p in $$files; do \ -+ $(am__strip_dir) \ -+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \ -+ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \ ++ for p in $$files; do \ ++ $(am__strip_dir) \ ++ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \ ++ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" || exit $$?; \ + done; \ done @@ -18,6 +18,6 @@ @list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files + dir='$(DESTDIR)$(perditionconfdir)'; $(am__uninstall_files_from_dir) + tags TAGS: + Added: head/mail/perdition/files/patch-perdition-acap_token.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/perdition/files/patch-perdition-acap_token.c Sun Aug 24 13:53:43 2014 (r365923) @@ -0,0 +1,10 @@ +--- perdition/acap_token.c.orig 2014-08-17 17:24:21.423379005 -0500 ++++ perdition/acap_token.c 2014-08-17 17:14:48.823113805 -0500 +@@ -5,6 +5,7 @@ + #include <vanessa_adt.h> + #include <ctype.h> + #include <limits.h> ++#include <stdint.h> + + struct acap_token_status { + enum acap_type type; Modified: head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in ============================================================================== --- head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in Sun Aug 24 13:51:49 2014 (r365922) +++ head/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in Sun Aug 24 13:53:43 2014 (r365923) @@ -1,15 +1,15 @@ ---- perdition/db/posix_regex/Makefile.in.orig 2012-03-20 05:08:06.000000000 -0700 -+++ perdition/db/posix_regex/Makefile.in 2012-12-12 16:47:41.000000000 -0800 -@@ -414,14 +414,17 @@ +--- perdition/db/posix_regex/Makefile.in.orig 2014-08-17 17:07:29.014154305 -0500 ++++ perdition/db/posix_regex/Makefile.in 2014-08-17 17:08:18.344506605 -0500 +@@ -503,14 +503,17 @@ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" || exit $$?; \ -+ for p in $$files; do \ -+ $(am__strip_dir) \ -+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \ -+ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \ ++ for p in $$files; do \ ++ $(am__strip_dir) \ ++ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \ ++ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" || exit $$?; \ + done ; \ done @@ -18,6 +18,6 @@ @list='$(conf_DATA)'; test -n "$(confdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + files=`for p in $$list; do echo $$p-dist; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(confdir)" && rm -f $$files + dir='$(DESTDIR)$(confdir)'; $(am__uninstall_files_from_dir) + + ID: $(am__tagged_files) Added: head/mail/perdition/files/patch-perdition-str.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/perdition/files/patch-perdition-str.c Sun Aug 24 13:53:43 2014 (r365923) @@ -0,0 +1,40 @@ +--- perdition/str.c.orig 2014-08-17 17:24:03.239221605 -0500 ++++ perdition/str.c 2014-08-17 17:14:01.541576305 -0500 +@@ -705,37 +705,6 @@ + } + + /********************************************************************** +- * strcasestring +- * Find the first occurrence of string in a string, case insensitively +- * pre: haystack: string to search in +- * needle: string to search for +- * return: pointer to the first occurrence of needle +- * NULL on error +- * +- * Note: returns a const char* rather than a char * like strstr(). +- * This seems more logical given the type of the inputs. +- * +- * strcasestr() exists in gcc (and returns char *) but this +- * is a GNU extension. As an implementation is needed for when +- * perdition is compiled against other libcs, it may as be used all +- * the time. +- **********************************************************************/ +- +-const char *strcasestr(const char *haystack, const char *needle) +-{ +- size_t i, haystack_len, needle_len; +- +- haystack_len = strlen(haystack); +- needle_len = strlen(needle); +- +- for (i = 0; haystack_len - i >= needle_len; i++) +- if (!strcasecmp(haystack + i, needle)) +- return haystack + i; +- +- return NULL; +-} +- +-/********************************************************************** + * strcasedelimword + * Find the first occurrence of a word in a string + * That is, find a needle in a haystack and make sure that; Added: head/mail/perdition/files/patch-perdition-str.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/perdition/files/patch-perdition-str.h Sun Aug 24 13:53:43 2014 (r365923) @@ -0,0 +1,28 @@ +--- perdition/str.h.orig 2014-08-17 17:23:58.809239705 -0500 ++++ perdition/str.h 2014-08-17 17:14:09.246054705 -0500 +@@ -335,25 +335,6 @@ + char *str_replace(char *str, size_t n, ...); + + /********************************************************************** +- * strcasestring +- * Find the first occurrence of string in a string, case insensitively +- * pre: haystack: string to search in +- * needle: string to search for +- * return: pointer to the first occurrence of needle +- * NULL on error +- * +- * Note: returns a const char* rather than a char * like strstr(). +- * This seems more logical given the type of the inputs. +- * +- * strcasestr() exists in gcc (and returns char *) but this +- * is a GNU extension. As an implementation is needed for when +- * perdition is compiled against other libcs, it may as be used all +- * the time. +- **********************************************************************/ +- +-const char *strcasestr(const char *haystack, const char *needle); +- +-/********************************************************************** + * strcasedelimword + * Find the first occurrence of a word in a string + * That is, find a needle in a haystack and make sure that; Added: head/mail/perdition/files/perdition.managesieve.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/perdition/files/perdition.managesieve.in Sun Aug 24 13:53:43 2014 (r365923) @@ -0,0 +1,29 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# PROVIDE: perdition_managesieve +# REQUIRE: DAEMON +# KEYWORD: shutdown +# +# Add the following line to /etc/rc.conf to enable perdition.managesieve +# +# perdition_managesieve_enable="YES" +# perdition_managesieve_flags="<set as needed>" +# +# See perdition(8) for flags +# + +perdition_managesieve_enable=${perdition_managesieve_enable-"NO"} + +. /etc/rc.subr + +name="perdition_managesieve" +rcvar=perdition_managesieve_enable + +command="%%PREFIX%%/sbin/perdition.managesieve" +pidfile="/var/run/perdition.managesieve/perdition.managesieve.pid" + +load_rc_config $name + +run_rc_command "$1" Modified: head/mail/perdition/pkg-plist ============================================================================== --- head/mail/perdition/pkg-plist Sun Aug 24 13:51:49 2014 (r365922) +++ head/mail/perdition/pkg-plist Sun Aug 24 13:53:43 2014 (r365923) @@ -56,6 +56,7 @@ man/man8/perdition.8.gz man/man8/perdition.imap4.8.gz man/man8/perdition.imap4s.8.gz man/man8/perdition.imaps.8.gz +man/man8/perdition.managesieve.8.gz %%LDAP%%man/man8/perditiondb_ldap_makedb.8.gz %%MYSQL%%man/man8/perditiondb_mysql_makedb.8.gz %%ODBC%%man/man8/perditiondb_odbc_makedb.8.gz @@ -68,6 +69,7 @@ sbin/perdition.pop3s sbin/perdition.imap4 sbin/perdition.imap4s sbin/perdition.imaps +sbin/perdition.managesieve %%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample @dirrmtry etc/perdition %%LDAP%%@dirrmtry etc/openldap/schema
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408241353.s7ODrihO021179>