| 1 |
robbat2 10/02/19 19:24:15 |
| 2 |
|
| 3 |
Added: nss_ldap-254-soname.patch |
| 4 |
nss_ldap-265-reconnect-timeouts.patch |
| 5 |
Log: |
| 6 |
Bug #161195, add an SONAME: Added to 264-r1 as stable candidate. Bug #302914: Version bump to 265. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-auth/nss_ldap/files/nss_ldap-254-soname.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-254-soname.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-254-soname.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nss_ldap-254-soname.patch |
| 16 |
=================================================================== |
| 17 |
Set the soname which glibc expects us to have. |
| 18 |
--- nss_ldap-254/configure.in 2007-02-26 16:40:53.000000000 -0500 |
| 19 |
+++ nss_ldap-254/configure.in 2007-02-26 16:40:47.000000000 -0500 |
| 20 |
@@ -92,7 +92,7 @@ |
| 21 |
nss_ldap_so_LDFLAGS="-b -dynamic -G `cat exports.hpux`" |
| 22 |
CPPFLAGS="$CPPFLAGS -I. -DHPUX" |
| 23 |
TARGET_OS=HPUX ;; |
| 24 |
-linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;; |
| 25 |
+linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux -Wl,-soname=libnss_ldap.so.2" ;; |
| 26 |
*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;; |
| 27 |
esac |
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-auth/nss_ldap/files/nss_ldap-265-reconnect-timeouts.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: nss_ldap-265-reconnect-timeouts.patch |
| 38 |
=================================================================== |
| 39 |
diff -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap.conf nss_ldap-265/ldap.conf |
| 40 |
--- nss_ldap-265.orig/ldap.conf 2009-11-06 10:28:08.000000000 +0000 |
| 41 |
+++ nss_ldap-265/ldap.conf 2010-02-19 18:36:58.272236290 +0000 |
| 42 |
@@ -279,7 +279,8 @@ |
| 43 |
# OpenLDAP SSL mechanism |
| 44 |
# start_tls mechanism uses the normal LDAP port, LDAPS typically 636 |
| 45 |
#ssl start_tls |
| 46 |
-#ssl on |
| 47 |
+###ssl on |
| 48 |
+# Gentoo note: Don't use 'ssl on' in 249/250. They are broken in some cases! Use start_tls instead. |
| 49 |
|
| 50 |
# OpenLDAP SSL options |
| 51 |
# Require and verify server certificate (yes/no) |
| 52 |
@@ -311,3 +312,27 @@ |
| 53 |
# Override the default Kerberos ticket cache location. |
| 54 |
#krb5_ccname FILE:/etc/.ldapcache |
| 55 |
|
| 56 |
+# Timeout behavior |
| 57 |
+# Upstream nss_ldap hard-codes these values: |
| 58 |
+#nss_reconnect_tries 5 # number of times to double the sleep time |
| 59 |
+#nss_reconnect_sleeptime 4 # initial sleep value |
| 60 |
+#nss_reconnect_maxsleeptime 64 # max sleep value to cap at |
| 61 |
+#nss_reconnect_maxconntries 2 # how many tries before sleeping |
| 62 |
+# This leads to a delay of 124 seconds (4+8+16+32+64=124) per lookup if the |
| 63 |
+# server is not available. |
| 64 |
+ |
| 65 |
+# For Gentoo's distribution of nss_ldap, as of 250-r1, we use these values |
| 66 |
+# (The hardwired constants in the code are changed to them as well): |
| 67 |
+nss_reconnect_tries 4 # number of times to double the sleep time |
| 68 |
+nss_reconnect_sleeptime 1 # initial sleep value |
| 69 |
+nss_reconnect_maxsleeptime 16 # max sleep value to cap at |
| 70 |
+nss_reconnect_maxconntries 2 # how many tries before sleeping |
| 71 |
+# This leads to a delay of 15 seconds (1+2+4+8=15) |
| 72 |
+ |
| 73 |
+# If you are impatient, and know your LDAP server is reliable, fast or local, |
| 74 |
+# you may wish to use these values instead: |
| 75 |
+#nss_reconnect_tries 1 # number of times to double the sleep time |
| 76 |
+#nss_reconnect_sleeptime 1 # initial sleep value |
| 77 |
+#nss_reconnect_maxsleeptime 1 # max sleep value to cap at |
| 78 |
+#nss_reconnect_maxconntries 3 # how many tries before sleeping |
| 79 |
+# This leads to a delay of 1 second. |
| 80 |
diff -Nuar --exclude '*.orig' nss_ldap-265.orig/ldap-nss.h nss_ldap-265/ldap-nss.h |
| 81 |
--- nss_ldap-265.orig/ldap-nss.h 2009-11-06 10:28:08.000000000 +0000 |
| 82 |
+++ nss_ldap-265/ldap-nss.h 2010-02-19 18:37:49.278474888 +0000 |
| 83 |
@@ -96,9 +96,9 @@ |
| 84 |
* unacceptable, in which case you may wish to adjust |
| 85 |
* the constants below. |
| 86 |
*/ |
| 87 |
-#define LDAP_NSS_TRIES 5 /* number of sleeping reconnect attempts */ |
| 88 |
-#define LDAP_NSS_SLEEPTIME 4 /* seconds to sleep; doubled until max */ |
| 89 |
-#define LDAP_NSS_MAXSLEEPTIME 64 /* maximum seconds to sleep */ |
| 90 |
+#define LDAP_NSS_TRIES 4 /* number of sleeping reconnect attempts */ |
| 91 |
+#define LDAP_NSS_SLEEPTIME 1 /* seconds to sleep; doubled until max */ |
| 92 |
+#define LDAP_NSS_MAXSLEEPTIME 16 /* maximum seconds to sleep */ |
| 93 |
#define LDAP_NSS_MAXCONNTRIES 2 /* reconnect attempts before sleeping */ |
| 94 |
|
| 95 |
#if defined(HAVE_NSSWITCH_H) || defined(HAVE_IRS_H) |
Archives