Date: Wed, 23 Dec 2009 22:06:45 GMT From: Michael Graziano <mikeg@bsd-box.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/141931: Update net/nss_ldap to latest version (& adopt) Message-ID: <200912232206.nBNM6jTh097338@www.freebsd.org> Resent-Message-ID: <200912232210.nBNMA1Wt025186@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141931 >Category: ports >Synopsis: Update net/nss_ldap to latest version (& adopt) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 23 22:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Michael Graziano >Release: RELENG_7_2 / RELENG_8_0 >Organization: >Environment: FreeBSD flexo.bsd-box.net 7.2-RELEASE-p5 FreeBSD 7.2-RELEASE-p5 #5: Thu Dec 3 12:16:47 EST 2009 root@flexo.bsd-box.net:/usr/obj/usr/src/sys/flexo i386 FreeBSD 8.0-RELEASE-p1 FreeBSD 8.0-RELEASE-p1 #0: Mon Dec 21 23:23:53 UTC 2009 root@:/usr/obj/usr/src/sys/ph-amd64 amd64 >Description: Attached patch to update the nss_ldap port (1.264 -> 1.265) & adopt maintainership. Major upgrade-related fixes (from upstream): - Version info now in binary - Fix broken ethers LDAP query - FD leak cleanup Fixes in port: - Re-enable many nss classes that were disabled (ethers, netgroups) - Fix compile-time breakage in ldap-ethers code (Better fix going upstream when I have time) *** Note: Ethers and Netgroup support aren't thoroughly tested as I don't use these in my environment. Re-enabling them doesn't seem to cause any problems, so they're back on in accordance with POLA. PRs/test cases for these are welcome if anyone finds breakage. >How-To-Repeat: - >Fix: Patch attached Patch attached with submission follows: diff -ruN nss_ldap/Makefile nss_ldap/Makefile --- nss_ldap/Makefile 2009-12-23 17:44:23.000000000 +0000 +++ nss_ldap/Makefile 2009-12-23 17:44:53.000000000 +0000 @@ -12,10 +12,10 @@ MASTER_SITES= http://www.padl.com/download/ DISTNAME= ${PORTNAME}-${NSS_LDAP_VERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mikeg@bsd-box.net COMMENT= RFC 2307 NSS module -NSS_LDAP_VERSION=264 +NSS_LDAP_VERSION=265 GNU_CONFIGURE= yes USE_GMAKE= yes diff -ruN nss_ldap/distinfo nss_ldap/distinfo --- nss_ldap/distinfo 2009-12-23 17:44:23.000000000 +0000 +++ nss_ldap/distinfo 2009-12-23 16:29:05.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (nss_ldap-264.tar.gz) = eebab40c6ce2f54e5c377b4895c0c93a -SHA256 (nss_ldap-264.tar.gz) = 556198f2774bdb61a597da3fa8a5ecc80a3271ed9ab177760df7c4f22d6b1d25 -SIZE (nss_ldap-264.tar.gz) = 278134 +MD5 (nss_ldap-265.tar.gz) = c1cb02d1a85538cf16bca6f6a562abe4 +SHA256 (nss_ldap-265.tar.gz) = 77b54d905f50d774f28d5559d49126f1bc76720f741b0864a64bb4936ec226a8 +SIZE (nss_ldap-265.tar.gz) = 280976 diff -ruN nss_ldap/files/patch-Makefile.am nss_ldap/files/patch-Makefile.am --- nss_ldap/files/patch-Makefile.am 2009-12-23 17:44:23.000000000 +0000 +++ nss_ldap/files/patch-Makefile.am 2009-12-23 17:28:22.000000000 +0000 @@ -1,5 +1,5 @@ ---- Makefile.am.orig 2007-10-29 06:30:12.000000000 -0700 -+++ Makefile.am 2008-09-26 20:44:49.000000000 -0700 +--- Makefile.am.orig 2009-11-06 10:28:08.000000000 +0000 ++++ Makefile.am 2009-12-23 17:28:09.000000000 +0000 @@ -9,8 +9,12 @@ if AIX INST_GID=system @@ -13,23 +13,16 @@ EXTRA_DIST = CVSVersionInfo.txt ChangeLog \ AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\ -@@ -18,11 +22,10 @@ - - man_MANS = nss_ldap.5 - --nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \ -- ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \ -- ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ -- ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \ -- dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c -+nss_ldap_so_SOURCES = \ -+ ldap-nss.c ldap-pwd.c ldap-grp.c ldap-hosts.c ldap-schema.c \ -+ util.c ltf.c snprintf.c resolve.c dnsconfig.c irs-nss.c pagectrl.c \ -+ ldap-init-krb5-cache.c bsdnss.c +@@ -23,7 +27,7 @@ + ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ + ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \ + dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c \ +- vers.c ++ vers.c bsdnss.c nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@ -@@ -102,7 +105,6 @@ +@@ -103,11 +107,10 @@ $(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \ $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ fi @@ -37,42 +30,8 @@ uninstall-local: @$(NORMAL_UNINSTALL) ---- Makefile.am.orig 2008-10-30 20:50:15.000000000 +0000 -+++ Makefile.am 2009-12-23 16:50:53.000000000 +0000 -@@ -9,8 +9,12 @@ - if AIX - INST_GID=system - else -+if FreeBSD -+INST_GID=wheel -+else - INST_GID=root - endif -+endif - EXTRA_DIST = CVSVersionInfo.txt ChangeLog \ - AUTHORS ANNOUNCE NEWS INSTALL README LICENSE.OpenLDAP COPYING\ -@@ -18,11 +22,10 @@ - - man_MANS = nss_ldap.5 - --nss_ldap_so_SOURCES = ldap-nss.c ldap-pwd.c ldap-grp.c ldap-netgrp.c ldap-rpc.c \ -- ldap-hosts.c ldap-network.c ldap-proto.c ldap-spwd.c \ -- ldap-alias.c ldap-service.c ldap-schema.c ldap-ethers.c \ -- ldap-bp.c ldap-automount.c util.c ltf.c snprintf.c resolve.c \ -- dnsconfig.c irs-nss.c pagectrl.c ldap-sldap.c ldap-init-krb5-cache.c -+nss_ldap_so_SOURCES = \ -+ ldap-nss.c ldap-pwd.c ldap-grp.c ldap-hosts.c ldap-schema.c \ -+ util.c ltf.c snprintf.c resolve.c dnsconfig.c irs-nss.c pagectrl.c \ -+ ldap-init-krb5-cache.c bsdnss.c - - nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@ - -@@ -102,7 +105,6 @@ - $(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \ - $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ - fi -- $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; + vers.c: $(top_srcdir)/CVSVersionInfo.txt +- CVSVERSIONDIR=$(top_srcdir) vers_string -v ++ $(top_srcdir)/vers_string -v - uninstall-local: - @$(NORMAL_UNINSTALL) diff -ruN nss_ldap/files/patch-ldap-ethers.c nss_ldap/files/patch-ldap-ethers.c --- nss_ldap/files/patch-ldap-ethers.c 1970-01-01 00:00:00.000000000 +0000 +++ nss_ldap/files/patch-ldap-ethers.c 2009-12-23 17:06:29.000000000 +0000 @@ -0,0 +1,32 @@ +--- ldap-ethers.c.orig 2009-11-06 10:28:08.000000000 +0000 ++++ ldap-ethers.c 2009-12-23 17:01:14.000000000 +0000 +@@ -217,9 +217,9 @@ + } + + snprintf(fullmac, sizeof(fullmac), "%02x:%02x:%02x:%02x:%02x:%02x", +- addr->ether_addr_octet[0], addr->ether_addr_octet[1], +- addr->ether_addr_octet[2], addr->ether_addr_octet[3], +- addr->ether_addr_octet[4], addr->ether_addr_octet[5]); ++ addr->octet[0], addr->octet[1], ++ addr->octet[2], addr->octet[3], ++ addr->octet[4], addr->octet[5]); + + LA_INIT(a); + LA_STRING(a) = ether_ntoa(addr); +@@ -343,14 +343,14 @@ + if (i != 6) + return NULL; + for (i = 0; i < 6; i++) +- ep.ether_addr_octet[i] = t[i]; ++ ep.octet[i] = t[i]; + + return &ep; + } + #endif /* !HAVE_ETHER_ATON */ + + #ifndef HAVE_ETHER_NTOA +-#define EI(i) (unsigned int)(e->ether_addr_octet[(i)]) ++#define EI(i) (unsigned int)(e->octet[(i)]) + static char *ether_ntoa (const struct ether_addr *e) + { + static char s[18]; diff -ruN nss_ldap/files/patch-ldap-ethers.h nss_ldap/files/patch-ldap-ethers.h --- nss_ldap/files/patch-ldap-ethers.h 1970-01-01 00:00:00.000000000 +0000 +++ nss_ldap/files/patch-ldap-ethers.h 2009-12-23 17:06:42.000000000 +0000 @@ -0,0 +1,11 @@ +--- ldap-ethers.h.orig 2009-11-06 10:28:08.000000000 +0000 ++++ ldap-ethers.h 2009-12-23 17:02:06.000000000 +0000 +@@ -32,7 +32,7 @@ + + #ifndef HAVE_STRUCT_ETHER_ADDR + struct ether_addr { +- u_char ether_addr_octet[6]; ++ u_char octet[6]; + }; + #endif + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912232206.nBNM6jTh097338>