March 2011 - openSUSE Commits - openSUSE Mailing Lists

commit gtg for openSUSE:11.4
by root＠hilbert.suse.de 01 Apr '11

01 Apr '11

Hello community, here is the log from the commit of package gtg for openSUSE:11.4 checked in at Fri Apr 1 00:42:00 CEST 2011. -------- --- old-versions/11.4/all/gtg/gtg.changes 2011-02-12 20:25:49.000000000 +0100 +++ 11.4/gtg/gtg.changes 2011-03-30 16:54:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 30 14:43:17 UTC 2011 - malcolmlewis(a)opensuse.org + +- Fix bug bnc#683748 malcolmlewis(a)opensuse.org -- After activiting + the Hamster (Time Tracking) plugin in GTG nothing happens. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/gtg Destination is old-versions/11.4/UPDATES/all/gtg calling whatdependson for 11.4-i586 New: ---- gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtg.spec ++++++ --- /var/tmp/diff_new_pack.kd8eGu/_old 2011-04-01 00:41:19.000000000 +0200 +++ /var/tmp/diff_new_pack.kd8eGu/_new 2011-04-01 00:41:19.000000000 +0200 @@ -19,12 +19,14 @@ Name: gtg Version: 0.2.4 -Release: 2 +Release: 5.<RELEASE6> License: GPLv3+ Summary: Personal Organizer for GNOME Url: https://gtg.fritalk.com Group: Productivity/Office/Organizers Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gtg-hamster-plugin-not-starting-tracking-tasks.patch lp#620313 bnc#683748 malcolmlewis(a)opensuse.org -- Fix After activiting the Hamster (Time Tracking) plugin in GTG nothing happens. +Patch0: gtg-hamster-plugin-not-starting-tracking-tasks.patch BuildRequires: dbus-1 # dbus-1 is only required for file ownerships BuildRequires: fdupes @@ -59,6 +61,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build ++++++ gtg-hamster-plugin-not-starting-tracking-tasks.patch ++++++ diff --git a/GTG/plugins/hamster/hamster.py b/GTG/plugins/hamster/hamster.py index b4e2208..09f003b 100755 --- a/GTG/plugins/hamster/hamster.py +++ b/GTG/plugins/hamster/hamster.py @@ -65,15 +65,18 @@ class hamsterPlugin: hamster_activities=dict([(unicode(x[0]), unicode(x[1])) for x in self.hamster.GetActivities()]) if (gtg_title in hamster_activities or gtg_title.replace(",", "") in hamster_activities): - category = "@%s" % hamster_activities[gtg_title] + category = "%s" % hamster_activities[gtg_title] if (self.preferences['category'] == 'tag' or (self.preferences['category'] == 'auto_tag' and not category)): # See if any of the tags match existing categories - categories = dict([(unicode(x).lower(), unicode(x)) for x in self.hamster.GetCategories()]) + categories = dict([(unicode(x[1]).lower(), unicode(x[1])) for x in self.hamster.GetCategories()]) intersection = set(categories.keys()).intersection(set([x.lower() for x in gtg_tags])) if len(intersection) > 0: - category = "@%s" % categories[intersection.pop()] + category = "%s" % categories[intersection.pop()] + else: + # Force category if not found + category = gtg_tags[0] description = "" if self.preferences['description'] == 'title': @@ -91,11 +94,10 @@ class hamsterPlugin: except dbus.exceptions.DBusException: # old hamster version, doesn't support tags pass - tag_str = "".join([" #" + x for x in tag_candidates]) - + tag_str = "".join([", " + x for x in tag_candidates]) #print '%s%s,%s%s'%(activity, category, description, tag_str) - hamster_id=self.hamster.AddFact('%s%s,%s%s'%(activity, category, description, tag_str), 0, 0) - + hamster_id=self.hamster.AddFact(activity, tag_str, 0, 0, category, description, False) + ids=self.get_hamster_ids(task) ids.append(str(hamster_id)) self.set_hamster_ids(task, ids) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit insserv for openSUSE:11.4
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package insserv for openSUSE:11.4 checked in at Thu Mar 31 18:07:53 CEST 2011. -------- --- old-versions/11.4/all/insserv/insserv.changes 2011-02-25 17:40:41.000000000 +0100 +++ 11.4/insserv/insserv.changes 2011-03-09 09:39:16.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 9 09:38:37 CET 2011 - werner(a)suse.de + +- Correct Freudian slip + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/insserv Destination is old-versions/11.4/UPDATES/all/insserv calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.qn8ZjM/_old 2011-03-31 18:07:01.000000000 +0200 +++ /var/tmp/diff_new_pack.qn8ZjM/_new 2011-03-31 18:07:01.000000000 +0200 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 20.<RELEASE2> +Release: 20.<RELEASE24> Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.b… ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.qn8ZjM/_old 2011-03-31 18:07:01.000000000 +0200 +++ /var/tmp/diff_new_pack.qn8ZjM/_new 2011-03-31 18:07:01.000000000 +0200 @@ -373,7 +373,7 @@ + } + clvl &= ~mlvl; + if ((must->attr.flags & SERV_WARNED) == 0) -+#ifndef OSCBUILD ++#ifdef OSCBUILD + warn("Service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); +#else @@ -386,7 +386,7 @@ + } + if ((must->attr.flags & (SERV_ENFORCE|SERV_KNOWN)) == SERV_ENFORCE) { + if ((must->attr.flags & SERV_WARNED) == 0) -+#ifndef OSCBUILD ++#ifdef OSCBUILD + warn("Service %s has to exists for service %s\n", + must->name, cur->name); +#else @@ -408,7 +408,7 @@ + continue; + if ((must->attr.flags & (SERV_CMDLINE|SERV_KNOWN)) == 0) { + if ((must->attr.flags & SERV_WARNED) == 0) -+#ifndef OSCBUILD ++#ifdef OSCBUILD + warn("Service %s has to exists for service %s\n", + must->name, cur->name); +#else @@ -429,7 +429,7 @@ + continue; + clvl &= ~mlvl; + if ((must->attr.flags & SERV_WARNED) == 0) -+#ifndef OSCBUILD ++#ifdef OSCBUILD + warn("Service %s is missed in the runlevels %s to use service %s\n", + must->name, lvl2str(clvl), cur->name); +#else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:11.4
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:11.4 checked in at Thu Mar 31 18:07:24 CEST 2011. -------- --- old-versions/11.4/all/yast2-bootloader/yast2-bootloader.changes 2011-02-22 12:33:29.000000000 +0100 +++ 11.4/yast2-bootloader/yast2-bootloader.changes 2011-03-31 13:42:51.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 31 12:12:40 CEST 2011 - snwint(a)suse.de + +- fix detection of other linux partitions (bnc #675224) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/yast2-bootloader Destination is old-versions/11.4/UPDATES/all/yast2-bootloader calling whatdependson for 11.4-i586 Old: ---- yast2-bootloader-2.20.1.tar.bz2 New: ---- yast2-bootloader-2.20.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.OA8GRI/_old 2011-03-31 18:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.OA8GRI/_new 2011-03-31 18:06:55.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-bootloader -Version: 2.20.1 -Release: 1.<RELEASE2> +Version: 2.20.2 +Release: 0.<RELEASE2> BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.20.1.tar.bz2 +Source0: yast2-bootloader-2.20.2.tar.bz2 Prefix: /usr @@ -67,7 +67,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.20.1 +%setup -n yast2-bootloader-2.20.2 %build %{prefix}/bin/y2tool y2autoconf @@ -119,5 +119,4 @@ /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc - %changelog ++++++ yast2-bootloader-2.20.1.tar.bz2 -> yast2-bootloader-2.20.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.20.1/MAINTAINER new/yast2-bootloader-2.20.2/MAINTAINER --- old/yast2-bootloader-2.20.1/MAINTAINER 2008-06-05 10:42:05.000000000 +0200 +++ new/yast2-bootloader-2.20.2/MAINTAINER 2011-03-31 12:46:51.000000000 +0200 @@ -1 +1 @@ -Jozef Uhliarik <juhliarik(a)suse.cz> +Steffen Winterfeldt <snwint(a)suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.20.1/VERSION new/yast2-bootloader-2.20.2/VERSION --- old/yast2-bootloader-2.20.1/VERSION 2011-02-22 12:30:44.000000000 +0100 +++ new/yast2-bootloader-2.20.2/VERSION 2011-03-31 12:46:51.000000000 +0200 @@ -1 +1 @@ -2.20.1 +2.20.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.20.1/configure new/yast2-bootloader-2.20.2/configure --- old/yast2-bootloader-2.20.1/configure 2011-02-22 16:17:28.000000000 +0100 +++ new/yast2-bootloader-2.20.2/configure 2011-03-31 12:47:05.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for yast2-bootloader 2.20.1. +# Generated by GNU Autoconf 2.65 for yast2-bootloader 2.20.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='yast2-bootloader' PACKAGE_TARNAME='yast2-bootloader' -PACKAGE_VERSION='2.20.1' -PACKAGE_STRING='yast2-bootloader 2.20.1' +PACKAGE_VERSION='2.20.2' +PACKAGE_STRING='yast2-bootloader 2.20.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1489,7 +1489,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-bootloader 2.20.1 to adapt to many kinds of systems. +\`configure' configures yast2-bootloader 2.20.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1561,7 +1561,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-bootloader 2.20.1:";; + short | recursive ) echo "Configuration of yast2-bootloader 2.20.2:";; esac cat <<\_ACEOF @@ -1673,7 +1673,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-bootloader configure 2.20.1 +yast2-bootloader configure 2.20.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2072,7 +2072,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-bootloader $as_me 2.20.1, which was +It was created by yast2-bootloader $as_me 2.20.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2995,7 +2995,7 @@ # Define the identity of the package. PACKAGE='yast2-bootloader' - VERSION='2.20.1' + VERSION='2.20.2' cat >>confdefs.h <<_ACEOF @@ -3117,9 +3117,9 @@ -VERSION="2.20.1" +VERSION="2.20.2" RPMNAME="yast2-bootloader" -MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" +MAINTAINER="Steffen Winterfeldt <snwint(a)suse.de>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig @@ -15973,7 +15973,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-bootloader $as_me 2.20.1, which was +This file was extended by yast2-bootloader $as_me 2.20.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16039,7 +16039,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-bootloader config.status 2.20.1 +yast2-bootloader config.status 2.20.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.20.1/configure.in new/yast2-bootloader-2.20.2/configure.in --- old/yast2-bootloader-2.20.1/configure.in 2011-02-22 16:17:16.000000000 +0100 +++ new/yast2-bootloader-2.20.2/configure.in 2011-03-31 12:46:59.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.20.1, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.20.2, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,9 +18,9 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.20.1" +VERSION="2.20.2" RPMNAME="yast2-bootloader" -MAINTAINER="Jozef Uhliarik <juhliarik(a)suse.cz>" +MAINTAINER="Steffen Winterfeldt <snwint(a)suse.de>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.20.1/src/modules/BootGRUB.ycp new/yast2-bootloader-2.20.2/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.20.1/src/modules/BootGRUB.ycp 2011-02-22 15:41:40.000000000 +0100 +++ new/yast2-bootloader-2.20.2/src/modules/BootGRUB.ycp 2011-03-31 12:46:51.000000000 +0200 @@ -15,7 +15,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootGRUB.ycp 63454 2011-02-22 11:29:55Z jreidinger $ + * $Id: BootGRUB.ycp 63686 2011-03-31 10:35:50Z snwint $ * */ @@ -149,7 +149,7 @@ // get list of all Linux Partitions on all real disks except encrypted ones ( as we don't know password and bootloader cannot boot from it directly) list<map> other_l = (list<map>)filter( map p, (list<map>)Storage::GetOtherLinuxPartitions(), - ``(p["enc_type"]:`none!=`none)); + ``(p["enc_type"]:`none==`none)); y2milestone ("Other linux parts: %1", other_l); list<string> destroyed_partitions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit quagga for openSUSE:11.3
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package quagga for openSUSE:11.3 checked in at Thu Mar 31 18:06:51 CEST 2011. -------- --- old-versions/11.3/UPDATES/all/quagga/quagga.changes 2010-11-10 17:26:08.000000000 +0100 +++ 11.3/quagga/quagga.changes 2011-03-31 14:14:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Feb 23 13:10:09 UTC 2011 - prusnak(a)opensuse.org + +- fix CVE-2010-1674 and CVE-2010-1675 [bnc#654270] + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- quagga-0.99.17-CVE-2010-1674.patch quagga-0.99.17-CVE-2010-1675.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.chlgK9/_old 2011-03-31 18:06:22.000000000 +0200 +++ /var/tmp/diff_new_pack.chlgK9/_new 2011-03-31 18:06:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package quagga (Version 0.99.17) +# spec file for package quagga # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: quagga Version: 0.99.17 -Release: 1.<RELEASE1> +Release: 1.<RELEASE5> License: LGPLv2.1+ Summary: Free Routing Software (for BGP, OSPF and RIP, for example) Url: http://www.quagga.net @@ -27,6 +27,8 @@ Source: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: %{name}-SUSE.tar.bz2 Source2: %{name}.pam +Patch0: %{name}-0.99.17-CVE-2010-1674.patch +Patch1: %{name}-0.99.17-CVE-2010-1675.patch BuildRequires: net-snmp-devel BuildRequires: pam-devel BuildRequires: readline-devel @@ -64,6 +66,8 @@ %prep %setup -q -a 1 +%patch0 -p 1 +%patch1 -p 1 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then ++++++ quagga-0.99.17-CVE-2010-1674.patch ++++++ commit 5aadc3763588766490a25ef6b475f64ef88f8e0e Author: Paul Jakma <paul(a)quagga.net> Date: Sun Dec 5 17:17:26 2010 +0000 bgpd/security: CVE-2010-1674 Fix crash due to extended-community parser error * bgp_attr.c: (bgp_attr_ext_communities) Certain extended-community attrs can leave attr->flag indicating ext-community is present, even though no extended-community object has been attached to the attr structure. Thus a null-pointer dereference can occur later. (bgp_attr_community) No bug fixed here, but tidy up flow so it has same form as previous. Problem and fix thanks to anonymous reporter. Index: quagga-0.99.17/bgpd/bgp_attr.c =================================================================== --- quagga-0.99.17.orig/bgpd/bgp_attr.c +++ quagga-0.99.17/bgpd/bgp_attr.c @@ -1235,13 +1235,16 @@ bgp_attr_community (struct peer *peer, b attr->community = NULL; return 0; } - else - { - attr->community = - community_parse ((u_int32_t *)stream_pnt (peer->ibuf), length); - stream_forward_getp (peer->ibuf, length); - } + + attr->community = + community_parse ((u_int32_t *)stream_pnt (peer->ibuf), length); + + /* XXX: fix community_parse to use stream API and remove this */ + stream_forward_getp (peer->ibuf, length); + if (!attr->community) + return -1; + attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES); return 0; @@ -1478,13 +1481,18 @@ bgp_attr_ext_communities (struct peer *p { if (attr->extra) attr->extra->ecommunity = NULL; + /* Empty extcomm doesn't seem to be invalid per se */ + return 0; } - else - { - (bgp_attr_extra_get (attr))->ecommunity = - ecommunity_parse ((u_int8_t *)stream_pnt (peer->ibuf), length); - stream_forward_getp (peer->ibuf, length); - } + + (bgp_attr_extra_get (attr))->ecommunity = + ecommunity_parse ((u_int8_t *)stream_pnt (peer->ibuf), length); + /* XXX: fix ecommunity_parse to use stream API */ + stream_forward_getp (peer->ibuf, length); + + if (!attr->extra->ecommunity) + return -1; + attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_EXT_COMMUNITIES); return 0; ++++++ quagga-0.99.17-CVE-2010-1675.patch ++++++ Index: quagga-0.99.17/bgpd/bgp_attr.c =================================================================== --- quagga-0.99.17.orig/bgpd/bgp_attr.c +++ quagga-0.99.17/bgpd/bgp_attr.c @@ -704,43 +704,6 @@ bgp_attr_flush (struct attr *attr) } } -/* Parse AS_PATHLIMIT attribute in an UPDATE */ -static int -bgp_attr_aspathlimit (struct peer *peer, bgp_size_t length, - struct attr *attr, u_char flag, u_char *startp) -{ - bgp_size_t total; - - total = length + (CHECK_FLAG (flag, BGP_ATTR_FLAG_EXTLEN) ? 4 : 3); - - if (!CHECK_FLAG(flag, BGP_ATTR_FLAG_TRANS) - || !CHECK_FLAG(flag, BGP_ATTR_FLAG_OPTIONAL)) - { - zlog (peer->log, LOG_ERR, - "AS-Pathlimit attribute flag isn't transitive %d", flag); - bgp_notify_send_with_data (peer, - BGP_NOTIFY_UPDATE_ERR, - BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR, - startp, total); - return -1; - } - - if (length != 5) - { - zlog (peer->log, LOG_ERR, - "AS-Pathlimit length, %u, is not 5", length); - bgp_notify_send_with_data (peer, - BGP_NOTIFY_UPDATE_ERR, - BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR, - startp, total); - return -1; - } - - attr->pathlimit.ttl = stream_getc (BGP_INPUT(peer)); - attr->pathlimit.as = stream_getl (BGP_INPUT(peer)); - attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_AS_PATHLIMIT); - return 0; -} /* Get origin attribute of the update message. */ static int bgp_attr_origin (struct peer *peer, bgp_size_t length, @@ -1717,9 +1680,6 @@ bgp_attr_parse (struct peer *peer, struc case BGP_ATTR_EXT_COMMUNITIES: ret = bgp_attr_ext_communities (peer, length, attr, flag); break; - case BGP_ATTR_AS_PATHLIMIT: - ret = bgp_attr_aspathlimit (peer, length, attr, flag, startp); - break; default: ret = bgp_attr_unknown (peer, attr, flag, type, length, startp); break; @@ -2273,25 +2233,7 @@ bgp_packet_attribute (struct bgp *bgp, s stream_putl (s, attr->extra->aggregator_as); stream_put_ipv4 (s, attr->extra->aggregator_addr.s_addr); } - - /* AS-Pathlimit */ - if (attr->pathlimit.ttl) - { - u_int32_t as = attr->pathlimit.as; - - /* should already have been done in announce_check(), - * but just in case.. - */ - if (!as) - as = peer->local_as; - - stream_putc (s, BGP_ATTR_FLAG_OPTIONAL|BGP_ATTR_FLAG_TRANS); - stream_putc (s, BGP_ATTR_AS_PATHLIMIT); - stream_putc (s, 5); - stream_putc (s, attr->pathlimit.ttl); - stream_putl (s, as); - } - + /* Unknown transit attribute. */ if (attr->extra && attr->extra->transit) stream_put (s, attr->extra->transit->val, attr->extra->transit->length); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mailman for openSUSE:11.3
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package mailman for openSUSE:11.3 checked in at Thu Mar 31 18:06:37 CEST 2011. -------- --- old-versions/11.3/all/mailman/mailman.changes 2009-11-03 20:20:21.000000000 +0100 +++ 11.3/mailman/mailman.changes 2011-02-23 19:43:22.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Feb 23 19:42:27 CET 2011 - matejcik(a)suse.cz + +- fixed a XSS vulnerability in confirm.py (CVE-2011-0707, bnc#671745) + +------------------------------------------------------------------- +Mon Nov 15 10:46:32 CET 2010 - dmueller(a)suse.de + +- update to 2.1.14: + - Two potential XSS vulnerabilities have been identified and fixed. + - Various i18n updates + - A new feature for controlling the addition/replacement of the Sender: + header in outgoing mail has been implemented. This allows a list owner + to set include_sender_header on the list's General Options page in the + admin GUI. The default for this setting is Yes which preserves the prior + behavior of removing any pre-existing Sender: and setting it to the + list's -bounces address. Setting this to No stops Mailman from adding or + modifying the Sender: at all. + - long list of bug fixes and enhancements, see included NEWS for details + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/mailman Destination is old-versions/11.3/UPDATES/all/mailman calling whatdependson for 11.3-i586 Old: ---- mailman-2.1.11.tgz mailman-2.1.3-misc-PACKAGES.diff mailman-2.1.3-python.dif mailman-2.1.4-avoid-headerfolding-python21.diff mailman-python-26-deprecation-md5-sha.diff mailman-python-26-email-fixes.diff minmem New: ---- mailman-2.1.14-CVE-2011-0707.patch mailman-2.1.14-misc-PACKAGES.diff mailman-2.1.14-python.dif mailman-2.1.14.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailman.spec ++++++ --- /var/tmp/diff_new_pack.lb47su/_old 2011-03-31 18:06:15.000000000 +0200 +++ /var/tmp/diff_new_pack.lb47su/_new 2011-03-31 18:06:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mailman (Version 2.1.11) +# spec file for package mailman # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,8 @@ PreReq: /usr/sbin/useradd /usr/sbin/groupadd /bin/echo /bin/cp /bin/rm /bin/mkdir /usr/bin/awk /usr/bin/touch /usr/bin/getent openssl PreReq: permissions Summary: The GNU Mailing List Manager -Version: 2.1.11 -Release: 10 +Version: 2.1.14 +Release: 6.<RELEASE2> Source: %{name}-%{version}.tgz Source1: README.SuSE Source2: mailman-2.1-manpages.tgz @@ -52,13 +52,12 @@ %else Patch2: mailman-SuSE.patch %endif -Patch3: mailman-2.1.3-python.dif +Patch3: mailman-2.1.14-python.dif Patch5: mailman-2.1.3-editarch.patch -Patch6: mailman-2.1.3-misc-PACKAGES.diff +Patch6: mailman-2.1.14-misc-PACKAGES.diff Patch7: mailman-2.1.2-list_lists.patch Patch10: mailman-2.1.4-dirmode.patch Patch11: mailman-2.1.4-notavaliduser.patch -Patch15: mailman-2.1.4-avoid-headerfolding-python21.diff Patch17: mailman-weak-password.diff Patch18: mailman-2.1.5-no_extra_asian.dif Patch19: mailman-python24.patch @@ -66,8 +65,7 @@ %else Patch20: mailman-SuSE2.patch %endif -Patch21: mailman-python-26-deprecation-md5-sha.diff -Patch22: mailman-python-26-email-fixes.diff +Patch21: mailman-2.1.14-CVE-2011-0707.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define m_uid 72 %define m_gid 67 @@ -100,7 +98,6 @@ %patch7 %patch10 -p1 %patch11 -p1 -%patch15 -p1 %patch17 -p1 %patch18 %patch19 @@ -109,7 +106,6 @@ %patch20 %endif %patch21 -%patch22 cp -av %{S:1} . # ---------------------------------------------------------------------------- ++++++ mailman-2.1.14-CVE-2011-0707.patch ++++++ === modified file 'Mailman/Cgi/confirm.py' --- Mailman/Cgi/confirm.py 2010-03-29 20:48:11 +0000 +++ Mailman/Cgi/confirm.py 2011-02-12 02:24:47 +0000 @@ -471,7 +471,7 @@ if fullname is None: fullname = _('Not available') else: - fullname = Utils.uncanonstr(fullname, lang) + fullname = Utils.websafe(Utils.uncanonstr(fullname, lang)) table.AddRow([_("""Your confirmation is required in order to complete the unsubscription request from the mailing list %(listname)s. You are currently subscribed with @@ -573,7 +573,7 @@ if fullname is None: fullname = _('Not available') else: - fullname = Utils.uncanonstr(fullname, lang) + fullname = Utils.websafe(Utils.uncanonstr(fullname, lang)) if globally: globallys = _('globally') else: @@ -814,7 +814,7 @@ if username is None: username = _('not available') else: - username = Utils.uncanonstr(username, lang) + username = Utils.websafe(Utils.uncanonstr(username, lang)) table.AddRow([_("""Your membership in the %(realname)s mailing list is currently disabled due to excessive bounces. Your confirmation is ++++++ mailman-2.1.3-misc-PACKAGES.diff -> mailman-2.1.14-misc-PACKAGES.diff ++++++ --- old-versions/11.3/all/mailman/mailman-2.1.3-misc-PACKAGES.diff 2009-10-04 14:12:35.000000000 +0200 +++ 11.3/mailman/mailman-2.1.14-misc-PACKAGES.diff 2010-11-15 10:49:14.000000000 +0100 @@ -1,5 +1,3 @@ -Index: mailman-2.1.11/Makefile.in -=================================================================== --- mailman-2.1.11.orig/Makefile.in +++ mailman-2.1.11/Makefile.in @@ -125,6 +125,7 @@ doinstall: $(SUBDIRS) @@ -10,13 +8,11 @@ # Only run bin/update if we aren't installing in DESTDIR, as this # means there are probably no lists to deal with, and it wouldn't -Index: mailman-2.1.11/misc/Makefile.in -=================================================================== ---- mailman-2.1.11.orig/misc/Makefile.in -+++ mailman-2.1.11/misc/Makefile.in -@@ -58,7 +58,7 @@ EMAILPKG= email-2.5.8 - JACODECSPKG= JapaneseCodecs-1.4.11 - KOCODECSPKG= KoreanCodecs-2.0.5 +--- mailman-2.1.14/misc/Makefile.in 2010-09-20 20:18:27.000000000 +0200 ++++ mailman-2.1.14/misc/Makefile.in 2010-11-15 10:34:50.013318554 +0100 +@@ -57,7 +57,7 @@ + JACODECSPKG= @JACODECSPKG@ + KOCODECSPKG= @KOCODECSPKG@ -PACKAGES= $(EMAILPKG) $(JACODECSPKG) $(KOCODECSPKG) +PACKAGES= $(EMAILPKG) ++++++ mailman-2.1.3-python.dif -> mailman-2.1.14-python.dif ++++++ --- old-versions/11.3/all/mailman/mailman-2.1.3-python.dif 2009-10-04 14:12:36.000000000 +0200 +++ 11.3/mailman/mailman-2.1.14-python.dif 2010-11-15 10:49:14.000000000 +0100 @@ -37,39 +37,18 @@ # Only run bin/update if we aren't installing in DESTDIR, as this # means there are probably no lists to deal with, and it wouldn't -Index: bin/mailmanctl -=================================================================== ---- bin/mailmanctl.orig -+++ bin/mailmanctl -@@ -417,6 +417,11 @@ def main(): - # won't be opening any terminal devices, don't do the ultra-paranoid - # suggestion of doing a second fork after the setsid() call. - os.setsid() -+ devnull = os.open('/dev/null', 0) -+ os.dup2(devnull, 0) -+ os.dup2(devnull, 1) -+ os.dup2(devnull, 2) -+ - # Instead of cd'ing to root, cd to the Mailman installation home - os.chdir(mm_cfg.PREFIX) - # Set our file mode creation umask -Index: misc/Makefile.in -=================================================================== ---- misc/Makefile.in.orig +--- misc/Makefile.in +++ misc/Makefile.in -@@ -47,10 +47,11 @@ SCRIPTSDIR= $(prefix)/scripts +@@ -47,9 +47,9 @@ SHELL= /bin/sh PYTHONLIBDIR= $(prefix)/pythonlib -SETUPINSTOPTS= --install-lib $(DESTDIR)$(PYTHONLIBDIR) \ - --install-purelib $(DESTDIR)$(PYTHONLIBDIR) \ - --install-data $(DESTDIR)$(PYTHONLIBDIR) --SETUPCMD= setup.py --quiet install $(SETUPINSTOPTS) -+SETUPINSTOPTS= --root=$(DESTDIR) \ -+ --install-lib $(PYTHONLIBDIR) \ ++SETUPINSTOPTS= --root=$(DESTDIR) --install-lib $(PYTHONLIBDIR) \ + --install-purelib $(PYTHONLIBDIR) \ + --install-data $(PYTHONLIBDIR) -+SETUPCMD= setup.py install $(SETUPINSTOPTS) + SETUPCMD= setup.py --quiet install $(SETUPINSTOPTS) PKGDIR= $(srcdir) - EMAILPKG= email-2.5.8 ++++++ mailman-2.1.11.tgz -> mailman-2.1.14.tgz ++++++ old-versions/11.3/all/mailman/mailman-2.1.11.tgz 11.3/mailman/mailman-2.1.14.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit quagga for openSUSE:11.2
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package quagga for openSUSE:11.2 checked in at Thu Mar 31 18:05:45 CEST 2011. -------- --- old-versions/11.2/UPDATES/all/quagga/quagga.changes 2010-11-10 17:26:08.000000000 +0100 +++ 11.2/quagga/quagga.changes 2011-03-31 14:14:42.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Feb 23 13:10:09 UTC 2011 - prusnak(a)opensuse.org + +- fix CVE-2010-1674 and CVE-2010-1675 [bnc#654270] + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- quagga-0.99.17-CVE-2010-1674.patch quagga-0.99.17-CVE-2010-1675.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.9vxWfm/_old 2011-03-31 18:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.9vxWfm/_new 2011-03-31 18:04:05.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package quagga (Version 0.99.17) +# spec file for package quagga # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: quagga Version: 0.99.17 -Release: 1.<RELEASE1> +Release: 1.<RELEASE5> License: LGPLv2.1+ Summary: Free Routing Software (for BGP, OSPF and RIP, for example) Url: http://www.quagga.net @@ -27,6 +27,8 @@ Source: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: %{name}-SUSE.tar.bz2 Source2: %{name}.pam +Patch0: %{name}-0.99.17-CVE-2010-1674.patch +Patch1: %{name}-0.99.17-CVE-2010-1675.patch BuildRequires: net-snmp-devel BuildRequires: pam-devel BuildRequires: readline-devel @@ -64,6 +66,8 @@ %prep %setup -q -a 1 +%patch0 -p 1 +%patch1 -p 1 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then ++++++ quagga-0.99.17-CVE-2010-1674.patch ++++++ commit 5aadc3763588766490a25ef6b475f64ef88f8e0e Author: Paul Jakma <paul(a)quagga.net> Date: Sun Dec 5 17:17:26 2010 +0000 bgpd/security: CVE-2010-1674 Fix crash due to extended-community parser error * bgp_attr.c: (bgp_attr_ext_communities) Certain extended-community attrs can leave attr->flag indicating ext-community is present, even though no extended-community object has been attached to the attr structure. Thus a null-pointer dereference can occur later. (bgp_attr_community) No bug fixed here, but tidy up flow so it has same form as previous. Problem and fix thanks to anonymous reporter. Index: quagga-0.99.17/bgpd/bgp_attr.c =================================================================== --- quagga-0.99.17.orig/bgpd/bgp_attr.c +++ quagga-0.99.17/bgpd/bgp_attr.c @@ -1235,13 +1235,16 @@ bgp_attr_community (struct peer *peer, b attr->community = NULL; return 0; } - else - { - attr->community = - community_parse ((u_int32_t *)stream_pnt (peer->ibuf), length); - stream_forward_getp (peer->ibuf, length); - } + + attr->community = + community_parse ((u_int32_t *)stream_pnt (peer->ibuf), length); + + /* XXX: fix community_parse to use stream API and remove this */ + stream_forward_getp (peer->ibuf, length); + if (!attr->community) + return -1; + attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_COMMUNITIES); return 0; @@ -1478,13 +1481,18 @@ bgp_attr_ext_communities (struct peer *p { if (attr->extra) attr->extra->ecommunity = NULL; + /* Empty extcomm doesn't seem to be invalid per se */ + return 0; } - else - { - (bgp_attr_extra_get (attr))->ecommunity = - ecommunity_parse ((u_int8_t *)stream_pnt (peer->ibuf), length); - stream_forward_getp (peer->ibuf, length); - } + + (bgp_attr_extra_get (attr))->ecommunity = + ecommunity_parse ((u_int8_t *)stream_pnt (peer->ibuf), length); + /* XXX: fix ecommunity_parse to use stream API */ + stream_forward_getp (peer->ibuf, length); + + if (!attr->extra->ecommunity) + return -1; + attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_EXT_COMMUNITIES); return 0; ++++++ quagga-0.99.17-CVE-2010-1675.patch ++++++ Index: quagga-0.99.17/bgpd/bgp_attr.c =================================================================== --- quagga-0.99.17.orig/bgpd/bgp_attr.c +++ quagga-0.99.17/bgpd/bgp_attr.c @@ -704,43 +704,6 @@ bgp_attr_flush (struct attr *attr) } } -/* Parse AS_PATHLIMIT attribute in an UPDATE */ -static int -bgp_attr_aspathlimit (struct peer *peer, bgp_size_t length, - struct attr *attr, u_char flag, u_char *startp) -{ - bgp_size_t total; - - total = length + (CHECK_FLAG (flag, BGP_ATTR_FLAG_EXTLEN) ? 4 : 3); - - if (!CHECK_FLAG(flag, BGP_ATTR_FLAG_TRANS) - || !CHECK_FLAG(flag, BGP_ATTR_FLAG_OPTIONAL)) - { - zlog (peer->log, LOG_ERR, - "AS-Pathlimit attribute flag isn't transitive %d", flag); - bgp_notify_send_with_data (peer, - BGP_NOTIFY_UPDATE_ERR, - BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR, - startp, total); - return -1; - } - - if (length != 5) - { - zlog (peer->log, LOG_ERR, - "AS-Pathlimit length, %u, is not 5", length); - bgp_notify_send_with_data (peer, - BGP_NOTIFY_UPDATE_ERR, - BGP_NOTIFY_UPDATE_ATTR_FLAG_ERR, - startp, total); - return -1; - } - - attr->pathlimit.ttl = stream_getc (BGP_INPUT(peer)); - attr->pathlimit.as = stream_getl (BGP_INPUT(peer)); - attr->flag |= ATTR_FLAG_BIT (BGP_ATTR_AS_PATHLIMIT); - return 0; -} /* Get origin attribute of the update message. */ static int bgp_attr_origin (struct peer *peer, bgp_size_t length, @@ -1717,9 +1680,6 @@ bgp_attr_parse (struct peer *peer, struc case BGP_ATTR_EXT_COMMUNITIES: ret = bgp_attr_ext_communities (peer, length, attr, flag); break; - case BGP_ATTR_AS_PATHLIMIT: - ret = bgp_attr_aspathlimit (peer, length, attr, flag, startp); - break; default: ret = bgp_attr_unknown (peer, attr, flag, type, length, startp); break; @@ -2273,25 +2233,7 @@ bgp_packet_attribute (struct bgp *bgp, s stream_putl (s, attr->extra->aggregator_as); stream_put_ipv4 (s, attr->extra->aggregator_addr.s_addr); } - - /* AS-Pathlimit */ - if (attr->pathlimit.ttl) - { - u_int32_t as = attr->pathlimit.as; - - /* should already have been done in announce_check(), - * but just in case.. - */ - if (!as) - as = peer->local_as; - - stream_putc (s, BGP_ATTR_FLAG_OPTIONAL|BGP_ATTR_FLAG_TRANS); - stream_putc (s, BGP_ATTR_AS_PATHLIMIT); - stream_putc (s, 5); - stream_putc (s, attr->pathlimit.ttl); - stream_putl (s, as); - } - + /* Unknown transit attribute. */ if (attr->extra && attr->extra->transit) stream_put (s, attr->extra->transit->val, attr->extra->transit->length); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iotop for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package iotop for openSUSE:Factory checked in at Thu Mar 31 15:56:49 CEST 2011. -------- --- iotop/iotop.changes 2010-09-07 12:21:38.000000000 +0200 +++ iotop/iotop.changes 2011-03-30 10:22:41.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Mar 30 07:42:46 UTC 2011 - saschpe(a)suse.de + +- Remove authors from %%description +- Change "python ./setup.py" calls to "python setup.py" + +------------------------------------------------------------------- +Mon Mar 28 23:04:21 UTC 2011 - pascal.bleser(a)opensuse.org + +- update to 0.4.3: + * the netlink message parsing code was fixed to accept alignment padding + * UTF-8 output is now forced even if the locale is misconfigured + * the semantic of the 'a' key was changed to show stats since iotop was + started + +- changes from 0.4.2: + * workaround for an ncurses bug where UTF-8 strings are misprinted + * ioprio support for the armel and hppa architectures was added + * a possible incompatibility with Linux 2.6.37 on 64-bit systems was fixed + * iotop does not crash anymore when the locale is incorrectly configured + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iotop-0.4.1.tar.bz2 iotop-pid_alignment.patch New: ---- iotop-0.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iotop.spec ++++++ --- /var/tmp/diff_new_pack.sXSp8h/_old 2011-03-31 15:56:09.000000000 +0200 +++ /var/tmp/diff_new_pack.sXSp8h/_new 2011-03-31 15:56:09.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package iotop (Version 0.4.1) +# spec file for package iotop # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Name: iotop -BuildRequires: python-devel >= 2.5 +Version: 0.4.3 +Release: 1 Summary: Top Like UI to Show Per-Process I/O Going on -Version: 0.4.1 -Release: 2 -Source: %{name}-%{version}.tar.bz2 +Source: http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -#Added 2010.09.06 Will be unnecessary with next major version. -Patch0: iotop-pid_alignment.patch -License: GPLv2 -Group: System/Monitoring Url: http://guichaz.free.fr/iotop/ +Group: System/Monitoring +License: GPLv2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel >= 2.5 Requires: python-curses +%if 0%{?suse_version} >= 1120 BuildArch: noarch -%{py_requires} +%endif +%py_requires %description Linux has always been able to show how much I/O was going on (the bi @@ -42,39 +42,28 @@ Iotop is a Python program with a UI similar to top to show on behalf of which process is the I/O going on. - - -Authors: --------- - Guillaume Chazarain <guichaz(a)yahoo.fr> - %prep %setup -q -%patch0 -p1 %build -python setup.py build +%__python setup.py build %install -#! /bin/sh -# # Copied from: http://trac.edgewall.org/ticket/1141 -# # this file is *inserted* into the install section of the generated # spec file -# # this is, what dist.py normally does -./setup.py install --prefix=/usr --root=%{buildroot} --record="INSTALLED_FILES" +%__python setup.py install --prefix="%{_prefix}" --root="%{buildroot}" --record="INSTALLED_FILES" # catch compressed man pages -sed -i -e 's@$.\+/man/man[[:digit:]]/.\+\.[[:digit:]]$$@\1*@' "INSTALLED_FILES" +%__sed -i -e 's@$.\+/man/man[[:digit:]]/.\+\.[[:digit:]]$$@\1*@' "INSTALLED_FILES" # catch any compiled python files (.pyc, .pyo), but don't list them twice -sed -i -e 's@$.\+$\.py$@\1.py*@' \ +%__sed -i -e 's@$.\+$\.py$@\1.py*@' \ -e '/.\+\.pyc$/d' \ "INSTALLED_FILES" echo "%dir %{python_sitelib}/iotop" >> INSTALLED_FILES %clean -rm -rf %{buildroot} +%{?buildroot:%__rm -rf "%{buildroot}"} %files -f INSTALLED_FILES %defattr(-,root,root) ++++++ iotop-0.4.1.tar.bz2 -> iotop-0.4.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/ChangeLog new/iotop-0.4.3/ChangeLog --- old/iotop-0.4.1/ChangeLog 2010-06-27 18:08:25.000000000 +0200 +++ new/iotop-0.4.3/ChangeLog 2011-03-28 22:36:07.000000000 +0200 @@ -1,3 +1,83 @@ +2011-03-28 Guillaume Chazarain <guichaz(a)gmail.com> + + * NEWS, iotop/version.py: Version bump + +2011-03-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * iotop/ui.py: Show stats since iotop started, not since 'a' was + pressed. This is to avoid losing valuable data when 'a' is + inadvertently pressed. + +2011-03-13 Guillaume Chazarain <guichaz(a)gmail.com> + + * iotop/ui.py: Force UTF-8 output even if the locale is not set to + UTF-8. At worst it will output garbage, which is better than + crashing in this case. + +2011-01-16 Guillaume Chazarain <guichaz(a)gmail.com> + + * THANKS, iotop/data.py, iotop/genetlink.py: Fix netlink message + parsing to accept alignement padding. https://lkml.org/lkml/2010/12/13/176 + https://lkml.org/lkml/2010/12/29/237 + +2010-12-15 Guillaume Chazarain <guichaz(a)gmail.com> + + * iotop/data.py: Removing dead code + +2010-12-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * NEWS: Grammar + +2010-12-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * NEWS, iotop/version.py: Version bump + +2010-12-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * MANIFEST.in, install-rpm.sh, setup.cfg: Try to do without + install-rpm.sh + +2010-12-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * iotop/ui.py: With addstr instead of insstr we get a harmless + exception when writing on the last column. Confirmed by http://ubuntuforums.org/showthread.php?t=457689 + addstr() raises an exception but the string is printed anyway + +2010-12-14 Guillaume Chazarain <guichaz(a)gmail.com> + + * iotop/ui.py: Back to addstr because of: + http://marc.info/?l=ncurses-bug&m=125233342917443&w=3 insstr (from ncursesw) UTF-8 issue => The cursor position was not + updated for wide characters by insstr() + +2010-09-06 Guillaume Chazarain <guichaz(a)gmail.com> + + * bin/iotop: Revert "Some distributions have a default distutils + prefix which is not in sys.path, so installed modules cannot be + imported." This reverts commit d0812c2024a1f8edb081a2996af12efacdf8c961. Actually I don't think this is needed for now. + +2010-09-06 Guillaume Chazarain <guichaz(a)gmail.com> + + * bin/iotop: Some distributions have a default distutils prefix + which is not in sys.path, so installed modules cannot be imported. + To address that, explicitely add the path where the module is + supposed to be installed to sys.path. + +2010-09-04 Guillaume Chazarain <guichaz(a)gmail.com> + + * THANKS, iotop/ioprio.py: Support for getting and setting IO + priority on armel and hppa architectures. + +2010-09-04 Guillaume Chazarain <guichaz(a)gmail.com> + + * THANKS, iotop/data.py: Instead of assuming the pid field is 4 + bytes long, take its length from the header. This is needed for + http://lkml.org/lkml/2010/2/12/167 [PATCH] delayacct: align to 8 + byte boundary on 64-bit systems + +2010-08-22 Paul Wise <pabs3(a)bonedaddy.net> + + * iotop/ui.py: Fix traceback with an invalid locale. Closes: http://bugs.debian.org/593846 + 2010-06-27 Guillaume Chazarain <guichaz(a)gmail.com> * NEWS, iotop/version.py: Bump version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/NEWS new/iotop-0.4.3/NEWS --- old/iotop-0.4.1/NEWS 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/NEWS 2011-03-28 22:34:10.000000000 +0200 @@ -1,3 +1,16 @@ +0.4.3 +~~~~~ +o Fixed netlink message parsing to accept alignement padding +o Force UTF-8 output even if the locale is misconfigured +o Changed the semantic of 'a' to show stats since iotop was started + +0.4.2 +~~~~~ +o Workaround for an ncurses bug where UTF-8 strings are misprinted +o Added ioprio support for the armel and hppa architectures +o Fix possible incompatibility with linux-2.6.37 on 64 bit systems +o Do not crash when the locale is incorrectly configured + 0.4.1 ~~~~~ o Portability fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/PKG-INFO new/iotop-0.4.3/PKG-INFO --- old/iotop-0.4.1/PKG-INFO 2010-06-27 18:08:26.000000000 +0200 +++ new/iotop-0.4.3/PKG-INFO 2011-03-28 22:36:07.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: iotop -Version: 0.4.1 +Version: 0.4.3 Summary: Per process I/O bandwidth monitor Home-page: http://guichaz.free.fr/iotop Author: Guillaume Chazarain diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/THANKS new/iotop-0.4.3/THANKS --- old/iotop-0.4.1/THANKS 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/THANKS 2011-03-28 22:34:10.000000000 +0200 @@ -30,3 +30,15 @@ Jiri Olsa <jolsa(a)redhat.com> Wrote the support for python2.4 with the ctypes module. + +Philipp Thomas <pth(a)suse.de> + Reported that iotop produced wrong numbers in openSUSE 11.3. + +Jakub Wilk <jwilk(a)debian.org> + Contributed syscall numbers for getting and setting IO priority on armel and hppa architectures. + +Jeff Mahoney <jeffm(a)suse.com> + Contributed a fixed implementation of the taskstats parsing code. + +Florian Mickler <florian(a)mickler.org> + Contributed a fixed implementation of the taskstats parsing code. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/install-rpm.sh new/iotop-0.4.3/install-rpm.sh --- old/iotop-0.4.1/install-rpm.sh 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/install-rpm.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#! /bin/sh -# -# Copied from: http://trac.edgewall.org/ticket/1141 -# -# this file is *inserted* into the install section of the generated -# spec file -# - -# this is, what dist.py normally does -./setup.py install --prefix=/usr --root=${RPM_BUILD_ROOT} --record="INSTALLED_FILES" - -# catch compressed man pages -sed -i -e 's@$.\+/man/man[[:digit:]]/.\+\.[[:digit:]]$$@\1*@' "INSTALLED_FILES" - -# catch any compiled python files (.pyc, .pyo), but don't list them twice -sed -i -e 's@$.\+$\.py$@\1.py*@' \ - -e '/.\+\.pyc$/d' \ - "INSTALLED_FILES" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/iotop/data.py new/iotop-0.4.3/iotop/data.py --- old/iotop-0.4.1/iotop/data.py 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/iotop/data.py 2011-03-28 22:34:10.000000000 +0200 @@ -134,6 +134,9 @@ TASKSTATS_CMD_GET = 1 TASKSTATS_CMD_ATTR_PID = 1 +TASKSTATS_TYPE_AGGR_PID = 4 +TASKSTATS_TYPE_PID = 1 +TASKSTATS_TYPE_STATS = 3 class TaskStatsNetlink(object): # Keep in sync with format_stats() and pinfo.did_some_io() @@ -152,23 +155,25 @@ def get_single_task_stats(self, thread): thread.task_stats_request.send(self.connection) try: - reply = self.connection.recv() + reply = GeNlMessage.recv(self.connection) except OSError, e: if e.errno == errno.ESRCH: # OSError: Netlink error: No such process (3) return raise - if len(reply.payload) < 292: + for attr_type, attr_value in reply.attrs.iteritems(): + if attr_type == TASKSTATS_TYPE_AGGR_PID: + reply = attr_value.nested() + break + else: + return + taskstats_data = reply[TASKSTATS_TYPE_STATS].data + if len(taskstats_data) < 272: # Short reply return - reply_data = reply.payload[20:] - - reply_length, reply_type = struct.unpack('HH', reply.payload[4:8]) - reply_version = struct.unpack('H', reply.payload[20:22])[0] - assert reply_length >= 288 - assert reply_type == TASKSTATS_CMD_ATTR_PID + 3 - assert reply_version >= 4 - return Stats(reply_data) + taskstats_version = struct.unpack('H', taskstats_data[:2])[0] + assert taskstats_version >= 4 + return Stats(taskstats_data) # # PIDs manipulations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/iotop/genetlink.py new/iotop-0.4.3/iotop/genetlink.py --- old/iotop-0.4.1/iotop/genetlink.py 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/iotop/genetlink.py 2011-03-28 22:34:10.000000000 +0200 @@ -45,6 +45,18 @@ Message.__init__(self, family, flags=flags, payload=[GenlHdr(self.cmd)]+attrs) + @staticmethod + def recv(conn): + msg = conn.recv() + packet = msg.payload + hdr = _genl_hdr_parse(packet[:4]) + + genlmsg = GeNlMessage(msg.type, hdr.cmd, [], msg.flags) + genlmsg.attrs = parse_attributes(packet[4:]) + genlmsg.version = hdr.version + + return genlmsg + class Controller: def __init__(self, conn): self.conn = conn @@ -53,10 +65,8 @@ m = GeNlMessage(GENL_ID_CTRL, CTRL_CMD_GETFAMILY, flags=NLM_F_REQUEST, attrs=[a]) m.send(self.conn) - m = self.conn.recv() - gh = _genl_hdr_parse(m.payload[:4]) - attrs = parse_attributes(m.payload[4:]) - return attrs[CTRL_ATTR_FAMILY_ID].u16() + m = GeNlMessage.recv(self.conn) + return m.attrs[CTRL_ATTR_FAMILY_ID].u16() connection = Connection(NETLINK_GENERIC) controller = Controller(connection) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/iotop/ioprio.py new/iotop-0.4.3/iotop/ioprio.py --- old/iotop-0.4.1/iotop/ioprio.py 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/iotop/ioprio.py 2011-03-28 22:34:10.000000000 +0200 @@ -29,8 +29,10 @@ # the architecture name and the word size. IOPRIO_GET_ARCH_SYSCALL = [ ('alpha', '*', 443), + ('arm*', '*', 315), ('i*86', '*', 290), ('ia64*', '*', 1275), + ('parisc*', '*', 268), ('powerpc*', '*', 274), ('s390*', '*', 283), ('sparc*', '*', 218), @@ -41,8 +43,10 @@ IOPRIO_SET_ARCH_SYSCALL = [ ('alpha', '*', 442), + ('arm*', '*', 314), ('i*86', '*', 289), ('ia64*', '*', 1274), + ('parisc*', '*', 267), ('powerpc*', '*', 273), ('s390*', '*', 282), ('sparc*', '*', 196), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/iotop/ui.py new/iotop-0.4.3/iotop/ui.py --- old/iotop-0.4.1/iotop/ui.py 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/iotop/ui.py 2011-03-28 22:34:10.000000000 +0200 @@ -280,7 +280,6 @@ def handle_key(self, key): def toggle_accumulated(): self.options.accumulated ^= True - self.process_list.clear() def toggle_only_io(): self.options.only ^= True def toggle_processes(): @@ -420,7 +419,7 @@ if self.options.quiet <= int(first_time): print ''.join(titles) for l in lines: - print l + print l.encode('utf-8') sys.stdout.flush() else: self.win.erase() @@ -446,13 +445,9 @@ num_lines = min(len(lines), self.height - 2 - int(bool(status_msg))) for i in xrange(num_lines): try: - self.win.insstr(i + 2, 0, lines[i].encode('utf-8')) + self.win.addstr(i + 2, 0, lines[i].encode('utf-8')) except curses.error: - exc_type, value, traceback = sys.exc_info() - value = '%s win:%s i:%d line:%s' % \ - (value, self.win.getmaxyx(), i, lines[i]) - value = str(value).encode('string_escape') - raise exc_type, value, traceback + pass if status_msg: self.win.insstr(self.height - 1, 0, status_msg, curses.A_BOLD) self.win.refresh() @@ -512,7 +507,10 @@ a refresh.''' % sys.argv[0] def main(): - locale.setlocale(locale.LC_ALL, '') + try: + locale.setlocale(locale.LC_ALL, '') + except locale.Error: + print 'unable to set locale, falling back to the default locale' parser = optparse.OptionParser(usage=USAGE, version='iotop ' + VERSION) parser.add_option('-o', '--only', action='store_true', dest='only', default=False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/iotop/version.py new/iotop-0.4.3/iotop/version.py --- old/iotop-0.4.1/iotop/version.py 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/iotop/version.py 2011-03-28 22:34:10.000000000 +0200 @@ -1 +1 @@ -VERSION = '0.4.1' +VERSION = '0.4.3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.1/setup.cfg new/iotop-0.4.3/setup.cfg --- old/iotop-0.4.1/setup.cfg 2010-06-27 18:08:10.000000000 +0200 +++ new/iotop-0.4.3/setup.cfg 2011-03-28 22:34:10.000000000 +0200 @@ -1,3 +1,2 @@ [bdist_rpm] -install_script = install-rpm.sh doc_files = ChangeLog COPYING NEWS README THANKS ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-setproctitle for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package python-setproctitle for openSUSE:Factory checked in at Thu Mar 31 15:55:48 CEST 2011. -------- --- python-setproctitle/python-setproctitle.changes 2010-11-18 16:53:11.000000000 +0100 +++ python-setproctitle/python-setproctitle.changes 2011-03-29 15:57:43.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 29 13:48:10 UTC 2011 - saschpe(a)suse.de + +- Spec file cleanup: + * changed license to BSD3c + * packaded documentation files + * fixed build non-SUSE distros + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-setproctitle.spec ++++++ --- /var/tmp/diff_new_pack.dXXQJW/_old 2011-03-31 15:55:11.000000000 +0200 +++ /var/tmp/diff_new_pack.dXXQJW/_new 2011-03-31 15:55:11.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-setproctitle (Version 1.1) +# spec file for package python-setproctitle # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,24 @@ # -%define modname setproctitle +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define mod_name setproctitle Name: python-setproctitle Version: 1.1 -Release: 1 -License: BSD +Release: 6 +License: BSD3c Summary: Python module to allow customization of the process title Url: http://pypi.python.org/pypi/setproctitle/ Group: Development/Libraries/Python -Source: %{modname}-%{version}.tar.bz2 -BuildRequires: python-devel +Source: %{mod_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%endif %description Changing the title is mostly useful in multi-process systems, for example when @@ -37,19 +42,21 @@ the OpenSSH Server for example. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n %{mod_name}-%{version} %build export CFLAGS="%{optflags}" python setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} %clean rm -rf %{buildroot} -%files -f INSTALLED_FILES +%files %defattr(-,root,root) +%doc COPYRIGHT HISTORY README +%python_sitearch/%{mod_name}* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-ply for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package python-ply for openSUSE:Factory checked in at Thu Mar 31 15:54:01 CEST 2011. -------- --- python-ply/python-ply.changes 2010-09-14 10:52:24.000000000 +0200 +++ python-ply/python-ply.changes 2011-03-29 16:07:35.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Mar 29 14:02:28 UTC 2011 - saschpe(a)suse.de + +- Update to 3.4: + + Minor patch to make cpp.py compatible with Python 3. + + Fixed setup.py trove classifiers to properly list PLY as Python + 3 compatible. +- License changed to BSD3c +- Packaged more doc files +- Moved important docs (README, ..) to base package +- Fixed build for non-SUSE distros + +------------------------------------------------------------------- @@ -4,4 +16,4 @@ -- update to 3.3: - PLY-3.3 is a minor bug fix release, it supports - both Python 2 and Python 3. -- license changed to BSD +- Update to 3.3: + + PLY-3.3 is a minor bug fix release, it supports both Python 2 + and Python 3. +- License changed to BSD @@ -12 +24 @@ -- use new python macros +- Use new python macros calling whatdependson for head-i586 Old: ---- ply-3.3.tar.gz New: ---- ply-3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ply.spec ++++++ --- /var/tmp/diff_new_pack.9UloW2/_old 2011-03-31 15:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.9UloW2/_new 2011-03-31 15:52:59.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-ply (Version 3.3) +# spec file for package python-ply # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,77 +17,79 @@ # norootforbuild -BuildRequires: python-devel -Summary: Lex and Yacc-like tools written in Python +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define mod_name ply -Name: python-ply -Version: 3.3 +Name: python-%{mod_name} +Version: 3.4 Release: 1 -License: BSD +Url: http://www.dabeaz.com/ply/ +Summary: Python Lex & Yacc +License: BSD3c Group: Development/Languages/Python -Source0: http://www.dabeaz.com/ply/ply-%{version}.tar.gz +Source: %{mod_name}-%{version}.tar.gz Patch0: python-ply-shebangs.patch -Url: http://www.dabeaz.com/ply BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel +%if 0%{?suse_version} %py_requires -%if %suse_version > 1120 +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif +%endif %description -PLY is yet another implementation of lex and yacc for Python. - Although several other parsing tools are available for Python, - there are several reasons why you might want to take a look at - PLY: - It uses LR-parsing which is reasonably efficient and well - suited for larger grammars. - -- PLY provides most of the standard lex/yacc features including - support for empty productions, precedence rules, error recovery, - and support for ambiguous grammars. +PLY is yet another implementation of lex and yacc for Python. Some notable +features include the fact that its implemented entirely in Python and it +uses LALR(1) parsing which is efficient and well suited for larger grammars. + +PLY provides most of the standard lex/yacc features including support for empty +productions, precedence rules, error recovery, and support for ambiguous grammars. -- PLY is extremely easy to use and provides very extensive error -checking. +PLY is extremely easy to use and provides very extensive error checking. +It is compatible with both Python 2 and Python 3. %package doc License: LGPLv2.1+ Group: Development/Languages/Python -Summary: Lex and Yacc-like tools written in Python +Summary: Python Lex & Yacc Requires: %{name} = %{version} %description doc -PLY is yet another implementation of lex and yacc for Python. - Although several other parsing tools are available for Python, - there are several reasons why you might want to take a look at - PLY: - It uses LR-parsing which is reasonably efficient and well - suited for larger grammars. - -- PLY provides most of the standard lex/yacc features including - support for empty productions, precedence rules, error recovery, - and support for ambiguous grammars. +PLY is yet another implementation of lex and yacc for Python. Some notable +features include the fact that its implemented entirely in Python and it +uses LALR(1) parsing which is efficient and well suited for larger grammars. + +PLY provides most of the standard lex/yacc features including support for empty +productions, precedence rules, error recovery, and support for ambiguous grammars. -- PLY is extremely easy to use and provides very extensive error -checking. +PLY is extremely easy to use and provides very extensive error checking. +It is compatible with both Python 2 and Python 3. %prep -%setup -n ply-%{version} +%setup -q -n %{mod_name}-%{version} %patch0 -p1 %build +export CFLAGS="%{optflags}" +python setup.py build %install -python setup.py install --prefix /usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} chmod a-x test/* %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) -# setup.py is kind of dumb, so: -%dir %{python_sitelib}/ply +%files +%defattr(-,root,root,-) +%doc ANNOUNCE CHANGES README TODO +%python_sitelib/%{mod_name}* %files doc -%defattr(-, root, root) -%doc CHANGES README TODO doc example test +%defattr(-,root,root,-) +%doc doc example test %changelog ++++++ ply-3.3.tar.gz -> ply-3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/ANNOUNCE new/ply-3.4/ANNOUNCE --- old/ply-3.3/ANNOUNCE 2009-09-02 16:27:23.000000000 +0200 +++ new/ply-3.4/ANNOUNCE 2011-02-18 04:52:28.000000000 +0100 @@ -1,11 +1,11 @@ -September 2, 2009 +February 17, 2011 - Announcing : PLY-3.3 (Python Lex-Yacc) + Announcing : PLY-3.4 (Python Lex-Yacc) http://www.dabeaz.com/ply -I'm pleased to announce PLY-3.3--a pure Python implementation of the -common parsing tools lex and yacc. PLY-3.3 is a minor bug fix +I'm pleased to announce PLY-3.4--a pure Python implementation of the +common parsing tools lex and yacc. PLY-3.4 is a minor bug fix release. It supports both Python 2 and Python 3. If you are new to PLY, here are a few highlights: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/CHANGES new/ply-3.4/CHANGES --- old/ply-3.3/CHANGES 2009-08-27 03:28:42.000000000 +0200 +++ new/ply-3.4/CHANGES 2011-02-18 04:52:28.000000000 +0100 @@ -1,3 +1,16 @@ +Version 3.4 +--------------------- +02/17/11: beazley + Minor patch to make cpp.py compatible with Python 3. Note: This + is an experimental file not currently used by the rest of PLY. + +02/17/11: beazley + Fixed setup.py trove classifiers to properly list PLY as + Python 3 compatible. + +01/02/11: beazley + Migration of repository to github. + Version 3.3 ----------------------------- 08/25/09: beazley diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/PKG-INFO new/ply-3.4/PKG-INFO --- old/ply-3.3/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/ply-3.4/PKG-INFO 2011-02-18 04:52:35.000000000 +0100 @@ -0,0 +1,22 @@ +Metadata-Version: 1.0 +Name: ply +Version: 3.4 +Summary: Python Lex & Yacc +Home-page: http://www.dabeaz.com/ply/ +Author: David Beazley +Author-email: dave(a)dabeaz.com +License: BSD +Description: + PLY is yet another implementation of lex and yacc for Python. Some notable + features include the fact that its implemented entirely in Python and it + uses LALR(1) parsing which is efficient and well suited for larger grammars. + + PLY provides most of the standard lex/yacc features including support for empty + productions, precedence rules, error recovery, and support for ambiguous grammars. + + PLY is extremely easy to use and provides very extensive error checking. + It is compatible with both Python 2 and Python 3. + +Platform: UNKNOWN +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/README new/ply-3.4/README --- old/ply-3.3/README 2009-09-02 16:27:23.000000000 +0200 +++ new/ply-3.4/README 2011-02-18 04:52:28.000000000 +0100 @@ -1,6 +1,6 @@ -PLY (Python Lex-Yacc) Version 3.3 +PLY (Python Lex-Yacc) Version 3.4 -Copyright (C) 2001-2009, +Copyright (C) 2001-2011, David M. Beazley (Dabeaz LLC) All rights reserved. @@ -177,7 +177,7 @@ t.lexer.lineno += t.value.count("\n") def t_error(t): - print "Illegal character '%s'" % t.value[0] + print("Illegal character '%s'" % t.value[0]) t.lexer.skip(1) # Build the lexer @@ -200,7 +200,7 @@ def p_statement_expr(p): 'statement : expression' - print p[1] + print(p[1]) def p_expression_binop(p): '''expression : expression PLUS expression @@ -229,18 +229,18 @@ try: p[0] = names[p[1]] except LookupError: - print "Undefined name '%s'" % p[1] + print("Undefined name '%s'" % p[1]) p[0] = 0 def p_error(p): - print "Syntax error at '%s'" % p.value + print("Syntax error at '%s'" % p.value) import ply.yacc as yacc yacc.yacc() while 1: try: - s = raw_input('calc > ') + s = raw_input('calc > ') # use input() on Python 3 except EOFError: break yacc.parse(s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/doc/ply.html new/ply-3.4/doc/ply.html --- old/ply-3.3/doc/ply.html 2009-09-02 16:27:23.000000000 +0200 +++ new/ply-3.4/doc/ply.html 2011-02-18 04:52:28.000000000 +0100 @@ -12,7 +12,7 @@ -PLY Version: 3.3 +PLY Version: 3.4  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/ply/cpp.py new/ply-3.4/ply/cpp.py --- old/ply-3.3/ply/cpp.py 2009-02-06 14:52:07.000000000 +0100 +++ new/ply-3.4/ply/cpp.py 2011-02-18 04:52:28.000000000 +0100 @@ -176,7 +176,7 @@ # ---------------------------------------------------------------------- def error(self,file,line,msg): - print >>sys.stderr,"%s:%d %s" % (file,line,msg) + print("%s:%d %s" % (file,line,msg)) # ---------------------------------------------------------------------- # lexprobe() @@ -193,7 +193,7 @@ self.lexer.input("identifier") tok = self.lexer.token() if not tok or tok.value != "identifier": - print "Couldn't determine identifier type" + print("Couldn't determine identifier type") else: self.t_ID = tok.type @@ -201,7 +201,7 @@ self.lexer.input("12345") tok = self.lexer.token() if not tok or int(tok.value) != 12345: - print "Couldn't determine integer type" + print("Couldn't determine integer type") else: self.t_INTEGER = tok.type self.t_INTEGER_TYPE = type(tok.value) @@ -210,7 +210,7 @@ self.lexer.input("\"filename\"") tok = self.lexer.token() if not tok or tok.value != "\"filename\"": - print "Couldn't determine string type" + print("Couldn't determine string type") else: self.t_STRING = tok.type @@ -227,7 +227,7 @@ tok = self.lexer.token() if not tok or tok.value != "\n": self.t_NEWLINE = None - print "Couldn't determine token for newlines" + print("Couldn't determine token for newlines") else: self.t_NEWLINE = tok.type @@ -239,7 +239,7 @@ self.lexer.input(c) tok = self.lexer.token() if not tok or tok.value != c: - print "Unable to lex '%s' required for preprocessor" % c + print("Unable to lex '%s' required for preprocessor" % c) # ---------------------------------------------------------------------- # add_path() @@ -737,7 +737,7 @@ break i += 1 else: - print "Malformed #include <...>" + print("Malformed #include <...>") return filename = "".join([x.value for x in tokens[1:i]]) path = self.path + [""] + self.temp_path @@ -745,7 +745,7 @@ filename = tokens[0].value[1:-1] path = self.temp_path + [""] + self.path else: - print "Malformed #include statement" + print("Malformed #include statement") return for p in path: iname = os.path.join(p,filename) @@ -759,10 +759,10 @@ if dname: del self.temp_path[0] break - except IOError,e: + except IOError: pass else: - print "Couldn't find '%s'" % filename + print("Couldn't find '%s'" % filename) # ---------------------------------------------------------------------- # define() @@ -794,7 +794,7 @@ variadic = False for a in args: if variadic: - print "No more arguments may follow a variadic argument" + print("No more arguments may follow a variadic argument") break astr = "".join([str(_i.value) for _i in a]) if astr == "...": @@ -813,7 +813,7 @@ a[0].value = a[0].value[:-3] continue if len(a) > 1 or a[0].type != self.t_ID: - print "Invalid macro argument" + print("Invalid macro argument") break else: mvalue = self.tokenstrip(linetok[1+tokcount:]) @@ -830,9 +830,9 @@ self.macro_prescan(m) self.macros[name.value] = m else: - print "Bad macro definition" + print("Bad macro definition") except LookupError: - print "Bad macro definition" + print("Bad macro definition") # ---------------------------------------------------------------------- # undef() @@ -864,7 +864,7 @@ def token(self): try: while True: - tok = self.parser.next() + tok = next(self.parser) if tok.type not in self.ignore: return tok except StopIteration: self.parser = None @@ -884,7 +884,7 @@ while True: tok = p.token() if not tok: break - print p.source, tok + print(p.source, tok) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/ply/lex.py new/ply-3.4/ply/lex.py --- old/ply-3.3/ply/lex.py 2009-08-27 03:28:42.000000000 +0200 +++ new/ply-3.4/ply/lex.py 2011-02-18 04:52:28.000000000 +0100 @@ -1,7 +1,7 @@ # ----------------------------------------------------------------------------- # ply: lex.py # -# Copyright (C) 2001-2009, +# Copyright (C) 2001-2011, # David M. Beazley (Dabeaz LLC) # All rights reserved. # @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ----------------------------------------------------------------------------- -__version__ = "3.3" +__version__ = "3.4" __tabversion__ = "3.2" # Version of table file used import re, sys, types, copy, os diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/ply/yacc.py new/ply-3.4/ply/yacc.py --- old/ply-3.3/ply/yacc.py 2009-09-02 16:27:23.000000000 +0200 +++ new/ply-3.4/ply/yacc.py 2011-02-18 04:52:28.000000000 +0100 @@ -1,7 +1,7 @@ # ----------------------------------------------------------------------------- # ply: yacc.py # -# Copyright (C) 2001-2009, +# Copyright (C) 2001-2011, # David M. Beazley (Dabeaz LLC) # All rights reserved. # @@ -59,7 +59,7 @@ # own risk! # ---------------------------------------------------------------------------- -__version__ = "3.3" +__version__ = "3.4" __tabversion__ = "3.2" # Table version #----------------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/setup.py new/ply-3.4/setup.py --- old/ply-3.3/setup.py 2009-09-02 16:29:24.000000000 +0200 +++ new/ply-3.4/setup.py 2011-02-18 04:52:28.000000000 +0100 @@ -14,13 +14,18 @@ productions, precedence rules, error recovery, and support for ambiguous grammars. PLY is extremely easy to use and provides very extensive error checking. +It is compatible with both Python 2 and Python 3. """, license="""BSD""", - version = "3.3", + version = "3.4", author = "David Beazley", author_email = "dave(a)dabeaz.com", maintainer = "David Beazley", maintainer_email = "dave(a)dabeaz.com", url = "http://www.dabeaz.com/ply/", packages = ['ply'], + classifiers = [ + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 2', + ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/test/README new/ply-3.4/test/README --- old/ply-3.3/test/README 2006-11-21 16:09:46.000000000 +0100 +++ new/ply-3.4/test/README 2011-02-18 04:52:28.000000000 +0100 @@ -4,8 +4,4 @@ $ python testlex.py . $ python testyacc.py . -The tests can also be run using the Python unittest module. - - $ python rununit.py - The script 'cleanup.sh' cleans up this directory to its original state. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/test/cleanup.sh new/ply-3.4/test/cleanup.sh --- old/ply-3.3/test/cleanup.sh 2008-05-29 16:00:14.000000000 +0200 +++ new/ply-3.4/test/cleanup.sh 2011-02-18 04:52:28.000000000 +0100 @@ -1,4 +1,4 @@ #!/bin/sh -rm -f *~ *.pyc *.pyo *.dif *.out +rm -rf *~ *.pyc *.pyo *.dif *.out __pycache__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/test/testlex.py new/ply-3.4/test/testlex.py --- old/ply-3.3/test/testlex.py 2009-02-02 23:53:39.000000000 +0100 +++ new/ply-3.4/test/testlex.py 2011-02-18 04:52:28.000000000 +0100 @@ -7,11 +7,33 @@ import io as StringIO import sys +import os +import imp +import warnings + sys.path.insert(0,"..") sys.tracebacklimit = 0 import ply.lex +def make_pymodule_path(filename): + path = os.path.dirname(filename) + file = os.path.basename(filename) + mod, ext = os.path.splitext(file) + + if sys.hexversion >= 0x3020000: + modname = mod+"."+imp.get_tag()+ext + fullpath = os.path.join(path,'__pycache__',modname) + else: + fullpath = filename + return fullpath + +def pymodule_out_exists(filename): + return os.path.exists(make_pymodule_path(filename)) + +def pymodule_out_remove(filename): + os.remove(make_pymodule_path(filename)) + def check_expected(result,expected): if sys.version_info[0] >= 3: if isinstance(result,str): @@ -40,6 +62,9 @@ def setUp(self): sys.stderr = StringIO.StringIO() sys.stdout = StringIO.StringIO() + if sys.hexversion >= 0x3020000: + warnings.filterwarnings('ignore',category=ResourceWarning) + def tearDown(self): sys.stderr = sys.__stderr__ sys.stdout = sys.__stdout__ @@ -325,9 +350,9 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("lextab.pyo")) + self.assert_(pymodule_out_exists("lextab.pyo")) - os.remove("lextab.pyo") + pymodule_out_remove("lextab.pyo") p = subprocess.Popen([sys.executable,'-OO','lex_optimize.py'], stdout=subprocess.PIPE) result = p.stdout.read() @@ -335,17 +360,17 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("lextab.pyo")) + self.assert_(pymodule_out_exists("lextab.pyo")) try: os.remove("lextab.py") except OSError: pass try: - os.remove("lextab.pyc") + pymodule_out_remove("lextab.pyc") except OSError: pass try: - os.remove("lextab.pyo") + pymodule_out_remove("lextab.pyo") except OSError: pass @@ -377,8 +402,8 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("opt2tab.pyo")) - os.remove("opt2tab.pyo") + self.assert_(pymodule_out_exists("opt2tab.pyo")) + pymodule_out_remove("opt2tab.pyo") p = subprocess.Popen([sys.executable,'-OO','lex_optimize2.py'], stdout=subprocess.PIPE) result = p.stdout.read() @@ -386,17 +411,17 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("opt2tab.pyo")) + self.assert_(pymodule_out_exists("opt2tab.pyo")) try: os.remove("opt2tab.py") except OSError: pass try: - os.remove("opt2tab.pyc") + pymodule_out_remove("opt2tab.pyc") except OSError: pass try: - os.remove("opt2tab.pyo") + pymodule_out_remove("opt2tab.pyo") except OSError: pass @@ -425,8 +450,8 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("lexdir/sub/calctab.pyo")) - os.remove("lexdir/sub/calctab.pyo") + self.assert_(pymodule_out_exists("lexdir/sub/calctab.pyo")) + pymodule_out_remove("lexdir/sub/calctab.pyo") p = subprocess.Popen([sys.executable,'-OO','lex_optimize3.py'], stdout=subprocess.PIPE) result = p.stdout.read() @@ -434,7 +459,7 @@ "(NUMBER,3,1,0)\n" "(PLUS,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("lexdir/sub/calctab.pyo")) + self.assert_(pymodule_out_exists("lexdir/sub/calctab.pyo")) try: shutil.rmtree("lexdir") except OSError: @@ -468,8 +493,8 @@ "(NUMBER,3,1,0)\n" "(+,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("aliastab.pyo")) - os.remove("aliastab.pyo") + self.assert_(pymodule_out_exists("aliastab.pyo")) + pymodule_out_remove("aliastab.pyo") p = subprocess.Popen([sys.executable,'-OO','lex_opt_alias.py'], stdout=subprocess.PIPE) result = p.stdout.read() @@ -477,17 +502,17 @@ "(NUMBER,3,1,0)\n" "(+,'+',1,1)\n" "(NUMBER,4,1,2)\n")) - self.assert_(os.path.exists("aliastab.pyo")) + self.assert_(pymodule_out_exists("aliastab.pyo")) try: os.remove("aliastab.py") except OSError: pass try: - os.remove("aliastab.pyc") + pymodule_out_remove("aliastab.pyc") except OSError: pass try: - os.remove("aliastab.pyo") + pymodule_out_remove("aliastab.pyo") except OSError: pass @@ -531,8 +556,8 @@ "(TOK999,'TOK999:',1,47)\n" )) - self.assert_(os.path.exists("manytab.pyo")) - os.remove("manytab.pyo") + self.assert_(pymodule_out_exists("manytab.pyo")) + pymodule_out_remove("manytab.pyo") try: os.remove("manytab.py") except OSError: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ply-3.3/test/testyacc.py new/ply-3.4/test/testyacc.py --- old/ply-3.3/test/testyacc.py 2009-03-24 12:40:56.000000000 +0100 +++ new/ply-3.4/test/testyacc.py 2011-02-18 04:52:28.000000000 +0100 @@ -8,11 +8,32 @@ import sys import os +import warnings sys.path.insert(0,"..") sys.tracebacklimit = 0 import ply.yacc +import imp + +def make_pymodule_path(filename): + path = os.path.dirname(filename) + file = os.path.basename(filename) + mod, ext = os.path.splitext(file) + + if sys.hexversion >= 0x3020000: + modname = mod+"."+imp.get_tag()+ext + fullpath = os.path.join(path,'__pycache__',modname) + else: + fullpath = filename + return fullpath + +def pymodule_out_exists(filename): + return os.path.exists(make_pymodule_path(filename)) + +def pymodule_out_remove(filename): + os.remove(make_pymodule_path(filename)) + def check_expected(result,expected): resultlines = [] @@ -43,10 +64,13 @@ sys.stdout = StringIO.StringIO() try: os.remove("parsetab.py") - os.remove("parsetab.pyc") + pymodule_out_remove("parsetab.pyc") except OSError: pass + if sys.hexversion >= 0x3020000: + warnings.filterwarnings('ignore',category=ResourceWarning) + def tearDown(self): sys.stderr = sys.__stderr__ sys.stdout = sys.__stdout__ @@ -297,7 +321,6 @@ def test_yacc_uprec(self): self.assertRaises(ply.yacc.YaccError,run_import,"yacc_uprec") result = sys.stderr.getvalue() - print repr(result) self.assert_(check_expected(result, "yacc_uprec.py:37: Nothing known about the precedence of 'UMINUS'\n" )) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-chardet for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '11

31 Mar '11

Hello community, here is the log from the commit of package python-chardet for openSUSE:Factory checked in at Thu Mar 31 15:52:49 CEST 2011. -------- --- python-chardet/python-chardet.changes 2010-01-25 15:39:19.000000000 +0100 +++ python-chardet/python-chardet.changes 2011-03-26 03:17:27.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Mar 26 02:11:35 UTC 2011 - alexandre(a)exatati.com.br + +- Regenerate spec file with py2pack; +- Bzip2 source file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- python2-chardet-2.0.1.tar.gz New: ---- python2-chardet-2.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-chardet.spec ++++++ --- /var/tmp/diff_new_pack.l1BBjK/_old 2011-03-31 15:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.l1BBjK/_new 2011-03-31 15:15:30.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-chardet (Version 2.0.1) +# spec file for package python-chardet # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,39 +17,64 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: python-chardet +%define mod_name chardet + +Name: python-%{mod_name} Version: 2.0.1 -Release: 1 -Summary: Universal encoding detectorUniversal encoding detector +Release: 7 +Url: http://chardet.feedparser.org/ +Summary: Universal encoding detector License: LGPL -Group: Development/Libraries/Python -Source: python2-chardet-%{version}.tar.gz -Url: http://chardet.feedparser.org -BuildRequires: python-devel python-setuptools +Group: Development/Languages/Python +Source: python2-%{mod_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1110 BuildArch: noarch %endif +%endif %description -Universal encoding detector. - -Author: --------- - Mark Pilgrim <mark(a)diveintomark.org> +Universal character encoding detector +------------------------------------- +Detects + - ASCII, UTF-8, UTF-16 (2 variants), UTF-32 (4 variants) + - Big5, GB2312, EUC-TW, HZ-GB-2312, ISO-2022-CN (Traditional and Simplified Chinese) + - EUC-JP, SHIFT_JIS, ISO-2022-JP (Japanese) + - EUC-KR, ISO-2022-KR (Korean) + - KOI8-R, MacCyrillic, IBM855, IBM866, ISO-8859-5, windows-1251 (Cyrillic) + - ISO-8859-2, windows-1250 (Hungarian) + - ISO-8859-5, windows-1251 (Bulgarian) + - windows-1252 (English) + - ISO-8859-7, windows-1253 (Greek) + - ISO-8859-8, windows-1255 (Visual and Logical Hebrew) + - TIS-620 (Thai) %prep -%setup -q -n python2-chardet-%{version} +%setup -q -n python2-%{mod_name}-%{version} %build -%{__python} setup.py build +export CFLAGS="%{optflags}" +python setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES +python setup.py install --prefix=%{_prefix} --root=%{buildroot} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root,-) +# You may have to add additional files here (documentation and binaries mostly) +%python_sitelib/%{mod_name}* +%if 0%{suse_version} > 1010 +%python_sitelib/*.egg-info +%endif -%files -f INSTALLED_FILES -%defattr(-,root,root) %changelog ++++++ python2-chardet-2.0.1.tar.gz -> python2-chardet-2.0.1.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0