| 1 |
commit: 258d621488916857113d5a765198d020783c766f |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 17 13:44:53 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 17 16:21:05 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258d6214 |
| 7 |
|
| 8 |
net-print/cups-filters: Drop old versions |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
net-print/cups-filters/Manifest | 2 - |
| 13 |
.../cups-filters/cups-filters-1.28.10-r3.ebuild | 149 --------------------- |
| 14 |
net-print/cups-filters/cups-filters-1.28.14.ebuild | 128 ------------------ |
| 15 |
...rs-1.28.2-make-missing-testfont-non-fatal.patch | 14 -- |
| 16 |
net-print/cups/files/cups-1.4.4-nostrip.patch | 14 -- |
| 17 |
.../cups/files/cups-2.2.6-fix-install-perms.patch | 18 --- |
| 18 |
.../files/cups-2.3.3-enforcing-read-limits.patch | 29 ---- |
| 19 |
.../cups/files/cups-2.3.3-ipp-retry-validate.patch | 43 ------ |
| 20 |
net-print/cups/files/cups-2.3.3-manpage.patch | 23 ---- |
| 21 |
net-print/cups/files/cups-2.3.3-timeout.patch | 26 ---- |
| 22 |
net-print/cups/files/cups-2.3.3-user-AR.patch | 22 --- |
| 23 |
11 files changed, 468 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest |
| 26 |
index bc649a3fb8b4..1093167a1966 100644 |
| 27 |
--- a/net-print/cups-filters/Manifest |
| 28 |
+++ b/net-print/cups-filters/Manifest |
| 29 |
@@ -1,3 +1 @@ |
| 30 |
-DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263 SHA512 d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659 |
| 31 |
-DIST cups-filters-1.28.14.tar.xz 1510944 BLAKE2B 653f68a39ed16d3a8298e5784aebebead224a0ee08071add702bb02fc987f3c4d454793531db262d9a44618f4fe29a7ce0144cfb8fe77634e9b7c222de21fe62 SHA512 a128858ac582da1322edad1cfca02bb6e5a077a4d3ca61d9e33e07b83e5015bb1a11571d30c66069f503031a6b55a82d7867cd171a7090fa729d894441f7abdd |
| 32 |
DIST cups-filters-1.28.15.tar.xz 1511452 BLAKE2B 2ed495f063197955456c07c6c06747093997afce53c15e19d081f2e53e6af9a76a41094d2356a1cd7533c3bb63bfb6257792b71ee14121a0daf5863b3b5cd76f SHA512 cc8d43bba6edb2b839f3be5fcbcdeb7633ed0f0f0c2737bcc6957cf95fb4ded8ee412358cc95fdbf289ae897dd0b7f32e689f02d191a8f15930eb4d2deefd74c |
| 33 |
|
| 34 |
diff --git a/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild b/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index ac0eb472327d..000000000000 |
| 37 |
--- a/net-print/cups-filters/cups-filters-1.28.10-r3.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,149 +0,0 @@ |
| 40 |
-# Copyright 1999-2022 Gentoo Authors |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
- |
| 43 |
-EAPI=8 |
| 44 |
- |
| 45 |
-GENTOO_DEPEND_ON_PERL=no |
| 46 |
- |
| 47 |
-inherit autotools perl-module systemd flag-o-matic |
| 48 |
- |
| 49 |
-if [[ "${PV}" == "9999" ]] ; then |
| 50 |
- inherit git-r3 |
| 51 |
- EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git" |
| 52 |
-else |
| 53 |
- SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" |
| 54 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
| 55 |
-fi |
| 56 |
-DESCRIPTION="Cups filters" |
| 57 |
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" |
| 58 |
- |
| 59 |
-LICENSE="MIT GPL-2" |
| 60 |
-SLOT="0" |
| 61 |
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" |
| 62 |
- |
| 63 |
-RESTRICT="!test? ( test )" |
| 64 |
- |
| 65 |
-RDEPEND=" |
| 66 |
- >=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] |
| 67 |
- >=app-text/qpdf-8.3.0:= |
| 68 |
- dev-libs/glib:2 |
| 69 |
- media-libs/fontconfig |
| 70 |
- media-libs/freetype:2 |
| 71 |
- media-libs/lcms:2 |
| 72 |
- >=net-print/cups-1.7.3 |
| 73 |
- !<=net-print/cups-1.5.9999 |
| 74 |
- sys-devel/bc |
| 75 |
- sys-libs/zlib |
| 76 |
- dbus? ( sys-apps/dbus ) |
| 77 |
- foomatic? ( !net-print/foomatic-filters ) |
| 78 |
- jpeg? ( virtual/jpeg:0 ) |
| 79 |
- ldap? ( net-nds/openldap:= ) |
| 80 |
- pdf? ( app-text/mupdf ) |
| 81 |
- perl? ( dev-lang/perl:= ) |
| 82 |
- png? ( media-libs/libpng:0= ) |
| 83 |
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) |
| 84 |
- tiff? ( media-libs/tiff:0 ) |
| 85 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 86 |
-" |
| 87 |
-DEPEND="${RDEPEND}" |
| 88 |
-BDEPEND=" |
| 89 |
- dev-util/gdbus-codegen |
| 90 |
- >=sys-devel/gettext-0.18.3 |
| 91 |
- virtual/pkgconfig |
| 92 |
- test? ( media-fonts/dejavu ) |
| 93 |
-" |
| 94 |
- |
| 95 |
-src_prepare() { |
| 96 |
- local need_eautoreconf= |
| 97 |
- |
| 98 |
- default |
| 99 |
- |
| 100 |
- if ! use test ; then |
| 101 |
- eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch |
| 102 |
- need_eautoreconf=yes |
| 103 |
- elif [[ "${PV}" == "9999" ]] ; then |
| 104 |
- need_eautoreconf=yes |
| 105 |
- fi |
| 106 |
- |
| 107 |
- [[ -n ${need_eautoreconf} ]] && eautoreconf |
| 108 |
-} |
| 109 |
- |
| 110 |
-src_configure() { |
| 111 |
- # Bug #626800 |
| 112 |
- append-cxxflags -std=c++11 |
| 113 |
- |
| 114 |
- local myeconfargs=( |
| 115 |
- --enable-imagefilters |
| 116 |
- --localstatedir="${EPREFIX}"/var |
| 117 |
- --with-browseremoteprotocols=DNSSD,CUPS |
| 118 |
- --with-cups-rundir="${EPREFIX}"/run/cups |
| 119 |
- --with-fontdir="fonts/conf.avail" |
| 120 |
- --with-pdftops=pdftops |
| 121 |
- --with-rcdir=no |
| 122 |
- --without-php |
| 123 |
- --disable-static |
| 124 |
- $(use_enable dbus) |
| 125 |
- $(use_enable foomatic) |
| 126 |
- $(use_enable ldap) |
| 127 |
- $(use_enable pclm) |
| 128 |
- $(use_enable pdf mutool) |
| 129 |
- $(use_enable postscript ghostscript) |
| 130 |
- $(use_enable zeroconf avahi) |
| 131 |
- $(use_with jpeg) |
| 132 |
- $(use_with png) |
| 133 |
- $(use_with tiff) |
| 134 |
- ) |
| 135 |
- |
| 136 |
- econf "${myeconfargs[@]}" |
| 137 |
-} |
| 138 |
- |
| 139 |
-src_compile() { |
| 140 |
- default |
| 141 |
- |
| 142 |
- if use perl; then |
| 143 |
- pushd "${S}/scripting/perl" > /dev/null || die |
| 144 |
- perl-module_src_configure |
| 145 |
- perl-module_src_compile |
| 146 |
- popd > /dev/null || die |
| 147 |
- fi |
| 148 |
-} |
| 149 |
- |
| 150 |
-src_test() { |
| 151 |
- emake check |
| 152 |
-} |
| 153 |
- |
| 154 |
-src_install() { |
| 155 |
- default |
| 156 |
- |
| 157 |
- if use perl; then |
| 158 |
- pushd "${S}/scripting/perl" > /dev/null || die |
| 159 |
- perl-module_src_install |
| 160 |
- perl_delete_localpod |
| 161 |
- popd > /dev/null || die |
| 162 |
- fi |
| 163 |
- |
| 164 |
- if use postscript; then |
| 165 |
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 |
| 166 |
- dosym gstoraster /usr/libexec/cups/filter/pstoraster |
| 167 |
- dosym gstopxl /usr/libexec/cups/filter/pstopxl |
| 168 |
- fi |
| 169 |
- |
| 170 |
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die |
| 171 |
- |
| 172 |
- cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die |
| 173 |
- |
| 174 |
- if ! use zeroconf ; then |
| 175 |
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die |
| 176 |
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die |
| 177 |
- fi |
| 178 |
- |
| 179 |
- doinitd "${T}"/cups-browsed |
| 180 |
- systemd_dounit "${S}"/utils/cups-browsed.service |
| 181 |
-} |
| 182 |
- |
| 183 |
-pkg_postinst() { |
| 184 |
- if ! use foomatic ; then |
| 185 |
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely" |
| 186 |
- ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained." |
| 187 |
- fi |
| 188 |
-} |
| 189 |
|
| 190 |
diff --git a/net-print/cups-filters/cups-filters-1.28.14.ebuild b/net-print/cups-filters/cups-filters-1.28.14.ebuild |
| 191 |
deleted file mode 100644 |
| 192 |
index 58faa6fecaac..000000000000 |
| 193 |
--- a/net-print/cups-filters/cups-filters-1.28.14.ebuild |
| 194 |
+++ /dev/null |
| 195 |
@@ -1,128 +0,0 @@ |
| 196 |
-# Copyright 1999-2022 Gentoo Authors |
| 197 |
-# Distributed under the terms of the GNU General Public License v2 |
| 198 |
- |
| 199 |
-EAPI=8 |
| 200 |
- |
| 201 |
-GENTOO_DEPEND_ON_PERL=no |
| 202 |
-inherit perl-module systemd flag-o-matic |
| 203 |
- |
| 204 |
-DESCRIPTION="Cups filters" |
| 205 |
-HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters" |
| 206 |
-SRC_URI="https://www.openprinting.org/download/${PN}/${P}.tar.xz" |
| 207 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
| 208 |
- |
| 209 |
-LICENSE="MIT GPL-2" |
| 210 |
-SLOT="0" |
| 211 |
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf" |
| 212 |
- |
| 213 |
-RESTRICT="!test? ( test )" |
| 214 |
- |
| 215 |
-RDEPEND=" |
| 216 |
- >=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils] |
| 217 |
- >=app-text/qpdf-8.3.0:= |
| 218 |
- dev-libs/glib:2 |
| 219 |
- media-libs/fontconfig |
| 220 |
- media-libs/freetype:2 |
| 221 |
- media-libs/lcms:2 |
| 222 |
- >=net-print/cups-1.7.3 |
| 223 |
- !<=net-print/cups-1.5.9999 |
| 224 |
- sys-devel/bc |
| 225 |
- sys-libs/zlib |
| 226 |
- dbus? ( sys-apps/dbus ) |
| 227 |
- foomatic? ( !net-print/foomatic-filters ) |
| 228 |
- jpeg? ( virtual/jpeg:0 ) |
| 229 |
- ldap? ( net-nds/openldap:= ) |
| 230 |
- pdf? ( app-text/mupdf ) |
| 231 |
- perl? ( dev-lang/perl:= ) |
| 232 |
- png? ( media-libs/libpng:0= ) |
| 233 |
- postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) |
| 234 |
- tiff? ( media-libs/tiff:0 ) |
| 235 |
- zeroconf? ( net-dns/avahi[dbus] ) |
| 236 |
-" |
| 237 |
-DEPEND="${RDEPEND}" |
| 238 |
-BDEPEND=" |
| 239 |
- dev-util/gdbus-codegen |
| 240 |
- >=sys-devel/gettext-0.18.3 |
| 241 |
- virtual/pkgconfig |
| 242 |
- test? ( media-fonts/dejavu ) |
| 243 |
-" |
| 244 |
- |
| 245 |
-src_configure() { |
| 246 |
- # Bug #626800 |
| 247 |
- append-cxxflags -std=c++11 |
| 248 |
- |
| 249 |
- local myeconfargs=( |
| 250 |
- --enable-imagefilters |
| 251 |
- --localstatedir="${EPREFIX}"/var |
| 252 |
- --with-browseremoteprotocols=DNSSD,CUPS |
| 253 |
- --with-cups-rundir="${EPREFIX}"/run/cups |
| 254 |
- --with-fontdir="fonts/conf.avail" |
| 255 |
- --with-pdftops=pdftops |
| 256 |
- --with-rcdir=no |
| 257 |
- --without-php |
| 258 |
- --disable-static |
| 259 |
- $(use_enable dbus) |
| 260 |
- $(use_enable foomatic) |
| 261 |
- $(use_enable ldap) |
| 262 |
- $(use_enable pclm) |
| 263 |
- $(use_enable pdf mutool) |
| 264 |
- $(use_enable postscript ghostscript) |
| 265 |
- $(use_enable zeroconf avahi) |
| 266 |
- $(use_with jpeg) |
| 267 |
- $(use_with png) |
| 268 |
- $(use_with tiff) |
| 269 |
- ) |
| 270 |
- |
| 271 |
- econf "${myeconfargs[@]}" |
| 272 |
-} |
| 273 |
- |
| 274 |
-src_compile() { |
| 275 |
- default |
| 276 |
- |
| 277 |
- if use perl; then |
| 278 |
- pushd "${S}/scripting/perl" > /dev/null || die |
| 279 |
- perl-module_src_configure |
| 280 |
- perl-module_src_compile |
| 281 |
- popd > /dev/null || die |
| 282 |
- fi |
| 283 |
-} |
| 284 |
- |
| 285 |
-src_test() { |
| 286 |
- emake check |
| 287 |
-} |
| 288 |
- |
| 289 |
-src_install() { |
| 290 |
- default |
| 291 |
- |
| 292 |
- if use perl; then |
| 293 |
- pushd "${S}/scripting/perl" > /dev/null || die |
| 294 |
- perl-module_src_install |
| 295 |
- perl_delete_localpod |
| 296 |
- popd > /dev/null || die |
| 297 |
- fi |
| 298 |
- |
| 299 |
- if use postscript; then |
| 300 |
- # workaround: some printer drivers still require pstoraster and pstopxl, bug #383831 |
| 301 |
- dosym gstoraster /usr/libexec/cups/filter/pstoraster |
| 302 |
- dosym gstopxl /usr/libexec/cups/filter/pstopxl |
| 303 |
- fi |
| 304 |
- |
| 305 |
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die |
| 306 |
- |
| 307 |
- cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die |
| 308 |
- |
| 309 |
- if ! use zeroconf ; then |
| 310 |
- sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die |
| 311 |
- sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die |
| 312 |
- fi |
| 313 |
- |
| 314 |
- doinitd "${T}"/cups-browsed |
| 315 |
- systemd_dounit "${S}"/utils/cups-browsed.service |
| 316 |
-} |
| 317 |
- |
| 318 |
-pkg_postinst() { |
| 319 |
- if ! use foomatic ; then |
| 320 |
- ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely" |
| 321 |
- ewarn "necessary. net-print/foomatic-filters as a replacement is deprecated and unmaintained." |
| 322 |
- fi |
| 323 |
-} |
| 324 |
|
| 325 |
diff --git a/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch b/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch |
| 326 |
deleted file mode 100644 |
| 327 |
index 8447929a5246..000000000000 |
| 328 |
--- a/net-print/cups-filters/files/cups-filters-1.28.2-make-missing-testfont-non-fatal.patch |
| 329 |
+++ /dev/null |
| 330 |
@@ -1,14 +0,0 @@ |
| 331 |
---- cups-filters-1.28.2/configure.ac |
| 332 |
-+++ cups-filters-1.28.2/configure.ac |
| 333 |
-@@ -790,7 +790,10 @@ |
| 334 |
- ) |
| 335 |
- |
| 336 |
- AS_IF([test "x$cross_compiling" != "xyes" && ! test -f "$with_test_font_path"], |
| 337 |
-- [AC_MSG_ERROR(DejaVuSans.ttf font file is missing. Please install a package providing it.)] |
| 338 |
-+ [ |
| 339 |
-+ AC_MSG_WARN(DejaVuSans.ttf font file is missing. Expect test failures!)] |
| 340 |
-+ AC_DEFINE([TESTFONT]) |
| 341 |
-+ ] |
| 342 |
- ) |
| 343 |
- AC_DEFINE_UNQUOTED([TESTFONT], ["$with_test_font_path"], [Path to font used in tests]) |
| 344 |
- |
| 345 |
|
| 346 |
diff --git a/net-print/cups/files/cups-1.4.4-nostrip.patch b/net-print/cups/files/cups-1.4.4-nostrip.patch |
| 347 |
deleted file mode 100644 |
| 348 |
index cd2b07042cec..000000000000 |
| 349 |
--- a/net-print/cups/files/cups-1.4.4-nostrip.patch |
| 350 |
+++ /dev/null |
| 351 |
@@ -1,14 +0,0 @@ |
| 352 |
-# Source: Gentoo |
| 353 |
- |
| 354 |
-diff -urN cups-1.4.4/config-scripts/cups-compiler.m4 cups-1.4.4.new/config-scripts/cups-compiler.m4 |
| 355 |
---- cups-1.4.4/config-scripts/cups-compiler.m4 2009-05-17 02:13:47.000000000 +0200 |
| 356 |
-+++ cups-1.4.4.new/config-scripts/cups-compiler.m4 2010-08-12 19:19:45.937020635 +0200 |
| 357 |
-@@ -30,7 +30,7 @@ |
| 358 |
- if test x$enable_debug = xyes; then |
| 359 |
- OPTIM="-g" |
| 360 |
- else |
| 361 |
-- INSTALL_STRIP="-s" |
| 362 |
-+ INSTALL_STRIP="" |
| 363 |
- fi |
| 364 |
- |
| 365 |
- dnl Debug printfs can slow things down, so provide a separate option for that |
| 366 |
|
| 367 |
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 |
| 368 |
deleted file mode 100644 |
| 369 |
index a8f007446f2d..000000000000 |
| 370 |
--- a/net-print/cups/files/cups-2.2.6-fix-install-perms.patch |
| 371 |
+++ /dev/null |
| 372 |
@@ -1,18 +0,0 @@ |
| 373 |
---- cups-2.2.6/Makedefs.in |
| 374 |
-+++ cups-2.2.6/Makedefs.in |
| 375 |
-@@ -49,12 +49,12 @@ |
| 376 |
- # |
| 377 |
- |
| 378 |
- INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ |
| 379 |
--INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ |
| 380 |
-+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ |
| 381 |
- INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ |
| 382 |
--INSTALL_DATA = $(INSTALL) -c -m 444 |
| 383 |
-+INSTALL_DATA = $(INSTALL) -c -m 644 |
| 384 |
- INSTALL_DIR = $(INSTALL) -d |
| 385 |
- INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ |
| 386 |
--INSTALL_MAN = $(INSTALL) -c -m 444 |
| 387 |
-+INSTALL_MAN = $(INSTALL) -c -m 644 |
| 388 |
- INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ |
| 389 |
- |
| 390 |
- # |
| 391 |
|
| 392 |
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 |
| 393 |
deleted file mode 100644 |
| 394 |
index 1782d122ae55..000000000000 |
| 395 |
--- a/net-print/cups/files/cups-2.3.3-enforcing-read-limits.patch |
| 396 |
+++ /dev/null |
| 397 |
@@ -1,29 +0,0 @@ |
| 398 |
-From: Zdenek Dohnal <zdohnal@××××××.com> |
| 399 |
-Date: Tue, 13 Apr 2021 15:47:37 +0200 |
| 400 |
-Subject: backend/usb-libusb.c: Revert enforcing read limits |
| 401 |
- |
| 402 |
-This commit reverts the change introduced by 2.2.12 [1] - its |
| 403 |
-implementation caused a regression with Lexmark filters. |
| 404 |
- |
| 405 |
-[1] https://github.com/apple/cups/commit/35e927f83529cd9b4bc37bcd418c50e307fced35 |
| 406 |
- |
| 407 |
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174 |
| 408 |
-Bug: https://github.com/OpenPrinting/cups/issues/72 |
| 409 |
---- |
| 410 |
- backend/usb-libusb.c | 3 ++- |
| 411 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
| 412 |
- |
| 413 |
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c |
| 414 |
-index fbb0d9d..89b5182 100644 |
| 415 |
---- a/backend/usb-libusb.c |
| 416 |
-+++ b/backend/usb-libusb.c |
| 417 |
-@@ -1721,7 +1721,8 @@ static void *read_thread(void *reference) |
| 418 |
- * Make sure this loop executes no more than once every 250 miliseconds... |
| 419 |
- */ |
| 420 |
- |
| 421 |
-- if ((g.wait_eof || !g.read_thread_stop)) |
| 422 |
-+ if ((readstatus != LIBUSB_SUCCESS || rbytes == 0) && |
| 423 |
-+ (g.wait_eof || !g.read_thread_stop)) |
| 424 |
- usleep(250000); |
| 425 |
- } |
| 426 |
- while (g.wait_eof || !g.read_thread_stop); |
| 427 |
|
| 428 |
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 |
| 429 |
deleted file mode 100644 |
| 430 |
index a677090cd91c..000000000000 |
| 431 |
--- a/net-print/cups/files/cups-2.3.3-ipp-retry-validate.patch |
| 432 |
+++ /dev/null |
| 433 |
@@ -1,43 +0,0 @@ |
| 434 |
-From 6e6999b1f74457b7fd6057a31f1d3606de19a05b Mon Sep 17 00:00:00 2001 |
| 435 |
-From: Michael R Sweet <michael.r.sweet@×××××.com> |
| 436 |
-Date: Fri, 9 Apr 2021 10:20:04 -0400 |
| 437 |
-Subject: [PATCH] Retry Validate-Job once, if needed (Issue #132) |
| 438 |
- |
| 439 |
---- |
| 440 |
- CHANGES.md | 1 + |
| 441 |
- backend/ipp.c | 14 +++++++++++++- |
| 442 |
- 2 files changed, 14 insertions(+), 1 deletion(-) |
| 443 |
- |
| 444 |
-diff --git a/backend/ipp.c b/backend/ipp.c |
| 445 |
-index 63353a66d..020ab7fd4 100644 |
| 446 |
---- a/backend/ipp.c |
| 447 |
-+++ b/backend/ipp.c |
| 448 |
-@@ -256,6 +257,7 @@ main(int argc, /* I - Number of command-line args */ |
| 449 |
- get_job_attrs = 0, /* Does printer support Get-Job-Attributes? */ |
| 450 |
- send_document = 0, /* Does printer support Send-Document? */ |
| 451 |
- validate_job = 0, /* Does printer support Validate-Job? */ |
| 452 |
-+ validate_retried = 0, /* Was Validate-Job request retried? */ |
| 453 |
- copies, /* Number of copies for job */ |
| 454 |
- copies_remaining; /* Number of copies remaining */ |
| 455 |
- const char *content_type, /* CONTENT_TYPE environment variable */ |
| 456 |
-@@ -1559,7 +1561,17 @@ main(int argc, /* I - Number of command-line args */ |
| 457 |
- ipp_status == IPP_STATUS_ERROR_BAD_REQUEST) |
| 458 |
- break; |
| 459 |
- else if (job_auth == NULL && ipp_status > IPP_STATUS_ERROR_BAD_REQUEST) |
| 460 |
-+ { |
| 461 |
-+ if (!validate_retried) |
| 462 |
-+ { |
| 463 |
-+ // Retry Validate-Job operation once, to work around known printer bug... |
| 464 |
-+ validate_retried = 1; |
| 465 |
-+ sleep(10); |
| 466 |
-+ continue; |
| 467 |
-+ } |
| 468 |
-+ |
| 469 |
- goto cleanup; |
| 470 |
-+ } |
| 471 |
- } |
| 472 |
- |
| 473 |
- /* |
| 474 |
--- |
| 475 |
-2.26.3 |
| 476 |
- |
| 477 |
|
| 478 |
diff --git a/net-print/cups/files/cups-2.3.3-manpage.patch b/net-print/cups/files/cups-2.3.3-manpage.patch |
| 479 |
deleted file mode 100644 |
| 480 |
index db22adeeec4d..000000000000 |
| 481 |
--- a/net-print/cups/files/cups-2.3.3-manpage.patch |
| 482 |
+++ /dev/null |
| 483 |
@@ -1,23 +0,0 @@ |
| 484 |
-From: Didier Raboud <odyx@××××××.org> |
| 485 |
-Date: Fri, 12 Feb 2021 13:47:22 +0100 |
| 486 |
-Subject: Let cups.1 point to client.conf.5, not client.conf.7 |
| 487 |
- |
| 488 |
-Bug: https://github.com/OpenPrinting/cups/pull/92 |
| 489 |
-Closes: #982303 |
| 490 |
---- |
| 491 |
- man/cups.1 | 2 +- |
| 492 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 493 |
- |
| 494 |
-diff --git a/man/cups.1 b/man/cups.1 |
| 495 |
-index 706620d..751ad9a 100644 |
| 496 |
---- a/man/cups.1 |
| 497 |
-+++ b/man/cups.1 |
| 498 |
-@@ -125,7 +125,7 @@ Printers that do not support IPP can be supported using applications such as |
| 499 |
- .BR ippeveprinter (1). |
| 500 |
- .SH SEE ALSO |
| 501 |
- .BR cancel (1), |
| 502 |
--.BR client.conf (7), |
| 503 |
-+.BR client.conf (5), |
| 504 |
- .BR cupsctl (8), |
| 505 |
- .BR cupsd (8), |
| 506 |
- .BR lp (1), |
| 507 |
|
| 508 |
diff --git a/net-print/cups/files/cups-2.3.3-timeout.patch b/net-print/cups/files/cups-2.3.3-timeout.patch |
| 509 |
deleted file mode 100644 |
| 510 |
index 280f71f2fad2..000000000000 |
| 511 |
--- a/net-print/cups/files/cups-2.3.3-timeout.patch |
| 512 |
+++ /dev/null |
| 513 |
@@ -1,26 +0,0 @@ |
| 514 |
-From: Zdenek Dohnal <zdohnal@××××××.com> |
| 515 |
-Date: Tue, 13 Apr 2021 15:44:14 +0200 |
| 516 |
-Subject: backend/usb-libusb.c: Use 60s timeout for reading at backchannel |
| 517 |
- |
| 518 |
-Some older models malfunction if timeout is too short. |
| 519 |
- |
| 520 |
-Origin: upstream, https://github.com/OpenPrinting/cups/pull/174 |
| 521 |
-Bug: https://github.com/OpenPrinting/cups/issues/160 |
| 522 |
-Bug-Debian: https://bugs.debian.org/989073 |
| 523 |
---- |
| 524 |
- backend/usb-libusb.c | 2 +- |
| 525 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 526 |
- |
| 527 |
-diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c |
| 528 |
-index d6b0eb4..fbb0d9d 100644 |
| 529 |
---- a/backend/usb-libusb.c |
| 530 |
-+++ b/backend/usb-libusb.c |
| 531 |
-@@ -1704,7 +1704,7 @@ static void *read_thread(void *reference) |
| 532 |
- readstatus = libusb_bulk_transfer(g.printer->handle, |
| 533 |
- g.printer->read_endp, |
| 534 |
- readbuffer, rbytes, |
| 535 |
-- &rbytes, 250); |
| 536 |
-+ &rbytes, 60000); |
| 537 |
- if (readstatus == LIBUSB_SUCCESS && rbytes > 0) |
| 538 |
- { |
| 539 |
- fprintf(stderr, "DEBUG: Read %d bytes of back-channel data...\n", (int)rbytes); |
| 540 |
|
| 541 |
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 |
| 542 |
deleted file mode 100644 |
| 543 |
index 0e52adb567d7..000000000000 |
| 544 |
--- a/net-print/cups/files/cups-2.3.3-user-AR.patch |
| 545 |
+++ /dev/null |
| 546 |
@@ -1,22 +0,0 @@ |
| 547 |
-AC_PATH_PROG does not search tuple prefixes. |
| 548 |
---- a/config-scripts/cups-common.m4 |
| 549 |
-+++ b/config-scripts/cups-common.m4 |
| 550 |
-@@ -37,15 +37,15 @@ AC_PROG_CC(clang cc gcc) |
| 551 |
- AC_PROG_CPP |
| 552 |
- AC_PROG_CXX(clang++ c++ g++) |
| 553 |
- AC_PROG_RANLIB |
| 554 |
--AC_PATH_PROG(AR,ar) |
| 555 |
-+AC_CHECK_TOOL(AR,ar) |
| 556 |
- AC_PATH_PROG(CHMOD,chmod) |
| 557 |
- AC_PATH_PROG(GZIPPROG,gzip) |
| 558 |
- AC_MSG_CHECKING(for install-sh script) |
| 559 |
- INSTALL="`pwd`/install-sh" |
| 560 |
- AC_SUBST(INSTALL) |
| 561 |
- AC_MSG_RESULT(using $INSTALL) |
| 562 |
--AC_PATH_PROG(LD,ld) |
| 563 |
--AC_PATH_PROG(LN,ln) |
| 564 |
-+AC_CHECK_TOOL(LD,ld) |
| 565 |
-+AC_CHECK_TOOL(LN,ln) |
| 566 |
- AC_PATH_PROG(MKDIR,mkdir) |
| 567 |
- AC_PATH_PROG(MV,mv) |
| 568 |
- AC_PATH_PROG(RM,rm) |
Archives