diff --git a/libtirpc/.footprint b/libtirpc/.footprint index f80b29a60..4cc025d2c 100644 --- a/libtirpc/.footprint +++ b/libtirpc/.footprint @@ -29,6 +29,7 @@ drwxr-xr-x root/root usr/include/tirpc/rpc/ -rw-r--r-- root/root usr/include/tirpc/rpc/svc.h -rw-r--r-- root/root usr/include/tirpc/rpc/svc_auth.h -rw-r--r-- root/root usr/include/tirpc/rpc/svc_dg.h +-rw-r--r-- root/root usr/include/tirpc/rpc/svc_mt.h -rw-r--r-- root/root usr/include/tirpc/rpc/svc_soc.h -rw-r--r-- root/root usr/include/tirpc/rpc/types.h -rw-r--r-- root/root usr/include/tirpc/rpc/xdr.h @@ -38,9 +39,9 @@ drwxr-xr-x root/root usr/include/tirpc/rpcsvc/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libtirpc.a -rwxr-xr-x root/root usr/lib/libtirpc.la -lrwxrwxrwx root/root usr/lib/libtirpc.so -> libtirpc.so.1.0.10 -lrwxrwxrwx root/root usr/lib/libtirpc.so.1 -> libtirpc.so.1.0.10 --rwxr-xr-x root/root usr/lib/libtirpc.so.1.0.10 +lrwxrwxrwx root/root usr/lib/libtirpc.so -> libtirpc.so.3.0.0 +lrwxrwxrwx root/root usr/lib/libtirpc.so.3 -> libtirpc.so.3.0.0 +-rwxr-xr-x root/root usr/lib/libtirpc.so.3.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtirpc.pc drwxr-xr-x root/root usr/man/ diff --git a/libtirpc/.md5sum b/libtirpc/.md5sum index f1721775d..6ae7f1cba 100644 --- a/libtirpc/.md5sum +++ b/libtirpc/.md5sum @@ -1,2 +1 @@ -373d5ad46b1d19759ec763a9f0afcf4d libtirpc-0.3.2.tar.bz2 -5b974a1204defec51255b83a029bbb2b rpc_get_default_domain.patch +36ce1c0ff80863bb0839d54aa0b94014 libtirpc-1.0.1.tar.bz2 diff --git a/libtirpc/Pkgfile b/libtirpc/Pkgfile index ae03770d3..fbe130312 100644 --- a/libtirpc/Pkgfile +++ b/libtirpc/Pkgfile @@ -3,17 +3,13 @@ # URL: http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php name=libtirpc -version=0.3.2 -release=2 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2 - rpc_get_default_domain.patch) +version=1.0.1 +release=1 +source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.bz2) build() { cd $name-$version - patch -p1 -i $SRC/rpc_get_default_domain.patch - - autoreconf ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/man \ diff --git a/libtirpc/rpc_get_default_domain.patch b/libtirpc/rpc_get_default_domain.patch deleted file mode 100644 index dc0635b98..000000000 --- a/libtirpc/rpc_get_default_domain.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit f7f6d01a83d136c98acbc1d7f098da25097bd0b6 -Author: Armin K -Date: Thu Jun 18 11:59:18 2015 -0400 - - __rpc_get_default_domain is undefined with LDFLAGS=-Wl,--no-undefined - - commit 109ccb9fe removed the __rpc_get_default_domain() - interface which is not defined in the glibc. This - brings the interface back. - - Reviewed-by: Chuck Lever - Signed-off-by: Steve Dickson - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6cc567a..66fcc6c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -69,7 +69,7 @@ if GSS - endif - - libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rtime.c -+libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in -diff --git a/src/rpcdname.c b/src/rpcdname.c -new file mode 100644 -index 0000000..3e6a988 ---- /dev/null -+++ b/src/rpcdname.c -@@ -0,0 +1,72 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * rpcdname.c -+ * Gets the default domain name -+ */ -+ -+#include -+#include -+#include -+ -+static char *default_domain = 0; -+ -+static char * -+get_default_domain() -+{ -+ char temp[256]; -+ -+ if (default_domain) -+ return (default_domain); -+ if (getdomainname(temp, sizeof(temp)) < 0) -+ return (0); -+ if ((int) strlen(temp) > 0) { -+ default_domain = (char *)malloc((strlen(temp)+(unsigned)1)); -+ if (default_domain == 0) -+ return (0); -+ (void) strcpy(default_domain, temp); -+ return (default_domain); -+ } -+ return (0); -+} -+ -+/* -+ * This is a wrapper for the system call getdomainname which returns a -+ * ypclnt.h error code in the failure case. It also checks to see that -+ * the domain name is non-null, knowing that the null string is going to -+ * get rejected elsewhere in the NIS client package. -+ */ -+int -+__rpc_get_default_domain(domain) -+ char **domain; -+{ -+ if ((*domain = get_default_domain()) != 0) -+ return (0); -+ return (-1); -+}