diff options
| author | richard <richard@pkgsrc.org> | 2013-10-12 06:01:58 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-10-12 06:01:58 +0000 |
| commit | 062c2b03c4f9a2e3c12dbb763b6303ab5d0916ff (patch) | |
| tree | 11a79b6c7489f5647f1f72503ae0f6eb340f67e0 /print | |
| parent | eae2940e37e6c9a98a31bba0efd5e595dee6a431 (diff) | |
| download | pkgsrc-062c2b03c4f9a2e3c12dbb763b6303ab5d0916ff.tar.gz | |
improve cups builtin kerberos support
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/distinfo | 4 | ||||
| -rw-r--r-- | print/cups/patches/patch-config-scripts_cups-gssapi.m4 | 31 |
2 files changed, 26 insertions, 9 deletions
diff --git a/print/cups/distinfo b/print/cups/distinfo index f5b3454c389..ad295b9b6c5 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2013/05/09 09:38:19 jperkin Exp $ +$NetBSD: distinfo,v 1.96 2013/10/12 06:01:58 richard Exp $ SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6 @@ -15,7 +15,7 @@ SHA1 (patch-ao) = 7fe50080b9a6fd4dac186020f9351ef6000373c7 SHA1 (patch-at) = bbda891ed0820e23fe7f6fe3dd5326eeda5b3b2e SHA1 (patch-au) = 0d1d3cf255b996c96b0ea798f46b08523ef22a60 SHA1 (patch-conf_Makefile) = 5b5d45abc1e8d6b73a1ad6b7a7098714d4c55395 -SHA1 (patch-config-scripts_cups-gssapi.m4) = a3505afd30f0864e3022d8f65c810b9614d82cf4 +SHA1 (patch-config-scripts_cups-gssapi.m4) = 6f558ee1d2d56ceba3a9705d3278c7969495be5d SHA1 (patch-ppdc_Makefile) = 7dcc34217557a4c6f42064b61abf593bd7620b60 SHA1 (patch-scheduler_auth.c) = 2056f20500e3c6e857f9dd2c83709c15be38fe0e SHA1 (patch-scheduler_dirsvc.c) = 62c6b47522a60b9f8042421e4a9d25a5dfa47c47 diff --git a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups/patches/patch-config-scripts_cups-gssapi.m4 index 1340650389e..ce5a50c7008 100644 --- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 +++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4 @@ -1,8 +1,11 @@ -$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2011/11/13 21:49:17 sbd Exp $ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.3 2013/10/12 06:01:58 richard Exp $ ---- config-scripts/cups-gssapi.m4.orig 2011-05-12 05:21:56.000000000 +0000 +builtin krb5-config in platforms such as solaris do not support +the gssapi option, and need an explicit -lgss + +--- config-scripts/cups-gssapi.m4.orig 2011-10-19 20:21:16.000000000 +0000 +++ config-scripts/cups-gssapi.m4 -@@ -36,14 +36,6 @@ if test x$enable_gssapi != xno; then +@@ -36,19 +36,18 @@ if test x$enable_gssapi != xno; then AC_MSG_RESULT(no) fi ;; @@ -10,10 +13,24 @@ $NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2011/11/13 21:49:17 sbd Exp $ - # Solaris has a non-standard krb5-config, don't use it! - AC_CHECK_LIB(gss, gss_display_status, - AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) -- CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" -- CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" ++ *) ++ # make sure krb5-config supports gssapi option ++ if $KRB5CONFIG --cflags gssapi 2>&1 | grep "Unknown option" > /dev/null ; then + CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS" + CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS" - LIBGSSAPI="-lgss `$KRB5CONFIG --libs`") - ;; - *) +- *) ++ LIBGSSAPI="-lgss `$KRB5CONFIG --libs`" ++ else # Other platforms just ask for GSSAPI - CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" +- CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" +- CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" +- LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" ++ CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS" ++ CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS" ++ LIBGSSAPI="`$KRB5CONFIG --libs gssapi`" ++ fi + ;; + esac + AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available]) |