diff options
| -rw-r--r-- | user/cups/APKBUILD | 19 | ||||
| -rw-r--r-- | user/cups/cups-no-export-ssllibs.patch | 12 |
2 files changed, 8 insertions, 23 deletions
diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index 987ef76a3..cb04f4ed1 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,9 +1,9 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=cups -pkgver=2.2.13 +pkgver=2.4.1 pkgrel=0 pkgdesc="The CUPS Printing System" -url="https://www.cups.org/" +url="https://openprinting.github.io/cups/" arch="all" license="GPL-2.0-only AND LGPL-2.0-only" # cupsUTF8ToCharset(CUPS_EUC_JP) of utfdemo.txt: FAIL (UTF-8 to EUC-JP on line 1) @@ -17,14 +17,15 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client install="cups.pre-install" pkgusers="lp" pkggroups="lp lpadmin" -source="https://github.com/apple/cups/releases/download/v$pkgver/cups-$pkgver-source.tar.gz +source="https://github.com/OpenPrinting/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver-source.tar.gz $pkgname.logrotate cupsd.initd - cups-no-export-ssllibs.patch default-config-no-gssapi.patch " build() { + unset LIBTOOL; #624 + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -102,17 +103,14 @@ client() { cd "$pkgdir" _mv usr/bin \ - usr/sbin/accept \ usr/sbin/cupsaccept \ - usr/sbin/cupsaddsmb \ usr/sbin/cupsctl \ usr/sbin/cupsdisable \ usr/sbin/cupsenable \ usr/sbin/lpadmin \ usr/sbin/lpc \ usr/sbin/lpinfo \ - usr/sbin/lpmove \ - usr/sbin/reject + usr/sbin/lpmove } _mv() { @@ -122,8 +120,7 @@ _mv() { done } -sha512sums="dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d cups-2.2.13-source.tar.gz +sha512sums="74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd cups-2.4.1-source.tar.gz cf64211da59e79285f99d437c02fdd7db462855fb2920ec9563ba47bd8a9e5cbd10555094940ceedeb41ac805c4f0ddb9147481470112a11a76220d0298aef79 cups.logrotate 2c2683f755a220166b3a1653fdd1a6daa9718c8f0bbdff2e2d5e61d1133306260d63a83d3ff41619b5cf84c4913fae5822b79553e2822858f38fa3613f4c7082 cupsd.initd -7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3 cups-no-export-ssllibs.patch 98bb97f4af69ea286fc3d398b8e57c32440e6b2d49fb7f79b418a4fe7f13441f3a610f65d3433d10d971ade808233c0b29b4d66160623ccaae919179384be918 default-config-no-gssapi.patch" diff --git a/user/cups/cups-no-export-ssllibs.patch b/user/cups/cups-no-export-ssllibs.patch deleted file mode 100644 index e227bd182..000000000 --- a/user/cups/cups-no-export-ssllibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) - - dnl |