Attachment #145943 for bug #192770

View | Details | Raw Unified | Return to bug 192770
Collapse All | Expand All

Lines 2-9 Link Here

(-)perdition/Makefile (-3 / +2 lines)
2	# $FreeBSD: head/mail/perdition/Makefile 363510 2014-07-30 20:06:24Z amdmi3 $	2	# $FreeBSD: head/mail/perdition/Makefile 363510 2014-07-30 20:06:24Z amdmi3 $
3		3
4	PORTNAME= perdition	4	PORTNAME= perdition
5	PORTVERSION= 1.18	5	PORTVERSION= 2.1
6	PORTREVISION= 5
7	CATEGORIES= mail net security	6	CATEGORIES= mail net security
8	MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/	7	MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/
9		8
Lines 15-21 Link Here
15	libvanessa_socket.so:${PORTSDIR}/devel/libvanessa_socket \	14	libvanessa_socket.so:${PORTSDIR}/devel/libvanessa_socket \
16	libvanessa_adt.so:${PORTSDIR}/devel/libvanessa_adt	15	libvanessa_adt.so:${PORTSDIR}/devel/libvanessa_adt
17		16
18	USES= gettext libtool shebangfix	17	USES= gettext libtool pkgconfig shebangfix
19	SHEBANG_FILES= ${WRKSRC}/perdition/db/ldap/perditiondb_ldap_makedb \	18	SHEBANG_FILES= ${WRKSRC}/perdition/db/ldap/perditiondb_ldap_makedb \
20	${WRKSRC}/perdition/db/mysql/perditiondb_mysql_makedb \	19	${WRKSRC}/perdition/db/mysql/perditiondb_mysql_makedb \
21	${WRKSRC}/perdition/db/odbc/perditiondb_odbc_makedb \	20	${WRKSRC}/perdition/db/odbc/perditiondb_odbc_makedb \

Lines 1-2 Link Here

(-)perdition/distinfo (-2 / +2 lines)
1	SHA256 (perdition-1.18.tar.gz) = cad541ca1881de8eec74106851d10c2027588b96cf1f70e3cf395f2c24c4ecaa	1	SHA256 (perdition-2.1.tar.gz) = 645fbb3bb1d001f5aec95d2848b23e245aeacc79119f0b392bc57cd896d79fe8
2	SIZE (perdition-1.18.tar.gz) = 602933	2	SIZE (perdition-2.1.tar.gz) = 701062




--- 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 $$?; \
+          done; \
 	done
 

 	@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|^.*/||'`; \
 	dir='$(DESTDIR)$(perditionconfdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 

Line 0 Link Here

(-)perdition/files/patch-perdition-acap_token.c (+10 lines)
	1	--- perdition/acap_token.c.orig 2014-08-17 17:24:21.423379005 -0500
	2	+++ perdition/acap_token.c 2014-08-17 17:14:48.823113805 -0500
	3	@@ -5,6 +5,7 @@
	4	#include <vanessa_adt.h>
	5	#include <ctype.h>
	6	#include <limits.h>
	7	+#include <stdint.h>
	8
	9	struct acap_token_status {
	10	enum acap_type type;




--- 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 $$?; \
+          done ; \
 	done
 

 	@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|^.*/||'`; \
 	dir='$(DESTDIR)$(confdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)




--- 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;




--- 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;




#!/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"

Lines 56-61 Link Here

(-)perdition/pkg-plist (+2 lines)
56	man/man8/perdition.imap4.8.gz	56	man/man8/perdition.imap4.8.gz
57	man/man8/perdition.imap4s.8.gz	57	man/man8/perdition.imap4s.8.gz
58	man/man8/perdition.imaps.8.gz	58	man/man8/perdition.imaps.8.gz
		59	man/man8/perdition.managesieve.8.gz
59	%%LDAP%%man/man8/perditiondb_ldap_makedb.8.gz	60	%%LDAP%%man/man8/perditiondb_ldap_makedb.8.gz
60	%%MYSQL%%man/man8/perditiondb_mysql_makedb.8.gz	61	%%MYSQL%%man/man8/perditiondb_mysql_makedb.8.gz
61	%%ODBC%%man/man8/perditiondb_odbc_makedb.8.gz	62	%%ODBC%%man/man8/perditiondb_odbc_makedb.8.gz
Lines 68-73 Link Here
68	sbin/perdition.imap4	69	sbin/perdition.imap4
69	sbin/perdition.imap4s	70	sbin/perdition.imap4s
70	sbin/perdition.imaps	71	sbin/perdition.imaps
		72	sbin/perdition.managesieve
71	%%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample	73	%%PORTDOCS%%%%DOCSDIR%%/perdition-pam.sample
72	@dirrmtry etc/perdition	74	@dirrmtry etc/perdition
73	%%LDAP%%@dirrmtry etc/openldap/schema	75	%%LDAP%%@dirrmtry etc/openldap/schema

Return to bug 192770

Lines 1-15 Link Here

(-)perdition/files/patch-etc-perdition-Makefile.in (-10 / +10 lines)
1	--- etc/perdition/Makefile.in.orig 2012-03-20 05:07:55.000000000 -0700	1	--- etc/perdition/Makefile.in.orig 2014-08-17 16:56:17.272880606 -0500
2	+++ etc/perdition/Makefile.in 2012-12-12 16:48:33.000000000 -0800	2	+++ etc/perdition/Makefile.in 2014-08-17 17:01:19.661130306 -0500
3	@@ -303,14 +303,17 @@	3	@@ -370,14 +370,17 @@
4	echo "$$d$$p"; \	4	echo "$$d$$p"; \
5	done \| $(am__base_list) \| \	5	done \| $(am__base_list) \| \
6	while read files; do \	6	while read files; do \
7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \	7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(perditionconfdir)'"; \
8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" \|\| exit $$?; \	8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(perditionconfdir)" \|\| exit $$?; \
9	+ for p in $$files; do \	9	+ for p in $$files; do \
10	+ $(am__strip_dir) \	10	+ $(am__strip_dir) \
11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \	11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(perditionconfdir)/$$f-dist'"; \
12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" \|\| exit $$?; \	12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(perditionconfdir)/$$f-dist" \|\| exit $$?; \
13	+ done; \	13	+ done; \
14	done	14	done
15		15
Lines 18-23 Link Here
18	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" \|\| list=; \	18	@list='$(perditionconf_DATA)'; test -n "$(perditionconfdir)" \|\| list=; \
19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \	19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \	20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \
21	test -n "$$files" \|\| exit 0; \	21	dir='$(DESTDIR)$(perditionconfdir)'; $(am__uninstall_files_from_dir)
22	echo " ( cd '$(DESTDIR)$(perditionconfdir)' && rm -f" $$files ")"; \	22	tags TAGS:
23	cd "$(DESTDIR)$(perditionconfdir)" && rm -f $$files	23

Lines 1-15 Link Here

(-)perdition/files/patch-perdition-db-posix_regex-Makefile.in (-10 / +10 lines)
1	--- perdition/db/posix_regex/Makefile.in.orig 2012-03-20 05:08:06.000000000 -0700	1	--- perdition/db/posix_regex/Makefile.in.orig 2014-08-17 17:07:29.014154305 -0500
2	+++ perdition/db/posix_regex/Makefile.in 2012-12-12 16:47:41.000000000 -0800	2	+++ perdition/db/posix_regex/Makefile.in 2014-08-17 17:08:18.344506605 -0500
3	@@ -414,14 +414,17 @@	3	@@ -503,14 +503,17 @@
4	echo "$$d$$p"; \	4	echo "$$d$$p"; \
5	done \| $(am__base_list) \| \	5	done \| $(am__base_list) \| \
6	while read files; do \	6	while read files; do \
7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \	7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(confdir)'"; \
8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" \|\| exit $$?; \	8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(confdir)" \|\| exit $$?; \
9	+ for p in $$files; do \	9	+ for p in $$files; do \
10	+ $(am__strip_dir) \	10	+ $(am__strip_dir) \
11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \	11	+ echo " $(INSTALL_DATA) $$p '$(DESTDIR)$(confdir)/$$f-dist'"; \
12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" \|\| exit $$?; \	12	+ $(INSTALL_DATA) $$p "$(DESTDIR)$(confdir)/$$f-dist" \|\| exit $$?; \
13	+ done ; \	13	+ done ; \
14	done	14	done
15		15
Lines 18-23 Link Here
18	@list='$(conf_DATA)'; test -n "$(confdir)" \|\| list=; \	18	@list='$(conf_DATA)'; test -n "$(confdir)" \|\| list=; \
19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \	19	- files=`for p in $$list; do echo $$p; done \| sed -e 's\|^.*/\|\|'`; \
20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \	20	+ files=`for p in $$list; do echo $$p-dist; done \| sed -e 's\|^.*/\|\|'`; \
21	test -n "$$files" \|\| exit 0; \	21	dir='$(DESTDIR)$(confdir)'; $(am__uninstall_files_from_dir)
22	echo " ( cd '$(DESTDIR)$(confdir)' && rm -f" $$files ")"; \	22
23	cd "$(DESTDIR)$(confdir)" && rm -f $$files	23	ID: $(am__tagged_files)

Line 0 Link Here

(-)perdition/files/patch-perdition-str.c (+40 lines)
	1	--- perdition/str.c.orig 2014-08-17 17:24:03.239221605 -0500
	2	+++ perdition/str.c 2014-08-17 17:14:01.541576305 -0500
	3	@@ -705,37 +705,6 @@
	4	}
	5
	6	/**********************************************************************
	7	- * strcasestring
	8	- * Find the first occurrence of string in a string, case insensitively
	9	- * pre: haystack: string to search in
	10	- * needle: string to search for
	11	- * return: pointer to the first occurrence of needle
	12	- * NULL on error
	13	- *
	14	- * Note: returns a const char* rather than a char * like strstr().
	15	- * This seems more logical given the type of the inputs.
	16	- *
	17	- * strcasestr() exists in gcc (and returns char *) but this
	18	- * is a GNU extension. As an implementation is needed for when
	19	- * perdition is compiled against other libcs, it may as be used all
	20	- * the time.
	21	- **********************************************************************/
	22	-
	23	-const char strcasestr(const char haystack, const char *needle)
	24	-{
	25	- size_t i, haystack_len, needle_len;
	26	-
	27	- haystack_len = strlen(haystack);
	28	- needle_len = strlen(needle);
	29	-
	30	- for (i = 0; haystack_len - i >= needle_len; i++)
	31	- if (!strcasecmp(haystack + i, needle))
	32	- return haystack + i;
	33	-
	34	- return NULL;
	35	-}
	36	-
	37	-/**********************************************************************
	38	* strcasedelimword
	39	* Find the first occurrence of a word in a string
	40	* That is, find a needle in a haystack and make sure that;

Line 0 Link Here

(-)perdition/files/patch-perdition-str.h (+28 lines)
	1	--- perdition/str.h.orig 2014-08-17 17:23:58.809239705 -0500
	2	+++ perdition/str.h 2014-08-17 17:14:09.246054705 -0500
	3	@@ -335,25 +335,6 @@
	4	char str_replace(char str, size_t n, ...);
	5
	6	/**********************************************************************
	7	- * strcasestring
	8	- * Find the first occurrence of string in a string, case insensitively
	9	- * pre: haystack: string to search in
	10	- * needle: string to search for
	11	- * return: pointer to the first occurrence of needle
	12	- * NULL on error
	13	- *
	14	- * Note: returns a const char* rather than a char * like strstr().
	15	- * This seems more logical given the type of the inputs.
	16	- *
	17	- * strcasestr() exists in gcc (and returns char *) but this
	18	- * is a GNU extension. As an implementation is needed for when
	19	- * perdition is compiled against other libcs, it may as be used all
	20	- * the time.
	21	- **********************************************************************/
	22	-
	23	-const char strcasestr(const char haystack, const char *needle);
	24	-
	25	-/**********************************************************************
	26	* strcasedelimword
	27	* Find the first occurrence of a word in a string
	28	* That is, find a needle in a haystack and make sure that;

Line 0 Link Here

(-)perdition/files/perdition.managesieve.in (+29 lines)
	1	#!/bin/sh
	2	#
	3	# $FreeBSD: head/mail/perdition/files/perdition.managesieve.in 340872 2014-01-24 00:14:07Z mat $
	4	#
	5	# PROVIDE: perdition_managesieve
	6	# REQUIRE: DAEMON
	7	# KEYWORD: shutdown
	8	#
	9	# Add the following line to /etc/rc.conf to enable perdition.managesieve
	10	#
	11	# perdition_managesieve_enable="YES"
	12	# perdition_managesieve_flags="<set as needed>"
	13	#
	14	# See perdition(8) for flags
	15	#
	16
	17	perdition_managesieve_enable=${perdition_managesieve_enable-"NO"}
	18
	19	. /etc/rc.subr
	20
	21	name="perdition_managesieve"
	22	rcvar=perdition_managesieve_enable
	23
	24	command="%%PREFIX%%/sbin/perdition.managesieve"
	25	pidfile="/var/run/perdition.managesieve/perdition.managesieve.pid"
	26
	27	load_rc_config $name
	28
	29	run_rc_command "$1"