Attachment 91630 Details for Bug 129030 – file.diff

[patch] file.diff

file.diff (text/plain), 12.81 KB, created by Martin Matuska on 2008-11-20 23:00:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Matuska

Created: 2008-11-20 23:00:11 UTC

Size: 12.81 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	20 Nov 2008 15:04:06 -0000
>@@ -14,13 +14,15 @@
> MAINTAINER=	kazakov@gmail.com
> COMMENT=	RFC 2307 NSS module
> 
>-NSS_LDAP_VERSION=257
>+NSS_LDAP_VERSION=264
> 
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> USE_LDCONFIG=	yes
> USE_OPENLDAP=	yes
> 
>+USE_AUTOTOOLS=	autoconf:262
>+
> PLIST_FILES=	etc/nss_ldap.conf.sample lib/nss_ldap.so.1
> 
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>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	20 Nov 2008 15:04:06 -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.in
>===================================================================
>RCS file: /home/pcvs/ports/net/nss_ldap/files/patch-Makefile.in,v
>retrieving revision 1.7
>diff -u -r1.7 patch-Makefile.in
>--- ports/net/nss_ldap/files/patch-Makefile.in	27 May 2006 16:31:57 -0000	1.7
>+++ ports/net/nss_ldap/files/patch-Makefile.in	20 Nov 2008 15:04:06 -0000
>@@ -1,82 +1,104 @@
>---- 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
>+--- Makefile.in.orig	2008-10-30 21:50:15.000000000 +0100
>++++ Makefile.in	2008-11-20 15:50:56.446445037 +0100
>+@@ -64,14 +64,10 @@
>+ NSS_LDAP_OBJECTS = $(am_NSS_LDAP_OBJECTS)
>+ NSS_LDAP_LDADD = $(LDADD)
>+ am_nss_ldap_so_OBJECTS = ldap-nss.$(OBJEXT) ldap-pwd.$(OBJEXT) \
>+-	ldap-grp.$(OBJEXT) ldap-netgrp.$(OBJEXT) ldap-rpc.$(OBJEXT) \
>+-	ldap-hosts.$(OBJEXT) ldap-network.$(OBJEXT) \
>+-	ldap-proto.$(OBJEXT) ldap-spwd.$(OBJEXT) ldap-alias.$(OBJEXT) \
>+-	ldap-service.$(OBJEXT) ldap-schema.$(OBJEXT) \
>+-	ldap-ethers.$(OBJEXT) ldap-bp.$(OBJEXT) \
>+-	ldap-automount.$(OBJEXT) util.$(OBJEXT) ltf.$(OBJEXT) \
>++	ldap-grp.$(OBJEXT) ldap-hosts.$(OBJEXT) ldap-schema.$(OBJEXT) \
>++	util.$(OBJEXT) ltf.$(OBJEXT) \
>+ 	snprintf.$(OBJEXT) resolve.$(OBJEXT) dnsconfig.$(OBJEXT) \
>+-	irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) ldap-sldap.$(OBJEXT) \
>++	irs-nss.$(OBJEXT) pagectrl.$(OBJEXT) bsdnss.$(OBJEXT) \
>+ 	ldap-init-krb5-cache.$(OBJEXT)
>+ nss_ldap_so_OBJECTS = $(am_nss_ldap_so_OBJECTS)
>  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 @@
>+@@ -208,11 +204,9 @@
>+ 	     ldap.conf nss_ldap.spec nsswitch.ldap 
>  
>- 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)
>+ 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 bsdnss.c ldap-init-krb5-cache.c
>+ 
>+ NSS_LDAP_SOURCES = ldap-nss.c ldap-grp.c ldap-pwd.c ldap-netgrp.c ldap-schema.c \
>+ 	util.c ltf.c snprintf.c resolve.c dnsconfig.c \
>+@@ -238,37 +232,37 @@
>+ .SUFFIXES: .c .o .obj
>+ am--refresh:
>+ 	@:
>+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>+-	@for dep in $?; do \
>+-	  case '$(am__configure_deps)' in \
>+-	    *$$dep*) \
>+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
>+-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
>+-		&& exit 0; \
>+-	      exit 1;; \
>+-	  esac; \
>+-	done; \
>+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
>+-	cd $(top_srcdir) && \
>+-	  $(AUTOMAKE) --gnu  Makefile
>+-.PRECIOUS: Makefile
>+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>+-	@case '$?' in \
>+-	  *config.status*) \
>+-	    echo ' $(SHELL) ./config.status'; \
>+-	    $(SHELL) ./config.status;; \
>+-	  *) \
>+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
>+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
>+-	esac;
> -
>--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
>+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
> -	$(SHELL) ./config.status --recheck
>--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
>+-
>+-$(top_srcdir)/configure:  $(am__configure_deps)
> -	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)
>+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>+-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>++#$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
>++#	@for dep in $?; do \
>++#	  case '$(am__configure_deps)' in \
>++#	    *$$dep*) \
>++#	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
>++#	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
>++#		&& exit 0; \
>++#	      exit 1;; \
>++#	  esac; \
>++#	done; \
>++#	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
>++#	cd $(top_srcdir) && \
>++#	  $(AUTOMAKE) --gnu  Makefile
>++#.PRECIOUS: Makefile
>++#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
>++#	@case '$?' in \
>++#	  *config.status*) \
>++#	    echo ' $(SHELL) ./config.status'; \
>++#	    $(SHELL) ./config.status;; \
>++#	  *) \
>++#	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
>++#	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
>++#	esac;
>++#
>++#$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
> +#	$(SHELL) ./config.status --recheck
>-+#$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
>++#
>++#$(top_srcdir)/configure:  $(am__configure_deps)
> +#	cd $(srcdir) && $(AUTOCONF)
>++#$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
>++#	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
>  
>- config.h: stamp-h
>+ config.h: stamp-h1
>  	@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	20 Nov 2008 15:04:06 -0000
>@@ -0,0 +1,10 @@
>+--- configure.in.orig	2008-11-20 15:44:47.576859246 +0100
>++++ configure.in	2008-11-20 15:44:52.765064426 +0100
>+@@ -152,7 +152,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)

Actions: View | Diff

Attachments on bug 129030: 91630