aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-10-15 21:50:10 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-10-16 08:06:33 +0000
commit5ffa731075d77da30257f562781fbbf74b7ea8e4 (patch)
tree638cf2530b7d41966926d8a425dd14c3fbe8a32d
parent1c1394303f50ef669b0b9ecfa463e12f684a267f (diff)
downloadaports-5ffa731075d77da30257f562781fbbf74b7ea8e4.tar.gz
aports-5ffa731075d77da30257f562781fbbf74b7ea8e4.tar.bz2
aports-5ffa731075d77da30257f562781fbbf74b7ea8e4.tar.xz
main/cups: modernize
-rw-r--r--main/cups/APKBUILD10
-rw-r--r--main/cups/default-config-no-gssapi.patch3
2 files changed, 6 insertions, 7 deletions
diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index f9779bac47..e896426228 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -15,7 +15,7 @@ depends="cups-client poppler-utils openssl dbus"
install="cups.pre-install"
pkggroups="lp lpadmin"
pkgusers="lp"
-source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-source.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/OpenPrinting/cups/archive/v$pkgver.tar.gz
$pkgname.logrotate
cupsd.initd
cups-no-export-ssllibs.patch
@@ -33,8 +33,6 @@ source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-so
# - CVE-2018-4700
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -68,8 +66,6 @@ build() {
}
package() {
- cd "$builddir"
-
make BUILDROOT="$pkgdir" install
cd "$pkgdir"
@@ -130,8 +126,8 @@ _mv() {
done
}
-sha512sums="7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d cups-2.3.3-source.tar.gz
+sha512sums="5a43ef98f83c1783221155c01de940f3679023251709931ef28572c7b00620b36252afe894e86f2f08a527008dc2c95dc8af4129f0ab28a28663be8d3ccc3418 cups-2.3.3.tar.gz
cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate
2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd
7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch
-98bb97f4af69ea286fc3d398b8e57c32440e6b2d49fb7f79b418a4fe7f13441f3a610f65d3433d10d971ade808233c0b29b4d66160623ccaae919179384be918 default-config-no-gssapi.patch"
+ac1ec4453d6a4b641d40089c77d3b776963d90efb092851c8d93deceb6068b111dee71171967ffb7ad0f5adb424398a43f51feb7d5d9734287cfb9e419efaa93 default-config-no-gssapi.patch"
diff --git a/main/cups/default-config-no-gssapi.patch b/main/cups/default-config-no-gssapi.patch
index b12c55ddf8..d35772e29f 100644
--- a/main/cups/default-config-no-gssapi.patch
+++ b/main/cups/default-config-no-gssapi.patch
@@ -1,3 +1,6 @@
+Upstream: Not applicable (local configuration)
+Reason: Sets config defaults for Alpine
+
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -145,12 +145,12 @@