1. update to 1.11

2. Add many knobs.
3. pass maintainer ship to Clement Laforet <sheepkiller@cultdeadsheep.org>

PR:		53358
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>
Notification by: daichi

19 files changed, 104 insertions, 227 deletions

diff --git a/mail/perdition/files/patch-aa b/mail/perdition/files/patch-aa
deleted file mode 100644
index 6c0cabe..0000000
--- a/mail/perdition/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** etc/perdition/Makefile.am.orig	Sun Apr 29 00:29:58 2001
---- etc/perdition/Makefile.am	Sun Apr 29 00:30:52 2001
-***************
-*** 23,29 ****
-  #
-  ######################################################################
-  
-! EXTRA_DIST = perdition.conf
-  
-  perditionconfdir = $(sysconfdir)/perdition
-! perditionconf_DATA = perdition.conf
---- 23,29 ----
-  #
-  ######################################################################
-  
-! EXTRA_DIST = perdition.conf.sample
-  
-  perditionconfdir = $(sysconfdir)/perdition
-! perditionconf_DATA = perdition.conf.sample
diff --git a/mail/perdition/files/patch-ab b/mail/perdition/files/patch-ab
deleted file mode 100644
index 1f56cb7..0000000
--- a/mail/perdition/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-*** etc/perdition/Makefile.in.orig	Sun Apr 29 00:56:52 2001
---- etc/perdition/Makefile.in	Sun Apr 29 00:57:22 2001
-***************
-*** 115,124 ****
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = perdition.conf
-  
-  perditionconfdir = $(sysconfdir)/perdition
-! perditionconf_DATA = perdition.conf
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../../config.h
-  CONFIG_CLEAN_FILES = 
---- 115,124 ----
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = perdition.conf.sample
-  
-  perditionconfdir = $(sysconfdir)/perdition
-! perditionconf_DATA = perdition.conf.sample
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../../config.h
-  CONFIG_CLEAN_FILES = 
diff --git a/mail/perdition/files/patch-ac b/mail/perdition/files/patch-ac
deleted file mode 100644
index fb07a4e..0000000
--- a/mail/perdition/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-*** etc/Makefile.am.orig	Sun Apr 29 00:31:48 2001
---- etc/Makefile.am	Sun Apr 29 00:32:01 2001
-***************
-*** 23,29 ****
-  #
-  ######################################################################
-  
-! SUBDIRS = perdition @pam_dir@ rc.d sysconfig
-  
-  EXTRA_DIST = 
-  
---- 23,29 ----
-  #
-  ######################################################################
-  
-! SUBDIRS = perdition @pam_dir@
-  
-  EXTRA_DIST = 
-  
diff --git a/mail/perdition/files/patch-ad b/mail/perdition/files/patch-ad
deleted file mode 100644
index fdbcb29..0000000
--- a/mail/perdition/files/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-*** etc/Makefile.in.orig	Sun Apr 29 00:59:15 2001
---- etc/Makefile.in	Sun Apr 29 00:59:23 2001
-***************
-*** 115,121 ****
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! SUBDIRS = perdition @pam_dir@ rc.d sysconfig
-  
-  EXTRA_DIST = 
-  
---- 115,121 ----
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! SUBDIRS = perdition @pam_dir@
-  
-  EXTRA_DIST = 
-  
diff --git a/mail/perdition/files/patch-ae b/mail/perdition/files/patch-ae
deleted file mode 100644
index de42de0..0000000
--- a/mail/perdition/files/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-*** perdition/db/gdbm/Makefile.am.orig	Sun Apr 29 00:34:26 2001
---- perdition/db/gdbm/Makefile.am	Sun Apr 29 00:35:37 2001
-***************
-*** 23,32 ****
-  #
-  ######################################################################
-  
-! EXTRA_DIST = popmap Makefile.popmap.in Makefile.popmap
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap Makefile.popmap
-  
-  install-data-hook:
-  	(cd $(DESTDIR)$(sysconfdir)/perdition/ && ln -sf Makefile.popmap Makefile)
---- 23,32 ----
-  #
-  ######################################################################
-  
-! EXTRA_DIST = popmap.sample Makefile.popmap.in Makefile.popmap
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.sample Makefile.popmap
-  
-  install-data-hook:
-  	(cd $(DESTDIR)$(sysconfdir)/perdition/ && ln -sf Makefile.popmap Makefile)
diff --git a/mail/perdition/files/patch-af b/mail/perdition/files/patch-af
deleted file mode 100644
index aa6f9ef..0000000
--- a/mail/perdition/files/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-*** perdition/db/gdbm/Makefile.in.orig	Sun Apr 29 01:00:08 2001
---- perdition/db/gdbm/Makefile.in	Sun Apr 29 01:00:36 2001
-***************
-*** 115,124 ****
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = popmap Makefile.popmap.in Makefile.popmap
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap Makefile.popmap
-  
-  lib_LTLIBRARIES = libperditiondb_gdbm.la
-  
---- 115,124 ----
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = popmap.sample Makefile.popmap.in Makefile.popmap
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.sample Makefile.popmap
-  
-  lib_LTLIBRARIES = libperditiondb_gdbm.la
-  
diff --git a/mail/perdition/files/patch-ag b/mail/perdition/files/patch-ag
deleted file mode 100644
index 5b2362b..0000000
--- a/mail/perdition/files/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-*** perdition/db/posix_regex/Makefile.am.orig	Sun Apr 29 00:36:56 2001
---- perdition/db/posix_regex/Makefile.am	Sun Apr 29 00:37:17 2001
-***************
-*** 24,33 ****
-  #
-  ######################################################################
-  
-! EXTRA_DIST = popmap.re
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.re
-  
-  lib_LTLIBRARIES = libperditiondb_posix_regex.la
-  
---- 24,33 ----
-  #
-  ######################################################################
-  
-! EXTRA_DIST = popmap.re.sample
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.re.sample
-  
-  lib_LTLIBRARIES = libperditiondb_posix_regex.la
-  
diff --git a/mail/perdition/files/patch-ah b/mail/perdition/files/patch-ah
deleted file mode 100644
index eeb3590..0000000
--- a/mail/perdition/files/patch-ah
+++ /dev/null
@@ -1,25 +0,0 @@
-*** perdition/db/posix_regex/Makefile.in.orig	Sun Apr 29 01:01:11 2001
---- perdition/db/posix_regex/Makefile.in	Sun Apr 29 01:01:24 2001
-***************
-*** 116,125 ****
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = popmap.re
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.re
-  
-  lib_LTLIBRARIES = libperditiondb_posix_regex.la
-  
---- 116,125 ----
-  resolv_lib = @resolv_lib@
-  socket_lib = @socket_lib@
-  
-! EXTRA_DIST = popmap.re.sample
-  
-  confdir = $(sysconfdir)/perdition
-! conf_DATA = popmap.re.sample
-  
-  lib_LTLIBRARIES = libperditiondb_posix_regex.la
-  
diff --git a/mail/perdition/files/patch-ai b/mail/perdition/files/patch-ai
deleted file mode 100644
index 9d30d39..0000000
--- a/mail/perdition/files/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
---- perdition/str.c.orig	Sun Apr 21 04:10:48 2002
-+++ perdition/str.c	Sun Apr 21 04:13:22 2002
-@@ -35,7 +35,6 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <unistd.h>
--#include <printf.h>
- #include <sys/uio.h>
- #include <vanessa_socket.h>
- 
-@@ -96,13 +95,6 @@
- 
-   extern options_t opt;
-   extern vanessa_logger_t *perdition_vl;
--
--  if((fmt_args=parse_printf_format(fmt, 0, NULL)) != nargs){
--    PERDITION_DEBUG_UNSAFE(
--      "nargs and fmt missmatch: %d args requested, %d args in format", nargs,
--      fmt_args);
--    return(-1);
--  }
- 
-   va_start(ap, fmt);
-   if((bytes=vsnprintf(__str_write_buf, STR_WRITE_BUF_LEN-2, fmt, ap))<0){
diff --git a/mail/perdition/files/patch-aj b/mail/perdition/files/patch-aj
deleted file mode 100644
index 2482502..0000000
--- a/mail/perdition/files/patch-aj
+++ /dev/null
@@ -1,10 +0,0 @@
---- perdition/username.h.orig	Sun Apr 21 04:16:49 2002
-+++ perdition/username.h	Sun Apr 21 04:16:57 2002
-@@ -29,6 +29,7 @@
- #ifndef USERNAME_BERT
- #define USERNAME_BERT
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
- 
- /**********************************************************************
diff --git a/mail/perdition/files/patch-ak b/mail/perdition/files/patch-ak
deleted file mode 100644
index 9e4e3f3..0000000
--- a/mail/perdition/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- perdition/pam.h.orig	Sat Dec 21 01:36:10 2002
-+++ perdition/pam.h	Sat Dec 21 01:36:12 2002
-@@ -37,6 +37,8 @@
- 
- #ifdef WITH_PAM_SUPPORT
- 
-+#include <stddef.h>
-+
- #ifdef HAVE_SECURITY_PAM_MISC_H
- #include <security/pam_misc.h>
- #endif /* HAVE_SECURITY_PAM_MISC_H */
diff --git a/mail/perdition/files/patch-etc-Makefile.in b/mail/perdition/files/patch-etc-Makefile.in
new file mode 100644
index 0000000..6598f65
--- /dev/null
+++ b/mail/perdition/files/patch-etc-Makefile.in
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig	Sun Jun 15 21:50:02 2003
++++ etc/Makefile.in	Sun Jun 15 21:50:18 2003
+@@ -136,7 +136,7 @@
+ ssl_includes = @ssl_includes@
+ ssl_lib = @ssl_lib@
+ 
+-SUBDIRS = perdition @pam_dir@ rc.d sysconfig
++SUBDIRS = perdition
+ 
+ EXTRA_DIST = 
+ 
diff --git a/mail/perdition/files/patch-etc-perdition-Makefile.in b/mail/perdition/files/patch-etc-perdition-Makefile.in
new file mode 100644
index 0000000..d46c01e
--- /dev/null
+++ b/mail/perdition/files/patch-etc-perdition-Makefile.in
@@ -0,0 +1,18 @@
+--- etc/perdition/Makefile.in.orig	Sun Jun 15 19:07:06 2003
++++ etc/perdition/Makefile.in	Sun Jun 15 19:07:13 2003
+@@ -169,11 +169,11 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(perditionconfdir)
+ 	@list='$(perditionconf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p; \
++	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist"; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(perditionconfdir)/$$p-dist; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p; \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p-dist"; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(perditionconfdir)/$$p-dist; \
+ 	  fi; fi; \
+ 	done
+ 
diff --git a/mail/perdition/files/patch-makebdb-Makefile.in b/mail/perdition/files/patch-makebdb-Makefile.in
new file mode 100644
index 0000000..72a4188
--- /dev/null
+++ b/mail/perdition/files/patch-makebdb-Makefile.in
@@ -0,0 +1,11 @@
+--- makebdb/Makefile.in.orig	Sun Jun 15 18:30:18 2003
++++ makebdb/Makefile.in	Sun Jun 15 18:30:35 2003
+@@ -145,7 +145,7 @@
+ makebdb_SOURCES =          makebdb.c         options.c         options.h
+ 
+ 
+-makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb -lpopt @dmalloc_lib@
++makebdb_LDADD = -L../libjain -L../libjain/.libs/ -ljain -ldb3 -lpopt @dmalloc_lib@
+ 
+ 
+ INCLUDES = -I$(top_srcdir)/libjain
diff --git a/mail/perdition/files/patch-makebdb-makebdb.c b/mail/perdition/files/patch-makebdb-makebdb.c
new file mode 100644
index 0000000..c976a51
--- /dev/null
+++ b/mail/perdition/files/patch-makebdb-makebdb.c
@@ -0,0 +1,11 @@
+--- makebdb/makebdb.c.orig	Mon Apr 28 08:13:47 2003
++++ makebdb/makebdb.c	Sun Jun 15 18:36:21 2003
+@@ -35,7 +35,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <db.h>
++#include <db3/db.h>
+ 
+ #include "options.h"
+ 
diff --git a/mail/perdition/files/patch-perdition-db-bdb-Makefile.in b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
new file mode 100644
index 0000000..e8f6475
--- /dev/null
+++ b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
@@ -0,0 +1,11 @@
+--- perdition/db/bdb/Makefile.in.orig	Sun Jun 15 18:42:41 2003
++++ perdition/db/bdb/Makefile.in	Sun Jun 15 18:42:58 2003
+@@ -143,7 +143,7 @@
+ 
+ libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
+ 
+-libperditiondb_bdb_la_LIBADD = -ldb
++libperditiondb_bdb_la_LIBADD = -ldb3
+ 
+ INCLUDES =    -I$(top_srcdir)/   -I$(top_srcdir)/perdition   -I$(top_srcdir)/libjain   -DPERDITIONDB_BDB_SYSCONFDIR=\"$(sysconfdir)/perdition\" @ssl_includes@
+ 
diff --git a/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h b/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
new file mode 100644
index 0000000..5ae7e65
--- /dev/null
+++ b/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
@@ -0,0 +1,11 @@
+--- perdition/db/bdb/perditiondb_bdb.h.orig	Sun Jun 15 18:38:52 2003
++++ perdition/db/bdb/perditiondb_bdb.h	Sun Jun 15 18:39:05 2003
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <db.h>
++#include <db3/db.h>
+ #include "log.h"
+ 
+ #ifndef PERDITIONDB_BDB_SYSCONFDIR
diff --git a/mail/perdition/files/patch-perdition-db-ldap-Makefile.in b/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
new file mode 100644
index 0000000..1965d3d
--- /dev/null
+++ b/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
@@ -0,0 +1,13 @@
+--- ./perdition/db/ldap/Makefile.in.orig	Sun Jun 15 21:21:13 2003
++++ ./perdition/db/ldap/Makefile.in	Sun Jun 15 21:22:09 2003
+@@ -550,8 +550,8 @@
+ 				"$(DESTDIR)@ldap_schemadir@"; \
+ 		fi; \
+ 		if test -w "$(DESTDIR)@ldap_schemadir@"; then \
+-			install -m644 $< \
+-				"$(DESTDIR)@ldap_schemadir@/perdition.schema";\
++			install -m644 $(schema_sources) \
++				"$(DESTDIR)@ldap_schemadir@/perdition.schema-dist";\
+ 		fi \
+ 	fi
+ 
diff --git a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in
new file mode 100644
index 0000000..7c8921d
--- /dev/null
+++ b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in
@@ -0,0 +1,18 @@
+--- perdition/db/posix_regex/Makefile.in.orig	Sun Jun 15 21:54:10 2003
++++ perdition/db/posix_regex/Makefile.in	Sun Jun 15 21:55:04 2003
+@@ -270,11 +270,11 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(confdir)
+ 	@list='$(conf_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p; \
++	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist"; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(confdir)/$$p-dist; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p; \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p-dist"; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(confdir)/$$p-dist; \
+ 	  fi; fi; \
+ 	done
+