diff options
Diffstat (limited to 'mail/perdition/files')
-rw-r--r-- | mail/perdition/files/patch-etc-perdition-Makefile.in | 20 | ||||
-rw-r--r-- | mail/perdition/files/patch-perdition-acap_token.c | 10 | ||||
-rw-r--r-- | mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in | 20 | ||||
-rw-r--r-- | mail/perdition/files/patch-perdition-str.c | 40 | ||||
-rw-r--r-- | mail/perdition/files/patch-perdition-str.h | 28 | ||||
-rw-r--r-- | mail/perdition/files/perdition.managesieve.in | 29 |
6 files changed, 127 insertions, 20 deletions
diff --git a/mail/perdition/files/patch-etc-perdition-Makefile.in b/mail/perdition/files/patch-etc-perdition-Makefile.in index 82c1c6397652..434b38038d14 100644 --- a/mail/perdition/files/patch-etc-perdition-Makefile.in +++ b/mail/perdition/files/patch-etc-perdition-Makefile.in @@ -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 --git a/mail/perdition/files/patch-perdition-acap_token.c b/mail/perdition/files/patch-perdition-acap_token.c new file mode 100644 index 000000000000..781c9856ee9d --- /dev/null +++ b/mail/perdition/files/patch-perdition-acap_token.c @@ -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 --git a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in index 69d14f5c8bc2..3734fcd16e4c 100644 --- a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in +++ b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in @@ -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 --git a/mail/perdition/files/patch-perdition-str.c b/mail/perdition/files/patch-perdition-str.c new file mode 100644 index 000000000000..2648b45095e1 --- /dev/null +++ b/mail/perdition/files/patch-perdition-str.c @@ -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 --git a/mail/perdition/files/patch-perdition-str.h b/mail/perdition/files/patch-perdition-str.h new file mode 100644 index 000000000000..5409eca5ec4a --- /dev/null +++ b/mail/perdition/files/patch-perdition-str.h @@ -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 --git a/mail/perdition/files/perdition.managesieve.in b/mail/perdition/files/perdition.managesieve.in new file mode 100644 index 000000000000..aeac444a1cad --- /dev/null +++ b/mail/perdition/files/perdition.managesieve.in @@ -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" |