Added support for authentication using PostgreSQL.

diff --git a/net-mail/tpop3d/ChangeLog b/net-mail/tpop3d/ChangeLog
index fa8add1fe1df90bc07401ef508c63f7b84fce00c..b618a8c5301c71fe4d3c7588da07685834f5b4ed 100644 (file)
--- a/net-mail/tpop3d/ChangeLog
+++ b/net-mail/tpop3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/tpop3d
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.14 2004/08/26 13:50:28 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/ChangeLog,v 1.15 2004/10/21 18:51:22 griffon26 Exp $
+
+  21 Oct 2004; Maurice van der Pot <griffon26@gentoo.org>
+  +files/tpop3d-1.5.3-variable-name-clash.patch, tpop3d-1.5.3.ebuild:
+  Added support for authentication using a PostgreSQL database to
+  ebuild as suggested by Lionel Bouton <lionel-dev@bouton.name> in 
+  bug #68024.
 
   26 Aug 2004; Maurice van der Pot <griffon26@gentoo.org>
   +files/tpop3d-1.5.3-invalid-user-message.patch, tpop3d-1.5.3.ebuild:

diff --git a/net-mail/tpop3d/Manifest b/net-mail/tpop3d/Manifest
index 041c99e7536670a41dc753dd89b72b378905a556..35726d6a07717e2f6907a587527303333391b212 100644 (file)
--- a/net-mail/tpop3d/Manifest
+++ b/net-mail/tpop3d/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 MD5 fdee8ea25743becb983807795ea997d3 metadata.xml 222
 MD5 26f7920178cfc03fb9e25afb1aa7594e tpop3d-1.4.2.ebuild 2513
-MD5 0fcbf2308939e1913a743bdd7aebc534 tpop3d-1.5.3.ebuild 2535
-MD5 447975ac8153f78fa018837346a7c18c ChangeLog 2277
+MD5 4fc64b2126a69f448d76b2894909f3d3 tpop3d-1.5.3.ebuild 2696
+MD5 b5dedd34de31e20b232caf5241547f80 ChangeLog 2554
 MD5 70073dfbe2bd93a7922b97c4f4cd3af2 files/digest-tpop3d-1.4.2 145
 MD5 4a64dc0452c80fd14ebdfe21d889d235 files/digest-tpop3d-1.5.3 64
 MD5 723ad41d7f5485e972db927a7e43ee6c files/tpop3d-init 688
 MD5 b4b77ee1eecb8a83a5edeaea1be8fc89 files/tpop3d-1.5.3-invalid-user-message.patch 1098
+MD5 248f2db7e7a34de9f006bafae84c36de files/tpop3d-1.5.3-variable-name-clash.patch 2215
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBLequMGnpIbeahxwRAu4HAJ4uWG/Mf0YMZmjgfwuZ4s8jKRjDfwCgq0HV
-ZP7mFekKwpiIoGHiePIHFag=
-=oioS
+iD8DBQFBeAU1MGnpIbeahxwRAsEhAJ4iVKezaw20gl3ZrD1oF3qP2CQz4wCeLJWb
+Tt6I0xPRPeAV/s90mR91kPY=
+=45S6
 -----END PGP SIGNATURE-----

diff --git a/net-mail/tpop3d/files/tpop3d-1.5.3-variable-name-clash.patch b/net-mail/tpop3d/files/tpop3d-1.5.3-variable-name-clash.patch
new file mode 100644 (file)
index 0000000..90af058
--- /dev/null
+++ b/net-mail/tpop3d/files/tpop3d-1.5.3-variable-name-clash.patch
@@ -0,0 +1,62 @@
+diff -urN tpop3d-1.5.3.org/auth_mysql.c tpop3d-1.5.3/auth_mysql.c
+--- tpop3d-1.5.3.org/auth_mysql.c      2004-08-19 23:51:19.751469352 +0200
++++ tpop3d-1.5.3/auth_mysql.c  2004-08-19 23:54:16.564589672 +0200
+@@ -44,7 +44,7 @@
+  *  [2] unix user
+  *  [3] mailbox type
+  */
+-char *user_pass_query_template =
++static char *user_pass_query_template =
+     "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, "
+             "domain.unix_user, 'bsd' "
+       "FROM popbox, domain "
+@@ -52,7 +52,7 @@
+        "AND popbox.domain_name = '$(domain)' "
+        "AND popbox.domain_name = domain.domain_name";
+        
+-char *apop_query_template =
++static char *apop_query_template =
+     "SELECT concat(domain.path, '/', popbox.mbox_name), popbox.password_hash, "
+             "domain.unix_user, 'bsd' "
+       "FROM popbox, domain "
+@@ -60,7 +60,7 @@
+        "AND popbox.domain_name = '$(domain)' "
+        "AND popbox.domain_name = domain.domain_name";
+ 
+-char *onlogin_query_template = NULL;
++static char *onlogin_query_template = NULL;
+ 
+ /* GID used to access mail spool (if any). */
+ int use_gid;
+diff -urN tpop3d-1.5.3.org/auth_pgsql.c tpop3d-1.5.3/auth_pgsql.c
+--- tpop3d-1.5.3.org/auth_pgsql.c      2004-08-19 23:51:18.772618160 +0200
++++ tpop3d-1.5.3/auth_pgsql.c  2004-08-19 23:54:37.936340672 +0200
+@@ -105,7 +105,7 @@
+  *  [2] unix user
+  *  [3] mailbox type
+  */
+-char *user_pass_query_template =
++static char *user_pass_query_template =
+     "SELECT domain.path || '/'  || popbox.mbox_name, popbox.password_hash, "
+             "domain.unix_user, 'bsd' "
+       "FROM popbox, domain "
+@@ -113,7 +113,7 @@
+        "AND popbox.domain_name = '$(domain)' "
+        "AND popbox.domain_name = domain.domain_name";
+        
+-char *apop_query_template =
++static char *apop_query_template =
+     "SELECT domain.path || '/' || popbox.mbox_name, popbox.password_hash, "
+             "domain.unix_user, 'bsd' "
+       "FROM popbox, domain "
+@@ -121,7 +121,7 @@
+        "AND popbox.domain_name = '$(domain)' "
+        "AND popbox.domain_name = domain.domain_name";
+ 
+-char *onlogin_query_template = NULL;
++static char *onlogin_query_template = NULL;
+ 
+ /* GID used to access mail spool (if any). */
+ int use_gid;
+
+

diff --git a/net-mail/tpop3d/tpop3d-1.5.3.ebuild b/net-mail/tpop3d/tpop3d-1.5.3.ebuild
index 3f1e04b7f9b64d0e13a18142916054bf856c973d..4ec3b7da509316867f2ce5714f6b42c0c0086f1b 100644 (file)
--- a/net-mail/tpop3d/tpop3d-1.5.3.ebuild
+++ b/net-mail/tpop3d/tpop3d-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.5.3.ebuild,v 1.8 2004/08/26 13:50:28 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/tpop3d/tpop3d-1.5.3.ebuild,v 1.9 2004/10/21 18:51:22 griffon26 Exp $
 
 inherit eutils
 
@@ -11,25 +11,28 @@ SRC_URI="http://www.ex-parrot.com/~chris/tpop3d/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE="ssl ldap mysql perl pam tcpd maildir debug"
+IUSE="ssl ldap mysql perl pam tcpd maildir debug postgres"
 
 DEPEND="virtual/libc
-       ssl?    ( >=dev-libs/openssl-0.9.6 )
-       ldap?   ( >=net-nds/openldap-2.0.7 )
-       mysql?  ( >=dev-db/mysql-3.23.28 )
-       perl?   ( >=dev-lang/perl-5.6.1 )
-       pam?    ( >=sys-libs/pam-0.75 )
-       tcpd?   ( >=sys-apps/tcp-wrappers-7.6 )"
+       ssl?            ( >=dev-libs/openssl-0.9.6 )
+       ldap?           ( >=net-nds/openldap-2.0.7 )
+       mysql?          ( >=dev-db/mysql-3.23.28 )
+       postgres?       ( >=dev-db/postgresql-7.3 )
+       perl?           ( >=dev-lang/perl-5.6.1 )
+       pam?            ( >=sys-libs/pam-0.75 )
+       tcpd?           ( >=sys-apps/tcp-wrappers-7.6 )"
 
 src_unpack() {
        unpack ${P}.tar.gz
        cd ${S}
        epatch ${FILESDIR}/${P}-invalid-user-message.patch
+       epatch ${FILESDIR}/${P}-variable-name-clash.patch
 }
 
 src_compile() {
        local myconf
        use mysql               && myconf="--enable-auth-mysql"
+       use postgres    && myconf="${myconf} --enable-auth-pgsql"
        use ldap                && myconf="${myconf} --enable-auth-ldap"
        use perl                && myconf="${myconf} --enable-auth-perl"
        use tcpd                && myconf="${myconf} --enable-tcp-wrappers"