From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- .../files/0001-Fix-some-web-interface-issues.patch | 667 +++++++++++++++++++++ .../cups/files/0001-Footer-message-corrected.patch | 89 +++ .../files/0001-cups-fix-uninit-value-jump.patch | 18 + ...ps-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch | 55 ++ net-print/cups/files/cups-2.4.1-nostrip.patch | 11 + net-print/cups/files/cups-2.4.1-resolve-uri.patch | 31 + net-print/cups/files/cups-2.4.1-user-AR.patch | 21 + .../files/cups-2.4.2-no-fortify-override.patch | 18 + net-print/cups/files/cupsd.init.d-r3 | 22 - 9 files changed, 910 insertions(+), 22 deletions(-) create mode 100644 net-print/cups/files/0001-Fix-some-web-interface-issues.patch create mode 100644 net-print/cups/files/0001-Footer-message-corrected.patch create mode 100644 net-print/cups/files/0001-cups-fix-uninit-value-jump.patch create mode 100644 net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch create mode 100644 net-print/cups/files/cups-2.4.1-nostrip.patch create mode 100644 net-print/cups/files/cups-2.4.1-resolve-uri.patch create mode 100644 net-print/cups/files/cups-2.4.1-user-AR.patch create mode 100644 net-print/cups/files/cups-2.4.2-no-fortify-override.patch delete mode 100644 net-print/cups/files/cupsd.init.d-r3 (limited to 'net-print/cups/files') diff --git a/net-print/cups/files/0001-Fix-some-web-interface-issues.patch b/net-print/cups/files/0001-Fix-some-web-interface-issues.patch new file mode 100644 index 000000000000..d2a8ec19429d --- /dev/null +++ b/net-print/cups/files/0001-Fix-some-web-interface-issues.patch @@ -0,0 +1,667 @@ +diff -up cups-2.4.1/doc/cups.css.css-issues cups-2.4.1/doc/cups.css +--- cups-2.4.1/doc/cups.css.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/cups.css 2022-03-08 13:55:16.075624812 +0100 +@@ -1,5 +1,5 @@ + /* Layout CSS */ +-.header { ++.cups-header { + background: rgba(46,46,46,.9); + box-shadow: 0 2px 5px rgba(0,0,0,0.25); + color: white; +@@ -11,7 +11,7 @@ + top: 0; + width: 100%; + } +-.header ul { ++.cups-header ul { + list-style: none; + margin: 0; + -webkit-margin-before: 0; +@@ -20,37 +20,37 @@ + -webkit-margin-end: 5px; + -webkit-padding-start: 0; + } +-.header ul li { ++.cups-header ul li { + float: left; + } +-.header a { ++.cups-header a { + display: block; + padding: 5px 10px !important; + } +-.header a:link, .header a:visited { ++.cups-header a:link, .cups-header a:visited { + color: white !important; + text-decoration: none !important; + } +-.header a:hover { ++.cups-header a:hover { + background: #cccccc !important; + color: #333333 !important; + text-decoration: none !important; + } +-.header a.active { ++.cups-header a.active { + background: white !important; + box-shadow: rgba(0,0,0,0.1) 0 0 10px 0 inset; + color: black !important; + text-decoration: none !important; + } + +-.body { ++.cups-body { + padding: 40px 20px; + } +-.row .body { ++.row .cups-body { + padding: 0; + } + +-.footer { ++.cups-footer { + background: rgba(46,46,46,.9); + bottom: 0; + box-shadow: 0 -2px 5px rgba(0,0,0,0.25); +@@ -62,7 +62,7 @@ + position: fixed; + width: 100%; + } +-.footer a:link, footer a:hover, .footer a:visited { ++.cups-footer a:link, footer a:hover, .cups-footer a:visited { + color: white !important; + text-decoration: none !important; + } +@@ -131,6 +131,7 @@ pre { + } + + blockquote { ++ background: rgba(191,191,191,0.1); + border-left: solid 2px #777; + margin: 1em 0; + padding: 10px; +@@ -207,7 +208,7 @@ table.page { + width: 100%; + } + +-td.body { ++td.cups-body { + height: 100%; + vertical-align: top; + } +@@ -365,7 +366,7 @@ h1.title { + display: none; + } + +-h2.title, h3.title, .row .body h2, .row .body h3 { ++h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 { + border-bottom: solid 2pt black; + } + +@@ -451,8 +452,8 @@ div.sidebar p.l2 { + } + + table.inset { +- background: rgba(191,191,191,0.15); +- border: thin solid rgba(191,191,191,0.3); ++ background: #f4f4f4; ++ border: thin solid rgba(191,191,191,0.5); + margin-top: 1em; + padding: 0; + width: 100%; +@@ -471,7 +472,7 @@ table.inset caption { + } + + table.inset td { +- padding: 2px; ++ padding: 2px 5px; + } + + dt { +@@ -525,15 +526,15 @@ div.tab { + } + + /* API documentation styles... */ +-div.body h1 { ++div.cups-body h1 { + } +-div.body h2 { ++div.cups-body h2 { + } +-div.body h3 { ++div.cups-body h3 { + } +-div.body h4 { ++div.cups-body h4 { + } +-div.body h5 { ++div.cups-body h5 { + } + div.contents { + } +@@ -589,9 +590,14 @@ h1, h2, h3, h4, h5, h6 { + blockquote { + page-break-inside: avoid; + } +-p code, li code, p.code, pre, ul.code li { +- background: rgba(127,127,127,0.1); ++p.code, pre, ul.code li { + border-left: thin dotted gray; ++ background: rgba(191,191,191,0.1); ++} ++p code, li code { ++ background: rgba(191,191,191,0.3); ++} ++p code, li code, p.code, pre, ul.code li { + font-family: monospace; + hyphens: manual; + margin: 18pt 0; +@@ -644,19 +650,19 @@ ul.contents li ul.code, ul.contents li u + display: none; + } + +- .header { ++ .cups-header { + margin: 0; + position: relative; + } +- .header ul li { ++ .cups-header ul li { + float: none; + } + +- .body { ++ .cups-body { + padding: 0; + } + +- .footer { ++ .cups-footer { + font-size: 10px; + height: auto; + position: relative; +@@ -715,6 +721,12 @@ ul.contents li ul.code, ul.contents li u + hr { + color: #666; + } ++ table.inset { ++ background: #1d1d1d; ++ } ++ h2.title, h3.title, .row .cups-body h2, .row .cups-body h3 { ++ border-bottom: solid 2pt #ccc; ++ } + div.table table td, table.list th { + background: black; + } +diff -up cups-2.4.1/doc/da/index.html.in.css-issues cups-2.4.1/doc/da/index.html.in +--- cups-2.4.1/doc/da/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/da/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Hjem - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

CUPS @CUPS_VERSION@

+

CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af OpenPrinting til Linux® og andre UNIX®-lignende styresystemer. CUPS uses IPP Everywhere™ to support printing to local and network printers

+@@ -47,6 +47,6 @@ +
+
+
+-
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
++
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
+ + +diff -up cups-2.4.1/doc/de/index.html.in.css-issues cups-2.4.1/doc/de/index.html.in +--- cups-2.4.1/doc/de/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/de/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Startseite - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

OpenPrinting CUPS @CUPS_VERSION@

+

CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch OpenPrinting für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt IPP Everywhere™ zur Unterstützung lokaler und Netzwerkdrucker.

+@@ -47,6 +47,6 @@ +
+
+
+-
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
++
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
+ + +diff -up cups-2.4.1/doc/es/index.html.in.css-issues cups-2.4.1/doc/es/index.html.in +--- cups-2.4.1/doc/es/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/es/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Inicio - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

CUPS @CUPS_VERSION@

+

CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por OpenPrinting para macOS® y otros sistemas operativos tipo UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

+@@ -47,6 +47,6 @@ +
+
+
+-
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
++
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
+ + +diff -up cups-2.4.1/doc/fr/index.html.in.css-issues cups-2.4.1/doc/fr/index.html.in +--- cups-2.4.1/doc/fr/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/fr/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Home - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

OpenPrinting CUPS @CUPS_VERSION@

+

Le système d'impression open source basé sur des normes, développé par OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ pour prendre en charge l'impression vers des imprimantes locales et de réseau.

+@@ -47,6 +47,6 @@ +
+
+
+-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + +diff -up cups-2.4.1/doc/index.html.in.css-issues cups-2.4.1/doc/index.html.in +--- cups-2.4.1/doc/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Home - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

OpenPrinting CUPS @CUPS_VERSION@

+

The standards-based, open source printing system developed by OpenPrinting for Linux® and other Unix®-like operating systems. CUPS uses IPP Everywhere™ to support printing to local and network printers.

+@@ -47,6 +47,6 @@ +
+
+
+-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + +diff -up cups-2.4.1/doc/ja/index.html.in.css-issues cups-2.4.1/doc/ja/index.html.in +--- cups-2.4.1/doc/ja/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/ja/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + ホーム - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

CUPS @CUPS_VERSION@

+

CUPS は、macOS® およびその他の UNIX ® 系 OS のために、Apple Inc. によって開発された標準ベースのオープンソース印刷システムです。

+@@ -47,6 +47,6 @@ +
+
+
+-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + +diff -up cups-2.4.1/doc/pt_BR/index.html.in.css-issues cups-2.4.1/doc/pt_BR/index.html.in +--- cups-2.4.1/doc/pt_BR/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/pt_BR/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Início - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

CUPS @CUPS_VERSION@

+

CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela OpenPrinting para Linux® e outros sistemas operacionais similares ao UNIX®. CUPS uses IPP Everywhere™ to support printing to local and network printers.

+@@ -47,6 +47,6 @@ +
+
+
+-
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
++
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
+ + +diff -up cups-2.4.1/doc/ru/index.html.in.css-issues cups-2.4.1/doc/ru/index.html.in +--- cups-2.4.1/doc/ru/index.html.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/doc/ru/index.html.in 2022-03-08 13:55:16.075624812 +0100 +@@ -10,7 +10,7 @@ + Home - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

OpenPrinting CUPS @CUPS_VERSION@

+

CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией OpenPrinting для операционной системы Linux® и других UNIX®-подобных операционных систем. CUPS uses IPP Everywhere™ to support printing to local and network printers

+@@ -47,6 +47,6 @@ +
+
+
+-
Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.
++
Copyright © 2021-2022 OpenPrinting. All Rights Reserved.
+ + +diff -up cups-2.4.1/templates/da/header.tmpl.in.css-issues cups-2.4.1/templates/da/header.tmpl.in +--- cups-2.4.1/templates/da/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/da/header.tmpl.in 2022-03-08 13:55:16.075624812 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/da/trailer.tmpl.css-issues cups-2.4.1/templates/da/trailer.tmpl +--- cups-2.4.1/templates/da/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100 ++++ cups-2.4.1/templates/da/trailer.tmpl 2022-03-08 13:56:03.419892000 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
++
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
+ + +diff -up cups-2.4.1/templates/de/header.tmpl.in.css-issues cups-2.4.1/templates/de/header.tmpl.in +--- cups-2.4.1/templates/de/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/de/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/de/trailer.tmpl.css-issues cups-2.4.1/templates/de/trailer.tmpl +--- cups-2.4.1/templates/de/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100 ++++ cups-2.4.1/templates/de/trailer.tmpl 2022-03-08 13:56:14.892956747 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
++
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
+ + +diff -up cups-2.4.1/templates/es/header.tmpl.in.css-issues cups-2.4.1/templates/es/header.tmpl.in +--- cups-2.4.1/templates/es/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/es/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/es/trailer.tmpl.css-issues cups-2.4.1/templates/es/trailer.tmpl +--- cups-2.4.1/templates/es/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100 ++++ cups-2.4.1/templates/es/trailer.tmpl 2022-03-08 13:56:29.420038731 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
++
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
+ + +diff -up cups-2.4.1/templates/fr/header.tmpl.in.css-issues cups-2.4.1/templates/fr/header.tmpl.in +--- cups-2.4.1/templates/fr/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/fr/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/fr/trailer.tmpl.css-issues cups-2.4.1/templates/fr/trailer.tmpl +--- cups-2.4.1/templates/fr/trailer.tmpl.css-issues 2022-03-08 13:55:16.076624818 +0100 ++++ cups-2.4.1/templates/fr/trailer.tmpl 2022-03-08 13:56:40.341100363 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. Tous droits réservés.
++
Copyright © 2021-2022 OpenPrinting. Tous droits réservés.
+ + +diff -up cups-2.4.1/templates/header.tmpl.in.css-issues cups-2.4.1/templates/header.tmpl.in +--- cups-2.4.1/templates/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/ja/header.tmpl.in.css-issues cups-2.4.1/templates/ja/header.tmpl.in +--- cups-2.4.1/templates/ja/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/ja/header.tmpl.in 2022-03-08 13:55:16.076624818 +0100 +@@ -19,7 +19,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/ja/trailer.tmpl.css-issues cups-2.4.1/templates/ja/trailer.tmpl +--- cups-2.4.1/templates/ja/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100 ++++ cups-2.4.1/templates/ja/trailer.tmpl 2022-03-08 13:56:55.101183659 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + +diff -up cups-2.4.1/templates/pt_BR/header.tmpl.in.css-issues cups-2.4.1/templates/pt_BR/header.tmpl.in +--- cups-2.4.1/templates/pt_BR/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/pt_BR/header.tmpl.in 2022-03-08 13:55:16.077624823 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/pt_BR/trailer.tmpl.css-issues cups-2.4.1/templates/pt_BR/trailer.tmpl +--- cups-2.4.1/templates/pt_BR/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100 ++++ cups-2.4.1/templates/pt_BR/trailer.tmpl 2022-03-08 13:57:11.349275354 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
++
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
+ + +diff -up cups-2.4.1/templates/ru/header.tmpl.in.css-issues cups-2.4.1/templates/ru/header.tmpl.in +--- cups-2.4.1/templates/ru/header.tmpl.in.css-issues 2022-01-27 12:11:42.000000000 +0100 ++++ cups-2.4.1/templates/ru/header.tmpl.in 2022-03-08 13:55:16.077624823 +0100 +@@ -27,7 +27,7 @@ + {title} - CUPS @CUPS_VERSION@ + + +-
++
+ +
+-
++
+
+

{title}

+diff -up cups-2.4.1/templates/ru/trailer.tmpl.css-issues cups-2.4.1/templates/ru/trailer.tmpl +--- cups-2.4.1/templates/ru/trailer.tmpl.css-issues 2022-03-08 13:55:16.077624823 +0100 ++++ cups-2.4.1/templates/ru/trailer.tmpl 2022-03-08 13:57:25.262353870 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. Все права защищены.
++
Copyright © 2021-2022 OpenPrinting. Все права защищены.
+ + +diff -up cups-2.4.1/templates/trailer.tmpl.css-issues cups-2.4.1/templates/trailer.tmpl +--- cups-2.4.1/templates/trailer.tmpl.css-issues 2022-03-08 13:55:16.073624801 +0100 ++++ cups-2.4.1/templates/trailer.tmpl 2022-03-08 13:55:16.077624823 +0100 +@@ -1,5 +1,5 @@ +
+
+-
Copyright © 2021-2022 OpenPrinting. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + diff --git a/net-print/cups/files/0001-Footer-message-corrected.patch b/net-print/cups/files/0001-Footer-message-corrected.patch new file mode 100644 index 000000000000..b2a2074c70d1 --- /dev/null +++ b/net-print/cups/files/0001-Footer-message-corrected.patch @@ -0,0 +1,89 @@ +diff --git a/templates/da/trailer.tmpl b/templates/da/trailer.tmpl +index aede375..d448d7e 100644 +--- a/templates/da/trailer.tmpl ++++ b/templates/da/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS og CUPS-logoet er varemærker som tilhører Apple Inc. Ophavsret © 2007-2019 Apple Inc. Alle rettigheder forbeholdt.
++
Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.
+ + +diff --git a/templates/de/trailer.tmpl b/templates/de/trailer.tmpl +index c1f5d38..cf3caca 100644 +--- a/templates/de/trailer.tmpl ++++ b/templates/de/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS und das CUPS-Logo sind Warenzeichen der Apple Inc. Copyright © 2007-2019 Apple Inc. Alle Rechte vorbehalten.
++
Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.
+ + +diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl +index c1cb58f..9b9047e 100644 +--- a/templates/es/trailer.tmpl ++++ b/templates/es/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS y el logo de CUPS son marcas registradas de Apple Inc. Derechos de autor © 2007-2019 Apple Inc. Todos los derechos reservados.
++
Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.
+ + +diff --git a/templates/fr/trailer.tmpl b/templates/fr/trailer.tmpl +index 6e9b8b1..9628176 100644 +--- a/templates/fr/trailer.tmpl ++++ b/templates/fr/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS et le logo CUPS sont des marques déposées de Apple Inc. CUPS est sous copyright 2007-2019 Apple Inc. Tous droits réservés.
++
Copyright © 2021-2022 OpenPrinting. Tous droits réservés.
+ + +diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl +index a4f86b1..240c56b 100644 +--- a/templates/ja/trailer.tmpl ++++ b/templates/ja/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2019 Apple Inc. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + +diff --git a/templates/pt_BR/trailer.tmpl b/templates/pt_BR/trailer.tmpl +index 673a555..774bc1d 100644 +--- a/templates/pt_BR/trailer.tmpl ++++ b/templates/pt_BR/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS e sua logo são marcas registradas da Apple Inc. Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.
++
Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.
+ + +diff --git a/templates/ru/trailer.tmpl b/templates/ru/trailer.tmpl +index 260d0e9..c6ec6e4 100644 +--- a/templates/ru/trailer.tmpl ++++ b/templates/ru/trailer.tmpl +@@ -1,6 +1,5 @@ +
+
+-
CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками +-Apple Inc. Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.
++
Copyright © 2021-2022 OpenPrinting. Все права защищены.
+ + +diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl +index a4f86b1..240c56b 100644 +--- a/templates/trailer.tmpl ++++ b/templates/trailer.tmpl +@@ -1,5 +1,5 @@ +
+
+-
CUPS and the CUPS logo are trademarks of Apple Inc. Copyright © 2007-2019 Apple Inc. All rights reserved.
++
Copyright © 2021-2022 OpenPrinting. All rights reserved.
+ + diff --git a/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch b/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch new file mode 100644 index 000000000000..79e462e1547d --- /dev/null +++ b/net-print/cups/files/0001-cups-fix-uninit-value-jump.patch @@ -0,0 +1,18 @@ +diff --git a/cups/ppd.c b/cups/ppd.c +index 525df3592..54368ac4c 100644 +--- a/cups/ppd.c ++++ b/cups/ppd.c +@@ -3430,12 +3430,12 @@ ppd_update_filters(ppd_file_t *ppd, /* I - PPD file */ + srctype[256], + dstsuper[16], /* Destination MIME media type */ + dsttype[256], +- program[1024], /* Command to run */ + *ptr, /* Pointer into command to run */ + buffer[1024], /* Re-written cupsFilter value */ + **filter; /* Current filter */ + int cost; /* Cost of filter */ + ++ char program[1024] = { 0 }; /* Command to run */ + + DEBUG_printf(("4ppd_update_filters(ppd=%p, cg=%p)", ppd, pg)); + diff --git a/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch b/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch new file mode 100644 index 000000000000..67e2edcfed67 --- /dev/null +++ b/net-print/cups/files/0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch @@ -0,0 +1,55 @@ +From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 6 Apr 2022 15:04:45 +0200 +Subject: [PATCH] cups/tls-gnutls.c: Use always GNUTLS_SHUT_WR + +The current mode for `gnutls_bye()` in client use cases strictly +follows TLS v1.2 standard, which in this particular part says: + +``` +Unless some other fatal alert has been transmitted, each party is +required to send a close_notify alert before closing the write +side of the connection. The other party MUST respond with a +close_notify alert of its own and close down the connection immediately, +discarding any pending writes. It is not required for the initiator +of the close to wait for the responding close_notify alert before +closing the read side of the connection. +``` + +and waits for the other side of TLS connection to confirm the close. + +Unfortunately it can undesired for reasons: +- we support switching of TLS versions in CUPS, and this mode strictly + follows TLS v1.2 - so for older version this behavior is not expected + and can cause delays +- even some TLS v1.2 implementations (like Windows Server 2016) don't + comply TLS v1.2 behavior even if it says it does - in that case, + encrypted printing takes 30s till HTTP timeout is reached, because the + other side didn't send confirmation +- AFAIU openssl's SSL_shutdown() doesn't make this TLS v1.2 difference, + so we could end up with two TLS implementations in CUPS which will + behave differently + +Since the standard defines that waiting for confirmation is not required +and due the problems above, I would propose using GNUTLS_SHUT_WR mode +regardless of HTTP mode. +--- + cups/tls-gnutls.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c +index c55995b2b..f87b4f4df 100644 +--- a/cups/tls-gnutls.c ++++ b/cups/tls-gnutls.c +@@ -1667,7 +1667,7 @@ _httpTLSStop(http_t *http) /* I - Connection to server */ + int error; /* Error code */ + + +- error = gnutls_bye(http->tls, http->mode == _HTTP_MODE_CLIENT ? GNUTLS_SHUT_RDWR : GNUTLS_SHUT_WR); ++ error = gnutls_bye(http->tls, GNUTLS_SHUT_WR); + if (error != GNUTLS_E_SUCCESS) + _cupsSetError(IPP_STATUS_ERROR_INTERNAL, gnutls_strerror(errno), 0); + +-- +2.35.1 + diff --git a/net-print/cups/files/cups-2.4.1-nostrip.patch b/net-print/cups/files/cups-2.4.1-nostrip.patch new file mode 100644 index 000000000000..5862ce178255 --- /dev/null +++ b/net-print/cups/files/cups-2.4.1-nostrip.patch @@ -0,0 +1,11 @@ +--- a/config-scripts/cups-compiler.m4 2022-01-27 12:11:42.000000000 +0100 ++++ b/config-scripts/cups-compiler.m4 2022-05-01 11:24:58.855033882 +0200 +@@ -30,8 +30,6 @@ + dnl For debugging, keep symbols, otherwise strip them... + AS_IF([test x$enable_debug = xyes -a "x$OPTIM" = x], [ + OPTIM="-g" +-], [ +- INSTALL_STRIP="-s" + ]) + + dnl Debug printfs can slow things down, so provide a separate option for that diff --git a/net-print/cups/files/cups-2.4.1-resolve-uri.patch b/net-print/cups/files/cups-2.4.1-resolve-uri.patch new file mode 100644 index 000000000000..e138e20dec14 --- /dev/null +++ b/net-print/cups/files/cups-2.4.1-resolve-uri.patch @@ -0,0 +1,31 @@ +diff -up cups-2.4.1/scheduler/ipp.c.resolve-uri cups-2.4.1/scheduler/ipp.c +--- cups-2.4.1/scheduler/ipp.c.resolve-uri 2022-03-04 08:13:13.712346134 +0100 ++++ cups-2.4.1/scheduler/ipp.c 2022-03-04 08:17:17.486819820 +0100 +@@ -5271,6 +5271,7 @@ create_local_bg_thread( + userpass[256], /* User:pass */ + host[256], /* Hostname */ + resource[1024], /* Resource path */ ++ uri[1024], /* Resolved URI, if needed */ + line[1024]; /* Line from PPD */ + int port; /* Port number */ + http_encryption_t encryption; /* Type of encryption to use */ +@@ -5292,6 +5293,19 @@ create_local_bg_thread( + + cupsdLogMessage(CUPSD_LOG_DEBUG, "%s: Generating PPD file from \"%s\"...", printer->name, printer->device_uri); + ++ if (strstr(printer->device_uri, "._tcp")) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "%s: Resolving mDNS URI \"%s\".", printer->name, printer->device_uri); ++ ++ if (!_httpResolveURI(printer->device_uri, uri, sizeof(uri), _HTTP_RESOLVE_DEFAULT, NULL, NULL)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Couldn't resolve mDNS URI \"%s\".", printer->name, printer->device_uri); ++ return (NULL); ++ } ++ ++ printer->device_uri = uri; ++ } ++ + if (httpSeparateURI(HTTP_URI_CODING_ALL, printer->device_uri, scheme, sizeof(scheme), userpass, sizeof(userpass), host, sizeof(host), &port, resource, sizeof(resource)) < HTTP_URI_STATUS_OK) + { + cupsdLogMessage(CUPSD_LOG_ERROR, "%s: Bad device URI \"%s\".", printer->name, printer->device_uri); diff --git a/net-print/cups/files/cups-2.4.1-user-AR.patch b/net-print/cups/files/cups-2.4.1-user-AR.patch new file mode 100644 index 000000000000..edbecd6ed9fa --- /dev/null +++ b/net-print/cups/files/cups-2.4.1-user-AR.patch @@ -0,0 +1,21 @@ +--- a/config-scripts/cups-common.m4 ++++ b/config-scripts/cups-common.m4 +@@ -39,15 +39,15 @@ + AC_PROG_CPP + AC_PROG_CXX + 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]) diff --git a/net-print/cups/files/cups-2.4.2-no-fortify-override.patch b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch new file mode 100644 index 000000000000..e9153ce2f082 --- /dev/null +++ b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch @@ -0,0 +1,18 @@ +Gentoo already sets -D_FORTIFY_SOURCE=2 by default in GCC (patched in), so +we need to avoid doing this in packages to avoid redefinition errors if +we try to upgrade to e.g. =3. + +So, no effect on users, but important to stop issues w/ F_S=3. +--- a/config-scripts/cups-compiler.m4 ++++ b/config-scripts/cups-compiler.m4 +@@ -106,8 +106,8 @@ AS_IF([test -n "$GCC"], [ + ], [ + # Otherwise use the Fortify enhancements to catch any unbounded + # string operations... +- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" +- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ++ CFLAGS="$CFLAGS" ++ CXXFLAGS="$CXXFLAGS" + ]) + + # Default optimization options... diff --git a/net-print/cups/files/cupsd.init.d-r3 b/net-print/cups/files/cupsd.init.d-r3 deleted file mode 100644 index 2f563e4c7698..000000000000 --- a/net-print/cups/files/cupsd.init.d-r3 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation - -description="The Common Unix Printing System daemon" -command="/usr/sbin/cupsd" -command_args="-f -c /etc/cups/cupsd.conf -s /etc/cups/cups-files.conf" -pidfile="/var/run/cupsd.pid" -start_stop_daemon_args="-b -m --pidfile ${pidfile}" - -depend() { - use net - @neededservices@ - before nfs - after logger -} - -start_pre() { - checkpath -q -d -m 0775 -o root:lp /var/cache/cups - checkpath -q -d -m 0775 -o root:lp /var/cache/cups/rss - checkpath -q -d -m 0755 -o root:lp /run/cups - checkpath -q -d -m 0511 -o lp:lpadmin /run/cups/certs -} -- cgit v1.2.3