# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1559403811 -3600
# Node ID 113d38a1e4e944b7bfdb257063303eda7911410f
# Parent  2f1060dc67fe3c851f26958b8f4d7a49752d204c
updated perdition, perdition-dev and perdition-pam (2.1 -> 2.2)

diff -r 2f1060dc67fe -r 113d38a1e4e9 perdition-dev/receipt
--- a/perdition-dev/receipt	Sat Jun 01 16:02:43 2019 +0100
+++ b/perdition-dev/receipt	Sat Jun 01 16:43:31 2019 +0100
@@ -1,15 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition-dev"
-VERSION="2.1"
+VERSION="2.2"
 CATEGORY="development"
-SHORT_DESC="IMAP/POP proxy development files."
+SHORT_DESC="Fully featured POP3 and IMAP4 proxy server - 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()
diff -r 2f1060dc67fe -r 113d38a1e4e9 perdition-pam/receipt
--- a/perdition-pam/receipt	Sat Jun 01 16:02:43 2019 +0100
+++ b/perdition-pam/receipt	Sat Jun 01 16:43:31 2019 +0100
@@ -1,32 +1,42 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition-pam"
-VERSION="2.1"
+VERSION="2.2"
 CATEGORY="network"
-SHORT_DESC="IMAP/POP proxy."
+SHORT_DESC="Fully featured POP3 and IMAP4 proxy server."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.vergenet.net/linux/perdition"
+
 SOURCE="perdition"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.vergenet.net/linux/$SOURCE"
 WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL"
+
+PROVIDE="perdition:pam"
+DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap openssl cyrus-sasl \
+	pam glibc-base libkrb5 libcomerr3 gdbm"
+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"
 CONFIG_FILES="/etc/perdition"
-PROVIDE="perdition:pam"
-
-DEPENDS="vanessa_logger vanessa_adt vanessa_socket libldap openssl cyrus-sasl \
-pam glibc-base libkrb5 libcomerr3 gdbm"
-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()
 {
-	./configure --prefix=/usr --infodir=/usr/share/info \
-		--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 &&
+	./configure				\
+		--prefix=/usr			\
+		--infodir=/usr/share/info	\
+		--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
 }
@@ -34,16 +44,21 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/etc/openldap/schema
-	cp -a $install/etc $fs
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/etc/openldap/schema
+
+	cp -a $install/etc		$fs
 	rm -f $fs/etc/perdition/perdition.conf
-	cp -a ../$SOURCE/stuff/etc $fs
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+
+	cp -a ../$SOURCE/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
 		mkdir -p $fs/var/run/perdition.$i
 	done
-	cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema
+	cp $src/perdition/db/ldap/perdition.schema \
+		$fs/etc/openldap/schema
 }
 
 # Pre and post install commands for Tazpkg.
diff -r 2f1060dc67fe -r 113d38a1e4e9 perdition/receipt
--- a/perdition/receipt	Sat Jun 01 16:02:43 2019 +0100
+++ b/perdition/receipt	Sat Jun 01 16:43:31 2019 +0100
@@ -1,31 +1,42 @@
 # SliTaz package receipt.
 
 PACKAGE="perdition"
-VERSION="2.1"
+VERSION="2.2"
 CATEGORY="network"
-SHORT_DESC="IMAP/POP proxy."
+SHORT_DESC="Fully featured POP3 and IMAP4 proxy server."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.vergenet.net/linux/$PACKAGE"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.vergenet.net/linux/$PACKAGE"
 WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL"
+
+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"
 CONFIG_FILES="/etc/perdition"
 BUGS="Very slow: more than 10 seconds for login with squirrelmail, why ?"
 
-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()
 {
-	./configure --prefix=/usr --infodir=/usr/share/info \
-		--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 &&
+	./configure				\
+		--prefix=/usr			\
+		--infodir=/usr/share/info	\
+		--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
 }
@@ -33,16 +44,20 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib $fs/etc/openldap/schema
-	cp -a $install/etc $fs
+	mkdir -p $fs/usr/lib
+	mkdir -p $fs/etc/openldap/schema
+
+	cp -a $install/etc		$fs
 	rm -f $fs/etc/perdition/perdition.conf
-	cp -a $stuff/etc $fs
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+
+	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
 		mkdir -p $fs/var/run/perdition.$i
 	done
-	cp $src/perdition/db/ldap/perdition.schema $fs/etc/openldap/schema
+	cp $src/perdition/db/ldap/perdition.schema \
+		$fs/etc/openldap/schema
 }
 
 # Pre and post install commands for Tazpkg.