December 2011 - openSUSE Commits - openSUSE Mailing Lists

commit kmymoney for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2011-12-01 17:37:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmymoney", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2011-11-10 15:49:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes 2011-12-01 17:37:59.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 12:55:52 UTC 2011 - idoenmez(a)suse.de + +- Fix build with Qt 4.8 + +------------------------------------------------------------------- New: ---- kmymoney-qdebug.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.kmDfCa/_old 2011-12-01 17:38:00.000000000 +0100 +++ /var/tmp/diff_new_pack.kmDfCa/_new 2011-12-01 17:38:00.000000000 +0100 @@ -25,6 +25,7 @@ Url: http://kmymoney2.sourceforge.net/ Group: Productivity/Office/Finance Source0: http://downloads.sourceforge.net/kmymoney2/%{name}-%{version}.tar.bz2 +Patch1: kmymoney-qdebug.patch BuildRequires: aqbanking-devel BuildRequires: boost-devel BuildRequires: fdupes @@ -73,6 +74,7 @@ %lang_package %prep %setup -q +%patch1 -p1 %build %cmake_kde4 -d build ++++++ kmymoney-qdebug.patch ++++++ Index: kmymoney-4.6.0/libkdchart/src/KDChartBackgroundAttributes.cpp =================================================================== --- kmymoney-4.6.0.orig/libkdchart/src/KDChartBackgroundAttributes.cpp +++ kmymoney-4.6.0/libkdchart/src/KDChartBackgroundAttributes.cpp @@ -22,6 +22,7 @@ #include "KDChartBackgroundAttributes.h" #include <QPixmap> +#include <QVariant> #include <KDABLibFakes> @@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh << "visible="<<ba.isVisible() << "brush="<<ba.brush() << "pixmapmode="<<ba.pixmapMode() - << "pixmap="<<ba.pixmap() + << "pixmap="<< QVariant(ba.pixmap()) << ")"; return dbg; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesvn for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package kdesvn for openSUSE:Factory checked in at 2011-12-01 17:37:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesvn (Old) and /work/SRC/openSUSE:Factory/.kdesvn.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesvn", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesvn/kdesvn.changes 2011-09-23 02:06:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesvn.new/kdesvn.changes 2011-12-01 17:37:55.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 12:50:11 UTC 2011 - idoenmez(a)suse.de + +- Fix build with Qt 4.8 + +------------------------------------------------------------------- New: ---- kdesvn-virtual-inheritance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesvn.spec ++++++ --- /var/tmp/diff_new_pack.eb8ocR/_old 2011-12-01 17:37:56.000000000 +0100 +++ /var/tmp/diff_new_pack.eb8ocR/_new 2011-12-01 17:37:56.000000000 +0100 @@ -28,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: kdesvn.diff Patch2: remove-nl.diff +Patch3: kdesvn-virtual-inheritance.patch BuildRequires: fdupes BuildRequires: libkde4-devel BuildRequires: openldap2-devel @@ -75,6 +76,7 @@ %setup -q %patch0 %patch2 +%patch3 -p1 %build %cmake_kde4 -d build @@ -89,9 +91,6 @@ %fdupes -s %{buildroot}%{_datadir} %kde_post_install -%clean -rm -rf %{buildroot} - %post -n libsvnqt6 -p /sbin/ldconfig %postun -n libsvnqt6 -p /sbin/ldconfig ++++++ kdesvn-virtual-inheritance.patch ++++++ Index: kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h =================================================================== --- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h +++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h @@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil /** @author Rajko Albrecht <ral(a)alwins-world.de> */ -class RevGraphView : virtual public QGraphicsView +class RevGraphView : public QGraphicsView { Q_OBJECT public: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesdk4 for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package kdesdk4 for openSUSE:Factory checked in at 2011-12-01 17:37:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4 (Old) and /work/SRC/openSUSE:Factory/.kdesdk4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk4", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4/kdesdk4.changes 2011-11-14 14:18:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk4.new/kdesdk4.changes 2011-12-01 17:37:51.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 12:26:42 UTC 2011 - idoenmez(a)suse.de + +- Fix build with Qt 4.8 + +------------------------------------------------------------------- New: ---- umbrella-virtual-qobject.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4.spec ++++++ --- /var/tmp/diff_new_pack.wi2kt3/_old 2011-12-01 17:37:52.000000000 +0100 +++ /var/tmp/diff_new_pack.wi2kt3/_new 2011-12-01 17:37:52.000000000 +0100 @@ -27,6 +27,7 @@ Source0: kdesdk-%{version}.tar.bz2 Source100: kdesdk4-rpmlintrc Patch0: desktop-files.diff +Patch1: umbrella-virtual-qobject.patch BuildRequires: antlr BuildRequires: antlr-devel # for libiberty (used by kmtrace for cp_demangle) @@ -36,13 +37,13 @@ BuildRequires: flex BuildRequires: hunspell-devel BuildRequires: kdebase4-workspace-devel +BuildRequires: libkde4-devel >= %{version} BuildRequires: libkdepimlibs4-devel BuildRequires: libkonq-devel BuildRequires: libqca2-devel BuildRequires: oxygen-icon-theme BuildRequires: strigi BuildRequires: subversion-devel -BuildRequires: libkde4-devel >= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires(post): shared-mime-info @@ -54,6 +55,7 @@ %prep %setup -q -n kdesdk-%{version} %patch0 +%patch1 -p1 %build %ifarch ppc64 @@ -104,10 +106,6 @@ /sbin/ldconfig %_kde4_bindir/update-mime-database %{_datadir}/mime &> /dev/null || : -%clean - rm -rf %{buildroot} - rm -rf filelists - %package scripts License: GPLv2+ Summary: Scripts for KDE Development ++++++ umbrella-virtual-qobject.patch ++++++ Index: kdesdk-4.7.3/umbrello/umbrello/codegenerators/ownedcodeblock.h =================================================================== --- kdesdk-4.7.3.orig/umbrello/umbrello/codegenerators/ownedcodeblock.h +++ kdesdk-4.7.3/umbrello/umbrello/codegenerators/ownedcodeblock.h @@ -23,7 +23,7 @@ class UMLObject; * Describes any codeblock which is 'owned' by a UMLobject of some sort and should * be in sync with that parent. */ -class OwnedCodeBlock : virtual public QObject +class OwnedCodeBlock : public QObject { Q_OBJECT public: -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bluez-firmware for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package bluez-firmware for openSUSE:Factory checked in at 2011-12-01 17:37:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bluez-firmware (Old) and /work/SRC/openSUSE:Factory/.bluez-firmware.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluez-firmware", Maintainer is "ACho(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bluez-firmware/bluez-firmware.changes 2011-09-23 01:52:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bluez-firmware.new/bluez-firmware.changes 2011-12-01 17:37:38.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 09:44:40 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-firmware.spec ++++++ --- /var/tmp/diff_new_pack.m1g5kv/_old 2011-12-01 17:37:39.000000000 +0100 +++ /var/tmp/diff_new_pack.m1g5kv/_new 2011-12-01 17:37:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bluez-firmware (Version 1.2) +# spec file for package bluez-firmware # -# 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 @@ -21,13 +21,13 @@ Name: bluez-firmware Url: http://bluez.sourceforge.net Version: 1.2 -Release: 125 +Release: 0 Summary: Bluetooth(TM) Firmware -License: GPL v2 or later; GPLv2 and redistributable unmodifiable binary firmware +License: GPL-2.0+; GPLv2 and redistributable unmodifiable binary firmware Group: Hardware/Mobile -AutoReqProv: on Source: http://bluez.sf.net/download/%{name}-%{version}.tar.gz Source1: bfusb.tar.bz2 +BuildRequires: automake BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: bluez-bluefw # Modules: bcm203x.ko bfusb.ko @@ -44,13 +44,6 @@ The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., USA. - - -Authors: --------- - Max Krasnyansky <maxk(a)qualcomm.com> - Marcel Holtmann <marcel(a)holtmann.org> - %prep %setup -b 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aranym for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package aranym for openSUSE:Factory checked in at 2011-12-01 17:37:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aranym (Old) and /work/SRC/openSUSE:Factory/.aranym.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aranym", Maintainer is "schwab(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aranym/aranym.changes 2011-09-23 01:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aranym.new/aranym.changes 2011-12-01 17:37:30.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 10:45:02 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aranym.spec ++++++ --- /var/tmp/diff_new_pack.uO1oXQ/_old 2011-12-01 17:37:31.000000000 +0100 +++ /var/tmp/diff_new_pack.uO1oXQ/_new 2011-12-01 17:37:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package aranym (Version 0.9.7beta) +# spec file for package aranym # -# Copyright (c) 2008 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 @@ -18,7 +18,7 @@ Name: aranym -BuildRequires: Mesa-devel SDL-devel SDL_image-devel gcc-c++ unzip update-desktop-files +BuildRequires: Mesa-devel SDL-devel SDL_image-devel automake gcc-c++ unzip update-desktop-files Url: http://aranym.org/ Summary: ARAnyM (Atari Running on Any Machine) Version: 0.9.7beta -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package NetworkManager for openSUSE:12.1:Update:Test checked in at 2011-12-01 16:54:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/NetworkManager (Old) and /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "NetworkManager", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/NetworkManager/NetworkManager.changes 2011-11-24 20:14:26.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager.new/NetworkManager.changes 2011-12-01 16:54:20.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 11:54:14 CET 2011 - fcrozat(a)suse.com + +- Update systemd-network-config.patch to handle NM_TIMEOUT value 0 + as no timeout (bnc#730628). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-network-config.patch ++++++ --- /var/tmp/diff_new_pack.Z4Osya/_old 2011-12-01 16:54:20.000000000 +0100 +++ /var/tmp/diff_new_pack.Z4Osya/_new 2011-12-01 16:54:20.000000000 +0100 @@ -30,9 +30,9 @@ [Service] Type=oneshot -ExecStart=@bindir@/nm-online -q --timeout=30 -+Environment=NM_ONLINE_TIMEOUT=30 ++Environment=NM_ONLINE_TIMEOUT=0 +EnvironmentFile=-/etc/sysconfig/network/config -+ExecStart=@bindir@/nm-online -q --timeout=${NM_ONLINE_TIMEOUT} ++ExecStart=/bin/bash -c "if [ ${NM_ONLINE_TIMEOUT} -gt 0 ]; then @bindir@/nm-online -q --timeout=${NM_ONLINE_TIMEOUT} ; else /bin/true ; fi" [Install] WantedBy=network.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit SuSEfirewall2 for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:12.1:Update:Test checked in at 2011-12-01 15:45:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/SuSEfirewall2 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.SuSEfirewall2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SuSEfirewall2", Maintainer is "lnussel(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/SuSEfirewall2/SuSEfirewall2.changes 2011-12-01 15:44:55.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.SuSEfirewall2.new/SuSEfirewall2.changes 2011-12-01 15:46:10.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 29 15:00:11 UTC 2011 - lnussel(a)suse.de + +- compat syntax for negated options no longer works (bnc#660156, bnc#731088) + +------------------------------------------------------------------- New: ---- SuSEfirewall2-negated-options.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.8AfmYm/_old 2011-12-01 15:46:11.000000000 +0100 +++ /var/tmp/diff_new_pack.8AfmYm/_new 2011-12-01 15:46:11.000000000 +0100 @@ -28,6 +28,7 @@ Requires: iptables coreutils perl sysconfig Summary: Stateful Packet Filter Using iptables and netfilter Source: SuSEfirewall2-%{version}.tar.bz2 +Patch0: SuSEfirewall2-negated-options.diff BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,6 +42,7 @@ %prep %setup +%patch0 -p1 # please send patches to lnussel for inclusion in git first # http://gitorious.org/opensuse/susefirewall2 ++++++ SuSEfirewall2-negated-options.diff ++++++ >From c0d28e8fd4b22b658e605bb57fc848f4c112abff Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Mon, 28 Nov 2011 16:57:25 +0100 Subject: [PATCH] compat syntax for negated options no longer works (bnc#660156, bnc#731088) --- SuSEfirewall2 | 89 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 55 insertions(+), 34 deletions(-) diff --git a/SuSEfirewall2 b/SuSEfirewall2 index b9c7fc7..affb8aa 100755 --- a/SuSEfirewall2 +++ b/SuSEfirewall2 @@ -1873,10 +1873,34 @@ warn_highports() fi } +# construct -s/-d pairs with correct negation +net2srcdst() +{ + local name="$1" + local value=${2#\!} + if [ -z "$value" ]; then + echo "${name}_src=" + echo "${name}_dst=" + echo "${name}_neg=" + return + fi + local neg= + if [ "$2" != "$value" ]; then + neg='! ' + echo "${name}_neg=1" + else + echo "${name}_neg=" + fi + echo "${name}_src=\"$neg-s $value\"" + echo "${name}_dst=\"$neg-d $value\"" +} + # redirect packets from one port to another, opens ports in input_* redirect_rules() { - local chain nets net1 net2 proto port1 port2 + local chain nets proto port1 port2 + local net1 net1_neg net1_src net1_dst + local net2 net2_neg net2_src net2_dst local redirectinstalled for nets in $FW_REDIRECT; do IFS=, eval set -- \$nets @@ -1900,10 +1924,10 @@ redirect_rules() if [ -n "$port2" ]; then port2="--to-ports $port2" fi - net1=${net1/\!/\! } - net2=${net2/\!/\! } - $IPTABLES -A PREROUTING -t mangle -j MARK -p $proto -s $net1 -d $net2 $port1 --set-mark $mark_redir - $IPTABLES -A PREROUTING -t nat -j REDIRECT -p $proto -s $net1 -d $net2 $port1 $port2 + eval `net2srcdst net1 "$net1"` + eval `net2srcdst net2 "$net2"` + $IPTABLES -A PREROUTING -t mangle -j MARK -p $proto $net1_src $net2_dst $port1 --set-mark $mark_redir + $IPTABLES -A PREROUTING -t nat -j REDIRECT -p $proto $net1_src $net2_dst $port1 $port2 redirectinstalled=1 fi done @@ -2051,7 +2075,9 @@ forwarding_rules() masquerading_rules() { - local nets net1 net2 proto port dev snet2 sport + local nets proto port dev sport + local net1 net1_neg net1_src net1_dst + local net2 net2_neg net2_src net2_dst local szone dzone sdev sdevs local z d local var='FW_NOMASQ_NETS' @@ -2073,20 +2099,14 @@ masquerading_rules() elif [ -z "$net1" ]; then error "source network must not be empty in $var -> $nets" elif check_proto_port "$proto" "$port" '' "$var"; then - net1=${net1/\!/\! } - net2=${net2/\!/\! } - snet2="" - if [ -n "$net2" ]; then - snet2="-s $net2" - net2="-d $net2" - fi - + eval `net2srcdst net1 "$net1"` + eval `net2srcdst net2 "$net2"` for dev in $FW_MASQ_DEV; do d=${dev//[^A-Za-z0-9]/_} eval z=\${iface_$d} if [ "$var" = "FW_NOMASQ_NETS" ]; then # cheap hack - $IPTABLES -A POSTROUTING -j ACCEPT -t nat -s $net1 $net2 $proto $port -o $dev + $IPTABLES -A POSTROUTING -j ACCEPT -t nat $net1_src $net2_dst $proto $port -o $dev continue fi @@ -2099,19 +2119,19 @@ masquerading_rules() [ "$sdev" = "$dev" ] && continue if [ "forward_$z" != "$dzone" ]; then #echo "$dzone: $sdev ($szone) -> $dev ($z)" - $LAA $IPTABLES -A $dzone ${LOG}"-`rulelog $dzone`-ACC-MASQ " -s $net1 $net2 $proto $port -i $sdev -o $dev - $IPTABLES -A $dzone -j "$ACCEPT" -m conntrack --ctstate NEW,ESTABLISHED,RELATED -s $net1 $net2 $proto $port -i $sdev -o $dev + $LAA $IPTABLES -A $dzone ${LOG}"-`rulelog $dzone`-ACC-MASQ " $net1_src $net2_dst $proto $port -i $sdev -o $dev + $IPTABLES -A $dzone -j "$ACCEPT" -m conntrack --ctstate NEW,ESTABLISHED,RELATED $net1_src $net2_dst $proto $port -i $sdev -o $dev else #echo "$dzone: $sdev ($szone) <- $dev ($z)" # we need to allow the replies as well - $LAA $IPTABLES -A $dzone -d $net1 $snet2 $proto $rport -i $dev -o $sdev ${LOG}"-`rulelog $dzone`-ACC-MASQ " -m conntrack --ctstate ESTABLISHED,RELATED - $IPTABLES -A $dzone -d $net1 $snet2 $proto $rport -i $dev -o $sdev -j "$ACCEPT" -m conntrack --ctstate ESTABLISHED,RELATED + $LAA $IPTABLES -A $dzone $net1_dst $net2_src $proto $rport -i $dev -o $sdev ${LOG}"-`rulelog $dzone`-ACC-MASQ " -m conntrack --ctstate ESTABLISHED,RELATED + $IPTABLES -A $dzone $net1_dst $net2_src $proto $rport -i $dev -o $sdev -j "$ACCEPT" -m conntrack --ctstate ESTABLISHED,RELATED fi done done done - $IPTABLES -A POSTROUTING -j MASQUERADE -t nat -s $net1 $net2 $proto $port -o $dev + $IPTABLES -A POSTROUTING -j MASQUERADE -t nat $net1_src $net2_dst $proto $port -o $dev done fi done @@ -2122,19 +2142,21 @@ masquerading_rules() # <source network>,<destination>,<protocol>,<port>,<ip to forward to>,<redirect port> forward_masquerading_rules() { - local nets net1 net2 proto port1 port2 lip + local nets proto port1 port2 lip + local net1 net1_neg net1_src net1_dst + local net2 net2_neg net2_src net2_dst for nets in $FW_FORWARD_MASQ; do IFS=, eval set -- \$nets net1="$1" - net2="$2" + target="$2" proto="$3" port1="$4" port2="$5" - lip="$6" + net2="$6" - case "$net2" in - */*|'') + case "$target" in + */*|\!*|'') error "target must be a single host in FW_FORWARD_MASQ -> $nets" continue ;; @@ -2149,29 +2171,28 @@ forward_masquerading_rules() elif [ -z "$port1" ]; then error "Port missing in FW_FORWARD_MASQ -> $nets" else - net1=${net1/\!/\! } - net2=${net2/\!/\! } + eval `net2srcdst net1 "$net1"` + eval `net2srcdst net2 "$net2"` proto="-p $proto" test -z "$port2" && port2="$port1" port1="--dport $port1" dport2="--dport $port2" port2=":${port2/:/-}" - test -n "$lip" && lip="-d $lip" for dev in $FW_MASQ_DEV; do - $IPTABLES -A PREROUTING -j DNAT -t nat $proto -s $net1 $lip $port1 --to-destination ${net2}${port2} -i $dev + $IPTABLES -A PREROUTING -j DNAT -t nat $proto $net1_src $net2_dst $port1 --to-destination ${target}${port2} -i $dev # to install minimal rule set we'd need to check if # $net1 is covered by $FW_MASQ_NETS. Not feasible in # bash code so just check for 0/0 if [ "$FW_MASQ_NETS" != "0/0" ]; then - $IPTABLES -A POSTROUTING -j MASQUERADE -t nat -s $net1 -d $net2 $proto $dport2 -o $dev + $IPTABLES -A POSTROUTING -j MASQUERADE -t nat $net1_src $net2_dst $proto $dport2 -o $dev fi done for chain in $forward_zones; do chain=forward_$chain - $LAC $IPTABLES -A $chain ${LOG}"-`rulelog $chain`-ACC-REVMASQ " $proto -s $net1 -d $net2 $dport2 -m conntrack --ctstate NEW - $LAA $IPTABLES -A $chain ${LOG}"-`rulelog $chain`-ACC-REVMASQ " $proto -s $net1 -d $net2 $dport2 - $IPTABLES -A $chain -j "$ACCEPT" $proto -s $net1 -d $net2 $dport2 - $IPTABLES -A $chain -j "$ACCEPT" $proto -d $net1 -s $net2 -m conntrack --ctstate ESTABLISHED,RELATED + $LAC $IPTABLES -A $chain ${LOG}"-`rulelog $chain`-ACC-REVMASQ " $proto $net1_src $net2_dst $dport2 -m conntrack --ctstate NEW + $LAA $IPTABLES -A $chain ${LOG}"-`rulelog $chain`-ACC-REVMASQ " $proto $net1_src $net2_dst $dport2 + $IPTABLES -A $chain -j "$ACCEPT" $proto $net1_src $net2_dst $dport2 + $IPTABLES -A $chain -j "$ACCEPT" $proto $net1_dst $net2_src -m conntrack --ctstate ESTABLISHED,RELATED done fi done -- 1.7.7 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit SuSEfirewall2 for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package SuSEfirewall2 for openSUSE:12.1:Update:Test checked in at 2011-12-01 15:44:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/SuSEfirewall2 (Old) and /work/SRC/openSUSE:12.1:Update:Test/.SuSEfirewall2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SuSEfirewall2", Maintainer is "lnussel(a)suse.com" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:12.1:Update:Test/.SuSEfirewall2.new/SuSEfirewall2.changes 2011-12-01 15:44:55.000000000 +0100 @@ -0,0 +1,1180 @@ +------------------------------------------------------------------- +Mon Nov 7 10:56:04 UTC 2011 - lnussel(a)suse.de + +- use /sbin/rpcinfo as /usr/sbin/rpcinfo is gone (bnc#727438) + +------------------------------------------------------------------- +Wed Nov 2 15:27:04 UTC 2011 - lnussel(a)suse.de + +- set SYSTEMD_NO_WRAP for status (bnc#727445) + +------------------------------------------------------------------- +Fri Oct 14 09:46:33 UTC 2011 - lnussel(a)suse.de + +- fix manual rcSuSEfirewall2 stop with sytemd (bnc#717583) + +------------------------------------------------------------------- +Tue Oct 4 14:53:13 UTC 2011 - lnussel(a)suse.de + +- fix typo (bnc#721845) +- atomic zone status writing + +------------------------------------------------------------------- +Sat Sep 17 10:25:23 UTC 2011 - jengelh(a)medozas.de + +- Remove redundant tags/sections from specfile + +------------------------------------------------------------------- +Wed Sep 7 11:38:14 UTC 2011 - lnussel(a)suse.de + +- sanitize FW_ZONE_DEFAULT (bnc#716013) +- add warning about iptables-batch to SuSEfirewall2-custom +- fix warning about /proc/net/ip_tables_names not readable +- don't install input rules for interfaces in default zone +- Add hook fw_custom_after_finished +- update FAQ (bnc#694464) +- clean up overrides when stopping the firewall (bnc#630961) +- change default FW_LOG_ACCEPT_CRIT to "no" +- allow redir without port specification +- make FW_SERVICES_{REJECT,DROP}_* take precedende before ACCEPT (bnc#671997) +- fix zonein and zoneout parameters +- fix reverse direction of forwarding rules (bnc#679192) + +------------------------------------------------------------------- +Tue Feb 1 13:16:53 UTC 2011 - lnussel(a)suse.de + +- introduce rpcusers file to allow statd to run as non-root + (bnc#668553) + +------------------------------------------------------------------- +Wed Jan 19 14:04:48 UTC 2011 - lnussel(a)suse.de + +- add zonein and zoneout parameters for FW_FORWARD +- fix typos + +------------------------------------------------------------------- +Mon Jan 10 13:15:05 UTC 2011 - lnussel(a)suse.de + +- don't start in runlevel 4 by default (bnc#656520) +- cut off long zone names (bnc#644527) +- fix and enhance output of log command (bnc#663262) + +------------------------------------------------------------------- +Thu Dec 2 13:33:59 UTC 2010 - lnussel(a)suse.de + +- don't unload rules when using systemd + +------------------------------------------------------------------- +Tue Nov 16 15:01:04 UTC 2010 - lnussel(a)suse.de + +- list some known rpc services as Should-Start +- don't filter outgoing packets at all +- fix an example (bnc#641907) +- fix status check in SuSEfirewall2_init (bnc#628751) + +------------------------------------------------------------------- +Mon Aug 16 07:32:31 UTC 2010 - lnussel(a)suse.de + +- don't use fillup anymore as it keeps corrupting the config file + (bnc#340926) + +------------------------------------------------------------------- +Tue Jun 29 12:20:30 UTC 2010 - lnussel(a)suse.de + +- remove "batch committing..." message +- read defaults from separate file +- warn if highports config options are set +- finally drop 'highports' misfeature +- remove kernel ipv6 module detection (bnc#617033) +- silence warning about default zone (bnc#616841) +- SuSEfirewall2-open: don't add values multiple times +- Use multiprotocol xt_conntrack + +------------------------------------------------------------------- +Mon May 31 08:11:54 UTC 2010 - lnussel(a)suse.de + +- only directories in /sys/class/net are real interfaces (bnc#609810) + +------------------------------------------------------------------- +Fri Mar 19 13:34:10 UTC 2010 - lnussel(a)suse.de + +- add entry about drbd to FAQ +- update docu +- implement FW_BOOT_FULL_INIT + +------------------------------------------------------------------- +Tue Feb 16 13:51:48 UTC 2010 - lnussel(a)suse.de + +- use new versioning scheme after switch of repo to git +- update and rebuild docu +- remove really old rc.config conversion code from spec file + +------------------------------------------------------------------- +Tue Sep 15 13:33:06 UTC 2009 - lnussel(a)suse.de + +- fix spelling error in sysconfig file (bnc#537427) +- polishing of log drop policy (bnc#538053) + * drop multicast packets silently + * separate drop rule for broadcast packets at end of chain + * only consider NEW udp packets as critical + * don't log INVALID packets as critical + +------------------------------------------------------------------- +Fri Aug 21 11:09:40 UTC 2009 - lnussel(a)suse.de + +- implement runtime override of interface zones +- allow disabling NOTRACK rules on lo (bnc#519526) + +------------------------------------------------------------------- +Fri Jul 17 10:04:48 UTC 2009 - lnussel(a)suse.de + +- remove chkconfig calls (bnc#522268) + +------------------------------------------------------------------- +Thu Jul 9 13:50:47 UTC 2009 - lnussel(a)suse.de + +- add note about use as bridging firewall +- allow to set FW_ZONE_DEFAULT via config file +- deprecate fw_custom_before_antispoofing and + fw_custom_after_antispoofing, use fw_custom_after_chain_creation + instead + +------------------------------------------------------------------- +Tue Jun 9 14:19:27 UTC 2009 - lnussel(a)suse.de + +- add note that ulog doesn't work with IPv6 (bnc#442756) +- fix version number in help text +- allow service files to specify kernel modules and allow related packets +- silence an error from bash if a service config file is not available (bnc#487870) +- better wording for BROADCAST in template +- update firewall hook script (patch by Marius) + +------------------------------------------------------------------- +Thu Nov 6 13:18:31 CET 2008 - lnussel(a)suse.de + +- check whether IPv6 support is available when stopping the firewall + (bnc#442118) +- point to correct path for service files (bnc#425187) + +------------------------------------------------------------------- +Wed Oct 15 15:50:36 CEST 2008 - lnussel(a)suse.de + +- check status of SuSEfirewall2 without triggering module load (bnc#435653) +- add missing iptables-batch commitpoint for IPv4 + +------------------------------------------------------------------- +Tue Sep 30 10:48:19 CEST 2008 - lnussel(a)suse.de + +- don't modify the ip local port range +- allow negated rules via ! in FW_FORWARD_MASQ (bnc#413046) +- explain some common pitfalls around FW_SERVICES_ACCEPT_EXT +- SuSEfirewall2_init: don't fail if /usr is not available (bnc#429899) + +------------------------------------------------------------------- +Tue Sep 2 11:22:53 CEST 2008 - lnussel(a)suse.de + +- fix "recent" match (bnc#421806) + +------------------------------------------------------------------- +Mon Aug 25 01:44:41 CEST 2008 - ro(a)suse.de + +- remove outdated start variables from fillup_and_insserv call + +------------------------------------------------------------------- +Thu Jul 31 19:21:51 CEST 2008 - werner(a)suse.de + +- Make boot script know about new upcoming startpar and insserv + +------------------------------------------------------------------- +Tue Jul 22 10:48:18 CEST 2008 - lnussel(a)suse.de + +- add NOTRACK/raw table support (fate#978788) + +------------------------------------------------------------------- +Mon Jul 14 09:32:40 CEST 2008 - lnussel(a)suse.de + +- use correct rules to accept RELATED icmpv6 packets (bnc#396667) + ++++ 983 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.SuSEfirewall2.new/SuSEfirewall2.changes New: ---- SuSEfirewall2-3.6.282.tar.bz2 SuSEfirewall2.changes SuSEfirewall2.rpmlintrc SuSEfirewall2.spec _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ # # spec file for package SuSEfirewall2 # # 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # icecream 0 Name: SuSEfirewall2 Version: 3.6.282 Release: 1 License: GPLv2+ Group: Productivity/Networking/Security Url: http://en.opensuse.org/SuSEfirewall2 PreReq: %fillup_prereq %insserv_prereq /bin/sed textutils fileutils grep filesystem Requires: iptables coreutils perl sysconfig Summary: Stateful Packet Filter Using iptables and netfilter Source: SuSEfirewall2-%{version}.tar.bz2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SuSEfirewall2 implements a packet filter that protects hosts and routers by limiting which services or networks are accessible on the host or via the router. SuSEfirewall2 uses the iptables/netfilter packet filtering infrastructure to create a flexible rule set for a stateful firewall. %prep %setup # please send patches to lnussel for inclusion in git first # http://gitorious.org/opensuse/susefirewall2 %build %install make DESTDIR="%{buildroot}" install install_doc install -d -m 755 %{buildroot}/var/adm/fillup-templates/ install -m 644 SuSEfirewall2.sysconfig %{buildroot}/var/adm/fillup-templates/sysconfig.SuSEfirewall2 install -D -m 644 SuSEfirewall2.sysconfig %{buildroot}/etc/sysconfig/SuSEfirewall2 install -d -m 755 %{buildroot}%{_datadir}/susehelp/meta/Manuals/Productivity install -m 644 doc/SuSEfirewall2-doc.desktop \ %{buildroot}%{_datadir}/susehelp/meta/Manuals/Productivity/SuSEfirewall2.desktop # %files %defattr(-, root, root) %doc %{_docdir}/%{name} %doc %{_datadir}/susehelp %config(noreplace) /etc/sysconfig/scripts/SuSEfirewall2-custom %config(noreplace) /etc/sysconfig/SuSEfirewall2 %config /etc/init.d/SuSEfirewall2_init %config /etc/init.d/SuSEfirewall2_setup /etc/sysconfig/SuSEfirewall2.d/services/* /etc/sysconfig/scripts/SuSEfirewall2-rpcinfo /etc/sysconfig/scripts/SuSEfirewall2-showlog /etc/sysconfig/scripts/SuSEfirewall2-open /etc/sysconfig/scripts/SuSEfirewall2-batch /etc/sysconfig/scripts/SuSEfirewall2-qdisc /etc/sysconfig/scripts/SuSEfirewall2-oldbroadcast /etc/sysconfig/network/scripts/SuSEfirewall2 /etc/sysconfig/network/scripts/firewall /etc/sysconfig/network/if-up.d/SuSEfirewall2 /sbin/rcSuSEfirewall2 /sbin/SuSEfirewall2 %dir /usr/share/SuSEfirewall2 %dir /usr/share/SuSEfirewall2/defaults /usr/share/SuSEfirewall2/defaults/50-default.cfg /usr/share/SuSEfirewall2/rpcusers /var/adm/fillup-templates/sysconfig.SuSEfirewall2 %postun %insserv_cleanup %post # SuSEfirewall2_init is no longer a boot.d script, need to remove # and add it again for i in etc/init.d/boot.d/S??SuSEfirewall2_init; do if [ -e "$i" ]; then /sbin/insserv -r -f SuSEfirewall2_init /sbin/insserv -f SuSEfirewall2_init break fi done if [ -e etc/sysconfig/SuSEfirewall2 ] \ && grep -q '^FW_MASQ_DEV="\$FW_DEV_EXT"$' etc/sysconfig/SuSEfirewall2; then sed 's/^FW_MASQ_DEV="\$FW_DEV_EXT"$/FW_MASQ_DEV="zone:ext"/' \ < etc/sysconfig/SuSEfirewall2 \ > etc/sysconfig/SuSEfirewall2.new \ && mv etc/sysconfig/SuSEfirewall2.new etc/sysconfig/SuSEfirewall2 \ && echo "FW_MASQ_DEV converted" fi # %insserv_cleanup # exit 0 %changelog ++++++ SuSEfirewall2.rpmlintrc ++++++ # fillup is known to break SuSEfirewall's sysconfig file on many # systems as people tend to break up long lines into several ones. # This bug remains unfixed since years (bnc#340926). # So we have to avoid fillup and therefore break the SUSE policy setBadness("suse-filelist-forbidden-sysconfig", 0) ++++++ _link ++++++ <link project="openSUSE:12.1" package="SuSEfirewall2" baserev="1764d9131befb71b94e56acb1a95f001"> <patches> <branch/> </patches> </link> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libzypp for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package libzypp for openSUSE:12.1:Update:Test checked in at 2011-12-01 14:36:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/libzypp (Old) and /work/SRC/openSUSE:12.1:Update:Test/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp", Maintainer is "ma(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/libzypp/libzypp.changes 2011-11-25 16:22:15.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.libzypp.new/libzypp.changes 2011-12-01 14:36:23.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 28 18:08:42 CET 2011 - ma(a)suse.de + +- Fix and optimize Pathname ctor and provide testcases (bnc#721128) +- Open all file descriptors with O_CLOEXEC to avoid leaks and races +- Some improvements to the services documentation +- Fix RW_pointer comparison with underlying smart pointer type. +- version 10.3.5 (3) + +------------------------------------------------------------------- +Sun Nov 27 01:13:10 CET 2011 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-10.3.4.tar.bz2 New: ---- libzypp-10.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.lmFMYx/_old 2011-12-01 14:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.lmFMYx/_new 2011-12-01 14:36:23.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 10.3.4 +Version: 10.3.5 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-10.3.4.tar.bz2 -> libzypp-10.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/VERSION.cmake new/libzypp-10.3.5/VERSION.cmake --- old/libzypp-10.3.4/VERSION.cmake 2011-11-23 11:30:33.000000000 +0100 +++ new/libzypp-10.3.5/VERSION.cmake 2011-11-29 15:09:29.000000000 +0100 @@ -45,24 +45,24 @@ # ================================================== #======= -# - Update version according to your changes, -# but based on 'LAST RELEASED:' below. I.e -# there's no need to increase LIBZYPP_MINOR -# if it already differs from 'LAST RELEASED:'. -# # - MOST IMPORTANT: -# Before you submitt to autobuild, rmember the -# new version in 'LAST RELEASED:', and add a -# note in the changes file. +# - Before you submitt to git: +# - Remember the new version in 'LAST RELEASED:' +# - State the new version in the changes file by adding a line +# "- version MAJOR.MINOR.PATCH (COMPATMINOR)" +# - Commit changes and version files together in a separate +# commit using -m 'changes MAJOR.MINOR.PATCH (COMPATMINOR)' +# - Tag the above commit with 'MAJOR.MINOR.PATCH' using +# -m "tagging MAJOR. # -# - Consider calling ./mkChangelog to edit the -# changes file. See './mkChangelog -h' for help. +# - Consider calling ./mkChangelog to assist you. +# See './mkChangelog -h' for help. # SET(LIBZYPP_MAJOR "10") SET(LIBZYPP_COMPATMINOR "3") SET(LIBZYPP_MINOR "3") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_PATCH "5") # -# LAST RELEASED: 10.3.4 (3) +# LAST RELEASED: 10.3.5 (3) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/devel/devel.ma/Basic.cc new/libzypp-10.3.5/devel/devel.ma/Basic.cc --- old/libzypp-10.3.4/devel/devel.ma/Basic.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/devel/devel.ma/Basic.cc 2011-11-29 15:09:30.000000000 +0100 @@ -11,6 +11,9 @@ #include <zypp/TmpPath.h> #include <zypp/ResPoolProxy.h> #include <zypp/repo/PackageProvider.h> +#include "zypp/media/MediaManager.h" +#include "zypp/MediaSetAccess.h" +#include "zypp/Fetcher.h" static const Pathname sysRoot( "/" ); @@ -18,6 +21,190 @@ using namespace zypp; using namespace zypp::ui; + +#include <zypp/ZYppCallbacks.h> + + struct DownloadProgressReceive : public callback::ReceiveReport<media::DownloadProgressReport> + { + DownloadProgressReceive() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE // ignore the failure + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + ACCESS_DENIED, // user authent. failed while accessing restricted file + ERROR // other error + }; +#endif + virtual void start( const Url & file, Pathname localfile ) + { + USR << "DP +++ " << file << endl; + lp = 0; + } + + virtual bool progress(int value, const Url &file, double dbps_avg = -1, double dbps_current = -1) + { + if ( abs(value-lp) >= 20 || value == 100 && lp != 100 ) + { + USR << "DP " << file << " " << value << "%" << endl; + lp = value; + } + return true; + + } + + virtual Action problem( const Url &file , Error error , const std::string &description ) + { + USR << "DP !!! " << file << " (" << error << ")" << endl; + return ABORT; + + } + + virtual void finish( const Url &file , Error error , const std::string &reason ) + { + USR << "DP --- " << file << " (" << error << ")" << endl; + } + + int lp; + }; + + //////////////////////////////////////////////////////////////////// + // + ////////////////////////////////////////////////////////////////// + + struct DownloadResolvableReceive : public callback::ReceiveReport<repo::DownloadResolvableReport> + { + DownloadResolvableReceive() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE, // ignore this resolvable but continue + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + INVALID // the downloaded file is invalid + }; +#endif + virtual void start( Resolvable::constPtr resolvable_ptr, const Url &url ) + { + USR << "+++ " << resolvable_ptr << endl; + } + + + // Dowmload delta rpm: + // - path below url reported on start() + // - expected download size (0 if unknown) + // - download is interruptable + // - problems are just informal + virtual void startDeltaDownload( const Pathname & /*filename*/, const ByteCount & /*downloadsize*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual bool progressDeltaDownload( int /*value*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + return true; + } + + virtual void problemDeltaDownload( const std::string &/*description*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual void finishDeltaDownload() + { + USR << __PRETTY_FUNCTION__ << endl; + } + + // Apply delta rpm: + // - local path of downloaded delta + // - aplpy is not interruptable + // - problems are just informal + virtual void startDeltaApply( const Pathname & /*filename*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual void progressDeltaApply( int /*value*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual void problemDeltaApply( const std::string &/*description*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual void finishDeltaApply() + { + USR << __PRETTY_FUNCTION__ << endl; + } + + // Dowmload patch rpm: + // - path below url reported on start() + // - expected download size (0 if unknown) + // - download is interruptable + virtual void startPatchDownload( const Pathname & /*filename*/, const ByteCount & /*downloadsize*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual bool progressPatchDownload( int /*value*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + return true; + } + + virtual void problemPatchDownload( const std::string &/*description*/ ) + { + USR << __PRETTY_FUNCTION__ << endl; + } + + virtual void finishPatchDownload() + { + USR << __PRETTY_FUNCTION__ << endl; + } + + + // return false if the download should be aborted right now + virtual bool progress(int value, Resolvable::constPtr resolvable_ptr) + { + if ( 1 || abs(value-lp) >= 20 || value == 100 && lp != 100 ) + { + USR << resolvable_ptr << " " << value << "%" << endl; + lp = value; + } + return true; + } + + virtual Action problem( Resolvable::constPtr resolvable_ptr , Error error , const std::string &/*description*/ ) + { + USR << "!!! " << resolvable_ptr << " (" << error << ")" << endl; + return ABORT; + } + + virtual void finish(Resolvable::constPtr resolvable_ptr , Error error , const std::string &/*reason*/ ) + { + USR << "--- " << resolvable_ptr << " (" << error << ")" << endl; + } + + int lp; + }; + + bool queryInstalledEditionHelper( const std::string & name_r, const Edition & ed_r, const Arch & arch_r ) @@ -66,6 +253,10 @@ INT << "===[START]==========================================" << endl; ::unsetenv( "ZYPP_CONF" ); ZConfig::instance(); + + DownloadProgressReceive _dpr; + DownloadResolvableReceive _drr; + TestSetup::LoadSystemAt( sysRoot ); /////////////////////////////////////////////////////////////////// ResPool pool( ResPool::instance() ); @@ -74,13 +265,44 @@ dumpRange( USR, satpool.reposBegin(), satpool.reposEnd() ) << endl; USR << "pool: " << pool << endl; - PoolItem pi( getPi<Package>( "amarok" ) ); - SEC << pi << endl; - ManagedFile f( repoProvidePackage( pi ) ); - SEC << f << endl; - //f.resetDispose(); - ExternalProgram("find /tmp/var") >> DBG; - DBG << endl; + if ( 0 ) { + PoolItem pi( getPi<Package>( "CDT", "amarok", Edition(), Arch_empty ) ); + SEC << pi << endl; + ManagedFile f( repoProvidePackage( pi ) ); + SEC << f << endl; + } + { + Url url("cd:///?devices=/dev/sr0"); + Pathname path(url.getPathName()); + url.setPathName ("/"); + MediaSetAccess access(url); + Pathname local = access.provideFile(path); + SEC << local << endl; + } + if ( 0 ) { + Url url("http://download.opensuse.org/debug/distribution/11.4/repo/oss/content.asc"); + url.setPathName ("/"); + MediaSetAccess access(url); + + zypp::Fetcher fch; + fch.reset(); + fch.setOptions(zypp::Fetcher::AutoAddIndexes); + + // path - add "/" to the beginning if it's missing there + std::string media_path("/debug/distribution/11.4/repo/oss/content.ascx"); + zypp::OnMediaLocation mloc(media_path, 1); + mloc.setOptional(true); + + zypp::filesystem::TmpDir tmpdir( zypp::filesystem::TmpDir::defaultLocation() ); + fch.addIndex(mloc); + fch.start(tmpdir.path(), access); + } + + + +// f.resetDispose(); +// ExternalProgram("find /tmp/var") >> DBG; +// DBG << endl; INT << "===[END]============================================" << endl; zypp::base::LogControl::instance().logNothing(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/mkChangelog new/libzypp-10.3.5/mkChangelog --- old/libzypp-10.3.4/mkChangelog 2011-11-23 11:30:33.000000000 +0100 +++ new/libzypp-10.3.5/mkChangelog 2011-11-29 15:09:29.000000000 +0100 @@ -1,80 +1,42 @@ #! /bin/bash -# + +function Recho() { echo -e "\e[0;31m""$@""\e[0m"; } +function Gecho() { echo -e "\e[0;32m""$@""\e[0m"; } +function Becho() { echo -e "\e[0;34m""$@""\e[0m"; } function errexit() { exec >&2 - echo "Error: $@" + Recho "Error: $@" exit 1 } -export LC_ALL="" -EDITOR=${EDITOR:-vi} - -TDIR=$(dirname $0) -test -n "$TDIR" && cd $TDIR - -CHANGESFILE=$(ls package/*.changes) -test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" - -VERSIONFILE="VERSION.cmake" -test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" - -LANG="en" - -## Version.cmake tags in getversion() are still zypp specific. - function usage() { exec >&2 -cat <<EOF - -Usage: $(basename $0) [OPTIONS] -Options: -h,-?,--help This page. - -$(basename $0) will load the changes file '$CHANGESFILE' -into your editor (\$EDITOR=$EDITOR), providing a new changes -entry template: + cat <<EOF + Usage: + $(basename $0) [OPTIONS] + + Options: + -h,-?,--help This page. + -n Dryrun. + +Prepare a new changes file entry preloaded with all commits since the last +changes tag and load it into \$EDITOR (vi). If the version file was changed, +optionally submitt and tag the new changes. Otherwise simply leave the changes +in place. - ------------------------------------------------------------------- - Wed Jul 30 18:20:06 CEST 2008 - ma(a)suse.de - - - - #---delete-or-release---# LAST RELEASED: 5.3.2 (2) NEW RELEASE: 5.4.0 (4) - -The line '#---delete-or-release---#...' shows the last version submitted -to autobuild ('# LAST RELEASED:; tag in $VERSIONFILE). And also the current -version, asuming you already updated the $VERSIONFILE according to your changes. -(The number in parenthesis is _COMPATMINOR) - - -- Delete the line if you don't want to submit the package to autobuild. - -- Leave the line in place if you want to submit the package. - - -Closing the editor you are prompted: - - #---delete-or-release---# LAST RELEASED: 5.3.2 (2) NEW RELEASE: 5.4.0 (4) - (a)bort, (c)ontinue, (e)dit : - -Choosing (c)ontinue will write the new changes file. The '#---delete-or-release---#' -line is missing in case you deleted it. It's presence will remind you -that it is going to be converted into: - - - version 5.4.0 - -and the '# LAST RELEASED:; tag in $VERSIONFILE will be updated accordingly. -Now check the result, check in your changes, build the package and submit -to autobuild. - -Released by accident? Don't mind. Nothing bad will happen. If you want to -undo the change, restore the 'LAST RELEASED: ' entry in $VERSIONFILE and -delete the '- version' line in $CHANGESFILE'. +Don't forgett to push created tags as well: git push --tags EOF exit 1 } +DRYRUN=0 + case "$1" in + -[n]*) + DRYRUN=1 + ;; -[hH?]*) usage ;; @@ -83,6 +45,19 @@ ;; esac + +export LC_ALL="" +export LANG="en" +EDITOR=${EDITOR:-vi} + +EMAIL="$(git config --get user.email)" + +CHANGESFILE=$(ls package/*.changes) +test -f "$CHANGESFILE" || errexit "No changes file '$CHANGESFILE'" + +VERSIONFILE="VERSION.cmake" +test -f "$VERSIONFILE" || errexit "No version file '$VERSIONFILE'" + function getversion() { cat "$VERSIONFILE" \ | awk ' @@ -94,66 +69,127 @@ /^ *SET *$ *LIBZYPP_MINOR *"[0-9]+" *$/ {getnum();minor=$0} /^ *SET *$ *LIBZYPP_PATCH *"[0-9]+" *$/ {getnum();patch=$0} /^ *SET *$ *LIBZYPP_COMPATMINOR *"[0-9]+" *$/ {getnum();compatminor=$0} - /^# LAST RELEASED:/ {gsub("^.*RELEASED: *","");gsub(" +$","");gsub(" +\$"," (");lastrelease=$0} + /^# LAST RELEASED:/ { + gsub("^.*RELEASED: *",""); + gsub(" +$",""); + lastcompat=$0 + gsub(".*\\(","",lastcompat) + gsub("\$.*","",lastcompat) + gsub(" +\\(.*",""); + lastrelease=$0 + } END { thisrelease = major"."minor"."patch" ("compatminor")" - if ( thisrelease == lastrelease ) - print "#---delete-or-release---# LAST RELEASED: "lastrelease" UNCHANGED RELEASE: "thisrelease - else - print "#---delete-or-release---# LAST RELEASED: "lastrelease" NEW RELEASE: "thisrelease + printf "LAST_RELEASE='%s'\n", lastrelease + printf "LAST_COMPAT='%s'\n", lastcompat + printf "THIS_RELEASE='%s'\n", major"."minor"."patch + printf "THIS_COMPAT='%s'\n", compatminor } ' } -test -r /etc/sysconfig/mail && source /etc/sysconfig/mail -EMAIL="${USER}@${FROM_HEADER:-$(hostname -f)}" +function sameVersion() { + test "$LAST_RELEASE" == "$THIS_RELEASE" -a "$LAST_COMPAT" == "$THIS_COMPAT" +} + +function getchanges() { + git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2' +} + +function newchangesentry() { + echo "-------------------------------------------------------------------" + echo "$(date) - $EMAIL" + echo "" + echo "$(getchanges)" + sameVersion || { + echo "- version $THIS_RELEASE ($THIS_COMPAT)" + } + echo "" +} + +git status --porcelain | grep '^[^ ]' | grep -v "$VERSIONFILE\|$CHANGESFILE" && { + Becho "!!! Files other than version and changes are added to the index." + Becho "!!! Doing dryrun..." + DRYRUN=1 +} +if [ "$DRYRUN" == "1" ]; then + eval $(getversion) + newchangesentry + sameVersion && { + Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." + } + exit 0 +fi -GOTVERSION="$(getversion)" +# check version file +# +while true; do + # $LAST_RELEASE + # $LAST_COMPAT + # $THIS_RELEASE + # $THIS_COMPAT + eval $(getversion) + sameVersion && { + newchangesentry + Becho "!!! Version is unchanged at $LAST_RELEASE ($LAST_COMPAT)." + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (e)dit version: ")" RES + echo + case "$RES" in + [eE]*) + $EDITOR $VERSIONFILE + continue + ;; + [cC]) + Becho "!!! Leave $VERSIONFILE untouched" + break + ;; + *) + errexit "aborted" + ;; + esac + } + break +done + +# prepare changes file +# TMPFILE=$(mktemp) -exec 3>&1- -exec >$TMPFILE -echo "-------------------------------------------------------------------" -echo "$(date) - $EMAIL" -echo "" -echo "- " -echo "$GOTVERSION" -echo "" -cat $CHANGESFILE -exec >&3 +trap " [ -f \"$TMPFILE\" ] && /bin/rm -f -- \"$TMPFILE\" " 0 1 2 3 13 15 +{ newchangesentry; cat $CHANGESFILE; } >$TMPFILE RES=e while [ "$RES" == "e" ]; do $EDITOR $TMPFILE echo - NEWREL=$(grep '#---delete-or-release---#' $TMPFILE) - test -n "$NEWREL" && echo "$NEWREL" - read -n 1 -p "(a)bort, (c)ontinue, (e)dit : " RES - echo + awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $TMPFILE + read -n 1 -p "$(Gecho "(a)bort, (c)ontinue, (s)ubmitt, (e)dit : ")" RES echo case "$RES" in [eE]*) RES=e ;; - [cC]) - test -n "$NEWREL" && { - echo "Remember new release in $VERSIONFILE" - sed -i 's/^.*#---delete-or-release---#.*RELEASE:/- version/' $TMPFILE - NEWREL=$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# LAST RELEASED:/' <<<"$NEWREL") - sed -i "s/^# LAST RELEASED:.*$/$NEWREL/" $VERSIONFILE + [cCsS]) + Becho "!!! Store new $CHANGESFILE" + mv $TMPFILE $CHANGESFILE + + test "$RES" == "s" && { + if [ "$LAST_RELEASE" == "$THIS_RELEASE" ]; then + git add "$CHANGESFILE" && git commit -m "changes" + else + Becho "!!! Remember new version $THIS_RELEASE in $VERSIONFILE" + sed -i "s/^# LAST RELEASED:.*$/# LAST RELEASED: $THIS_RELEASE ($THIS_COMPAT)/" $VERSIONFILE + git add "$CHANGESFILE" "$VERSIONFILE" \ + && git commit -m "changes $THIS_RELEASE ($THIS_COMPAT)" \ + && git tag -m "tagging $THIS_RELEASE" "$THIS_RELEASE" HEAD + Becho "!!!" + Becho "!!! Do not forget to push the commit and the tag: $(Gecho git push --tags)" + Becho "!!!" + fi } - - echo "Store new $CHANGESFILE" - cp $TMPFILE $CHANGESFILE - - echo "$(sed 's/^.*#---delete-or-release---#.*RELEASE:/# CURRENT RELEASE:/' <<<"$GOTVERSION")" - awk '{print}/^----------/{n=n+1; if ( n == 2 ) exit 0; }' $CHANGESFILE - ;; *) - echo "Leave $CHANGESFILE untouched" + Becho "!!! Leave $CHANGESFILE untouched" ;; esac done - -rm -f $TMPFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/package/libzypp.changes new/libzypp-10.3.5/package/libzypp.changes --- old/libzypp-10.3.4/package/libzypp.changes 2011-11-23 11:30:33.000000000 +0100 +++ new/libzypp-10.3.5/package/libzypp.changes 2011-11-29 15:09:29.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Nov 28 18:08:42 CET 2011 - ma(a)suse.de + +- Fix and optimize Pathname ctor and provide testcases (bnc#721128) +- Open all file descriptors with O_CLOEXEC to avoid leaks and races +- Some improvements to the services documentation +- Fix RW_pointer comparison with underlying smart pointer type. +- version 10.3.5 (3) + +------------------------------------------------------------------- +Sun Nov 27 01:13:10 CET 2011 - ma(a)suse.de + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Thu Nov 17 01:13:15 CET 2011 - ma(a)suse.de - Update zypp-po.tar.bz2 Files old/libzypp-10.3.4/po/zypp-po.tar.bz2 and new/libzypp-10.3.5/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/tests/zypp/CMakeLists.txt new/libzypp-10.3.5/tests/zypp/CMakeLists.txt --- old/libzypp-10.3.4/tests/zypp/CMakeLists.txt 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/tests/zypp/CMakeLists.txt 2011-11-29 15:09:29.000000000 +0100 @@ -21,6 +21,7 @@ Locks MediaSetAccess PathInfo + Pathname PluginFrame PoolQuery ProgressData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/tests/zypp/Pathname_test.cc new/libzypp-10.3.5/tests/zypp/Pathname_test.cc --- old/libzypp-10.3.4/tests/zypp/Pathname_test.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-10.3.5/tests/zypp/Pathname_test.cc 2011-11-29 15:09:29.000000000 +0100 @@ -0,0 +1,151 @@ +#include <iostream> +#include <string> + +#include <boost/test/auto_unit_test.hpp> + +#include "zypp/base/LogTools.h" +#include "zypp/Pathname.h" + +using boost::unit_test::test_suite; +using boost::unit_test::test_case; + +using namespace std; +using namespace zypp; + +BOOST_AUTO_TEST_CASE(pathname_default_ctor) +{ + Pathname p; + + BOOST_CHECK_EQUAL(p.empty(), true ); + BOOST_CHECK_EQUAL(p.absolute(), false ); + BOOST_CHECK_EQUAL(p.relative(), false ); + BOOST_CHECK_EQUAL(p.dirname(), "" ); + BOOST_CHECK_EQUAL(p.basename(), "" ); + BOOST_CHECK_EQUAL(p.extension(), "" ); + BOOST_CHECK_EQUAL(p.absolutename(), "" ); + BOOST_CHECK_EQUAL(p.relativename(), "" ); +} + +BOOST_AUTO_TEST_CASE(pathname_root) +{ + Pathname p("/"); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), true ); + BOOST_CHECK_EQUAL(p.relative(), false ); + BOOST_CHECK_EQUAL(p.dirname(), "/" ); + BOOST_CHECK_EQUAL(p.basename(), "/" ); + BOOST_CHECK_EQUAL(p.extension(), "" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/" ); + BOOST_CHECK_EQUAL(p.relativename(), "./" ); +} + +BOOST_AUTO_TEST_CASE(pathname_this) +{ + Pathname p("."); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), false ); + BOOST_CHECK_EQUAL(p.relative(), true ); + BOOST_CHECK_EQUAL(p.dirname(), "." ); + BOOST_CHECK_EQUAL(p.basename(), "." ); + BOOST_CHECK_EQUAL(p.extension(), "" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/" ); + BOOST_CHECK_EQUAL(p.relativename(), "." ); +} + +BOOST_AUTO_TEST_CASE(pathname_up) +{ + Pathname p(".."); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), false ); + BOOST_CHECK_EQUAL(p.relative(), true ); + BOOST_CHECK_EQUAL(p.dirname(), "." ); + BOOST_CHECK_EQUAL(p.basename(), ".." ); + BOOST_CHECK_EQUAL(p.extension(), "" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/" ); + BOOST_CHECK_EQUAL(p.relativename(), ".." ); +} + +BOOST_AUTO_TEST_CASE(pathname_abs) +{ + Pathname p("/foo/baa.ka"); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), true ); + BOOST_CHECK_EQUAL(p.relative(), false ); + BOOST_CHECK_EQUAL(p.dirname(), "/foo" ); + BOOST_CHECK_EQUAL(p.basename(), "baa.ka" ); + BOOST_CHECK_EQUAL(p.extension(), ".ka" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/foo/baa.ka" ); + BOOST_CHECK_EQUAL(p.relativename(), "./foo/baa.ka" ); +} + +BOOST_AUTO_TEST_CASE(pathname_rel) +{ + Pathname p("./foo/./../baa.ka"); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), false ); + BOOST_CHECK_EQUAL(p.relative(), true ); + BOOST_CHECK_EQUAL(p.dirname(), "." ); + BOOST_CHECK_EQUAL(p.basename(), "baa.ka" ); + BOOST_CHECK_EQUAL(p.extension(), ".ka" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/baa.ka" ); + BOOST_CHECK_EQUAL(p.relativename(), "./baa.ka" ); +} + +BOOST_AUTO_TEST_CASE(pathname_relup) +{ + Pathname p("./../foo/./../baa"); + + BOOST_CHECK_EQUAL(p.empty(), false ); + BOOST_CHECK_EQUAL(p.absolute(), false ); + BOOST_CHECK_EQUAL(p.relative(), true ); + BOOST_CHECK_EQUAL(p.dirname(), ".." ); + BOOST_CHECK_EQUAL(p.basename(), "baa" ); + BOOST_CHECK_EQUAL(p.extension(), "" ); + BOOST_CHECK_EQUAL(p.absolutename(), "/baa" ); + BOOST_CHECK_EQUAL(p.relativename(), "../baa" ); +} + +BOOST_AUTO_TEST_CASE(pathname_strval) +{ + BOOST_CHECK_EQUAL(Pathname("").asString(), "" ); + BOOST_CHECK_EQUAL(Pathname("/////./").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("./").asString(), "." ); + BOOST_CHECK_EQUAL(Pathname("/.").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("./..").asString(), "./.." ); // ? .. + BOOST_CHECK_EQUAL(Pathname("../").asString(), "./.." ); // ? .. + BOOST_CHECK_EQUAL(Pathname(".././..").asString(), "./../.." ); // ? ../.. + + + BOOST_CHECK_EQUAL(Pathname("//baa").asString(), "/baa" ); + BOOST_CHECK_EQUAL(Pathname("/./baa").asString(), "/baa" ); + BOOST_CHECK_EQUAL(Pathname("/baa/..").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/baa/../baa").asString(), "/baa" ); + BOOST_CHECK_EQUAL(Pathname("/./../foo/./../baa").asString(), "/baa" ); + + BOOST_CHECK_EQUAL(Pathname("/").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname(".").asString(), "." ); + BOOST_CHECK_EQUAL(Pathname("..").asString(), "./.." ); + BOOST_CHECK_EQUAL(Pathname("/.").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/..").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/./.").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/./..").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/../.").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/../..").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/././").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/./../").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/.././").asString(), "/" ); + BOOST_CHECK_EQUAL(Pathname("/../../").asString(), "/" ); + + BOOST_CHECK_EQUAL(Pathname("a\\b").asString(), "./a\\b" ); + BOOST_CHECK_EQUAL(Pathname("a/b").asString(), "./a/b" ); + BOOST_CHECK_EQUAL(Pathname("c:a\\b").asString(), "./c:a\\b" ); + BOOST_CHECK_EQUAL(Pathname("c:a/b").asString(), "./c:a/b" ); + BOOST_CHECK_EQUAL(Pathname("cc:a\\b").asString(), "./cc:a\\b" ); + BOOST_CHECK_EQUAL(Pathname("cc:a/b").asString(), "./cc:a/b" ); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/PathInfo.cc new/libzypp-10.3.5/zypp/PathInfo.cc --- old/libzypp-10.3.4/zypp/PathInfo.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/PathInfo.cc 2011-11-29 15:09:30.000000000 +0100 @@ -1058,7 +1058,7 @@ { ZIP_TYPE ret = ZT_NONE; - int fd = open( file.asString().c_str(), O_RDONLY ); + int fd = open( file.asString().c_str(), O_RDONLY|O_CLOEXEC ); if ( fd != -1 ) { const int magicSize = 3; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/Pathname.cc new/libzypp-10.3.5/zypp/Pathname.cc --- old/libzypp-10.3.4/zypp/Pathname.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/Pathname.cc 2011-11-29 15:09:30.000000000 +0100 @@ -25,105 +25,6 @@ { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - namespace - { ///////////////////////////////////////////////////////////////// - - /////////////////////////////////////////////////////////////////// - // - // CLASS NAME : DirStack - // - /** silly helper to build Pathnames. - */ - class DirStack { - - struct Dir { - - Dir * up; - Dir * dn; - string name; - - Dir( const string & n = "" ) { - name = n; - up = dn = 0; - } - - ~Dir() { - if ( up ) - up->dn = dn; - if ( dn ) - dn->up = up; - } - }; - - Dir * top; - Dir * bot; - - void Pop() { - if ( !top ) - return; - top = top->dn; - if ( top ) - delete top->up; - else { - delete bot; - bot = 0; - } - } - - public: - - DirStack() { top = bot = 0; } - ~DirStack() { - while ( bot ) - Pop(); - } - - void Push( const string & n ) { - if ( n.empty() || n == "." ) { // '.' or '/' only for bot - if ( bot ) - return; - } else if ( n == ".." && top ) { - if ( top->name == "" ) // "/.." ==> "/" - return; - - if ( top->name != "." && top->name != ".." ) { // "somedir/.." ==> "" - Pop(); - return; - } - // "../.." "./.." stays - } - - Dir * d = new Dir( n ); - if ( !top ) - top = bot = d; - else { - top->up = d; - d->dn = top; - d->up = 0; - top = d; - } - } - - string str() { - if ( !bot ) - return ""; - string ret; - for ( Dir * d = bot; d; d = d->up ) { - if ( d != bot ) - ret += "/"; - ret += d->name; - } - if ( ret.empty() ) - return "/"; - return ret; - } - }; - - ///////////////////////////////////////////////////////////////// - } // namespace - /////////////////////////////////////////////////////////////////// - - /////////////////////////////////////////////////////////////////// // // METHOD NAME : Pathname::_assign // METHOD TYPE : void @@ -131,55 +32,93 @@ void Pathname::_assign( const string & name_tv ) { prfx_i = 0; - name_t = name_tv; - - if ( name_t.empty() ) + name_t.clear(); + if ( name_tv.empty() ) return; + name_t.reserve( name_tv.size() ); - string Tprfx; - DirStack Stack_Ci; - - char * Buf_aci = new char[name_tv.length() + 1]; - char * W_pci = Buf_aci; - const char * R_pci = name_tv.c_str(); - - // check for prefix - if ( name_t.length() >= 2 - && name_t[1] == ':' - && ( ( 'a' <= name_t[0] && name_t[0] <= 'z' ) - || ( 'A' <= name_t[0] && name_t[0] <= 'Z' ) ) ) { - Tprfx = name_t.substr( 0, 2 ); - prfx_i = 2; - R_pci += 2; + // Collect up to "/.." + enum Pending { + P_none = 0, // "" + P_slash = 1, // "/" + P_dot1 = 2, // "/." + P_dot2 = 3 // "/.." + } pending = P_none; + + // Assert relative path starting with "./" + // We rely on this below! + if ( name_tv[0] != '/' ) + { + name_t += '.'; + pending = P_slash; } - // rel or abs path - if ( *R_pci == '/' ) { - Stack_Ci.Push( "" ); - ++R_pci; - } else { - Stack_Ci.Push( "." ); - } + // Lambda handling the "/.." case: + // [] + "/.." ==> [] + // [.] + "/.." ==> [./..] + // [foo] is always [./foo] due to init above + // [*/..] + "/.." ==> [*/../..] + // [*/foo] + "/.." ==> [*] + auto goParent_f = [&](){ + if ( name_t.empty() ) + /*NOOP*/; + else if ( name_t.size() == 1 ) // content is '.' + name_t += "/.."; + else + { + std::string::size_type pos = name_t.rfind( "/" ); + if ( pos == name_t.size() - 3 && name_t[pos+1] == '.' && name_t[pos+2] == '.' ) + name_t += "/.."; + else + name_t.erase( pos ); + } + }; - do { - switch ( *R_pci ) { - case '/': - case '\0': - if ( W_pci != Buf_aci ) { - *W_pci = '\0'; - W_pci = Buf_aci; - Stack_Ci.Push( Buf_aci ); - } - break; - - default: - *W_pci++ = *R_pci; - break; - } - } while( *R_pci++ ); + for ( auto ch : name_tv ) + { + switch ( ch ) + { + case '/': + switch ( pending ) + { + case P_none: pending = P_slash; break; + case P_slash: break; + case P_dot1: pending = P_slash; break; + case P_dot2: goParent_f(); pending = P_slash; break; + } + break; + + case '.': + switch ( pending ) + { + case P_none: name_t += '.'; break; + case P_slash: pending = P_dot1; break; + case P_dot1: pending = P_dot2; break; + case P_dot2: name_t += "/..."; pending = P_none; break; + } + break; + + default: + switch ( pending ) + { + case P_none: break; + case P_slash: name_t += '/'; pending = P_none; break; + case P_dot1: name_t += "/."; pending = P_none; break; + case P_dot2: name_t += "/.."; pending = P_none; break; + } + name_t += ch; + break; + } + } - delete[] Buf_aci; - name_t = Tprfx + Stack_Ci.str(); + switch ( pending ) + { + case P_none: break; + case P_slash: if ( name_t.empty() ) name_t = "/"; break; + case P_dot1: if ( name_t.empty() ) name_t = "/"; break; + case P_dot2: goParent_f(); if ( name_t.empty() ) name_t = "/"; break; + } + return; } /////////////////////////////////////////////////////////////////// @@ -190,17 +129,15 @@ Pathname Pathname::dirname( const Pathname & name_tv ) { if ( name_tv.empty() ) - return ""; + return Pathname(); Pathname ret_t( name_tv ); string::size_type idx = ret_t.name_t.find_last_of( '/' ); if ( idx == string::npos ) { - ret_t.name_t.erase( ret_t.prfx_i ); - ret_t.name_t += "."; - } else if ( idx == ret_t.prfx_i ) { - ret_t.name_t.erase( ret_t.prfx_i ); - ret_t.name_t += "/"; + ret_t.name_t = "."; + } else if ( idx == 0 ) { + ret_t.name_t = "/"; } else { ret_t.name_t.erase( idx ); } @@ -219,9 +156,8 @@ return string(); string ret_t( name_tv.asString() ); - ret_t.erase( 0, name_tv.prfx_i ); string::size_type idx = ret_t.find_last_of( '/' ); - if ( idx != string::npos ) { + if ( idx != string::npos && ( idx != 0 || ret_t.size() != 1 ) ) { ret_t.erase( 0, idx+1 ); } @@ -264,8 +200,20 @@ string base( basename( name_tv ) ); string::size_type pos = base.rfind( '.' ); - if ( pos == string::npos ) - return string(); + switch ( pos ) + { + case 0: + if ( base.size() == 1 ) // . + return string(); + break; + case 1: + if ( base.size() == 2 && base[0] == '.' ) // .. + return string(); + break; + case string::npos: + return string(); + break; + } return base.substr( pos ); } @@ -295,10 +243,10 @@ if ( name_tv.empty() ) return add_tv; - string ret_ti( add_tv.asString() ); - ret_ti.replace( 0, add_tv.prfx_i, "/" ); - - return name_tv.asString() + ret_ti; + string ret_ti( name_tv.name_t ); + if( add_tv.name_t[0] != '/' ) + ret_ti += '/'; + return ret_ti + add_tv.name_t; } /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/Pathname.h new/libzypp-10.3.5/zypp/Pathname.h --- old/libzypp-10.3.4/zypp/Pathname.h 2011-11-23 11:30:36.000000000 +0100 +++ new/libzypp-10.3.5/zypp/Pathname.h 2011-11-29 15:09:30.000000000 +0100 @@ -40,7 +40,7 @@ * \todo Add support for handling extensions incl. stripping * extensions from basename (basename("/path/foo.baa", ".baa") ==> "foo") * \todo Review. Maybe use COW pimpl, check storage. - * \todo \b EXPLICIT ctors. + * \todo remove prfx_i */ class Pathname { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/Repository.cc new/libzypp-10.3.5/zypp/Repository.cc --- old/libzypp-10.3.4/zypp/Repository.cc 2011-11-23 11:30:36.000000000 +0100 +++ new/libzypp-10.3.5/zypp/Repository.cc 2011-11-29 15:09:30.000000000 +0100 @@ -248,7 +248,7 @@ { NO_REPOSITORY_THROW( Exception( "Can't add solvables to norepo." ) ); - AutoDispose<FILE*> file( ::fopen( file_r.c_str(), "r" ), ::fclose ); + AutoDispose<FILE*> file( ::fopen( file_r.c_str(), "re" ), ::fclose ); if ( file == NULL ) { file.resetDispose(); @@ -270,7 +270,7 @@ std::string command( file_r.extension() == ".gz" ? "zcat " : "cat " ); command += file_r.asString(); - AutoDispose<FILE*> file( ::popen( command.c_str(), "r" ), ::pclose ); + AutoDispose<FILE*> file( ::popen( command.c_str(), "re" ), ::pclose ); if ( file == NULL ) { file.resetDispose(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/TmpPath.cc new/libzypp-10.3.5/zypp/TmpPath.cc --- old/libzypp-10.3.4/zypp/TmpPath.cc 2011-11-23 11:30:36.000000000 +0100 +++ new/libzypp-10.3.5/zypp/TmpPath.cc 2011-11-29 15:09:30.000000000 +0100 @@ -187,7 +187,7 @@ return; } - int tmpFd = ::mkstemp( buf ); + int tmpFd = ::mkostemp( buf, O_CLOEXEC ); if ( tmpFd != -1 ) { // success; create _impl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/base/GzStream.cc new/libzypp-10.3.5/zypp/base/GzStream.cc --- old/libzypp-10.3.4/zypp/base/GzStream.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/base/GzStream.cc 2011-11-29 15:09:30.000000000 +0100 @@ -79,12 +79,12 @@ // we expect gzdopen to handle errors of ::open if ( mode_r == std::ios_base::in ) { - _fd = ::open( name_r, O_RDONLY ); + _fd = ::open( name_r, O_RDONLY | O_CLOEXEC ); _file = gzdopen( _fd, "rb" ); } else if ( mode_r == std::ios_base::out ) { - _fd = ::open( name_r, O_WRONLY|O_CREAT, 0666 ); + _fd = ::open( name_r, O_WRONLY|O_CREAT|O_CLOEXEC, 0666 ); _file = gzdopen( _fd, "wb" ); } // else: not supported diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/base/Random.cc new/libzypp-10.3.5/zypp/base/Random.cc --- old/libzypp-10.3.4/zypp/base/Random.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/base/Random.cc 2011-11-29 15:09:30.000000000 +0100 @@ -17,7 +17,7 @@ { unsigned int seed; init = true; - int fd = open("/dev/urandom", O_RDONLY); + int fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC); if (fd < 0 || ::read(fd, &seed, sizeof(seed)) != sizeof(seed)) { // No /dev/urandom... try something else. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/media/MediaCD.cc new/libzypp-10.3.5/zypp/media/MediaCD.cc --- old/libzypp-10.3.4/zypp/media/MediaCD.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/media/MediaCD.cc 2011-11-29 15:09:30.000000000 +0100 @@ -249,7 +249,7 @@ // bool MediaCD::openTray( const std::string & device_r ) { - int fd = ::open( device_r.c_str(), O_RDONLY|O_NONBLOCK ); + int fd = ::open( device_r.c_str(), O_RDONLY|O_NONBLOCK|O_CLOEXEC ); int res = -1; if ( fd != -1) @@ -308,7 +308,7 @@ // bool MediaCD::closeTray( const std::string & device_r ) { - int fd = ::open( device_r.c_str(), O_RDONLY|O_NONBLOCK ); + int fd = ::open( device_r.c_str(), O_RDONLY|O_NONBLOCK|O_CLOEXEC ); if ( fd == -1 ) { WAR << "Unable to open '" << device_r << "' (" << ::strerror( errno ) << ")" << endl; return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/media/MediaCurl.cc new/libzypp-10.3.5/zypp/media/MediaCurl.cc --- old/libzypp-10.3.4/zypp/media/MediaCurl.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/media/MediaCurl.cc 2011-11-29 15:09:30.000000000 +0100 @@ -1220,7 +1220,7 @@ ZYPP_THROW(MediaSystemException(url, "out of memory for temp file name")); } - int tmp_fd = ::mkstemp( buf ); + int tmp_fd = ::mkostemp( buf, O_CLOEXEC ); if( tmp_fd == -1) { free( buf); @@ -1230,7 +1230,7 @@ destNew = buf; free( buf); - FILE *file = ::fdopen( tmp_fd, "w" ); + FILE *file = ::fdopen( tmp_fd, "we" ); if ( !file ) { ::close( tmp_fd); filesystem::unlink( destNew ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/media/MediaMultiCurl.cc new/libzypp-10.3.5/zypp/media/MediaMultiCurl.cc --- old/libzypp-10.3.4/zypp/media/MediaMultiCurl.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/media/MediaMultiCurl.cc 2011-11-29 15:09:30.000000000 +0100 @@ -479,7 +479,7 @@ struct addrinfo *ai, aihints; memset(&aihints, 0, sizeof(aihints)); aihints.ai_family = PF_UNSPEC; - int tstsock = socket(PF_INET6, SOCK_DGRAM, 0); + int tstsock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (tstsock == -1) aihints.ai_family = PF_INET; else @@ -1203,7 +1203,7 @@ { char buf[256], *p; int fd, l; - if ((fd = open(file.asString().c_str(), O_RDONLY)) == -1) + if ((fd = open(file.asString().c_str(), O_RDONLY|O_CLOEXEC)) == -1) return false; while ((l = read(fd, buf, sizeof(buf) - 1)) == -1 && errno == EINTR) ; @@ -1246,7 +1246,7 @@ ZYPP_THROW(MediaSystemException(url, "out of memory for temp file name")); } - int tmp_fd = ::mkstemp( buf ); + int tmp_fd = ::mkostemp( buf, O_CLOEXEC ); if( tmp_fd == -1) { free( buf); @@ -1256,7 +1256,7 @@ destNew = buf; free( buf); - FILE *file = ::fdopen( tmp_fd, "w" ); + FILE *file = ::fdopen( tmp_fd, "we" ); if ( !file ) { ::close( tmp_fd); filesystem::unlink( destNew ); @@ -1344,7 +1344,7 @@ MediaBlockList bl = mlp.getBlockList(); vector<Url> urls = mlp.getUrls(); DBG << bl << endl; - file = fopen(destNew.c_str(), "w+"); + file = fopen(destNew.c_str(), "w+e"); if (!file) ZYPP_THROW(MediaWriteException(destNew)); if (PathInfo(target).isExist()) @@ -1393,7 +1393,7 @@ filesystem::unlink(destNew); ZYPP_RETHROW(ex); } - file = fopen(destNew.c_str(), "w+"); + file = fopen(destNew.c_str(), "w+e"); if (!file) ZYPP_THROW(MediaWriteException(destNew)); MediaCurl::doGetFileCopyFile(filename, dest, file, report, options | OPTION_NO_REPORT_START); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/media/Mount.cc new/libzypp-10.3.5/zypp/media/Mount.cc --- old/libzypp-10.3.4/zypp/media/Mount.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/media/Mount.cc 2011-11-29 15:09:30.000000000 +0100 @@ -302,7 +302,7 @@ { DBG << "Reading mount table from '" << *t << "'" << std::endl; } - FILE *fp = setmntent(t->c_str(), "r"); + FILE *fp = setmntent(t->c_str(), "re"); if( fp) { char buf[PATH_MAX * 4]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-10.3.4/zypp/target/modalias/Modalias.cc new/libzypp-10.3.5/zypp/target/modalias/Modalias.cc --- old/libzypp-10.3.4/zypp/target/modalias/Modalias.cc 2011-11-23 11:30:35.000000000 +0100 +++ new/libzypp-10.3.5/zypp/target/modalias/Modalias.cc 2011-11-29 15:09:30.000000000 +0100 @@ -115,7 +115,7 @@ return 0; } snprintf(path, sizeof(path), "%s/%s", dir, file); - if ((fd = open(path, O_RDONLY)) == -1) + if ((fd = open(path, O_RDONLY|O_CLOEXEC)) == -1) return 0; len = read(fd, modalias, sizeof(modalias) - 1); if (len < 0) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xtermset for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '11

01 Dec '11

Hello community, here is the log from the commit of package xtermset for openSUSE:Factory checked in at 2011-12-01 12:27:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtermset (Old) and /work/SRC/openSUSE:Factory/.xtermset.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtermset", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xtermset/xtermset.changes 2011-09-23 12:52:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtermset.new/xtermset.changes 2011-12-01 12:27:52.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 30 10:25:13 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtermset.spec ++++++ --- /var/tmp/diff_new_pack.CkfY9i/_old 2011-12-01 12:27:58.000000000 +0100 +++ /var/tmp/diff_new_pack.CkfY9i/_new 2011-12-01 12:27:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xtermset (Version 0.5.2) +# spec file for package xtermset # -# Copyright (c) 2008 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,16 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: xtermset -License: GPL v2 or later; X11/MIT +BuildRequires: automake +License: GPL-2.0+; X11/MIT Group: System/X11/Terminals -AutoReqProv: on Summary: A program to change the settings of an xterm Version: 0.5.2 -Release: 255 +Release: 0 Url: http://sourceforge.net/projects/clts/ Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}.dif @@ -37,13 +36,6 @@ from the command line. Most options have the same names as those that you would give an xterm at startup. - - -Authors: --------- - Breyten Ernsting <bje(a)dds.nl> - Decklin Foster <decklin(a)home.com> - %prep %setup %patch0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0