# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1452723310 -3600
# Node ID c7a23f0fad689fed7a7548b04857467b3c0622d7
# Parent  4303f41bd2455660cbae8cc7ec62050f090cacf2
Up perdition (2.1)

diff -r 4303f41bd245 -r c7a23f0fad68 perdition-dev/receipt
--- a/perdition-dev/receipt	Wed Jan 13 22:24:07 2016 +0100
+++ b/perdition-dev/receipt	Wed Jan 13 23:15:10 2016 +0100
@@ -1,14 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition-dev"
-VERSION="1.17.1"
+VERSION="2.1"
 CATEGORY="development"
 SHORT_DESC="IMAP/POP proxy development files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.vergenet.net/linux/perdition"
+WANTED="perdition"
+
 DEPENDS="perdition"
-WANTED="perdition"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -16,4 +17,3 @@
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.a $fs/usr/lib
 }
-
diff -r 4303f41bd245 -r c7a23f0fad68 perdition-pam/receipt
--- a/perdition-pam/receipt	Wed Jan 13 22:24:07 2016 +0100
+++ b/perdition-pam/receipt	Wed Jan 13 23:15:10 2016 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition-pam"
-VERSION="1.17.1"
+VERSION="2.1"
 CATEGORY="network"
 SHORT_DESC="IMAP/POP proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -10,22 +10,23 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.vergenet.net/linux/$SOURCE"
 WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL"
-BUILD_DEPENDS="vanessa_logger-dev vanessa_logger vanessa_adt-dev vanessa_adt vanessa_socket-dev vanessa_socket openldap-dev pam pam-dev popt-dev cyrus-sasl-dev"
+CONFIG_FILES="/etc/perdition"
+PROVIDE="perdition:pam"
+
 DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap openssl cyrus-sasl \
 pam glibc-base libkrb5 libcomerr3 gdbm"
-CONFIG_FILES="/etc/perdition"
-PROVIDE="perdition:pam"
-BUGS="Very slow: more than 10 seconds for login with squirrelmail, why ?"
+BUILD_DEPENDS="vanessa_logger-dev vanessa_adt-dev vanessa_socket-dev \
+openldap-dev pam pam-dev popt-dev cyrus-sasl-dev openssl-dev libidn-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure --prefix=/usr --infodir=/usr/share/info \
-	--enable-openldap --disable-ldap-doc --disable-nis \
-	--disable-odbc --disable-mysql --disable-pg --disable-bdb \
-	--sysconfdir=/etc --localstatedir=/var \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+		--disable-ldap-doc --disable-nis \
+		--disable-odbc --disable-mysql --disable-pg --disable-bdb \
+		--disable-cdb --disable-gdbm \
+		--sysconfdir=/etc --localstatedir=/var \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 4303f41bd245 -r c7a23f0fad68 perdition/receipt
--- a/perdition/receipt	Wed Jan 13 22:24:07 2016 +0100
+++ b/perdition/receipt	Wed Jan 13 23:15:10 2016 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition"
-VERSION="1.17.1"
+VERSION="2.1"
 CATEGORY="network"
 SHORT_DESC="IMAP/POP proxy."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -12,21 +12,20 @@
 CONFIG_FILES="/etc/perdition"
 BUGS="Very slow: more than 10 seconds for login with squirrelmail, why ?"
 
-BUILD_DEPENDS="vanessa_logger-dev vanessa_logger vanessa_adt-dev vanessa_adt vanessa_socket-dev vanessa_socket openldap-dev popt-dev cyrus-sasl-dev"
 DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap openssl cyrus-sasl \
  glibc-base libkrb5 libcomerr3 gdbm"
+BUILD_DEPENDS="vanessa_logger-dev vanessa_adt-dev vanessa_socket-dev \
+openldap-dev popt-dev cyrus-sasl-dev openssl-dev libidn-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	sed -i 's/pam=yes/pam=no/' configure
 	./configure --prefix=/usr --infodir=/usr/share/info \
-	--enable-openldap --disable-ldap-doc --disable-nis \
-	--disable-odbc --disable-mysql --disable-pg --disable-bdb \
-	--sysconfdir=/etc --localstatedir=/var \
-	--mandir=/usr/share/man $CONFIGURE_ARGS || return 1
-	sed -i 's/#define WITH_PAM_SUPPORT 1/#undef WITH_PAM_SUPPORT/' config.h
+		--disable-ldap-doc --disable-nis \
+		--disable-odbc --disable-mysql --disable-pg --disable-bdb \
+		--disable-cdb --disable-gdbm --disable-pam \
+		--sysconfdir=/etc --localstatedir=/var \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -37,7 +36,7 @@
 	mkdir -p $fs/usr/lib $fs/etc/openldap/schema
 	cp -a $install/etc $fs
 	rm -f $fs/etc/perdition/perdition.conf
-	cp -a stuff/etc $fs
+	cp -a $stuff/etc $fs
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	for i in pop3 pop3s imap4 imap4s imaps; do