2090633 - cups-2.4.2 is available
This commit is contained in:
Zdenek Dohnal
parent
8eb2617ff8
commit
7e5364ebb7
1
.gitignore
vendored
1
.gitignore
vendored
@ -97,3 +97,4 @@ cups-1.4.4-source.tar.bz2
|
|||||||
/cups-2.3.3op2-source.tar.gz
|
/cups-2.3.3op2-source.tar.gz
|
||||||
/cups-2.4.0-source.tar.gz
|
/cups-2.4.0-source.tar.gz
|
||||||
/cups-2.4.1-source.tar.gz
|
/cups-2.4.1-source.tar.gz
|
||||||
|
/cups-2.4.2-source.tar.gz
|
||||||
|
|||||||
@ -1,667 +0,0 @@
|
|||||||
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 @@
|
|
||||||
<title>Hjem - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Hjem</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Printere</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>CUPS er det standardbaseret, open source-udskrivningssystem som er udviklet af <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> til Linux® og andre UNIX<sup>®</sup>-lignende styresystemer. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
|
|
||||||
+ <div class="cups-footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Startseite - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Startseite</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Drucker</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>CUPS basiert auf Standards, Open Source Drucksystem entwickelt durch <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> für Linux® und andere UNIX®-artige Betriebssysteme. CUPS benutzt <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> zur Unterstützung lokaler und Netzwerkdrucker.</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Inicio - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Inicio</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Impresoras</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>CUPS es el sistema de impresión de código abierto basado en estándares desarrollado por <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para macOS<sup>®</sup> y otros sistemas operativos tipo UNIX<sup>®</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
|
|
||||||
+ <div class="cups-footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Home - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Home</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Imprimantes</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>Le système d'impression open source basé sur des normes, développé par <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> pour prendre en charge l'impression vers des imprimantes locales et de réseau.</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Home - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Home</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Printers</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>The standards-based, open source printing system developed by <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> for Linux® and other Unix®-like operating systems. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>ホーム - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">ホーム</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">プリンター</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>CUPS は、macOS<sup>®</sup> およびその他の UNIX <SUP>®</sup> 系 OS のために、<a href="http://www.apple.com/">Apple Inc.</a> によって開発された標準ベースのオープンソース印刷システムです。</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Início - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Início</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Impressoras</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>CUPS @CUPS_VERSION@</h1>
|
|
||||||
<p>CUPS é o sistema de impressão baseado em padrões e de código aberto desenvolvido pela <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> para Linux® e outros sistemas operacionais similares ao UNIX<sup>®</sup>. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers.</p>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
<title>Home - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a class="active" href="/">Начало</a></li>
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
<li><a href="/printers/">Принтеры</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>OpenPrinting CUPS @CUPS_VERSION@</h1>
|
|
||||||
<P>CUPS — поддерживающая большинство стандартов, свободная подсистема печати, разрабатываемая компанией <a class="jumbolink" href="https://openprinting.github.io/" target="_blank">OpenPrinting</a> для операционной системы Linux® и других UNIX<SUP>®</SUP>-подобных операционных систем. CUPS uses <a href="https://www.pwg.org/ipp/everywhere.html" target="_blank">IPP Everywhere™</a> to support printing to local and network printers</P>
|
|
||||||
@@ -47,6 +47,6 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer"> Авторские права на CUPS принадлежат (2021) компании OpenPrinting Все права защищены.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All Rights Reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Hjem</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Printere</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
|
|
||||||
+ <div class="cups-footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Startseite</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Drucker</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Inicio</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Impresoras</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
|
|
||||||
+ <div class="cups-footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Home</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Imprimantes</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Home</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Printers</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">ホーム</a></li>
|
|
||||||
@@ -30,6 +30,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">プリンター</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Início</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Impressoras</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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>{title} - CUPS @CUPS_VERSION@</title>
|
|
||||||
</head>
|
|
||||||
<body onload="check_cookies();">
|
|
||||||
- <div class="header">
|
|
||||||
+ <div class="cups-header">
|
|
||||||
<ul>
|
|
||||||
<li><a href="https://openprinting.github.io/cups/" target="_blank">OpenPrinting CUPS</a></li>
|
|
||||||
<li><a href="/">Начало</a></li>
|
|
||||||
@@ -38,6 +38,6 @@
|
|
||||||
<li><a {SECTION=printers?class="active" :}href="/printers/">Принтеры</a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
- <div class="body">
|
|
||||||
+ <div class="cups-body">
|
|
||||||
<div class="row">
|
|
||||||
<h1>{title}</h1>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
+ <div class="cups-footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,89 +0,0 @@
|
|||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS og CUPS-logoet er varemærker som tilhører <a href="http://www.apple.com">Apple Inc.</a> Ophavsret © 2007-2019 Apple Inc. Alle rettigheder forbeholdt.</div>
|
|
||||||
+ <div class="footer">Ophavsret © 2021-2022 OpenPrinting. Alle rettigheder forbeholdt.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS und das CUPS-Logo sind Warenzeichen der <a href="https://www.apple.com/">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Alle Rechte vorbehalten.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Alle Rechte vorbehalten.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS y el logo de CUPS son marcas registradas de <a href="http://www.apple.com">Apple Inc.</a> Derechos de autor © 2007-2019 Apple Inc. Todos los derechos reservados.</div>
|
|
||||||
+ <div class="footer">Derechos de autor © 2021-2022 OpenPrinting. Todos los derechos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS et le logo CUPS sont des marques déposées de <a href="http://www.apple.com">Apple Inc.</a> CUPS est sous copyright 2007-2019 Apple Inc. Tous droits réservés.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Tous droits réservés.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS e sua logo são marcas registradas da <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. Todos os direitos reservados.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Todos os direitos reservados.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS, а так же логотип CUPS являются зарегистрированными торговыми марками
|
|
||||||
-<A HREF="http://www.apple.com">Apple Inc.</A> Авторские права на CUPS принадлежат (2007-2019) компании Apple Inc. Все права защищены.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. Все права защищены.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
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 @@
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
- <div class="footer">CUPS and the CUPS logo are trademarks of <a href="http://www.apple.com">Apple Inc.</a> Copyright © 2007-2019 Apple Inc. All rights reserved.</div>
|
|
||||||
+ <div class="footer">Copyright © 2021-2022 OpenPrinting. All rights reserved.</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
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));
|
|
||||||
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
From bdb1ca45454d90410031c4c2054005a995f76180 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Zdenek Dohnal <zdohnal@redhat.com>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
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);
|
|
||||||
32
cups.spec
32
cups.spec
@ -14,8 +14,8 @@
|
|||||||
Summary: CUPS printing system
|
Summary: CUPS printing system
|
||||||
Name: cups
|
Name: cups
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 2.4.1
|
Version: 2.4.2
|
||||||
Release: 9%{?dist}
|
Release: 1%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Url: https://openprinting.github.io/cups/
|
Url: https://openprinting.github.io/cups/
|
||||||
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
# Apple stopped uploading the new versions into github, use OpenPrinting fork
|
||||||
@ -67,19 +67,6 @@ Patch100: cups-lspp.patch
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
#### UPSTREAM PATCHES (starts with 1000) ####
|
#### UPSTREAM PATCHES (starts with 1000) ####
|
||||||
# uninitialized value in cups library on ppc64le
|
|
||||||
# https://github.com/OpenPrinting/cups/pull/329
|
|
||||||
Patch1000: 0001-cups-fix-uninit-value-jump.patch
|
|
||||||
# background thread for adding IPP Everywhere printers didn't resolve
|
|
||||||
# mDNS URIs
|
|
||||||
# https://github.com/OpenPrinting/cups/issues/340
|
|
||||||
Patch1001: cups-resolve-uri.patch
|
|
||||||
# Fix copyright in trailer templates
|
|
||||||
Patch1002: 0001-Footer-message-corrected.patch
|
|
||||||
# CSS issues in web ui
|
|
||||||
Patch1003: 0001-Fix-some-web-interface-issues.patch
|
|
||||||
# 2073268 - 30-second delays printing to Windows 2016 server via HTTPS
|
|
||||||
Patch1004: 0001-cups-tls-gnutls.c-Use-always-GNUTLS_SHUT_WR.patch
|
|
||||||
|
|
||||||
##### Patches removed because IMHO they aren't no longer needed
|
##### Patches removed because IMHO they aren't no longer needed
|
||||||
##### but still I'll leave them in git in case their removal
|
##### but still I'll leave them in git in case their removal
|
||||||
@ -283,18 +270,6 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
|
|||||||
%patch13 -p1 -b .dymo-deviceid
|
%patch13 -p1 -b .dymo-deviceid
|
||||||
|
|
||||||
# UPSTREAM PATCHES
|
# UPSTREAM PATCHES
|
||||||
# uninitialized value in PPD CUPS API
|
|
||||||
%patch1000 -p1 -b .ppd-memleak
|
|
||||||
# background thread for adding IPP Everywhere printers didn't resolve
|
|
||||||
# mDNS URIs
|
|
||||||
# https://github.com/OpenPrinting/cups/issues/340
|
|
||||||
%patch1001 -p1 -b .resolve-uri
|
|
||||||
# Fixed copyright in trailers
|
|
||||||
%patch1002 -p1 -b .trailer-copyright
|
|
||||||
# CSS issues in web ui
|
|
||||||
%patch1003 -p1 -b .css-issues
|
|
||||||
# 2073268 - 30-second delays printing to Windows 2016 server via HTTPS
|
|
||||||
%patch1004 -p1 -b .gnutlsbye
|
|
||||||
|
|
||||||
|
|
||||||
%if %{lspp}
|
%if %{lspp}
|
||||||
@ -685,6 +660,9 @@ rm -f %{cups_serverbin}/backend/smb
|
|||||||
%{_mandir}/man7/ippeveps.7.gz
|
%{_mandir}/man7/ippeveps.7.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 31 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.2-1
|
||||||
|
- 2090633 - cups-2.4.2 is available
|
||||||
|
|
||||||
* Thu May 05 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.1-9
|
* Thu May 05 2022 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.4.1-9
|
||||||
- add .gz to several files, which are compressed during installation script
|
- add .gz to several files, which are compressed during installation script
|
||||||
|
|
||||||
|
|||||||
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cups-2.4.1-source.tar.gz) = 74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd
|
SHA512 (cups-2.4.2-source.tar.gz) = 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user