- up to 1.3.5

Changed files:
    cups-direct_usb.patch -> 1.4
    cups-no-polluted-krb5config.patch -> 1.2

diff --git a/cups-direct_usb.patch b/cups-direct_usb.patch
index ecab1dc82bc48af24d584a50ed841616f837d705..3e7bef37b63b468ab1b5f6c16fcb9f7aed2209fc 100644 (file)
--- a/cups-direct_usb.patch
+++ b/cups-direct_usb.patch
@@ -1,9 +1,9 @@
 --- cups-1.2.8/backend/usb-unix.c.direct-usb   2007-02-05 20:25:50.000000000 +0000
 +++ cups-1.2.8/backend/usb-unix.c      2007-02-14 17:44:40.000000000 +0000
 @@ -87,6 +87,8 @@
-     use_bc = strcasecmp(hostname, "Canon") &&
-              strcasecmp(hostname, "Konica Minolta") &&
-              strcasecmp(hostname, "Minolta");
+              strcasecmp(hostname, "Canon") &&
+              strncasecmp(hostname, "Konica", 6) &&
+              strncasecmp(hostname, "Minolta", 7);
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
 +      use_bc = 0;
  #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */

diff --git a/cups-no-polluted-krb5config.patch b/cups-no-polluted-krb5config.patch
index 8344bb1690c41ee4dffa6fb77bfa564a4b428528..87206f79232b675d712ba7663ebdf2313c70dc27 100644 (file)
--- a/cups-no-polluted-krb5config.patch
+++ b/cups-no-polluted-krb5config.patch
@@ -1,15 +1,16 @@
 --- cups-1.3.4/config-scripts/cups-gssapi.m4~  2007-08-01 21:02:47.000000000 +0200
 +++ cups-1.3.4/config-scripts/cups-gssapi.m4   2007-12-06 23:18:40.000000000 +0100
 @@ -27,9 +27,9 @@
-                       # Mac OS X weak-links to the Kerberos framework...
-                       LIBGSSAPI="-weak_framework Kerberos"
-               else
--                      CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
--                      CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
--                      LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
-+                      CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"         
-+                      CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"             
-+                      LIBGSSAPI="`CFLAGS= LDFLAGS= $KRB5CONFIG --libs gssapi`"
-               fi
+                               ;;
+                       *)
+                               # Other platforms just ask for GSSAPI
+-                              CFLAGS="`$KRB5CONFIG --cflags gssapi` $CFLAGS"          
+-                              CPPFLAGS="`$KRB5CONFIG --cflags gssapi` $CPPFLAGS"              
+-                              LIBGSSAPI="`$KRB5CONFIG --libs gssapi`"
++                              CFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CFLAGS"         
++                              CPPFLAGS="`CFLAGS= LDFLAGS= $KRB5CONFIG --cflags gssapi` $CPPFLAGS"             
++                              LIBGSSAPI="`CFLAGS= LDFLAGS= $KRB5CONFIG --libs gssapi`"
+                               ;;
+               esac
                AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
        else