From: Karol Krenski <charles@pld-linux.org>
Date: Tue, 23 May 2006 22:22:21 +0000 (+0000)
Subject: - obsolete
X-Git-Tag: auto/ac/cups-1_2_1-1~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=24d3de3f76eddd8326460fa958af07b61c94e4c4;p=packages%2Fcups.git

- obsolete

Changed files:
    cups-rpath.patch -> 1.3
    cups-str1670.patch -> 1.2
    cups-str1705.patch -> 1.2
---

diff --git a/cups-rpath.patch b/cups-rpath.patch
deleted file mode 100644
index ca8504f..0000000
--- a/cups-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN cups-1.1.21.org/config-scripts/cups-sharedlibs.m4 cups-1.1.21/config-scripts/cups-sharedlibs.m4
---- cups-1.1.21.org/config-scripts/cups-sharedlibs.m4	2004-09-24 01:17:18.586596250 +0200
-+++ cups-1.1.21/config-scripts/cups-sharedlibs.m4	2004-09-24 01:23:26.775720365 +0200
-@@ -137,9 +137,11 @@
-                         ;;
-                 Linux | GNU)
-                         # Linux and HURD
-+			if test $libdir != /usr/lib -a $libdir != /usr/lib32 -a $libdir != /usr/lib64 -a $libdir != /lib ; then
-                 	DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"
-                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
-                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
-+			fi
-                         ;;
- 	esac
- else
diff --git a/cups-str1670.patch b/cups-str1670.patch
deleted file mode 100644
index f46a393..0000000
--- a/cups-str1670.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cups-1.2.x/scheduler/dirsvc.c.str1670	2006-05-18 13:48:42.000000000 +0100
-+++ cups-1.2.x/scheduler/dirsvc.c	2006-05-18 13:49:45.000000000 +0100
-@@ -2596,7 +2596,8 @@
-       cupsdLogMessage(CUPSD_LOG_DEBUG2,
-                       "cupsdSendBrowseList: (%d bytes) %s", bytes, packet);
- 
--      if (sendto(BrowseSocket, packet, bytes, 0,
-+      if (BrowseSocket != -1 &&
-+	  sendto(BrowseSocket, packet, bytes, 0,
- 		 (struct sockaddr *)&(b->to),
- 		 sizeof(struct sockaddr_in)) <= 0)
-       {
diff --git a/cups-str1705.patch b/cups-str1705.patch
deleted file mode 100644
index 7112834..0000000
--- a/cups-str1705.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cups-1.2.x/backend/usb-unix.c.str1705	2006-05-18 18:12:40.000000000 +0100
-+++ cups-1.2.x/backend/usb-unix.c	2006-05-18 18:13:38.000000000 +0100
-@@ -238,7 +238,7 @@
-         do
- 	{
-           FD_ZERO(&input);
--	  FD_SET(fd, &input);
-+	  // FD_SET(fd, &input); // disable back-channel data (see STR #1705)
- 	  FD_ZERO(&output);
- 	  FD_SET(fd, &output);
-         }