diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-02-12 14:12:19 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-02-12 14:12:19 +0000 |
| commit | eb7800e2aa0a8316789c313cea026cc73a85bc19 (patch) | |
| tree | 6c51afbd0e08e8d1d9b3875da86e100f043545d2 /print/cups | |
| parent | 872e5698e8a4102b59eb755499658550a9a81875 (diff) | |
| download | pkgsrc-eb7800e2aa0a8316789c313cea026cc73a85bc19.tar.gz | |
Don't pull in sys/ucred.h on Solaris as it results in procfs.h being
included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-scheduler_auth.c | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index ba903ab373d..5fa49463307 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.93 2012/09/18 15:17:32 drochner Exp $ +$NetBSD: distinfo,v 1.94 2013/02/12 14:12:19 jperkin Exp $ SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6 @@ -17,4 +17,5 @@ SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60 SHA1 (patch-conf_Makefile) = 9bb4106e9fecaed2ba9bb67b7989f2ac9a9494fc SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4 SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60 +SHA1 (patch-scheduler_auth.c) = 2056f20500e3c6e857f9dd2c83709c15be38fe0e SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups/patches/patch-scheduler_auth.c b/print/cups/patches/patch-scheduler_auth.c new file mode 100644 index 00000000000..e036c8a5667 --- /dev/null +++ b/print/cups/patches/patch-scheduler_auth.c @@ -0,0 +1,16 @@ +$NetBSD: patch-scheduler_auth.c,v 1.1 2013/02/12 14:12:19 jperkin Exp $ + +Don't pull in sys/ucred.h on Solaris as it results in procfs.h being +included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs. + +--- scheduler/auth.c.orig 2011-08-31 04:58:33.000000000 +0000 ++++ scheduler/auth.c +@@ -84,7 +84,7 @@ extern const char *cssmErrorString(int e + #ifdef HAVE_SYS_PARAM_H + # include <sys/param.h> + #endif /* HAVE_SYS_PARAM_H */ +-#ifdef HAVE_SYS_UCRED_H ++#if defined(HAVE_SYS_UCRED_H) && !defined(__sun) + # include <sys/ucred.h> + typedef struct xucred cupsd_ucred_t; + # define CUPSD_UCRED_UID(c) (c).cr_uid |