pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/48230: gnome-vfs with gssapi option passes native krb5-config when pkgsrc version should be used
The following reply was made to PR pkg/48230; it has been noted by GNATS.
From: Richard PALO <richard.palo%baou.fr@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc:
Subject: Re: pkg/48230: gnome-vfs with gssapi option passes native krb5-config
when pkgsrc version should be used
Date: Wed, 25 Sep 2013 10:26:59 +0200
This is a multi-part message in MIME format.
--------------000009000203000200030305
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
Le 22/09/13 12:35, richard%netbsd.org@localhost a écrit :
>> Number: 48230
>> Category: pkg
>> Synopsis: gnome-vfs with gssapi option passes native krb5-config when
>> pkgsrc version should be used
>> Confidential: no
>> Severity: critical
>> Priority: medium
>> Responsible: pkg-manager
>> State: open
>> Class: sw-bug
>> Submitter-Id: net
>> Arrival-Date: Sun Sep 22 10:35:00 +0000 2013
>> Originator: Richard PALO
>> Release: pkgsrc trunk
>> Organization:
>> Environment:
> SunOS devzoneX 5.11 illumos-gate i86pc i386 i86pc
>
>> Description:
> somewhat in relation to pkg/48228, building gnome-gvs with option 'gssapi'
> fails on solaris if pkgsrc mit-krb5, for example, is installed because the
> solaris supplied krb5-config doesn't [currently] support the gssapi option.
>
> The options seems to presume that "native" is intended.
>
> The attached patch at least allows the build to complete..
>
> NB: There is probably additional work to support current native solaris krb5
> gssapi support to get over the incorrect assumption that krb5-config always
> supports a gssapi option.
>> How-To-Repeat:
>
>> Fix:
> richard@devzoneX:~/src/pkgsrc/sysutils/gnome-vfs$ git diff .
> diff --git a/sysutils/gnome-vfs/options.mk b/sysutils/gnome-vfs/options.mk
> index 43fd232..833e46c 100644
> --- a/sysutils/gnome-vfs/options.mk
> +++ b/sysutils/gnome-vfs/options.mk
> @@ -23,7 +23,9 @@ CONFIGURE_ARGS+= --disable-fam
>
> .if !empty(PKG_OPTIONS:Mgssapi)
> .include "../../mk/krb5.buildlink3.mk"
> +. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS])
> CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG}
> +. endif
> .else
> CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none
> .endif
>
>
attached patch seems to fix krb5-config problem on solaris when native
mit-krb5 is used.
--------------000009000203000200030305
Content-Type: text/plain; charset=UTF-8;
name="gvfs.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="gvfs.patch"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- distinfo 19 Apr 2013 20:02:22 -0000 1.34
+++ distinfo 25 Sep 2013 08:07:40 -0000
@@ -5,7 +5,7 @@
Size (gnome-vfs-2.24.4.tar.bz2) = 1890370 bytes
SHA1 (patch-aa) = a5a3ac6be3e2a888eaaab108807d2aff651e62db
SHA1 (patch-ab) = 6320180870f234a150dfe40f8f990deec7a2a0b5
-SHA1 (patch-ae) = 2e46f1311674265d2054c7209aa057d8da2aca67
+SHA1 (patch-ae) = bc6fe6afd2484acb9f1b31469c18f9a3c4ac7d70
SHA1 (patch-af) = 6724c4a43d0d9525f5361ba7380c91adbf656e56
SHA1 (patch-ai) = 6afefb35bfe3fc37e84048b95ccc272a01542ec2
SHA1 (patch-am) = 4e037da71db0d3aae236475a0f2ead12738f35f9
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- options.mk 12 Jun 2012 15:46:03 -0000 1.5
+++ options.mk 25 Sep 2013 08:07:40 -0000
@@ -23,7 +23,9 @@
.if !empty(PKG_OPTIONS:Mgssapi)
.include "../../mk/krb5.buildlink3.mk"
+. if !empty(USE_BUILTIN.${KRB5_TYPE}:M[yY][eE][sS])
CONFIGURE_ENV+= KRB5_CONFIG=${SH_KRB5_CONFIG}
+. endif
.else
CONFIGURE_ENV+= ac_cv_path_KRB5_CONFIG=none
.endif
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/gnome-vfs/patches/patch-ae,v
retrieving revision 1.10
diff -u -r1.10 patch-ae
--- patches/patch-ae 22 Oct 2010 20:11:17 -0000 1.10
+++ patches/patch-ae 25 Sep 2013 08:07:40 -0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.10 2010/10/22 20:11:17 drochner Exp $
+$NetBSD$
--- configure.orig 2010-09-28 09:35:20.000000000 +0000
+++ configure
@@ -23,7 +23,25 @@
return 0;
}
_ACEOF
-@@ -17533,7 +17535,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
+@@ -15717,9 +15719,14 @@ fi
+
+
+ if test "x$KRB5_CONFIG" != "xnone"; then
+- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-
++ # make sure krb5-config supports gssapi option
++ if $KRB5_CONFIG --libs gssapi 2>&1 | grep "Unknown option" > /dev/null
; then
++ GSSAPI_LIBS="`${KRB5_CONFIG} --libs`"
++ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags`"
++ else
++ GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
++ GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
++ fi
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $GSSAPI_LIBS"
+@@ -17533,7 +17540,7 @@ $as_echo "#define HAVE_SAMBA /**/" >>con
msg_samba="yes"
if test x$with_samba_libs != x/usr/lib; then
@@ -32,7 +50,7 @@
else
SAMBA_LIBS="-lsmbclient"
fi
-@@ -19370,12 +19372,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
+@@ -19370,12 +19377,12 @@ if test -n "$LIBGNOMEVFS_CFLAGS"; then
pkg_cv_LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -48,7 +66,7 @@
else
pkg_failed=yes
fi
-@@ -19386,12 +19388,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
+@@ -19386,12 +19393,12 @@ if test -n "$LIBGNOMEVFS_LIBS"; then
pkg_cv_LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
@@ -64,7 +82,7 @@
else
pkg_failed=yes
fi
-@@ -19411,14 +19413,14 @@ else
+@@ -19411,14 +19418,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
--------------000009000203000200030305--
Home |
Main Index |
Thread Index |
Old Index