Attachment 91919 Details for Bug 129445 – file.diff

[patch] file.diff

file.diff (text/plain), 12.32 KB, created by Martin Matuska on 2008-12-06 00:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2008-12-06 00:20:01 UTC

Size: 12.32 KB

patch

obsolete

>Index: ports/net/nss_ldap/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/nss_ldap/Makefile,v
>retrieving revision 1.25
>diff -u -r1.25 Makefile
>--- ports/net/nss_ldap/Makefile	16 Dec 2007 23:18:29 -0000	1.25
>+++ ports/net/nss_ldap/Makefile	6 Dec 2008 00:11:26 -0000
>@@ -14,14 +14,17 @@
> MAINTAINER=	kazakov@gmail.com
> COMMENT=	RFC 2307 NSS module
> 
>-NSS_LDAP_VERSION=257
>+NSS_LDAP_VERSION=264
> 
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
>+USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:262 autoheader:262
> USE_LDCONFIG=	yes
> USE_OPENLDAP=	yes
> 
>-PLIST_FILES=	etc/nss_ldap.conf.sample lib/nss_ldap.so.1
>+
>+PLIST_FILES=	etc/nss_ldap.conf.sample \
>+		lib/nss_ldap.so.1
> 
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib"
>@@ -29,7 +32,6 @@
> CONFIGURE_ARGS=	--with-ldap-conf-file=${PREFIX}/etc/nss_ldap.conf \
> 		--with-ldap-secret-file=${PREFIX}/etc/nss_ldap.secret \
> 		--enable-rfc2307bis \
>-		--enable-schema-mapping \
> 		--enable-paged-results \
> 		--enable-configurable-krb5-ccname-env
> 
>Index: ports/net/nss_ldap/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/net/nss_ldap/distinfo,v
>retrieving revision 1.14
>diff -u -r1.14 distinfo
>--- ports/net/nss_ldap/distinfo	16 Dec 2007 23:18:29 -0000	1.14
>+++ ports/net/nss_ldap/distinfo	6 Dec 2008 00:11:26 -0000
>@@ -1,3 +1,3 @@
>-MD5 (nss_ldap-257.tar.gz) = 8b9c3d91c67ba05d4135f042dd9a35f2
>-SHA256 (nss_ldap-257.tar.gz) = 506a89bf9d8fac4182e52cb1a7e9dc5310be865f7c2430b2602d4080c9140dae
>-SIZE (nss_ldap-257.tar.gz) = 229299
>+MD5 (nss_ldap-264.tar.gz) = eebab40c6ce2f54e5c377b4895c0c93a
>+SHA256 (nss_ldap-264.tar.gz) = 556198f2774bdb61a597da3fa8a5ecc80a3271ed9ab177760df7c4f22d6b1d25
>+SIZE (nss_ldap-264.tar.gz) = 278134
>Index: ports/net/nss_ldap/files/patch-Makefile.am
>===================================================================
>RCS file: ports/net/nss_ldap/files/patch-Makefile.am
>diff -N ports/net/nss_ldap/files/patch-Makefile.am
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ports/net/nss_ldap/files/patch-Makefile.am	6 Dec 2008 00:11:26 -0000
>@@ -0,0 +1,39 @@
>+--- Makefile.am.orig	2007-10-29 06:30:12.000000000 -0700
>++++ Makefile.am	2008-09-26 20:44:49.000000000 -0700
>+@@ -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; 
>+ 
>+ uninstall-local:
>+ 	@$(NORMAL_UNINSTALL)
>Index: ports/net/nss_ldap/files/patch-Makefile.in
>===================================================================
>RCS file: ports/net/nss_ldap/files/patch-Makefile.in
>diff -N ports/net/nss_ldap/files/patch-Makefile.in
>--- ports/net/nss_ldap/files/patch-Makefile.in	27 May 2006 16:31:57 -0000	1.7
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,82 +0,0 @@
>---- Makefile.in.orig	Sat May 27 16:26:52 2006
>-+++ Makefile.in	Sat May 27 16:46:05 2006
>-@@ -82,7 +82,7 @@
>- 
>- 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
>-+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 bsdnss.c
>- 
>- 
>- nss_ldap_so_LDFLAGS = @nss_ldap_so_LDFLAGS@
>-@@ -118,11 +118,9 @@
>- CPPFLAGS = @CPPFLAGS@
>- LDFLAGS = @LDFLAGS@
>- LIBS = @LIBS@
>--nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o ldap-netgrp.o \
>--ldap-rpc.o ldap-hosts.o ldap-network.o ldap-proto.o ldap-spwd.o \
>--ldap-alias.o ldap-service.o ldap-schema.o ldap-ethers.o ldap-bp.o \
>--ldap-automount.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
>--irs-nss.o pagectrl.o ldap-sldap.o
>-+nss_ldap_so_OBJECTS =  ldap-nss.o ldap-pwd.o ldap-grp.o \
>-+ldap-hosts.o ldap-schema.o util.o ltf.o snprintf.o resolve.o dnsconfig.o \
>-+irs-nss.o pagectrl.o bsdnss.o
>- nss_ldap_so_LDADD = $(LDADD)
>- nss_ldap_so_DEPENDENCIES = 
>- NSS_LDAP_OBJECTS =  ldap-nss.o ldap-grp.o ldap-pwd.o ldap-netgrp.o \
>-@@ -147,34 +145,34 @@
>- 
>- TAR = tar
>- GZIP_ENV = --best
>--DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P .deps/irs-nss.P \
>--.deps/ldap-alias.P .deps/ldap-automount.P .deps/ldap-bp.P \
>--.deps/ldap-ethers.P .deps/ldap-grp.P .deps/ldap-hosts.P \
>--.deps/ldap-netgrp.P .deps/ldap-network.P .deps/ldap-nss.P \
>--.deps/ldap-proto.P .deps/ldap-pwd.P .deps/ldap-rpc.P \
>--.deps/ldap-schema.P .deps/ldap-service.P .deps/ldap-sldap.P \
>--.deps/ldap-spwd.P .deps/ltf.P .deps/pagectrl.P .deps/resolve.P \
>--.deps/snprintf.P .deps/util.P
>-+DEP_FILES =  .deps/aix_authmeth.P .deps/dnsconfig.P \
>-+.deps/ldap-grp.P .deps/ldap-hosts.P \
>-+.deps/irs-nss.P \
>-+.deps/ldap-nss.P \
>-+.deps/ldap-pwd.P \
>-+.deps/ldap-schema.P \
>-+.deps/ltf.P .deps/pagectrl.P .deps/resolve.P \
>-+.deps/snprintf.P .deps/util.P .deps/bsdnss.Po
>- SOURCES = $(nss_ldap_so_SOURCES) $(NSS_LDAP_SOURCES)
>- OBJECTS = $(nss_ldap_so_OBJECTS) $(NSS_LDAP_OBJECTS)
>- 
>- all: all-redirect
>- .SUFFIXES:
>- .SUFFIXES: .S .c .o .s
>--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
>--	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
>-+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
>-+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
>- 
>--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
>--	cd $(top_builddir) \
>--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
>--
>--$(ACLOCAL_M4):  configure.in 
>--	cd $(srcdir) && $(ACLOCAL)
>--
>--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>--	$(SHELL) ./config.status --recheck
>--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
>--	cd $(srcdir) && $(AUTOCONF)
>-+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
>-+#	cd $(top_builddir) \
>-+#	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
>-+
>-+#$(ACLOCAL_M4):  configure.in 
>-+#	cd $(srcdir) && $(ACLOCAL)
>-+
>-+#config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>-+#	$(SHELL) ./config.status --recheck
>-+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
>-+#	cd $(srcdir) && $(AUTOCONF)
>- 
>- config.h: stamp-h
>- 	@if test ! -f $@; then \
>Index: ports/net/nss_ldap/files/patch-configure
>===================================================================
>RCS file: ports/net/nss_ldap/files/patch-configure
>diff -N ports/net/nss_ldap/files/patch-configure
>--- ports/net/nss_ldap/files/patch-configure	27 May 2006 16:31:57 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,89 +0,0 @@
>---- configure.orig	Sat May 27 17:06:27 2006
>-+++ configure	Sat May 27 17:10:45 2006
>-@@ -1729,46 +1729,46 @@
>- fi
>- done
>- 
>--     for ac_hdr in nsswitch.h
>--do
>--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
>--echo "configure:1737: checking for $ac_hdr" >&5
>--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>--  echo $ac_n "(cached) $ac_c" 1>&6
>--else
>--  cat > conftest.$ac_ext <<EOF
>--#line 1742 "configure"
>--#include "confdefs.h"
>--#include <$ac_hdr>
>--EOF
>--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>--{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>--if test -z "$ac_err"; then
>--  rm -rf conftest*
>--  eval "ac_cv_header_$ac_safe=yes"
>--else
>--  echo "$ac_err" >&5
>--  echo "configure: failed program was:" >&5
>--  cat conftest.$ac_ext >&5
>--  rm -rf conftest*
>--  eval "ac_cv_header_$ac_safe=no"
>--fi
>--rm -f conftest*
>--fi
>--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
>--  echo "$ac_t""yes" 1>&6
>--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
>--  cat >> confdefs.h <<EOF
>--#define $ac_tr_hdr 1
>--EOF
>-- 
>--else
>--  echo "$ac_t""no" 1>&6
>--fi
>--done
>--
>-+#     for ac_hdr in nsswitch.h
>-+#do
>-+#ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>-+#echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
>-+#echo "configure:1737: checking for $ac_hdr" >&5
>-+#if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
>-+#  echo $ac_n "(cached) $ac_c" 1>&6
>-+#else
>-+#  cat > conftest.$ac_ext <<EOF
>-+##line 1742 "configure"
>-+##include "confdefs.h"
>-+##include <$ac_hdr>
>-+#EOF
>-+#ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
>-+#{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
>-+#ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
>-+#if test -z "$ac_err"; then
>-+#  rm -rf conftest*
>-+#  eval "ac_cv_header_$ac_safe=yes"
>-+#else
>-+#  echo "$ac_err" >&5
>-+#  echo "configure: failed program was:" >&5
>-+#  cat conftest.$ac_ext >&5
>-+#  rm -rf conftest*
>-+#  eval "ac_cv_header_$ac_safe=no"
>-+#fi
>-+#rm -f conftest*
>-+#fi
>-+#if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
>-+#  echo "$ac_t""yes" 1>&6
>-+#    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
>-+#  cat >> confdefs.h <<EOF
>-+##define $ac_tr_hdr 1
>-+#EOF
>-+# 
>-+#else
>-+#  echo "$ac_t""no" 1>&6
>-+#fi
>-+#done
>-+#
>-      for ac_hdr in irs.h
>- do
>- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
>Index: ports/net/nss_ldap/files/patch-configure.in
>===================================================================
>RCS file: ports/net/nss_ldap/files/patch-configure.in
>diff -N ports/net/nss_ldap/files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ ports/net/nss_ldap/files/patch-configure.in	6 Dec 2008 00:11:26 -0000
>@@ -0,0 +1,26 @@
>+--- configure.in.orig	2007-10-29 06:30:12.000000000 -0700
>++++ configure.in	2008-09-26 20:38:20.000000000 -0700
>+@@ -96,11 +96,15 @@
>+ linux*) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic -Wl,--version-script,\$(srcdir)/exports.linux" ;;
>+ *) nss_ldap_so_LDFLAGS="-shared -Wl,-Bdynamic" ;;
>+ esac
>++case "$target_os" in
>++freebsd*) TARGET_OS=FreeBSD ;;
>++esac
>+ 
>+ AM_CONDITIONAL(GCC, test "$GCC" = "yes")
>+ AM_CONDITIONAL(GLIBC, test "$target_os" = "linux" -o "$target_os" = "linux-gnu")
>+ AM_CONDITIONAL(AIX, test "$TARGET_OS" = AIX)
>+ AM_CONDITIONAL(HPUX, test "$TARGET_OS" = HPUX)
>++AM_CONDITIONAL(FreeBSD, test "$TARGET_OS" = FreeBSD)
>+ 
>+ AM_CONDITIONAL(USE_NATIVE_LINKER, test -n "$nss_ldap_so_LD")
>+ 
>+@@ -152,7 +156,6 @@
>+   aix*) AC_CHECK_HEADERS(irs.h usersec.h) ;;
>+   hpux*) AC_CHECK_HEADERS(nsswitch.h) ;;
>+   *) AC_CHECK_HEADERS(nss.h)
>+-     AC_CHECK_HEADERS(nsswitch.h)
>+      AC_CHECK_HEADERS(irs.h) ;;
>+ esac
>+ AC_CHECK_HEADERS(thread.h)
>Index: ports/net/nss_ldap/files/patch-ldap-pwd.c
>===================================================================
>RCS file: /home/pcvs/ports/net/nss_ldap/files/patch-ldap-pwd.c,v
>retrieving revision 1.2
>diff -u -r1.2 patch-ldap-pwd.c
>--- ports/net/nss_ldap/files/patch-ldap-pwd.c	20 Dec 2006 02:31:17 -0000	1.2
>+++ ports/net/nss_ldap/files/patch-ldap-pwd.c	6 Dec 2008 00:11:26 -0000
>@@ -1,8 +1,8 @@
>---- ldap-pwd.c.orig	Fri Feb 24 11:02:50 2006
>-+++ ldap-pwd.c	Thu May 11 14:52:42 2006
>+--- ldap-pwd.c.orig	2008-10-30 21:50:15.000000000 +0100
>++++ ldap-pwd.c	2008-12-06 00:37:30.216966282 +0100
> @@ -21,7 +21,10 @@
>  static char rcsId[] =
>-   "$Id: ldap-pwd.c,v 2.46 2006/01/11 18:03:49 lukeh Exp $";
>+   "$Id: ldap-pwd.c,v 2.48 2008/10/30 20:49:47 lukeh Exp $";
>  
> +#include <sys/types.h>
> +#include <unistd.h>

Actions: View | Diff

Attachments on bug 129445: 91919