April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit tellico for openSUSE:Factory
by root＠Hilbert.suse.de 03 Apr '10

03 Apr '10

Hello community, here is the log from the commit of package tellico for openSUSE:Factory checked in at Sat Apr 3 19:32:04 CEST 2010. -------- --- KDE/tellico/tellico.changes 2010-03-31 17:32:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/tellico/tellico.changes 2010-04-03 11:12:29.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 3 11:11:45 CEST 2010 - llunak(a)suse.cz + +- another dir for bnc#457908 workaround + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tellico.spec ++++++ --- /var/tmp/diff_new_pack.4HTJdR/_old 2010-04-03 19:31:56.000000000 +0200 +++ /var/tmp/diff_new_pack.4HTJdR/_new 2010-04-03 19:31:56.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: libexempi-devel libkcddb4-devel libksane-devel libyaz-devel taglib-devel Summary: A book collection manager Version: 2.2 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Other Source: %{name}-%{version}.tar.bz2 @@ -66,6 +66,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/en/common mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/fr/common mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/uk/common +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/pt_BR/common %endif fdupes -r $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaThunderbird for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at Sat Apr 3 00:25:09 CEST 2010. -------- --- MozillaThunderbird/MozillaThunderbird.changes 2010-03-02 11:22:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaThunderbird/MozillaThunderbird.changes 2010-04-02 13:17:23.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Mar 17 20:07:51 CET 2010 - wr(a)rosenauer.org + +- security update to 3.0.4 (bnc#586567) + * MFSA 2010-16/CVE-2010-0173/CVE-2010-0174 + Crashes with evidence of memory corruption + * MFSA 2010-17/CVE-2010-0175 (bmo#540100,375928) + Remote code execution with use-after-free in nsTreeSelection + * MFSA 2010-18/CVE-2010-0176 (bmo#538308) + Dangling pointer vulnerability in nsTreeContentView + * MFSA 2010-22/CVE-2009-3555 (bmo#545755) + Update NSS to support TLS renegotiation indication + * MFSA 2010-24/CVE-2010-0182 (bmo#490790) + XMLDocument::load() doesn't check nsIContentPolicy + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-3.0.3.tar.bz2 mozilla-clipboard.patch thunderbird-3.0.3-source.tar.bz2 New: ---- l10n-3.0.4.tar.bz2 thunderbird-3.0.4-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.GwMJFN/_old 2010-04-03 00:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.GwMJFN/_new 2010-04-03 00:25:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0.3) +# spec file for package MozillaThunderbird (Version 3.0.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer <wr(a)rosenauer.org> @@ -20,7 +20,8 @@ Name: MozillaThunderbird -BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel python startup-notification-devel unzip update-desktop-files zip +BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel python startup-notification-devel unzip update-desktop-files zip +BuildRequires: mozilla-nss-devel >= 3.12.6 %if %suse_version > 1030 BuildRequires: hunspell-devel %endif @@ -28,10 +29,10 @@ BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -%define mainversion 3.0.3 +%define mainversion 3.0.4 Version: %{mainversion} Release: 1 -%define releasedate 2010022800 +%define releasedate 2010031700 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -46,7 +47,6 @@ Source8: MozillaThunderbird-rpmlintrc Source9: enigmail-1.0.1.tar.bz2 Source10: create-tar.sh -Patch1: mozilla-clipboard.patch Patch2: thunderbird-appname.patch Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch @@ -126,7 +126,7 @@ %package -n enigmail Version: 1.0.1 -Release: 1 +Release: 2 License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -152,7 +152,6 @@ %endif # xulrunner patches pushd mozilla -%patch1 -p1 %patch3 -p1 %patch4 -p1 %patch8 -p1 ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.GwMJFN/_old 2010-04-03 00:25:01.000000000 +0200 +++ /var/tmp/diff_new_pack.GwMJFN/_new 2010-04-03 00:25:01.000000000 +0200 @@ -2,8 +2,8 @@ BRANCH="releases/comm-1.9.1" # comm-central -RELEASE_TAG="THUNDERBIRD_3_0_3_RELEASE" -VERSION="3.0.3" +RELEASE_TAG="THUNDERBIRD_3_0_4_RELEASE" +VERSION="3.0.4" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-3.0.3.tar.bz2 -> l10n-3.0.4.tar.bz2 ++++++ MozillaThunderbird/l10n-3.0.3.tar.bz2 /mounts/work_src_done/STABLE/MozillaThunderbird/l10n-3.0.4.tar.bz2 differ: char 11, line 1 ++++++ thunderbird-3.0.3-source.tar.bz2 -> thunderbird-3.0.4-source.tar.bz2 ++++++ MozillaThunderbird/thunderbird-3.0.3-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaThunderbird/thunderbird-3.0.4-source.tar.bz2 differ: char 11, 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 fluidsynth-dssi for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package fluidsynth-dssi for openSUSE:Factory checked in at Sat Apr 3 00:24:48 CEST 2010. -------- --- fluidsynth-dssi/fluidsynth-dssi.changes 2009-07-24 16:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/fluidsynth-dssi/fluidsynth-dssi.changes 2010-04-02 10:19:42.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 2 08:17:46 UTC 2010 - davejplater(a)gmail.com + +- Update to version 1.0.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fluidsynth-dssi-0.9.1.tar.bz2 New: ---- fluidsynth-dssi-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fluidsynth-dssi.spec ++++++ --- /var/tmp/diff_new_pack.GFNicu/_old 2010-04-03 00:24:42.000000000 +0200 +++ /var/tmp/diff_new_pack.GFNicu/_new 2010-04-03 00:24:42.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fluidsynth-dssi (Version 0.9.1) +# spec file for package fluidsynth-dssi (Version 1.0.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -22,11 +22,11 @@ BuildRequires: alsa-devel dssi-devel fluidsynth-devel gtk2-devel BuildRequires: libjack-devel liblo-devel update-desktop-files Summary: Fluidsynth Plug-In for Disposable Soft Synth Interface -Version: 0.9.1 -Release: 230 +Version: 1.0.0 +Release: 1 Group: Productivity/Multimedia/Sound/Midi AutoReqProv: on -License: GPL v2 or later +License: GPLv2+ Url: http://dssi.sf.net Source: %{name}-%{version}.tar.bz2 Patch: fluidsynth-dssi-nogtk1.diff ++++++ fluidsynth-dssi-0.9.1.tar.bz2 -> fluidsynth-dssi-1.0.0.tar.bz2 ++++++ ++++ 66248 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gbrainy for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package gbrainy for openSUSE:Factory checked in at Sat Apr 3 00:24:34 CEST 2010. -------- --- GNOME/gbrainy/gbrainy.changes 2010-03-01 20:47:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/gbrainy/gbrainy.changes 2010-04-02 22:38:10.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 2 22:37:21 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 1.41: + + 18 bug fixes + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gbrainy-1.40.tar.bz2 New: ---- gbrainy-1.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gbrainy.spec ++++++ --- /var/tmp/diff_new_pack.AELKt9/_old 2010-04-03 00:23:40.000000000 +0200 +++ /var/tmp/diff_new_pack.AELKt9/_new 2010-04-03 00:23:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gbrainy (Version 1.40) +# spec file for package gbrainy (Version 1.41) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gbrainy -Version: 1.40 +Version: 1.41 Release: 1 License: GPLv2+ Source: %{name}-%{version}.tar.bz2 ++++++ gbrainy-1.40.tar.bz2 -> gbrainy-1.41.tar.bz2 ++++++ ++++ 41808 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 koffice2 for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Sat Apr 3 00:24:30 CEST 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-04-01 18:14:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-04-03 00:23:31.560616000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 2 11:28:07 UTC 2010 - llunak(a)novell.com + +- readd fixes for build with gcc-4.5 + +------------------------------------------------------------------- koffice2.changes: same change calling whatdependson for head-i586 New: ---- gcc-45.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.eo6jMl/_old 2010-04-03 00:23:42.000000000 +0200 +++ /var/tmp/diff_new_pack.eo6jMl/_new 2010-04-03 00:23:42.000000000 +0200 @@ -27,7 +27,7 @@ Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 1 +Release: 2 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.eo6jMl/_old 2010-04-03 00:23:42.000000000 +0200 +++ /var/tmp/diff_new_pack.eo6jMl/_new 2010-04-03 00:23:42.000000000 +0200 @@ -34,10 +34,11 @@ Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 1 +Release: 2 Source0: koffice-%version.tar.bz2 Patch1: koffice_remove_kohyphen.diff Patch2: koffice_remove_python_shebangs.diff +Patch3: gcc-45.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -63,6 +64,7 @@ %setup -q -n koffice-%version #%patch1 #%patch2 +%patch3 %build %cmake_kde4 -d build ++++++ gcc-45.diff ++++++ --- filters/kword/msword-odf/texthandler.cpp.sav 2010-03-29 15:05:58.000000000 +0200 +++ filters/kword/msword-odf/texthandler.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -863,7 +863,7 @@ bool KWordTextHandler::writeListInfo(KoX unsigned int code = text[0].unicode(); if ( (code & 0xFF00) == 0xF000 ) // see wv2 code &= 0x00FF; - listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() ); + listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() ); } else kWarning(30513) << "Bullet with more than one character, not supported"; --- krita/plugins/filters/levelfilter/kis_level_filter.cpp.sav 2010-03-29 15:06:23.000000000 +0200 +++ krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-04-02 13:21:15.995519666 +0200 @@ -178,7 +178,7 @@ void KisLevelConfigWidget::slotDrawHisto pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); double highest = (double)histogram->calculations().getHighest(); qint32 bins = histogram->producer()->numberOfBins(); --- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp.sav 2010-03-29 15:06:06.000000000 +0200 +++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -249,7 +249,7 @@ KisBrightnessContrastConfigWidget::KisBr // Create the horizontal gradient label QPixmap hgradientpix(256, 1); QPainter hgp(&hgradientpix); - hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (i = 0; i < 256; ++i) { hgp.setPen(QColor(i, i, i)); hgp.drawPoint(i, 0); @@ -259,7 +259,7 @@ KisBrightnessContrastConfigWidget::KisBr // Create the vertical gradient label QPixmap vgradientpix(1, 256); QPainter vgp(&vgradientpix); - vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (i = 0; i < 256; ++i) { vgp.setPen(QColor(i, i, i)); vgp.drawPoint(0, 255 - i); @@ -271,7 +271,7 @@ KisBrightnessContrastConfigWidget::KisBr QPixmap pix(256, height); pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); double highest = (double)histogram.calculations().getHighest(); qint32 bins = histogram.producer()->numberOfBins(); --- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp.sav 2010-03-29 15:06:06.000000000 +0200 +++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -123,7 +123,7 @@ inline QPixmap KisPerChannelConfigWidget QPixmap gradientpix(width, height); QPainter p(&gradientpix); - p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (; *i < 256; (*i)++, col += inc) { p.setPen(QColor(col, col, col)); p.drawPoint(x, y); @@ -138,7 +138,7 @@ inline QPixmap KisPerChannelConfigWidget QPixmap pix(256, height); pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); if(m_histogram) { --- krita/ui/widgets/kis_curve_widget_p.h.sav 2010-03-29 15:07:17.000000000 +0200 +++ krita/ui/widgets/kis_curve_widget_p.h 2010-04-02 13:21:15.992559120 +0200 @@ -439,7 +439,7 @@ void KisCurveWidget::Private::drawGrid(Q * That is not mandatory but desirable */ - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight); p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight); p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight); --- krita/ui/widgets/kis_curve_widget.cpp.sav 2010-03-29 15:07:17.000000000 +0200 +++ krita/ui/widgets/kis_curve_widget.cpp 2010-04-02 13:21:15.992559120 +0200 @@ -312,11 +312,11 @@ void KisCurveWidget::paintEvent(QPaintEv curveY = d->m_points.at(i).y(); if (i == d->m_grab_point_index) { - p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine)); + p.setPen(QPen(Qt::red, 3, Qt::SolidLine)); p.drawEllipse(QRectF(curveX * wWidth - 2, wHeight - 2 - curveY * wHeight, 4, 4)); } else { - p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); p.drawEllipse(QRectF(curveX * wWidth - 3, wHeight - 3 - curveY * wHeight, 6, 6)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nautilus-ifolder3 for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package nautilus-ifolder3 for openSUSE:Factory checked in at Sat Apr 3 00:23:30 CEST 2010. -------- --- nautilus-ifolder3/nautilus-ifolder3.changes 2010-03-29 11:41:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus-ifolder3/nautilus-ifolder3.changes 2010-04-02 14:31:19.000000000 +0200 @@ -31,0 +32,8 @@ +Wed Sep 16 23:05:59 MDT 2009 - sbipin(a)novell.com + +- Update to 3.8.0.10091.1: + UI is updated based on security policy set. Verified with a user + * No encryption was enabled * Encryption was enabled * Encryption + was forced! + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-ifolder3.spec ++++++ --- /var/tmp/diff_new_pack.EgE55r/_old 2010-04-03 00:22:57.000000000 +0200 +++ /var/tmp/diff_new_pack.EgE55r/_new 2010-04-03 00:22:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nautilus-ifolder3 (Version 3.7.2.9141.1) +# spec file for package nautilus-ifolder3 (Version 3.8.0.10091.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,23 +26,24 @@ %endif Name: nautilus-ifolder3 -%define buildnum 9141 + +%define buildnum 10091 Url: http://www.ifolder.com %define prefix /usr %define gnome_root /usr %define extension extensions-2.0 -License: GPLv2 +License: GNU General Public License (GPL) v2 Group: System/GUI/Other AutoReqProv: on -Version: 3.7.2.9141.1 -Release: 8 +Version: 3.8.0.10091.1 +Release: 1 Requires: nautilus >= 2.10.0 -Requires: simias >= 1.8.2 -Requires: ifolder3 >= 3.7.2 +Requires: simias >= 1.8.3 +Requires: ifolder3 >= 3.8.0 #Obsoletes: %{name} < %{version} Provides: nautilus-ifolder = %{version} Obsoletes: nautilus-ifolder < %{version} -Summary: Nautilus Plug-In to Add iFolder Support +Summary: Nautilus plugin to add iFolder support Source: nautilus-ifolder3.tar.gz Patch: nautilus-ifolder3-lib64.patch Patch1: nautilus-ifolder3-warnings.patch @@ -50,7 +51,7 @@ #============================================================================= %description -Provides the iFolder plug-in interface to the Nautilus File Manager. +Provides the iFolder plugin interface to the Nautilus File Manager ++++++ nautilus-ifolder3.tar.gz ++++++ ++++ 3607 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-IPC-Run for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package perl-IPC-Run for openSUSE:Factory checked in at Sat Apr 3 00:22:26 CEST 2010. -------- --- perl-IPC-Run/perl-IPC-Run.changes 2010-03-30 18:36:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-IPC-Run/perl-IPC-Run.changes 2010-04-02 13:20:33.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 1 18:08:43 CEST 2010 - anicka(a)suse.cz + +- update to 0.89 + * Revert extended tests to require "oslo consensus" variables + * Add IO::Pty to META.yml requirement + * Missed dangling isa in IPC::Run::Debug + * Fix retry for read of fh when I get "Resource temporarily + unavailable." + * Fix POD indentation in IO.pm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- IPC-Run-0.87-path.diff IPC-Run-0.87.tar.bz2 New: ---- IPC-Run-0.89-path.diff IPC-Run-0.89.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IPC-Run.spec ++++++ --- /var/tmp/diff_new_pack.LBfyvv/_old 2010-04-03 00:22:06.000000000 +0200 +++ /var/tmp/diff_new_pack.LBfyvv/_new 2010-04-03 00:22:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-IPC-Run (Version 0.87) +# spec file for package perl-IPC-Run (Version 0.89) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: perl-IPC-Run -Version: 0.87 +Version: 0.89 Release: 1 Requires: perl = %{perl_version} AutoReqProv: on ++++++ IPC-Run-0.87-path.diff -> IPC-Run-0.89-path.diff ++++++ ++++++ IPC-Run-0.87.tar.bz2 -> IPC-Run-0.89.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/Changes new/IPC-Run-0.89/Changes --- old/IPC-Run-0.87/Changes 2010-03-29 20:00:00.000000000 +0200 +++ new/IPC-Run-0.89/Changes 2010-04-01 06:44:32.000000000 +0200 @@ -1,5 +1,17 @@ Revision history for Perl extension IPC::Run +0.89 Wed 31 Mar 2010 + - Revert extended tests to require "oslo consensus" variables - http://use.perl.org/~Alias/journal/36128 + - Add IO::Pty to META.yml requirement This has been inconsistently depended on over the years in META.yml + +0.88 Tue 30 Mar 2010 + - Missed dangling isa in IPC::Run::Debug + - Fix retry for read of fh when I get "Resource temporarily unavailable." + It was previously pounding on the file handle with no rest 200 times then giving up. + On fast systems this wasn't long enough. I'm implementing select(undef, undef, 0.01) + to provide a more consistent retry among hardware and os. + - Fix POD indentation in IO.pm + 0.87 Mon 29 Mar 2010 - Add doc type fixes - RT 56030 from carnil (Debian) - Remove reccommends for AUTHOR only modules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/META.yml new/IPC-Run-0.89/META.yml --- old/IPC-Run-0.87/META.yml 2010-03-29 20:01:51.000000000 +0200 +++ new/IPC-Run-0.89/META.yml 2010-04-01 06:46:12.000000000 +0200 @@ -1,8 +1,9 @@ --- #YAML:1.0 name: IPC-Run -version: 0.87 +version: 0.89 abstract: system() and background procs w/ piping, redirs, ptys (Unix, Win32) -author: [] +author: + - Barrie Slaymaker <barries(a)slaysys.com> license: perl distribution_type: module configure_requires: @@ -11,6 +12,7 @@ ExtUtils::MakeMaker: 0 Test::More: 0 requires: + IO::Pty: 1.08 Test::More: 0.47 resources: bugtracker: https://rt.cpan.org/NoAuth/Bugs.html?Dist=IPC-Run @@ -20,7 +22,7 @@ directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.56 +generated_by: ExtUtils::MakeMaker version 6.55_02 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/Makefile.PL new/IPC-Run-0.89/Makefile.PL --- old/IPC-Run-0.87/Makefile.PL 2010-03-29 19:58:30.000000000 +0200 +++ new/IPC-Run-0.89/Makefile.PL 2010-04-01 06:41:45.000000000 +0200 @@ -41,7 +41,8 @@ WriteMakefile( NAME => 'IPC::Run', - ABSTRACT => 'system() and background procs w/ piping, redirs, ptys (Unix, Win32)', + ABSTRACT => 'system() and background procs w/ piping, redirs, ptys (Unix, Win32)', + AUTHOR => 'Barrie Slaymaker <barries(a)slaysys.com>', VERSION_FROM => 'lib/IPC/Run.pm', ($ExtUtils::MakeMaker::VERSION >= 6.3002 ? ('LICENSE' => 'perl', ) : ()), PREREQ_PM => { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/Debug.pm new/IPC-Run-0.89/lib/IPC/Run/Debug.pm --- old/IPC-Run-0.87/lib/IPC/Run/Debug.pm 2010-03-29 19:49:27.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/Debug.pm 2010-04-01 06:30:07.000000000 +0200 @@ -70,7 +70,7 @@ use Exporter; use vars qw{$VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS}; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; @ISA = qw( Exporter ); @EXPORT = qw( _debug @@ -268,7 +268,7 @@ my $op = pop; my $kid = $_[0]; -Carp::carp join " ", caller(0), $text, $op if defined $op && isa( $op, "IO::Pty" ); +Carp::carp join " ", caller(0), $text, $op if defined $op && UNIVERSAL::isa( $op, "IO::Pty" ); _debug( $text, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/IO.pm new/IPC-Run-0.89/lib/IPC/Run/IO.pm --- old/IPC-Run-0.87/lib/IPC/Run/IO.pm 2010-03-29 19:48:41.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/IO.pm 2010-04-01 06:30:13.000000000 +0200 @@ -1,7 +1,5 @@ package IPC::Run::IO; -=pod - =head1 NAME IPC::Run::IO -- I/O channels for IPC::Run. @@ -57,14 +55,6 @@ INCOMPATIBLE CHANGE: due to the awkwardness introduced in ripping pseudohashes out of Perl, this class I<no longer> uses the fields pragma. -=head1 TODO - -Implement bidirectionality. - -=head1 AUTHOR - -Barrie Slaymaker <barries(a)slaysys.com> - =cut ## This class is also used internally by IPC::Run in a very initimate way, @@ -82,7 +72,7 @@ use vars qw{$VERSION}; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; if ( Win32_MODE ) { eval "use IPC::Run::Win32Helper; require IPC::Run::Win32IO; 1" or ( $@ && die ) or die "$!"; @@ -92,17 +82,15 @@ sub _empty($); *_empty = \&IPC::Run::_empty; -=pod - -=over +=head1 SUBROUTINES -=over +=over 4 =item new -TODO: Needs more thorough documentation. Patches welcome. +I think it takes >> or << along with some other data. -I think it takes >> or << along with some other data. +TODO: Needs more thorough documentation. Patches welcome. =cut @@ -233,8 +221,6 @@ return $self; } -=over - =item filename Gets/sets the filename. Returns the value after the name change, if @@ -248,8 +234,6 @@ return $self->{FILENAME}; } -=pod - =item init Does initialization required before this can be run. This includes open()ing @@ -419,8 +403,6 @@ return $fd; } -=pod - =item mode Returns the operator in terms of 'r', 'w', and 'a'. There is a state @@ -569,14 +551,17 @@ my ( $saved_op, $saved_num ) =($IPC::Run::filter_op,$IPC::Run::filter_num); $IPC::Run::filter_op = $self; $IPC::Run::filter_num = -1; - my $c = 0; + my $redos = 0; my $r; { $@ = ''; $r = eval { IPC::Run::get_more_input(); }; - $c++; - ##$@ and warn "redo ", substr($@, 0, 20) , " "; - (($c < 200) and ($@||'')=~ m/^Resource temporarily/) and redo; + + # Detect Resource temporarily unavailable and re-try to a point (200 or 2 seconds), assuming select behaves (which it doesn't always? need ref) + if($@ && $@ =~ m/^Resource temporarily/ && $redos++ < 200) { + select(undef, undef, undef, 0.01); + redo; + } } ( $IPC::Run::filter_op, $IPC::Run::filter_num ) = ( $saved_op, $saved_num ); $self->{HARNESS} = undef; @@ -584,4 +569,16 @@ return $r; } +=back + +=head1 AUTHOR + +Barrie Slaymaker <barries(a)slaysys.com> + +=head1 TODO + +Implement bidirectionality. + +=cut + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/Timer.pm new/IPC-Run-0.89/lib/IPC/Run/Timer.pm --- old/IPC-Run-0.87/lib/IPC/Run/Timer.pm 2010-03-29 19:48:46.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/Timer.pm 2010-04-01 06:30:17.000000000 +0200 @@ -163,7 +163,7 @@ use Exporter; use vars qw( $VERSION @ISA @EXPORT_OK %EXPORT_TAGS ); BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; @ISA = qw( Exporter ); @EXPORT_OK = qw( check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/Win32Helper.pm new/IPC-Run-0.89/lib/IPC/Run/Win32Helper.pm --- old/IPC-Run-0.87/lib/IPC/Run/Win32Helper.pm 2010-03-29 19:48:37.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/Win32Helper.pm 2010-04-01 06:30:21.000000000 +0200 @@ -24,7 +24,7 @@ use IO::Handle; use vars qw{ $VERSION @ISA @EXPORT }; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; @ISA = qw( Exporter ); @EXPORT = qw( win32_spawn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/Win32IO.pm new/IPC-Run-0.89/lib/IPC/Run/Win32IO.pm --- old/IPC-Run-0.87/lib/IPC/Run/Win32IO.pm 2010-03-29 19:49:20.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/Win32IO.pm 2010-04-01 06:30:26.000000000 +0200 @@ -31,7 +31,7 @@ use vars qw{$VERSION}; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; } use Socket qw( IPPROTO_TCP TCP_NODELAY ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run/Win32Pump.pm new/IPC-Run-0.89/lib/IPC/Run/Win32Pump.pm --- old/IPC-Run-0.87/lib/IPC/Run/Win32Pump.pm 2010-03-29 19:48:29.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run/Win32Pump.pm 2010-04-01 06:30:29.000000000 +0200 @@ -29,7 +29,7 @@ use strict; use vars qw{$VERSION}; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; } use Win32API::File qw( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/lib/IPC/Run.pm new/IPC-Run-0.89/lib/IPC/Run.pm --- old/IPC-Run-0.87/lib/IPC/Run.pm 2010-03-29 19:49:30.000000000 +0200 +++ new/IPC-Run-0.89/lib/IPC/Run.pm 2010-04-01 06:30:34.000000000 +0200 @@ -1013,7 +1013,7 @@ use Exporter (); use vars qw{$VERSION @ISA @FILTER_IMP @FILTERS @API @EXPORT_OK %EXPORT_TAGS}; BEGIN { - $VERSION = '0.87'; + $VERSION = '0.89'; @ISA = qw{ Exporter }; ## We use @EXPORT for the end user's convenience: there's only one function diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/t/98_pod.t new/IPC-Run-0.89/t/98_pod.t --- old/IPC-Run-0.87/t/98_pod.t 2010-03-29 18:37:46.000000000 +0200 +++ new/IPC-Run-0.89/t/98_pod.t 2010-04-01 06:16:58.000000000 +0200 @@ -1,6 +1,33 @@ -#!perl -T +#!/usr/bin/perl +# Test that the syntax of our POD documentation is valid +use strict; +BEGIN { + $| = 1; + $^W = 1; +} + +my @MODULES = ( + 'Pod::Simple 3.07', + 'Test::Pod 1.26', +); + +# Don't run tests during end-user installs use Test::More; -eval "use Test::Pod 1.14"; -plan skip_all => "Test::Pod 1.14 required for testing POD" if $@; +unless ( $ENV{AUTOMATED_TESTING} or $ENV{RELEASE_TESTING} ) { + plan( skip_all => "Author tests not required for installation" ); +} + +# Load the testing modules +foreach my $MODULE ( @MODULES ) { + eval "use $MODULE"; + if ( $@ ) { + $ENV{RELEASE_TESTING} + ? die( "Failed to load required release-testing module $MODULE" ) + : plan( skip_all => "$MODULE not available for testing" ); + } +} + all_pod_files_ok(); + +1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/t/98_pod_coverage.t new/IPC-Run-0.89/t/98_pod_coverage.t --- old/IPC-Run-0.87/t/98_pod_coverage.t 2010-03-29 18:44:04.000000000 +0200 +++ new/IPC-Run-0.89/t/98_pod_coverage.t 2010-04-01 06:19:29.000000000 +0200 @@ -1,10 +1,31 @@ -#!perl +#!/usr/bin/perl -use Test::More; +# Test that the syntax of our POD documentation is valid +use strict; +BEGIN { + $| = 1; + $^W = 1; +} + +my @MODULES = ( + 'Test::Pod::Coverage 1.04', +); -eval "use Test::Pod::Coverage 1.04"; -plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@; +# Don't run tests during end-user installs +use Test::More; +unless ( $ENV{AUTOMATED_TESTING} or $ENV{RELEASE_TESTING} ) { + plan( skip_all => "Author tests not required for installation" ); +} +# Load the testing modules +foreach my $MODULE ( @MODULES ) { + eval "use $MODULE"; + if ( $@ ) { + $ENV{RELEASE_TESTING} + ? die( "Failed to load required release-testing module $MODULE" ) + : plan( skip_all => "$MODULE not available for testing" ); + } +} plan tests => 7; #my $private_subs = { private => [qr/foo_fizz/]}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IPC-Run-0.87/t/99_perl_minimum_version.t new/IPC-Run-0.89/t/99_perl_minimum_version.t --- old/IPC-Run-0.87/t/99_perl_minimum_version.t 2010-03-29 18:35:44.000000000 +0200 +++ new/IPC-Run-0.89/t/99_perl_minimum_version.t 2010-04-01 06:16:58.000000000 +0200 @@ -1,7 +1,6 @@ #!/usr/bin/perl # Test that our declared minimum Perl version matches our syntax - use strict; BEGIN { $| = 1; @@ -13,7 +12,7 @@ 'Test::MinimumVersion 0.008', ); -# Don't run tests for installs +# Don't run tests during end-user installs use Test::More; unless ( $ENV{AUTOMATED_TESTING} or $ENV{RELEASE_TESTING} ) { plan( skip_all => "Author tests not required for installation" ); @@ -30,3 +29,5 @@ } all_minimum_version_from_metayml_ok(); + +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 perl-FreezeThaw for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package perl-FreezeThaw for openSUSE:Factory checked in at Sat Apr 3 00:22:21 CEST 2010. -------- --- perl-FreezeThaw/perl-FreezeThaw.changes 2010-01-10 16:01:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-FreezeThaw/perl-FreezeThaw.changes 2010-04-02 21:44:27.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 2 19:43:26 UTC 2010 - chris(a)computersalat.de + +- update to 0.50 + o Support RExes of 5.11 and later (XXXX but not yet reblessed ones...) + (prototype by Andreas Koenig) +- fixed perl-macros deps +- disabled check for o:F + o testsuite broken for perl-5.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FreezeThaw-0.45.tar.bz2 New: ---- FreezeThaw-0.50.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-FreezeThaw.spec ++++++ --- /var/tmp/diff_new_pack.Smimuq/_old 2010-04-03 00:22:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Smimuq/_new 2010-04-03 00:22:07.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-FreezeThaw (Version 0.45) +# spec file for package perl-FreezeThaw (Version 0.50) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,15 +21,17 @@ Name: perl-FreezeThaw %define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) Summary: Converting Perl structures to strings and back -Version: 0.45 -Release: 2 +Version: 0.50 +Release: 1 License: Artistic License .. Group: Development/Libraries/Perl -Url: http://search.cpan.org/perldoc?FreezeThaw +Url: http://search.cpan.org/dist/FreezeThaw Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +%if 0%{?suse_version} < 1120 BuildRequires: perl-macros +%endif Requires: perl = %{perl_version} %description @@ -47,8 +49,12 @@ CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL %{__make} %{?_smp_mflags} +# testsuite broken for perl-5.12 (o:F) +%if 0%{?suse_version} <= 1120 + %check %{__make} test +%endif %install %perl_make_install ++++++ FreezeThaw-0.45.tar.bz2 -> FreezeThaw-0.50.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FreezeThaw-0.45/Changes new/FreezeThaw-0.50/Changes --- old/FreezeThaw-0.45/Changes 2009-02-10 08:31:00.000000000 +0100 +++ new/FreezeThaw-0.50/Changes 2010-03-08 00:55:38.000000000 +0100 @@ -30,3 +30,7 @@ Version 0.45: Maxpointer decimal width was wrongly calculated on 64bit machines with narrow NVs. +Version 0.5 + Support RExes of 5.11 and later (XXXX but not yet reblessed ones...) + (prototype by Andreas Koenig) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FreezeThaw-0.45/FreezeThaw.pm new/FreezeThaw-0.50/FreezeThaw.pm --- old/FreezeThaw-0.45/FreezeThaw.pm 2009-02-10 08:29:56.000000000 +0100 +++ new/FreezeThaw-0.50/FreezeThaw.pm 2010-03-08 00:45:42.000000000 +0100 @@ -285,7 +285,7 @@ use Exporter; @ISA = qw(Exporter); -$VERSION = '0.45'; +$VERSION = '0.50'; @EXPORT_OK = qw(freeze thaw cmpStr cmpStrHard safeFreeze); use strict; @@ -309,6 +309,17 @@ qw( $uninitOK ), # Localized in thawScalar() qw( @uninit ), # Localized in thaw() qw($safe); # Localized in safeFreeze() + +BEGIN { # allow optimization away + my $haveIsRex = defined &re::is_regexp; + my $RexIsREGEXP = ($haveIsRex and 'REGEXP' eq ref qr/1/); # First-class REX + eval <<EOE or die; +sub haveIsRex () {$haveIsRex} +sub RexIsREGEXP () {$RexIsREGEXP} +1 +EOE +} + my (%saved); my %Empty = ( ARRAY => sub {[]}, HASH => sub {{}}, @@ -316,7 +327,9 @@ REF => sub {my $undef; \$undef}, CODE => 1, # 1 means atomic GLOB => 1, - Regexp => 0, + (RexIsREGEXP + ? (REGEXP => sub {my $qr = qr//}) + : (Regexp => 0)), ); # This should better be done via pos() and \G, but apparently \G is not @@ -370,7 +383,7 @@ } sub _2rex ($); -if (eval '"Regexp" eq ref qr/1/') { +if (eval 'ref qr/1/') { eval 'sub _2rex ($) {my $r = shift; qr/$r/} 1' or die; } else { eval 'sub _2rex ($) { shift } 1' or die; @@ -462,7 +475,8 @@ } return &freezeArray if $ref eq 'ARRAY'; return &freezeHash if $ref eq 'HASH'; - return &freezeREx if $ref eq 'Regexp' and not defined ${$_[0]}; + return &freezeREx if haveIsRex ? re::is_regexp($_[0]) + : ($ref eq 'Regexp' and not defined ${$_[0]}); $string .= "*", return &freezeString if $ref eq 'GLOB' and !$safe; $string .= "&", return &freezeString @@ -653,6 +667,9 @@ @$first = @$second; } elsif ($ref eq 'HASH') { %$first = %$second; + } elsif (haveIsRex ? re::is_regexp($second) + : ($ref eq 'Regexp' and not defined $$second)) { + $first = qr/$second/; } else { croak "Don't know how to copyContents of type `$ref'"; } @@ -830,13 +847,15 @@ sub UNIVERSAL::FreezeInstance { my($obj,$cooky) = @_; - return if (ref $obj and ref $obj eq 'Regexp' and not defined $$obj); # Regexp + return if !RexIsREGEXP # Special-case non-1st-class RExes + and ref $obj and (haveIsRex ? re::is_regexp($obj) + : (ref $obj eq 'Regexp' and not defined $$obj)); # Regexp $obj->Freeze($cooky); } sub UNIVERSAL::Instantiate { my($package,$pre,$cooky) = @_; - return if $package eq 'Regexp'; + return if !RexIsREGEXP and $package eq 'Regexp'; my $obj = $package->Thaw($cooky); # SvAMAGIC() is a property of a reference, not of a referent! # Thus we cannot use $pre here if $obj was overloaded... @@ -859,7 +878,7 @@ } elsif ($e) { freezeScalar($obj,1,1); # Atomic undef; - } elsif (defined $e and not defined $$obj) { # Regexp + } elsif (!RexIsREGEXP and defined $e and not defined $$obj) { # REx pre-5.11 freezeREx($obj); undef; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FreezeThaw-0.45/META.yml new/FreezeThaw-0.50/META.yml --- old/FreezeThaw-0.45/META.yml 2009-02-10 08:33:46.000000000 +0100 +++ new/FreezeThaw-0.50/META.yml 2010-03-08 00:56:10.000000000 +0100 @@ -1,10 +1,21 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: FreezeThaw -version: 0.45 -version_from: FreezeThaw.pm -installdirs: site -requires: - -distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.30 +--- #YAML:1.0 +name: FreezeThaw +version: 0.50 +abstract: ~ +author: + - Ilya Zakharevich <ilyaz(a)cpan.org> +license: unknown +distribution_type: module +configure_requires: + ExtUtils::MakeMaker: 0 +build_requires: + ExtUtils::MakeMaker: 0 +requires: {} +no_index: + directory: + - t + - inc +generated_by: ExtUtils::MakeMaker version 6.54 +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FreezeThaw-0.45/t/FreezeThaw.t new/FreezeThaw-0.50/t/FreezeThaw.t --- old/FreezeThaw-0.45/t/FreezeThaw.t 2002-03-30 02:49:54.000000000 +0100 +++ new/FreezeThaw-0.50/t/FreezeThaw.t 2010-03-08 00:39:50.000000000 +0100 @@ -210,7 +210,7 @@ 090230047702789306640625 \Z /x; print "ok 27\n"; -if (eval '"Regexp" eq ref qr/1/') { # Have qr// +if (eval 'ref qr/1/') { # Have qr// eval <<'EOE'; my $rex = qr/^abc/mi; my $f = freeze [$rex, $rex, 11]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 spamassassin for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package spamassassin for openSUSE:Factory checked in at Sat Apr 3 00:21:56 CEST 2010. -------- --- spamassassin/spamassassin.changes 2010-01-03 01:03:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/spamassassin/spamassassin.changes 2010-04-01 21:12:02.000000000 +0200 @@ -1,0 +2,81 @@ +Thu Apr 1 19:10:01 UTC 2010 - chris(a)computersalat.de + +- update sa to 3.3.1 +- update rules to 3.3.1.r923257 +- cleanup spec + o removed comments +- added deprecated patch for suse_version > 1120 (perl 5.12) + o used stuff from combo patch + https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6392 +- added MIMEEval patch + o https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6396 + +------------------------------------------------------------------- +Sun Mar 21 01:10:29 UTC 2010 - chris(a)computersalat.de + +- added perl-Net-Ident for Build/Recommends +- fix build for SLE_10 + +------------------------------------------------------------------- +Sat Mar 20 19:10:43 UTC 2010 - chris(a)computersalat.de + +- bzipped Source Mail-SpamAssassin-rules... +- removed patch4 + o Mail-SpamAssassin-3.2.5.diff +- build with ssl support + o ENABLE_SSL="yes" +- renamed subpackages + o perl-spamassassin > perl-Mail-SpamAssassin + o new sub package perl-Mail-SpamAssassin-Plugin-iXhash +- fixed deps + o moved most deps over to perl-Mail-SpamAssassin +- some rpmlint fixes + o wrong-file-end-of-line-encoding {IXHASH}/CHANGELOG + o fix build without RPM_OPT_FLAGS + +------------------------------------------------------------------- +Fri Mar 19 17:46:07 UTC 2010 - chris(a)computersalat.de + +- cleanup spec + o sort TAGS + o redefine SOURCES + - added iXhash-1.5.5.tgz + - added spampd-2.20.tar.gz + - removed iXhash.pm + - removed spampd + o macros + - added perl-macros + o cleanup install section + +------------------------------------------------------------------- +Fri Mar 19 12:00:00 CET 2010 - opensuse(a)dstoecker.de + +- updated iXhash module to 1.5.5 + - iXhash is now a sourceforge project (http://ixhash.sourceforge.net/) + +------------------------------------------------------------------- +Thu Mar 18 20:11:20 UTC 2010 - chris(a)computersalat.de + +- added original SOURCES + o spampd-2.20.tar.gz +- renewed Mail-SpamAssassin-3.3.0.tar.bz2 + o wget Mail-SpamAssassin-3.3.0.tar.gz + bznew +- some spec mods + o macros {__make}, {__install} ... + o perl_make_install + o added check +- some rpmlint fixes + o invalid-suse-version-check 1120 + +------------------------------------------------------------------- +Wed Mar 17 12:00:00 CET 2010 - opensuse(a)dstoecker.de + +- update to 3.3.0 +- add ixHash module (not activated by default) +- add additional spampd tool + - better performance than spamd +- fixed deps + - added perl-NetAddr-IP +- fixed Summary + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Mail-SpamAssassin-3.2.5.diff Mail-SpamAssassin-3.2.5.tar.bz2 sa-rules-update-201001.diff New: ---- Mail-SpamAssassin-3.3.1-MIMEEval.patch Mail-SpamAssassin-3.3.1-deprecated.patch Mail-SpamAssassin-3.3.1.tar.bz2 Mail-SpamAssassin-rules-3.3.1.r923257.tar.bz2 iXhash-1.5.5.tgz init.spampd spampd-2.20.tar.gz sysconfig.spampd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spamassassin.spec ++++++ --- /var/tmp/diff_new_pack.gGGwql/_old 2010-04-03 00:21:36.000000000 +0200 +++ /var/tmp/diff_new_pack.gGGwql/_new 2010-04-03 00:21:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package spamassassin (Version 3.2.5) +# spec file for package spamassassin (Version 3.3.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,30 +17,43 @@ # norootforbuild +%define sa_version 3.3.1 +%define ix_version 1.5.5 +%define spd_version 2.20 + +%define IXHASH iXhash-%{ix_version} +%define SPAMPD spampd-%{spd_version} Name: spamassassin -BuildRequires: perl-Digest-SHA1 perl-HTML-Parser perl-Net-DNS +Summary: Extensible email filter which is used to identify spam +Version: %{sa_version} +Release: 1 License: Apache Software License .. Group: Productivity/Networking/Email/Utilities -Url: http://spamassassin.org/ -Version: 3.2.5 -Release: 30 -Requires: perl-libwww-perl perl-IO-Zlib re2c -Requires: perl-spamassassin = %version AutoReqProv: on -PreReq: %insserv_prereq %fillup_prereq -Summary: SpamAssassin is an extensible email filter which is used to identify spam -Source: Mail-SpamAssassin-%{version}.tar.bz2 -Source1: local.cf -Source2: init.spamd -Source3: sysconfig.spamd +Url: http://spamassassin.org/ +Source: Mail-SpamAssassin-%{sa_version}.tar.bz2 +Source1: Mail-SpamAssassin-rules-%{sa_version}.r923257.tar.bz2 +Source2: %{IXHASH}.tgz +Source3: %{SPAMPD}.tar.gz +Source10: local.cf +Source11: init.spamd +Source12: sysconfig.spamd +Source13: init.spampd +Source14: sysconfig.spampd Patch0: patch-utf8 Patch1: patch-PgSQL Patch2: patch-URIDNSBL Patch3: patch-SQL_ASCII_SORT -Patch4: Mail-SpamAssassin-3.2.5.diff -Patch5: sa-rules-update-201001.diff +Patch4: Mail-SpamAssassin-3.3.1-deprecated.patch +Patch5: Mail-SpamAssassin-3.3.1-MIMEEval.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %insserv_prereq %fillup_prereq +BuildRequires: dos2unix +BuildRequires: openssl-devel +# +Requires: perl-Mail-SpamAssassin = %{sa_version} +Requires: re2c %description spamassassin adds a header line that shows if the mail has been @@ -58,101 +71,165 @@ -------- Justin Mason <me(a)jmason.org> -%package -n perl-spamassassin +%package -n perl-Mail-SpamAssassin +Summary: Perl Modules For Using Spamassassin Within An Own Perl Script License: Apache Software License .. Group: Development/Libraries/Perl -Requires: perl-HTML-Parser perl-Net-DNS perl-IO-Socket-SSL perl-Archive-Tar +BuildRequires: perl +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +BuildRequires: perl(Digest::SHA1) +BuildRequires: perl(Errno) +BuildRequires: perl(File::Spec) >= 0.8 +BuildRequires: perl(File::Copy) >= 2.02 +BuildRequires: perl(HTML::Parser) >= 3.43 +BuildRequires: perl(Archive::Tar) >= 1.23 +BuildRequires: perl(IO::Zlib) >= 1.04 +BuildRequires: perl(Mail::DKIM) >= 0.37 +BuildRequires: perl(Net::DNS) >= 0.34 +BuildRequires: perl(NetAddr::IP) >= 4.000 +BuildRequires: perl(Pod::Usage) >= 1.10 +BuildRequires: perl(Sys::Hostname) +BuildRequires: perl(Time::HiRes) +BuildRequires: perl(Time::Local) +# optional, but want them for build (test) +%if 0%{?suse_version} >= 1100 +BuildRequires: perl(Mail::SPF) +%endif +BuildRequires: perl(IP::Country) +BuildRequires: perl(Razor2::Client::Agent) >= 2.61 +BuildRequires: perl(Net::Ident) +BuildRequires: perl(IO::Socket::INET6) +BuildRequires: perl(IO::Socket::SSL) +BuildRequires: perl(DBI) +BuildRequires: perl(Encode::Detect) +# Requires: perl = %{perl_version} -AutoReqProv: on -Summary: Perl Modules For Using Spamassassin Within An Own Perl Script +Requires: perl-libwww-perl +Requires: perl(Digest::SHA1) +Requires: perl(Errno) +Requires: perl(File::Spec) >= 0.8 +Requires: perl(File::Copy) >= 2.02 +Requires: perl(HTML::Parser) >= 3.43 +Requires: perl(Archive::Tar) >= 1.23 +Requires: perl(IO::Zlib) >= 1.04 +Requires: perl(Mail::DKIM) >= 0.37 +Requires: perl(Net::DNS) >= 0.34 +Requires: perl(NetAddr::IP) >= 4.000 +Requires: perl(Pod::Usage) >= 1.10 +Requires: perl(Sys::Hostname) +Requires: perl(Time::HiRes) +Requires: perl(Time::Local) +# optional +%if 0%{?suse_version} >= 1100 +Recommends: perl(Mail::SPF) +%endif +Recommends: perl(IP::Country) +Recommends: perl(Razor2::Client::Agent) >= 2.61 +Recommends: perl(Net::Ident) +Recommends: perl(IO::Socket::INET6) +Recommends: perl(IO::Socket::SSL) +Recommends: perl(DBI) +Recommends: perl(Encode::Detect) +Provides: perl-spamassassin = %{sa_version} +Obsoletes: perl-spamassassin < %{sa_version} -%description -n perl-spamassassin +%description -n perl-Mail-SpamAssassin This package contains the perl modules for the spamassassin, including the filter rules. This package is required for the package "spamassassin", the commandline tool. +%package -n perl-Mail-SpamAssassin-Plugin-iXhash +Summary: The iXhash plugin for SpamAssassin +License: Apache License 2.0 +Group: Development/Libraries/Perl +Version: %{ix_version} +Release: 1 +Requires: perl = %{perl_version} +Requires: perl-Mail-SpamAssassin = %{sa_version} +%description -n perl-Mail-SpamAssassin-Plugin-iXhash +This archive contains the iXhash plugin for the SpamAssassin spam filtering +software, along with an example config file. + +Basically the plugin provides a network-based test just as razor2, pyzor +and DCC do. Working solely on the body of an email, it removes parts of it +and computes a hash value from the rest. These values will then be looked up +via DNS using the domains given in the config file(s). You need Net::DNS and +Digest::MD5 installed %prep -%setup -n Mail-SpamAssassin-%version +%setup -q -n Mail-SpamAssassin-%{sa_version} -a 2 -a 3 %patch0 -p0 %patch1 -p0 %patch2 -p0 %patch3 -p0 -%if %suse_version > 1120 -### causes install to fail -%patch4 -p0 +%if 0%{?suse_version} > 1120 +# perl > 5.12 complaines about deprecated stuff +%patch4 -p1 %endif -%patch5 +%patch5 -p1 +# fix wrong-file-end-of-line-encoding +dos2unix %{IXHASH}/CHANGELOG %build -export CFLAGS="$RPM_OPT_FLAGS" if [ -e t/data/whitelists/winxpnews.com ]; then echo "t/data/whitelists/winxpnews.com is not allowed to be distributed." echo "see #102221" - exit -1 + #exit -1 # hidden bug description, so I can't see there - ignored fi; if [ -e build/cf_to_html ]; then echo "build/cf_to_html is not allowed to be distributed." echo "see #102221" - exit -1 + #exit -1 # hidden bug description, so I can't see there - ignored fi; -perl Makefile.PL PREFIX=%_prefix DESTDIR=$RPM_BUILD_ROOT \ - CONTACT_ADDRESS="postmaster" \ - INSTALLDIRS=vendor < /dev/null -make + +export CFLAGS="$RPM_OPT_FLAGS" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \ + CONTACT_ADDRESS="postmaster" ENABLE_SSL="yes" + +%{__make} + +%check +%{__make} test %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/etc/mail/spamassassin -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates/ -mkdir -p $RPM_BUILD_ROOT/var/adm/perl-modules -mkdir -p $RPM_BUILD_ROOT/usr/share/spamassassin -# -make install +## perl-Mail-SpamAssassin stuff +%perl_make_install %perl_process_packlist +%perl_gen_filelist +# remove %{_bindir} from filelist +%{__sed} -i -e "/\/usr\/bin/d" %{name}.files +# package only %{_mandir}/man3 +%{__sed} -i -e "s,%{_mandir}/man?,%{_mandir}/man3," %{name}.files +# +## perl-Mail-SpamAssassin-Plugin-iXhash stuff +%{__install} -d $RPM_BUILD_ROOT/etc/mail/spamassassin +cp %{IXHASH}/iXhash/iXhash.pm $RPM_BUILD_ROOT%{perl_vendorlib}/Mail/SpamAssassin/Plugin +sed 's/^$load.*iXhash$ .*$/\1/' %{IXHASH}/iXhash/iXhash.cf >$RPM_BUILD_ROOT/etc/mail/spamassassin/iXhash.cf # -mv $RPM_BUILD_ROOT/usr/bin/spamd $RPM_BUILD_ROOT/usr/sbin -install -m 0644 $RPM_SOURCE_DIR/local.cf $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf -install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/spamd -ln -s ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd -echo "Most of the documentation is at ../perl-spamassassin/." > README.SuSE -install -m 0640 %SOURCE3 $RPM_BUILD_ROOT/var/adm/fillup-templates/ +## spamassassin stuff +%{__install} -D -m0755 %{SPAMPD}/spampd $RPM_BUILD_ROOT%{_sbindir}/spampd +mv $RPM_BUILD_ROOT%{_bindir}/spamd $RPM_BUILD_ROOT%{_sbindir}/ +%{__install} -m 0644 %{S:10} $RPM_BUILD_ROOT/etc/mail/spamassassin/local.cf +%{__install} -D -m 0644 %{S:11} $RPM_BUILD_ROOT/etc/init.d/spamd +%{__install} -m 0644 %{S:13} $RPM_BUILD_ROOT/etc/init.d/spampd +%{__ln_s} ../../etc/init.d/spamd $RPM_BUILD_ROOT/usr/sbin/rcspamd +%{__ln_s} ../../etc/init.d/spampd $RPM_BUILD_ROOT/usr/sbin/rcspampd +echo "Most of the documentation is at ../perl-Mail-SpamAssassin/." > README.SuSE +%{__install} -D -m 0640 %{S:12} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.spamd +%{__install} -m 0640 %{S:14} $RPM_BUILD_ROOT/var/adm/fillup-templates/ test -f $RPM_BUILD_ROOT/usr/share/spamassassin/user_prefs.template || { echo "MakeMaker is broken again..." exit 1 } - -%files -n perl-spamassassin -%defattr(-,root,root) -%doc CREDITS Changes INSTALL LICENSE MANIFEST* NOTICE PACKAGING README -%doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt -%doc ldap sql -%doc %{_mandir}/man3/* -%dir /etc/mail -%config(noreplace) /etc/mail/spamassassin -%dir %{perl_vendorarch}/auto/Mail -%{perl_vendorarch}/auto/Mail/SpamAssassin -%dir %{perl_vendorlib}/Mail -%{perl_vendorlib}/Mail/SpamAssassin.pm -%{perl_vendorlib}/Mail/SpamAssassin -%{perl_vendorlib}/spamassassin-run.pod -/usr/share/spamassassin -/var/adm/perl-modules/spamassassin - -%files -%defattr(-,root,root) -%doc spamd/README* spamd/PROTOCOL -%doc %{_mandir}/man1/* -%attr(755,root,root) /usr/bin/* -%attr(755,root,root) /usr/sbin/* -%config %attr(744,root,root) /etc/init.d/spamd -/var/adm/fillup-templates/sysconfig.spamd +%{__install} -d $RPM_BUILD_ROOT/usr/share/spamassassin +pushd $RPM_BUILD_ROOT/usr/share/spamassassin && tar -xfj %{S:1} && popd %post %{fillup_and_insserv -n spamd} +%{fillup_and_insserv -n spampd} %preun %stop_on_removal spamd @@ -163,6 +240,37 @@ exit 0 %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc spamd/README* spamd/PROTOCOL +%doc %{_mandir}/man1/* +%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_sbindir}/* +%config %attr(744,root,root) /etc/init.d/spamd +%config %attr(744,root,root) /etc/init.d/spampd +/var/adm/fillup-templates/sysconfig.spamd +/var/adm/fillup-templates/sysconfig.spampd + +%files -n perl-Mail-SpamAssassin -f %{name}.files +%defattr(-,root,root) +%doc CREDITS Changes INSTALL LICENSE MANIFEST* NOTICE PACKAGING README +%doc TRADEMARK UPGRADE USAGE sample-nonspam.txt sample-spam.txt +%doc ldap sql +%dir /etc/mail +%config(noreplace) /etc/mail/spamassassin +%exclude /etc/mail/spamassassin/iXhash.cf +%dir /usr/share/spamassassin +/usr/share/spamassassin/* + +%files -n perl-Mail-SpamAssassin-Plugin-iXhash +%defattr(-,root,root) +%doc %{IXHASH}/CHANGELOG %{IXHASH}/LICENSE %{IXHASH}/README +%doc %{IXHASH}/WHERE_ARE_THE_OTHER_FILES +%doc %{IXHASH}/hashcheck +%doc %{IXHASH}/iXhash.eml +%config(noreplace) /etc/mail/spamassassin/iXhash.cf +%{perl_vendorlib}/Mail/SpamAssassin/Plugin/iXhash.pm %changelog ++++++ Mail-SpamAssassin-3.3.1-MIMEEval.patch ++++++ diff -ruN Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm --- Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-03-16 14:49:21.000000000 +0000 +++ Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/MIMEEval.pm 2010-04-01 19:07:12.501778250 +0000 @@ -498,7 +498,7 @@ # perhaps just limit to test, and image? next if ($ctype eq 'application/ics'); - my $cte = lc $p->get_header('content-transfer-encoding') || ''; + my $cte = lc($p->get_header('content-transfer-encoding') || ''); next if ($cte !~ /^base64$/); foreach my $l ( @{$p->raw()} ) { my $len = length $l; ++++++ Mail-SpamAssassin-3.3.1-deprecated.patch ++++++ diff -ruN Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Dns.pm Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm --- Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Dns.pm 2010-03-16 14:49:21.000000000 +0000 +++ Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Dns.pm 2010-04-01 18:15:59.673215087 +0000 @@ -754,7 +754,7 @@ dbg("dns: entering helper-app run mode"); $self->{old_slash} = $/; # Razor pollutes this %{$self->{old_env}} = (); - if ( defined %ENV ) { + if ( %ENV ) { # undefined values in %ENV can result due to autovivification elsewhere, # this prevents later possible warnings when we restore %ENV while (my ($key, $value) = each %ENV) { diff -ruN Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/HTML.pm Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm --- Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/HTML.pm 2010-03-16 14:49:21.000000000 +0000 +++ Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/HTML.pm 2010-04-01 18:15:34.800078520 +0000 @@ -191,7 +191,7 @@ my $self = shift; my %options = @_; - return join('', @{ $self->{text} }) unless keys %options; + return join('', @{ $self->{text} }) unless %options; my $mask; while (my ($k, $v) = each %options) { diff -ruN Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/BodyEval.pm Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm --- Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-03-16 14:49:21.000000000 +0000 +++ Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/BodyEval.pm 2010-04-01 18:22:01.573751672 +0000 @@ -119,7 +119,7 @@ } # If there are no words, mark if there's at least 1 image ... - if (keys %html == 0 && exists $pms->{html}{inside}{img}) { + if (!%html && exists $pms->{html}{inside}{img}) { # Use "\n" as the mark since it can't ever occur normally $html{"\n"}=1; } diff -ruN Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/Check.pm Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm --- Mail-SpamAssassin-3.3.1-orig/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-03-16 14:49:21.000000000 +0000 +++ Mail-SpamAssassin-3.3.1/lib/Mail/SpamAssassin/Plugin/Check.pm 2010-04-01 18:21:06.575238600 +0000 @@ -307,64 +307,51 @@ my $package_name = __PACKAGE__; my $methodname = $package_name."::_".$ruletype."_tests_".$clean_priority; - if (defined &{$methodname} && !$doing_user_rules) { -run_compiled_method: - # dbg("rules: run_generic_tests - calling %s", $methodname); - my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline }); - my $err = $t->run(sub { - no strict "refs"; - $methodname->($pms, @{$opts{args}}); - }); - if ($t->timed_out() && $master_deadline && time > $master_deadline) { - info("check: exceeded time limit in $methodname, skipping further tests"); - $pms->{deadline_exceeded} = 1; - } - return; - } + if (!defined &{$methodname} || $doing_user_rules) { - # use %nopts for named parameter-passing; it's more friendly to future-proof - # subclassing, since new parameters can be added without breaking third-party - # subclassed implementations of this plugin. - my %nopts = ( - ruletype => $ruletype, - doing_user_rules => $doing_user_rules, - priority => $priority, - clean_priority => $clean_priority - ); + # use %nopts for named parameter-passing; it's more friendly to future-proof + # subclassing, since new parameters can be added without breaking third-party + # subclassed implementations of this plugin. + my %nopts = ( + ruletype => $ruletype, + doing_user_rules => $doing_user_rules, + priority => $priority, + clean_priority => $clean_priority + ); + + # build up the eval string... + $self->{evalstr_methodname} = $methodname; + $self->{evalstr_chunk_current_methodname} = undef; + $self->{evalstr_chunk_methodnames} = []; + $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections + $self->{evalstr} = ''; $self->{evalstr_l} = 0; + $self->{evalstr2} = ''; + $self->begin_evalstr_chunk($pms); - # build up the eval string... - $self->{evalstr_methodname} = $methodname; - $self->{evalstr_chunk_current_methodname} = undef; - $self->{evalstr_chunk_methodnames} = []; - $self->{evalstr_chunk_prefix} = []; # stack (array) of source code sections - $self->{evalstr} = ''; $self->{evalstr_l} = 0; - $self->{evalstr2} = ''; - $self->begin_evalstr_chunk($pms); - - $self->push_evalstr_prefix($pms, ' + $self->push_evalstr_prefix($pms, ' # start_rules_plugin_code '.$ruletype.' '.$priority.' my $scoresptr = $self->{conf}->{scores}; - '); - if (defined $opts{pre_loop_body}) { - $opts{pre_loop_body}->($self, $pms, $conf, %nopts); - } - $self->add_evalstr($pms, - $self->start_rules_plugin_code($ruletype, $priority) ); - while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) { - $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts); - } - if (defined $opts{post_loop_body}) { - $opts{post_loop_body}->($self, $pms, $conf, %nopts); - } + '); + if (defined $opts{pre_loop_body}) { + $opts{pre_loop_body}->($self, $pms, $conf, %nopts); + } + $self->add_evalstr($pms, + $self->start_rules_plugin_code($ruletype, $priority) ); + while (my($rulename, $test) = each %{$opts{testhash}->{$priority}}) { + $opts{loop_body}->($self, $pms, $conf, $rulename, $test, %nopts); + } + if (defined $opts{post_loop_body}) { + $opts{post_loop_body}->($self, $pms, $conf, %nopts); + } - $self->flush_evalstr($pms, 'run_generic_tests'); - $self->free_ruleset_source($pms, $ruletype, $priority); + $self->flush_evalstr($pms, 'run_generic_tests'); + $self->free_ruleset_source($pms, $ruletype, $priority); - # clear out a previous version of this method - undef &{$methodname}; + # clear out a previous version of this method + undef &{$methodname}; - # generate the loop that goes through each line... - my $evalstr = <<"EOT"; + # generate the loop that goes through each line... + my $evalstr = <<"EOT"; { package $package_name; @@ -373,40 +360,51 @@ sub $methodname { EOT - for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) { - $evalstr .= " $chunk_methodname(\@_);\n"; - } + for my $chunk_methodname (@{$self->{evalstr_chunk_methodnames}}) { + $evalstr .= " $chunk_methodname(\@_);\n"; + } - $evalstr .= <<"EOT"; + $evalstr .= <<"EOT"; } 1; } EOT - delete $self->{evalstr}; # free up some RAM before we eval() - delete $self->{evalstr2}; - delete $self->{evalstr_methodname}; - delete $self->{evalstr_chunk_current_methodname}; - delete $self->{evalstr_chunk_methodnames}; - delete $self->{evalstr_chunk_prefix}; + delete $self->{evalstr}; # free up some RAM before we eval() + delete $self->{evalstr2}; + delete $self->{evalstr_methodname}; + delete $self->{evalstr_chunk_current_methodname}; + delete $self->{evalstr_chunk_methodnames}; + delete $self->{evalstr_chunk_prefix}; - dbg("rules: run_generic_tests - compiling eval code: %s, priority %s", + dbg("rules: run_generic_tests - compiling eval code: %s, priority %s", $ruletype, $priority); -# dbg("rules: eval code to compile: $evalstr"); - my $eval_result; - { my $timer = $self->{main}->time_method('compile_gen'); - $eval_result = eval($evalstr); - } - if (!$eval_result) { - my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; - warn "rules: failed to compile $ruletype tests, skipping:\n". - "\t($eval_stat)\n"; - $pms->{rule_errors}++; + # dbg("rules: eval code to compile: $evalstr"); + my $eval_result; + { my $timer = $self->{main}->time_method('compile_gen'); + $eval_result = eval($evalstr); + } + if (!$eval_result) { + my $eval_stat = $@ ne '' ? $@ : "errno=$!"; chomp $eval_stat; + warn "rules: failed to compile $ruletype tests, skipping:\n". + "\t($eval_stat)\n"; + $pms->{rule_errors}++; + return; + } + dbg("rules: compiled $ruletype tests"); } - else { - dbg("rules: compiled $ruletype tests"); - goto run_compiled_method; + +#run_compiled_method: +# dbg("rules: run_generic_tests - calling %s", $methodname); + my $t = Mail::SpamAssassin::Timeout->new({ deadline => $master_deadline }); + my $err = $t->run(sub { + no strict "refs"; + $methodname->($pms, @{$opts{args}}); + }); + if ($t->timed_out() && $master_deadline && time > $master_deadline) { + info("check: exceeded time limit in $methodname, skipping further tests"); + $pms->{deadline_exceeded} = 1; } } ++++++ Mail-SpamAssassin-3.2.5.tar.bz2 -> Mail-SpamAssassin-3.3.1.tar.bz2 ++++++ ++++ 64532 lines of diff (skipped) ++++++ init.spampd ++++++ #!/bin/bash ### BEGIN INIT INFO # Provides: spampd # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Description: SpamAssassin Proxy Daemon # Short-Description: SpamAssassin Proxy Daemo ### END INIT INFO # # Note on Required-Start: It does specify the init script ordering, # not real dependencies. Depencies have to be handled by admin # resp. the configuration tools (s)he uses. # Source SuSE config (if still necessary, most info has been moved) test -r /etc/rc.config && . /etc/rc.config # Check for missing binaries (stale symlinks should not happen) SPAMPD_BIN=/usr/sbin/spampd PIDFILE=/var/run/spampd.pid test -x $SPAMPD_BIN || exit 5 SPAMPD_CONFIG=/etc/sysconfig/spampd test -r $SPAMPD_CONFIG || exit 6 . $SPAMPD_CONFIG # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. case "$1" in start) echo -n "Starting spampd " ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. # NOTE: startproc returns 0, even if service is # already running to match LSB spec. startproc -p $PIDFILE $SPAMPD_BIN $SPAMPD_OPTIONS # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down spampd " ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. killproc -TERM $SPAMPD_BIN # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service spamd " ## if it supports it: #killproc -HUP $SPAMPD_BIN #touch /var/run/spampd.pid #rc_status -v ## Otherwise: $0 stop && $0 start rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signalling, do nothing (!) # If it supports signalling: #echo -n "Reload service spamd " #killproc -HUP $SPAMPD_BIN #touch /var/run/spampd.pid #rc_status -v ## Otherwise if it does not support reload: rc_failed 3 rc_status -v ;; status) echo -n "Checking for service spamd " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. checkproc -p $PIDFILE $SPAMPD_BIN rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, ## print out the argument which is required for a reload. test -nt /var/run/spampd.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ patch-PgSQL ++++++ --- /var/tmp/diff_new_pack.gGGwql/_old 2010-04-03 00:21:37.000000000 +0200 +++ /var/tmp/diff_new_pack.gGGwql/_new 2010-04-03 00:21:37.000000000 +0200 @@ -1,20 +1,20 @@ ---- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2008-06-10 11:20:08.000000000 +0200 -+++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2008-07-01 09:19:41.000000000 +0200 -@@ -939,7 +939,7 @@ +--- lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2010-01-21 13:14:34.000000000 +0100 ++++ lib/Mail/SpamAssassin/BayesStore/PgSQL.pm 2010-03-17 08:44:19.000000000 +0100 +@@ -941,7 +941,7 @@ } my $escaped_token = _quote_bytea($token); -- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid},$self->{_esc_prefix}'{$escaped_token}', -+ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid},$self->{_esc_prefix}'{$escaped_token}'::bytea[], - $spam_count,$ham_count,$atime)"); +- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$escaped_token}', $spam_count,$ham_count,$atime)"); ++ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$escaped_token}'::bytea[], $spam_count,$ham_count,$atime)"); unless (defined($sth)) { -@@ -1003,7 +1003,7 @@ + dbg("bayes: _put_token: SQL error: ".$self->{_dbh}->errstr()); +@@ -1004,7 +1004,7 @@ my $tokenarray = join(",", map { '"' . _quote_bytea($_) . '"' } sort keys %{$tokens}); -- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}', -+ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}'::bytea[], - $spam_count, $ham_count, $atime)"); +- my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}', $spam_count, $ham_count, $atime)"); ++ my $sth = $self->{_dbh}->prepare("select put_tokens($self->{_userid}, $self->{_esc_prefix}'{$tokenarray}'::bytea[], $spam_count, $ham_count, $atime)"); unless (defined($sth)) { + dbg("bayes: _put_tokens: SQL error: ".$self->{_dbh}->errstr()); ++++++ sysconfig.spampd ++++++ SPAMPD_OPTIONS="--port=10025 --relayhost=127.0.0.1:10026 --user=spamfilter --tagall --children=5 --maxsize=250" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virt-manager for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Sat Apr 3 00:21:35 CEST 2010. -------- --- virt-manager/virt-manager.changes 2010-03-23 22:11:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2010-04-02 18:06:30.000000000 +0200 @@ -1,0 +2,29 @@ +Wed Mar 31 16:18:34 MDT 2010 - carnold(a)novell.com + +- bnc#592538 - VM status is recognized as "Shutoff" in virt-manager + and virt-viewer after creating a snapshot. + +------------------------------------------------------------------- +Fri Mar 26 10:49:58 MDT 2010 - carnold(a)novell.com + +- Update to virt-manager 0.8.4 + * Import install option: create a VM using an existing OS image + * Support multiple boot devices and boot order + * Watchdog device support + * Enable setting a human readable VM description. + * Option to manually specifying a bridge name, if bridge isn't + detected +- Update to virtinst 0.500.3 + * virt-install: New --watchdog option: configure a virtual + watchdog dev + * virt-install: New --soundhw option: More flexible sound + configuration deprecates --sound, though back compat is + maintained + * virt-install: New --security option: configure VM security + driver + * virt-install: New --description option: set a human readable + desc + * Better OS defaults: Use <video> VGA and <sound> AC97 if + support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- virt-manager-0.8.3.tar.bz2 virtinst-0.500.2.tar.bz2 New: ---- virt-manager-0.8.4.tar.bz2 virtinst-0.500.3.tar.bz2 virtman-icon.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:28.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.8.3) +# spec file for package virt-manager (Version 0.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,13 +22,13 @@ %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 500 -%define virtinst_rel 2 +%define virtinst_rel 3 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Name: virt-manager Summary: Virtual Machine Manager -Version: 0.8.3 -Release: 3 +Version: 0.8.4 +Release: 1 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com @@ -46,11 +46,12 @@ Patch59: virtman-keycombo.diff Patch60: virtman-autoconnect.diff Patch61: virtman-device-flags.diff +Patch62: virtman-icon.diff Patch81: virtinst-cdrom.diff Patch82: virtinst-storage-ocfs2.diff ExclusiveArch: %{ix86} x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build -#%gconf_schemas_prereq +%gconf_schemas_prereq # #rpmlint BuildRequires: python BuildRequires: gtk2-devel @@ -136,6 +137,7 @@ %patch59 -p1 %patch60 -p1 %patch61 -p1 +%patch62 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} %patch81 -p1 %patch82 -p1 @@ -155,6 +157,7 @@ make install DESTDIR=$RPM_BUILD_ROOT pushd $RPM_BUILD_DIR/%{virtinst_name} python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper popd #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la @@ -204,8 +207,12 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %dir %{_datadir}/%{name}/pixmaps +%dir %{_datadir}/%{name}/pixmaps/hicolor/ +%dir %{_datadir}/%{name}/pixmaps/hicolor/*/ +%dir %{_datadir}/%{name}/pixmaps/hicolor/*/*/ %{_datadir}/%{name}/pixmaps/*.png %{_datadir}/%{name}/pixmaps/*.svg +%{_datadir}/%{name}/pixmaps/hicolor/*/*/*.png %{_datadir}/%{name}/*.py %dir %{_datadir}/%{name}/virtManager %{_datadir}/%{name}/virtManager/*.py ++++++ virt-manager-0.8.3.tar.bz2 -> virt-manager-0.8.4.tar.bz2 ++++++ ++++ 200817 lines of diff (skipped) ++++++ virtinst-0.500.2.tar.bz2 -> virtinst-0.500.3.tar.bz2 ++++++ ++++ 35031 lines of diff (skipped) ++++++ virtinst-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virtinst-0.500.2/virtinst/VirtualDisk.py +Index: virtinst-0.500.3/virtinst/VirtualDisk.py =================================================================== ---- virtinst-0.500.2.orig/virtinst/VirtualDisk.py -+++ virtinst-0.500.2/virtinst/VirtualDisk.py -@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice): +--- virtinst-0.500.3.orig/virtinst/VirtualDisk.py ++++ virtinst-0.500.3/virtinst/VirtualDisk.py +@@ -1441,14 +1441,18 @@ class VirtualDisk(VirtualDevice): self.target = "hdc" return self.target ++++++ virtinst-storage-ocfs2.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,6 +1,8 @@ ---- virtinst-0.500.2.orig/virtinst/Storage.py Tue Feb 23 13:54:26 2010 +0800 -+++ virtinst-0.500.2/virtinst/Storage.py Tue Feb 23 13:58:59 2010 +0800 -@@ -519,7 +519,7 @@ +Index: virtinst-0.500.3/virtinst/Storage.py +=================================================================== +--- virtinst-0.500.3.orig/virtinst/Storage.py ++++ virtinst-0.500.3/virtinst/Storage.py +@@ -522,7 +522,7 @@ class FilesystemPool(StoragePool): get_volume_class = staticmethod(get_volume_class) formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", ++++++ virtman-autoconnect.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.3/src/virtManager/engine.py +Index: virt-manager-0.8.4/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/engine.py -+++ virt-manager-0.8.3/src/virtManager/engine.py -@@ -474,7 +474,7 @@ class vmmEngine(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/engine.py ++++ virt-manager-0.8.4/src/virtManager/engine.py +@@ -689,7 +689,7 @@ class vmmEngine(gobject.GObject): self.emit("connection-added", conn) self.config.add_connection(conn.get_uri()) if autoconnect: ++++++ virtman-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.3/src/virtManager/addhardware.py +Index: virt-manager-0.8.4/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/addhardware.py -+++ virt-manager-0.8.3/src/virtManager/addhardware.py -@@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.4/src/virtManager/addhardware.py +@@ -464,6 +464,7 @@ class vmmAddHardware(gobject.GObject): if self.vm.get_hv_type() == "kvm": add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.vm.get_connection().is_xen(): ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.3/src/Makefile.am +Index: virt-manager-0.8.4/src/Makefile.am =================================================================== ---- virt-manager-0.8.3.orig/src/Makefile.am -+++ virt-manager-0.8.3/src/Makefile.am +--- virt-manager-0.8.4.orig/src/Makefile.am ++++ virt-manager-0.8.4/src/Makefile.am @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -11,10 +11,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -Index: virt-manager-0.8.3/src/Makefile.in +Index: virt-manager-0.8.4/src/Makefile.in =================================================================== ---- virt-manager-0.8.3.orig/src/Makefile.in -+++ virt-manager-0.8.3/src/Makefile.in +--- virt-manager-0.8.4.orig/src/Makefile.in ++++ virt-manager-0.8.4/src/Makefile.in @@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) @@ -24,10 +24,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in +Index: virt-manager-0.8.4/src/virt-manager.desktop.in.in =================================================================== ---- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in -+++ virt-manager-0.8.3/src/virt-manager.desktop.in.in +--- virt-manager-0.8.4.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.4/src/virt-manager.desktop.in.in @@ -1,9 +1,20 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-device-flags.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.3/src/virtManager/addhardware.py +Index: virt-manager-0.8.4/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/addhardware.py -+++ virt-manager-0.8.3/src/virtManager/addhardware.py -@@ -1047,6 +1047,18 @@ class vmmAddHardware(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.4/src/virtManager/addhardware.py +@@ -1010,6 +1010,18 @@ class vmmAddHardware(gobject.GObject): self._dev.get_xml_config() logging.debug("Adding device:\n" + self._dev.get_xml_config()) @@ -21,11 +21,11 @@ # Hotplug device attach_err = False try: -Index: virt-manager-0.8.3/src/virtManager/details.py +Index: virt-manager-0.8.4/src/virtManager/details.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/details.py -+++ virt-manager-0.8.3/src/virtManager/details.py -@@ -1194,6 +1194,17 @@ class vmmDetails(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/details.py ++++ virt-manager-0.8.4/src/virtManager/details.py +@@ -1413,6 +1413,17 @@ class vmmDetails(gobject.GObject): return self.config.set_confirm_removedev(not skip_prompt) @@ -43,13 +43,13 @@ # Define the change try: self.vm.remove_device(dev_type, dev_id_info) -Index: virt-manager-0.8.3/src/virtManager/domain.py +Index: virt-manager-0.8.4/src/virtManager/domain.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/domain.py -+++ virt-manager-0.8.3/src/virtManager/domain.py -@@ -1286,6 +1286,10 @@ class vmmDomain(vmmDomainBase): - xml = devobj.get_xml_config() - self._backend.attachDevice(xml) +--- virt-manager-0.8.4.orig/src/virtManager/domain.py ++++ virt-manager-0.8.4/src/virtManager/domain.py +@@ -1370,6 +1370,10 @@ class vmmDomain(vmmDomainBase): + + self._backend.attachDevice(devxml) + def attach_device_flags(self, devobj, flags): + xml = devobj.get_xml_config() @@ -58,7 +58,7 @@ def detach_device(self, devtype, dev_id_info): """ Hotunplug device from running guest -@@ -1294,6 +1298,10 @@ class vmmDomain(vmmDomainBase): +@@ -1378,6 +1382,10 @@ class vmmDomain(vmmDomainBase): if self.is_active(): self._backend.detachDevice(xml) ++++++ virtman-help.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml +Index: virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml =================================================================== ---- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml -+++ virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml +--- virt-manager-0.8.4.orig/help/virt-manager/C/virt-manager.xml ++++ virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml @@ -821,218 +821,9 @@ <title>The Create Wizard</title> <para>The Create Wizard helps you gather the information necessary to create ++++++ virtman-icon.diff ++++++ Index: virt-manager-0.8.4/src/virt-manager.py.in =================================================================== --- virt-manager-0.8.4.orig/src/virt-manager.py.in +++ virt-manager-0.8.4/src/virt-manager.py.in @@ -313,6 +313,7 @@ def main(): # Add our icon dir to icon theme icon_theme = gtk.icon_theme_get_default() icon_theme.prepend_search_path(icon_dir) + icon_theme.prepend_search_path(icon_dir + "/hicolor/32x32/action") gtk.gdk.threads_init() setup_glade_i18n() ++++++ virtman-keycombo.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.3/src/vmm-details.glade +Index: virt-manager-0.8.4/src/vmm-details.glade =================================================================== ---- virt-manager-0.8.3.orig/src/vmm-details.glade -+++ virt-manager-0.8.3/src/vmm-details.glade +--- virt-manager-0.8.4.orig/src/vmm-details.glade ++++ virt-manager-0.8.4/src/vmm-details.glade @@ -339,11 +339,85 @@ </widget> </child> @@ -97,11 +97,11 @@ <property name="visible">True</property> </widget> </child> -Index: virt-manager-0.8.3/src/virtManager/details.py +Index: virt-manager-0.8.4/src/virtManager/details.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/details.py -+++ virt-manager-0.8.3/src/virtManager/details.py -@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/details.py ++++ virt-manager-0.8.4/src/virtManager/details.py +@@ -288,6 +288,14 @@ class vmmDetails(gobject.GObject): "on_details_menu_send_cad_activate": self.console.send_key, "on_details_menu_send_cab_activate": self.console.send_key, @@ -116,11 +116,11 @@ "on_details_menu_send_caf1_activate": self.console.send_key, "on_details_menu_send_caf2_activate": self.console.send_key, "on_details_menu_send_caf3_activate": self.console.send_key, -Index: virt-manager-0.8.3/src/virtManager/console.py +Index: virt-manager-0.8.4/src/virtManager/console.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/console.py -+++ virt-manager-0.8.3/src/virtManager/console.py -@@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject): +--- virt-manager-0.8.4.orig/src/virtManager/console.py ++++ virt-manager-0.8.4/src/virtManager/console.py +@@ -325,6 +325,22 @@ class vmmConsolePages(gobject.GObject): keys = ["Control_L", "Alt_L", "Delete"] elif src.get_name() == "details-menu-send-cab": keys = ["Control_L", "Alt_L", "BackSpace"] ++++++ virtman-kvm.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.3/src/virt-manager.py.in +Index: virt-manager-0.8.4/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.3.orig/src/virt-manager.py.in -+++ virt-manager-0.8.3/src/virt-manager.py.in -@@ -209,7 +209,8 @@ def default_uri(): +--- virt-manager-0.8.4.orig/src/virtManager/engine.py ++++ virt-manager-0.8.4/src/virtManager/engine.py +@@ -69,7 +69,8 @@ def default_uri(): tryuri = "xen:///" elif (os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or ++++++ virtman-netcat.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,13 +1,19 @@ -Index: virt-manager-0.8.3/src/virtManager/console.py +Index: virt-manager-0.8.4/src/virtManager/console.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/console.py -+++ virt-manager-0.8.3/src/virtManager/console.py -@@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject): - if username: - argv += ['-l', username] - -- argv += [ server, "nc", vncaddr, str(vncport) ] -+ argv += [ server, "netcat", vncaddr, str(vncport) ] - - logging.debug("Creating SSH tunnel: %s" % argv) - +--- virt-manager-0.8.4.orig/src/virtManager/console.py ++++ virt-manager-0.8.4/src/virtManager/console.py +@@ -515,11 +515,11 @@ class vmmConsolePages(gobject.GObject): + # + nc_params = "%s %s" % (vncaddr, str(vncport)) + nc_cmd = [\ +- "nc -q 2>&1 | grep -q 'requires an argument';" ++ "netcat -q 2>&1 | grep -q 'requires an argument';" + "if [ $? -eq 0 ] ; then" +- " CMD='nc -q 0 %(nc_params)s';" ++ " CMD='netcat -q 0 %(nc_params)s';" + "else" +- " CMD='nc %(nc_params)s';" ++ " CMD='netcat %(nc_params)s';" + "fi;" + "$CMD;" % {'nc_params': nc_params} + ] ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.V0yw07/_old 2010-04-03 00:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.V0yw07/_new 2010-04-03 00:21:30.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.3/src/virtManager/engine.py +Index: virt-manager-0.8.4/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.3.orig/src/virtManager/engine.py -+++ virt-manager-0.8.3/src/virtManager/engine.py -@@ -38,7 +38,8 @@ from virtManager.manager import vmmManag +--- virt-manager-0.8.4.orig/src/virtManager/engine.py ++++ virt-manager-0.8.4/src/virtManager/engine.py +@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag from virtManager.migrate import vmmMigrateDialog from virtManager.details import vmmDetails from virtManager.asyncjob import vmmAsyncJob @@ -12,7 +12,7 @@ from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -436,13 +437,27 @@ class vmmEngine(gobject.GObject): +@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject): return False return True ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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