From 9b40c56e936152a246a4a4510907b6f092eeb09c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 11 Nov 2013 21:17:13 +0100 Subject: forgot patches in last commit --- .../patches/patch-include_rpcsecgss_rpc_rpc_h | 16 ++++++++++++++++ .../patch-include_rpcsecgss_rpc_rpcsecgss_rename_h | 11 +++++++++++ package/librpcsecgss/patches/patch-src_Makefile_am | 11 +++++++++++ package/librpcsecgss/patches/patch-src_clnt_generic_c | 13 +++++++++++++ package/librpcsecgss/patches/patch-src_rpc_commondata_c | 9 +++++++++ 5 files changed, 60 insertions(+) create mode 100644 package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpc_h create mode 100644 package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpcsecgss_rename_h create mode 100644 package/librpcsecgss/patches/patch-src_Makefile_am create mode 100644 package/librpcsecgss/patches/patch-src_clnt_generic_c create mode 100644 package/librpcsecgss/patches/patch-src_rpc_commondata_c (limited to 'package/librpcsecgss/patches') diff --git a/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpc_h b/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpc_h new file mode 100644 index 000000000..cc07b1833 --- /dev/null +++ b/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpc_h @@ -0,0 +1,16 @@ +--- librpcsecgss-0.19.orig/include/rpcsecgss/rpc/rpc.h 2009-07-29 18:24:50.000000000 +0200 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h 2013-11-11 21:11:41.000000000 +0100 +@@ -71,13 +71,6 @@ + + __BEGIN_DECLS + +-/* Global variables, protected for multi-threaded applications. */ +-extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__)); +-#define svc_fdset (*__rpc_thread_svc_fdset ()) +- +-extern struct rpc_createerr *__rpc_thread_createerr (void) +- __attribute__ ((__const__)); +-#define get_rpc_createerr() (*__rpc_thread_createerr ()) + /* The people who "engineered" RPC should bee punished for naming the + data structure and the variable the same. We cannot always define the + macro 'rpc_createerr' because this would prevent people from defining diff --git a/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpcsecgss_rename_h b/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpcsecgss_rename_h new file mode 100644 index 000000000..5b553a6b8 --- /dev/null +++ b/package/librpcsecgss/patches/patch-include_rpcsecgss_rpc_rpcsecgss_rename_h @@ -0,0 +1,11 @@ +--- librpcsecgss-0.19.orig/include/rpcsecgss/rpc/rpcsecgss_rename.h 2009-05-13 23:33:08.000000000 +0200 ++++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h 2013-11-11 21:11:41.000000000 +0100 +@@ -83,8 +83,6 @@ + #define rpc_createerr rpcsecgss_rpc_createerr + #define svc_auth_none rpcsecgss_svc_auth_none + #define svc_auth_none_ops rpcsecgss_svc_auth_none_ops +-#define __svc_fdset rpcsecgss___svc_fdset +-#define __svc_fdsetsize rpcsecgss___svc_fdsetsize + #define svc_maxfd rpcsecgss_svc_maxfd + + #endif /* _RPCSECGSS_RENAME_H_ */ diff --git a/package/librpcsecgss/patches/patch-src_Makefile_am b/package/librpcsecgss/patches/patch-src_Makefile_am new file mode 100644 index 000000000..39b295809 --- /dev/null +++ b/package/librpcsecgss/patches/patch-src_Makefile_am @@ -0,0 +1,11 @@ +--- librpcsecgss-0.19.orig/src/Makefile.am 2009-05-13 23:33:08.000000000 +0200 ++++ librpcsecgss-0.19/src/Makefile.am 2013-11-11 21:11:41.000000000 +0100 +@@ -1,7 +1,7 @@ + lib_LTLIBRARIES = librpcsecgss.la + librpcsecgss_la_CPPFLAGS = $(GSSGLUE_CFLAGS) + librpcsecgss_la_LDFLAGS = -version-info 3:0:0 +-librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) ++librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) -ltirpc + librpcsecgss_la_SOURCES = \ + auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \ + svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \ diff --git a/package/librpcsecgss/patches/patch-src_clnt_generic_c b/package/librpcsecgss/patches/patch-src_clnt_generic_c new file mode 100644 index 000000000..501b574b4 --- /dev/null +++ b/package/librpcsecgss/patches/patch-src_clnt_generic_c @@ -0,0 +1,13 @@ +--- librpcsecgss-0.19.orig/src/clnt_generic.c 2009-07-29 18:24:50.000000000 +0200 ++++ librpcsecgss-0.19/src/clnt_generic.c 2013-11-11 21:11:41.000000000 +0100 +@@ -47,8 +47,8 @@ static char *rcsid = "$OpenBSD: clnt_gen + CLIENT * + clnt_create(hostname, prog, vers, proto) + __const char *hostname; +- __const u_long prog; +- __const u_long vers; ++ __const rpcprog_t prog; ++ __const rpcvers_t vers; + __const char *proto; + { + struct hostent *h; diff --git a/package/librpcsecgss/patches/patch-src_rpc_commondata_c b/package/librpcsecgss/patches/patch-src_rpc_commondata_c new file mode 100644 index 000000000..4297b1ed3 --- /dev/null +++ b/package/librpcsecgss/patches/patch-src_rpc_commondata_c @@ -0,0 +1,9 @@ +--- librpcsecgss-0.19.orig/src/rpc_commondata.c 2009-07-29 18:24:50.000000000 +0200 ++++ librpcsecgss-0.19/src/rpc_commondata.c 2013-11-11 21:11:41.000000000 +0100 +@@ -36,6 +36,4 @@ static char *rcsid = "$OpenBSD: rpc_comm + * by public interfaces + */ + struct opaque_auth _null_auth; +-fd_set svc_fdset; + int svc_maxfd = -1; +-struct rpc_createerr rpc_createerr; -- cgit v1.2.3