main/cups: upgrade to 1.7.2 and enable avahi

2 files changed, 24 insertions, 8 deletions

diff --git a/main/cups/APKBUILD b/main/cups/APKBUILD
index e223fa37ee..52baea3165 100644
--- a/main/cups/APKBUILD
+++ b/main/cups/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=0
 pkgdesc="The CUPS Printing System"
 url="http://www.cups.org/"
@@ -9,7 +9,7 @@ license="GPL LGPL2+"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs ipptool $pkgname-client
         $pkgname-lang"
 depends_dev="openssl-dev zlib-dev"
-makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev"
+makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev avahi-dev"
 depends="cups-client poppler-utils openssl dbus"
 install="cups.pre-install"
 pkggroups="lp lpadmin"
@@ -18,6 +18,7 @@ replaces="cups-doc"
 source="http://www.cups.org/software/$pkgver/cups-$pkgver-source.tar.bz2
         $pkgname.logrotate
         cupsd.initd
+        cups-no-export-ssllibs.patch
         "
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -116,12 +117,15 @@ client() {
                 usr/sbin/reject
 }
 
-md5sums="55277c40fd4b7183dc3671d39c5c42b7  cups-1.7.1-source.tar.bz2
+md5sums="f06a997d4b71b81b23324e27174f93e7  cups-1.7.2-source.tar.bz2
 f861b18f4446c43918c8643dcbbd7f6d  cups.logrotate
-1154ed66fdcfa0523f929a369079f43c  cupsd.initd"
-sha256sums="f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681  cups-1.7.1-source.tar.bz2
+1154ed66fdcfa0523f929a369079f43c  cupsd.initd
+3ba9e3410df1dc3015463d615ef91b3b  cups-no-export-ssllibs.patch"
+sha256sums="315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676  cups-1.7.2-source.tar.bz2
 b3308353504bc1cc0d5203ad3609bc98639ad9655b52e8ec8257286877532796  cups.logrotate
-3ea71f13cf925736847ca44aa0f1a9ed944fb3d303c34af923140b20fd587e2b  cupsd.initd"
-sha512sums="e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57  cups-1.7.1-source.tar.bz2
+3ea71f13cf925736847ca44aa0f1a9ed944fb3d303c34af923140b20fd587e2b  cupsd.initd
+ff3eb0782af0405f5dafe89e04b1b4ea7a49afc5496860d724343bd04f375832  cups-no-export-ssllibs.patch"
+sha512sums="441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912  cups-1.7.2-source.tar.bz2
 162fe69ee46962f7ce07a9a2a75154682088895c4749c9bcfc54bb2aa861f48d7d1a8e3223f78a197319a3a405626ffe996615f6eb23168afcefabab343d5be0  cups.logrotate
-3c5f4017cb1faf3e63551db53da4cb8305601adf65358bc53e982c5a0dfdd2b455a8ce735760ae3cc5ef81cdfa2a3cfe4be4107d1858d7ab9d91b4b97d3bc73b  cupsd.initd"
+3c5f4017cb1faf3e63551db53da4cb8305601adf65358bc53e982c5a0dfdd2b455a8ce735760ae3cc5ef81cdfa2a3cfe4be4107d1858d7ab9d91b4b97d3bc73b  cupsd.initd
+7a8cd9ac33b0dd4627c72df4275db8ccd7cf8e201bce3833719b42f532f526bb347b842e3ea1ef0d61855b5c6e1088b5d20b68942f2c2c0acf504d8d9728efd3  cups-no-export-ssllibs.patch"
diff --git a/main/cups/cups-no-export-ssllibs.patch b/main/cups/cups-no-export-ssllibs.patch
new file mode 100644
index 0000000000..e227bd1823
--- /dev/null
+++ b/main/cups/cups-no-export-ssllibs.patch
@@ -0,0 +1,12 @@
+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