diff --git a/001-tirpc-features.patch b/001-tirpc-features.patch index 55b6ef6..5708645 100644 --- a/001-tirpc-features.patch +++ b/001-tirpc-features.patch @@ -12,7 +12,7 @@ index b7814a3..fad274f 100644 *~ .stgitmail.txt diff --git a/Makefile.am b/Makefile.am -index 2bf725c..2bce3b0 100644 +index 466b6dd..665d328 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 @@ -29,113 +29,126 @@ index 2bf725c..2bce3b0 100644 tirpc/rpcsvc/crypt.h \ tirpc/rpc/xdr.h \ diff --git a/configure.ac b/configure.ac -index 711b054..290c635 100644 +index e3cb8af..7802304 100644 --- a/configure.ac +++ b/configure.ac -@@ -10,6 +10,7 @@ AC_ARG_ENABLE(gssapi, - AM_CONDITIONAL(GSS, test "x$enable_gssapi" = xyes) - - if test "x$enable_gssapi" = xyes; then -+ AC_DEFINE([HAVE_GSSAPI], [1], [Define to 1 if GSSAPI is enabled]) - GSSAPI_CFLAGS=`krb5-config --cflags gssapi` - GSSAPI_LIBS=`krb5-config --libs gssapi` - AC_SUBST([GSSAPI_CFLAGS]) -@@ -41,7 +42,7 @@ AC_ARG_ENABLE(symvers, +@@ -31,7 +31,7 @@ AC_ARG_ENABLE(authdes, + [],[enable_authdes=no]) + AM_CONDITIONAL(AUTHDES, test "x$enable_authdes" = xyes) + if test "x$enable_authdes" = xyes; then +- AC_DEFINE([HAVE_AUTHDES], [1], ++ AC_DEFINE([TIRPC_AUTHDES], [1], + [Define to 1 if DES authentication is enabled]) + CFLAG_AUTHDES="-DHAVE_AUTHDES=1" + AC_SUBST([CFLAG_AUTHDES]) +@@ -50,7 +50,7 @@ AC_ARG_ENABLE(symvers, + [],[enable_symvers=yes]) AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes) - AC_PROG_CC -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([config.h tirpc/tirpc-features.h]) AC_PROG_LIBTOOL AC_HEADER_DIRENT AC_PREFIX_DEFAULT(/usr) -diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c -index d95eae1..e0a5c6a 100644 ---- a/src/svc_auth_gss.c -+++ b/src/svc_auth_gss.c -@@ -34,8 +34,11 @@ - - */ - --#include -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - -+#include - #include - #include - #include -diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h -index 1dbb391..8f37454 100644 ---- a/tirpc/rpc/rpc.h -+++ b/tirpc/rpc/rpc.h -@@ -35,6 +35,8 @@ - #ifndef _TIRPC_RPC_H - #define _TIRPC_RPC_H +diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h +index f7fa16c..3e2d1cf 100644 +--- a/tirpc/rpc/auth.h ++++ b/tirpc/rpc/auth.h +@@ -51,6 +51,7 @@ + #include + #include +#include -+ - #include /* some typedefs */ - #include - #include -@@ -60,7 +62,7 @@ - #include /* protocol for des style cred */ - #endif /* HAVE_AUTHDES */ --#ifdef HAVE_RPCSEC_GSS -+#ifdef HAVE_GSSAPI - #include /* RPCSEC_GSS */ + #define MAX_AUTH_BYTES 400 + #define MAXNETNAMELEN 255 /* maximum length of network user's name */ +@@ -164,7 +165,7 @@ union des_block { + }; + typedef union des_block des_block; + +-#ifdef HAVE_AUTHDES ++#ifdef TIRPC_AUTHDES + #ifdef __cplusplus + extern "C" { + #endif +@@ -172,7 +173,7 @@ extern bool_t xdr_des_block(XDR *, des_block *); + #ifdef __cplusplus + } + #endif +-#endif /* HAVE_AUTHDES */ ++#endif /* TIRPC_AUTHDES */ + + /* + * Authentication info. Opaque to client. +@@ -320,7 +321,7 @@ extern AUTH *authnone_create(void); /* takes no parameters */ + } #endif -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index 44b38bf..dbd8cc9 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -41,6 +41,10 @@ - #ifndef _RPC_SVC_AUTH_H - #define _RPC_SVC_AUTH_H +-#ifdef HAVE_AUTHDES ++#ifdef TIRPC_AUTHDES + /* + * DES style authentication + * AUTH *authsecdes_create(servername, window, timehost, ckey) +@@ -338,7 +339,7 @@ extern AUTH *authdes_seccreate (const char *, const u_int, const char *, + #ifdef __cplusplus + } + #endif +-#endif /* HAVE_AUTHDES */ ++#endif /* TIRPC_AUTHDES */ + + #ifdef __cplusplus + extern "C" { +@@ -362,9 +363,9 @@ extern int host2netname(char *, const char *, const char *); + extern int user2netname(char *, const uid_t, const char *); + extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *); + extern int netname2host(char *, char *, const int); +-#ifdef HAVE_AUTHDES ++#ifdef TIRPC_AUTHDES + extern void passwd2des ( char *, char * ); +-#endif /* HAVE_AUTHDES */ ++#endif /* TIRPC_AUTHDES */ + #ifdef __cplusplus + } + #endif +diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h +index 392a7b9..7517264 100644 +--- a/tirpc/rpc/rpc.h ++++ b/tirpc/rpc/rpc.h +@@ -39,6 +39,8 @@ + #include + #include +#include + -+#ifdef HAVE_GSSAPI -+ - #include + /* external data representation interfaces */ + #include /* generic (de)serializer */ - typedef struct { -@@ -51,6 +55,8 @@ typedef struct { - u_int seq_num; - } svc_rpc_gss_parms_t; +@@ -52,13 +54,13 @@ + #include /* protocol for rpc messages */ + #include /* protocol for unix style cred */ -+#endif /* HAVE_GSSAPI */ -+ +-#ifdef HAVE_AUTHDES ++#ifdef TIRPC_AUTHDES /* - * Interface to server-side authentication flavors. + * Uncomment-out the next line if you are building the rpc library with + * DES Authentication (see the README file in the secure_rpc/ directory). */ -@@ -63,8 +69,10 @@ typedef struct SVCAUTH { - int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; -+#ifdef HAVE_GSSAPI - svc_rpc_gss_parms_t svc_gss_params; - rpc_gss_rawcred_t raw_cred; -+#endif - } SVCAUTH; + #include /* protocol for des style cred */ +-#endif /* HAVE_AUTHDES */ ++#endif /* TIRPC_AUTHDES */ - #define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ + /* Server side only remote procedure callee */ + #include /* service side authenticator */ diff --git a/tirpc/tirpc-features.h.in b/tirpc/tirpc-features.h.in new file mode 100644 -index 0000000..72e18bc +index 0000000..9bea966 --- /dev/null +++ b/tirpc/tirpc-features.h.in -@@ -0,0 +1,10 @@ +@@ -0,0 +1,7 @@ +#ifndef _TIRPC_FEATURES_H +#define _TIRPC_FEATURES_H + +/* Define to 1 if DES authentication is enabled */ -+#undef HAVE_AUTHDES -+ -+/* Define to 1 if GSSAPI is enabled */ -+#undef HAVE_GSSAPI ++#undef TIRPC_AUTHDES + +#endif /* _TIRPC_FEATURES_H */ diff --git a/002-old-automake.patch b/002-old-automake.patch index bb2ec2b..9c93f42 100644 --- a/002-old-automake.patch +++ b/002-old-automake.patch @@ -3,7 +3,7 @@ index 290c635..a6a202e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,4 @@ - AC_INIT(libtirpc, 0.3.0) + AC_INIT(libtirpc, 0.3.1) -AM_INIT_AUTOMAKE([silent-rules]) +AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) diff --git a/003-fix-gssapi.patch b/003-fix-gssapi.patch deleted file mode 100644 index a505d33..0000000 --- a/003-fix-gssapi.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/svc_auth_gss.c -+++ src/svc_auth_gss.c 2015/05/12 08:58:54 -@@ -919,13 +919,8 @@ - auth = rqst->rq_xprt->xp_auth; - gd = SVCAUTH_PRIVATE(auth); - -- if (rcred != NULL) { -- auth->raw_cred = gd->rcred; -- auth->raw_cred.service = _rpc_gss_svc_to_service(gd->sec.svc); -- (void)rpc_gss_num_to_qop(auth->raw_cred.mechanism, gd->sec.qop, -- &auth->raw_cred.qop); -- *rcred = &auth->raw_cred; -- } -+ if (rcred != NULL) -+ *rcred = &gd->rcred; - - if (ucred != NULL) { - _rpc_gss_fill_in_ucreds(gd); ---- tirpc/rpc/svc_auth.h -+++ tirpc/rpc/svc_auth.h 2015/05/12 08:59:06 -@@ -69,10 +69,6 @@ - int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; --#ifdef HAVE_GSSAPI -- svc_rpc_gss_parms_t svc_gss_params; -- rpc_gss_rawcred_t raw_cred; --#endif - } SVCAUTH; - - #define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ diff --git a/006-rework-features.diff b/006-rework-features.diff deleted file mode 100644 index 0149596..0000000 --- a/006-rework-features.diff +++ /dev/null @@ -1,169 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 290c635..5d11a69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,7 +10,7 @@ AC_ARG_ENABLE(gssapi, - AM_CONDITIONAL(GSS, test "x$enable_gssapi" = xyes) - - if test "x$enable_gssapi" = xyes; then -- AC_DEFINE([HAVE_GSSAPI], [1], [Define to 1 if GSSAPI is enabled]) -+ AC_DEFINE([TIRPC_GSSAPI], [1], [Define to 1 if GSSAPI is enabled]) - GSSAPI_CFLAGS=`krb5-config --cflags gssapi` - GSSAPI_LIBS=`krb5-config --libs gssapi` - AC_SUBST([GSSAPI_CFLAGS]) -@@ -22,7 +22,7 @@ AC_ARG_ENABLE(authdes, - [],[enable_authdes=no]) - AM_CONDITIONAL(AUTHDES, test "x$enable_authdes" = xyes) - if test "x$enable_authdes" = xyes; then -- AC_DEFINE([HAVE_AUTHDES], [1], -+ AC_DEFINE([TIRPC_AUTHDES], [1], - [Define to 1 if DES authentication is enabled]) - CFLAG_AUTHDES="-DHAVE_AUTHDES=1" - AC_SUBST([CFLAG_AUTHDES]) -diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h -index f7fa16c..6cf512a 100644 ---- a/tirpc/rpc/auth.h -+++ b/tirpc/rpc/auth.h -@@ -164,7 +164,7 @@ union des_block { - }; - typedef union des_block des_block; - --#ifdef HAVE_AUTHDES -+#ifdef TIRPC_AUTHDES - #ifdef __cplusplus - extern "C" { - #endif -@@ -172,7 +172,7 @@ extern bool_t xdr_des_block(XDR *, des_block *); - #ifdef __cplusplus - } - #endif --#endif /* HAVE_AUTHDES */ -+#endif /* TIRPC_AUTHDES */ - - /* - * Authentication info. Opaque to client. -@@ -320,7 +320,7 @@ extern AUTH *authnone_create(void); /* takes no parameters */ - } - #endif - --#ifdef HAVE_AUTHDES -+#ifdef TIRPC_AUTHDES - /* - * DES style authentication - * AUTH *authsecdes_create(servername, window, timehost, ckey) -@@ -338,7 +338,7 @@ extern AUTH *authdes_seccreate (const char *, const u_int, const char *, - #ifdef __cplusplus - } - #endif --#endif /* HAVE_AUTHDES */ -+#endif /* TIRPC_AUTHDES */ - - #ifdef __cplusplus - extern "C" { -@@ -362,9 +362,9 @@ extern int host2netname(char *, const char *, const char *); - extern int user2netname(char *, const uid_t, const char *); - extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *); - extern int netname2host(char *, char *, const int); --#ifdef HAVE_AUTHDES -+#ifdef TIRPC_AUTHDES - extern void passwd2des ( char *, char * ); --#endif /* HAVE_AUTHDES */ -+#endif /* TIRPC_AUTHDES */ - #ifdef __cplusplus - } - #endif -diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h -index 8f37454..942959a 100644 ---- a/tirpc/rpc/rpc.h -+++ b/tirpc/rpc/rpc.h -@@ -54,15 +54,15 @@ - #include /* protocol for rpc messages */ - #include /* protocol for unix style cred */ - --#ifdef HAVE_AUTHDES -+#ifdef TIRPC_AUTHDES - /* - * Uncomment-out the next line if you are building the rpc library with - * DES Authentication (see the README file in the secure_rpc/ directory). - */ - #include /* protocol for des style cred */ --#endif /* HAVE_AUTHDES */ -+#endif /* TIRPC_AUTHDES */ - --#ifdef HAVE_GSSAPI -+#ifdef TIRPC_GSSAPI - #include /* RPCSEC_GSS */ - #endif - -diff --git a/tirpc/rpc/rpcsec_gss.h b/tirpc/rpc/rpcsec_gss.h -index 217fc0d..da343ea 100644 ---- a/tirpc/rpc/rpcsec_gss.h -+++ b/tirpc/rpc/rpcsec_gss.h -@@ -35,8 +35,6 @@ - #include - #include - --#include -- - typedef enum { - rpcsec_gss_svc_default = 0, - rpcsec_gss_svc_none = 1, -@@ -44,6 +42,11 @@ typedef enum { - rpcsec_gss_svc_privacy = 3 - } rpc_gss_service_t; - -+#include -+ -+#ifdef TIRPC_GSSAPI -+#include -+ - typedef struct { - int len; - char name[1]; -@@ -129,4 +132,6 @@ bool_t rpc_gss_mech_to_oid(char *, rpc_gss_OID *); - bool_t rpc_gss_qop_to_num(char *, char *, u_int *); - __END_DECLS - -+#endif /* TIRPC_GSSAPI */ -+ - #endif /* !_TIRPC_RPCSEC_GSS_H */ -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index dbd8cc9..0fbee5d 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -41,10 +41,6 @@ - #ifndef _RPC_SVC_AUTH_H - #define _RPC_SVC_AUTH_H - --#include -- --#ifdef HAVE_GSSAPI -- - #include - - typedef struct { -@@ -55,8 +52,6 @@ typedef struct { - u_int seq_num; - } svc_rpc_gss_parms_t; - --#endif /* HAVE_GSSAPI */ -- - /* - * Interface to server-side authentication flavors. - */ -diff --git a/tirpc/tirpc-features.h.in b/tirpc/tirpc-features.h.in -index 72e18bc..39fa64e 100644 ---- a/tirpc/tirpc-features.h.in -+++ b/tirpc/tirpc-features.h.in -@@ -2,9 +2,9 @@ - #define _TIRPC_FEATURES_H - - /* Define to 1 if DES authentication is enabled */ --#undef HAVE_AUTHDES -+#undef TIRPC_AUTHDES - - /* Define to 1 if GSSAPI is enabled */ --#undef HAVE_GSSAPI -+#undef TIRPC_GSSAPI - - #endif /* _TIRPC_FEATURES_H */ diff --git a/libtirpc-0.3.0.tar.bz2 b/libtirpc-0.3.0.tar.bz2 deleted file mode 100644 index ce75a5e..0000000 --- a/libtirpc-0.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cafe59d561145b384bffd34d6614e9fe4c1d9157c30d2b6b022a0ef71de5a11d -size 479088 diff --git a/libtirpc-0.3.1.tar.bz2 b/libtirpc-0.3.1.tar.bz2 new file mode 100644 index 0000000..cc341a1 --- /dev/null +++ b/libtirpc-0.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8838fe180deb8a6f6e491ee665325a28dee4100ec6b1f0b86d611dbfe3a2bb8 +size 479721 diff --git a/libtirpc.changes b/libtirpc.changes index 4e25f78..71acbd9 100644 --- a/libtirpc.changes +++ b/libtirpc.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Mon Jun 1 17:06:29 CEST 2015 - kukuk@suse.de + +- Remove krb5-devel from -devel requires, not needed anymore + +------------------------------------------------------------------- +Mon Jun 1 14:44:05 CEST 2015 - kukuk@suse.de + +- Update to libtirpc 0.3.1, which incorporates the following + patches: + - 011-gssapi-update1.patch + - 012-gssapi-update2.patch + - 013-gssapi-update3.patch + - 014-gssapi-update4.patch + - 015-gssapi-update5.patch + - 016-gssapi-update6.patch + - 017-gssapi-update7.patch + - 018-gssapi-update8.patch + Not needed anymore: + - 007-fix-tirpc_map.patch + Adjusted: + - 001-tirpc-features.patch, merged with 006-rework-features.diff + - 002-old-automake.patch + +------------------------------------------------------------------- +Tue May 26 13:55:07 CEST 2015 - kukuk@suse.de + +- 007-fix-tirpc_map.patch: fix symbol version for new global names + +------------------------------------------------------------------- +Tue May 26 11:28:46 CEST 2015 - kukuk@suse.de + +- 006-rework-features.diff: Adjust for set of gssapi patches +- 003-fix-gssapi.patch replaced by 011-gssapi-update1.patch +- 012-gssapi-update2.patch: fix krb5-config usage +- 013-gssapi-update3.patch: check for gssapi.h +- 014-gssapi-update4.patch: don't include rpcsec_gss.h +- 015-gssapi-update5.patch: don't install GSSAPI files if disabled +- 016-gssapi-update6.patch: fix rpc_gss_seccreate +- 017-gssapi-update7.patch: officialy export two internal functions +- 018-gssapi-update8.patch: don't use glibc special header files + ------------------------------------------------------------------- Tue May 12 12:48:37 CEST 2015 - kukuk@suse.de @@ -99,7 +141,7 @@ Thu Apr 23 21:55:29 CEST 2015 - kukuk@suse.de - following patches are accepted upstream: - 003-rpc_broadcast_misformed_replies.patch - libtirpc-misc-segfaults.patch - - replace 001-symbol-versions-v2.patch with + - replace 001-symbol-versions-v2.patch with 001-symbol-versions-v3.patch - enable symbol versioning patch @@ -136,7 +178,7 @@ Mon Dec 15 14:47:58 CET 2014 - kukuk@suse.de - Adjust libtirpc-rpc_broadcast_misformed_replies.patch and rename to 003-rpc_broadcast_misformed_replies.patch - Rename libtirpc-getpmaphandle.patch to 004-getpmaphandle.patch -- Adjust libtirpc-bindresvport_blacklist.patch and rename to +- Adjust libtirpc-bindresvport_blacklist.patch and rename to 000-bindresvport_blacklist.patch - Drop libtirpc-pmap-setunset.patch, not needed anymore - Apply libtirpc-new-path-rpcbindsock.patch only on openSUSE 13.1 @@ -247,7 +289,7 @@ Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de ------------------------------------------------------------------- Wed Sep 29 15:42:12 UTC 2010 - max@novell.com -- Fix showmount -e hostname (bnc#633007). +- Fix showmount -e hostname (bnc#633007). ------------------------------------------------------------------- Wed Sep 15 14:38:57 UTC 2010 - max@novell.com @@ -263,7 +305,7 @@ Thu May 27 21:01:20 UTC 2010 - cristian.rodriguez@opensuse.org - Update to a current git snapshot, important fixes: * don't call abort() in the AUTH_UNIX creation codepaths * Support 64-bit bit mask operations in svc_getreqset() - * Automount with nis maps crashes and generates a core + * Automount with nis maps crashes and generates a core * memory leaks in rpcb_clnt.c:add_cache() and getclnthandle() ------------------------------------------------------------------- @@ -308,7 +350,7 @@ Wed Oct 1 12:32:45 CEST 2008 - mkoenig@suse.de * introduce __rpc_set_netbuf helper * kill map_ipv4_to_ipv6 * Fix xp_raddr handling in svc_fd_create etc - * fix for taddr2addr conversion bug of local addresses [bnc#426883] + * fix for taddr2addr conversion bug of local addresses [bnc#426883] ------------------------------------------------------------------- Tue Sep 2 18:49:16 CEST 2008 - mkoenig@suse.de @@ -352,4 +394,3 @@ Wed Mar 19 17:12:18 CET 2008 - mkoenig@suse.de - set shlib soname version initially to 1.0.7, keeping compatibility with RH - fix some compiling issues - diff --git a/libtirpc.spec b/libtirpc.spec index 5ac4e35..c7ea7c9 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -16,12 +16,12 @@ # -%define tarversion 0.3.0 +%define tarversion 0.3.1 Name: libtirpc # src/crypt_client.c tirpc/spinlock.h and tirpc/rpcsvc/crypt.x have the BSD # advertising clause -Version: 0.3.0 +Version: 0.3.1 Release: 0 Summary: Transport Independent RPC Library License: BSD-4-Clause @@ -42,10 +42,8 @@ Patch0: 000-bindresvport_blacklist.patch Patch1: 001-tirpc-features.patch # Patch2 is only needed for SLES11 Patch2: 002-old-automake.patch -Patch3: 003-fix-gssapi.patch Patch4: 004-netconfig-prefer-IPv6.patch Patch5: 005-no_IPv6_for_old_code.patch -Patch6: 006-rework-features.diff Patch25: patch6_7.diff # Patch37 is only needed on openSUSE >= 13.1, SLE >= 12 Patch37: libtirpc-new-path-rpcbindsock.patch @@ -74,7 +72,6 @@ TCP over IPv4 Summary: Transport Independent RPC Library Group: Development/Libraries/C and C++ Requires: glibc-devel -Requires: krb5-devel Requires: libtirpc1 = %{version} %description devel @@ -87,12 +84,10 @@ TCP over IPv4 %setup -q -n %name-%tarversion %patch0 -p0 %patch1 -p1 -%patch2 -p1 -%patch3 -p0 %patch4 -p1 %patch5 -p1 -%patch6 -p1 %patch25 -p1 +%patch2 -p1 %if 0%{suse_version} >= 1310 %patch37 -p1 %endif