10 files changed, 49 insertions, 30 deletions

diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index bead780e260b..fa2aef89a51a 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	perdition
-PORTVERSION=	1.15
+PORTVERSION=	1.17
 CATEGORIES=	mail net security
 MASTER_SITES=	http://www.vergenet.net/linux/perdition/download/${PORTVERSION}/
 
-MAINTAINER=	clement@FreeBSD.org
+MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	A POP3 & IMAP4 proxy that can map users to multiple backend servers
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
diff --git a/mail/perdition/distinfo b/mail/perdition/distinfo
index 7e7ebcb77e8e..a62a713f482b 100644
--- a/mail/perdition/distinfo
+++ b/mail/perdition/distinfo
@@ -1,2 +1,3 @@
-MD5 (perdition-1.15.tar.gz) = 7c3aaf30198cf73191a984a76637a940
-SIZE (perdition-1.15.tar.gz) = 551692
+MD5 (perdition-1.17.tar.gz) = 6cef90e55bde9eb2d0a17acccb3516f3
+SHA256 (perdition-1.17.tar.gz) = 38f1bfe1cb7db8b16fc6a3febc293460b6a5ae49312c6a08b757c89b1ae73879
+SIZE (perdition-1.17.tar.gz) = 552149
diff --git a/mail/perdition/files/patch-etc-Makefile.in b/mail/perdition/files/patch-etc-Makefile.in
index 6598f65e53de..e648e4e103de 100644
--- a/mail/perdition/files/patch-etc-Makefile.in
+++ b/mail/perdition/files/patch-etc-Makefile.in
@@ -1,10 +1,10 @@
---- 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@
+--- etc/Makefile.in.orig	Wed Jun 22 06:32:39 2005
++++ etc/Makefile.in	Mon Dec 19 09:31:41 2005
+@@ -137,7 +137,7 @@
  
--SUBDIRS = perdition @pam_dir@ rc.d sysconfig
+ @PAM_BUILD_TRUE@PAM_DIR = pam.d
+ 
+-SUBDIRS = perdition $(PAM_DIR) rc.d sysconfig
 +SUBDIRS = perdition
  
  EXTRA_DIST = 
diff --git a/mail/perdition/files/patch-perdition-db-bdb-Makefile.in b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
index e8f6475249f2..55679148906e 100644
--- a/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
+++ b/mail/perdition/files/patch-perdition-db-bdb-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- perdition/db/bdb/Makefile.in.orig	Tue Dec  6 15:56:55 2005
++++ perdition/db/bdb/Makefile.in	Tue Dec  6 15:57:17 2005
+@@ -142,7 +142,7 @@
  
  libperditiondb_bdb_la_LDFLAGS = -version-info 0:0:0
  
diff --git a/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h b/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
index 5ae7e6598c7a..89430eef6d0c 100644
--- a/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
+++ b/mail/perdition/files/patch-perdition-db-bdb-perditiondb_bdb.h
@@ -1,5 +1,5 @@
---- 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
+--- perdition/db/bdb/perditiondb_bdb.h.orig	Tue Dec  6 15:58:20 2005
++++ perdition/db/bdb/perditiondb_bdb.h	Tue Dec  6 15:58:34 2005
 @@ -29,7 +29,7 @@
  #include <unistd.h>
  #include <stdlib.h>
diff --git a/mail/perdition/files/patch-perdition-db-ldap-Makefile.in b/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
index 1965d3dfe769..3b2bd41dd46d 100644
--- a/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
+++ b/mail/perdition/files/patch-perdition-db-ldap-Makefile.in
@@ -1,6 +1,6 @@
---- ./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 @@
+--- perdition/db/ldap/Makefile.in.orig	Tue Dec  6 15:59:30 2005
++++ perdition/db/ldap/Makefile.in	Tue Dec  6 16:04:27 2005
+@@ -545,8 +545,8 @@
  				"$(DESTDIR)@ldap_schemadir@"; \
  		fi; \
  		if test -w "$(DESTDIR)@ldap_schemadir@"; then \
diff --git a/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap b/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap
new file mode 100644
index 000000000000..6da3393089bc
--- /dev/null
+++ b/mail/perdition/files/patch-perdition-db-ldap-perditiondb_ldap
@@ -0,0 +1,18 @@
+--- perdition/db/ldap/perditiondb_ldap.c.orig	Tue Dec  6 22:32:57 2005
++++ perdition/db/ldap/perditiondb_ldap.c	Tue Dec  6 22:38:31 2005
+@@ -334,9 +334,12 @@
+ 	}
+ 
+ 	/* Open LDAP connection */
+-#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)
+-	if (ldap_initialize(&connection, pldap_filter) != LDAP_SUCCESS) {
+-		VANESSA_LOGGER_DEBUG_ERRNO("ldap_initialize");
++#if 0
++//#if defined(LDAP_API_FEATURE_X_OPENLDAP) && (LDAP_API_VERSION > 2000)
++	err = ldap_initialize(&connection, pldap_filter);
++	if (err != LDAP_SUCCESS) {
++		VANESSA_LOGGER_DEBUG_UNSAFE("ldap_initialize: %s",
++			ldap_err2string(err)); 
+ 		goto leave;
+ 	}
+ #else
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 7c8921ddbe1b..1672be3d1e38 100644
--- a/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in
+++ b/mail/perdition/files/patch-perdition-db-posix_regex-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- perdition/db/posix_regex/Makefile.in.orig	Tue Dec  6 16:05:43 2005
++++ perdition/db/posix_regex/Makefile.in	Tue Dec  6 16:08:04 2005
+@@ -269,11 +269,11 @@
  	$(mkinstalldirs) $(DESTDIR)$(confdir)
  	@list='$(conf_DATA)'; for p in $$list; do \
  	  if test -f $(srcdir)/$$p; then \
diff --git a/mail/perdition/files/patch-perdition::Makefile.in b/mail/perdition/files/patch-perdition::Makefile.in
index bf8081697eb4..d37bd2b8e380 100644
--- a/mail/perdition/files/patch-perdition::Makefile.in
+++ b/mail/perdition/files/patch-perdition::Makefile.in
@@ -1,6 +1,6 @@
---- perdition/Makefile.in.orig	Mon Dec 15 08:19:21 2003
-+++ perdition/Makefile.in	Mon Dec 15 14:35:08 2003
-@@ -573,8 +573,6 @@
+--- perdition/Makefile.in.orig	Tue Dec  6 16:08:58 2005
++++ perdition/Makefile.in	Tue Dec  6 16:09:36 2005
+@@ -560,8 +560,6 @@
  	for i in pop3 pop3s imap4 imap4s imaps; do \
  		(cd $(DESTDIR)$(sbindir) && rm -f perdition.$$i && \
  			ln -sf perdition perdition.$$i); \
diff --git a/mail/perdition/files/patch-perdition::db::daemon::Makefile.in b/mail/perdition/files/patch-perdition::db::daemon::Makefile.in
index a06156c5ad52..f7ea51995bfc 100644
--- a/mail/perdition/files/patch-perdition::db::daemon::Makefile.in
+++ b/mail/perdition/files/patch-perdition::db::daemon::Makefile.in
@@ -1,11 +1,11 @@
---- perdition/db/daemon/Makefile.in.orig	Mon Dec 15 12:24:51 2003
-+++ perdition/db/daemon/Makefile.in	Mon Dec 15 12:27:20 2003
-@@ -155,7 +155,7 @@
+--- perdition/db/daemon/Makefile.in.orig	Tue Dec  6 16:10:19 2005
++++ perdition/db/daemon/Makefile.in	Tue Dec  6 16:11:15 2005
+@@ -144,7 +144,7 @@
+ libperditiondb_daemon_la_SOURCES =  perditiondb_daemon.c perditiondb_daemon.h unix_socket.c unix_socket.h
  
  libperditiondb_daemon_la_LDFLAGS = -version-info 0:0:0
- 
--libperditiondb_daemon_la_LIBADD = -ldb
-+libperditiondb_daemon_la_LIBADD = -lgdbm
+-libperditiondb_daemon_la_LIBADD = -ldb -L. -lperditiondb_daemon_packet
++libperditiondb_daemon_la_LIBADD = -lgdbm -L. -lperditiondb_daemon_packet
  
  noinst_PROGRAMS = client server