14 files changed, 156 insertions, 2 deletions
diff --git a/libc/debian/changelog b/libc/debian/changelog
index 8f3916c..f13551f 100644
--- a/libc/debian/changelog
+++ b/libc/debian/changelog
@@ -1,3 +1,10 @@
+libc (2.10+5) unstable; urgency=low
+
+  * Build and package librpcsvc1
+  * libc1-dev depends on librpcsvc1
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Fri, 27 Sep 2013 20:04:25 +0400
+
 libc (2.10+4) unstable; urgency=low
 
   * Implemented cfmakeraw(), added libc-add-cfmakeraw.patch
diff --git a/libc/debian/control b/libc/debian/control
index b421c19..190ce63 100644
--- a/libc/debian/control
+++ b/libc/debian/control
@@ -92,6 +92,7 @@ Depends: ${misc:Depends},
 # Until we build libm from sources:
  libm2-dev,
  libiconv2-dev,
+ librpcsvc1,
  uts-dev ( >= 2.10-2 ),
  libc1 (= ${binary:Version}),
  libc-dev-bin (= ${binary:Version})
@@ -116,7 +117,8 @@ Provides: libc-dev-illumos-i386, libc6-dev-illumos-i386, lib32c1-dev, lib32c-dev
 Priority: optional
 Section: libdevel
 Architecture: illumos-amd64
-Depends: ${misc:Depends}, libc1-dev (= ${binary:Version}), lib32m2-dev
+Depends: ${misc:Depends}, libc1-dev (= ${binary:Version}), lib32m2-dev,
+ lib32rpcsvc1,
 Conflicts: lib32secdb1-dev
 Description: illumos C library: development files
  Contains the symlinks, headers, and object files needed to compile and link
@@ -296,3 +298,16 @@ Description: illumos libc debugging libraries: 32-bit development files
  libc_db is a threads debugging library,
  librtld_db is a runtime linker debugging library.
 
+Package: librpcsvc1
+Architecture: illumos-any
+Priority: optional
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: RPC services library
+
+Package: lib32rpcsvc1
+Architecture: illumos-any
+Priority: optional
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: RPC services library (32-bit)
diff --git a/libc/debian/lib32rpcsvc1.install b/libc/debian/lib32rpcsvc1.install
new file mode 100644
index 0000000..4f34acc
--- /dev/null
+++ b/libc/debian/lib32rpcsvc1.install
@@ -0,0 +1 @@
+usr/lib32/librpcsvc.so.1
diff --git a/libc/debian/libc1-dev-illumos-i386.install b/libc/debian/libc1-dev-illumos-i386.install
index 96a8bdc..a13125c 100644
--- a/libc/debian/libc1-dev-illumos-i386.install
+++ b/libc/debian/libc1-dev-illumos-i386.install
@@ -9,6 +9,7 @@ usr/lib32/libnsl.so
 usr/lib32/libposix4.so
 usr/lib32/libpthread.so
 usr/lib32/libresolv.so
+usr/lib32/librpcsvc.so
 usr/lib32/librt.so
 usr/lib32/libsecdb.so
 usr/lib32/libsendfile.so
diff --git a/libc/debian/libc1-dev.install b/libc/debian/libc1-dev.install
index b974d6d..9798c23 100644
--- a/libc/debian/libc1-dev.install
+++ b/libc/debian/libc1-dev.install
@@ -11,6 +11,7 @@ usr/lib/*/libnsl.so
 usr/lib/*/libposix4.so
 usr/lib/*/libpthread.so
 usr/lib/*/libresolv.so
+usr/lib/*/librpcsvc.so
 usr/lib/*/librt.so
 usr/lib/*/libsecdb.so
 usr/lib/*/libsendfile.so
diff --git a/libc/debian/librpcsvc1.install b/libc/debian/librpcsvc1.install
new file mode 100644
index 0000000..1c9a261
--- /dev/null
+++ b/libc/debian/librpcsvc1.install
@@ -0,0 +1 @@
+usr/lib/*/librpcsvc.so.1
diff --git a/libc/debian/patches/librpcsvc-gnumake.patch b/libc/debian/patches/librpcsvc-gnumake.patch
new file mode 100644
index 0000000..f0f5f2a
--- /dev/null
+++ b/libc/debian/patches/librpcsvc-gnumake.patch
@@ -0,0 +1,13 @@
+Index: libc/usr/src/lib/librpcsvc/Makefile
+===================================================================
+--- libc.orig/usr/src/lib/librpcsvc/Makefile	2013-09-27 18:35:16.439473375 +0400
++++ libc/usr/src/lib/librpcsvc/Makefile	2013-09-27 18:53:38.152428301 +0400
+@@ -68,7 +68,7 @@
+ 
+ all:	$(DERIVED_FILES) $(TXTS) .WAIT $(SUBDIRS)
+ 
+-install: all .WAIT $(SUBDIRS)
++install: $(SUBDIRS)
+ 
+ install_h: $(DERIVED_FILES) $(ROOTHDRS)
+ 
diff --git a/libc/debian/patches/librpcsvc-use-system-x.patch b/libc/debian/patches/librpcsvc-use-system-x.patch
new file mode 100644
index 0000000..5963e2b
--- /dev/null
+++ b/libc/debian/patches/librpcsvc-use-system-x.patch
@@ -0,0 +1,31 @@
+Index: libc/usr/src/lib/librpcsvc/Makefile
+===================================================================
+--- libc.orig/usr/src/lib/librpcsvc/Makefile	2012-10-08 04:25:42.000000000 +0400
++++ libc/usr/src/lib/librpcsvc/Makefile	2013-09-27 18:25:14.854624400 +0400
+@@ -90,8 +90,8 @@
+ common/rusers_xdr.c: $(PROTOCOL_DIR)/rusers.x
+ 	$(RPCGEN) -c $(PROTOCOL_DIR)/rusers.x > $@
+ 
+-common/sm_inter_xdr.c: $(PROTOCOL_DIR)/sm_inter.x
+-	$(RPCGEN) -c $(PROTOCOL_DIR)/sm_inter.x > $@
++common/sm_inter_xdr.c: /usr/include/rpcsvc/sm_inter.x
++	$(RPCGEN) -c /usr/include/rpcsvc/sm_inter.x > $@
+ 
+ common/spray_xdr.c: $(PROTOCOL_DIR)/spray.x
+ 	$(RPCGEN) -c $(PROTOCOL_DIR)/spray.x > $@
+@@ -102,11 +102,11 @@
+ common/mount_xdr.c: $(PROTOCOL_DIR)/mount.x
+ 	$(RPCGEN) -c $(PROTOCOL_DIR)/mount.x > $@
+ 
+-common/nsm_addr_xdr.c: $(PROTOCOL_DIR)/nsm_addr.x
+-	$(RPCGEN) -c $(PROTOCOL_DIR)/nsm_addr.x > $@
++common/nsm_addr_xdr.c: /usr/include/rpcsvc/nsm_addr.x
++	$(RPCGEN) -c /usr/include/rpcsvc/nsm_addr.x > $@
+ 
+-common/rpc_sztypes.c: $(PROTOCOL_DIR)/rpc_sztypes.x
+-	$(RPCGEN) -c $(PROTOCOL_DIR)/rpc_sztypes.x > $@
++common/rpc_sztypes.c: /usr/include/rpcsvc/rpc_sztypes.x
++	$(RPCGEN) -c /usr/include/rpcsvc/rpc_sztypes.x > $@
+ 
+ # include library targets
+ include ../Makefile.targ
diff --git a/libc/debian/patches/librpcsvc-usr-lib.patch b/libc/debian/patches/librpcsvc-usr-lib.patch
new file mode 100644
index 0000000..1fe235e
--- /dev/null
+++ b/libc/debian/patches/librpcsvc-usr-lib.patch
@@ -0,0 +1,14 @@
+Index: libc/usr/src/lib/librpcsvc/Makefile.com
+===================================================================
+--- libc.orig/usr/src/lib/librpcsvc/Makefile.com	2012-10-08 04:25:42.000000000 +0400
++++ libc/usr/src/lib/librpcsvc/Makefile.com	2013-09-27 18:56:03.915411833 +0400
+@@ -35,9 +35,6 @@
+ # include library definitions
+ include ../../Makefile.lib
+ 
+-# install this library in the root filesystem
+-include ../../Makefile.rootfs
+-
+ SRCDIR =	../common
+ 
+ pics/%.o: ../common/%.c
diff --git a/libc/debian/patches/rstat.x-stdc.patch b/libc/debian/patches/rstat.x-stdc.patch
new file mode 100644
index 0000000..5f24e7c
--- /dev/null
+++ b/libc/debian/patches/rstat.x-stdc.patch
@@ -0,0 +1,31 @@
+Index: libc/usr/src/head/rpcsvc/rstat.x
+===================================================================
+--- libc.orig/usr/src/head/rpcsvc/rstat.x	2013-09-27 18:07:00.831925924 +0400
++++ libc/usr/src/head/rpcsvc/rstat.x	2013-09-27 18:19:42.345521803 +0400
+@@ -72,13 +72,7 @@
+ % */
+ %
+ %bool_t
+-%#ifdef __STDC__
+ %xdr_timeval(XDR *xdrs, struct timeval *tvp)
+-%#else /* K&R C */
+-%xdr_timeval(xdrs, tvp)
+-%	XDR *xdrs;
+-%	struct timeval *tvp;
+-%#endif /* K&R C */
+ %{
+ %	return (xdr_rstat_timeval(xdrs, (rstat_timeval *)tvp));
+ %}
+@@ -167,12 +161,7 @@
+ 
+ #ifdef RPC_HDR
+ %
+-%#if defined(__STDC__) || defined(__cplusplus)
+ %enum clnt_stat rstat(char *, struct statstime *);
+ %int havedisk(char *);
+-%#else
+-%enum clnt_stat rstat();
+-%int havedisk();
+-%#endif
+ %
+ #endif
diff --git a/libc/debian/patches/rusers.x-stdc.patch b/libc/debian/patches/rusers.x-stdc.patch
new file mode 100644
index 0000000..e081862
--- /dev/null
+++ b/libc/debian/patches/rusers.x-stdc.patch
@@ -0,0 +1,17 @@
+Index: libc/usr/src/head/rpcsvc/rusers.x
+===================================================================
+--- libc.orig/usr/src/head/rpcsvc/rusers.x	2013-09-27 18:07:01.243311538 +0400
++++ libc/usr/src/head/rpcsvc/rusers.x	2013-09-27 18:21:06.429628029 +0400
+@@ -111,12 +111,7 @@
+ %
+ %int xdr_utmpidlearr();
+ %
+-%#if defined(__STDC__) || defined(__cplusplus)
+ %enum clnt_stat rusers(char *host, struct utmpidlearr *up);
+ %int rnusers(char *host);
+-%#else
+-%enum clnt_stat rusers();
+-%int rnusers();
+-%#endif
+ %
+ #endif
diff --git a/libc/debian/patches/rwall.x-stdc.patch b/libc/debian/patches/rwall.x-stdc.patch
new file mode 100644
index 0000000..3411ab5
--- /dev/null
+++ b/libc/debian/patches/rwall.x-stdc.patch
@@ -0,0 +1,15 @@
+Index: libc/usr/src/head/rpcsvc/rwall.x
+===================================================================
+--- libc.orig/usr/src/head/rpcsvc/rwall.x	2013-09-27 18:24:01.012139346 +0400
++++ libc/usr/src/head/rpcsvc/rwall.x	2013-09-27 18:25:22.050269170 +0400
+@@ -60,10 +60,6 @@
+ #ifdef RPC_HDR
+ %
+ %
+-%#if defined(__STDC__) || defined(__cplusplus)
+ %enum clnt_stat rwall(char *, char *);
+-%#else
+-%enum clnt_stat rwall();
+-%#endif
+ %
+ #endif
diff --git a/libc/debian/patches/series b/libc/debian/patches/series
index 150d6c0..2f0fdd9 100644
--- a/libc/debian/patches/series
+++ b/libc/debian/patches/series
@@ -87,3 +87,9 @@ libc-add-get_current_dir_name.patch
 illumos-3787.patch
 libc-add-cfmakeraw.patch
 libsocket-binutils-2.23-weak.patch
+librpcsvc-use-system-x.patch
+rstat.x-stdc.patch
+rusers.x-stdc.patch
+rwall.x-stdc.patch
+librpcsvc-usr-lib.patch
+librpcsvc-gnumake.patch
diff --git a/libc/debian/rules b/libc/debian/rules
index 2822b51..f1c842c 100755
--- a/libc/debian/rules
+++ b/libc/debian/rules
@@ -29,10 +29,11 @@ libcrypt \
 libmd \
 libmp \
 libnsl \
-libsocket \
 libresolv \
 libresolv2 \
+librpcsvc \
 libsecdb \
+libsocket \
 crypt_modules \
 
 libs_filters := \