From 30306ccacef8b2eee7c2a2cae52d0f5fa58fbe5e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Tue, 18 Dec 2007 18:21:49 +0000
Subject: [PATCH] - up to 1.3.5

Changed files:
    cups-direct_usb.patch -> 1.4
    cups-no-polluted-krb5config.patch -> 1.2
---
 cups-direct_usb.patch             |  6 +++---
 cups-no-polluted-krb5config.patch | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/cups-direct_usb.patch b/cups-direct_usb.patch
index ecab1dc..3e7bef3 100644
--- 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 8344bb1..87206f7 100644
--- 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
-- 
2.44.0