Attachment 145943 Details for Bug 192770 – Update perdition to 2.1

[patch] Update perdition to 2.1

perdition-2.1.diff (text/plain), 10.50 KB, created by Brian Mastenbrook on 2014-08-17 22:56:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Mastenbrook

Created: 2014-08-17 22:56:43 UTC

Size: 10.50 KB

patch

obsolete

>diff -urN /usr/ports/mail/perdition/Makefile perdition/Makefile
>--- /usr/ports/mail/perdition/Makefile	2014-07-30 15:06:24.000000000 -0500
>+++ perdition/Makefile	2014-08-17 17:48:47.515011404 -0500
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/mail/perdition/Makefile 363510 2014-07-30 20:06:24Z amdmi3 $
> 
> PORTNAME=	perdition
>-PORTVERSION=	1.18
>-PORTREVISION=	5
>+PORTVERSION=	2.1
> CATEGORIES=	mail net security
> MASTER_SITES=	http://horms.net/projects/perdition/download/${PORTVERSION}/
> 
>@@ -15,7 +14,7 @@
> 		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 \
>diff -urN /usr/ports/mail/perdition/distinfo perdition/distinfo
>--- /usr/ports/mail/perdition/distinfo	2013-01-08 16:33:10.000000000 -0600
>+++ perdition/distinfo	2014-08-17 16:50:00.789276206 -0500
>@@ -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
>diff -urN /usr/ports/mail/perdition/files/patch-etc-perdition-Makefile.in perdition/files/patch-etc-perdition-Makefile.in
>--- /usr/ports/mail/perdition/files/patch-etc-perdition-Makefile.in	2013-01-08 16:33:10.000000000 -0600
>+++ perdition/files/patch-etc-perdition-Makefile.in	2014-08-17 17:02:06.239260506 -0500
>@@ -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:
>+ 
>diff -urN /usr/ports/mail/perdition/files/patch-perdition-acap_token.c perdition/files/patch-perdition-acap_token.c
>--- /usr/ports/mail/perdition/files/patch-perdition-acap_token.c	1969-12-31 18:00:00.000000000 -0600
>+++ perdition/files/patch-perdition-acap_token.c	2014-08-17 17:24:58.539367705 -0500
>@@ -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;
>diff -urN /usr/ports/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in perdition/files/patch-perdition-db-posix_regex-Makefile.in
>--- /usr/ports/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in	2013-01-08 16:33:10.000000000 -0600
>+++ perdition/files/patch-perdition-db-posix_regex-Makefile.in	2014-08-17 17:08:59.529253505 -0500
>@@ -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)
>diff -urN /usr/ports/mail/perdition/files/patch-perdition-str.c perdition/files/patch-perdition-str.c
>--- /usr/ports/mail/perdition/files/patch-perdition-str.c	1969-12-31 18:00:00.000000000 -0600
>+++ perdition/files/patch-perdition-str.c	2014-08-17 17:25:26.919232805 -0500
>@@ -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;
>diff -urN /usr/ports/mail/perdition/files/patch-perdition-str.h perdition/files/patch-perdition-str.h
>--- /usr/ports/mail/perdition/files/patch-perdition-str.h	1969-12-31 18:00:00.000000000 -0600
>+++ perdition/files/patch-perdition-str.h	2014-08-17 17:25:19.154318305 -0500
>@@ -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;
>diff -urN /usr/ports/mail/perdition/files/perdition.managesieve.in perdition/files/perdition.managesieve.in
>--- /usr/ports/mail/perdition/files/perdition.managesieve.in	1969-12-31 18:00:00.000000000 -0600
>+++ perdition/files/perdition.managesieve.in	2014-08-17 17:44:53.425770204 -0500
>@@ -0,0 +1,29 @@
>+#!/bin/sh
>+#
>+# $FreeBSD: head/mail/perdition/files/perdition.managesieve.in 340872 2014-01-24 00:14:07Z mat $
>+#
>+# 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"
>diff -urN /usr/ports/mail/perdition/pkg-plist perdition/pkg-plist
>--- /usr/ports/mail/perdition/pkg-plist	2014-07-30 15:06:24.000000000 -0500
>+++ perdition/pkg-plist	2014-08-17 17:43:19.272404504 -0500
>@@ -56,6 +56,7 @@
> 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.imap4
> sbin/perdition.imap4s
> sbin/perdition.imaps
>+sbin/perdition.managesieve
> %%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample
> @dirrmtry etc/perdition
> %%LDAP%%@dirrmtry etc/openldap/schema

Actions: View | Diff

Attachments on bug 192770: 145943