diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-12-24 03:14:26 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-12-25 21:16:37 +0300 |
| commit | 089183c52a0e99ccda43265e866914cff9775299 (patch) | |
| tree | 85b6dd05096428bfce59c802ac96519cef8594f3 /uts | |
| parent | d338e5e8766d27c6fa8240034369b113e3bc3773 (diff) | |
| download | illumos-packaging-089183c52a0e99ccda43265e866914cff9775299.tar.gz | |
Added debian/patches/rpc-rpc-h.patch: resolve conflicts with other libraries
Diffstat (limited to 'uts')
| -rw-r--r-- | uts/debian/changelog | 2 | ||||
| -rw-r--r-- | uts/debian/patches/rpc-rpc-h.patch | 30 | ||||
| -rw-r--r-- | uts/debian/patches/series | 1 |
3 files changed, 33 insertions, 0 deletions
diff --git a/uts/debian/changelog b/uts/debian/changelog index e65a2a1..6f4507d 100644 --- a/uts/debian/changelog +++ b/uts/debian/changelog @@ -1,6 +1,8 @@ uts (4.3+6) UNRELEASED; urgency=medium * Added index_t.patch + * Added debian/patches/rpc-rpc-h.patch: resolve conflicts with other + libraries -- Igor Pashev <pashev.igor@gmail.com> Tue, 04 Nov 2014 01:12:46 +0400 diff --git a/uts/debian/patches/rpc-rpc-h.patch b/uts/debian/patches/rpc-rpc-h.patch new file mode 100644 index 0000000..07efa89 --- /dev/null +++ b/uts/debian/patches/rpc-rpc-h.patch @@ -0,0 +1,30 @@ +Index: uts/usr/src/uts/common/rpc/rpc.h +=================================================================== +--- uts.orig/usr/src/uts/common/rpc/rpc.h ++++ uts/usr/src/uts/common/rpc/rpc.h +@@ -63,16 +63,23 @@ + #include <rpc/auth_sys.h> /* protocol for unix style cred */ + #include <rpc/auth_des.h> /* protocol for des style cred */ + #include <sys/socket.h> /* generic socket info */ +-#include <rpc/rpcsec_gss.h> /* GSS style security */ + + #include <rpc/svc.h> /* service manager and multiplexer */ +-#include <rpc/svc_auth.h> /* service side authenticator */ + + #ifndef _KERNEL + #ifndef _RPCB_PROT_H_RPCGEN /* Don't include before rpcb_prot defined */ + #include <rpc/rpcb_clnt.h> /* rpcbind interface functions */ + #endif ++#endif ++ ++ ++// These headers include sys/gssapi.h ++// which causes conflicts with other GSS libraries ++// like heimdal. For example it causes Samba FTBFS. ++#if defined (_KERNEL) || defined (__FULL_RPC_H__) ++#include <rpc/rpcsec_gss.h> /* GSS style security */ + #include <rpc/svc_mt.h> /* private server definitions */ ++#include <rpc/svc_auth.h> /* service side authenticator */ + #endif + + #endif /* !_RPC_RPC_H */ diff --git a/uts/debian/patches/series b/uts/debian/patches/series index 5f0938a..a952c0d 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -64,3 +64,4 @@ uts-gcc48-warnings.patch illumos-4840-ddi_dma_mem_alloc.patch disable-clobbered-warning.patch index_t.patch +rpc-rpc-h.patch |