From 3511fb2f331f0edb105ec5efde6b45575e78b826 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 15 Mar 2010 22:41:07 +0000 Subject: [PATCH] app-portage/layman: Integrate backport patch for bug #309617 Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- app-portage/layman/ChangeLog | 8 +- app-portage/layman/Manifest | 14 +-- .../files/layman-1.3.2-missing-text.patch | 95 ++++++++++++++++ app-portage/layman/layman-1.3.2-r2.ebuild | 104 ++++++++++++++++++ 4 files changed, 209 insertions(+), 12 deletions(-) create mode 100644 app-portage/layman/files/layman-1.3.2-missing-text.patch create mode 100644 app-portage/layman/layman-1.3.2-r2.ebuild diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog index 55f5df3f214a..acec3d239b95 100644 --- a/app-portage/layman/ChangeLog +++ b/app-portage/layman/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/layman # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.104 2010/03/14 12:41:16 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.105 2010/03/15 22:41:07 sping Exp $ + +*layman-1.3.2-r2 (15 Mar 2010) + + 15 Mar 2010; Sebastian Pipping +layman-1.3.2-r2.ebuild, + +files/layman-1.3.2-missing-text.patch: + Integrate backport patch for bug #309617 14 Mar 2010; Lennart Kolmodin layman-1.3.0-r1.ebuild, layman-1.3.1.ebuild, layman-1.3.2-r1.ebuild, diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest index 67b012a3fbca..a80b73b02145 100644 --- a/app-portage/layman/Manifest +++ b/app-portage/layman/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX layman-1.2.4-non-ascii-backport.patch 1654 RMD160 8260a9ca2b0d818e2f623bac6a53aee54f38f518 SHA1 9eea719e0d0f51a073f4fa5795dc4d886553b6fb SHA256 fec4eab473d2824876230267309463a8075fc6fcef2b8d363f1adf85bb3223d5 AUX layman-1.2.4-peg-backport.patch 927 RMD160 f11d910e2ee20149d0c824929afc920c6facc34a SHA1 438d7da92544f1b09c419eb2cf7524ab91744a18 SHA256 06206de62729f07e8821c31e635ae1b73ccd43a88594ce90cb0bb58a472cf324 AUX layman-1.3.0-cvs-fix.patch 2022 RMD160 7efb359ae59751eeb8aba33bd7a0d98be1e099e1 SHA1 7105538ad50a93c3807d2cedbaae8a5f3fbb10a9 SHA256 72362bfe82d9e03767641dbb1f8ecf84ad8e08605f14618fce88bf9635c9ec80 @@ -8,6 +5,7 @@ AUX layman-1.3.0_rc1-fix-sync-warnings.patch 1833 RMD160 d88916feb525e9c1f186cf8 AUX layman-1.3.0_rc1-refactoring-fix.patch 1943 RMD160 5ab158a8a1c188202648d761e06deb8ddac4d4ae SHA1 bca50413f863268f5f7baa48aaedf831c47b1eaf SHA256 7c4ce26bd645f941a903b2bf7c6117e7d2f2e3bcab02bddd0a6907e6d0543762 AUX layman-1.3.0_rc1-sync-fix.patch 4079 RMD160 ba27046d36ccf2114e329d709ef7a1b141f28f54 SHA1 422776213e131146c8a05595b5ae1d1250d1b724 SHA256 15ecf0cac3101e3ea6c22ce916c437d121b42cc8359b9d06c969b6790a1dc997 AUX layman-1.3.2-missing-import.patch 1407 RMD160 5d7ca594a3ec418b63fba4a135ca7c6a3eeddbd2 SHA1 169edfb71229fbe0148f4cce225ba4d7663bbeeb SHA256 98ea403f6c71de94c4d0d0ec18a165e59da9a4a622582dd0b2139b4c53ddb30a +AUX layman-1.3.2-missing-text.patch 3453 RMD160 d84283ac6a77013f410d319041360e161af84249 SHA1 19758a1d44c8758fbab055963fd3e5ea8c5177c9 SHA256 e657f51545f3c8d1b3c697de31dd0b38760a22bbfffbb6ae5e3629788cba485f DIST layman-1.1.1.tar.gz 46122 RMD160 ef0277455acef5963780dc83c9dd7a24a828d2dd SHA1 c0f7108463fedd0b2d7b350fb4cebbcff4c505ff SHA256 725cf36a5b728dfde707dad3d9d2045b282586021de53518daeb2a6a67b61f2b DIST layman-1.2.3.tar.gz 46673 RMD160 f05e1b2cfdf4a3f47bff59116b947cde53af4a0b SHA1 3e80ddba7af177ca5e4b57fd77af1c4540f15458 SHA256 c00ff923b6d097f335c020bc9ee51bf80b41ab7f95450a7cf57614fa8176622a DIST layman-1.2.4.tar.gz 47713 RMD160 00e7ede7036207bbe40578b1b080297c6562e2dc SHA1 7b55dd04e148e449421e379285f827bd04e2cea4 SHA256 74a5e94dd39e6a45265b402f1ec9ccb0ab61d54a58ab67e8ad6564506cc1eb3f @@ -27,13 +25,7 @@ EBUILD layman-1.3.0.ebuild 2499 RMD160 2547fe45eb5156be79e63c660c28e330a720e4b6 EBUILD layman-1.3.0_rc1-r3.ebuild 2678 RMD160 f5cd9446ade62611c67910a4d8784105b98672ec SHA1 383eb6be392609b9dc1a71fb84c72af24521f5e9 SHA256 6b7ca2cbb5e71916713fc6f9fb322491130033f004ca5150cb998b2b1eb3ccb5 EBUILD layman-1.3.1.ebuild 2637 RMD160 38bd9979f15e4cbcaf2641e2f305dbbaa3972209 SHA1 77f14d3ea4891bba008f239aaf7ba8b8ee36826c SHA256 efb5c878b007ff33b4dc9fa505e066d6598d8f3d7815ff26c7f664280d5bd606 EBUILD layman-1.3.2-r1.ebuild 2707 RMD160 1c9344e9d0fc7eb807866b0cd4ccd1d7b08bfd47 SHA1 491b7adb3cda8e219918ed7a3fc3ed6cfc863a5b SHA256 b624a4f42a7022a1671c1e9a7685d36dd0c42c3bba6f6b165bc7a4b6eaf8efe6 +EBUILD layman-1.3.2-r2.ebuild 2750 RMD160 9f2eb660e5adfe0af35109272d5fd5ec1e45fcc3 SHA1 3a5432bf00ef0ca62bcdb68cea34e684242c4bd2 SHA256 2d145eb2bb82196e9db0c258a47c3c21386f823d9eb969407e085b9646aee6a5 EBUILD layman-9999.ebuild 2713 RMD160 b73662743b018d576c23f6318e22ee828661eeca SHA1 910001648ea41a4b711dd7a8c6ab5c9f30133a0e SHA256 92168a28cd16e4772d55ae56b0461033413367a5a6e17cd18f2f4fde9c6c8216 -MISC ChangeLog 14569 RMD160 0e4144e09ebc7fa646dca9dfead16668e79d1a1e SHA1 96fbc4e5c1deebfa46ca4c28bd7fec91d9c33dfa SHA256 c8381a442f5fe345fadeda30e21767c24f0d168f4a1b4312c20e852973e8937a +MISC ChangeLog 14761 RMD160 251a9f3d1cb32afd39cf10315a90bd7c7ad6c9e9 SHA1 abb817c27591c21dc924fb6d01d6ca5045c716a8 SHA256 fddff8e1f73617ca3acd18d533410c92635ff015503bf0286c0a6e298a4dc8ef MISC metadata.xml 623 RMD160 955e3f2cbf227f79f7c0b542020db29fb5e5b28f SHA1 9658ffc4e7bd63b3bab95119a02e85159af01ed6 SHA256 dd430b0c54891ada1949b494ce7b6a9a7afa5f5c24a1baf5ac2cfa93dc0f4633 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuc2WsACgkQ1n/CYbXjntISDQCfTOzt76tZ2tVauqjM34y8bHM8 -of4An11Dqb8Ljq1gJvSumJYtz2eoymCQ -=rUS3 ------END PGP SIGNATURE----- diff --git a/app-portage/layman/files/layman-1.3.2-missing-text.patch b/app-portage/layman/files/layman-1.3.2-missing-text.patch new file mode 100644 index 000000000000..1272347e8500 --- /dev/null +++ b/app-portage/layman/files/layman-1.3.2-missing-text.patch @@ -0,0 +1,95 @@ +From b3d326a19454ddd00b9f5fc8400f926123bd13db Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Mon, 15 Mar 2010 23:21:22 +0100 +Subject: [PATCH 1/2] Fix handling of empty XML entities (bug #309617) + +--- + layman/overlays/overlay.py | 22 ++++++++++++++-------- + layman/version.py | 2 +- + 2 files changed, 15 insertions(+), 9 deletions(-) + +diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py +index d2144f1..2333d72 100644 +--- a/layman/overlays/overlay.py ++++ b/layman/overlays/overlay.py +@@ -100,9 +100,15 @@ class Overlay(object): + False + ''' + ++ def strip_text(node): ++ res = node.text ++ if res is None: ++ return '' ++ return res.strip() ++ + _name = xml.find('name') + if _name != None: +- self.name = ensure_unicode(_name.text.strip()) ++ self.name = ensure_unicode(strip_text(_name)) + elif 'name' in xml.attrib: + self.name = ensure_unicode(xml.attrib['name']) + else: +@@ -127,7 +133,7 @@ class Overlay(object): + _class = OVERLAY_TYPES[_type] + except KeyError: + raise Exception('Unknown overlay type "%s"!' % _type) +- _location = ensure_unicode(source_elem.text.strip()) ++ _location = ensure_unicode(strip_text(source_elem)) + return _class(self, xml, config, _location, ignore, quiet) + + self.sources = [create_overlay_source(e) for e in _sources] +@@ -139,10 +145,10 @@ class Overlay(object): + else: + _email = _owner.find('email') + if _owner != None and _email != None: +- self.owner_email = ensure_unicode(_email.text.strip()) ++ self.owner_email = ensure_unicode(strip_text(_email)) + _name = _owner.find('name') + if _name != None: +- self.owner_name = ensure_unicode(_name.text.strip()) ++ self.owner_name = ensure_unicode(strip_text(_name)) + else: + self.owner_name = None + elif 'contact' in xml.attrib: +@@ -161,7 +167,7 @@ class Overlay(object): + + _desc = xml.find('description') + if _desc != None: +- d = WHITESPACE_REGEX.sub(' ', _desc.text.strip()) ++ d = WHITESPACE_REGEX.sub(' ', strip_text(_desc)) + self.description = ensure_unicode(d) + del d + else: +@@ -191,13 +197,13 @@ class Overlay(object): + h = xml.find('homepage') + l = xml.find('link') + if h != None: +- self.homepage = ensure_unicode(h.text.strip()) ++ self.homepage = ensure_unicode(strip_text(h)) + elif l != None: +- self.homepage = ensure_unicode(l.text.strip()) ++ self.homepage = ensure_unicode(strip_text(l)) + else: + self.homepage = None + +- self.feeds = [ensure_unicode(e.text.strip()) for e in xml.findall('feed')] ++ self.feeds = [ensure_unicode(strip_text(e)) for e in xml.findall('feed')] + + + def __eq__(self, other): +diff --git a/layman/version.py b/layman/version.py +index c42c7f9..1cb47d4 100644 +--- a/layman/version.py ++++ b/layman/version.py +@@ -20,7 +20,7 @@ + __version__ = "$Id: layman-1.3.2-missing-text.patch,v 1.1 2010/03/15 22:41:07 sping Exp $" + + +-VERSION = '1.3.2_p1' ++VERSION = '1.3.2_p2' + + if __name__ == '__main__': + print VERSION +-- +1.7.0.1.61.gdc05d.dirty + diff --git a/app-portage/layman/layman-1.3.2-r2.ebuild b/app-portage/layman/layman-1.3.2-r2.ebuild new file mode 100644 index 000000000000..7f9b3a9a97e6 --- /dev/null +++ b/app-portage/layman/layman-1.3.2-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.2-r2.ebuild,v 1.1 2010/03/15 22:41:07 sping Exp $ + +EAPI="2" +NEED_PYTHON=2.5 +SUPPORT_PYTHON_ABIS="1" + +inherit eutils distutils + +DESCRIPTION="A python script for retrieving gentoo overlays." +HOMEPAGE="http://layman.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="bazaar cvs darcs git mercurial subversion test" + +COMMON_DEPS="dev-lang/python[xml]" +DEPEND="${COMMON_DEPS} + test? ( dev-util/subversion )" +RDEPEND="${COMMON_DEPS} + bazaar? ( dev-vcs/bzr ) + cvs? ( dev-util/cvs ) + darcs? ( dev-vcs/darcs ) + git? ( dev-util/git ) + mercurial? ( dev-vcs/mercurial ) + subversion? ( + || ( + >=dev-util/subversion-1.5.4[webdav-neon] + >=dev-util/subversion-1.5.4[webdav-serf] + ) + )" +RESTRICT_PYTHON_ABIS="2.4 3.*" + +src_prepare() { + epatch "${FILESDIR}"/${P}-missing-import.patch + epatch "${FILESDIR}"/${P}-missing-text.patch +} + +pkg_setup() { + if ! has_version dev-util/subversion; then + ewarn "You do not have dev-util/subversion installed!" + ewarn "While layman does not exactly depend on this" + ewarn "version control system you should note that" + ewarn "most available overlays are offered via" + ewarn "dev-util/subversion. If you do not install it" + ewarn "you will be unable to use these overlays." + ewarn + fi +} + +src_test() { + testing() { + for suite in layman/tests/{dtest,external}.py ; do + PYTHONPATH="." "$(PYTHON)" ${suite} \ + || die "test suite '${suite}' failed" + done + } + python_execute_function testing +} + +src_install() { + distutils_src_install + + dodir /etc/layman + + cp etc/* "${D}"/etc/layman/ + + doman doc/layman.8 + dohtml doc/layman.8.html + + keepdir /var/lib/layman +} + +pkg_postinst() { + distutils_pkg_postinst + + einfo "You are now ready to add overlays into your system." + einfo + einfo " layman -L" + einfo + einfo "will display a list of available overlays." + einfo + elog "Select an overlay and add it using" + elog + elog " layman -a overlay-name" + elog + elog "If this is the very first overlay you add with layman," + elog "you need to append the following statement to your" + elog "/etc/make.conf file:" + elog + elog " source /var/lib/layman/make.conf" + elog + elog "If you modify the 'storage' parameter in the layman" + elog "configuration file (/etc/layman/layman.cfg) you will" + elog "need to adapt the path given above to the new storage" + elog "directory." + elog + ewarn "Please add the 'source' statement to make.conf only AFTER " + ewarn "you added your first overlay. Otherwise portage will fail." + epause 5 +} -- 2.26.2