[PR PATCH] cups: update to 2.3.3op2.

[PR PATCH] cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 1806 bytes --]

There is a new pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages cups
https://github.com/void-linux/void-packages/pull/29439

cups: update to 2.3.3op2.
Switch to the latest openprinting release, available at https://github.com/OpenPrinting/cups.
This has fixed a lot of issues around ipp-everywhere printers for me, but may need a little more testing with different setups.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29439.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-29439.patch --]
[-- Type: text/x-diff, Size: 1580 bytes --]

From 4d2000104d9fcb8f28ae3de07fe93c15a02f01ee Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 13 Mar 2021 19:12:09 +0100
Subject: [PATCH] cups: update to 2.3.3op2.

---
 srcpkgs/cups/template | 8 ++++----
 srcpkgs/cups/update   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/cups/update

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 937298368a5..66204733fa8 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,6 +1,6 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3
+version=2.3.3op2
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
@@ -14,9 +14,9 @@ depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://www.cups.org/"
-distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
+homepage="https://github.com/OpenPrinting/cups"
+distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
+checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cups/update b/srcpkgs/cups/update
deleted file mode 100644
index 73d2de0ea75..00000000000
--- a/srcpkgs/cups/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://github.com/apple/cups/releases
-ignore="*b* *rc*"

Re: [PR PATCH] [Updated] cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]

There is an updated pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages cups
https://github.com/void-linux/void-packages/pull/29439

cups: update to 2.3.3op2.
Switch to the latest openprinting release, available at https://github.com/OpenPrinting/cups.
This has fixed a lot of issues around ipp-everywhere printers for me, but may need a little more testing with different setups.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29439.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-29439.patch --]
[-- Type: text/x-diff, Size: 1586 bytes --]

From 21632798617fe69fcdd9a29b1e6845d44aec286a Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 13 Mar 2021 19:12:09 +0100
Subject: [PATCH] cups: update to 2.3.3op2.

---
 srcpkgs/cups/template | 8 ++++----
 srcpkgs/cups/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 937298368a5..66204733fa8 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,6 +1,6 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3
+version=2.3.3op2
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
@@ -14,9 +14,9 @@ depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://www.cups.org/"
-distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
+homepage="https://github.com/OpenPrinting/cups"
+distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
+checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cups/update b/srcpkgs/cups/update
index 73d2de0ea75..fc1d5291a07 100644
--- a/srcpkgs/cups/update
+++ b/srcpkgs/cups/update
@@ -1,2 +1,2 @@
-site=https://github.com/apple/cups/releases
+site=https://github.com/OpenPrinting/cups/releases
 ignore="*b* *rc*"

Re: cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-798915135

Comment:
It seems like Debian already carries patches to make tests work, will try to add them later.

Re: cups: update to 2.3.3op2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 281 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-798923631

Comment:
Are the test fixes upstream? Otherwise we might have to carry patches forever... I'd consider leaving as is, and reporting failures to them.

Re: cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-799431521

Comment:
It looks like the tests on Github are hitting this https://github.com/OpenPrinting/cups/issues/90
I can't get that far locally, but maybe playing with the mentioned environment variable helps

Re: cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 353 bytes --]

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-806521665

Comment:
The current version of cups in master has this [vulnerability](https://bugzilla.redhat.com/show_bug.cgi?id=1921680), which is fixed in this version. Should I open a separate PR with a patch for the current version?

Re: cups: update to 2.3.3op2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 239 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-806645135

Comment:
@oynqr can you try `make_check_args=-j1` and see if it solves tests? Otherwise we can merge as is.

Re: cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-806654576

Comment:
@ericonr will try, although I will have to run it through github ci, since I still can not get that far locally

Re: [PR PATCH] [Updated] cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]

There is an updated pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages cups
https://github.com/void-linux/void-packages/pull/29439

cups: update to 2.3.3op2.
Switch to the latest openprinting release, available at https://github.com/OpenPrinting/cups.
This has fixed a lot of issues around ipp-everywhere printers for me, but may need a little more testing with different setups.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29439.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-29439.patch --]
[-- Type: text/x-diff, Size: 1785 bytes --]

From 9eb8c280cdd7bcada4010a06b5350130b1ce8c41 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 13 Mar 2021 19:12:09 +0100
Subject: [PATCH] cups: update to 2.3.3op2.

---
 srcpkgs/cups/template | 9 +++++----
 srcpkgs/cups/update   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 937298368a5b..73ef1a363850 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,9 +1,10 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3
+version=2.3.3op2
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
+make_check_args=-j1
 hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
  gnutls-devel perl pkg-config poppler-utils"
 makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
@@ -14,9 +15,9 @@ depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://www.cups.org/"
-distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
+homepage="https://github.com/OpenPrinting/cups"
+distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
+checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cups/update b/srcpkgs/cups/update
index 73d2de0ea755..fc1d5291a072 100644
--- a/srcpkgs/cups/update
+++ b/srcpkgs/cups/update
@@ -1,2 +1,2 @@
-site=https://github.com/apple/cups/releases
+site=https://github.com/OpenPrinting/cups/releases
 ignore="*b* *rc*"

Re: cups: update to 2.3.3op2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-806755292

Comment:
> Please run this as a normal user. Not supported when run as root.

I think CI is not an option, at least for now.

Can you return to the previous version? Then I can merge.

Re: [PR PATCH] [Updated] cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]

There is an updated pull request by oynqr against master on the void-packages repository

https://github.com/oynqr/void-packages cups
https://github.com/void-linux/void-packages/pull/29439

cups: update to 2.3.3op2.
Switch to the latest openprinting release, available at https://github.com/OpenPrinting/cups.
This has fixed a lot of issues around ipp-everywhere printers for me, but may need a little more testing with different setups.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29439.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-29439.patch --]
[-- Type: text/x-diff, Size: 1590 bytes --]

From 567cb46fe3d5618435b0258f1f30cf0b4382727d Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 13 Mar 2021 19:12:09 +0100
Subject: [PATCH] cups: update to 2.3.3op2.

---
 srcpkgs/cups/template | 8 ++++----
 srcpkgs/cups/update   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 937298368a5b..66204733fa86 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,6 +1,6 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3
+version=2.3.3op2
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
@@ -14,9 +14,9 @@ depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
-homepage="https://www.cups.org/"
-distfiles="https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee
+homepage="https://github.com/OpenPrinting/cups"
+distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
+checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
diff --git a/srcpkgs/cups/update b/srcpkgs/cups/update
index 73d2de0ea755..fc1d5291a072 100644
--- a/srcpkgs/cups/update
+++ b/srcpkgs/cups/update
@@ -1,2 +1,2 @@
-site=https://github.com/apple/cups/releases
+site=https://github.com/OpenPrinting/cups/releases
 ignore="*b* *rc*"

Re: cups: update to 2.3.3op2.

[oynqr]

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

New comment by oynqr on void-packages repository

https://github.com/void-linux/void-packages/pull/29439#issuecomment-806793856

Comment:
done

Re: [PR PATCH] [Merged]: cups: update to 2.3.3op2.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]

There's a merged pull request on the void-packages repository

cups: update to 2.3.3op2.
https://github.com/void-linux/void-packages/pull/29439

Description:
Switch to the latest openprinting release, available at https://github.com/OpenPrinting/cups.
This has fixed a lot of issues around ipp-everywhere printers for me, but may need a little more testing with different setups.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->