gentoo auto-resync : 17:08:2022 - 20:33:10

7 files changed, 0 insertions, 175 deletions

diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch
deleted file mode 100644
index cd2b07042cec..000000000000
--- a/net-print/cups/files/cups-1.4.4-nostrip.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Source: Gentoo
-
-diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4
---- cups-1.4.4/config-scripts/cups-compiler.m4	2009-05-17 02:13:47.000000000 +0200
-+++ cups-1.4.4.new/config-scripts/cups-compiler.m4	2010-08-12 19:19:45.937020635 +0200
-@@ -30,7 +30,7 @@
- if test x$enable_debug = xyes; then
- 	OPTIM="-g"
- else
--	INSTALL_STRIP="-s"
-+	INSTALL_STRIP=""
- fi
- 
- dnl Debug printfs can slow things down, so provide a separate option for that
diff --git a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch b/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
deleted file mode 100644
index a8f007446f2d..000000000000
--- a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cups-2.2.6/Makedefs.in
-+++ cups-2.2.6/Makedefs.in
-@@ -49,12 +49,12 @@
- #
- 
- INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
- INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
--INSTALL_DATA	=	$(INSTALL) -c -m 444
-+INSTALL_DATA	=	$(INSTALL) -c -m 644
- INSTALL_DIR	=	$(INSTALL) -d
- INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
--INSTALL_MAN	=	$(INSTALL) -c -m 444
-+INSTALL_MAN	=	$(INSTALL) -c -m 644
- INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
- 
- #
diff --git a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch b/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch
deleted file mode 100644
index 1782d122ae55..000000000000
--- a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 13 Apr 2021 15:47:37 +0200
-Subject: backend/usb-libusb.c: Revert enforcing read limits
-
-This commit reverts the change introduced by 2.2.12 [1] - its
-implementation caused a regression with Lexmark filters.
-
-[1] https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35
-
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
-Bug: https://github.com/OpenPrinting/cups/issues/72
----
- backend/usb-libusb.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
-index fbb0d9d..89b5182 100644
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference)
-     * Make sure this loop executes no more than once every 250 miliseconds...
-     */
- 
--    if ((g.wait_eof || !g.read_thread_stop))
-+    if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) &&
-+	 (g.wait_eof || !g.read_thread_stop))
-       usleep(250000);
-   }
-   while (g.wait_eof || !g.read_thread_stop);
diff --git a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch b/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch
deleted file mode 100644
index a677090cd91c..000000000000
--- a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 6e6999b1f74457b7fd6057a31f1d3606de19a05b Mon Sep 17 00:00:00 2001
-From: Michael R Sweet <michael.r.sweet@gmail.com>
-Date: Fri, 9 Apr 2021 10:20:04 -0400
-Subject: [PATCH] Retry Validate-Job once, if needed (Issue #132)
-
----
- CHANGES.md    |  1 +
- backend/ipp.c | 14 +++++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/backend/ipp.c b/backend/ipp.c
-index 63353a66d..020ab7fd4 100644
---- a/backend/ipp.c
-+++ b/backend/ipp.c
-@@ -256,6 +257,7 @@ main(int  argc,				/* I - Number of command-line args */
- 		get_job_attrs = 0,	/* Does printer support Get-Job-Attributes? */
- 		send_document = 0,	/* Does printer support Send-Document? */
- 		validate_job = 0,	/* Does printer support Validate-Job? */
-+		validate_retried = 0,	/* Was Validate-Job request retried? */
- 		copies,			/* Number of copies for job */
- 		copies_remaining;	/* Number of copies remaining */
-   const char	*content_type,		/* CONTENT_TYPE environment variable */
-@@ -1559,7 +1561,17 @@ main(int  argc,				/* I - Number of command-line args */
-              ipp_status == IPP_STATUS_ERROR_BAD_REQUEST)
-       break;
-     else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST)
-+    {
-+      if (!validate_retried)
-+      {
-+        // Retry Validate-Job operation once, to work around known printer bug...
-+        validate_retried = 1;
-+        sleep(10);
-+        continue;
-+      }
-+
-       goto cleanup;
-+    }
-   }
- 
-  /*
--- 
-2.26.3
-
diff --git a/net-print/cups/files/cups-2.3.3-manpage.patch b/net-print/cups/files/cups-2.3.3-manpage.patch
deleted file mode 100644
index db22adeeec4d..000000000000
--- a/net-print/cups/files/cups-2.3.3-manpage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Didier Raboud <odyx@debian.org>
-Date: Fri, 12 Feb 2021 13:47:22 +0100
-Subject: Let cups.1 point to client.conf.5, not client.conf.7
-
-Bug: https://github.com/OpenPrinting/cups/pull/92
-Closes: #982303
----
- man/cups.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/cups.1 b/man/cups.1
-index 706620d..751ad9a 100644
---- a/man/cups.1
-+++ b/man/cups.1
-@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as
- .BR ippeveprinter (1).
- .SH SEE ALSO
- .BR cancel (1),
--.BR client.conf (7),
-+.BR client.conf (5),
- .BR cupsctl (8),
- .BR cupsd (8),
- .BR lp (1),
diff --git a/net-print/cups/files/cups-2.3.3-timeout.patch b/net-print/cups/files/cups-2.3.3-timeout.patch
deleted file mode 100644
index 280f71f2fad2..000000000000
--- a/net-print/cups/files/cups-2.3.3-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Tue, 13 Apr 2021 15:44:14 +0200
-Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel
-
-Some older models malfunction if timeout is too short.
-
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174
-Bug: https://github.com/OpenPrinting/cups/issues/160
-Bug-Debian: https://bugs.debian.org/989073
----
- backend/usb-libusb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
-index d6b0eb4..fbb0d9d 100644
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference)
-     readstatus = libusb_bulk_transfer(g.printer->handle,
- 				      g.printer->read_endp,
- 				      readbuffer, rbytes,
--				      &rbytes, 250);
-+				      &rbytes, 60000);
-     if (readstatus == LIBUSB_SUCCESS && rbytes > 0)
-     {
-       fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", (int)rbytes);
diff --git a/net-print/cups/files/cups-2.3.3-user-AR.patch b/net-print/cups/files/cups-2.3.3-user-AR.patch
deleted file mode 100644
index 0e52adb567d7..000000000000
--- a/net-print/cups/files/cups-2.3.3-user-AR.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-AC_PATH_PROG does not search tuple prefixes.
---- a/config-scripts/cups-common.m4
-+++ b/config-scripts/cups-common.m4
-@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc)
- AC_PROG_CPP
- AC_PROG_CXX(clang++ c++ g++)
- AC_PROG_RANLIB
--AC_PATH_PROG(AR,ar)
-+AC_CHECK_TOOL(AR,ar)
- AC_PATH_PROG(CHMOD,chmod)
- AC_PATH_PROG(GZIPPROG,gzip)
- AC_MSG_CHECKING(for install-sh script)
- INSTALL="`pwd`/install-sh"
- AC_SUBST(INSTALL)
- AC_MSG_RESULT(using $INSTALL)
--AC_PATH_PROG(LD,ld)
--AC_PATH_PROG(LN,ln)
-+AC_CHECK_TOOL(LD,ld)
-+AC_CHECK_TOOL(LN,ln)
- AC_PATH_PROG(MKDIR,mkdir)
- AC_PATH_PROG(MV,mv)
- AC_PATH_PROG(RM,rm)