diff --git a/libtirpc-0.2.4-rc1.patch b/libtirpc-0.2.4-rc1.patch deleted file mode 100644 index 89480a5..0000000 --- a/libtirpc-0.2.4-rc1.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 40dce96..4a4adba 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -5,15 +5,30 @@ AC_CONFIG_SRCDIR([src/auth_des.c]) - AC_CONFIG_MACRO_DIR([m4]) - - AC_ARG_ENABLE(gss,[ --enable-gss Turn on gss api], [case "${enableval}" in -- yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;; -+ yes) gss=true ;; - no) gss=false ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;; - esac],[gss=false]) - AM_CONDITIONAL(GSS, test x$gss = xtrue) -+AC_ARG_WITH(gssglue, -+ [ --with-gssglue Use libgssglue], -+ [case "${enableval}" in -+ yes) gssglue=true ;; -+ no) gssglue=false ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --with-gssglue) ;; -+ esac], -+ [gssglue=false]) -+AM_CONDITIONAL(USEGSSGLUE, test x$gssglue = xtrue) - if test x$gss = xtrue; then -- AC_DEFINE(HAVE_LIBGSSAPI, 1, []) -- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [], -- AC_MSG_ERROR([Unable to locate information required to use libgssglue.])) -+ if test x$gssglue = xtrue; then -+ PKG_CHECK_MODULES(GSSAPI, libgssglue, [], -+ AC_MSG_ERROR([Unable to locate information required to use libgssglue.])) -+ else -+ GSSAPI_CFLAGS=`krb5-config --cflags gssapi` -+ GSSAPI_LIBS=`krb5-config --libs gssapi` -+ AC_SUBST([GSSAPI_CFLAGS]) -+ AC_SUBST([GSSAPI_LIBS]) -+ fi - fi - AC_ARG_ENABLE(ipv6, - [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])], -diff --git a/src/Makefile.am b/src/Makefile.am -index 66350f5..2dd7768 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -58,8 +58,8 @@ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_ref - ## Secure-RPC - if GSS - libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c -- libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS) -- libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) -+ libtirpc_la_LDFLAGS += $(GSSAPI_LIBS) -+ libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) - endif - - ## libtirpc_a_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -diff --git a/src/auth_gss.c b/src/auth_gss.c -index 81ae8ae..703bc3f 100644 ---- a/src/auth_gss.c -+++ b/src/auth_gss.c -@@ -269,6 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd) - * send an RPCSEC_GSS_DESTROY request which might inappropriately - * destroy the context. - */ -+ gd->ctx = GSS_C_NO_CONTEXT; - gd->gc.gc_ctx.length = 0; - gd->gc.gc_ctx.value = NULL; - -@@ -284,7 +285,8 @@ authgss_free_private_data(struct authgss_private_data *pd) - if (!pd) - return (FALSE); - -- pd->pd_ctx = NULL; -+ if (pd->pd_ctx != GSS_C_NO_CONTEXT) -+ gss_delete_sec_context(&min_stat, &pd->pd_ctx, NULL); - gss_release_buffer(&min_stat, &pd->pd_ctx_hndl); - memset(&pd->pd_ctx_hndl, 0, sizeof(pd->pd_ctx_hndl)); - pd->pd_seq_win = 0; -diff --git a/src/svc_dg.c b/src/svc_dg.c -index b1ac462..6e00191 100644 ---- a/src/svc_dg.c -+++ b/src/svc_dg.c -@@ -284,7 +284,6 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) - { - if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), - xdr_args, args_ptr)) { -- (void)svc_freeargs(xprt, xdr_args, args_ptr); - return FALSE; - } - return TRUE; diff --git a/libtirpc-0.2.4-rc3.patch b/libtirpc-0.2.4-rc3.patch new file mode 100644 index 0000000..bed768e --- /dev/null +++ b/libtirpc-0.2.4-rc3.patch @@ -0,0 +1,838 @@ +diff -up libtirpc-0.2.3/autogen.sh.orig libtirpc-0.2.3/autogen.sh +--- libtirpc-0.2.3/autogen.sh.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/autogen.sh 2013-11-25 15:26:11.377054660 -0500 +@@ -37,6 +37,6 @@ fi + + aclocal + libtoolize --force --copy +-autoheader ++#autoheader + automake --add-missing --copy --gnu # -Wall + autoconf # -Wall +diff -up libtirpc-0.2.3/configure.ac.orig libtirpc-0.2.3/configure.ac +--- libtirpc-0.2.3/configure.ac.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/configure.ac 2013-11-25 15:26:11.378054666 -0500 +@@ -1,19 +1,34 @@ + AC_INIT(libtirpc, 0.2.3) +-AM_INIT_AUTOMAKE(libtirpc, 0.2.3) ++AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR([src/auth_des.c]) + AC_CONFIG_MACRO_DIR([m4]) + + AC_ARG_ENABLE(gss,[ --enable-gss Turn on gss api], [case "${enableval}" in +- yes) gss=true ; AC_CHECK_LIB([gssapi],[gss_init_sec_context]) ;; ++ yes) gss=true ;; + no) gss=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-gss) ;; + esac],[gss=false]) + AM_CONDITIONAL(GSS, test x$gss = xtrue) ++AC_ARG_WITH(gssglue, ++ [ --with-gssglue Use libgssglue], ++ [case "${enableval}" in ++ yes) gssglue=true ;; ++ no) gssglue=false ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --with-gssglue) ;; ++ esac], ++ [gssglue=false]) ++AM_CONDITIONAL(USEGSSGLUE, test x$gssglue = xtrue) + if test x$gss = xtrue; then +- AC_DEFINE(HAVE_LIBGSSAPI, 1, []) +- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [], +- AC_MSG_ERROR([Unable to locate information required to use libgssglue.])) ++ if test x$gssglue = xtrue; then ++ PKG_CHECK_MODULES(GSSAPI, libgssglue, [], ++ AC_MSG_ERROR([Unable to locate information required to use libgssglue.])) ++ else ++ GSSAPI_CFLAGS=`krb5-config --cflags gssapi` ++ GSSAPI_LIBS=`krb5-config --libs gssapi` ++ AC_SUBST([GSSAPI_CFLAGS]) ++ AC_SUBST([GSSAPI_LIBS]) ++ fi + fi + AC_ARG_ENABLE(ipv6, + [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])], +@@ -24,7 +39,7 @@ if test "x$enable_ipv6" != xno; then + fi + + AC_PROG_CC +-AM_CONFIG_HEADER(config.h) ++m4_pattern_allow(AM_CONFIG_HEADERS(config.h)) + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) +diff -up libtirpc-0.2.3/INSTALL.orig libtirpc-0.2.3/INSTALL +--- libtirpc-0.2.3/INSTALL.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/INSTALL 2013-06-17 05:16:35.000000000 -0400 +@@ -1,35 +1,25 @@ +-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +-Foundation, Inc. ++Installation Instructions ++************************* + +- This file is free documentation; the Free Software Foundation gives +-unlimited permission to copy, distribute and modify it. +- +- +-TI-RPC Library Quick Installation +-================================= +- +- Without GSS API +- +-$ ./configure +-$ make +-# make install +- +- To enable utilization of RPCSEC via GSS API use following commands +-but you need to install libgssapi from the CITI before +- +-$ ./configure --enable-gss +-$ make +-# make install +- +- Once installed, you can customize the /etc/netconfig configuration file +-to configure the supported protocols. To support INET6 udp/tcp, uncomment +-the udp6/tcp6 lines. ++Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, ++Inc. + ++ Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. This file is offered as-is, ++without warranty of any kind. + + Basic Installation + ================== + +- These are generic installation instructions. ++ Briefly, the shell commands `./configure; make; make install' should ++configure, build, and install this package. The following ++more-detailed instructions are generic; see the `README' file for ++instructions specific to this package. Some packages provide this ++`INSTALL' file but do not implement all of the features documented ++below. The lack of an optional feature in a given package is not ++necessarily a bug. More recommendations for GNU packages can be found ++in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for + various system-dependent variables used during compilation. It uses +@@ -42,9 +32,9 @@ debugging `configure'). + + It can also use an optional file (typically called `config.cache' + and enabled with `--cache-file=config.cache' or simply `-C') that saves +-the results of its tests to speed up reconfiguring. (Caching is ++the results of its tests to speed up reconfiguring. Caching is + disabled by default to prevent problems with accidental use of stale +-cache files.) ++cache files. + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail +@@ -54,30 +44,37 @@ some point `config.cache' contains resul + may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +-`configure' by a program called `autoconf'. You only need +-`configure.ac' if you want to change it or regenerate `configure' using +-a newer version of `autoconf'. ++`configure' by a program called `autoconf'. You need `configure.ac' if ++you want to change it or regenerate `configure' using a newer version ++of `autoconf'. + +-The simplest way to compile this package is: ++ The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type +- `./configure' to configure the package for your system. If you're +- using `csh' on an old version of System V, you might need to type +- `sh ./configure' instead to prevent `csh' from trying to execute +- `configure' itself. ++ `./configure' to configure the package for your system. + +- Running `configure' takes awhile. While running, it prints some +- messages telling which features it is checking for. ++ Running `configure' might take a while. While running, it prints ++ some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with +- the package. ++ the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and +- documentation. ++ documentation. When installing into a prefix owned by root, it is ++ recommended that the package be configured and built as a regular ++ user, and only the `make install' phase executed with root ++ privileges. ++ ++ 5. Optionally, type `make installcheck' to repeat any self-tests, but ++ this time using the binaries in their final installed location. ++ This target does not install anything. Running this target as a ++ regular user, particularly if the prior `make install' required ++ root privileges, verifies that the installation completed ++ correctly. + +- 5. You can remove the program binaries and object files from the ++ 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is +@@ -86,6 +83,16 @@ The simplest way to compile this package + all sorts of other programs in order to regenerate files that came + with the distribution. + ++ 7. Often, you can also type `make uninstall' to remove the installed ++ files again. In practice, not all packages have tested that ++ uninstallation works correctly, even though it is required by the ++ GNU Coding Standards. ++ ++ 8. Some packages, particularly those that use Automake, provide `make ++ distcheck', which can by used by developers to test that all other ++ targets like `make install' and `make uninstall' work correctly. ++ This target is generally not run by end users. ++ + Compilers and Options + ===================== + +@@ -97,7 +104,7 @@ for details on some of the pertinent env + by setting variables in the command line or in the environment. Here + is an example: + +- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +@@ -106,44 +113,89 @@ Compiling For Multiple Architectures + + You can compile the package for more than one kind of computer at the + same time, by placing the object files for each architecture in their +-own directory. To do this, you must use a version of `make' that +-supports the `VPATH' variable, such as GNU `make'. `cd' to the ++own directory. To do this, you can use GNU `make'. `cd' to the + directory where you want the object files and executables to go and run + the `configure' script. `configure' automatically checks for the +-source code in the directory that `configure' is in and in `..'. ++source code in the directory that `configure' is in and in `..'. This ++is known as a "VPATH" build. + +- If you have to use a `make' that does not support the `VPATH' +-variable, you have to compile the package for one architecture at a +-time in the source code directory. After you have installed the +-package for one architecture, use `make distclean' before reconfiguring +-for another architecture. ++ With a non-GNU `make', it is safer to compile the package for one ++architecture at a time in the source code directory. After you have ++installed the package for one architecture, use `make distclean' before ++reconfiguring for another architecture. ++ ++ On MacOS X 10.5 and later systems, you can create libraries and ++executables that work on multiple system types--known as "fat" or ++"universal" binaries--by specifying multiple `-arch' options to the ++compiler but only a single `-arch' option to the preprocessor. Like ++this: ++ ++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ ++ CPP="gcc -E" CXXCPP="g++ -E" ++ ++ This is not guaranteed to produce working output in all cases, you ++may have to build one architecture at a time and combine the results ++using the `lipo' tool if you have problems. + + Installation Names + ================== + +- By default, `make install' will install the package's files in +-`/usr/local/bin', `/usr/local/man', etc. You can specify an +-installation prefix other than `/usr/local' by giving `configure' the +-option `--prefix=PATH'. ++ By default, `make install' installs the package's commands under ++`/usr/local/bin', include files under `/usr/local/include', etc. You ++can specify an installation prefix other than `/usr/local' by giving ++`configure' the option `--prefix=PREFIX', where PREFIX must be an ++absolute file name. + + You can specify separate installation prefixes for + architecture-specific files and architecture-independent files. If you +-give `configure' the option `--exec-prefix=PATH', the package will use +-PATH as the prefix for installing programs and libraries. +-Documentation and other data files will still use the regular prefix. ++pass the option `--exec-prefix=PREFIX' to `configure', the package uses ++PREFIX as the prefix for installing programs and libraries. ++Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +-options like `--bindir=PATH' to specify different values for particular ++options like `--bindir=DIR' to specify different values for particular + kinds of files. Run `configure --help' for a list of the directories +-you can set and what kinds of files go in them. ++you can set and what kinds of files go in them. In general, the ++default for these options is expressed in terms of `${prefix}', so that ++specifying just `--prefix' will affect all of the other directory ++specifications that were not explicitly provided. ++ ++ The most portable way to affect installation locations is to pass the ++correct locations to `configure'; however, many packages provide one or ++both of the following shortcuts of passing variable assignments to the ++`make install' command line to change installation locations without ++having to reconfigure or recompile. ++ ++ The first method involves providing an override variable for each ++affected directory. For example, `make install ++prefix=/alternate/directory' will choose an alternate location for all ++directory configuration variables that were expressed in terms of ++`${prefix}'. Any directories that were specified during `configure', ++but not in terms of `${prefix}', must each be overridden at install ++time for the entire installation to be relocated. The approach of ++makefile variable overrides for each directory variable is required by ++the GNU Coding Standards, and ideally causes no recompilation. ++However, some platforms have known limitations with the semantics of ++shared libraries that end up requiring recompilation when using this ++method, particularly noticeable in packages that use GNU Libtool. ++ ++ The second method involves providing the `DESTDIR' variable. For ++example, `make install DESTDIR=/alternate/directory' will prepend ++`/alternate/directory' before all installation names. The approach of ++`DESTDIR' overrides is not required by the GNU Coding Standards, and ++does not work on platforms that have drive letters. On the other hand, ++it does better at avoiding recompilation issues, and works well even ++when some directory options were not specified in terms of `${prefix}' ++at `configure' time. ++ ++Optional Features ++================= + + If the package supports it, you can cause programs to be installed + with an extra prefix or suffix on their names by giving `configure' the + option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +-Optional Features +-================= +- + Some packages pay attention to `--enable-FEATURE' options to + `configure', where FEATURE indicates an optional part of the package. + They may also pay attention to `--with-PACKAGE' options, where PACKAGE +@@ -156,6 +208,50 @@ find the X include and library files aut + you can use the `configure' options `--x-includes=DIR' and + `--x-libraries=DIR' to specify their locations. + ++ Some packages offer the ability to configure how verbose the ++execution of `make' will be. For these packages, running `./configure ++--enable-silent-rules' sets the default to minimal output, which can be ++overridden with `make V=1'; while running `./configure ++--disable-silent-rules' sets the default to verbose, which can be ++overridden with `make V=0'. ++ ++Particular systems ++================== ++ ++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU ++CC is not installed, it is recommended to use the following options in ++order to use an ANSI C compiler: ++ ++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" ++ ++and if that doesn't work, install pre-built binaries of GCC for HP-UX. ++ ++ HP-UX `make' updates targets which have the same time stamps as ++their prerequisites, which makes it generally unusable when shipped ++generated files such as `configure' are involved. Use GNU `make' ++instead. ++ ++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot ++parse its `' header file. The option `-nodtk' can be used as ++a workaround. If GNU CC is not installed, it is therefore recommended ++to try ++ ++ ./configure CC="cc" ++ ++and if that doesn't work, try ++ ++ ./configure CC="cc -nodtk" ++ ++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This ++directory contains several dysfunctional programs; working variants of ++these programs are available in `/usr/bin'. So, if you need `/usr/ucb' ++in your `PATH', put it _after_ `/usr/bin'. ++ ++ On Haiku, software installed for all users goes in `/boot/common', ++not `/usr/local'. It is recommended to use the following options: ++ ++ ./configure --prefix=/boot/common ++ + Specifying the System Type + ========================== + +@@ -171,14 +267,15 @@ type, such as `sun4', or a canonical nam + + where SYSTEM can have one of these forms: + +- OS KERNEL-OS ++ OS ++ KERNEL-OS + + See the file `config.sub' for the possible values of each field. If + `config.sub' isn't included in this package, then this package doesn't + need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +-use the `--target=TYPE' option to select the type of system they will ++use the option `--target=TYPE' to select the type of system they will + produce code for. + + If you want to _use_ a cross compiler, that generates code for a +@@ -208,9 +305,15 @@ them in the `configure' command line, us + + ./configure CC=/usr/local2/bin/gcc + +-will cause the specified gcc to be used as the C compiler (unless it is ++causes the specified `gcc' to be used as the C compiler (unless it is + overridden in the site shell script). + ++Unfortunately, this technique does not work for `CONFIG_SHELL' due to ++an Autoconf limitation. Until the limitation is lifted, you can use ++this workaround: ++ ++ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash ++ + `configure' Invocation + ====================== + +@@ -219,7 +322,14 @@ operates. + + `--help' + `-h' +- Print a summary of the options to `configure', and exit. ++ Print a summary of all of the options to `configure', and exit. ++ ++`--help=short' ++`--help=recursive' ++ Print a summary of the options unique to this package's ++ `configure', and exit. The `short' variant lists options used ++ only in the top level, while the `recursive' variant lists options ++ also present in any nested packages. + + `--version' + `-V' +@@ -246,6 +356,15 @@ operates. + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + ++`--prefix=DIR' ++ Use DIR as the installation prefix. *note Installation Names:: ++ for more details, including other options available for fine-tuning ++ the installation locations. ++ ++`--no-create' ++`-n' ++ Run the configure checks, but stop before creating any output ++ files. ++ + `configure' also accepts some other, not widely useful, options. Run + `configure --help' for more details. +- +diff -up libtirpc-0.2.3/src/auth_gss.c.orig libtirpc-0.2.3/src/auth_gss.c +--- libtirpc-0.2.3/src/auth_gss.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/auth_gss.c 2013-11-25 15:26:11.378054666 -0500 +@@ -269,6 +269,7 @@ authgss_get_private_data(AUTH *auth, str + * send an RPCSEC_GSS_DESTROY request which might inappropriately + * destroy the context. + */ ++ gd->ctx = GSS_C_NO_CONTEXT; + gd->gc.gc_ctx.length = 0; + gd->gc.gc_ctx.value = NULL; + +@@ -284,7 +285,8 @@ authgss_free_private_data(struct authgss + if (!pd) + return (FALSE); + +- pd->pd_ctx = NULL; ++ if (pd->pd_ctx != GSS_C_NO_CONTEXT) ++ gss_delete_sec_context(&min_stat, &pd->pd_ctx, NULL); + gss_release_buffer(&min_stat, &pd->pd_ctx_hndl); + memset(&pd->pd_ctx_hndl, 0, sizeof(pd->pd_ctx_hndl)); + pd->pd_seq_win = 0; +diff -up libtirpc-0.2.3/src/bindresvport.c.orig libtirpc-0.2.3/src/bindresvport.c +--- libtirpc-0.2.3/src/bindresvport.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/bindresvport.c 2013-11-25 15:26:11.378054666 -0500 +@@ -46,6 +46,9 @@ + #include + + #include ++#include ++ ++extern pthread_mutex_t port_lock; + + /* + * Bind a socket to a privileged IP port +@@ -80,16 +83,21 @@ bindresvport_sa(sd, sa) + static u_int16_t port; + static short startport = STARTPORT; + socklen_t salen; +- int nports = ENDPORT - startport + 1; ++ int nports; + int endport = ENDPORT; + int i; + ++ mutex_lock(&port_lock); ++ nports = ENDPORT - startport + 1; ++ + if (sa == NULL) { + salen = sizeof(myaddr); + sa = (struct sockaddr *)&myaddr; + +- if (getsockname(sd, (struct sockaddr *)&myaddr, &salen) == -1) +- return -1; /* errno is correctly set */ ++ if (getsockname(sd, (struct sockaddr *)&myaddr, &salen) == -1) { ++ mutex_unlock(&port_lock); ++ return -1; /* errno is correctly set */ ++ } + + af = myaddr.ss_family; + } else +@@ -112,6 +120,7 @@ bindresvport_sa(sd, sa) + #endif + default: + errno = EPFNOSUPPORT; ++ mutex_unlock(&port_lock); + return (-1); + } + sa->sa_family = af; +@@ -137,6 +146,8 @@ bindresvport_sa(sd, sa) + port = LOWPORT + port % (STARTPORT - LOWPORT); + goto again; + } ++ mutex_unlock(&port_lock); ++ + return (res); + } + #else +diff -up libtirpc-0.2.3/src/clnt_vc.c.orig libtirpc-0.2.3/src/clnt_vc.c +--- libtirpc-0.2.3/src/clnt_vc.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/clnt_vc.c 2013-11-25 15:26:11.378054666 -0500 +@@ -133,6 +133,7 @@ struct ct_data { + * should be the first thing fixed. One step at a time. + */ + static int *vc_fd_locks; ++extern pthread_mutex_t disrupt_lock; + extern mutex_t clnt_fd_lock; + static cond_t *vc_cv; + #define release_fd_lock(fd, mask) { \ +@@ -179,8 +180,10 @@ clnt_vc_create(fd, raddr, prog, vers, se + socklen_t slen; + struct __rpc_sockinfo si; + ++ mutex_lock(&disrupt_lock); + if (disrupt == 0) + disrupt = (u_int32_t)(long)raddr; ++ mutex_unlock(&disrupt_lock); + + cl = (CLIENT *)mem_alloc(sizeof (*cl)); + ct = (struct ct_data *)mem_alloc(sizeof (*ct)); +@@ -270,7 +273,9 @@ clnt_vc_create(fd, raddr, prog, vers, se + * Initialize call message + */ + (void)gettimeofday(&now, NULL); ++ mutex_lock(&disrupt_lock); + call_msg.rm_xid = ((u_int32_t)++disrupt) ^ __RPC_GETXID(&now); ++ mutex_unlock(&disrupt_lock); + call_msg.rm_direction = CALL; + call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; + call_msg.rm_call.cb_prog = (u_int32_t)prog; +@@ -505,7 +510,7 @@ clnt_vc_control(cl, request, info) + sigset_t newmask; + int rpc_lock_value; + u_int32_t tmp; +- u_long ltmp; ++ u_int32_t ltmp; + + assert(cl != NULL); + +diff -up libtirpc-0.2.3/src/getnetconfig.c.orig libtirpc-0.2.3/src/getnetconfig.c +--- libtirpc-0.2.3/src/getnetconfig.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/getnetconfig.c 2013-11-25 15:26:11.379054666 -0500 +@@ -120,6 +120,7 @@ static struct netconfig *dup_ncp(struct + + static FILE *nc_file; /* for netconfig db */ + static struct netconfig_info ni = { 0, 0, NULL, NULL}; ++extern pthread_mutex_t nc_db_lock; + + #define MAXNETCONFIGLINE 1000 + +@@ -146,7 +147,8 @@ __nc_error() + return (&nc_error); + } + if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) { +- nc_addr = (int *)malloc(sizeof (int)); ++ if((nc_addr = (int *)malloc(sizeof (int))) == NULL) ++ return (&nc_error); + if (thr_setspecific(nc_key, (void *) nc_addr) != 0) { + if (nc_addr) + free(nc_addr); +@@ -191,14 +193,17 @@ setnetconfig() + * For multiple calls, i.e. nc_file is not NULL, we just return the + * handle without reopening the netconfig db. + */ ++ mutex_lock(&nc_db_lock); + ni.ref++; + if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "r")) != NULL) { + nc_vars->valid = NC_VALID; + nc_vars->flag = 0; + nc_vars->nc_configs = ni.head; ++ mutex_unlock(&nc_db_lock); + return ((void *)nc_vars); + } + ni.ref--; ++ mutex_unlock(&nc_db_lock); + nc_error = NC_NONETCONFIG; + free(nc_vars); + return (NULL); +@@ -221,12 +226,15 @@ void *handlep; + char *stringp; /* tmp string pointer */ + struct netconfig_list *list; + struct netconfig *np; ++ struct netconfig *result; + + /* + * Verify that handle is valid + */ ++ mutex_lock(&nc_db_lock); + if (ncp == NULL || nc_file == NULL) { + nc_error = NC_NOTINIT; ++ mutex_unlock(&nc_db_lock); + return (NULL); + } + +@@ -243,11 +251,14 @@ void *handlep; + if (ncp->flag == 0) { /* first time */ + ncp->flag = 1; + ncp->nc_configs = ni.head; +- if (ncp->nc_configs != NULL) /* entry already exist */ ++ if (ncp->nc_configs != NULL) /* entry already exist */ { ++ mutex_unlock(&nc_db_lock); + return(ncp->nc_configs->ncp); ++ } + } + else if (ncp->nc_configs != NULL && ncp->nc_configs->next != NULL) { + ncp->nc_configs = ncp->nc_configs->next; ++ mutex_unlock(&nc_db_lock); + return(ncp->nc_configs->ncp); + } + +@@ -255,16 +266,22 @@ void *handlep; + * If we cannot find the entry in the list and is end of file, + * we give up. + */ +- if (ni.eof == 1) return(NULL); ++ if (ni.eof == 1) { ++ mutex_unlock(&nc_db_lock); ++ return(NULL); ++ } + break; + default: + nc_error = NC_NOTINIT; ++ mutex_unlock(&nc_db_lock); + return (NULL); + } + + stringp = (char *) malloc(MAXNETCONFIGLINE); +- if (stringp == NULL) +- return (NULL); ++ if (stringp == NULL) { ++ mutex_unlock(&nc_db_lock); ++ return (NULL); ++ } + + #ifdef MEM_CHK + if (malloc_verify() == 0) { +@@ -280,6 +297,7 @@ void *handlep; + if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) { + free(stringp); + ni.eof = 1; ++ mutex_unlock(&nc_db_lock); + return (NULL); + } + } while (*stringp == '#'); +@@ -287,12 +305,14 @@ void *handlep; + list = (struct netconfig_list *) malloc(sizeof (struct netconfig_list)); + if (list == NULL) { + free(stringp); ++ mutex_unlock(&nc_db_lock); + return(NULL); + } + np = (struct netconfig *) malloc(sizeof (struct netconfig)); + if (np == NULL) { + free(stringp); +- free(list); ++ free(list); ++ mutex_unlock(&nc_db_lock); + return(NULL); + } + list->ncp = np; +@@ -303,6 +323,7 @@ void *handlep; + free(stringp); + free(np); + free(list); ++ mutex_unlock(&nc_db_lock); + return (NULL); + } + else { +@@ -320,7 +341,9 @@ void *handlep; + ni.tail = ni.tail->next; + } + ncp->nc_configs = ni.tail; +- return(ni.tail->ncp); ++ result = ni.tail->ncp; ++ mutex_unlock(&nc_db_lock); ++ return result; + } + } + +@@ -354,8 +377,10 @@ void *handlep; + nc_handlep->valid = NC_INVALID; + nc_handlep->flag = 0; + nc_handlep->nc_configs = NULL; ++ mutex_lock(&nc_db_lock); + if (--ni.ref > 0) { +- free(nc_handlep); ++ mutex_unlock(&nc_db_lock); ++ free(nc_handlep); + return(0); + } + +@@ -376,9 +401,11 @@ void *handlep; + q = p; + } + free(nc_handlep); +- +- fclose(nc_file); ++ if(nc_file != NULL) { ++ fclose(nc_file); ++ } + nc_file = NULL; ++ mutex_unlock(&nc_db_lock); + return (0); + } + +@@ -426,16 +453,21 @@ getnetconfigent(netid) + * If all the netconfig db has been read and placed into the list and + * there is no match for the netid, return NULL. + */ ++ mutex_lock(&nc_db_lock); + if (ni.head != NULL) { + for (list = ni.head; list; list = list->next) { + if (strcmp(list->ncp->nc_netid, netid) == 0) { +- return(dup_ncp(list->ncp)); ++ ncp = dup_ncp(list->ncp); ++ mutex_unlock(&nc_db_lock); ++ return ncp; + } + } +- if (ni.eof == 1) /* that's all the entries */ +- return(NULL); ++ if (ni.eof == 1) { /* that's all the entries */ ++ mutex_unlock(&nc_db_lock); ++ return(NULL); ++ } + } +- ++ mutex_unlock(&nc_db_lock); + + if ((file = fopen(NETCONFIG, "r")) == NULL) { + nc_error = NC_NONETCONFIG; +diff -up libtirpc-0.2.3/src/Makefile.am.orig libtirpc-0.2.3/src/Makefile.am +--- libtirpc-0.2.3/src/Makefile.am.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/Makefile.am 2013-11-25 15:26:11.378054666 -0500 +@@ -6,7 +6,7 @@ + ## anything like that. + + +-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ ++AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \ + -D_GNU_SOURCE -Wall -pipe + + lib_LTLIBRARIES = libtirpc.la +@@ -58,8 +58,8 @@ libtirpc_la_SOURCES += xdr.c xdr_rec.c x + ## Secure-RPC + if GSS + libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c +- libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS) +- libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) ++ libtirpc_la_LDFLAGS += $(GSSAPI_LIBS) ++ libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) + endif + + ## libtirpc_a_SOURCES += key_call.c key_prot_xdr.c getpublickey.c +diff -up libtirpc-0.2.3/src/mt_misc.c.orig libtirpc-0.2.3/src/mt_misc.c +--- libtirpc-0.2.3/src/mt_misc.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/mt_misc.c 2013-11-25 15:26:11.379054666 -0500 +@@ -91,6 +91,15 @@ pthread_mutex_t xprtlist_lock = PTHREAD_ + /* serializes calls to public key routines */ + pthread_mutex_t serialize_pkey = PTHREAD_MUTEX_INITIALIZER; + ++/* protects global variables ni and nc_file (getnetconfig.c) */ ++pthread_mutex_t nc_db_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++/* protects static port and startport (bindresvport.c) */ ++pthread_mutex_t port_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++/* protects static disrupt (clnt_vc.c) */ ++pthread_mutex_t disrupt_lock = PTHREAD_MUTEX_INITIALIZER; ++ + #undef rpc_createerr + + struct rpc_createerr rpc_createerr; +diff -up libtirpc-0.2.3/src/svc_dg.c.orig libtirpc-0.2.3/src/svc_dg.c +--- libtirpc-0.2.3/src/svc_dg.c.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/src/svc_dg.c 2013-11-25 15:26:11.379054666 -0500 +@@ -284,7 +284,6 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) + { + if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), + xdr_args, args_ptr)) { +- (void)svc_freeargs(xprt, xdr_args, args_ptr); + return FALSE; + } + return TRUE; +diff -up libtirpc-0.2.3/tirpc/rpc/auth.h.orig libtirpc-0.2.3/tirpc/rpc/auth.h +--- libtirpc-0.2.3/tirpc/rpc/auth.h.orig 2013-02-13 10:13:59.000000000 -0500 ++++ libtirpc-0.2.3/tirpc/rpc/auth.h 2013-11-25 15:26:11.380054663 -0500 +@@ -51,7 +51,6 @@ + #include + #include + #include +-#include + + + #define MAX_AUTH_BYTES 400 +@@ -249,19 +248,11 @@ auth_put(AUTH *auth) + #define auth_refresh(auth, msg) \ + ((*((auth)->ah_ops->ah_refresh))(auth, msg)) + +-#if defined(__GNUC__) && defined(DEBUG) +-#define auth_log_debug(fmt,args...) printf(stderr, fmt, args) +-#else +-#define auth_log_debug(fmt,args...) +-#endif +- + #define AUTH_DESTROY(auth) \ + do { \ + int refs; \ + if ((refs = auth_put((auth))) == 0) \ + ((*((auth)->ah_ops->ah_destroy))(auth));\ +- auth_log_debug("%s: auth_put(), refs %d\n", \ +- __func__, refs); \ + } while (0) + + #define auth_destroy(auth) \ +@@ -269,8 +260,6 @@ auth_put(AUTH *auth) + int refs; \ + if ((refs = auth_put((auth))) == 0) \ + ((*((auth)->ah_ops->ah_destroy))(auth));\ +- auth_log_debug("%s: auth_put(), refs %d\n", \ +- __func__, refs); \ + } while (0) + + #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ diff --git a/libtirpc.spec b/libtirpc.spec index c15f1c9..b2ed510 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -2,7 +2,7 @@ Name: libtirpc Version: 0.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: SISSL and BSD @@ -11,7 +11,7 @@ URL: http://nfsv4.bullopensource.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2 -Patch001: libtirpc-0.2.4-rc2.patch +Patch001: libtirpc-0.2.4-rc3.patch BuildRequires: automake, autoconf, libtool, pkgconfig BuildRequires: krb5-devel @@ -131,6 +131,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* Mon Nov 25 2013 Steve Dickson 0.2.3-5 +- Update to latest RC release: libtirpc-0-2-4-rc3 (bz 1034438) + * Sat Aug 03 2013 Fedora Release Engineering - 0.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild