libtirpc: 0.3.2 -> 1.0.1
This commit is contained in:
parent
0f516115a4
commit
ca4e0a483e
@ -1,19 +1,16 @@
|
|||||||
{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
|
{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libtirpc-0.3.2";
|
name = "libtirpc-1.0.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
|
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
|
||||||
sha256 = "1z1z8xnlqgqznxzmyc6sypjc6b220xkv0s55hxd5sb3zydws6210";
|
sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
propagatedBuildInputs = [ libkrb5 ];
|
propagatedBuildInputs = [ libkrb5 ];
|
||||||
|
|
||||||
# http://sourceforge.net/p/libtirpc/mailman/libtirpc-devel/thread/5581CB06.5020604%40email.com/#msg34216933
|
|
||||||
patches = [ ./fix_missing_rpc_get_default_domain.patch ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
|
sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h
|
||||||
'';
|
'';
|
||||||
|
@ -1,88 +0,0 @@
|
|||||||
diff -rNu3 libtirpc-0.3.2-old/src/Makefile.am libtirpc-0.3.2/src/Makefile.am
|
|
||||||
--- libtirpc-0.3.2-old/src/Makefile.am 2015-07-28 15:17:49.248168000 +0300
|
|
||||||
+++ libtirpc-0.3.2/src/Makefile.am 2015-07-28 15:18:04.870144456 +0300
|
|
||||||
@@ -69,7 +69,7 @@
|
|
||||||
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 -rNu3 libtirpc-0.3.2-old/src/rpcdname.c libtirpc-0.3.2/src/rpcdname.c
|
|
||||||
--- libtirpc-0.3.2-old/src/rpcdname.c 1970-01-01 03:00:00.000000000 +0300
|
|
||||||
+++ libtirpc-0.3.2/src/rpcdname.c 2015-07-28 15:18:04.870144456 +0300
|
|
||||||
@@ -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 <stdlib.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
+#include <string.h>
|
|
||||||
+
|
|
||||||
+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);
|
|
||||||
+}
|
|
Loading…
x
Reference in New Issue
Block a user