libtirpc.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. --- librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h~ 2013-02-22 08:35:29.949005794 +0100
  2. +++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpc.h 2013-02-22 08:35:31.199005887 +0100
  3. @@ -71,13 +71,6 @@
  4. __BEGIN_DECLS
  5. -/* Global variables, protected for multi-threaded applications. */
  6. -extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__));
  7. -#define svc_fdset (*__rpc_thread_svc_fdset ())
  8. -
  9. -extern struct rpc_createerr *__rpc_thread_createerr (void)
  10. - __attribute__ ((__const__));
  11. -#define get_rpc_createerr() (*__rpc_thread_createerr ())
  12. /* The people who "engineered" RPC should bee punished for naming the
  13. data structure and the variable the same. We cannot always define the
  14. macro 'rpc_createerr' because this would prevent people from defining
  15. --- librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h~ 2013-02-22 08:35:34.064007047 +0100
  16. +++ librpcsecgss-0.19/include/rpcsecgss/rpc/rpcsecgss_rename.h 2013-02-22 08:35:35.309007979 +0100
  17. @@ -83,8 +83,6 @@
  18. #define rpc_createerr rpcsecgss_rpc_createerr
  19. #define svc_auth_none rpcsecgss_svc_auth_none
  20. #define svc_auth_none_ops rpcsecgss_svc_auth_none_ops
  21. -#define __svc_fdset rpcsecgss___svc_fdset
  22. -#define __svc_fdsetsize rpcsecgss___svc_fdsetsize
  23. #define svc_maxfd rpcsecgss_svc_maxfd
  24. #endif /* _RPCSECGSS_RENAME_H_ */
  25. --- librpcsecgss-0.19/src/clnt_generic.c~ 2013-02-22 08:35:43.705020289 +0100
  26. +++ librpcsecgss-0.19/src/clnt_generic.c 2013-02-22 08:35:44.853022749 +0100
  27. @@ -47,8 +47,8 @@ static char *rcsid = "$OpenBSD: clnt_gen
  28. CLIENT *
  29. clnt_create(hostname, prog, vers, proto)
  30. __const char *hostname;
  31. - __const u_long prog;
  32. - __const u_long vers;
  33. + __const rpcprog_t prog;
  34. + __const rpcvers_t vers;
  35. __const char *proto;
  36. {
  37. struct hostent *h;
  38. --- librpcsecgss-0.19/src/Makefile.am~ 2009-05-13 23:33:08.000000000 +0200
  39. +++ librpcsecgss-0.19/src/Makefile.am 2013-02-22 08:38:04.829048549 +0100
  40. @@ -1,7 +1,7 @@
  41. lib_LTLIBRARIES = librpcsecgss.la
  42. librpcsecgss_la_CPPFLAGS = $(GSSGLUE_CFLAGS)
  43. librpcsecgss_la_LDFLAGS = -version-info 3:0:0
  44. -librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS)
  45. +librpcsecgss_la_LIBADD = $(GSSGLUE_LIBS) -ltirpc
  46. librpcsecgss_la_SOURCES = \
  47. auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \
  48. svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \
  49. --- librpcsecgss-0.19/src/rpc_commondata.c~ 2013-02-22 08:35:39.195012386 +0100
  50. +++ librpcsecgss-0.19/src/rpc_commondata.c 2013-02-22 08:35:40.523014417 +0100
  51. @@ -36,6 +36,4 @@ static char *rcsid = "$OpenBSD: rpc_comm
  52. * by public interfaces
  53. */
  54. struct opaque_auth _null_auth;
  55. -fd_set svc_fdset;
  56. int svc_maxfd = -1;
  57. -struct rpc_createerr rpc_createerr;