rpcbind

4 files changed, 100 insertions, 0 deletions

diff --git a/illumos-rpcbind/debian/patches/rpcbind-sockaddr_gen.patch b/illumos-rpcbind/debian/patches/rpcbind-sockaddr_gen.patch
new file mode 100644
index 0000000..dac3b55
--- /dev/null
+++ b/illumos-rpcbind/debian/patches/rpcbind-sockaddr_gen.patch
@@ -0,0 +1,13 @@
+Index: illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.h
+===================================================================
+--- illumos-rpcbind.orig/usr/src/cmd/rpcbind/rpcbind.h	2012-10-08 04:25:33.000000000 +0400
++++ illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.h	2013-09-28 15:57:48.897215965 +0400
+@@ -85,6 +85,8 @@
+ extern void rpcb_log(boolean_t, SVCXPRT *, rpcproc_t, rpcprog_t, boolean_t);
+ extern boolean_t allow_indirect, wrap_enabled, verboselog, local_only;
+ 
++struct sockaddr_gen;
++
+ #define	svc_getgencaller(transp) \
+ 	((struct sockaddr_gen *)svc_getrpccaller((transp))->buf)
+ 
diff --git a/illumos-rpcbind/debian/patches/rpcbind-tcpd.h.patch b/illumos-rpcbind/debian/patches/rpcbind-tcpd.h.patch
new file mode 100644
index 0000000..f89b906
--- /dev/null
+++ b/illumos-rpcbind/debian/patches/rpcbind-tcpd.h.patch
@@ -0,0 +1,61 @@
+Index: illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.h
+===================================================================
+--- illumos-rpcbind.orig/usr/src/cmd/rpcbind/rpcbind.h	2012-10-08 04:25:33.000000000 +0400
++++ illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.h	2013-09-28 16:28:00.969913772 +0400
+@@ -51,6 +51,43 @@
+ 
+ #include <tcpd.h>
+ 
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++/* from illumos libwrap */
++typedef struct sockaddr_gen {
++    union {
++	struct sockaddr	_sg_sa;
++	struct sockaddr_in	_sg_sin;
++	struct sockaddr_in6	_sg_sin6;
++    } sg_addr;
++} sockaddr_gen;
++
++typedef union gen_addr {
++    struct in_addr	ga_in;
++#ifdef HAVE_IPV6
++    struct in6_addr	ga_in6;
++#endif
++} gen_addr;
++#define sg_sa		sg_addr._sg_sa
++#define sg_sin		sg_addr._sg_sin
++#define sg_sin6		sg_addr._sg_sin6
++#define sg_family	sg_sa.sa_family
++#define SGADDRSZ(sag)		((sag)->sg_family == AF_INET6 ? \
++				    sizeof (struct in6_addr) : \
++				    sizeof (struct in_addr))
++#define SGSOCKADDRSZ(sag)	((sag)->sg_family == AF_INET6 ? \
++				    sizeof (struct sockaddr_in6) : \
++				    sizeof (struct sockaddr_in))
++#define SGPORT(sag)		(*((sag)->sg_family == AF_INET6 ? \
++				    &(sag)->sg_sin6.sin6_port : \
++				    &(sag)->sg_sin.sin_port))
++#define SGADDRP(sag)		(((sag)->sg_family == AF_INET6 ? \
++				    (char *) &(sag)->sg_sin6.sin6_addr : \
++				    (char *) &(sag)->sg_sin.sin_addr))
++#define SGFAM(sag)		((sag)->sg_family == AF_INET6 ? \
++				    AF_INET6 : AF_INET)
++
+ #ifdef	__cplusplus
+ extern "C" {
+ #endif
+Index: illumos-rpcbind/usr/src/cmd/rpcbind/rpcb_check.c
+===================================================================
+--- illumos-rpcbind.orig/usr/src/cmd/rpcbind/rpcb_check.c	2012-10-08 04:25:33.000000000 +0400
++++ illumos-rpcbind/usr/src/cmd/rpcbind/rpcb_check.c	2013-09-28 16:30:52.274024004 +0400
+@@ -220,7 +220,7 @@
+ 
+ 		if (!localxprt(transp, ispmap) &&
+ 		    (local_only ||
+-		    hosts_ctl("rpcbind", addr_string, addr_string, "") == 0)) {
++		    hosts_ctl("rpcbind", (char *)addr_string, (char *)addr_string, "") == 0)) {
+ 			res = B_FALSE;
+ 		}
+ 	}
diff --git a/illumos-rpcbind/debian/patches/rpcbind.c.patch b/illumos-rpcbind/debian/patches/rpcbind.c.patch
new file mode 100644
index 0000000..ebc516e
--- /dev/null
+++ b/illumos-rpcbind/debian/patches/rpcbind.c.patch
@@ -0,0 +1,24 @@
+Index: illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.c
+===================================================================
+--- illumos-rpcbind.orig/usr/src/cmd/rpcbind/rpcbind.c	2012-10-08 04:25:33.000000000 +0400
++++ illumos-rpcbind/usr/src/cmd/rpcbind/rpcbind.c	2013-09-28 15:51:33.630424214 +0400
+@@ -230,8 +230,8 @@
+ 	}
+ 	endnetconfig(nc_handle);
+ 
+-	if ((loopback_dg[0] == NULL) && (loopback_vc[0] == NULL) &&
+-	    (loopback_vc_ord[0] == NULL)) {
++	if ((loopback_dg[0] == 0) && (loopback_vc[0] == 0) &&
++	    (loopback_vc_ord[0] == 0)) {
+ 		syslog(LOG_ERR, "could not find loopback transports");
+ 		exit(1);
+ 	}
+@@ -544,7 +544,7 @@
+ 		PMAPLIST *pml;
+ 
+ 		if (!svc_register(my_xprt, PMAPPROG, PMAPVERS,
+-		    pmap_service, NULL)) {
++		    pmap_service, 0)) {
+ 			syslog(LOG_ERR, "could not register on %s",
+ 			    nconf->nc_netid);
+ 			goto error;
diff --git a/illumos-rpcbind/debian/patches/series b/illumos-rpcbind/debian/patches/series
new file mode 100644
index 0000000..9879e81
--- /dev/null
+++ b/illumos-rpcbind/debian/patches/series
@@ -0,0 +1,2 @@
+rpcbind.c.patch
+rpcbind-tcpd.h.patch