commit: 04b5ecd7498ff95f87c86fa978bb9a213ce272cc Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jan 26 17:16:46 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jan 26 22:36:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b5ecd7
net-nds/nsscache: remove unused file/patch Closes: https://github.com/gentoo/gentoo/pull/3666 net-nds/nsscache/files/nsscache-0.30-ldapssh.patch | 41 ------- net-nds/nsscache/files/nsscache.conf | 122 --------------------- 2 files changed, 163 deletions(-) diff --git a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch b/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch deleted file mode 100644 index 59adde1..00000000 --- a/net-nds/nsscache/files/nsscache-0.30-ldapssh.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cc0f2d7485205d6f9b8c434cb0da292e12448216 Mon Sep 17 00:00:00 2001 -From: Thomas Glanzmann <tho...@glanzmann.de> -Date: Wed, 2 Sep 2015 17:01:40 +0200 -Subject: [PATCH] Provider parameter when calling SshkeyUpdateGetter in order - to fix sshkey - -Without this change retrieving the map sshkey results in the following exception: - -(localhost) [~/work/nsscache] nsscache update -Traceback (most recent call last): - File "/usr/bin/nsscache", line 33, in <module> - return_value = nsscache_app.Run(sys.argv[1:], os.environ) - File "/usr/lib/python2.6/site-packages/nss_cache/app.py", line 240, in Run - retval = command_callable().Run(conf=conf, args=args) - File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 230, in Run - force_lock=options.force_lock) - File "/usr/lib/python2.6/site-packages/nss_cache/command.py", line 303, in UpdateMaps - force_write=force_write) - File "/usr/lib/python2.6/site-packages/nss_cache/update/updater.py", line 265, in UpdateFromSource - force_write, location=None) - File "/usr/lib/python2.6/site-packages/nss_cache/update/map_updater.py", line 75, in UpdateCacheFromSource - location=location) - File "/usr/lib/python2.6/site-packages/nss_cache/sources/source.py", line 65, in GetMap - return self.GetSshkeyMap(since) - File "/usr/lib/python2.6/site-packages/nss_cache/sources/ldapsource.py", line 274, in GetSshkeyMap - return SshkeyUpdateGetter().GetUpdates(source=self, -TypeError: __init__() takes exactly 2 arguments (1 given) - -diff --git a/nss_cache/sources/ldapsource.py b/nss_cache/sources/ldapsource.py -index 2af170e..5ffea81 100644 ---- a/nss_cache/sources/ldapsource.py -+++ b/nss_cache/sources/ldapsource.py -@@ -271,7 +271,7 @@ class LdapSource(source.Source): - Returns: - instance of maps.SshkeyMap - """ -- return SshkeyUpdateGetter().GetUpdates(source=self, -+ return SshkeyUpdateGetter(self.conf).GetUpdates(source=self, - search_base=self.conf['base'], - search_filter=self.conf['filter'], - search_scope=self.conf['scope'], diff --git a/net-nds/nsscache/files/nsscache.conf b/net-nds/nsscache/files/nsscache.conf deleted file mode 100644 index c17f4a2..00000000 --- a/net-nds/nsscache/files/nsscache.conf +++ /dev/null @@ -1,122 +0,0 @@ -# Example /etc/nsscache.conf - configuration for nsscache -# -# nsscache loads a config file from the environment variable NSSCACHE_CONFIG -# -# By default this is /etc/nsscache.conf -# -# Commented values are overrideable defaults, uncommented values -# require you to set them. - -[DEFAULT] - -# Default NSS data source module name -source = ldap - -# Default NSS data cache module name -cache = nssdb -#cache = files - -# NSS maps to be cached -maps = passwd, group, shadow, netgroup - -# Directory to store our update/modify timestamps -timestamp_dir = /var/lib/nsscache - -# Lockfile to use for update/repair operations -#lockfile = /var/run/nsscache - -# Defaults for specific modules; prefaced with "modulename_" - -## -# ldap module defaults. -# - -# LDAP URI to query for NSS data -ldap_uri = ldaps://ldap - -# Base for LDAP searches -ldap_base = ou=people,dc=example,dc=com - -# Default LDAP search filter for maps -ldap_filter = (objectclass=posixAccount) - -# Default LDAP search scope -#ldap_scope = one - -# Default LDAP BIND DN, empty string is an anonymous bind -#ldap_bind_dn = "" - -# Default LDAP password, empty DN and empty password is used for -# anonymous binds -#ldap_bind_password = "" - -# Default timelimit for LDAP queries, in seconds. -# The query will block for this number of seconds, or indefinitely if negative. -#ldap_timelimit = -1 - -# Default number of retry attempts -#ldap_retry_max = 3 - -# Default delay in between retry attempts -#ldap_retry_delay = 5 - -# Default setting for requiring tls certificates, one of: -# never, hard, demand, allow, try -#ldap_tls_require_cert = 'demand' - -# Default directoy for trusted CAs -#ldap_tls_cacertdir = '/usr/share/ssl' - -# Default filename for trusted CAs -#ldap_tls_cacertfile = '/usr/share/ssl/cert.pem' - -# Should we issue STARTTLS? -# ldap_tls_starttls = 1 - -## -# nssdb module defaults - -# Directory to store nssdb databases. Current libnss_db code requires -# the path below -#nssdb_dir = /var/lib/misc - -# Path to `makedb', supplied by the nss_db module -#nssdb_makedb = /usr/bin/makedb - -## -# files module defaults - -# Directory to store the plain text files -#files_dir = /etc - -# Suffix used on the files module database files -files_cache_filename_suffix = cache - -### -# Optional per-map sections, if present they will override the above -# defaults. The examples below show you some common values to override -# -# [passwd] -# -# ldap_base = ou=people,dc=example,dc=com - -[group] - -ldap_base = ou=group,dc=example,dc=com -ldap_filter = (objectclass=posixGroup) - -[shadow] - -ldap_filter = (objectclass=shadowAccount) - -[netgroup] - -ldap_base = ou=netgroup,dc=example,dc=com -ldap_filter = (objectclass=nisNetgroup) -files_cache_filename_suffix = - -[automount] - -ldap_base = ou=automounts,dc=example,dc=com -files_cache_filename_suffix = -cache = files
