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

Conflicts:
	package/nspr/Makefile

4 files changed, 78 insertions, 0 deletions

diff --git a/package/rpcbind/patches/patch-config_h_in b/package/rpcbind/patches/patch-config_h_in
new file mode 100644
index 000000000..0eeab0c48
--- /dev/null
+++ b/package/rpcbind/patches/patch-config_h_in
@@ -0,0 +1,12 @@
+--- rpcbind-0.2.0.orig/config.h.in	2009-05-29 18:37:50.000000000 +0200
++++ rpcbind-0.2.0/config.h.in	2010-02-06 01:51:38.000000000 +0100
+@@ -96,6 +96,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
diff --git a/package/rpcbind/patches/patch-src_Makefile_in b/package/rpcbind/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..037bff1b3
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- rpcbind-0.2.0.orig/src/Makefile.in	2009-05-29 18:37:50.000000000 +0200
++++ rpcbind-0.2.0/src/Makefile.in	2010-01-31 17:27:20.000000000 +0100
+@@ -207,7 +207,7 @@ rpcinfo_LDFLAGS = -lpthread -ltirpc
+ rpcinfo_LDADD = $(LIB_TIRPC)
+ rpcbind_LDFLAGS = -lpthread -ltirpc
+ rpcbind_LDADD = $(LIB_TIRPC)
+-AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
++AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
+                        -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
+ 
+ all: config.h
diff --git a/package/rpcbind/patches/patch-src_rpcbind_c b/package/rpcbind/patches/patch-src_rpcbind_c
new file mode 100644
index 000000000..358bdc0c0
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_rpcbind_c
@@ -0,0 +1,14 @@
+--- rpcbind-0.2.0.orig/src/rpcbind.c	2009-05-29 15:38:22.000000000 +0200
++++ rpcbind-0.2.0/src/rpcbind.c	2010-02-06 01:54:03.194325296 +0100
+@@ -67,7 +67,11 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <errno.h>
++#if defined(__UCLIBC__)
++#define __nss_configure_lookup(x,y)
++#else
+ #include <nss.h>
++#endif 
+ #include "config.h"
+ #include "rpcbind.h"
+ 
diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
new file mode 100644
index 000000000..d7a5582d9
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_security_c
@@ -0,0 +1,41 @@
+--- rpcbind-0.2.0.orig/src/security.c	2009-05-29 15:38:22.000000000 +0200
++++ rpcbind-0.2.0/src/security.c	2010-02-06 01:55:37.383094004 +0100
+@@ -20,12 +20,38 @@
+ /*
+  * XXX for special case checks in check_callit.
+  */
++#if defined(__UCLIBC__)
++
++#define MOUNTPROC_MNT 1
++#define MOUNTPROC_UMNT 3
++
++#define NFS_PROGRAM    100003
++#define YPPROG         100004
++#define MOUNTPROG      100005
++#define YPBINDPROG     100007
++#define YPPASSWDPROG   100009
++#define RQUOTAPROG     100011
++
++#define YPPROC_NULL    0
++#define YPPROC_DOMAIN  1
++#define YPPROC_DOMAIN_NONACK 2
++#define YPPROC_MATCH   3
++#define YPPROC_FIRST   4
++#define YPPROC_NEXT    5
++#define YPPROC_XFR     6
++#define YPPROC_CLEAR   7
++#define YPPROC_ALL     8
++
++#define YPBINDPROC_SETDOM      2
++
++#else 
+ #include <rpcsvc/mount.h>
+ #include <rpcsvc/rquota.h>
+ #include <rpcsvc/nfs_prot.h>
+ #include <rpcsvc/yp.h>
+ #include <rpcsvc/ypclnt.h>
+ #include <rpcsvc/yppasswd.h>
++#endif
+ 
+ #include "rpcbind.h"
+