Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

1 files changed, 33 insertions, 62 deletions

diff --git a/package/libtirpc/patches/patch-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in
index 9aa2129c1..f6e41aa3b 100644
--- a/package/libtirpc/patches/patch-src_Makefile_in
+++ b/package/libtirpc/patches/patch-src_Makefile_in
@@ -1,57 +1,38 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libtirpc-0.2.0.orig/src/Makefile.in	2009-05-29 00:13:40.000000000 +0200
-+++ libtirpc-0.2.0/src/Makefile.in	2009-05-31 05:10:59.000000000 +0200
-@@ -64,9 +64,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none
+--- libtirpc-0.2.1.orig/src/Makefile.in	2009-11-30 15:10:21.000000000 +0100
++++ libtirpc-0.2.1/src/Makefile.in	2010-01-13 21:28:55.000000000 +0100
+@@ -81,8 +81,8 @@ am__libtirpc_la_SOURCES_DIST = auth_none
  	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
  	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
  	svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \
 -	svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \
 -	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
--	xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
-+	svc_simple.c svc_vc.c getpeereid.c xdr.c xdr_rec.c xdr_array.c \
-+	xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
++	svc_simple.c svc_vc.c getpeereid.c \
++	xdr.c xdr_rec.c xdr_array.c xdr_float.c \
+ 	xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \
  	authgss_prot.c svc_auth_gss.c svc_auth_none.c
  @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \
- @GSS_TRUE@	libtirpc_la-authgss_prot.lo \
-@@ -93,12 +92,10 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
+@@ -110,8 +110,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
  	libtirpc_la-svc_generic.lo libtirpc_la-svc_raw.lo \
  	libtirpc_la-svc_run.lo libtirpc_la-svc_simple.lo \
  	libtirpc_la-svc_vc.lo libtirpc_la-getpeereid.lo \
 -	libtirpc_la-auth_time.lo libtirpc_la-auth_des.lo \
 -	libtirpc_la-authdes_prot.lo libtirpc_la-xdr.lo \
--	libtirpc_la-xdr_rec.lo libtirpc_la-xdr_array.lo \
--	libtirpc_la-xdr_float.lo libtirpc_la-xdr_mem.lo \
--	libtirpc_la-xdr_reference.lo libtirpc_la-xdr_stdio.lo \
--	$(am__objects_1)
-+	libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \
-+	libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \
-+	libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \
-+	libtirpc_la-xdr_stdio.lo $(am__objects_1)
- libtirpc_la_OBJECTS = $(am_libtirpc_la_OBJECTS)
- libtirpc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtirpc_la_CFLAGS) \
-@@ -230,7 +227,6 @@ sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- INCLUDES = -I../tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
-@@ -278,9 +274,9 @@ libtirpc_la_SOURCES = auth_none.c auth_u
++	libtirpc_la-xdr.lo \
+ 	libtirpc_la-xdr_rec.lo libtirpc_la-xdr_array.lo \
+ 	libtirpc_la-xdr_float.lo libtirpc_la-xdr_mem.lo \
+ 	libtirpc_la-xdr_reference.lo libtirpc_la-xdr_stdio.lo \
+@@ -297,8 +296,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
  	rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \
  	rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \
  	svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \
 -	svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \
 -	authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \
--	xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1)
-+	svc_simple.c svc_vc.c getpeereid.c xdr.c xdr_rec.c xdr_array.c \
-+	xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
-+	$(am__append_1)
++	svc_simple.c svc_vc.c getpeereid.c \
++	xdr.c xdr_rec.c xdr_array.c xdr_float.c \
+ 	xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1)
  @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS)
  all: all-am
- 
-@@ -351,12 +347,9 @@ mostlyclean-compile:
+@@ -375,12 +374,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -64,31 +45,21 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authunix_prot.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-bindresvport.Plo@am__quote@
-@@ -715,27 +708,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c
+@@ -1055,7 +1051,7 @@ uninstall-am: uninstall-libLTLIBRARIES
+ @GSS_TRUE@        svc_raw.c svc_run.c svc_simple.c svc_vc.c \
+ @GSS_TRUE@	xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+ @GSS_TRUE@	auth_gss.c authgss_prot.c svc_auth_gss.c getpeereid.c \
+-@GSS_TRUE@	auth_time.c auth_des.c authdes_prot.c svc_auth_none.c
++@GSS_TRUE@	svc_auth_none.c
+ 
+ @GSS_FALSE@$(libtirpc_la_OBJECTS) :auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
+ @GSS_FALSE@        clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
+@@ -1066,7 +1062,7 @@ uninstall-am: uninstall-libLTLIBRARIES
+ @GSS_FALSE@        rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
+ @GSS_FALSE@        svc_raw.c svc_run.c svc_simple.c svc_vc.c \
+ @GSS_FALSE@	xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \
+-@GSS_FALSE@	getpeereid.c auth_time.c auth_des.c authdes_prot.c
++@GSS_FALSE@	getpeereid.c
  
--libtirpc_la-auth_time.lo: auth_time.c
--@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c
--
--libtirpc_la-auth_des.lo: auth_des.c
--@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c
--
--libtirpc_la-authdes_prot.lo: authdes_prot.c
--@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
--@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='authdes_prot.c' object='libtirpc_la-authdes_prot.lo' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c
--
- libtirpc_la-xdr.lo: xdr.c
- @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-xdr.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-xdr.Tpo -c -o libtirpc_la-xdr.lo `test -f 'xdr.c' || echo '$(srcdir)/'`xdr.c
- @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libtirpc_la-xdr.Tpo $(DEPDIR)/libtirpc_la-xdr.Plo
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.