October 2014 - openSUSE Commits - openSUSE Mailing Lists

commit xtrabackup for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package xtrabackup for openSUSE:Factory checked in at 2014-10-05 20:32:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtrabackup (Old) and /work/SRC/openSUSE:Factory/.xtrabackup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtrabackup" Changes: -------- --- /work/SRC/openSUSE:Factory/xtrabackup/xtrabackup.changes 2014-09-15 18:24:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xtrabackup.new/xtrabackup.changes 2014-10-05 20:34:03.000000000 +0200 @@ -1,0 +2,35 @@ +Sun Oct 5 11:55:10 UTC 2014 - andreas.stieger(a)gmx.de + +- Percona XtraBackup 2.2.5 +- New features: + * Percona XtraBackup has been rebased on MySQL 5.6.21. +- Bugs fixed: + * Fix a regression for users with huge numbers of InnoDB + tablespaces, and the workaround of raising the open files + limits didnt work in all cases due to a limitation in the Linux + kernel. A new innobackupex --close-files option has been + implemented to close the file handles once they are no longer + accessed. NOTE: Using this option may result in a broken + backup if DDL is performed on InnoDB tables during the backup. + * Fix a regression since 2.2.0 which caused Percona XtraBackup + to fail to copy redo logs in random cases. + * innobackupex --galera-info didn't copy the last binlog file + when it was taking a backup from server where backup locks are + supported. + * xtrabackup binary would accept arguments that were not options, + which could lead to unexpected results. + * If innobackupex is run against MySQL 5.1 with built-in InnoDB, + it will now suggest using Percona XtraBackup 2.0 or upgrading + to InnoDB plugin, rather than just failing with the generic + unsupported server version message. + * Using the (deprecated) log parameter in mysqld section would + cause backups to fail. + * Percona XtraBackup now uses MySQL code to get the stack trace + in case Percona XtraBackup crashes with a segmentation fault or + an assertion failure. + * Attempt to use any of the following options without the + --incremental option now fails with an error message rather than + create a full backup: --incremental-lsn, --incremental-basedir, + --incremental-history-name, --incremental-history-uuid. + +------------------------------------------------------------------- Old: ---- percona-xtrabackup-2.2.4-nodoc.tar.xz New: ---- percona-xtrabackup-2.2.5-nodoc.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtrabackup.spec ++++++ --- /var/tmp/diff_new_pack.2IZIT7/_old 2014-10-05 20:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.2IZIT7/_new 2014-10-05 20:34:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: xtrabackup -Version: 2.2.4 +Version: 2.2.5 Release: 0 Summary: Online backup for MySQL / InnoDB License: GPL-2.0 ++++++ percona-xtrabackup-2.2.4-nodoc.tar.xz -> percona-xtrabackup-2.2.5-nodoc.tar.xz ++++++ /work/SRC/openSUSE:Factory/xtrabackup/percona-xtrabackup-2.2.4-nodoc.tar.xz /work/SRC/openSUSE:Factory/.xtrabackup.new/percona-xtrabackup-2.2.5-nodoc.tar.xz differ: char 27, line 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 xsynth-dssi for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package xsynth-dssi for openSUSE:Factory checked in at 2014-10-05 20:32:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsynth-dssi (Old) and /work/SRC/openSUSE:Factory/.xsynth-dssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xsynth-dssi" Changes: -------- --- /work/SRC/openSUSE:Factory/xsynth-dssi/xsynth-dssi.changes 2011-12-25 17:43:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xsynth-dssi.new/xsynth-dssi.changes 2014-10-05 20:34:01.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Oct 5 08:55:38 UTC 2014 - davejplater(a)gmail.com + +- Require dssi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsynth-dssi.spec ++++++ --- /var/tmp/diff_new_pack.ba0vhB/_old 2014-10-05 20:34:02.000000000 +0200 +++ /var/tmp/diff_new_pack.ba0vhB/_new 2014-10-05 20:34:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xsynth-dssi # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -24,6 +24,7 @@ BuildRequires: libjack-devel BuildRequires: liblo-devel BuildRequires: update-desktop-files +Requires: dssi Summary: Xsynth an analog-style (VCAs-VCF-VCO) synth plugin License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Midi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dssi for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package dssi for openSUSE:Factory checked in at 2014-10-05 20:32:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dssi (Old) and /work/SRC/openSUSE:Factory/.dssi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dssi" Changes: -------- --- /work/SRC/openSUSE:Factory/dssi/dssi.changes 2013-03-08 13:01:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dssi.new/dssi.changes 2014-10-05 20:34:00.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Oct 5 07:33:18 UTC 2014 - davejplater(a)gmail.com + +- Own the dssi libdir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dssi.spec ++++++ --- /var/tmp/diff_new_pack.AmA0Jb/_old 2014-10-05 20:34:01.000000000 +0200 +++ /var/tmp/diff_new_pack.AmA0Jb/_new 2014-10-05 20:34:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dssi # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -78,6 +78,7 @@ %defattr(-,root,root) %doc COPYING README %doc examples +%dir %{_libdir}/dssi %{_mandir}/man?/* %{_bindir}/* %{_libdir}/dssi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-dvb-daemon for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gnome-dvb-daemon for openSUSE:Factory checked in at 2014-10-05 20:32:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-dvb-daemon (Old) and /work/SRC/openSUSE:Factory/.gnome-dvb-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-dvb-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-dvb-daemon/gnome-dvb-daemon.changes 2013-03-11 07:24:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-dvb-daemon.new/gnome-dvb-daemon.changes 2014-10-05 20:33:58.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Aug 8 16:16:01 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.2.90: + + Update daemon to use gstreamer 1.4.0. + + Update client UI to python3. + + Updated translations. +- Updated BuildRequires to match new dependencies: + + Removed: python-devel, gstreamer-0_10-plugins-bad, + gstreamer-0_10-plugins-good, gstreamer-0_10-utils, + pkgconfig(gee-1.0), pkgconfig(gst-rtsp-server-0.10), + pkgconfig(gstreamer-0.10), pkgconfig(gstreamer-rtsp-0.10). + + Added: python3-devel, pkgconfig(gee-0.8), + pkgconfig(gstreamer-1.0), pkgconfig(gstreamer-rtsp-1.0), + pkgconfig(gstreamer-mpegts-1.0), + pkgconfig(gstreamer-rtsp-server-1.0). +- Drop obsolete Requires: gstreamer-0_10-plugins-{good,bad}. +- Drop obsolete Requires from python-gnome-dvb-daemon: + python-gobject2, python-gstreamer-0_10. +- Remove conditions to build on old openSUSE Variants: they do not + ship GStreamer 1.4 anyway. + +------------------------------------------------------------------- Old: ---- gnome-dvb-daemon-0.2.10.tar.xz New: ---- gnome-dvb-daemon-0.2.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-dvb-daemon.spec ++++++ --- /var/tmp/diff_new_pack.u0Ktcx/_old 2014-10-05 20:33:59.000000000 +0200 +++ /var/tmp/diff_new_pack.u0Ktcx/_new 2014-10-05 20:33:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-dvb-daemon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gnome-dvb-daemon -Version: 0.2.10 +Version: 0.2.90 Release: 0 Summary: Daemon to use DVB devices License: GPL-3.0+ @@ -25,25 +25,21 @@ Url: http://live.gnome.org/DVBDaemon Source0: http://download.gnome.org/sources/gnome-dvb-daemon/0.2/%{name}-%{version}.t… BuildRequires: fdupes -BuildRequires: gstreamer-0_10-plugins-bad -BuildRequires: gstreamer-0_10-plugins-good -BuildRequires: gstreamer-0_10-utils -BuildRequires: intltool -BuildRequires: python-devel +BuildRequires: intltool >= 0.40.0 +BuildRequires: python3-devel >= 3.2 BuildRequires: totem-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: vala >= 0.15.0 -BuildRequires: pkgconfig(gee-1.0) +BuildRequires: vala >= 0.25.1 +BuildRequires: pkgconfig(gee-0.8) >= 0.8.0 BuildRequires: pkgconfig(gobject-2.0) >= 2.32.0 -BuildRequires: pkgconfig(gst-rtsp-server-0.10) -BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gstreamer-rtsp-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.4.0 +BuildRequires: pkgconfig(gstreamer-mpegts-1.0) >= 1.4.0 +BuildRequires: pkgconfig(gstreamer-rtsp-1.0) >= 1.4.0 +BuildRequires: pkgconfig(gstreamer-rtsp-server-1.0) >= 1.4.0 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(pygobject-3.0) >= 3.2.1 BuildRequires: pkgconfig(sqlite3) -Requires: gstreamer-0_10-plugins-bad -Requires: gstreamer-0_10-plugins-good BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,9 +52,6 @@ Group: Productivity/Multimedia/Other Url: http://live.gnome.org/DVBDaemon Requires: %{name} = %{version} -Requires: dbus-1-python -Requires: python-gobject2 -Requires: python-gstreamer-0_10 # Note: we put the Recommends for the lang package here and not in the main # package because that's where the translatable strings live. We could change # the name of the lang package, but the .mo files are named gnome-dvb-daemon, @@ -93,6 +86,7 @@ This package contains a Totem plugin to use your DVB devices. %lang_package + %prep %setup -q translation-update-upstream @@ -100,10 +94,10 @@ %build %configure \ --enable-totem-plugin -%__make %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %find_lang %{name} %{?no_lang_C} %suse_update_desktop_file gnome-dvb-control %suse_update_desktop_file gnome-dvb-setup @@ -111,20 +105,13 @@ %fdupes %{buildroot}%{python_sitelib} %fdupes %{buildroot}%{_libdir}/totem/ -%clean -rm -rf %{buildroot} - %post -n python-gnome-dvb-daemon -%if 0%{?suse_version} > 1130 %desktop_database_post %icon_theme_cache_post -%endif %postun -n python-gnome-dvb-daemon -%if 0%{?suse_version} > 1130 %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-, root, root) @@ -141,12 +128,13 @@ %{_datadir}/applications/gnome-dvb-setup.desktop %{_datadir}/icons/hicolor/*/apps/gnome-dvb-daemon.* %{_datadir}/icons/hicolor/*/apps/gnome-dvb-setup.* -%{python_sitelib}/gnomedvb/ +%{python3_sitelib}/gnomedvb/ %files -n totem-plugin-gnome-dvb-daemon %defattr(-, root, root) %{_libdir}/totem/plugins/dvb-daemon/ %files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ gnome-dvb-daemon-0.2.10.tar.xz -> gnome-dvb-daemon-0.2.90.tar.xz ++++++ ++++ 108600 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit recordmydesktop for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package recordmydesktop for openSUSE:Factory checked in at 2014-10-05 20:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/recordmydesktop (Old) and /work/SRC/openSUSE:Factory/.recordmydesktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "recordmydesktop" Changes: -------- --- /work/SRC/openSUSE:Factory/recordmydesktop/recordmydesktop.changes 2012-04-12 09:51:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.recordmydesktop.new/recordmydesktop.changes 2014-10-05 20:33:57.000000000 +0200 @@ -1,0 +2,19 @@ +Sat Oct 4 22:05:35 UTC 2014 - dimstar(a)opensuse.org + +- Add recordmydesktop-sane-theora-defaults.patch: use some saner + Theora default values. Older Theora encoders simply ignored + insane settings. The original defaults were 'Limit to 45kbit/s + at highest quality (63)'. The new default is to set the highest + quality, without bitrate limit (boo#780609). + +------------------------------------------------------------------- +Wed Oct 1 20:04:17 UTC 2014 - crrodriguez(a)opensuse.org + +- Clean up BuildRequires in line with what configure checks for and + convert to pkgconfig where possible: + + Drop xorg-x11-devel (metapackage), xorg-x11-libICE-devel, + xorg-x11-libSM-devel and xorg-x11-libxext-devel. + + Add pkgconfig() BuildRequires: ice, sm, x11, xdamage, xext and + xfixes. + +------------------------------------------------------------------- New: ---- recordmydesktop-sane-theora-defaults.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ recordmydesktop.spec ++++++ --- /var/tmp/diff_new_pack.BhVK6c/_old 2014-10-05 20:33:58.000000000 +0200 +++ /var/tmp/diff_new_pack.BhVK6c/_new 2014-10-05 20:33:58.000000000 +0200 @@ -1,36 +1,47 @@ # -# spec file for package recordmydesktop (0.3.8.1) +# spec file for package recordmydesktop # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2014 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/ # + Name: recordmydesktop Version: 0.3.8.1 -Release: 1 -License: GPL-2.0 +Release: 0 Summary: Desktop Recorder -Url: http://recordmydesktop.sourceforge.net +License: GPL-2.0 Group: Productivity/Multimedia/Video/Editors and Convertors +Url: http://recordmydesktop.sourceforge.net Source: %{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE add x11 includes (>= 11.3 only) Patch0: recordmydesktop-x11-includes.patch # PATCH-FIX-OPENSUSE add gcc includes Patch1: recordmydesktop-gcc-includes.patch +# PATCH-FIX-UPSTREAM recordmydesktop-sane-theora-defaults.patch rh#525155 dimstar(a)opensuse.org -- Use sane default values for Theora encoder +Patch2: recordmydesktop-sane-theora-defaults.patch BuildRequires: alsa-devel BuildRequires: jack-devel BuildRequires: libogg-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel -BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-libICE-devel -BuildRequires: xorg-x11-libSM-devel -BuildRequires: xorg-x11-libXext-devel BuildRequires: zlib-devel - +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xdamage) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xfixes) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,6 +56,7 @@ %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 %build %configure --enable-jack=yes ++++++ recordmydesktop-sane-theora-defaults.patch ++++++ --- recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 +++ recordmydesktop-0.3.8.1.old/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 @@ -224,7 +224,7 @@ args->channels = 1; args->frequency = 22050; args->buffsize = 4096; - args->v_bitrate = 45000; + args->v_bitrate = 0; args->v_quality = 63; args->s_quality = 10; --- recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 +++ recordmydesktop-0.3.8.1.old/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 @@ -104,10 +104,10 @@ "Encoding Options\n" "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" "\t--v_quality n\t\tA number from 0 to 63 for" - " desired encoded video quality(default 63).\n" + " desired encoded video quality(default 63).\n\t (set quality to zero for bitrate controlled usage)\n" - "\t--v_bitrate n\t\tA number from 45000 to 2000000" - " for desired encoded video bitrate(default 45000).\n" + "\t--v_bitrate n\t\tA number from 0 to 200000000" + " for desired encoded video bitrate(default 0 = not rate controlled).\n" "\t--s_quality n\t\tDesired audio quality(-1 to 10).\n\n" @@ -327,17 +327,17 @@ strcmp(argv[i], "-v_bitrate") == 0) { if(i+1<argc){ int num=atoi(argv[i+1]); - if((num>=45000)&&(num<=2000000)) + if((num>=0)&&(num<=200000000)) arg_return->v_bitrate=num; else{ fprintf(stderr,"Argument Usage:" - " --v_bitrate n(number 45000-2000000)\n"); + " --v_bitrate n(number 0-200000000)\n"); return FALSE; } } else{ fprintf(stderr,"Argument Usage:" - " --v_bitrate n(number 45000-2000000)\n"); + " --v_bitrate n(number 0-200000000)\n"); return FALSE; } i++; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eric5 for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package eric5 for openSUSE:Factory checked in at 2014-10-05 20:32:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eric5 (Old) and /work/SRC/openSUSE:Factory/.eric5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "eric5" Changes: -------- --- /work/SRC/openSUSE:Factory/eric5/eric5.changes 2014-08-11 10:08:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.eric5.new/eric5.changes 2014-10-05 20:33:53.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Oct 4 21:07:38 UTC 2014 - termim(a)gmail.com + +- Update to 5.4.7 + - bug fixes + +------------------------------------------------------------------- Old: ---- eric5-5.4.6.tar.gz eric5-i18n-cs-5.4.6.tar.gz eric5-i18n-de-5.4.6.tar.gz eric5-i18n-en-5.4.6.tar.gz eric5-i18n-es-5.4.6.tar.gz eric5-i18n-fr-5.4.6.tar.gz eric5-i18n-it-5.4.6.tar.gz eric5-i18n-ru-5.4.6.tar.gz eric5-i18n-tr-5.4.6.tar.gz eric5-i18n-zh_CN.GB2312-5.4.6.tar.gz New: ---- eric5-5.4.7.tar.gz eric5-i18n-cs-5.4.7.tar.gz eric5-i18n-de-5.4.7.tar.gz eric5-i18n-en-5.4.7.tar.gz eric5-i18n-es-5.4.7.tar.gz eric5-i18n-fr-5.4.7.tar.gz eric5-i18n-it-5.4.7.tar.gz eric5-i18n-ru-5.4.7.tar.gz eric5-i18n-tr-5.4.7.tar.gz eric5-i18n-zh_CN.GB2312-5.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eric5.spec ++++++ --- /var/tmp/diff_new_pack.yuUTr9/_old 2014-10-05 20:33:56.000000000 +0200 +++ /var/tmp/diff_new_pack.yuUTr9/_new 2014-10-05 20:33:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: eric5 -Version: 5.4.6 +Version: 5.4.7 Release: 0 Summary: Python IDE based on Qt4 License: GPL-3.0+ ++++++ eric5-5.4.6.tar.gz -> eric5-5.4.7.tar.gz ++++++ /work/SRC/openSUSE:Factory/eric5/eric5-5.4.6.tar.gz /work/SRC/openSUSE:Factory/.eric5.new/eric5-5.4.7.tar.gz differ: char 5, line 1 ++++++ eric5-i18n-cs-5.4.6.tar.gz -> eric5-i18n-cs-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-de-5.4.6.tar.gz -> eric5-i18n-de-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-en-5.4.6.tar.gz -> eric5-i18n-en-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-es-5.4.6.tar.gz -> eric5-i18n-es-5.4.7.tar.gz ++++++ Files old/eric5-5.4.6/eric/i18n/eric5_es.qm and new/eric5-5.4.7/eric/i18n/eric5_es.qm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eric5-5.4.6/eric/i18n/eric5_es.ts new/eric5-5.4.7/eric/i18n/eric5_es.ts --- old/eric5-5.4.6/eric/i18n/eric5_es.ts 2014-07-30 19:51:05.000000000 +0200 +++ new/eric5-5.4.7/eric/i18n/eric5_es.ts 2014-09-27 13:08:31.000000000 +0200 @@ -530,7 +530,7 @@ <message> <location filename="../Project/AddDirectoryDialog.py" line="72"/> <source>Interface Files</source> - <translation>Archivos de Intefaces</translation> + <translation>Archivos de Interfaces</translation> </message> <message> <location filename="../Project/AddDirectoryDialog.py" line="74"/> @@ -3334,12 +3334,12 @@ <translation>Error: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="885"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="891"/> <source>Fix: {0}</source> <translation>Arreglar: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="546"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> <source>No issues found.</source> <translation>No se han encontrado problemas.</translation> </message> @@ -5649,7 +5649,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="1014"/> <source>The program has terminated with an exit status of {0}.</source> - <translation>The programa ha terminado con un estado de salida {0}.</translation> + <translation>El programa ha terminado con un estado de salida {0}.</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="1019"/> @@ -5659,7 +5659,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="1084"/> <source>The file {0} contains the syntax error {1} at line {2}, character {3}.</source> - <translation>El archivo {0} contiene el error de sintaxis {1} en la línea{2}, carácter {4}.</translation> + <translation>El archivo {0} contiene el error de sintaxis {1} en la línea{2}, carácter {3}.</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="1143"/> @@ -5695,7 +5695,7 @@ <location filename="../Debugger/DebugUI.py" line="1040"/> <source>The program has terminated with an exit status of {0}. </source> - <translation>The programa ha terminado con un estado de salida {0}. + <translation>El programa ha terminado con un estado de salida {0}. </translation> </message> <message> @@ -9395,7 +9395,7 @@ <message> <location filename="../QScintilla/Editor.py" line="940"/> <source>End-of-Line Type</source> - <translation>Typo de fin-de-línea</translation> + <translation>Tipo de fin-de-línea</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="944"/> @@ -13030,67 +13030,67 @@ <context> <name>EricAccessHandler</name> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="87"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Speed Dial</source> <translation>Marcación rápida</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="88"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>URL</source> <translation>URL</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="89"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Title</source> <translation>Título</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="90"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Apply</source> <translation>Aplicar</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="91"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>New Page</source> <translation>Página Nueva</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="92"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Edit</source> <translation>Editar</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="93"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="94"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Reload</source> <translation>Recargar</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="95"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Load title from page</source> <translation>Cargar título desde la página</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="97"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Speed Dial Settings</source> <translation>Ajustes de marcación rápida</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="99"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Add New Page</source> <translation>Añadir Página Nueva</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="100"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Maximum pages in a row:</source> <translation>Máximo número de páginas por fila:</translation> </message> <message> - <location filename="../Helpviewer/Network/EricAccessHandler.py" line="102"/> + <location filename="../Helpviewer/Network/EricAccessHandler.py" line="77"/> <source>Change size of pages:</source> <translation>Cambiar tamaño de páginas:</translation> </message> @@ -57729,7 +57729,7 @@ <message> <location filename="../ViewManager/ViewManager.py" line="749"/> <source>Open &Bookmarked Files</source> - <translation>Abrir Archvos &Marcados</translation> + <translation>Abrir Archivos &Marcados</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="794"/> ++++++ eric5-i18n-fr-5.4.6.tar.gz -> eric5-i18n-fr-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-it-5.4.6.tar.gz -> eric5-i18n-it-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-ru-5.4.6.tar.gz -> eric5-i18n-ru-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-tr-5.4.6.tar.gz -> eric5-i18n-tr-5.4.7.tar.gz ++++++ ++++++ eric5-i18n-zh_CN.GB2312-5.4.6.tar.gz -> eric5-i18n-zh_CN.GB2312-5.4.7.tar.gz ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2014-10-05 20:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mercurial" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2014-09-15 18:25:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2014-10-05 20:33:51.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Oct 4 16:09:22 UTC 2014 - develop7(a)develop7.info + +- update to v3.1.2 + * commit: catch changed exec bit on files from p1 (issue4382) + * diff: document the nobinary option + * dispatch: check shell alias again after loading extensions (issue4355) + * dispatch: make "_checkshellalias" reusable regardless of adding aliases + * help: fix typo in log examples + * help: mention mode in hg log --removed help (issue4381) + * hgweb: fail if an invalid command was supplied in url path (issue4071) + * hgweb: refresh hgweb.repo on phase change (issue4061) + * histedit: abort gracefully on --continue/--abort with no state + * keepalive: fix how md5 is used + * mq: examine "pushable" of already applied patch correctly + * mq: pop correct patches when changing pushable-ness of already applied ones + * mq: report correct numbers for changing "number of guarded, applied patches" + * mq: use "mq.applied[i].name" instead of "mq.appliedname(i)" for safety + * revset: add an optimised baseset.contains (issue4371) + * templater: fix precedence of --style and --template options + +------------------------------------------------------------------- @@ -5 +25,0 @@ - Old: ---- mercurial-3.1.1.tar.gz New: ---- mercurial-3.1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.TaFXwH/_old 2014-10-05 20:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.TaFXwH/_new 2014-10-05 20:33:52.000000000 +0200 @@ -17,7 +17,7 @@ Name: mercurial -Version: 3.1.1 +Version: 3.1.2 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ ++++++ mercurial-3.1.1.tar.gz -> mercurial-3.1.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/.hgsigs new/mercurial-3.1.2/.hgsigs --- old/mercurial-3.1.1/.hgsigs 2014-09-02 03:41:02.000000000 +0200 +++ new/mercurial-3.1.2/.hgsigs 2014-10-01 21:59:34.000000000 +0200 @@ -92,3 +92,4 @@ 2d8cd3d0e83c7336c0cb45a9f88638363f993848 0 iQIVAwUAU7OLTCBXgaxoKi1yAQJ+pw/+M3yOesgf55eo3PUTZw02QZxDyEg9ElrRc6664/QFXaJuYdz8H3LGG/NYs8uEdYihiGpS1Qc70jwd1IoUlrCELsaSSZpzWQ+VpQFX29aooBoetfL+8WgqV8zJHCtY0E1EBg/Z3ZL3n2OS++fVeWlKtp5mwEq8uLTUmhIS7GseP3bIG/CwF2Zz4bzhmPGK8V2s74aUvELZLCfkBE1ULNs7Nou1iPDGnhYOD53eq1KGIPlIg1rnLbyYw5bhS20wy5IxkWf2eCaXfmQBTG61kO5m3nkzfVgtxmZHLqYggISTJXUovfGsWZcp5a71clCSMVal+Mfviw8L/UPHG0Ie1c36djJiFLxM0f2HlwVMjegQOZSAeMGg1YL1xnIys2zMMsKgEeR+JISTal1pJyLcT9x5mr1HCnUczSGXE5zsixN+PORRnZOqcEZTa2mHJ1h5jJeEm36B/eR57BMJG+i0QgZqTpLzYTFrp2eWokGMjFB1MvgAkL2YoRsw9h6TeIwqzK8mFwLi28bf1c90gX9uMbwY/NOqGzfQKBR9bvCjs2k/gmJ+qd5AbC3DvOxHnN6hRZUqNq76Bo4F+CUVcjQ/NXnfnOIVNbILpl5Un5kl+8wLFM+mNxDxduajaUwLhSHZofKmmCSLbuuaGmQTC7a/4wzhQM9e5dX0X/8sOo8CptW7uw4= 6c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 0 iQIVAwUAU8n97yBXgaxoKi1yAQKqcA/+MT0VFoP6N8fHnlxj85maoM2HfZbAzX7oEW1B8F1WH6rHESHDexDWIYWJ2XnEeTD4GCXN0/1p+O/I0IMPNzqoSz8BU0SR4+ejhRkGrKG7mcFiF5G8enxaiISn9nmax6DyRfqtOQBzuXYGObXg9PGvMS6zbR0SorJK61xX7fSsUNN6BAvHJfpwcVkOrrFAIpEhs/Gh9wg0oUKCffO/Abs6oS+P6nGLylpIyXqC7rKZ4uPVc6Ljh9DOcpV4NCU6kQbNE7Ty79E0/JWWLsHOEY4F4WBzI7rVh7dOkRMmfNGaqvKkuNkJOEqTR1o1o73Hhbxn4NU7IPbVP/zFKC+/4QVtcPk2IPlpK1MqA1H2hBNYZhJlNhvAa7LwkIxM0916/zQ8dbFAzp6Ay/t/L0tSEcIrudTz2KTrY0WKw+pkzB/nTwaS3XZre6H2B+gszskmf1Y41clkIy/nH9K7zBuzANWyK3+bm40vmMoBbbnsweUAKkyCwqm4KTyQoYQWzu/ZiZcI+Uuk/ajJ9s7EhJbIlSnYG9ttWL/IZ1h+qPU9mqVO9fcaqkeL/NIRh+IsnzaWo0zmHU1bK+/E29PPGGf3v6+IEJmXg7lvNl5pHiMd2tb7RNO/UaNSv1Y2E9naD4FQwSWo38GRBcnRGuKCLdZNHGUR+6dYo6BJCGG8wtZvNXb3TOo= 3178e49892020336491cdc6945885c4de26ffa8b 0 iQIVAwUAU9whUCBXgaxoKi1yAQJDKxAAoGzdHXV/BvZ598VExEQ8IqkmBVIP1QZDVBr/orMc1eFM4tbGKxumMGbqgJsg+NetI0irkh/YWeJQ13lT4Og72iJ+4UC9eF9pcpUKr/0eBYdU2N/p2MIbVNWh3aF5QkbuQpSri0VbHOWkxqwoqrrwXEjgHaKYP4PKh+Dzukax4yzBUIyzAG38pt4a8hbjnozCl2uAikxk4Ojg+ZufhPoZWgFEuYzSfK5SrwVKOwuxKYFGbbVGTQMIXLvBhOipAmHp4JMEYHfG85kwuyx/DCDbGmXKPQYQfClwjJ4ob/IwG8asyMsPWs+09vrvpVO08HBuph3GjuiWJ1fhEef/ImWmZdQySI9Y4SjwP4dMVfzLCnY+PYPDM9Sq/5Iee13gI2lVM2NtAfQZPXh9l8u6SbCir1UhMNMx0qVMkqMAATmiZ+ETHCO75q4Wdcmnv5fk2PbvaGBVtrHGeiyuz5mK/j4cMbd0R9R0hR1PyC4dOhNqOnbqELNIe0rKNByG1RkpiQYsqZTU6insmnZrv4fVsxfA4JOObPfKNT4oa24MHS73ldLFCfQAuIxVE7RDJJ3bHeh/yO6Smo28FuVRldBl5e+wj2MykS8iVcuSa1smw6gJ14iLBH369nlR3fAAQxI0omVYPDHLr7SsH3vJasTaCD7V3SL4lW6vo/yaAh4ImlTAE+Y= +5dc91146f35369949ea56b40172308158b59063a 0 iQIVAwUAVAUgJyBXgaxoKi1yAQJkEg/9EXFZvPpuvU7AjII1dlIT8F534AXrO30+H6hweg+h2mUCSb/mZnbo3Jr1tATgBWbIKkYmmsiIKNlJMFNPZTWhImGcVA93t6v85tSFiNJRI2QP9ypl5wTt2KhiS/s7GbUYCtPDm6xyNYoSvDo6vXJ5mfGlgFZY5gYLwEHq/lIRWLWD4EWYWbk5yN+B7rHu6A1n3yro73UR8DudEhYYqC23KbWEqFOiNd1IGj3UJlxIHUE4AcDukxbfiMWrKvv1kuT/vXak3X7cLXlO56aUbMopvaUflA3PSr3XAqynDd69cxACo/T36fuwzCQN4ICpdzGTos0rQALSr7CKF5YP9LMhVhCsOn0pCsAkSiw4HxxbcHQLl+t+0rchNysc4dWGwDt6GAfYcdm3fPtGFtA3qsN8lOpCquFH3TAZ3TrIjLFoTOk6s1xX1x5rjP/DAHc/y3KZU0Ffx3TwdQEEEIFaAXaxQG848rdfzV42+dnFnXh1G/MIrKAmv3ZSUkQ3XJfGc7iu82FsYE1NLHriUQDmMRBzCoQ1Rn1Kji119Cxf5rsMcQ6ZISR1f0jDCUS/qxlHvSqETLp8H63NSUfvuKSC7uC6pGvq9XQm1JRNO5UuJfK6tHzy0jv9bt2IRo2xbmvpDu9L5oHHd3JePsAmFmbrFf/7Qem3JyzEvRcpdcdHtefxcxc= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/.hgtags new/mercurial-3.1.2/.hgtags --- old/mercurial-3.1.1/.hgtags 2014-09-02 03:41:02.000000000 +0200 +++ new/mercurial-3.1.2/.hgtags 2014-10-01 21:59:34.000000000 +0200 @@ -105,3 +105,4 @@ 2d8cd3d0e83c7336c0cb45a9f88638363f993848 3.0.2 6c36dc6cd61a0e1b563f1d51e55bdf4dacf12162 3.1-rc 3178e49892020336491cdc6945885c4de26ffa8b 3.1 +5dc91146f35369949ea56b40172308158b59063a 3.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/PKG-INFO new/mercurial-3.1.2/PKG-INFO --- old/mercurial-3.1.1/PKG-INFO 2014-09-02 03:41:10.000000000 +0200 +++ new/mercurial-3.1.2/PKG-INFO 2014-10-01 21:59:43.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial -Version: 3.1.1 +Version: 3.1.2 Summary: Fast scalable distributed SCM (revision control, version control) system Home-page: http://mercurial.selenic.com/ Author: Matt Mackall and many others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/doc/hg.1 new/mercurial-3.1.2/doc/hg.1 --- old/mercurial-3.1.1/doc/hg.1 2014-09-02 03:41:04.000000000 +0200 +++ new/mercurial-3.1.2/doc/hg.1 2014-10-01 21:59:36.000000000 +0200 @@ -2588,9 +2588,8 @@ .IP Note . for performance reasons, log FILE may omit duplicate changes -made on branches and will not show deletions. To see all -changes including duplicates and deletions, use the \-\-removed -switch. +made on branches and will not show removals or mode changes. To +see all such changes, use the \-\-removed switch. .RE .sp Some examples: @@ -2660,7 +2659,7 @@ .fi .IP \(bu 2 . -check if a given changeset is included is a tagged release: +check if a given changeset is included in a tagged release: .sp .nf .ft C diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/doc/hg.1.html new/mercurial-3.1.2/doc/hg.1.html --- old/mercurial-3.1.1/doc/hg.1.html 2014-09-02 03:41:07.000000000 +0200 +++ new/mercurial-3.1.2/doc/hg.1.html 2014-10-01 21:59:39.000000000 +0200 @@ -2125,9 +2125,8 @@ <div class="note"> Note for performance reasons, log FILE may omit duplicate changes -made on branches and will not show deletions. To see all -changes including duplicates and deletions, use the --removed -switch. +made on branches and will not show removals or mode changes. To +see all such changes, use the --removed switch. </div> <div class="verbose container"> Some examples: @@ -2167,7 +2166,7 @@ hg log -T list </pre> </li> -<li>check if a given changeset is included is a tagged release: +<li>check if a given changeset is included in a tagged release: <pre class="literal-block"> hg log -r "a21ccf and ancestor(1.9)" </pre> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/doc/hgrc.5 new/mercurial-3.1.2/doc/hgrc.5 --- old/mercurial-3.1.1/doc/hgrc.5 2014-09-02 03:41:05.000000000 +0200 +++ new/mercurial-3.1.2/doc/hgrc.5 2014-10-01 21:59:37.000000000 +0200 @@ -618,6 +618,10 @@ .sp Use git extended diff format. .TP +.B \fBnobinary\fP +.sp +Omit git binary patches. +.TP .B \fBnodates\fP .sp Don\(aqt include dates in diff headers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/doc/hgrc.5.html new/mercurial-3.1.2/doc/hgrc.5.html --- old/mercurial-3.1.1/doc/hgrc.5.html 2014-09-02 03:41:07.000000000 +0200 +++ new/mercurial-3.1.2/doc/hgrc.5.html 2014-10-01 21:59:39.000000000 +0200 @@ -503,6 +503,8 @@ <dl class="docutils"> <dt><tt class="docutils literal">git</tt></dt> <dd>Use git extended diff format.</dd> +<dt><tt class="docutils literal">nobinary</tt></dt> +<dd>Omit git binary patches.</dd> <dt><tt class="docutils literal">nodates</tt></dt> <dd>Don't include dates in diff headers.</dd> <dt><tt class="docutils literal">showfunc</tt></dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/hgext/histedit.py new/mercurial-3.1.2/hgext/histedit.py --- old/mercurial-3.1.1/hgext/histedit.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/hgext/histedit.py 2014-10-01 21:58:04.000000000 +0200 @@ -147,6 +147,7 @@ pickle.dump # import now except ImportError: import pickle +import errno import os import sys @@ -741,7 +742,12 @@ def readstate(repo): """Returns a tuple of (parentnode, rules, keep, topmost, replacements). """ - fp = open(os.path.join(repo.path, 'histedit-state')) + try: + fp = open(os.path.join(repo.path, 'histedit-state')) + except IOError, err: + if err.errno != errno.ENOENT: + raise + raise util.Abort(_('no histedit in progress')) return pickle.load(fp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/hgext/mq.py new/mercurial-3.1.2/hgext/mq.py --- old/mercurial-3.1.1/hgext/mq.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/hgext/mq.py 2014-10-01 21:58:04.000000000 +0200 @@ -2969,18 +2969,17 @@ q = repo.mq guards = q.active() + pushable = lambda i: q.pushable(q.applied[i].name)[0] if args or opts.get('none'): old_unapplied = q.unapplied(repo) - old_guarded = [i for i in xrange(len(q.applied)) if - not q.pushable(i)[0]] + old_guarded = [i for i in xrange(len(q.applied)) if not pushable(i)] q.setactive(args) q.savedirty() if not args: ui.status(_('guards deactivated\n')) if not opts.get('pop') and not opts.get('reapply'): unapplied = q.unapplied(repo) - guarded = [i for i in xrange(len(q.applied)) - if not q.pushable(i)[0]] + guarded = [i for i in xrange(len(q.applied)) if not pushable(i)] if len(unapplied) != len(old_unapplied): ui.status(_('number of unguarded, unapplied patches has ' 'changed from %d to %d\n') % @@ -3016,18 +3015,17 @@ ui.write(g, '\n') else: ui.write(_('no active guards\n')) - reapply = opts.get('reapply') and q.applied and q.appliedname(-1) + reapply = opts.get('reapply') and q.applied and q.applied[-1].name popped = False if opts.get('pop') or opts.get('reapply'): for i in xrange(len(q.applied)): - pushable, reason = q.pushable(i) - if not pushable: + if not pushable(i): ui.status(_('popping guarded patches\n')) popped = True if i == 0: q.pop(repo, all=True) else: - q.pop(repo, str(i - 1)) + q.pop(repo, q.applied[i - 1].name) break if popped: try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/i18n/pt_BR.po new/mercurial-3.1.2/i18n/pt_BR.po --- old/mercurial-3.1.1/i18n/pt_BR.po 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/i18n/pt_BR.po 2014-10-01 21:58:04.000000000 +0200 @@ -4013,7 +4013,7 @@ "If you were to run ``hg histedit c561b4e977df``, you would see the following\n" "file open in your editor::" msgstr "" -"Se você fosse rodar ``hg histedit c561b4e977df``, você veria o seguinte\n" +"Se você rodasse ``hg histedit c561b4e977df``, você veria o seguinte\n" "arquivo aberto no seu editor::" msgid "" @@ -4078,7 +4078,7 @@ msgstr "" "Em seguida, no momento em que você fechar o editor, o 'histedit'\n" "começará a funcionar.\n" -"Quando você especificar a operação ``fold``(incorporar), ``histedit``\n" +"Quando você especificar a operação ``fold`` (incorporar), ``histedit``\n" "abrirá um editor ao incorporar as revisões, oferecendo a você\n" "uma chance de limpar a mensagem de consolidação::" @@ -4134,7 +4134,7 @@ "Note que ``histedit`` *não* remove qualquer revisão (até mesmo\n" "as temporárias) até completar todas as operações de edição, então\n" "provavelmente ele irá realizar diversas operações de remoção\n" -"quando for terminado. Para o exemplo acima, ele teve que executar\n" +"ao final da operação. Para o exemplo acima, ele teve que executar\n" "a remoção duas vezes. Dependendo de uma variedade de fatores, a\n" "remoção pode ser lenta, então você pode precisar ser um pouco\n" "paciente. Você pode escolher manter as revisões originais passando\n" @@ -4149,23 +4149,24 @@ "new commit message, but the default commit message will be the\n" "original message for the ``edit`` ed revision." msgstr "" -"A operação de edição (``edit``) irá conduzi-lo de volta ao prompt de comando,\n" -"permitindo que você edite arquivos livremente, ou mesmo use ``hg record``\n" -"para consolidar algumas mudanças como uma consolidação separada. Quando\n" -"você acabar, qualquer mudança restante não consolidada também será\n" -"consolidada. Quando terminado, execute ``hg histedit --continue`` para\n" -"finalizar essa etapa. Você será consultado interativamente para uma nova\n" -"mensagem de consolidação, mas o texto da mensagem original será incluído\n" -"na edição." +"A operação de edição (``edit``) irá conduzi-lo de volta ao prompt\n" +"de comando, permitindo a você editar arquivos livremente,\n" +"ou até mesmo usar ``hg record`` para colocar algumas mudanças em\n" +"uma consolidação separada.\n" +"Quando você terminar, qualquer mudança pendente restante também\n" +"será consolidada. Ao final, execute ``hg histedit --continue``\n" +"para encerrar essa etapa. Você será consultado interativamente\n" +"para uma nova mensagem de consolidação, mas o texto da mensagem\n" +"original será incluído na edição." msgid "" "The ``message`` operation will give you a chance to revise a commit\n" "message without changing the contents. It's a shortcut for doing\n" "``edit`` immediately followed by `hg histedit --continue``." msgstr "" -"A operação de mensagem ( ``message``) irá dar a você a chance de\n" -"revisar uma mensagem de consolidação sem mudar o conteúdo. É um\n" -"atalho para fazer ``edit`` e imediatamente em seguida fazer\n" +"A operação de mensagem (``message``) possibilita revisar\n" +"uma mensagem de consolidação sem mudar o conteúdo da revisão.\n" +"É um atalho para ``edit`` seguido imediatamente por\n" "``hg histedit --continue``." msgid "" @@ -4425,6 +4426,9 @@ msgid "cannot edit immutable changeset: %s" msgstr "não é possível editar uma revisão imutável: %s" +msgid "no histedit in progress" +msgstr "nenhuma edição de histórico em andamento" + #, python-format msgid "malformed line \"%s\"" msgstr "linha malformada \"%s\"" @@ -11831,6 +11835,9 @@ " Veja :hg:`help config` para mais informações sobre arquivos de " "configuração." +msgid " Returns 0 on success, 1 if NAME does not exist." +msgstr " Devolve 0 para indicar sucesso, 1 se o NOME não existir." + msgid " " msgstr " " @@ -13613,14 +13620,12 @@ msgid "" " for performance reasons, log FILE may omit duplicate changes\n" -" made on branches and will not show deletions. To see all\n" -" changes including duplicates and deletions, use the --removed\n" -" switch." +" made on branches and will not show removals or mode changes. To\n" +" see all such changes, use the --removed switch." msgstr "" " por razões de desempenho, log ARQUIVO pode omitir mudanças\n" -" duplicadas feitas em outros ramos, e não mostra remoções.\n" -" Para ver todas as mudanças incluindo duplicatas e remoções,\n" -" use a opção --removed." +" duplicadas feitas em outros ramos, e não mostra remoções nem mudanças de atributos.\n" +" Para ver todas as mudanças, use a opção --removed." msgid " - changesets with full descriptions and file lists::" msgstr " - revisões com descrições completas e lista de arquivos::" @@ -13672,7 +13677,7 @@ msgid " hg log -T list" msgstr " hg log -T list" -msgid " - check if a given changeset is included is a tagged release::" +msgid " - check if a given changeset is included in a tagged release::" msgstr "" " - verifica se uma revisão dada foi incluída em um\n" " release etiquetado::" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/__version__.py new/mercurial-3.1.2/mercurial/__version__.py --- old/mercurial-3.1.1/mercurial/__version__.py 2014-09-02 03:41:09.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/__version__.py 2014-10-01 21:59:41.000000000 +0200 @@ -1,2 +1,2 @@ # this file is autogenerated by setup.py -version = "3.1.1" +version = "3.1.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/cmdutil.py new/mercurial-3.1.2/mercurial/cmdutil.py --- old/mercurial-3.1.1/mercurial/cmdutil.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/cmdutil.py 2014-10-01 21:58:04.000000000 +0200 @@ -1087,7 +1087,7 @@ """ # ui settings - if not tmpl and not style: + if not tmpl and not style: # template are stronger than style tmpl = ui.config('ui', 'logtemplate') if tmpl: try: @@ -1098,7 +1098,7 @@ else: style = util.expandpath(ui.config('ui', 'style', '')) - if style: + if not tmpl and style: mapfile = style if not os.path.split(mapfile)[0]: mapname = (templater.templatepath('map-cmdline.' + mapfile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/commands.py new/mercurial-3.1.2/mercurial/commands.py --- old/mercurial-3.1.1/mercurial/commands.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/commands.py 2014-10-01 21:58:04.000000000 +0200 @@ -4118,9 +4118,8 @@ .. note:: for performance reasons, log FILE may omit duplicate changes - made on branches and will not show deletions. To see all - changes including duplicates and deletions, use the --removed - switch. + made on branches and will not show removals or mode changes. To + see all such changes, use the --removed switch. .. container:: verbose @@ -4154,7 +4153,7 @@ hg log -T list - - check if a given changeset is included is a tagged release:: + - check if a given changeset is included in a tagged release:: hg log -r "a21ccf and ancestor(1.9)" @@ -4175,6 +4174,7 @@ specifying custom templates. Returns 0 on success. + """ if opts.get('graph'): return cmdutil.graphlog(ui, repo, *pats, **opts) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/dispatch.py new/mercurial-3.1.2/mercurial/dispatch.py --- old/mercurial-3.1.1/mercurial/dispatch.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/dispatch.py 2014-10-01 21:58:04.000000000 +0200 @@ -627,7 +627,12 @@ return path, lui -def _checkshellalias(lui, ui, args): +def _checkshellalias(lui, ui, args, precheck=True): + """Return the function to run the shell alias, if it is required + + 'precheck' is whether this function is invoked before adding + aliases or not. + """ options = {} try: @@ -638,18 +643,24 @@ if not args: return - norepo = commands.norepo - optionalrepo = commands.optionalrepo - def restorecommands(): - commands.norepo = norepo - commands.optionalrepo = optionalrepo - - cmdtable = commands.table.copy() - addaliases(lui, cmdtable) + if precheck: + strict = True + norepo = commands.norepo + optionalrepo = commands.optionalrepo + def restorecommands(): + commands.norepo = norepo + commands.optionalrepo = optionalrepo + cmdtable = commands.table.copy() + addaliases(lui, cmdtable) + else: + strict = False + def restorecommands(): + pass + cmdtable = commands.table cmd = args[0] try: - aliases, entry = cmdutil.findcmd(cmd, cmdtable) + aliases, entry = cmdutil.findcmd(cmd, cmdtable, strict) except (error.AmbiguousCommand, error.UnknownCommand): restorecommands() return @@ -706,6 +717,14 @@ addaliases(lui, commands.table) + if not lui.configbool("ui", "strict"): + # All aliases and commands are completely defined, now. + # Check abbreviation/ambiguity of shell alias again, because shell + # alias may cause failure of "_parse" (see issue4355) + shellaliasfn = _checkshellalias(lui, ui, args, precheck=False) + if shellaliasfn: + return shellaliasfn() + # check for fallback encoding fallback = lui.config('ui', 'fallbackencoding') if fallback: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/help/config.txt new/mercurial-3.1.2/mercurial/help/config.txt --- old/mercurial-3.1.1/mercurial/help/config.txt 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/help/config.txt 2014-10-01 21:58:04.000000000 +0200 @@ -467,6 +467,9 @@ ``git`` Use git extended diff format. +``nobinary`` + Omit git binary patches. + ``nodates`` Don't include dates in diff headers. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/hgweb/common.py new/mercurial-3.1.2/mercurial/hgweb/common.py --- old/mercurial-3.1.1/mercurial/hgweb/common.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/hgweb/common.py 2014-10-01 21:58:04.000000000 +0200 @@ -112,9 +112,9 @@ def statusmessage(code, message=None): return '%d %s' % (code, message or _statusmessage(code)) -def get_stat(spath): - """stat changelog if it exists, spath otherwise""" - cl_path = os.path.join(spath, "00changelog.i") +def get_stat(spath, fn="00changelog.i"): + """stat fn (00changelog.i by default) if it exists, spath otherwise""" + cl_path = os.path.join(spath, fn) if os.path.exists(cl_path): return os.stat(cl_path) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/hgweb/hgweb_mod.py new/mercurial-3.1.2/mercurial/hgweb/hgweb_mod.py --- old/mercurial-3.1.1/mercurial/hgweb/hgweb_mod.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/hgweb/hgweb_mod.py 2014-10-01 21:58:04.000000000 +0200 @@ -71,8 +71,8 @@ r.baseui.setconfig('ui', 'nontty', 'true', 'hgweb') self.repo = r hook.redirect(True) + self.repostate = ((-1, -1), (-1, -1)) self.mtime = -1 - self.size = -1 self.reponame = name self.archives = 'zip', 'gz', 'bz2' self.stripecount = 1 @@ -107,9 +107,12 @@ def refresh(self, request=None): st = get_stat(self.repo.spath) - # compare changelog size in addition to mtime to catch - # rollbacks made less than a second ago - if st.st_mtime != self.mtime or st.st_size != self.size: + pst = get_stat(self.repo.spath, 'phaseroots') + # changelog mtime and size, phaseroots mtime and size + repostate = ((st.st_mtime, st.st_size), (pst.st_mtime, pst.st_size)) + # we need to compare file size in addition to mtime to catch + # changes made less than a second ago + if repostate != self.repostate: r = hg.repository(self.repo.baseui, self.repo.root) self.repo = self._getview(r) self.maxchanges = int(self.config("web", "maxchanges", 10)) @@ -121,8 +124,9 @@ encoding.encoding = self.config("web", "encoding", encoding.encoding) # update these last to avoid threads seeing empty settings + self.repostate = repostate + # mtime is needed for ETag self.mtime = st.st_mtime - self.size = st.st_size if request: self.repo.ui.environ = request.env @@ -200,8 +204,6 @@ # avoid accepting e.g. style parameter as command if util.safehasattr(webcommands, cmd): req.form['cmd'] = [cmd] - else: - cmd = '' if cmd == 'static': req.form['file'] = ['/'.join(args)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/keepalive.py new/mercurial-3.1.2/mercurial/keepalive.py --- old/mercurial-3.1.1/mercurial/keepalive.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/keepalive.py 2014-10-01 21:58:04.000000000 +0200 @@ -635,7 +635,7 @@ fo = urllib2.urlopen(url) foo = fo.read() fo.close() - m = md5.new(foo) + m = md5(foo) print format % ('normal urllib', m.hexdigest()) # now install the keepalive handler and try again @@ -645,7 +645,7 @@ fo = urllib2.urlopen(url) foo = fo.read() fo.close() - m = md5.new(foo) + m = md5(foo) print format % ('keepalive read', m.hexdigest()) fo = urllib2.urlopen(url) @@ -656,7 +656,7 @@ foo = foo + f else: break fo.close() - m = md5.new(foo) + m = md5(foo) print format % ('keepalive readline', m.hexdigest()) def comp(N, url): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/localrepo.py new/mercurial-3.1.2/mercurial/localrepo.py --- old/mercurial-3.1.1/mercurial/localrepo.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/localrepo.py 2014-10-01 21:58:04.000000000 +0200 @@ -1127,7 +1127,7 @@ text = fctx.data() flog = self.file(fname) fparent1 = manifest1.get(fname, nullid) - fparent2 = fparent2o = manifest2.get(fname, nullid) + fparent2 = manifest2.get(fname, nullid) meta = {} copy = fctx.renamed() @@ -1193,9 +1193,8 @@ if fparent2 != nullid or flog.cmp(fparent1, text) or meta: changelist.append(fname) return flog.add(text, meta, tr, linkrev, fparent1, fparent2) - # are just the flags changed during merge? - if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): + elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): changelist.append(fname) return fparent1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/mercurial/revset.py new/mercurial-3.1.2/mercurial/revset.py --- old/mercurial-3.1.1/mercurial/revset.py 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/mercurial/revset.py 2014-10-01 21:58:04.000000000 +0200 @@ -2228,6 +2228,10 @@ self._set = set(self) return self._set + @util.propertycache + def __contains__(self): + return self.set().__contains__ + def __sub__(self, other): """Returns a new object with the substraction of the two collections. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-alias.t new/mercurial-3.1.2/tests/test-alias.t --- old/mercurial-3.1.1/tests/test-alias.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-alias.t 2014-10-01 21:58:04.000000000 +0200 @@ -353,7 +353,7 @@ > [extensions] > hgext.rebase = > [alias] - > rebate = !echo this is rebate + > rebate = !echo this is \$HG_ARGS > EOF $ hg reba hg: command 'reba' is ambiguous: @@ -361,6 +361,8 @@ [255] $ hg rebat this is rebate + $ hg rebat --foo-bar + this is rebate --foo-bar invalid arguments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-changelog-exec.t new/mercurial-3.1.2/tests/test-changelog-exec.t --- old/mercurial-3.1.1/tests/test-changelog-exec.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-changelog-exec.t 2014-10-01 21:58:04.000000000 +0200 @@ -32,17 +32,19 @@ $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) + $ chmod +x foo $ hg ci -m 'merge' -this should not mention bar: +this should not mention bar but should mention foo: $ hg tip -v - changeset: 3:ef2fc9b4a51b + changeset: 3:c53d17ff3380 tag: tip parent: 2:ed1b79f46b9a parent: 1:d394a8db219b user: test date: Thu Jan 01 00:00:00 1970 +0000 + files: foo description: merge diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-command-template.t new/mercurial-3.1.2/tests/test-command-template.t --- old/mercurial-3.1.1/tests/test-command-template.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-command-template.t 2014-10-01 21:58:04.000000000 +0200 @@ -86,6 +86,11 @@ $ hg log -l1 -T./map-simple 8 +Template should precede style option + + $ hg log -l1 --style default -T '{rev}\n' + 8 + Default style is like normal output: $ hg log > log.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-hgweb.t new/mercurial-3.1.2/tests/test-hgweb.t --- old/mercurial-3.1.1/tests/test-hgweb.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-hgweb.t 2014-10-01 21:58:04.000000000 +0200 @@ -122,6 +122,24 @@ error: no such method: spam [1] + $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT '?cmd=spam' + 400 no such method: spam + [1] + +should give a 400 - bad command as a part of url path (issue4071) + + $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'spam' + 400 no such method: spam + [1] + + $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'raw-spam' + 400 no such method: spam + [1] + + $ "$TESTDIR/get-with-headers.py" --headeronly localhost:$HGPORT 'spam/tip/foo' + 400 no such method: spam + [1] + should give a 404 - file does not exist $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'file/tip/bork?style=raw' @@ -308,7 +326,7 @@ Test the access/error files are opened in append mode $ python -c "print len(file('access.log').readlines()), 'log lines written'" - 10 log lines written + 14 log lines written static file @@ -513,6 +531,50 @@ 304 Not Modified +phase changes are refreshed (issue4061) + + $ echo bar >> foo + $ hg ci -msecret --secret + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log?style=raw' + 200 Script output follows + + + # HG changelog + # Node ID 2ef0ac749a14e4f57a5a822464a0902c6f7f448f + + changeset: 2ef0ac749a14e4f57a5a822464a0902c6f7f448f + revision: 0 + user: test + date: Thu, 01 Jan 1970 00:00:00 +0000 + summary: base + branch: default + tag: tip + + + $ hg phase --draft tip + $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'log?style=raw' + 200 Script output follows + + + # HG changelog + # Node ID a084749e708a9c4c0a5b652a2a446322ce290e04 + + changeset: a084749e708a9c4c0a5b652a2a446322ce290e04 + revision: 1 + user: test + date: Thu, 01 Jan 1970 00:00:00 +0000 + summary: secret + branch: default + tag: tip + + changeset: 2ef0ac749a14e4f57a5a822464a0902c6f7f448f + revision: 0 + user: test + date: Thu, 01 Jan 1970 00:00:00 +0000 + summary: base + + + errors $ cat errors.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-histedit-arguments.t new/mercurial-3.1.2/tests/test-histedit-arguments.t --- old/mercurial-3.1.1/tests/test-histedit-arguments.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-histedit-arguments.t 2014-10-01 21:58:04.000000000 +0200 @@ -41,6 +41,16 @@ one +histedit --continue/--abort with no existing state +-------------------------------------------------- + + $ hg histedit --continue + abort: no histedit in progress + [255] + $ hg histedit --abort + abort: no histedit in progress + [255] + Run a dummy edit to make sure we get tip^^ correctly via revsingle. -------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-mq-guards.t new/mercurial-3.1.2/tests/test-mq-guards.t --- old/mercurial-3.1.1/tests/test-mq-guards.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-mq-guards.t 2014-10-01 21:58:04.000000000 +0200 @@ -256,14 +256,21 @@ $ hg qpush -a applying c.patch now at: c.patch - $ hg qselect -n --reapply + $ hg qselect -n --reapply -v guards deactivated popping guarded patches popping c.patch popping b.patch patch queue now empty reapplying unguarded patches + skipping a.patch - guarded by '+1' '+2' + skipping b.patch - guarded by '+2' + skipping a.patch - guarded by '+1' '+2' + skipping b.patch - guarded by '+2' applying c.patch + patching file c + adding c + c now at: c.patch guards in series file: +1 +2 -3 @@ -388,7 +395,6 @@ 3 G d.patch $ hg qselect 2 number of unguarded, unapplied patches has changed from 0 to 1 - number of guarded, applied patches has changed from 1 to 0 $ qappunappv % hg qapplied new.patch @@ -507,3 +513,78 @@ 0 G new.patch 1 A c.patch 2 A d.patch + +test that qselect shows "number of guarded, applied patches" correctly + + $ hg qimport -q -e b.patch + adding b.patch to series file + $ hg qguard -- b.patch -not-b + $ hg qpop -a -q + patch queue now empty + $ hg qunapplied -v + 0 G new.patch + 1 U c.patch + 2 U d.patch + 3 U b.patch + $ hg qselect not-new not-c + number of unguarded, unapplied patches has changed from 3 to 2 + $ hg qpush -q -a + patch d.patch is empty + now at: b.patch + + $ hg qapplied -v + 0 G new.patch + 1 G c.patch + 2 A d.patch + 3 A b.patch + $ hg qselect --none + guards deactivated + $ hg qselect not-new not-c not-d + number of guarded, applied patches has changed from 0 to 1 + +test that "qselect --reapply" reapplies patches successfully when the +already applied patch becomes unguarded and it follows the already +guarded (= not yet applied) one. + + $ hg qpop -q -a + patch queue now empty + $ hg qselect not-new not-c + number of unguarded, unapplied patches has changed from 1 to 2 + $ hg qpush -q -a + patch d.patch is empty + now at: b.patch + $ hg qapplied -v + 0 G new.patch + 1 G c.patch + 2 A d.patch + 3 A b.patch + $ hg qselect -q --reapply not-c not-b + now at: d.patch + cannot push 'b.patch' - guarded by '-not-b' + $ hg qseries -v + 0 U new.patch + 1 G c.patch + 2 A d.patch + 3 G b.patch + +test that "qselect --reapply" checks applied patches correctly when no +applied patche becomes guarded but some of unapplied ones become +unguarded. + + $ hg qpop -q -a + patch queue now empty + $ hg qselect not-new not-c not-d + number of unguarded, unapplied patches has changed from 2 to 1 + $ hg qpush -q -a + now at: b.patch + $ hg qapplied -v + 0 G new.patch + 1 G c.patch + 2 G d.patch + 3 A b.patch + $ hg qselect -q --reapply not-new not-c + $ hg qseries -v + 0 G new.patch + 1 G c.patch + 2 U d.patch + 3 A b.patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.1.1/tests/test-mq-qpush-fail.t new/mercurial-3.1.2/tests/test-mq-qpush-fail.t --- old/mercurial-3.1.1/tests/test-mq-qpush-fail.t 2014-09-02 03:40:54.000000000 +0200 +++ new/mercurial-3.1.2/tests/test-mq-qpush-fail.t 2014-10-01 21:58:04.000000000 +0200 @@ -131,8 +131,12 @@ now at: c now try it when a is unguarded, and we're at the top of the queue + + $ hg qapplied -v + 0 G a + 1 A b + 2 A c $ hg qsel block - number of guarded, applied patches has changed from 1 to 0 $ hg qpush b abort: cannot push to a previous patch: b [255] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2014-10-05 20:32:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2014-10-02 14:14:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2014-10-05 20:33:49.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Oct 4 20:08:12 UTC 2014 - andreas.stieger(a)gmx.de + +- rsyslog Version 8.4.2 [v8-stable] 2014-10-02 [bnc#899756] + This release primarily contains a correction for the previous fix + for the PRI vulnerability which was incomplete. + - bugfix: the fix for CVE-2014-3634 did not handle all cases + This is corrected now. see also: CVE-2014-3683 + - fixed a build problem on some platforms + - behaviour change: "msg" of messages with invalid PRI set to + "rawmsg" + +------------------------------------------------------------------- Old: ---- rsyslog-8.4.1.tar.gz rsyslog-doc-8.4.1.tar.gz New: ---- rsyslog-8.4.2.tar.gz rsyslog-doc-8.4.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.5jdU4T/_old 2014-10-05 20:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.5jdU4T/_new 2014-10-05 20:33:50.000000000 +0200 @@ -20,7 +20,7 @@ Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 8.4.1 +Version: 8.4.2 Release: 0 %if 0%{?suse_version} >= 1210 %bcond_without systemd ++++++ rsyslog-8.4.1.tar.gz -> rsyslog-8.4.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/ChangeLog new/rsyslog-8.4.2/ChangeLog --- old/rsyslog-8.4.1/ChangeLog 2014-09-26 11:58:12.000000000 +0200 +++ new/rsyslog-8.4.2/ChangeLog 2014-10-02 12:28:25.000000000 +0200 @@ -1,4 +1,16 @@ --------------------------------------------------------------------------- +Version 8.4.2 [v8-stable] 2014-10-02 +- bugfix: the fix for CVE-2014-3634 did not handle all cases + This is corrected now. + see also: CVE-2014-3683 +- fixed a build problem on some platforms + Thanks to Olaf for the patch +- behaviour change: "msg" of messages with invalid PRI set to "rawmsg" + When the PRI is invalid, the rest of the header cannot be valid. So + we move all of it to MSG and do not try to parse it out. Note that + this is not directly related to the security issue but rather done + because it makes most sense. +--------------------------------------------------------------------------- Version 8.4.1 [v8-stable] 2014-09-30 - imudp: add for bracketing mode, which makes parsing stats easier - permit at-sign in variable names @@ -422,6 +434,18 @@ statement. Also, it can still be build without problems, the option must just explicitely be given. --------------------------------------------------------------------------- +Version 7.6.7 [v7.6-stable] 2014-10-02 +- bugfix: the fix for CVE-2014-3634 did not handle all cases + This is corrected now. + see also: CVE-2014-3683 +- fixed a build problem on some platforms + Thanks to Olaf for the patch +- behaviour change: "msg" of messages with invalid PRI set to "rawmsg" + When the PRI is invalid, the rest of the header cannot be valid. So + we move all of it to MSG and do not try to parse it out. Note that + this is not directly related to the security issue but rather done + because it makes most sense. +--------------------------------------------------------------------------- Version 7.6.6 [v7.6-stable] 2014-09-30 - bugfix: potential abort when a message with PRI > 191 was processed if the "pri-text" property was used in active templates, this could diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/configure new/rsyslog-8.4.2/configure --- old/rsyslog-8.4.1/configure 2014-09-26 11:59:11.000000000 +0200 +++ new/rsyslog-8.4.2/configure 2014-10-02 12:29:07.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rsyslog 8.4.1. +# Generated by GNU Autoconf 2.68 for rsyslog 8.4.2. # # Report bugs to <rsyslog(a)lists.adiscon.com>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='rsyslog' PACKAGE_TARNAME='rsyslog' -PACKAGE_VERSION='8.4.1' -PACKAGE_STRING='rsyslog 8.4.1' +PACKAGE_VERSION='8.4.2' +PACKAGE_STRING='rsyslog 8.4.2' PACKAGE_BUGREPORT='rsyslog(a)lists.adiscon.com' PACKAGE_URL='' @@ -1621,7 +1621,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rsyslog 8.4.1 to adapt to many kinds of systems. +\`configure' configures rsyslog 8.4.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1691,7 +1691,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rsyslog 8.4.1:";; + short | recursive ) echo "Configuration of rsyslog 8.4.2:";; esac cat <<\_ACEOF @@ -1949,7 +1949,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rsyslog configure 8.4.1 +rsyslog configure 8.4.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2528,7 +2528,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rsyslog $as_me 8.4.1, which was +It was created by rsyslog $as_me 8.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3343,7 +3343,7 @@ # Define the identity of the package. PACKAGE='rsyslog' - VERSION='8.4.1' + VERSION='8.4.2' cat >>confdefs.h <<_ACEOF @@ -21331,7 +21331,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rsyslog $as_me 8.4.1, which was +This file was extended by rsyslog $as_me 8.4.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21397,7 +21397,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rsyslog config.status 8.4.1 +rsyslog config.status 8.4.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/configure.ac new/rsyslog-8.4.2/configure.ac --- old/rsyslog-8.4.1/configure.ac 2014-09-26 11:57:03.000000000 +0200 +++ new/rsyslog-8.4.2/configure.ac 2014-10-02 12:27:22.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[8.4.1],[rsyslog(a)lists.adiscon.com]) +AC_INIT([rsyslog],[8.4.2],[rsyslog(a)lists.adiscon.com]) AM_INIT_AUTOMAKE([subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/grammar/lexer.c new/rsyslog-8.4.2/grammar/lexer.c --- old/rsyslog-8.4.1/grammar/lexer.c 2014-09-26 12:01:26.000000000 +0200 +++ new/rsyslog-8.4.2/grammar/lexer.c 2014-10-02 12:31:03.000000000 +0200 @@ -1511,7 +1511,7 @@ #line 32 "lexer.l" #include "config.h" #include "parserif.h" -extern char *strdup(char*); /* somehow we do not get this from string.h... */ +extern char *strdup(__const char*); /* somehow we may not get this from string.h... */ /*%option noyywrap nodefault case-insensitive */ /* avoid compiler warning: `yyunput' defined but not used */ #define YY_NO_INPUT 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/grammar/lexer.l new/rsyslog-8.4.2/grammar/lexer.l --- old/rsyslog-8.4.1/grammar/lexer.l 2014-09-26 11:56:29.000000000 +0200 +++ new/rsyslog-8.4.2/grammar/lexer.l 2014-10-02 12:27:30.000000000 +0200 @@ -31,7 +31,7 @@ %{ #include "config.h" #include "parserif.h" -extern char *strdup(char*); /* somehow we do not get this from string.h... */ +extern char *strdup(__const char*); /* somehow we may not get this from string.h... */ %} %option noyywrap nodefault case-insensitive yylineno diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/runtime/parser.c new/rsyslog-8.4.2/runtime/parser.c --- old/rsyslog-8.4.1/runtime/parser.c 2014-09-26 11:57:03.000000000 +0200 +++ new/rsyslog-8.4.2/runtime/parser.c 2014-10-02 12:27:22.000000000 +0200 @@ -4,7 +4,7 @@ * * Module begun 2008-10-09 by Rainer Gerhards (based on previous code from syslogd.c) * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2014 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -596,7 +596,7 @@ static inline rsRetVal ParsePRI(msg_t *pMsg) { - int pri; + unsigned pri; uchar *msg; int lenMsg; DEFiRet; @@ -610,22 +610,21 @@ MsgSetAfterPRIOffs(pMsg, 0); } else { if(*msg == '<') { - /* while we process the PRI, we also fill the PRI textual representation - * inside the msg object. This may not be ideal from an OOP point of view, - * but it offers us performance... - */ pri = 0; - while(--lenMsg > 0 && isdigit((int) *++msg)) { + while(--lenMsg > 0 && isdigit((int) *++msg) && pri <= LOG_MAXPRI) { pri = 10 * pri + (*msg - '0'); } - if(*msg == '>') + if(*msg == '>') { ++msg; + } else { + pri = LOG_PRI_INVLD; + } if(pri > LOG_MAXPRI) pri = LOG_PRI_INVLD; } pMsg->iFacility = pri2fac(pri); pMsg->iSeverity = pri2sev(pri); - MsgSetAfterPRIOffs(pMsg, msg - pMsg->pszRawMsg); + MsgSetAfterPRIOffs(pMsg, (pri == LOG_PRI_INVLD) ? 0 : msg - pMsg->pszRawMsg); } RETiRet; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/runtime/rsyslog.h new/rsyslog-8.4.2/runtime/rsyslog.h --- old/rsyslog-8.4.1/runtime/rsyslog.h 2014-09-26 11:57:03.000000000 +0200 +++ new/rsyslog-8.4.2/runtime/rsyslog.h 2014-10-02 12:27:22.000000000 +0200 @@ -83,7 +83,7 @@ #define LOG_NFACILITIES 24+1 /* plus one for our special "invld" facility! */ #define LOG_MAXPRI 191 /* highest supported valid PRI value --> RFC3164, RFC5424 */ #undef LOG_MAKEPRI -#define LOG_PRI_INVLD LOG_INVLD|LOG_DEBUG /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */ +#define LOG_PRI_INVLD (LOG_INVLD|LOG_DEBUG) /* PRI is invalid --> special "invld.=debug" PRI code (rsyslog-specific) */ #define LOG_EMERG 0 /* system is unusable */ #define LOG_ALERT 1 /* action must be taken immediately */ @@ -122,7 +122,7 @@ */ static inline int pri2fac(const int pri) { - int fac = pri >> 3; + unsigned fac = pri >> 3; return (fac > 23) ? LOG_FAC_INVLD : fac; } static inline int pri2sev(const int pri) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/Makefile.am new/rsyslog-8.4.2/tests/Makefile.am --- old/rsyslog-8.4.1/tests/Makefile.am 2014-09-26 11:57:08.000000000 +0200 +++ new/rsyslog-8.4.2/tests/Makefile.am 2014-10-02 12:27:22.000000000 +0200 @@ -13,6 +13,10 @@ fac_mail.sh \ fac_news.sh \ fac_uucp.sh \ + fac_invld1.sh \ + fac_invld2.sh \ + fac_invld3.sh \ + fac_invld4_rfc5424.sh \ rfc5424parser.sh \ arrayqueue.sh \ global_vars.sh \ @@ -362,6 +366,14 @@ testsuites/fac_news.conf \ fac_uucp.sh \ testsuites/fac_uucp.conf \ + fac_invld1.sh \ + testsuites/fac_invld1.conf \ + fac_invld2.sh \ + testsuites/fac_invld2.conf \ + fac_invld3.sh \ + testsuites/fac_invld3.conf \ + fac_invld4_rfc5424.sh \ + testsuites/fac_invld4_rfc5424.conf \ rs_optimizer_pri.sh \ testsuites/rs_optimizer_pri.conf \ rscript_prifilt.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/Makefile.in new/rsyslog-8.4.2/tests/Makefile.in --- old/rsyslog-8.4.1/tests/Makefile.in 2014-09-26 11:59:34.000000000 +0200 +++ new/rsyslog-8.4.2/tests/Makefile.in 2014-10-02 12:29:22.000000000 +0200 @@ -60,6 +60,10 @@ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_mail.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_news.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_uucp.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld1.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld2.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld3.sh \ +@ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ fac_invld4_rfc5424.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ rfc5424parser.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ arrayqueue.sh \ @ENABLE_IMDIAG_TRUE@@ENABLE_TESTBENCH_TRUE@ global_vars.sh \ @@ -653,6 +657,14 @@ testsuites/fac_news.conf \ fac_uucp.sh \ testsuites/fac_uucp.conf \ + fac_invld1.sh \ + testsuites/fac_invld1.conf \ + fac_invld2.sh \ + testsuites/fac_invld2.conf \ + fac_invld3.sh \ + testsuites/fac_invld3.conf \ + fac_invld4_rfc5424.sh \ + testsuites/fac_invld4_rfc5424.conf \ rs_optimizer_pri.sh \ testsuites/rs_optimizer_pri.conf \ rscript_prifilt.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld1.sh new/rsyslog-8.4.2/tests/fac_invld1.sh --- old/rsyslog-8.4.1/tests/fac_invld1.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/fac_invld1.sh 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,10 @@ +# added 2014-10-01 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_invld1.conf +source $srcdir/diag.sh tcpflood -m1000 -P 1011 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld2.sh new/rsyslog-8.4.2/tests/fac_invld2.sh --- old/rsyslog-8.4.1/tests/fac_invld2.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/fac_invld2.sh 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,10 @@ +# added 2014-10-01 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_invld2.conf +source $srcdir/diag.sh tcpflood -m1000 -P 3500000000 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld3.sh new/rsyslog-8.4.2/tests/fac_invld3.sh --- old/rsyslog-8.4.1/tests/fac_invld3.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/fac_invld3.sh 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,10 @@ +# added 2014-10-01 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_invld3.conf +source $srcdir/diag.sh tcpflood -m1000 -P x112 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/fac_invld4_rfc5424.sh new/rsyslog-8.4.2/tests/fac_invld4_rfc5424.sh --- old/rsyslog-8.4.1/tests/fac_invld4_rfc5424.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/fac_invld4_rfc5424.sh 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,10 @@ +# added 2014-10-01 by Rgerhards + +# This file is part of the rsyslog project, released under ASL 2.0 +source $srcdir/diag.sh init +source $srcdir/diag.sh startup fac_invld4_rfc5424.conf +source $srcdir/diag.sh tcpflood -y -m1000 -P 8000000000000000000000000000000 +source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages +source $srcdir/diag.sh wait-shutdown # and wait for it to terminate +source $srcdir/diag.sh seq-check 0 999 +source $srcdir/diag.sh exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld1.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld1.conf --- old/rsyslog-8.4.1/tests/testsuites/fac_invld1.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/testsuites/fac_invld1.conf 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:4%\n") +invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld2.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld2.conf --- old/rsyslog-8.4.1/tests/testsuites/fac_invld2.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/testsuites/fac_invld2.conf 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:4%\n") +invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld3.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld3.conf --- old/rsyslog-8.4.1/tests/testsuites/fac_invld3.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/testsuites/fac_invld3.conf 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:4%\n") +invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tests/testsuites/fac_invld4_rfc5424.conf new/rsyslog-8.4.2/tests/testsuites/fac_invld4_rfc5424.conf --- old/rsyslog-8.4.1/tests/testsuites/fac_invld4_rfc5424.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rsyslog-8.4.2/tests/testsuites/fac_invld4_rfc5424.conf 2014-10-02 07:56:37.000000000 +0200 @@ -0,0 +1,7 @@ +$IncludeConfig diag-common.conf + +module(load="../plugins/imtcp/.libs/imtcp") +input(type="imtcp" port="13514") + +template(type="string" name="outfmt" string="%msg:F,58:4%\n") +invld.=debug action(type="omfile" file="rsyslog.out.log" template="outfmt") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rsyslog-8.4.1/tools/pmrfc3164.c new/rsyslog-8.4.2/tools/pmrfc3164.c --- old/rsyslog-8.4.1/tools/pmrfc3164.c 2014-09-26 11:56:29.000000000 +0200 +++ new/rsyslog-8.4.2/tools/pmrfc3164.c 2014-10-02 12:27:22.000000000 +0200 @@ -84,6 +84,9 @@ lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* note: offAfterPRI is already the number of PRI chars (do not add one!) */ p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI; /* point to start of text, after PRI */ setProtocolVersion(pMsg, MSG_LEGACY_PROTOCOL); + if(pMsg->iFacility == (LOG_INVLD>>3)) + FINALIZE; /* don't parse out from invalid messages! */ + /* Check to see if msg contains a timestamp. We start by assuming * that the message timestamp is the time of reception (which we @@ -199,7 +202,7 @@ } } - /* The rest is the actual MSG */ +finalize_it: MsgSetMSGoffs(pMsg, p2parse - pMsg->pszRawMsg); ENDparse ++++++ rsyslog-doc-8.4.1.tar.gz -> rsyslog-doc-8.4.2.tar.gz ++++++ ++++ no output (probably identical) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit corebird for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package corebird for openSUSE:Factory checked in at 2014-10-05 20:32:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corebird (Old) and /work/SRC/openSUSE:Factory/.corebird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "corebird" Changes: -------- --- /work/SRC/openSUSE:Factory/corebird/corebird.changes 2014-05-20 14:22:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.corebird.new/corebird.changes 2014-10-05 20:33:48.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 8 19:47:26 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 0.8: + + Switch build system from cmake to automake. + + Internal code reorganisation. + + Add test units. + + Updated translations. +- Enable make check in %check section. +- Replace cmake call with autogen.sh (tarball is not bootstrapped) + and configure. +- Add libtool BuildRequires: needed in order to run autogen.sh. +- Drop cmake BuildRequires: no longer needed after the switch to + automake. +- Add pkgconfig(gstreamer-video-1.0) and pkgconfig(gdk-x11-3.0) + BuildRequires: new dependencies. +- Add corebird-fix-binding-usage.patch: Fix usage of bindings. +- Add corebird-fix-manpage-install.patch: Fix man page + installation. + +------------------------------------------------------------------- Old: ---- corebird-0.7.tar.gz New: ---- corebird-0.8.tar.gz corebird-fix-binding-usage.patch corebird-fix-manpage-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corebird.spec ++++++ --- /var/tmp/diff_new_pack.wwsC6E/_old 2014-10-05 20:33:49.000000000 +0200 +++ /var/tmp/diff_new_pack.wwsC6E/_new 2014-10-05 20:33:49.000000000 +0200 @@ -18,7 +18,7 @@ Name: corebird -Version: 0.7 +Version: 0.8 Release: 0 Summary: A lightweight Twitter Client License: GPL-3.0+ @@ -26,14 +26,20 @@ Url: http://corebird.baedert.org/ #Source: https://github.com/baedert/corebird/archive/%%{version}.tar.gz Source0: %{name}-%{version}.tar.gz -BuildRequires: cmake +# PATCH-FIX-UPSTREAM corebird-fix-binding-usage.patch dimstar(a)opensuse.org -- Fix binding usage, taken from git +Patch0: corebird-fix-binding-usage.patch +# PATCH-FIX-UPSTREAM corebird-fix-manpage-install.patch dimstar(a)opensuse.org -- Fix macros used to install man pages +Patch1: corebird-fix-manpage-install.patch BuildRequires: intltool +BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: vala-devel >= 0.21.1 +BuildRequires: pkgconfig(gdk-x11-3.0) BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.40 +BuildRequires: pkgconfig(gstreamer-video-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libsoup-2.4) @@ -48,15 +54,17 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} +NOCONFIGURE=1 ./autogen.sh +%configure make %{?_smp_mflags} %install %make_install -%suse_update_desktop_file %{name} X-SuSE-Core-Internet +%suse_update_desktop_file org.baedert.corebird X-SuSE-Core-Internet %find_lang %{name} %{?no_lang_C} %post @@ -76,7 +84,7 @@ %{_datadir}/%{name}/ %dir %{_datadir}/appdata %{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/org.baedert.corebird.desktop %{_datadir}/glib-2.0/schemas/org.baedert.corebird.gschema.xml %{_datadir}/icons/hicolor/ %{_mandir}/man1/%{name}.1%{?ext_man} ++++++ corebird-0.7.tar.gz -> corebird-0.8.tar.gz ++++++ ++++ 21767 lines of diff (skipped) ++++++ corebird-fix-binding-usage.patch ++++++ >From 2e2e2aba161d591dcc8e538d92b6b520020d8ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail(a)baedert.org> Date: Wed, 10 Sep 2014 12:48:20 +0200 Subject: [PATCH] Fix binding usages --- src/list/TweetListEntry.vala | 2 +- src/widgets/ReplyEntry.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/list/TweetListEntry.vala b/src/list/TweetListEntry.vala index 286992e..d9338c9 100644 --- a/src/list/TweetListEntry.vala +++ b/src/list/TweetListEntry.vala @@ -174,7 +174,7 @@ public class TweetListEntry : ITwitterItem, Gtk.ListBoxRow { } static construct { - unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class (typeof (TweetListEntry).class_ref ()); + unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class ((GLib.ObjectClass)typeof (TweetListEntry).class_ref ()); Gtk.BindingEntry.add_signal (binding_set, Gdk.Key.r, 0, "reply-tweet", 0, null); Gtk.BindingEntry.add_signal (binding_set, Gdk.Key.Return, 0, "activate", 0, null); diff --git a/src/widgets/ReplyEntry.vala b/src/widgets/ReplyEntry.vala index 9bdec02..0c59820 100644 --- a/src/widgets/ReplyEntry.vala +++ b/src/widgets/ReplyEntry.vala @@ -25,7 +25,7 @@ class ReplyEntry : Gtk.Entry { public ReplyEntry () {} static construct { - unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class (typeof (ReplyEntry).class_ref ()); + unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class ((GLib.ObjectClass)typeof (ReplyEntry).class_ref ()); Gtk.BindingEntry.add_signal (binding_set, Gdk.Key.Escape, 0, "cancelled", 0, null); } -- 2.1.1 ++++++ corebird-fix-manpage-install.patch ++++++ >From d474e9a51d5af20541f2e5da03b433266363cd35 Mon Sep 17 00:00:00 2001 From: Kalev Lember <kalevlember(a)gmail.com> Date: Sun, 27 Jul 2014 12:41:34 +0200 Subject: [PATCH] Fix man page installation directory Use the right automake invocation to make the man page properly go to /usr/share/man/man1. --- data/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index a418caf..b2a4a45 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -11,8 +11,7 @@ appdata_in_files = corebird.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) @INTLTOOL_XML_RULE@ -manpagedir = $(mandir) -manpage_DATA = corebird.1 +man_MANS = corebird.1 if ENABLE_CATALOG catalogdir = $(prefix)/share/glade/catalogs/ -- 2.1.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 gnucash for openSUSE:Factory
by root＠hilbert.suse.de 05 Oct '14

05 Oct '14

Hello community, here is the log from the commit of package gnucash for openSUSE:Factory checked in at 2014-10-05 20:32:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnucash (Old) and /work/SRC/openSUSE:Factory/.gnucash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnucash" Changes: -------- --- /work/SRC/openSUSE:Factory/gnucash/gnucash.changes 2014-07-17 06:58:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnucash.new/gnucash.changes 2014-10-05 20:33:46.000000000 +0200 @@ -1,0 +2,49 @@ +Sat Oct 4 17:42:21 UTC 2014 - novell(a)whamra.com + +- Update gnucash-libdbi-0.9.patch: fix usage of internal function + _gnucash-libdbi-0.9.patch (boo#898974). + +------------------------------------------------------------------- +Tue Sep 30 19:30:33 UTC 2014 - dimstar(a)opensuse.org + +- Update to version 2.6.4: + + Add business lot scrubbing to Check & Repair->All/This + transaction(s). + + Add context to generic translatable string. + + Add scrub function to reduce the amount of lot links used. + + Add some date format checking and make sure generated dates are + the correct user selected format, not always locale format. + + Allow the ability to skip rows when importing transactions. + + Always use the price we display to calculate the current value + of an account. + + Better period totals formatting in Invoices. + + CSV Export: factor out function to generate regular expression. + + CSV Import transform macro into function. + + Convert ISO-8859-1 account chart templates to UTF-8. + + Correct txf output to use a minus sign, rather than + parenthesis. + + Fix document type dispay for credit notes on owner report. + + Fix test-backend-dbi segfault with libdbi-0.9.0. + + Handle the case of scrubbing a lot link between two + non-document lots. + + Lots of refactoring. + + Chart-of-Account Templates Updated. + + Bugs fixed: bgo#120199, bgo#434462, bgo#509263, bgo#610202, + bgo#630638, bgo#671615, bgo#688965, bgo#692249, bgo#695240, + bgo#707243, bgo#711440, bgo#711567, bgo#719457, bgo#719457, + bgo#720427, bgo#720934, bgo#722140, bgo#722200, bgo#723145, + bgo#723442, bgo#725054, bgo#725366, bgo#726449, bgo#726888, + bgo#727130, bgo#727338, bgo#728103, bgo#728717, bgo#728841, + bgo#729157, bgo#729497, bgo#730255, bgo#731519, bgo#732545, + bgo#733107, bgo#733283, bgo#733506, bgo#734183, bgo#736703. + + Updated translations. +- Rebase gnucash-cpan-warning.patch and gnucash-libdbi-0.9.patch. +- Add gnucash-guile1.patch: properly detect GUILE1 on openSUSE. + This patch replaces the sed hacks injecting GUILE1 into + configure, but has a chance to land upstream. +- Unconditionally run autoreconf now, as above patch is applied + for all versions of openSUSE. +- No longer export GUILE for configure: the patch above makes this + work without hacks. + +------------------------------------------------------------------- Old: ---- gnucash-2.6.3.tar.bz2 New: ---- gnucash-2.6.4.tar.gz gnucash-guile1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnucash.spec ++++++ --- /var/tmp/diff_new_pack.IAiPVq/_old 2014-10-05 20:33:48.000000000 +0200 +++ /var/tmp/diff_new_pack.IAiPVq/_new 2014-10-05 20:33:48.000000000 +0200 @@ -17,18 +17,20 @@ Name: gnucash -Version: 2.6.3 +Version: 2.6.4 Release: 0 Summary: Personal Finance Manager License: SUSE-GPL-2.0-with-openssl-exception or SUSE-GPL-3.0-with-openssl-exception Group: Productivity/Office/Finance Url: http://www.gnucash.org/ -Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.6… +Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/%{v… Source1: %{name}-rpmlintrc # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: gnucash-cpan-warning.patch # PATCH-FIX-UPSTREAM gnucash-libdbi-0.9.patch dimstar(a)opensuse.org -- Fix build with libdbi-0.9.0+git23 and newer Patch1: gnucash-libdbi-0.9.patch +# PATCH-FIX-UPSTREAM gnucash-guile1.patch dimstar(a)opensuse.org -- Properly detect GUILE1 on openSUSE +Patch2: gnucash-guile1.patch BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes @@ -143,15 +145,10 @@ # SLE12 contains libdbi 0.9.0, before this API change. %patch1 -p1 %endif +%patch2 -p1 %build -%if %{?suse_version} >= 1210 -# needed for patch0 and use of guile1 -sed -i "s:GUILE_MODULE_AVAILABLE:GUILE1_MODULE_AVAILABLE:" configure.ac -autoreconf -fi -sed -i "s:guile-config:guile1-config:" configure -export GUILE=/usr/bin/guile1 -%endif +autoreconf -fiv %configure\ --libexecdir=%{_libexecdir}\ --enable-ofx\ ++++++ gnucash-cpan-warning.patch ++++++ --- /var/tmp/diff_new_pack.IAiPVq/_old 2014-10-05 20:33:48.000000000 +0200 +++ /var/tmp/diff_new_pack.IAiPVq/_new 2014-10-05 20:33:48.000000000 +0200 @@ -32,6 +32,6 @@ + +exit 0 if ($input ne "n"); + - CPAN::Shell->install('LWP'); CPAN::Shell->install('Date::Manip'); - CPAN::Shell->install('Mozilla::CA'); + CPAN::Shell->install('HTML::TableExtract'); + CPAN::Shell->install('HTTP::Request::Common'); ++++++ gnucash-guile1.patch ++++++ --- gnucash-2.6.4/configure.ac 2014-09-28 02:11:31.000000000 +0200 +++ gnucash-2.6.4.patche/configure.ac 2014-10-01 23:55:11.095602881 +0200 @@ -463,7 +463,9 @@ [guile-1.8 >= 1.8.5], [m4_ifdef([GUILE1_8_PROGS], [ GUILE1_8_PROGS ], - [ GUILE_PROGS ]) + [ m4_ifdef([GUILE1_PROGS], + [ GUILE1_PROGS ], + [ GUILE_PROGS ])]) ], [ PKG_CHECK_MODULES(GUILE, [guile-2.0 >= 2.0.0], ++++++ gnucash-libdbi-0.9.patch ++++++ --- /var/tmp/diff_new_pack.IAiPVq/_old 2014-10-05 20:33:48.000000000 +0200 +++ /var/tmp/diff_new_pack.IAiPVq/_new 2014-10-05 20:33:48.000000000 +0200 @@ -1,13 +1,15 @@ -Index: gnucash-2.6.3/src/backend/dbi/gnc-backend-dbi.c +Index: gnucash-2.6.4/src/backend/dbi/gnc-backend-dbi.c =================================================================== ---- gnucash-2.6.3.orig/src/backend/dbi/gnc-backend-dbi.c -+++ gnucash-2.6.3/src/backend/dbi/gnc-backend-dbi.c -@@ -2039,7 +2039,7 @@ row_get_value_at_col_name( GncSqlRow* ro +--- gnucash-2.6.4.orig/src/backend/dbi/gnc-backend-dbi.c ++++ gnucash-2.6.4/src/backend/dbi/gnc-backend-dbi.c +@@ -2106,7 +2106,9 @@ row_get_value_at_col_name( GncSqlRow* ro dbi_result_t *result = (dbi_result_t*)(dbi_row->result); guint64 row = dbi_result_get_currow (result); guint idx = dbi_result_get_field_idx (result, col_name) - 1; - time64 time = result->rows[row]->field_values[idx].d_datetime; -+ time64 time = _dbi_make_datetime(result->rows[row]->field_values[idx].d_datetimex); ++ const dbi_datetimex *dtx = &result->rows[row]->field_values[idx].d_datetimex; ++ struct tm copy = dtx->tm; ++ time64 time = timegm(&copy) - dtx->utc_offset; (void)g_value_init( value, G_TYPE_INT64 ); g_value_set_int64 (value, time); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0