aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Correa Gómez <ablocorrea@hotmail.com>2021-12-10 19:56:38 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2021-12-28 07:38:48 +0000
commit956b4f603310bffcdbe39d1e37caeb09492e7ccb (patch)
tree5ec96461573a06587fdf8ccc7015c807edbf734c
parent899841f0052fb5768afac44ec410f850507c0282 (diff)
downloadaports-956b4f603310bffcdbe39d1e37caeb09492e7ccb.tar.gz
aports-956b4f603310bffcdbe39d1e37caeb09492e7ccb.tar.bz2
aports-956b4f603310bffcdbe39d1e37caeb09492e7ccb.tar.xz
main/cups: upgrade to 2.4.0 and update patches
Fixes #11937
-rw-r--r--main/cups/APKBUILD12
-rw-r--r--main/cups/cups-no-export-ssllibs.patch20
-rw-r--r--main/cups/cups-nostrip.patch42
-rw-r--r--main/cups/default-config-no-gssapi.patch4
4 files changed, 38 insertions, 40 deletions
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index 6326795468..ccd7be62b7 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cups
-pkgver=2.3.3
-pkgrel=4
+pkgver=2.4.0
+pkgrel=0
pkgdesc="The CUPS Printing System"
url="https://www.cups.org/"
arch="all"
@@ -133,10 +133,10 @@ _mv() {
}
sha512sums="
-5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
+09a99efbc47a8afbb5c76ff8b0949248439eaf79c8c278dd39018e8c5480d235fb6df8d4ce8230051e0bb5c661295b3b514966d19a55c6e0d0407bff9626af64 cups-2.4.0.tar.gz
cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate
2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd
-7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch
-f9f465c0a0125e15d969e4992e94657277211045b393247808b028ba5f8e010f753b750b7a01e4272da03188955866cbe6db1970fc865f883e8377a7e432ba65 cups-nostrip.patch
-ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch
+148eb01f0861e1cd0861a174a5c5262c49b079b27b972b4e90656b9b9357ec710e861604c30e897818f550e9c1cdcefcd8c8bc955ba4a333902a74cdd8dfb5a6 cups-no-export-ssllibs.patch
+7b2f1212b009d4e005eaf4fc288413bde57aff4ca664173202163e8f18be1ddc72c26ec84576a4850d63b08c6ce5948d57c77e81c4f4c85032d7ef7530b1eb81 cups-nostrip.patch
+c492f5e20a1bb73cf6bed86d0343659e839df4003aa1409bf608dd3ff05694d1e06ba26fd3786385d2c96dd668485dcef6cfee7f908416a2b125a8e30e82e670 default-config-no-gssapi.patch
"
diff --git a/main/cups/cups-no-export-ssllibs.patch b/main/cups/cups-no-export-ssllibs.patch
index e227bd1823..652fd6ad36 100644
--- a/main/cups/cups-no-export-ssllibs.patch
+++ b/main/cups/cups-no-export-ssllibs.patch
@@ -1,12 +1,10 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-tls.m4
+--- cups-1.6.2/config-scripts/cups-tls.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-tls.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -107,5 +107,5 @@
+ AC_SUBST([TLSFLAGS])
+ AC_SUBST([TLSLIBS])
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
-
- dnl
+-EXPORT_TLSLIBS="$TLSLIBS"
++EXPORT_TLSLIBS=""
+ AC_SUBST([EXPORT_TLSLIBS])
diff --git a/main/cups/cups-nostrip.patch b/main/cups/cups-nostrip.patch
index 62b3ce2344..f689368e77 100644
--- a/main/cups/cups-nostrip.patch
+++ b/main/cups/cups-nostrip.patch
@@ -1,29 +1,28 @@
diff -ru a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
--- a/config-scripts/cups-compiler.m4 2020-04-27 14:04:29.000000000 -0400
+++ b/config-scripts/cups-compiler.m4 2021-08-06 20:53:29.316010169 -0400
-@@ -9,9 +9,6 @@
+@@ -11,9 +11,6 @@
dnl Clear the debugging and non-shared library options unless the user asks
dnl for them...
-INSTALL_STRIP=""
-AC_SUBST(INSTALL_STRIP)
-
- AC_ARG_WITH(optim, [ --with-optim set optimization flags ],
- OPTIM="$withval",
- OPTIM="")
-@@ -25,8 +22,6 @@
- dnl For debugging, keep symbols, otherwise strip them...
- if test x$enable_debug = xyes -a "x$OPTIM" = x; then
- OPTIM="-g"
--else
-- INSTALL_STRIP="-s"
- fi
+ AC_ARG_WITH([optim], AS_HELP_STRING([--with-optim], [set optimization flags]), [
+ OPTIM="$withval"
+ ], [
+@@ -31,7 +28,6 @@
+ 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 -ru a/configure b/configure
--- a/configure 2020-04-27 14:04:29.000000000 -0400
+++ b/configure 2021-08-06 20:54:01.585892266 -0400
-@@ -694,7 +694,6 @@
+@@ -726,7 +726,6 @@
ARCHFLAGS
UNITTESTS
OPTIM
@@ -31,7 +30,7 @@ diff -ru a/configure b/configure
LIBTOOL_INSTALL
LIBTOOL_CXX
LIBTOOL_CC
-@@ -6662,7 +6661,6 @@
+@@ -7902,7 +7901,6 @@
@@ -39,19 +38,21 @@ diff -ru a/configure b/configure
-@@ -6698,8 +6696,6 @@
+@@ -7956,10 +7954,6 @@
+
+ OPTIM="-g"
- if test x$enable_debug = xyes -a "x$OPTIM" = x; then
- OPTIM="-g"
--else
-- INSTALL_STRIP="-s"
+-else $as_nop
+-
+- INSTALL_STRIP="-s"
+-
fi
- if test x$enable_debug_printfs = xyes; then
+ if test x$enable_debug_printfs = xyes
diff -ru a/Makedefs.in b/Makedefs.in
--- a/Makedefs.in 2020-04-27 14:04:29.000000000 -0400
+++ b/Makedefs.in 2021-08-06 20:53:42.565961754 -0400
-@@ -45,12 +45,12 @@
+@@ -46,12 +46,12 @@
# Installation programs...
#
@@ -65,4 +66,3 @@ diff -ru a/Makedefs.in b/Makedefs.in
+INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
INSTALL_MAN = $(INSTALL) -c -m 444
INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
-
diff --git a/main/cups/default-config-no-gssapi.patch b/main/cups/default-config-no-gssapi.patch
index d35772e29f..54c75bce20 100644
--- a/main/cups/default-config-no-gssapi.patch
+++ b/main/cups/default-config-no-gssapi.patch
@@ -3,7 +3,7 @@ Reason: Sets config defaults for Alpine
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
-@@ -145,12 +145,12 @@
+@@ -154,12 +154,12 @@
# Job-related operations must be done by the owner or an administrator...
<Limit Create-Job Print-Job Print-URI Validate-Job>
@@ -18,7 +18,7 @@ Reason: Sets config defaults for Alpine
Require user @OWNER @SYSTEM
Order deny,allow
</Limit>
-@@ -171,7 +171,7 @@
+@@ -180,7 +180,7 @@
# Only the owner or an administrator can cancel or authenticate a job...
<Limit Cancel-Job CUPS-Authenticate-Job>