Author: qboosh                       Date: Mon Feb 28 21:14:59 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- configure and build fixes

---- Files affected:
SOURCES:
   librpcsecgss-configure.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/librpcsecgss-configure.patch
diff -u /dev/null SOURCES/librpcsecgss-configure.patch:1.1
--- /dev/null   Mon Feb 28 22:14:59 2005
+++ SOURCES/librpcsecgss-configure.patch        Mon Feb 28 22:14:54 2005
@@ -0,0 +1,90 @@
+--- librpcsecgss-0.1/configure.in.orig 2004-10-22 19:24:27.000000000 +0200
++++ librpcsecgss-0.1/configure.in      2005-02-28 22:03:09.848455160 +0100
+@@ -61,8 +61,8 @@
+   fi
+   if test "$K5CONFIG" != ""; then
+     if test -f $dir/include/gssapi/gssapi_krb5.h -a \
+-            \( -f $dir/lib/libgssapi_krb5.a -o \
+-          -f $dir/lib/libgssapi_krb5.so \) ; then
++            \( -f $dir/lib/libgssapi_krb5.so -o \
++          -f $dir/lib64/libgssapi_krb5.so \) ; then
+        AC_DEFINE(HAVE_KRB5)
+        KRBDIR="$dir"
+        K5VERS=`$K5CONFIG --version | awk '{split($4,v,"."); print 
v[[1]]v[[2]]v[[3]] }'`
+@@ -82,7 +82,7 @@
+     dnl of Heimdal Kerberos on SuSe
+     elif test \( -f $dir/include/heim_err.h -o\
+                -f $dir/include/heimdal/heim_err.h \) -a \
+-              -f $dir/lib/libroken.a; then
++              \( -f $dir/lib/libroken.so -o -f $dir/lib64/libroken.so \) ; 
then
+        AC_DEFINE(HAVE_HEIMDAL)
+        KRBDIR="$dir"
+        K5VERS=`$K5CONFIG --version | head -1 | awk '{split($2,v,"."); print 
v[[1]]v[[2]]v[[3]] }'`
+@@ -96,7 +96,7 @@
+          AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME),,$KRBLIB)
+       break
+     fi
+-    CFLAGS=$CFLAGS `K5CONFIG --cflags`
++    CFLAGS=$CFLAGS `$K5CONFIG --cflags`
+   fi
+ done
+ dnl We didn't find a usable Kerberos environment
+--- librpcsecgss-0.1/Makefile.am.orig  2004-10-25 19:07:30.000000000 +0200
++++ librpcsecgss-0.1/Makefile.am       2005-02-28 22:05:48.693307072 +0100
+@@ -18,4 +18,3 @@
+ dist-hook:
+       mkdir $(distdir)/debian/
+       find $(srcdir)/debian -maxdepth 1 -type f |xargs -i cp {} 
$(distdir)/debian/
+-      #XXX: also exclude debian/files and debian/files.new ? do a clean??
+--- librpcsecgss-0.1/include/rpc/auth_gss.h.orig       2004-10-22 
19:24:29.000000000 +0200
++++ librpcsecgss-0.1/include/rpc/auth_gss.h    2005-02-28 22:10:23.335555104 
+0100
+@@ -38,7 +38,7 @@
+ #define _RPC_AUTH_GSS_H
+ 
+ #include <rpc/clnt.h>
+-#include <gssapi/gssapi.h>
++#include <gssapi.h>
+ 
+ /* RPCSEC_GSS control procedures. */
+ typedef enum {
+--- librpcsecgss-0.1/src/auth_gss.c.orig       2004-10-22 19:24:30.000000000 
+0200
++++ librpcsecgss-0.1/src/auth_gss.c    2005-02-28 22:09:59.058245816 +0100
+@@ -47,7 +47,7 @@
+ #include <rpc/auth_gss.h>
+ #include <rpc/clnt.h>
+ #include <netinet/in.h>
+-#include <gssapi/gssapi.h>
++#include <gssapi.h>
+ 
+ static void   authgss_nextverf();
+ static bool_t authgss_marshal();
+--- librpcsecgss-0.1/src/authgss_prot.c.orig   2004-10-22 19:24:30.000000000 
+0200
++++ librpcsecgss-0.1/src/authgss_prot.c        2005-02-28 22:10:52.871065024 
+0100
+@@ -42,7 +42,7 @@
+ #include <rpc/auth.h>
+ #include <rpc/auth_gss.h>
+ #include <rpc/rpc.h>
+-#include <gssapi/gssapi.h>
++#include <gssapi.h>
+ 
+ bool_t
+ xdr_rpc_gss_cred(XDR *xdrs, struct rpc_gss_cred *p)
+--- librpcsecgss-0.1/src/svc_auth_gss.c.orig   2004-10-22 19:24:30.000000000 
+0200
++++ librpcsecgss-0.1/src/svc_auth_gss.c        2005-02-28 22:13:56.131205248 
+0100
+@@ -38,7 +38,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <rpc/rpc.h>
+-#include <gssapi/gssapi.h>
++#include <gssapi.h>
+ 
+ extern SVCAUTH svc_auth_none;
+ 
+--- librpcsecgss-0.1/src/Makefile.am.orig      2004-10-22 19:24:29.000000000 
+0200
++++ librpcsecgss-0.1/src/Makefile.am   2005-02-28 22:15:01.340291960 +0100
+@@ -1,4 +1,5 @@
+ lib_LTLIBRARIES = librpcsecgss.la
++librpcsecgss_la_LIBADD = $(KRBLIB)
+ librpcsecgss_la_SOURCES = \
+       auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \
+       svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \
================================================================

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to