Fix to offer new option for STARTTLS if required, as needed by Gentoo infrastructure.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 91 insertions, 3 deletions

diff --git a/net-nds/nsscache/ChangeLog b/net-nds/nsscache/ChangeLog
index aa3a5436d45b..59ecdfd65f2a 100644
--- a/net-nds/nsscache/ChangeLog
+++ b/net-nds/nsscache/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/nsscache
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/nsscache/ChangeLog,v 1.3 2009/05/22 04:23:17 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nsscache/ChangeLog,v 1.4 2009/05/24 21:00:10 robbat2 Exp $
+
+*nsscache-0.8.3-r1 (24 May 2009)
+
+  24 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +nsscache-0.8.3-r1.ebuild, +files/nsscache-0.8.3-starttls.patch,
+  files/nsscache.conf:
+  Fix to offer new option for STARTTLS if required, as needed by Gentoo
+  infrastructure.
 
   22 May 2009; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   Taking over maintenance of this as we use it heavily in infra.
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index f8f7c6c37e26..2683f332b900 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,5 +1,7 @@
-AUX nsscache.conf 2695 RMD160 77e2ed85ec57b7314eb890e0fb42a86de5ebcfe6 SHA1 05c2bd63f4877443647248b8616d3f16f9667ea3 SHA256 86babb59fde997095625e9594668c0d52f7d779b2aae964f2ec1d10b71a84772
+AUX nsscache-0.8.3-starttls.patch 1733 RMD160 b5c5c9059faed4279b99c9cdcaeb73d27af1d8da SHA1 7dfc0577440760a61bd6b04b6ac1035a8dd5e176 SHA256 f330471a7f5d19fd0b33d86afba691aa1b52352b3fe9ca7c8b8efa40a7ecac4b
+AUX nsscache.conf 2747 RMD160 97d74f5083750fc9b644ca872a1023723c177d60 SHA1 634fa867fdda188ec466f09af9cf6c73553e5d4d SHA256 1063d7d385c0f09e97f6d619c8e5307966a2b6ce94823ce7d81a09fb0eaf6d50
 DIST nsscache-0.8.3.tar.gz 72612 RMD160 27c3a74488ebef68d9591efb9bd6789a2ab72b26 SHA1 23057a22407a7d6bee9a9ac2ac4c38ee8b295af9 SHA256 452037c5859aad13f3bfc123db1f9d02211ebbcb9b1073a73a2e1f783c5c2c2a
+EBUILD nsscache-0.8.3-r1.ebuild 875 RMD160 3b7f8d87c39cb4e3ef53dc640b7115fe09ac6c94 SHA1 d6265f0c359671669aadbd658928fe3d5faff6bf SHA256 dd99d8c9099051197dec7d0fb0ddb4d7384ed2c517616ee32230105e0faef17e
 EBUILD nsscache-0.8.3.ebuild 783 RMD160 70a00b4773b1e70c463f827f2a633f0784c1da05 SHA1 444579aed70eab4367cc78ed8d457957a934e3fe SHA256 7fe401cadc2302317be22ad27fd309cfe1969cd797bd039a34118d2a2df55d1d
-MISC ChangeLog 610 RMD160 02c724e96085af8cfe6ac7dcba6063235bf3c3da SHA1 93f7ab09c1813f7f7655ed593898fea4b47a722c SHA256 5c4a56464bc0d7a8a09065af65a00db206f12651c09d2cd721cf2fc24b45a77e
+MISC ChangeLog 878 RMD160 c6a507a23b4e45071980d798e242edc847aa101e SHA1 0adce654f4c836728f8e96c19765f86f888c9d9f SHA256 aa4648a8578465774a7ece6b3e14a9870cbed0b27cab78fe5ad3d8aeba61ce80
 MISC metadata.xml 403 RMD160 d9fd93f79826495f7c41ff10c04638eb02f70975 SHA1 f957d7361bb6562c38a269ac137e0ed130f2811a SHA256 b88c7b2df5a1f8c4ca0448a8d9102f56319361624c9351e5b9f5a875023dff4f
diff --git a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch b/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
new file mode 100644
index 000000000000..c345c958f137
--- /dev/null
+++ b/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
@@ -0,0 +1,44 @@
+Some LDAP configurations require STARTTLS, like the Gentoo infrastructure one.
+Add a new configuration file to do it.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar ../nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py ../nsscache-0.8.3/nss_cache/sources/ldapsource.py
+--- ../nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py	2008-09-08 18:31:58.000000000 -0700
++++ ../nsscache-0.8.3/nss_cache/sources/ldapsource.py	2009-05-24 13:56:14.009240803 -0700
+@@ -76,6 +76,8 @@
+       self.conn = rlo(uri=conf['uri'],
+                       retry_max=conf['retry_max'],
+                       retry_delay=conf['retry_delay'])
++      if configuration['ldap_tls_starttls'] == 1:
++          self.conn.start_tls_s()
+     else:
+       self.conn = conn
+ 
+@@ -120,6 +122,13 @@
+     elif configuration['tls_require_cert'] == 'try':
+       configuration['tls_require_cert'] = ldap.OPT_X_TLS_TRY
+ 
++    # Should we issue STARTTLS?
++    if configuration['ldap_tls_starttls'] in (1, '1', 'on', 'yes', 'true'):
++        configuration['ldap_tls_starttls'] = 1
++    #if not configuration['ldap_tls_starttls']:
++    else:
++      configuration['ldap_tls_starttls'] = 0
++
+     # Setting global ldap defaults.
+     ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT,
+                     configuration['tls_require_cert'])
+diff -Nuar ../nsscache-0.8.3.orig/nsscache.conf ../nsscache-0.8.3/nsscache.conf
+--- ../nsscache-0.8.3.orig/nsscache.conf	2008-09-08 18:31:58.000000000 -0700
++++ ../nsscache-0.8.3/nsscache.conf	2009-05-24 13:56:18.182858446 -0700
+@@ -70,6 +70,9 @@
+ # Default filename for trusted CAs
+ #ldap_tls_cacertfile = '/usr/share/ssl/cert.pem'
+ 
++# Should we issue STARTTLS?
++# ldap_tls_starttls = 1
++
+ 
+ ##
+ # nssdb module defaults
diff --git a/net-nds/nsscache/files/nsscache.conf b/net-nds/nsscache/files/nsscache.conf
index 5f54fe8353d1..c17f4a2df9c8 100644
--- a/net-nds/nsscache/files/nsscache.conf
+++ b/net-nds/nsscache/files/nsscache.conf
@@ -70,6 +70,8 @@ ldap_filter = (objectclass=posixAccount)
 # Default filename for trusted CAs
 #ldap_tls_cacertfile = '/usr/share/ssl/cert.pem'
 
+# Should we issue STARTTLS?
+# ldap_tls_starttls = 1
 
 ##
 # nssdb module defaults
diff --git a/net-nds/nsscache/nsscache-0.8.3-r1.ebuild b/net-nds/nsscache/nsscache-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..c97e9bcb62f8
--- /dev/null
+++ b/net-nds/nsscache/nsscache-0.8.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nsscache/nsscache-0.8.3-r1.ebuild,v 1.1 2009/05/24 21:00:10 robbat2 Exp $
+
+inherit distutils
+
+DESCRIPTION="commandline tool to sync directory services to local cache."
+HOMEPAGE="http://code.google.com/p/nsscache/"
+SRC_URI="http://nsscache.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nssdb nsscache"
+
+RDEPEND="dev-python/python-ldap
+		nssdb? ( sys-libs/nss-db )
+		nsscache? ( sys-auth/libnss-cache )"
+DEPEND="$RDEPEND"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${PN}-0.8.3-starttls.patch
+}
+
+src_install() {
+	distutils_src_install
+	insinto /etc
+	doins "$FILESDIR/nsscache.conf" # overwrite default with working config.
+	doman *.[1-8]
+	dodoc THANKS nsscache.cron
+}