Re: mit-krb5/builtin.mk problems on solaris

[Richard PALO <richard.palo%free.fr@localhost>]

Le 01/10/13 16:07, Richard PALO a écrit :
> Any objections that now the freeze is over that I push the updates (so
> far) for
>   - scmcvs
>   - curl
>   - gnome-vfs
> + revert the -lgssapi patch in postgresql92/options.mk
>
> as for the API requirement in mit-krb5/buildlink3.mk, I've tested with
> 1.6, but I'll leave it to the maintainer to determine where to set it.
I guess I'll need to add the attached fix to an existing cups patch as well.

As soon as I get any native solaris (and non-solaris) mit-krb5 for a 
sanity check, I'll be willing to push these updates.

cordially,

diff --git a/print/cups/distinfo b/print/cups/distinfo
index f5b3454..75dfe32 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -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) = 
ed5193512ef3e7f7d4a55ebd2d3fd2837968d6cc
 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 1340650..0917449 100644
--- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4
+++ b/print/cups/patches/patch-config-scripts_cups-gssapi.m4
@@ -1,8 +1,8 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2011/11/13 21:49:17 sbd Exp 
$
+$NetBSD$
 
---- config-scripts/cups-gssapi.m4.orig 2011-05-12 05:21:56.000000000 +0000
+--- 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 +10,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])