diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-12-25 22:04:55 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-12-25 22:04:55 +0300 |
| commit | 84a977cb0b61e369e787fc5a60e879333ab62f06 (patch) | |
| tree | c6a2280854fe74ef7594f451b946b2983757f1bb /libc | |
| parent | 95278912fa0edf4d4766ed7cc56edad68490937b (diff) | |
| download | illumos-packaging-84a977cb0b61e369e787fc5a60e879333ab62f06.tar.gz | |
Fixed complication against refactored rpc/rpc.h
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/debian/patches/rpc_gss.patch | 63 | ||||
| -rw-r--r-- | libc/debian/patches/series | 1 |
2 files changed, 64 insertions, 0 deletions
diff --git a/libc/debian/patches/rpc_gss.patch b/libc/debian/patches/rpc_gss.patch new file mode 100644 index 0000000..cac39f6 --- /dev/null +++ b/libc/debian/patches/rpc_gss.patch @@ -0,0 +1,63 @@ +Description: rpc/rpc.h was refactored to fix conflicts + of several gssapi.h headers. Now some hearder must be + included directly. +Index: libc/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h +=================================================================== +--- libc.orig/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h ++++ libc/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h +@@ -39,6 +39,7 @@ extern "C" { + + #include <rpc/rpc.h> + #include <rpc/key_prot.h> ++#include <rpc/rpcsec_gss.h> + #include <rpcsvc/nis.h> /* to get nis_server */ + + +Index: libc/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c +=================================================================== +--- libc.orig/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c ++++ libc/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c +@@ -34,7 +34,7 @@ + #include <syslog.h> + #include <string.h> + #include <unistd.h> +-#include <gssapi/gssapi.h> ++#include <sys/gssapi.h> + #include <rpc/rpc.h> + #include <rpcsvc/nis.h> + #include <rpcsvc/nis_dhext.h> +@@ -48,7 +48,6 @@ + #include <netinet/in.h> + #include <netdb.h> + #include <dlfcn.h> +-#include <gssapi/gssapi.h> + + extern int bin2hex(int len, unsigned char *binnum, char *hexnum); + extern int hex2bin(int len, char *hexnum, char *binnum); +Index: libc/usr/src/lib/libnsl/rpc/rpc_mt.h +=================================================================== +--- libc.orig/usr/src/lib/libnsl/rpc/rpc_mt.h ++++ libc/usr/src/lib/libnsl/rpc/rpc_mt.h +@@ -35,6 +35,9 @@ + + #include <sys/types.h> + #include <rpc/rpc.h> ++#include <rpc/rpcsec_gss.h> ++#include <rpc/svc_mt.h> ++#include <rpc/svc_auth.h> + #include <netconfig.h> + + #ifdef __cplusplus +Index: libc/usr/src/lib/libnsl/rpc/ti_opts.c +=================================================================== +--- libc.orig/usr/src/lib/libnsl/rpc/ti_opts.c ++++ libc/usr/src/lib/libnsl/rpc/ti_opts.c +@@ -47,6 +47,8 @@ + #include <net/if.h> + #include <sys/sockio.h> + #include <rpc/rpc.h> ++#include <rpc/rpcsec_gss.h> ++#include <rpc/svc_mt.h> + #include <sys/tl.h> + #include <sys/stropts.h> + #include <errno.h> diff --git a/libc/debian/patches/series b/libc/debian/patches/series index 29a0194..b62a0f2 100644 --- a/libc/debian/patches/series +++ b/libc/debian/patches/series @@ -111,3 +111,4 @@ use-posix-functions.patch zic-enable-leapsecond.patch TZDIR.patch etc-timezone.patch +rpc_gss.patch |