Revison bump. Fix bug #458976. Wrong permissions again. This time for /var/lib/hp/. Thanks to James for the report. Only remove /var/lib/hp/ if it is world writeable.

Package-Manager: portage-2.1.11.52/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 288 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 19384119373d..6b38a08b1214 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # 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.264 2013/02/24 10:52:07 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.265 2013/03/01 20:11:03 billie Exp $
+
+*hplip-3.13.2-r2 (01 Mar 2013)
+
+  01 Mar 2013; Daniel Pielmeier <billie@gentoo.org> +hplip-3.13.2-r2.ebuild:
+  Revison bump. Fix bug #458976. Wrong permissions again. This time for
+  /var/lib/hp/. Thanks to James for the report. Only remove /var/lib/hp/ if it
+  is world writeable.
 
   24 Feb 2013; Daniel Pielmeier <billie@gentoo.org> hplip-3.13.2-r1.ebuild:
   Use PYTHON_USEDEP for notify-python as it now uses python-r1.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index bc3d888c9dd8..00e4a334893a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -6,12 +6,13 @@ DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7
 DIST hplip-3.13.2.tar.gz 21681714 SHA256 7dee21c30a15729b2107713a1b779ea07982064a38e2d4935e58e6f56d6d3592 SHA512 be8ed690cd0ff7171de76c3ab67d67ea5065f7ad9f587c56194c05d1ce5f8b9274452d7d428efd5c4d04b94e44456b050302ae865d78e99f31d843dc31a76c39 WHIRLPOOL f6088657ad729e6dd404d39be1e3d59431dcedfd6ffd7e043e7332d3f051cd52c9c9a7049b025cf4f38b3a8dd5415573064e73a530fe55988d8a922a3c0b9da7
 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
 EBUILD hplip-3.13.2-r1.ebuild 7871 SHA256 f2f90874d8bebeabd57e7cd6ef31ed73b7cf05b65ce7953cdc2a4c913653ee7c SHA512 3f69f6c5590bb1e8489315ddab601599174b41d569f88adfcb9d7dc1621d4f497e5950199c8582e121bc8f41f1b42720f5fc87ec75d111b69ad62f8d3ad21054 WHIRLPOOL 5f03bd956309576ee4932dd31b6cad0e34c2aaec5b365baffed5a2d47cb95719fbda954b6360af4f3dd5829e39e8b0691d7ff32c05252b20fc6b5fb32b375a8f
-MISC ChangeLog 45747 SHA256 075ad5f91eb2c1abb8c9bab99edb3ebabfaae8152b14b7ec662a7fbf1046fa50 SHA512 659897d20d30b821a4309304a4dc857a2fd32f5efaa6d745d7dd4342e5d47369fe71c3a760bb3bd91a3db041b22925d5e4743e82d621f5037c94a790486686ed WHIRLPOOL 3a233f905b997c298fd93db72273511f809f218aa2b9a8114c31fd872ab1cf7a8d326f47fa38c81f3c3966beb9ed58b05f23d824d9d0adafcee9115e75806fe5
+EBUILD hplip-3.13.2-r2.ebuild 8280 SHA256 188ee1368c0f287f28f9ec3bcf745db2cd30292a0b1cb9c3511046199ce799cb SHA512 19b3758713180316c2f2a29cae85a2e99439037ec400a01efe71e330f3dd46303abf4ade4bffa6921d12bbe6b37c793239e276aa4113981c803cea8ce76b5ec5 WHIRLPOOL 7b26cd9e64316a3e57cc682d061b498acf94e1a7ef48c880db14fac2e2b0d9d66f1ddafb6e587818ded05bb8b010720d6db4d5cae3093902505aab5da8dc5efe
+MISC ChangeLog 46030 SHA256 40ad87d09d34c1a8c8b30444a7875e53c59f1034ade2497fe9e61c249d4838fd SHA512 67a2c1891c6a3b82a03ebdce12b7516f97216e12f6af350567c92bd462f83b3d26c4348c906b899ab29a65944a944e759b7fba6dfd79f024ad4ac21a8d679eda WHIRLPOOL 371319f252f84c38ebbb3da50adb1fcc75e83cbd1b4ff7c501546774411774e01a6dbfeb30a2c25ab98dd4a36d366d621deada428ffd3d6e78e443ba93b59f70
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEp8N8ACgkQlcuUeyFa0U00BQCeOWlzmocg7shJrsy0ME7MONAS
-QucAnR1TKPcBnAcnSbrxmU5kRisI+VQu
-=LsCh
+iEYEAREIAAYFAlExC1gACgkQlcuUeyFa0U2wtwCghEN4fpabcHX1+yg+5asTL1rq
+G7IAnRTBTRFruTlRf7CQK874toQviIrh
+=XnGt
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.13.2-r2.ebuild b/net-print/hplip/hplip-3.13.2-r2.ebuild
new file mode 100644
index 000000000000..e83971a9dbfe
--- /dev/null
+++ b/net-print/hplip/hplip-3.13.2-r2.ebuild
@@ -0,0 +1,275 @@
+# 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.2-r2.ebuild,v 1.1 2013/03/01 20:11:03 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.12.10-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, sys-apps/dbus, 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 )
+		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}]
+			>=dev-python/imaging-1.1.7-r2[${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}]
+			)
+		)
+	)"
+
+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
+
+	# Change permission to allow verification of plugin installation
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=458976
+	# Upstream bug :https://bugs.launchpad.net/hplip/+bug/1133486
+	# remove with the next update
+	chmod 755 "${ROOT%/}/var/lib/hp"
+}