Respin patch to apply better without the ../ and also make sure the state directory is created by default.

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

4 files changed, 32 insertions, 17 deletions

diff --git a/net-nds/nsscache/ChangeLog b/net-nds/nsscache/ChangeLog
index 59ecdfd65f2a..198e10c0fb26 100644
--- a/net-nds/nsscache/ChangeLog
+++ b/net-nds/nsscache/ChangeLog
@@ -1,6 +1,11 @@
 # 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.4 2009/05/24 21:00:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nsscache/ChangeLog,v 1.5 2009/05/24 23:53:36 robbat2 Exp $
+
+  24 May 2009; Robin H. Johnson <robbat2@gentoo.org>
+  nsscache-0.8.3-r1.ebuild, files/nsscache-0.8.3-starttls.patch:
+  Respin patch to apply better without the ../ and also make sure the state
+  directory is created by default.
 
 *nsscache-0.8.3-r1 (24 May 2009)
 
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest
index 2683f332b900..62c8d233ccaf 100644
--- a/net-nds/nsscache/Manifest
+++ b/net-nds/nsscache/Manifest
@@ -1,7 +1,7 @@
-AUX nsscache-0.8.3-starttls.patch 1733 RMD160 b5c5c9059faed4279b99c9cdcaeb73d27af1d8da SHA1 7dfc0577440760a61bd6b04b6ac1035a8dd5e176 SHA256 f330471a7f5d19fd0b33d86afba691aa1b52352b3fe9ca7c8b8efa40a7ecac4b
+AUX nsscache-0.8.3-starttls.patch 2074 RMD160 b43ff7d467d3d26356facea7bef62d67b3a4ab5e SHA1 1a3c000e7da60fd8bef938b26678ff7f16b1c1f7 SHA256 fbd19e9787e1344907609d9c6a025b3de0bb60772efa7c38160b961f23a6cab0
 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-r1.ebuild 902 RMD160 a1d0a28da8538ce7ad68134253af3e941d8fd8de SHA1 8a7fcc0286cd159d21dead76417fd54ced3e54f9 SHA256 c1678a7d3c88a726a002306d4bc9b8d2236f6f9f60b66c6dbc98511ef57275f2
 EBUILD nsscache-0.8.3.ebuild 783 RMD160 70a00b4773b1e70c463f827f2a633f0784c1da05 SHA1 444579aed70eab4367cc78ed8d457957a934e3fe SHA256 7fe401cadc2302317be22ad27fd309cfe1969cd797bd039a34118d2a2df55d1d
-MISC ChangeLog 878 RMD160 c6a507a23b4e45071980d798e242edc847aa101e SHA1 0adce654f4c836728f8e96c19765f86f888c9d9f SHA256 aa4648a8578465774a7ece6b3e14a9870cbed0b27cab78fe5ad3d8aeba61ce80
+MISC ChangeLog 1108 RMD160 23fbde0a7d6b47b62f3ed68c87e835a35e86edc8 SHA1 9ac340f3eafe0a09220e03d35a05decbb815b6a5 SHA256 316c000384f143e3baa85cd47b212d6ae4aecba85a79febc0d4375d94151481e
 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
index c345c958f137..2ca9c1feec9b 100644
--- a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
+++ b/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch
@@ -3,35 +3,44 @@ 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
+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 16:50:59.579112740 -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:
++      if conf['tls_starttls'] == 1:
 +          self.conn.start_tls_s()
      else:
        self.conn = conn
  
-@@ -120,6 +122,13 @@
+@@ -107,6 +109,8 @@
+       configuration['tls_cacertdir'] = self.TLS_CACERTDIR
+     if not 'tls_cacertfile' in configuration:
+       configuration['tls_cacertfile'] = self.TLS_CACERTFILE
++    if not 'tls_starttls' in configuration:
++      configuration['tls_starttls'] = 0
+ 
+     # Translate tls_require into appropriate constant, if necessary.
+     if configuration['tls_require_cert'] == 'never':
+@@ -120,6 +124,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']:
++    if configuration['tls_starttls'] in (1, '1', 'on', 'yes', 'true'):
++        configuration['tls_starttls'] = 1
++    #if not configuration['tls_starttls']:
 +    else:
-+      configuration['ldap_tls_starttls'] = 0
++      configuration['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
+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 16:51:25.468374563 -0700
 @@ -70,6 +70,9 @@
  # Default filename for trusted CAs
  #ldap_tls_cacertfile = '/usr/share/ssl/cert.pem'
diff --git a/net-nds/nsscache/nsscache-0.8.3-r1.ebuild b/net-nds/nsscache/nsscache-0.8.3-r1.ebuild
index c97e9bcb62f8..7d4d10349806 100644
--- a/net-nds/nsscache/nsscache-0.8.3-r1.ebuild
+++ b/net-nds/nsscache/nsscache-0.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/nsscache/nsscache-0.8.3-r1.ebuild,v 1.2 2009/05/24 23:53:36 robbat2 Exp $
 
 inherit distutils
 
@@ -29,4 +29,5 @@ src_install() {
 	doins "$FILESDIR/nsscache.conf" # overwrite default with working config.
 	doman *.[1-8]
 	dodoc THANKS nsscache.cron
+	keepdir /var/lib/nsscache
 }