update gcc, glibc and fix build breakage

6 files changed, 68 insertions, 59 deletions

diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 83785dd1e..cc9cafb2d 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtirpc
-PKG_VERSION:=		0.2.1
+PKG_VERSION:=		0.2.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d77eb15f464bf9d6e66259eaf78b2a4e
+PKG_MD5SUM:=		74c41c15c2909f7d11d9c7bfa7db6273
 PKG_DESCR:=		a transport independent RPC library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libgssglue
diff --git a/package/libtirpc/patches/patch-ltmain_sh b/package/libtirpc/patches/patch-ltmain_sh
deleted file mode 100644
index 599235216..000000000
--- a/package/libtirpc/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtirpc-0.2.1.orig/ltmain.sh	2009-11-30 15:10:18.000000000 +0100
-+++ libtirpc-0.2.1/ltmain.sh	2011-01-15 23:09:39.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/libtirpc/patches/patch-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in
index 18ce6ffe2..705eca8e4 100644
--- a/package/libtirpc/patches/patch-src_Makefile_in
+++ b/package/libtirpc/patches/patch-src_Makefile_in
@@ -1,14 +1,14 @@
---- libtirpc-0.2.1.orig/src/Makefile.in	2009-11-30 15:10:21.000000000 +0100
-+++ libtirpc-0.2.1/src/Makefile.in	2010-11-11 10:41:48.394995633 +0100
+--- libtirpc-0.2.2.orig/src/Makefile.in	2011-05-02 14:31:55.000000000 +0200
++++ libtirpc-0.2.2/src/Makefile.in	2012-03-22 19:02:24.598855474 +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 \
+-	authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.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 \
++	des_crypt.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 \
 @@ -110,8 +110,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut
@@ -16,32 +16,23 @@
  	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.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 \
-@@ -286,7 +285,7 @@ lib_LTLIBRARIES = libtirpc.la
- # release number of your package. This is an abuse that only fosters
- # misunderstanding of the purpose of library versions."
- #
--libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 \
-+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 \
- 	$(am__append_2)
- libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \
- 	bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \
-@@ -297,8 +296,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u
+-	libtirpc_la-authdes_prot.lo libtirpc_la-des_crypt.lo \
++	libtirpc_la-des_crypt.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 \
+@@ -302,8 +301,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 \
+-	authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.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 $(am__append_1)
++	des_crypt.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
-@@ -375,12 +374,9 @@ mostlyclean-compile:
+@@ -381,12 +380,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -54,21 +45,3 @@
  @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@
-@@ -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
- 
- # 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.
diff --git a/package/libtirpc/patches/patch-src_auth_time_c b/package/libtirpc/patches/patch-src_auth_time_c
new file mode 100644
index 000000000..5ce7de419
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_auth_time_c
@@ -0,0 +1,24 @@
+--- libtirpc-0.2.2.orig/src/auth_time.c	2011-05-02 14:10:40.000000000 +0200
++++ libtirpc-0.2.2/src/auth_time.c	2012-03-22 19:02:30.422855534 +0100
+@@ -43,7 +43,7 @@
+ //#include <clnt_soc.h>
+ #include <sys/select.h>
+ #undef NIS
+-#include <rpcsvc/nis.h>
++//#include <rpcsvc/nis.h>
+ 
+ 
+ #ifdef TESTING
+@@ -138,6 +138,7 @@ free_eps(eps, num)
+  * NIS+ server will call __rpc_get_time_offset() with the nis_server
+  * structure already populated.
+  */
++#ifdef 0
+ static nis_server *
+ get_server(sin, host, srv, eps, maxep)
+ 	struct sockaddr_in *sin;
+@@ -491,3 +492,4 @@ error:
+ 
+ 	return (time_valid);
+ }
++#endif
diff --git a/package/libtirpc/patches/patch-src_des_crypt_c b/package/libtirpc/patches/patch-src_des_crypt_c
new file mode 100644
index 000000000..c2169177d
--- /dev/null
+++ b/package/libtirpc/patches/patch-src_des_crypt_c
@@ -0,0 +1,23 @@
+--- libtirpc-0.2.2.orig/src/des_crypt.c	2011-05-02 14:10:40.000000000 +0200
++++ libtirpc-0.2.2/src/des_crypt.c	2012-03-22 19:23:01.213747585 +0100
+@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)des_crypt.c	
+ 
+ static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
+ int (*__des_crypt_LOCAL)() = 0;
+-extern int _des_crypt_call(char *, int, struct desparams *);
++//extern int _des_crypt_call(char *, int, struct desparams *);
+ /*
+  * Copy 8 bytes
+  */
+@@ -145,10 +145,6 @@ common_crypt(key, buf, len, mode, desp)	
+ 		if (!__des_crypt_LOCAL(buf, len, desp)) {
+ 			return (DESERR_HWERROR);
+ 		}
+-	} else {
+-		if (!_des_crypt_call(buf, len, desp)) {
+-			return (DESERR_HWERROR);
+-		}
+-	}
++	} 
+ 	return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE);
+ }
diff --git a/package/libtirpc/patches/patch-src_rpc_soc_c b/package/libtirpc/patches/patch-src_rpc_soc_c
index 09d303f59..1ae7f30d6 100644
--- a/package/libtirpc/patches/patch-src_rpc_soc_c
+++ b/package/libtirpc/patches/patch-src_rpc_soc_c
@@ -1,6 +1,6 @@
---- libtirpc-0.2.1.orig/src/rpc_soc.c	2009-11-30 15:04:55.000000000 +0100
-+++ libtirpc-0.2.1/src/rpc_soc.c	2010-01-13 22:16:08.000000000 +0100
-@@ -479,37 +479,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
+--- libtirpc-0.2.2.orig/src/rpc_soc.c	2011-05-02 14:10:40.000000000 +0200
++++ libtirpc-0.2.2/src/rpc_soc.c	2012-03-22 19:20:37.849747561 +0100
+@@ -515,37 +515,6 @@ clnt_broadcast(prog, vers, proc, xargs, 
  	    (resultproc_t) rpc_wrap_bcast, "udp");
  }