| 1 |
commit: ac6d3e8d3fd25f13f7459c7d92344b09fa699004 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 6 00:00:44 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 00:00:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6d3e8d |
| 7 |
|
| 8 |
net-nds/nsscache: cleanup googlecode references. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
net-nds/nsscache/Manifest | 1 - |
| 13 |
.../nsscache/files/nsscache-0.8.3-starttls.patch | 53 ---------------------- |
| 14 |
net-nds/nsscache/metadata.xml | 1 - |
| 15 |
net-nds/nsscache/nsscache-0.23-r1.ebuild | 43 ------------------ |
| 16 |
net-nds/nsscache/nsscache-0.23-r2.ebuild | 43 ------------------ |
| 17 |
net-nds/nsscache/nsscache-0.23.ebuild | 42 ----------------- |
| 18 |
6 files changed, 183 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-nds/nsscache/Manifest b/net-nds/nsscache/Manifest |
| 21 |
index 702d918..867a64f 100644 |
| 22 |
--- a/net-nds/nsscache/Manifest |
| 23 |
+++ b/net-nds/nsscache/Manifest |
| 24 |
@@ -1,4 +1,3 @@ |
| 25 |
-DIST nsscache-0.23.tar.gz 92603 SHA256 b33ea574cd6e9c4f5ce57b8fae9dd64a710ec89d3f382c879f0af8c6215d0d9e SHA512 2bce655f6e8b64eb258779f80620d4514729d221ce9ed9ca7f675c22faeca400478827f27befa9cdac5e95f33934609d84d520af71f756721e22aa0c7cef82d6 WHIRLPOOL 78d6e8abdc4d66df667d2c9e3ab4c6e1c065a224283c94ab44bd51209db373d896b7221923d1948e7cdc36dcfc752d9f98162c3ece95955578b9b7c0c5b28dd8 |
| 26 |
DIST nsscache-0.30-gentoo-authorized-keys-command.py 8004 SHA256 956323bc311381da23c788e143706e732eef86ad37cf570209b28206ecea6a1f SHA512 58d3053aa140cbec214033ea3c524e7e7b670aa94a6ff306b9d816ffd4c23b8c781b1178ef7ce14009f8b45afaf05f75e9248e8c1eebef790b838baef5f50c26 WHIRLPOOL 5612cce26ab4172fcf019de702b5d26d830850cff3002dd23a2061b25ebb98d4c4a5436c17a6bcacc952ecdeb2027b677893552fce0520089a0d1f793cac7b75 |
| 27 |
DIST nsscache-0.30-r3-gentoo-authorized-keys-command.py 11974 SHA256 90069477763e1f81d5febe8d3d6d50c663da10cf8087512bb45c52bf0b109a05 SHA512 b660a6ae19e6e42efbb07d0a368704706b0a0bd1bf0b2c84855f0d1c00d4cda80872432f5a25384d0c27e99bf60072beb12975bcfa0201b52fa040d0e6bc2da2 WHIRLPOOL 91c94a867960ec0527af15be69107fb05d080f64e2a91bcbfa5f686cb98c34cb31551be47a76cc3616094bb5a36f31db07d3e6a5f5d14e85e2891781d3899d1c |
| 28 |
DIST nsscache-0.30.tar.gz 109615 SHA256 9cbae8768b6671ec7d8a94d76c62be69cd4c704ea792b50b6dbfa2786cfe19e4 SHA512 22c58904eadd2e69405c42263c1c85c7b612151466386870fbea7685ab32835250a84f1acd83fca6f3289582c74df5371cbfb4f354679a302f240fd0ff334712 WHIRLPOOL b9b9384f8c238a49f44ab9037d598f7a4795a52ae6e62de352127a7a53546bb84861b943282c58680fb2c088a5b9a1a4a0c3bb921eecec2e26a2f92b83137718 |
| 29 |
|
| 30 |
diff --git a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch b/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index 2ca9c1f..00000000 |
| 33 |
--- a/net-nds/nsscache/files/nsscache-0.8.3-starttls.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,53 +0,0 @@ |
| 36 |
-Some LDAP configurations require STARTTLS, like the Gentoo infrastructure one. |
| 37 |
-Add a new configuration file to do it. |
| 38 |
- |
| 39 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 40 |
- |
| 41 |
-diff -Nuar nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py nsscache-0.8.3/nss_cache/sources/ldapsource.py |
| 42 |
---- nsscache-0.8.3.orig/nss_cache/sources/ldapsource.py 2008-09-08 18:31:58.000000000 -0700 |
| 43 |
-+++ nsscache-0.8.3/nss_cache/sources/ldapsource.py 2009-05-24 16:50:59.579112740 -0700 |
| 44 |
-@@ -76,6 +76,8 @@ |
| 45 |
- self.conn = rlo(uri=conf['uri'], |
| 46 |
- retry_max=conf['retry_max'], |
| 47 |
- retry_delay=conf['retry_delay']) |
| 48 |
-+ if conf['tls_starttls'] == 1: |
| 49 |
-+ self.conn.start_tls_s() |
| 50 |
- else: |
| 51 |
- self.conn = conn |
| 52 |
- |
| 53 |
-@@ -107,6 +109,8 @@ |
| 54 |
- configuration['tls_cacertdir'] = self.TLS_CACERTDIR |
| 55 |
- if not 'tls_cacertfile' in configuration: |
| 56 |
- configuration['tls_cacertfile'] = self.TLS_CACERTFILE |
| 57 |
-+ if not 'tls_starttls' in configuration: |
| 58 |
-+ configuration['tls_starttls'] = 0 |
| 59 |
- |
| 60 |
- # Translate tls_require into appropriate constant, if necessary. |
| 61 |
- if configuration['tls_require_cert'] == 'never': |
| 62 |
-@@ -120,6 +124,13 @@ |
| 63 |
- elif configuration['tls_require_cert'] == 'try': |
| 64 |
- configuration['tls_require_cert'] = ldap.OPT_X_TLS_TRY |
| 65 |
- |
| 66 |
-+ # Should we issue STARTTLS? |
| 67 |
-+ if configuration['tls_starttls'] in (1, '1', 'on', 'yes', 'true'): |
| 68 |
-+ configuration['tls_starttls'] = 1 |
| 69 |
-+ #if not configuration['tls_starttls']: |
| 70 |
-+ else: |
| 71 |
-+ configuration['tls_starttls'] = 0 |
| 72 |
-+ |
| 73 |
- # Setting global ldap defaults. |
| 74 |
- ldap.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, |
| 75 |
- configuration['tls_require_cert']) |
| 76 |
-diff -Nuar nsscache-0.8.3.orig/nsscache.conf nsscache-0.8.3/nsscache.conf |
| 77 |
---- nsscache-0.8.3.orig/nsscache.conf 2008-09-08 18:31:58.000000000 -0700 |
| 78 |
-+++ nsscache-0.8.3/nsscache.conf 2009-05-24 16:51:25.468374563 -0700 |
| 79 |
-@@ -70,6 +70,9 @@ |
| 80 |
- # Default filename for trusted CAs |
| 81 |
- #ldap_tls_cacertfile = '/usr/share/ssl/cert.pem' |
| 82 |
- |
| 83 |
-+# Should we issue STARTTLS? |
| 84 |
-+# ldap_tls_starttls = 1 |
| 85 |
-+ |
| 86 |
- |
| 87 |
- ## |
| 88 |
- # nssdb module defaults |
| 89 |
|
| 90 |
diff --git a/net-nds/nsscache/metadata.xml b/net-nds/nsscache/metadata.xml |
| 91 |
index f5fa464..90ba820 100644 |
| 92 |
--- a/net-nds/nsscache/metadata.xml |
| 93 |
+++ b/net-nds/nsscache/metadata.xml |
| 94 |
@@ -9,7 +9,6 @@ |
| 95 |
<flag name="nsscache">Depend on sys-auth/libnss-cache to handle flat files</flag> |
| 96 |
</use> |
| 97 |
<upstream> |
| 98 |
- <remote-id type="google-code">nsscache</remote-id> |
| 99 |
<remote-id type="github">google/nsscache</remote-id> |
| 100 |
</upstream> |
| 101 |
</pkgmetadata> |
| 102 |
|
| 103 |
diff --git a/net-nds/nsscache/nsscache-0.23-r1.ebuild b/net-nds/nsscache/nsscache-0.23-r1.ebuild |
| 104 |
deleted file mode 100644 |
| 105 |
index aaa5aad..00000000 |
| 106 |
--- a/net-nds/nsscache/nsscache-0.23-r1.ebuild |
| 107 |
+++ /dev/null |
| 108 |
@@ -1,43 +0,0 @@ |
| 109 |
-# Copyright 1999-2015 Gentoo Foundation |
| 110 |
-# Distributed under the terms of the GNU General Public License v2 |
| 111 |
-# $Id$ |
| 112 |
- |
| 113 |
-EAPI=5 |
| 114 |
-PYTHON_COMPAT=( python2_7 ) |
| 115 |
- |
| 116 |
-inherit eutils distutils-r1 |
| 117 |
- |
| 118 |
-DESCRIPTION="commandline tool to sync directory services to local cache" |
| 119 |
-HOMEPAGE="https://github.com/google/nsscache" |
| 120 |
-SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz" |
| 121 |
- |
| 122 |
-LICENSE="GPL-2" |
| 123 |
-SLOT="0" |
| 124 |
-KEYWORDS="~amd64 ~x86" |
| 125 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 126 |
-IUSE="nssdb nsscache" |
| 127 |
- |
| 128 |
-DEPEND="${PYTHON_DEPS} |
| 129 |
- dev-python/python-ldap[${PYTHON_USEDEP}] |
| 130 |
- dev-python/pycurl[${PYTHON_USEDEP}] |
| 131 |
- nssdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )" |
| 132 |
-RDEPEND="${DEPEND} |
| 133 |
- nssdb? ( sys-libs/nss-db ) |
| 134 |
- nsscache? ( >=sys-auth/libnss-cache-0.10 )" |
| 135 |
-RESTRICT="test" |
| 136 |
- |
| 137 |
-src_prepare() { |
| 138 |
- find "${S}" -name '*.py' -exec \ |
| 139 |
- sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \ |
| 140 |
- {} \+ |
| 141 |
- distutils-r1_src_prepare |
| 142 |
-} |
| 143 |
- |
| 144 |
-src_install() { |
| 145 |
- distutils-r1_src_install |
| 146 |
- |
| 147 |
- doman nsscache.1 nsscache.conf.5 |
| 148 |
- dodoc THANKS nsscache.cron |
| 149 |
- |
| 150 |
- keepdir /var/lib/nsscache |
| 151 |
-} |
| 152 |
|
| 153 |
diff --git a/net-nds/nsscache/nsscache-0.23-r2.ebuild b/net-nds/nsscache/nsscache-0.23-r2.ebuild |
| 154 |
deleted file mode 100644 |
| 155 |
index 77d5e07..00000000 |
| 156 |
--- a/net-nds/nsscache/nsscache-0.23-r2.ebuild |
| 157 |
+++ /dev/null |
| 158 |
@@ -1,43 +0,0 @@ |
| 159 |
-# Copyright 1999-2015 Gentoo Foundation |
| 160 |
-# Distributed under the terms of the GNU General Public License v2 |
| 161 |
-# $Id$ |
| 162 |
- |
| 163 |
-EAPI=5 |
| 164 |
-PYTHON_COMPAT=( python2_7 ) |
| 165 |
- |
| 166 |
-inherit eutils distutils-r1 |
| 167 |
- |
| 168 |
-DESCRIPTION="commandline tool to sync directory services to local cache" |
| 169 |
-HOMEPAGE="https://github.com/google/nsscache" |
| 170 |
-SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz" |
| 171 |
- |
| 172 |
-LICENSE="GPL-2" |
| 173 |
-SLOT="0" |
| 174 |
-KEYWORDS="~amd64 ~x86" |
| 175 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 176 |
-IUSE="nssdb nsscache" |
| 177 |
- |
| 178 |
-DEPEND="${PYTHON_DEPS} |
| 179 |
- dev-python/python-ldap[${PYTHON_USEDEP}] |
| 180 |
- dev-python/pycurl[${PYTHON_USEDEP}] |
| 181 |
- dev-python/bsddb3[${PYTHON_USEDEP}]" |
| 182 |
-RDEPEND="${DEPEND} |
| 183 |
- nssdb? ( sys-libs/nss-db ) |
| 184 |
- nsscache? ( >=sys-auth/libnss-cache-0.10 )" |
| 185 |
-RESTRICT="test" |
| 186 |
- |
| 187 |
-src_prepare() { |
| 188 |
- find "${S}" -name '*.py' -exec \ |
| 189 |
- sed -i '/^import bsddb$/s,bsddb,bsddb3 as bsddb,g' \ |
| 190 |
- {} \+ |
| 191 |
- distutils-r1_src_prepare |
| 192 |
-} |
| 193 |
- |
| 194 |
-src_install() { |
| 195 |
- distutils-r1_src_install |
| 196 |
- |
| 197 |
- doman nsscache.1 nsscache.conf.5 |
| 198 |
- dodoc THANKS nsscache.cron |
| 199 |
- |
| 200 |
- keepdir /var/lib/nsscache |
| 201 |
-} |
| 202 |
|
| 203 |
diff --git a/net-nds/nsscache/nsscache-0.23.ebuild b/net-nds/nsscache/nsscache-0.23.ebuild |
| 204 |
deleted file mode 100644 |
| 205 |
index 5e93369..00000000 |
| 206 |
--- a/net-nds/nsscache/nsscache-0.23.ebuild |
| 207 |
+++ /dev/null |
| 208 |
@@ -1,42 +0,0 @@ |
| 209 |
-# Copyright 1999-2015 Gentoo Foundation |
| 210 |
-# Distributed under the terms of the GNU General Public License v2 |
| 211 |
-# $Id$ |
| 212 |
- |
| 213 |
-EAPI=5 |
| 214 |
- |
| 215 |
-PYTHON_DEPEND="2" |
| 216 |
-SUPPORT_PYTHON_ABIS="1" |
| 217 |
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" |
| 218 |
-PYTHON_USE_WITH="berkdb" |
| 219 |
-PYTHON_USE_WITH_OPT="nssdb" |
| 220 |
- |
| 221 |
-inherit eutils python distutils |
| 222 |
- |
| 223 |
-DESCRIPTION="commandline tool to sync directory services to local cache" |
| 224 |
-HOMEPAGE="https://github.com/google/nsscache" |
| 225 |
-SRC_URI="https://nsscache.googlecode.com/files/${P}.tar.gz" |
| 226 |
- |
| 227 |
-LICENSE="GPL-2" |
| 228 |
-SLOT="0" |
| 229 |
-KEYWORDS="~amd64 ~x86" |
| 230 |
-IUSE="nssdb nsscache" |
| 231 |
- |
| 232 |
-DEPEND="dev-python/python-ldap |
| 233 |
- dev-python/pycurl" |
| 234 |
-RDEPEND="${DEPEND} |
| 235 |
- nssdb? ( sys-libs/nss-db ) |
| 236 |
- nsscache? ( >=sys-auth/libnss-cache-0.10 )" |
| 237 |
-RESTRICT="test" |
| 238 |
- |
| 239 |
-src_prepare() { |
| 240 |
- distutils_src_prepare |
| 241 |
-} |
| 242 |
- |
| 243 |
-src_install() { |
| 244 |
- distutils_src_install |
| 245 |
- |
| 246 |
- doman nsscache.1 nsscache.conf.5 |
| 247 |
- dodoc THANKS nsscache.cron |
| 248 |
- |
| 249 |
- keepdir /var/lib/nsscache |
| 250 |
-} |
Archives