Switch browsing off by default, bug 401927

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 44 insertions, 19 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 27a35772afc0..2fca88b96a68 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.455 2012/04/18 22:07:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.456 2012/04/18 22:17:38 dilfridge Exp $
+
+  18 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r2.ebuild,
+  +files/cups-1.5.2-browsing.patch:
+  Switch browsing off by default, bug 401927
 
 *cups-1.5.2-r2 (18 Apr 2012)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f3054965fdbe..ef9b5daf2cab 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -13,6 +13,7 @@ AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666
 AUX cups-1.4.8-CVE-2011-3170.patch 1045 RMD160 9a27eb1ec34ced57da5bbe7c55261d8aa35b01c0 SHA1 6155d7c4b34ff6447a93aa56fa4b5958eb943202 SHA256 c94d49c3ff980b830874dae4158768554f87f429ae400838a605505aae350af6
 AUX cups-1.4.8-largeimage.patch 572 RMD160 62e0a92fb1dc62adff43bcdc22f201da426d8916 SHA1 1528f2b1f67e7c532418dd7f495db1788ae7d2d4 SHA256 364a3ed3e161ad75836e6bc56746c25207680ab6f44563219c93146f0cf74541
 AUX cups-1.5.0-systemd-socket.patch 12829 RMD160 d4ca24c299daf65f2621568443a339f82bd03a2a SHA1 f45e18ba92d3afbca6a26ac676f2f42738032c10 SHA256 350eb1bdb76618dd082e9cda26c5b1400f4f870ffd521186f4d74940d15b4cd5
+AUX cups-1.5.2-browsing.patch 513 RMD160 592b2a814f23beea82d61446989636a393ab34a7 SHA1 43f78e93f84a4da430cb2e1ced268ea00d5f00b3 SHA256 47a229fb7be6ada4e48806c24cdba70cd2b6161ac8fcf1290e07063e486b7bfe
 AUX cupsd.init.d 402 RMD160 1b132354d01ad2ecebbe5238b09dfa3cb9391d43 SHA1 ea48170f3369486792ed9f98fe7d1c53487b455c SHA256 66b14dffc99900c0db04453765e5bf48cdf0c197c6f50dccf2a55dc66dd0cf95
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
@@ -24,23 +25,23 @@ EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
 EBUILD cups-1.5.0-r4.ebuild 7778 RMD160 589d4fd3981132f886ea353b02247c248d3717ff SHA1 02a9829da95c49dbc2dc27667581a0a16914f73b SHA256 c54f49196c44fde519fd57d0a4f3e2d25266e763763357c026e7093d480fdee4
 EBUILD cups-1.5.2-r1.ebuild 7612 RMD160 106fcb8c63f10d55a3ae494d3a70feaeab24034e SHA1 923b2d6a3983768f7048ab6acc4c6c3055db35c0 SHA256 5047115966134ee06dda96e8f376659f4d94904d3c5446236a094f70f1313b45
-EBUILD cups-1.5.2-r2.ebuild 7786 RMD160 b984760adc9540269bcc83c30536b0aff3b728a5 SHA1 d161e44d6e8da3a2414c76bcd24721e350acc5ae SHA256 4d1f1f57ff62f57c032516359a58a4d6a277bfa9d3952a44905c4b5ba17ffa1b
-MISC ChangeLog 69253 RMD160 e61672b1a3ca0193c0a39525840f7910f1a62dea SHA1 c8e38dc33ad64f2456b85ae700962ccc56bf64c6 SHA256 e1690ae5fe6b4722314b617b7a85ec1322f194022691a1c2a42cc6b6cb182fff
+EBUILD cups-1.5.2-r2.ebuild 8090 RMD160 5de23b7a22e6d35b936d2033664f020b6db9b268 SHA1 81608da367bf9a60b49ed254da36445d73ee5ccf SHA256 eeb622bc461071cd701755df063dca8b60617cd386b8e36346e54386829e1b60
+MISC ChangeLog 69414 RMD160 52cac398d0637e4e301a20c40ed8c705cb40e03c SHA1 c8d5c39c92b3dac40485fdb5ae895d21303dd6d2 SHA256 5f5a42f07d5a01d7062c551ec2faf7b1f6783e84429306481b6e9e937aa74053
 MISC metadata.xml 691 RMD160 2a77a55b3ba142202c16f7c9e5710107cdd7565f SHA1 0fedf6ebd837708cd218a4a03741a20091714950 SHA256 3d89754273130856a7433fb325a132b07b86f7c0391284ab2c7dc8a2fa46fec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPjztKAAoJENwGBM22xffeRGUP/2hP/X6wzxDQnUBgP3eSIu6W
-FWHwA4lEr/05pm2zKm0o4WBg+20EdTpX30Mc6+bM/bdY6AS739GslPLSw4LaVvr9
-ImccWWMPvKh2SA3DUYL6NkOQN3xBBmwHjqTa85r9gV8lBalfD0OU3I83zZyeEiha
-C2gGwKoK/IXYvmQN0unJpOQR7K/jweRTjeMwxE2d6AeN2OtX8svAPS60vbE5+TVu
-uwsUbZn00IvHLai//jPGwCqjkoCA16KFpThOKlLhk0+zHLxqx7ZcfcNEYU4AcFxd
-di+LhjC8TH2fDuz6h9QWZbxaGk9Ouqx5mDwh7cqWvAle1SnftSO/7X8ThyBcMYX7
-8FM/AuqzCnCi4z0FdxBRYjC40mfgVrt0Xv+jxOIK7th9/hi+rBZnGqOw1ystWpwm
-b9kmMkjbyEpTsRrorMaLClfR1ExcaHoeIuFd9ZFkdt4aQrKhwOoV1ZXkGRGiTA8v
-J6BX1i9wpJHEA/QgDgu9Be1JSXpCVm3FruRNN5MnM+vrs0N+wO1tu/ubf6KcnsDa
-4CDKmQ+7EkB0VMrB8H6b1kqRmSta7xTn/GCNpZKoG6G4J6b0UzvluuSJB21P+XYO
-stvkdI21q9gX9ObDWFHOEh3jA7kqS4cu4Ch48hXddWT3PXQ2EgtXbLV8HO6h0tW0
-ehkLGWNcuXttgU2y6PoX
-=acy9
+iQIcBAEBCgAGBQJPjz2VAAoJENwGBM22xffe/A4QAKP52b+ilvefkbVqIWwbDchD
+9/80P5M2Gso2Z+2L1ETvg3179CsPNuh0qUGBPEoNQbsxfI2zBRIh12gaaBG9mLcN
+OY+Ec0RgN3rt5aTo5mnuoreXwC9TWcswuSKrpy5cJk30/75O20mO09D0OwObWsrh
+gMP9YsMZvLCXS4mBTyLaJrX12HG9z9yUy9KqpswBtw+nb8qsxqywoqfcWBBYpvp0
+PJuPHGNuYb/BumqeEnjR/mD3Y7uZ4t306spLcJOrsmQn4k0bmjr/RaCSbL4F02FJ
+LbyAJu7Fh6jJk9nNjxJ0fqz2yWPc85KLRHSdP8h8R/dTxvpwPTMniwgOkDIawuSz
+g5dnG91Ld87MC0WCK5sx7Qpb2rspNmFw6wYZ2vf9T5WOPALvgRdrJVQ2Xk58YCkA
+cutFJnXnJCjlhNiKr7lOXtQVJgX/lUq6TKrDow6evCFnZ+7CbrDZCSusdUx7sJSb
+L2xBWoO9hC4OiGcBvbgdTnp3uwJERi4hGrHfm+7IKQfknohZsJUPmWd7k4ruD7PU
+6zY4HSqZfFI/P0PRqhGCbODWAN8de1njGo+EhEvAPM8zzADfa2y6WIaA6EYQ5P5a
+QxM8ccr8e9tqtVIqJimeZsABTHZ5YJlr9kHCC8NjWk+WvQ82KRDfa1ZVoK4tjbG9
+Y87+SwOcdKb6/50BBhWL
+=yBvF
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r2.ebuild b/net-print/cups/cups-1.5.2-r2.ebuild
index 7ba8697b29c2..5366a9213ad3 100644
--- a/net-print/cups/cups-1.5.2-r2.ebuild
+++ b/net-print/cups/cups-1.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r2.ebuild,v 1.1 2012/04/18 22:07:34 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r2.ebuild,v 1.2 2012/04/18 22:17:38 dilfridge Exp $
 
 EAPI=4
 
@@ -133,10 +133,13 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
 
 	# revert ipp backend to 1.4 state, as ubuntu and debian
-	epatch "${DISTDIR}/${P}-ipp-r8950.patch.bz2"
+	epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"
 
 	# avahi support from debian
-	epatch "${DISTDIR}/${P}-avahi.patch.bz2"
+	epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"
+
+	# browsing off by default
+	epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch"
 
 	AT_M4DIR=config-scripts eaclocal
 	eautoconf
@@ -279,6 +282,10 @@ pkg_postinst() {
 	elog "For information about installing a printer and general cups setup"
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
+	elog "Network browsing for printers is now switched off by default in the config file."
+	elog "To (re-)enable it, edit /etc/cupsd.conf and set \"Browsing On\", "
+	elog "afterwards re-start or reload cups."
+	echo
 }
 
 pkg_postrm() {
diff --git a/net-print/cups/files/cups-1.5.2-browsing.patch b/net-print/cups/files/cups-1.5.2-browsing.patch
new file mode 100644
index 000000000000..6ab08b1383e2
--- /dev/null
+++ b/net-print/cups/files/cups-1.5.2-browsing.patch
@@ -0,0 +1,13 @@
+diff -ruN cups-1.5.2.orig/conf/cupsd.conf.in cups-1.5.2/conf/cupsd.conf.in
+--- cups-1.5.2.orig/conf/cupsd.conf.in	2010-12-09 22:24:51.000000000 +0100
++++ cups-1.5.2/conf/cupsd.conf.in	2012-04-19 00:12:31.004045949 +0200
+@@ -18,7 +18,8 @@
+ @CUPS_LISTEN_DOMAINSOCKET@
+ 
+ # Show shared printers on the local network.
+-Browsing On
++# We switch this off by default in Gentoo, to avoid an unnecessary open port.
++Browsing Off
+ BrowseOrder allow,deny
+ BrowseAllow all
+ BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@