Version bump. Includes Red Hat's patch to fix CVE-2013-4325.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

3 files changed, 284 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index c2b1647e5112..e71a386a7eda 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.279 2013/09/06 15:51:32 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.280 2013/09/28 10:16:55 billie Exp $
+
+*hplip-3.13.9 (28 Sep 2013)
+
+  28 Sep 2013; Daniel Pielmeier <billie@gentoo.org> +hplip-3.13.9.ebuild:
+  Version bump. Includes Red Hat's patch to fix CVE-2013-4325.
 
   06 Sep 2013; Daniel Pielmeier <billie@gentoo.org> -hplip-3.13.6.ebuild:
   Remove old.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 4c0719b9d67f..8befe692a4eb 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,15 +6,18 @@ DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7
 DIST hplip-3.13.7-patches-1.tar.xz 7628 SHA256 16110fea116df0034bb57e2addd7649629626706364109a3b8e74c5a74ba6800 SHA512 dd3f27c71bc6443ba7fbccace6addc29eeaea964feb80e0541f9ae6c7d3af4c73a4d1573f4cf6a85d7a2e4bb804a4e635abbefebc661ef611b06faabf7c39999 WHIRLPOOL bc590a645431b3cd8f13639a2c1a9e94157268a67ddd5d19b94f5c4c82c3dff1af36f25c19c9c5f052ae1ccd940033942e6ec1cef4824cb2a81e1b1a8207afef
 DIST hplip-3.13.7.tar.gz 20810611 SHA256 710b99786783d75f0d260e36a795e730d54e54a494d0a35276a4b1c497905b11 SHA512 8fb6dae76b772b378cd652ad321682e73928851ee676f8cee7c1038a1b9633cf7be122e462e6ce63f0b3bf3e08a90361d62168fe08c1c1540d67d006733b7265 WHIRLPOOL 6e6e63c06e99cf1dd8f6b50e86e262004953b1d333b8497a4ae440da74a340af35ed2455e20323d112796cb99690546da9845319bf1b6c3c5b6cfedfe84c4d05
 DIST hplip-3.13.8.tar.gz 20836354 SHA256 57c83139eca691e1337a4a43a9cfe7777cf969c94f85e8718949212f94e39b1d SHA512 a21629dad91dc0c0c1d6d0442b2f142c02d02a775f2f96bcc39881b1e2f5c8612211677033115a0215d2fae21a851742ad47b5e45cc19ac1c639c06730d40e9a WHIRLPOOL fcae8c35b2107cc316d7b60c119be01037495826b12f0f32342c5258a5f8b128e08e6dabcc0e33eec06da8a6c347d1799145be9c8a6da2de44ac6d570934f802
+DIST hplip-3.13.9-patches-1.tar.xz 8096 SHA256 cabdc3ad00ed745728810f4af667356baa3b0b757ee889486d424102ce4cdce4 SHA512 88f6c542c5b9d1125eaa0748b17d99ea177f455023a7678a1fa7ff74fdace2b6b16ba3e08a61b1ff2006af511212c434cab60cac2c50e8584d1c4a9f8510cc9e WHIRLPOOL ca44d44b6e4d33a8c9300e2388982983e44305b389c32998c342fbf3cbc0a2217e032a49377231518c813540f6267d0f7c6664a21bec0e6072d2caebc24d4aa7
+DIST hplip-3.13.9.tar.gz 20878480 SHA256 d95c729a79b0d28be3ecb6cba6df5a931b0788484c4d323963abc36d514bb120 SHA512 7895b55336a61db9479f1457ef7d46084e22bb92a59c5f705be47f435e8854a51ba0409f7bbc332215edcb372fb5f21423ab1222fda5286113f105a20d928960 WHIRLPOOL 86c7ceac0bf33a4a2799233b7ee7718e23bab7f6720fa1c571967c98e5c7ba77667efcd8320a98a0f4eea773ae2c7325320a475029d9b1d0f5741c9d478e368b
 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
 EBUILD hplip-3.13.7.ebuild 8065 SHA256 f79317c2fe8dbaa2478347863a29acfb6d469341a043138887a102eb0ad13648 SHA512 6f34fe5aee50ce1a1a642d2e455ca1c0a827b683674705c1ce7873acb943c9449d7011b5bea06f291465a4b57671ff2aaf347a14594be5dd9f57ee10639c4ea5 WHIRLPOOL 34f218b3adcad24afd5559323b799855ae970c7464d0c39a2d0fcdcf445766de6c08b52fe3afff62bfe45659a8dcc3b2c757dac38141a467fe1e828d49bee64c
 EBUILD hplip-3.13.8.ebuild 8065 SHA256 5d44a06dbc1906e6191df258b163960e28313d365a422bd17ea2cef21750fc84 SHA512 468866616343b4801e0a050e07229762b23fc22c6f6f7a987926ed54958b5630b95e842e743c82c0c8ca90b05524d9fa5a2e129a7c9b3158c45cc739e66a52c8 WHIRLPOOL 8d2ec2361933fd8fa24c52b5c4500fff086aa5d71176919d4dcd628e565142f7564f204029d7c2b23aea80c01452b57b8e378b7d2c5e5bbf4ae4deec26c97648
-MISC ChangeLog 47808 SHA256 12982d97f4625cd1a6e7245fc114bfffb2a916d336c8bbfc03917b2b7f68bb3b SHA512 1f36b1c45b6b4b140088c0ae96dbc63826a247846eb33be512b72580ccb79d5ff75bbeeaee96c8245533b0e796b8c37a76db3a99c78d239b72d590e2d44593cb WHIRLPOOL bf33c15a2540d4475c76debaa055df2c16df9dbb076697a0ec62fbfb5da3854c5a3e451675f07a7cf51d8286c5a28639ff5ff0849756d97905883c702ba501a2
+EBUILD hplip-3.13.9.ebuild 8065 SHA256 5dd945353f85c2d05f15e139ff126629612248b20532962c19e9a75394501ff8 SHA512 47f371209c501abbf1e35dff205fdbf1d43feb4244a1dfc4a7a0a69c5bc4fc35d4f3e2c2493bb655977c8ff0a7c1bd9a656b0b1780402ae8258b396efe86411e WHIRLPOOL 872b35f940d5eb26ff3034d9ad6c239d725699b19364ca8ff216c2cdc3abb5bb2f59a0f60b47119fc5f7fdfb7b936060ee0c213415822f4175fc5493f5eff3a3
+MISC ChangeLog 47975 SHA256 0a9078b8d94e3ff28766d8c454db35ca84377c4986de7024c01da4f1dd834a69 SHA512 8077abfda466d71f54203fdd54a0939eee8e8948bbffcc6cc916caf14027988e01f14a220947c3a8bdf4ad1a9abf3c0ca85c3c0d2a21538ca8c6872a8bd1b328 WHIRLPOOL 57bea3030856a16d4fa7abc25a0ea570f681b608c14a132ef7afe51529b2be8da37e08ed058618491b7a5ca4274bf048931ea2986ff6691d8ae408f61cc78363
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIp+gUACgkQlcuUeyFa0U0QYACfYsFOA6rNE5FEIlzpDuBY2hhc
-aQkAnijmE50iKBOQ6P+jy445Ar8w1q48
-=a5uK
+iEYEAREIAAYFAlJGrJgACgkQlcuUeyFa0U1wOwCg7NClCworhzTunelvH4ZhSQnS
+4D8An0Cb2BKzcGlWbQc3uGp57sPVGRL+
+=3HiC
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.13.9.ebuild b/net-print/hplip/hplip-3.13.9.ebuild
new file mode 100644
index 000000000000..944cea2a832d
--- /dev/null
+++ b/net-print/hplip/hplip-3.13.9.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.13.9.ebuild,v 1.1 2013/09/28 10:16:55 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit eutils fdo-mime linux-info python-single-r1 udev autotools toolchain-funcs
+
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		http://dev.gentoo.org/~billie/distfiles/${PN}-3.13.9-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+# TODO: check if net-print/cups, net-analyzer/net-snmp
+# are migrated to python-r1
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( >=sys-apps/dbus-1.6.8-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
+		scanner? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=virtual/python-imaging-1[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		)
+		qt4? (
+			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
+			libnotify? (
+				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
+			)
+		)
+	)"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(udev_get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-udev_sysfs_rules \
+		--disable-udev-acl-rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -exec rm -rf {} + || die
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+pkg_preinst() {
+	# remove temporary directory so it is recreated with correct permissions
+	# this ensures correct permissions when upgrading from vulnerable versions
+	# remove this after some time
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=452586
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1016507
+	if [[ $(stat -c '%A' /var/lib/hp/) =~ w.$ ]] ; then
+		rm -rf "${ROOT%/}/var/log/hp"
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "For more information on setting up your printer please take"
+		elog "a look at the hplip section of the gentoo printing guide:"
+		elog "http://www.gentoo.org/doc/en/printing-howto.xml"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+	fi
+}