rpm/libtirpc
SHA256
1
0
Fork 0
forked from pool/libtirpc
Code Pull Requests Activity

Accepting request 305881 from home:kukuk:NIS

Browse Source 
- 001-tirpc-features.patch: update with official git version
- 002-old-automake.patch: re-add for SLES11
- 003-fix-gssapi.patch: try to fix the disable-gssapi option correct

OBS-URL: https://build.opensuse.org/request/show/305881
OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=44
This commit is contained in:
Olaf Kirch 2015-05-08 10:53:50 +00:00 committed by Git OBS Bridge
parent 167c8f44ce
commit 1be34e3c8c
5 changed files with 262 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
001-tirpc-features.patch
View File

@ -1,3 +1,16 @@
diff --git a/.gitignore b/.gitignore
index b7814a3..fad274f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,8 @@ libtirpc.pc
lib*.a
src/libtirpc.la
src/libtirpc_la-*.lo
+tirpc/stamp-h2
+tirpc/tirpc-features.h
# generic editor backup et al
*~
.stgitmail.txt
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index 2bf725c..2bce3b0 100644 index 2bf725c..2bce3b0 100644
--- a/Makefile.am --- a/Makefile.am
@ -36,6 +49,23 @@ index 711b054..290c635 100644
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_PREFIX_DEFAULT(/usr) 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 <sys/types.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h
index 1dbb391..8f37454 100644 index 1dbb391..8f37454 100644
--- a/tirpc/rpc/rpc.h --- a/tirpc/rpc/rpc.h
@ -59,7 +89,7 @@ index 1dbb391..8f37454 100644
#endif #endif
diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h
index 44b38bf..b308d2b 100644 index 44b38bf..dbd8cc9 100644
--- a/tirpc/rpc/svc_auth.h --- a/tirpc/rpc/svc_auth.h
+++ b/tirpc/rpc/svc_auth.h +++ b/tirpc/rpc/svc_auth.h
@@ -41,6 +41,10 @@ @@ -41,6 +41,10 @@
@ -82,9 +112,21 @@ index 44b38bf..b308d2b 100644
/* /*
* Interface to server-side authentication flavors. * Interface to server-side authentication flavors.
*/ */
@@ -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;
#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \
diff --git a/tirpc/tirpc-features.h.in b/tirpc/tirpc-features.h.in diff --git a/tirpc/tirpc-features.h.in b/tirpc/tirpc-features.h.in
index e69de29..72e18bc 100644 new file mode 100644
--- a/tirpc/tirpc-features.h.in index 0000000..72e18bc
--- /dev/null
+++ b/tirpc/tirpc-features.h.in +++ b/tirpc/tirpc-features.h.in
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+#ifndef _TIRPC_FEATURES_H +#ifndef _TIRPC_FEATURES_H

11
002-old-automake.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/configure.ac b/configure.ac
index 290c635..a6a202e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
AC_INIT(libtirpc, 0.3.0)
-AM_INIT_AUTOMAKE([silent-rules])
+AM_INIT_AUTOMAKE
-AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/auth_des.c])
AC_CONFIG_MACRO_DIR([m4])

194
003-fix-gssapi.patch Normal file
View File

@ -0,0 +1,194 @@
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 <rpc/rpc_msg.h> /* protocol for rpc messages */
#include <rpc/auth_unix.h> /* 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 <rpc/auth_des.h> /* protocol for des style cred */
-#endif /* HAVE_AUTHDES */
+#endif /* TIRPC_AUTHDES */
-#ifdef HAVE_GSSAPI
+#ifdef TIRPC_GSSAPI
#include <rpc/auth_gss.h> /* RPCSEC_GSS */
#endif
diff --git a/tirpc/rpc/rpcsec_gss.h b/tirpc/rpc/rpcsec_gss.h
index 217fc0d..767988c 100644
--- a/tirpc/rpc/rpcsec_gss.h
+++ b/tirpc/rpc/rpcsec_gss.h
@@ -50,6 +50,19 @@ typedef struct {
} *rpc_gss_principal_t;
typedef struct {
+ u_int version;
+ char *mechanism;
+ char *qop;
+ rpc_gss_principal_t client_principal;
+ char *svc_principal;
+ rpc_gss_service_t service;
+} rpc_gss_rawcred_t;
+
+#ifdef TIRPC_GSSAPI
+
+#include <gssapi/gssapi.h>
+
+typedef struct {
int req_flags;
int time_req;
gss_cred_id_t my_cred;
@@ -68,15 +81,6 @@ typedef struct {
} rpc_gss_options_ret_t;
typedef struct {
- u_int version;
- char *mechanism;
- char *qop;
- rpc_gss_principal_t client_principal;
- char *svc_principal;
- rpc_gss_service_t service;
-} rpc_gss_rawcred_t;
-
-typedef struct {
uid_t uid;
gid_t gid;
short gidlen;
@@ -129,4 +133,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..f91bf01 100644
--- a/tirpc/rpc/svc_auth.h
+++ b/tirpc/rpc/svc_auth.h
@@ -42,9 +42,6 @@
#define _RPC_SVC_AUTH_H
#include <tirpc-features.h>
-
-#ifdef HAVE_GSSAPI
-
#include <rpc/rpcsec_gss.h>
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.
*/
@@ -69,10 +64,8 @@ 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;
#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \
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 */

7
libtirpc.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri May 8 10:07:42 CEST 2015 - kukuk@suse.de
- 001-tirpc-features.patch: update with official git version
- 002-old-automake.patch: re-add for SLES11
- 003-fix-gssapi.patch: try to fix the disable-gssapi option correct
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 7 13:50:16 CEST 2015 - kukuk@suse.de Thu May 7 13:50:16 CEST 2015 - kukuk@suse.de

5
libtirpc.spec
View File

@ -40,6 +40,9 @@ Source: %{name}-%{tarversion}.tar.bz2
Source1: baselibs.conf Source1: baselibs.conf
Patch0: 000-bindresvport_blacklist.patch Patch0: 000-bindresvport_blacklist.patch
Patch1: 001-tirpc-features.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 Patch4: 004-netconfig-prefer-IPv6.patch
Patch5: 005-no_IPv6_for_old_code.patch Patch5: 005-no_IPv6_for_old_code.patch
Patch25: patch6_7.diff Patch25: patch6_7.diff
@ -83,6 +86,8 @@ TCP over IPv4
%setup -q -n %name-%tarversion %setup -q -n %name-%tarversion
%patch0 -p0 %patch0 -p0
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch25 -p1 %patch25 -p1