November 2015 - openSUSE Commits - openSUSE Mailing Lists

commit gnome-shell for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '15

28 Nov '15

Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2015-11-28 15:18:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2015-11-08 11:25:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2015-11-28 15:18:55.000000000 +0100 @@ -1,0 +2,30 @@ +Tue Nov 17 22:27:14 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.18.3: + + Fix browser plugin crash in Firefox (bgo#737932, bgo#757940). +- Drop gnome-shell-revert-browser-plugin.patch: Fixed upstream. + +------------------------------------------------------------------- +Sat Nov 14 11:02:44 UTC 2015 - zaitor(a)opensuse.org + +- Add gnome-shell-revert-browser-plugin.patch: Revert upstream + commit that makes the browser plugin crash in openSUSE + (bgo#757940, bgo#758035). + +------------------------------------------------------------------- +Thu Nov 12 16:05:25 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.18.2: + + Fix fullscreen animation glitches (bgo#756697, bgo#756714). + + Fix window menu being closed immediately in top orientation + (bgo#756605). + + Respect text-scaling factor under wayland (bgo#756447). + + Fix login screen getting stuck after authentification + (bgo#754814). + + Fix overview being toggled while still animating (bgo#756925). + + Improve robustness of browser plugin (bgo#737932, bgo#757940). + + Misc. bug fixes (bgo#756983, bgo#757150, bgo#757779). + + Updated translations. +- Drop gnome-shell-Fix-nb-translation.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- gnome-shell-3.18.1.tar.xz gnome-shell-Fix-nb-translation.patch New: ---- gnome-shell-3.18.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.UKOMwl/_old 2015-11-28 15:18:56.000000000 +0100 +++ /var/tmp/diff_new_pack.UKOMwl/_new 2015-11-28 15:18:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.18.1 +Version: 3.18.3 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -26,8 +26,6 @@ Source: http://download.gnome.org/sources/gnome-shell/3.18/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar(a)opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch -# PATCH-FIX-UPSTREAM gnome-shell-Fix-nb-translation.patch bgo#740906 zaitor(a)opensuse.org -- Fix Norwegian translation -Patch2: gnome-shell-Fix-nb-translation.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: intltool @@ -155,7 +153,6 @@ %setup -q %patch1 -p1 translation-update-upstream -%patch2 -p1 %build export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins ++++++ gnome-shell-3.18.1.tar.xz -> gnome-shell-3.18.3.tar.xz ++++++ ++++ 21743 lines of diff (skipped)

1 0

commit gdm for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '15

28 Nov '15

Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2015-11-28 15:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdm" Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2015-10-28 17:29:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2015-11-28 15:18:50.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Nov 17 18:50:18 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.18.2 (boo#955552): + + Fix lock screen bypass when holding escape key (CVE-2015-7496, + bgo#758032). + + Updated translations. + +------------------------------------------------------------------- +Tue Nov 10 09:43:52 UTC 2015 - zaitor(a)opensuse.org + +- Drop gdm-session-emit-verification-complete-for-logins.patch: Bug + fixed in gnome-shell. + +------------------------------------------------------------------- Old: ---- gdm-3.18.0.tar.xz gdm-session-emit-verification-complete-for-logins.patch New: ---- gdm-3.18.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.70JFEZ/_old 2015-11-28 15:18:52.000000000 +0100 +++ /var/tmp/diff_new_pack.70JFEZ/_new 2015-11-28 15:18:52.000000000 +0100 @@ -27,7 +27,7 @@ %define enable_split_authentication 0 Name: gdm -Version: 3.18.0 +Version: 3.18.2 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0+ @@ -60,8 +60,6 @@ Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat(a)suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running Patch41: gdm-plymouth-vt1.patch -# PATCH-FIX-UPSTREAM gdm-session-emit-verification-complete-for-logins.patch bgo#754814 zaitor(a)opensuse.org -- Fix hang on login when using Nvidia driver. -Patch42: gdm-session-emit-verification-complete-for-logins.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -193,7 +191,6 @@ %patch34 -p1 #patch35 -p1 %patch41 -p1 -%patch42 -p1 %build NOCONFIGURE=1 sh autogen.sh ++++++ gdm-3.18.0.tar.xz -> gdm-3.18.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/NEWS new/gdm-3.18.2/NEWS --- old/gdm-3.18.0/NEWS 2015-09-21 16:13:09.000000000 +0200 +++ new/gdm-3.18.2/NEWS 2015-11-17 18:16:02.000000000 +0100 @@ -1,4 +1,10 @@ ============== +Version 3.18.2 +============== +- CVE-2015-7496 - lock screen bypass when holding escape key +- Translation updates + +============== Version 3.18.0 ============== - Translation updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/configure new/gdm-3.18.2/configure --- old/gdm-3.18.0/configure 2015-09-21 16:14:07.000000000 +0200 +++ new/gdm-3.18.2/configure 2015-11-17 18:16:25.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gdm 3.18.0. +# Generated by GNU Autoconf 2.69 for gdm 3.18.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gdm>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gdm' PACKAGE_TARNAME='gdm' -PACKAGE_VERSION='3.18.0' -PACKAGE_STRING='gdm 3.18.0' +PACKAGE_VERSION='3.18.2' +PACKAGE_STRING='gdm 3.18.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdm' PACKAGE_URL='' @@ -1598,7 +1598,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 gdm 3.18.0 to adapt to many kinds of systems. +\`configure' configures gdm 3.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1672,7 +1672,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gdm 3.18.0:";; + short | recursive ) echo "Configuration of gdm 3.18.2:";; esac cat <<\_ACEOF @@ -1923,7 +1923,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gdm configure 3.18.0 +gdm configure 3.18.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2513,7 +2513,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gdm $as_me 3.18.0, which was +It was created by gdm $as_me 3.18.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3379,7 +3379,7 @@ # Define the identity of the package. PACKAGE='gdm' - VERSION='3.18.0' + VERSION='3.18.2' cat >>confdefs.h <<_ACEOF @@ -25357,7 +25357,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gdm $as_me 3.18.0, which was +This file was extended by gdm $as_me 3.18.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25423,7 +25423,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gdm config.status 3.18.0 +gdm config.status 3.18.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/configure.ac new/gdm-3.18.2/configure.ac --- old/gdm-3.18.0/configure.ac 2015-09-21 16:13:15.000000000 +0200 +++ new/gdm-3.18.2/configure.ac 2015-11-17 18:16:04.000000000 +0100 @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) AC_INIT([gdm], - [3.18.0], + [3.18.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm]) AC_CONFIG_SRCDIR([daemon/gdm-manager.c]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/daemon/gdm-manager-glue.c new/gdm-3.18.2/daemon/gdm-manager-glue.c --- old/gdm-3.18.0/daemon/gdm-manager-glue.c 2015-09-21 16:14:31.000000000 +0200 +++ new/gdm-3.18.2/daemon/gdm-manager-glue.c 2015-06-17 15:41:55.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.45.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/daemon/gdm-manager-glue.h new/gdm-3.18.2/daemon/gdm-manager-glue.h --- old/gdm-3.18.0/daemon/gdm-manager-glue.h 2015-09-21 16:14:31.000000000 +0200 +++ new/gdm-3.18.2/daemon/gdm-manager-glue.h 2015-06-17 15:41:55.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.45.7. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/daemon/gdm-session.c new/gdm-3.18.2/daemon/gdm-session.c --- old/gdm-3.18.0/daemon/gdm-session.c 2015-09-21 16:12:33.000000000 +0200 +++ new/gdm-3.18.2/daemon/gdm-session.c 2015-11-17 18:14:16.000000000 +0100 @@ -73,6 +73,7 @@ GDBusMethodInvocation *pending_invocation; GdmDBusWorkerManager *worker_manager_interface; GdmDBusWorker *worker_proxy; + GCancellable *worker_cancellable; char *session_id; guint32 is_stopping : 1; @@ -1040,6 +1041,8 @@ g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (conversation->worker_proxy), G_MAXINT); + conversation->worker_cancellable = g_cancellable_new (); + g_signal_connect (conversation->worker_proxy, "username-changed", G_CALLBACK (worker_on_username_changed), conversation); @@ -1675,7 +1678,31 @@ g_free (conversation->starting_username); g_free (conversation->session_id); g_clear_object (&conversation->worker_manager_interface); - g_clear_object (&conversation->worker_proxy); + + g_cancellable_cancel (conversation->worker_cancellable); + g_clear_object (&conversation->worker_cancellable); + + if (conversation->worker_proxy != NULL) { + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_username_changed), + conversation); + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_session_exited), + conversation); + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_reauthenticated), + conversation); + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_saved_language_name_read), + conversation); + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_saved_session_name_read), + conversation); + g_signal_handlers_disconnect_by_func (conversation->worker_proxy, + G_CALLBACK (worker_on_cancel_pending_query), + conversation); + g_clear_object (&conversation->worker_proxy); + } g_clear_object (&conversation->session); g_free (conversation); } @@ -2090,7 +2117,7 @@ display_hostname, self->priv->display_is_local, self->priv->display_is_initial, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_setup_complete_cb, conversation); } @@ -2156,7 +2183,7 @@ display_hostname, self->priv->display_is_local, self->priv->display_is_initial, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_setup_complete_cb, conversation); } @@ -2218,7 +2245,7 @@ self->priv->display_is_local, self->priv->display_is_initial, log_file, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_setup_complete_cb, conversation); } @@ -2276,7 +2303,7 @@ conversation = find_conversation_by_name (self, service_name); if (conversation != NULL) { gdm_dbus_worker_call_authenticate (conversation->worker_proxy, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_authenticate_cb, conversation); } @@ -2293,7 +2320,7 @@ conversation = find_conversation_by_name (self, service_name); if (conversation != NULL) { gdm_dbus_worker_call_authorize (conversation->worker_proxy, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_authorize_cb, conversation); } @@ -2310,7 +2337,7 @@ conversation = find_conversation_by_name (self, service_name); if (conversation != NULL) { gdm_dbus_worker_call_establish_credentials (conversation->worker_proxy, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_establish_credentials_cb, conversation); } @@ -2324,7 +2351,8 @@ { gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy, key, value, - NULL, NULL, NULL); + conversation->worker_cancellable, + NULL, NULL); } static void @@ -2514,7 +2542,8 @@ mode = gdm_session_get_display_mode (self); gdm_dbus_worker_call_set_session_display_mode (conversation->worker_proxy, gdm_session_display_mode_to_string (mode), - NULL, NULL, NULL); + conversation->worker_cancellable, + NULL, NULL); } static void @@ -2530,7 +2559,8 @@ gdm_dbus_worker_call_set_environment_variable (conversation->worker_proxy, "XDG_SESSION_TYPE", session_type, - NULL, NULL, NULL); + conversation->worker_cancellable, + NULL, NULL); } void @@ -2548,7 +2578,7 @@ send_session_type (self, conversation); gdm_dbus_worker_call_open (conversation->worker_proxy, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_opened, conversation); } } @@ -2734,7 +2764,7 @@ gdm_dbus_worker_call_start_program (conversation->worker_proxy, program, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_start_program_cb, conversation); g_free (program); @@ -2866,7 +2896,7 @@ gdm_dbus_worker_call_start_reauthentication (conversation->worker_proxy, (int) pid_of_caller, (int) uid_of_caller, - NULL, + conversation->worker_cancellable, (GAsyncReadyCallback) on_reauthentication_started_cb, conversation); } @@ -3103,7 +3133,8 @@ gdm_dbus_worker_call_set_session_name (conversation->worker_proxy, get_session_name (self), - NULL, NULL, NULL); + conversation->worker_cancellable, + NULL, NULL); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/libgdm/gdm-client-glue.h new/gdm-3.18.2/libgdm/gdm-client-glue.h --- old/gdm-3.18.0/libgdm/gdm-client-glue.h 2015-08-24 18:51:06.000000000 +0200 +++ new/gdm-3.18.2/libgdm/gdm-client-glue.h 2015-11-17 18:18:41.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.45.4. DO NOT EDIT. + * Generated by gdbus-codegen 2.47.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gdm-3.18.0/libgdm/gdm.pc new/gdm-3.18.2/libgdm/gdm.pc --- old/gdm-3.18.0/libgdm/gdm.pc 2015-09-21 16:14:20.000000000 +0200 +++ new/gdm-3.18.2/libgdm/gdm.pc 2015-11-17 18:16:35.000000000 +0100 @@ -5,6 +5,6 @@ Name: GDM Client Library Description: Client Library for communicating with GDM daemon -Version: 3.18.0 +Version: 3.18.2 Libs: -L${libdir} -lgdm Cflags: -I${includedir}/gdm

1 0

commit cyrus-imapd for openSUSE:13.2:Update
by root＠hilbert.suse.de 27 Nov '15

27 Nov '15

Hello community, here is the log from the commit of package cyrus-imapd for openSUSE:13.2:Update checked in at 2015-11-27 13:56:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/cyrus-imapd (Old) and /work/SRC/openSUSE:13.2:Update/.cyrus-imapd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cyrus-imapd" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.BEMeLu/_old 2015-11-27 13:56:50.000000000 +0100 +++ /var/tmp/diff_new_pack.BEMeLu/_new 2015-11-27 13:56:50.000000000 +0100 @@ -1 +1 @@ -<link package='cyrus-imapd.4026' cicount='copy' /> +<link package='cyrus-imapd.4253' cicount='copy' />

1 0

commit ppp for openSUSE:13.1:Update
by root＠hilbert.suse.de 27 Nov '15

27 Nov '15

Hello community, here is the log from the commit of package ppp for openSUSE:13.1:Update checked in at 2015-11-27 13:55:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/ppp (Old) and /work/SRC/openSUSE:13.1:Update/.ppp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ppp" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.LKo1Lo/_old 2015-11-27 13:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.LKo1Lo/_new 2015-11-27 13:55:20.000000000 +0100 @@ -1 +1 @@ -<link package='ppp.2995' cicount='copy' /> +<link package='ppp.4255' cicount='copy' />

1 0

commit xf86-video-intel for openSUSE:13.2:Update
by root＠hilbert.suse.de 27 Nov '15

27 Nov '15

Hello community, here is the log from the commit of package xf86-video-intel for openSUSE:13.2:Update checked in at 2015-11-27 13:53:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/xf86-video-intel (Old) and /work/SRC/openSUSE:13.2:Update/.xf86-video-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-intel" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.oi8HSV/_old 2015-11-27 13:53:25.000000000 +0100 +++ /var/tmp/diff_new_pack.oi8HSV/_new 2015-11-27 13:53:25.000000000 +0100 @@ -1 +1 @@ -<link package='xf86-video-intel.3826' cicount='copy' /> +<link package='xf86-video-intel.4259' cicount='copy' />

1 0

commit virtualbox for openSUSE:13.2:Update
by root＠hilbert.suse.de 27 Nov '15

27 Nov '15

Hello community, here is the log from the commit of package virtualbox for openSUSE:13.2:Update checked in at 2015-11-27 13:48:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/virtualbox (Old) and /work/SRC/openSUSE:13.2:Update/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Y36zfV/_old 2015-11-27 13:48:06.000000000 +0100 +++ /var/tmp/diff_new_pack.Y36zfV/_new 2015-11-27 13:48:06.000000000 +0100 @@ -1 +1 @@ -<link package='virtualbox.4120' cicount='copy' /> +<link package='virtualbox.4242' cicount='copy' />

1 0

commit patchinfo.4263 for openSUSE:13.1:Update
by root＠hilbert.suse.de 27 Nov '15

27 Nov '15

Hello community, here is the log from the commit of package patchinfo.4263 for openSUSE:13.1:Update checked in at 2015-11-27 13:45:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/patchinfo.4263 (Old) and /work/SRC/openSUSE:13.1:Update/.patchinfo.4263.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.4263" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="4263"> <issue id="857141" tracker="bnc">Graphics fail on ThinkPad T23 with S3 Savage</issue> <category>recommended</category> <rating>moderate</rating> <packager>eeich</packager> <description> This update for xf86-video-savage fixes the following issues: - Fix build against xorg-server 1.15 - Update to version 2.3.7 (boo#857141) + Small bugfix for video playback on MX/IX/SuperSavage + Usual catch-up to the ever-changing xserver, build and run on 1.14, and default to EXA now that the xserver does not support XAA anymore. </description> <summary>Recommended update for xf86-video-savage</summary> </patchinfo>

1 0

commit serd for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '15

26 Nov '15

Hello community, here is the log from the commit of package serd for openSUSE:Factory checked in at 2015-11-26 17:04:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/serd (Old) and /work/SRC/openSUSE:Factory/.serd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "serd" Changes: -------- --- /work/SRC/openSUSE:Factory/serd/serd.changes 2015-03-25 10:01:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.serd.new/serd.changes 2015-11-26 17:04:39.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Nov 24 18:45:34 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.22.0 + * Remove dependence on fmax() to avoid portability issues + * Fix serd_reader_read_file() for URIs with escaped characters (spaces) + * Add serd_reader_set_strict() and -l (lax) option to serdi to tolerate + parsing URIs with escaped characters + * Fix reading statements ending with a blank then dot with no space + * Fix clash resolution when a blank node ID prefix is set + * Fix serializing fractional decimals that would round up + * Add support for Turtle named inline nodes extension + * Report errors for invalid IRI characters and missing terminators + * Show serdi errors in standard format + * Fix warnings when building with ISO C++ compilers + * Upgrade to waf 1.8.14 + +------------------------------------------------------------------- Old: ---- serd-0.20.0.tar.bz2 New: ---- serd-0.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ serd.spec ++++++ --- /var/tmp/diff_new_pack.u4mu6s/_old 2015-11-26 17:04:40.000000000 +0100 +++ /var/tmp/diff_new_pack.u4mu6s/_new 2015-11-26 17:04:40.000000000 +0100 @@ -19,7 +19,7 @@ %define soname 0 Name: serd -Version: 0.20.0 +Version: 0.22.0 Release: 0 Summary: A lightweight C library for RDF syntax License: ISC @@ -92,7 +92,7 @@ %{_libdir}/libserd-0.so %{_includedir}/serd-0/ %{_libdir}/pkgconfig/serd-0.pc -%{_defaultdocdir}/serd-0/ -%{_mandir}/man3/* +#%{_defaultdocdir}/serd-0/ +#%{_mandir}/man3/* %changelog ++++++ serd-0.20.0.tar.bz2 -> serd-0.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/COPYING new/serd-0.22.0/COPYING --- old/serd-0.20.0/COPYING 2014-08-08 07:47:20.000000000 +0200 +++ new/serd-0.22.0/COPYING 2015-10-07 03:59:57.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright 2011-2014 David Robillard <http://drobilla.net> +Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/INSTALL new/serd-0.22.0/INSTALL --- old/serd-0.20.0/INSTALL 2012-07-09 05:43:14.000000000 +0200 +++ new/serd-0.22.0/INSTALL 2015-10-07 04:13:53.000000000 +0200 @@ -8,11 +8,7 @@ ./waf configure ./waf - ./waf install - -You may need to become root for the install stage, for example: - - sudo ./waf install + ./waf install # or sudo ./waf install Configuration Options --------------------- @@ -40,12 +36,20 @@ * CPPFLAGS: C preprocessor options * LINKFLAGS: Linker options -Installation Directories ------------------------- +Library Versioning +------------------ + +This library uses semantic versioning <http://semver.org/>. -The --prefix option (or the PREFIX environment variable) can be used to change -the prefix which all files are installed under. There are also several options -allowing for more fine-tuned control, see the --help output for details. +Several major versions can be installed in parallel. The shared library name, +include directory, and pkg-config file are suffixed with the major version +number. For example, a library named "foo" at version 1.x.y might install: + + /usr/include/foo-1/foo/foo.h + /usr/lib/foo-1.so.1.x.y + /usr/lib/pkgconfig/foo-1.pc + +Dependencies can check for the package "foo-1" with pkg-config. Packaging --------- @@ -57,3 +61,6 @@ ./waf configure --prefix=/usr ./waf ./waf install --destdir=/tmp/package + +Packages should allow parallel installation of several major versions. For +example, the above would be packaged as "foo-1". \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/NEWS new/serd-0.22.0/NEWS --- old/serd-0.20.0/NEWS 2014-08-09 00:03:44.000000000 +0200 +++ new/serd-0.22.0/NEWS 2015-10-08 21:34:20.000000000 +0200 @@ -1,3 +1,20 @@ +serd (0.22.0) stable; + + * Remove dependence on fmax() to avoid portability issues + * Fix serd_reader_read_file() for URIs with escaped characters (spaces) + * Add serd_reader_set_strict() and -l (lax) option to serdi to tolerate + parsing URIs with escaped characters + * Fix reading statements ending with a blank then dot with no space + * Fix clash resolution when a blank node ID prefix is set + * Fix serializing fractional decimals that would round up + * Add support for Turtle named inline nodes extension + * Report errors for invalid IRI characters and missing terminators + * Show serdi errors in standard format + * Fix warnings when building with ISO C++ compilers + * Upgrade to waf 1.8.14 + + -- David Robillard <d(a)drobilla.net> Thu, 08 Oct 2015 15:34:18 -0400 + serd (0.20.0) stable; * Support new RDF 1.1 Turtle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/PACKAGING new/serd-0.22.0/PACKAGING --- old/serd-0.20.0/PACKAGING 2011-12-06 21:07:43.000000000 +0100 +++ new/serd-0.22.0/PACKAGING 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -This library is designed to allow parallel installation of different major -versions. To facilitate this, the shared library name, include directory, and -pkg-config file are suffixed with the major version number of the library. - -For example, if this library was named "foo" and at version 1.x.y: - -/usr/include/foo-1/foo/foo.h -/usr/lib/foo-1.so.1.x.y -/usr/lib/pkgconfig/foo-1.pc - -Dependencies check for pkg-config name "foo-1" and will build -against a compatible version 1, regardless any other installed versions. - -*** IMPORTANT GUIDELINES FOR PACKAGERS *** - -Packages should follow the same conventions as above, i.e. include the major -version (and only the major version) in the name of the package. Continuing the -example above, the package(s) would be named foo-1 and foo-1-dev. This way, -if/when version 2 comes out, it may be installed at the same time as version 1 -without breaking anything. - -Please do not create packages of this library that do not follow these -guidelines, you will break things and cause unnecessary headaches. Please do -not use any number as a suffix other than the actual major version number of the -upstream source package. - -Because program and documentation names are not versioned, these should be -included in separate packages which may replace previous versions, since -there is little use in having parallel installations of them. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/serd/serd.h new/serd-0.22.0/serd/serd.h --- old/serd-0.20.0/serd/serd.h 2014-08-08 16:40:02.000000000 +0200 +++ new/serd-0.22.0/serd/serd.h 2015-10-08 21:32:14.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright 2011-2014 David Robillard <http://drobilla.net> + Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -183,7 +183,7 @@ @see <a href="http://www.w3.org/TeamSubmission/turtle#nodeID">Turtle <tt>nodeID</tt></a> */ - SERD_BLANK = 4, + SERD_BLANK = 4 } SerdType; @@ -336,8 +336,7 @@ @param hostname If non-NULL, set to the hostname, if present. @return The path component of the URI. - Both the returned path and `hostname` (if applicable) are owned by the - caller and must be freed with free(). + The returned path and `*hostname` must be freed with free(). */ SERD_API uint8_t* @@ -689,6 +688,17 @@ SerdEndSink end_sink); /** + Enable or disable strict parsing. + + The reader is non-strict (lax) by default, which will tolerate URIs with + invalid characters. Setting strict will fail when parsing such files. An + error is printed for invalid input in either case. +*/ +SERD_API +void +serd_reader_set_strict(SerdReader* reader, bool strict); + +/** Set a function to be called when errors occur during reading. The `error_sink` will be called with `handle` as its first argument. If Files old/serd-0.20.0/serd-0.20.0.tar.bz2.sig and new/serd-0.22.0/serd-0.20.0.tar.bz2.sig differ Files old/serd-0.20.0/serd.o and new/serd-0.22.0/serd.o differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/src/node.c new/serd-0.22.0/src/node.c --- old/serd-0.20.0/src/node.c 2014-08-08 07:14:04.000000000 +0200 +++ new/serd-0.22.0/src/node.c 2015-10-08 21:32:14.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright 2011-2014 David Robillard <http://drobilla.net> + Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -216,6 +216,13 @@ return node; } +static inline unsigned +serd_digits(double abs) +{ + const double lg = ceil(log10(floor(abs) + 1.0)); + return lg < 1.0 ? 1U : (unsigned)lg; +} + SERD_API SerdNode serd_node_new_decimal(double d, unsigned frac_digits) @@ -225,7 +232,7 @@ } const double abs_d = fabs(d); - const unsigned int_digits = (unsigned)fmax(1.0, ceil(log10(abs_d + 1))); + const unsigned int_digits = serd_digits(abs_d); char* buf = (char*)calloc(int_digits + frac_digits + 3, 1); SerdNode node = { (const uint8_t*)buf, 0, 0, 0, SERD_LITERAL }; const double int_part = floor(abs_d); @@ -276,7 +283,7 @@ serd_node_new_integer(int64_t i) { int64_t abs_i = (i < 0) ? -i : i; - const unsigned digits = fmax(1.0, ceil(log10((double)abs_i + 1))); + const unsigned digits = serd_digits(abs_i); char* buf = (char*)calloc(digits + 2, 1); SerdNode node = { (const uint8_t*)buf, 0, 0, 0, SERD_LITERAL }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/src/reader.c new/serd-0.22.0/src/reader.c --- old/serd-0.20.0/src/reader.c 2014-08-08 16:40:02.000000000 +0200 +++ new/serd-0.22.0/src/reader.c 2015-10-08 21:32:14.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright 2011-2014 David Robillard <http://drobilla.net> + Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -17,6 +17,7 @@ #include "serd_internal.h" #include <assert.h> +#include <ctype.h> #include <errno.h> #include <stdarg.h> #include <stdint.h> @@ -84,6 +85,7 @@ uint8_t read_byte; ///< 1-byte 'buffer' used when not paging bool from_file; ///< True iff reading from `fd` bool paging; ///< True iff reading a page at a time + bool strict; ///< True iff strict parsing bool eof; bool seen_genid; #ifdef SERD_STACK_CHECK @@ -633,7 +635,7 @@ if ((c & 0x80)) { // Multi-byte character return !read_utf8_character(reader, dest, eat_byte_safe(reader, c)); } - + if (is_alpha(c) || is_digit(c) || c == '_' || c == '-') { push_byte(reader, dest, eat_byte_safe(reader, c)); return true; @@ -654,7 +656,7 @@ } return false; } - + static SerdStatus read_PLX(SerdReader* reader, Ref dest) { @@ -802,7 +804,17 @@ break; default: if (c <= 0x20) { - return pop_node(reader, ref); + if (isprint(c)) { + r_err(reader, SERD_ERR_BAD_SYNTAX, + "invalid IRI character `%c' (escape %%%02X)\n", c, c); + } else { + r_err(reader, SERD_ERR_BAD_SYNTAX, + "invalid IRI character (escape %%%02X)\n", c, c); + } + if (reader->strict) { + return pop_node(reader, ref); + } + push_byte(reader, ref, eat_byte_safe(reader, c)); } else { push_byte(reader, ref, eat_byte_safe(reader, c)); } @@ -872,7 +884,7 @@ *ate_dot = true; // Force caller to deal with stupid grammar return true; // Next byte is not a number character, done } - + push_byte(reader, ref, '.'); read_0_9(reader, ref, false); } @@ -990,7 +1002,7 @@ } static Ref -read_BLANK_NODE_LABEL(SerdReader* reader) +read_BLANK_NODE_LABEL(SerdReader* reader, bool* ate_dot) { eat_byte_safe(reader, '_'); eat_byte_check(reader, ':'); @@ -1014,18 +1026,21 @@ } } - const SerdNode* n = deref(reader, ref); + SerdNode* n = deref(reader, ref); if (n->buf[n->n_bytes - 1] == '.' && !read_PN_CHARS(reader, ref)) { - r_err(reader, SERD_ERR_BAD_SYNTAX, "name ends with `.'\n"); - return pop_node(reader, ref); + // Ate trailing dot, pop it from stack/node and inform caller + --n->n_bytes; + serd_stack_pop(&reader->stack, 1); + *ate_dot = true; } if (reader->syntax == SERD_TURTLE) { - if (is_digit(n->buf[1])) { - if (n->buf[0] == 'b') { - ((char*)n->buf)[0] = 'B'; // Prevent clash + if (is_digit(n->buf[reader->bprefix_len + 1])) { + if ((n->buf[reader->bprefix_len]) == 'b') { + ((char*)n->buf)[reader->bprefix_len] = 'B'; // Prevent clash reader->seen_genid = true; - } else if (reader->seen_genid && n->buf[0] == 'B') { + } else if (reader->seen_genid && + n->buf[reader->bprefix_len] == 'B') { r_err(reader, SERD_ERR_ID_CLASH, "found both `b' and `B' blank IDs, prefix required\n"); return pop_node(reader, ref); @@ -1058,51 +1073,64 @@ return ref; } +static Ref +read_blankName(SerdReader* reader) +{ + eat_byte_safe(reader, '='); + if (eat_byte_check(reader, '=') != '=') { + return r_err(reader, SERD_ERR_BAD_SYNTAX, "expected `='\n"); + } + + Ref subject = 0; + bool ate_dot = false; + read_ws_star(reader); + read_iri(reader, &subject, &ate_dot); + return subject; +} + static bool -read_blank(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest) +read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest) { const SerdStatementFlags old_flags = *ctx.flags; bool empty; - switch (peek_byte(reader)) { - case '_': - return (*dest = read_BLANK_NODE_LABEL(reader)); - case '[': - eat_byte_safe(reader, '['); - if ((empty = peek_delim(reader, ']'))) { - *ctx.flags |= (subject) ? SERD_EMPTY_S : SERD_EMPTY_O; - } else { - *ctx.flags |= (subject) ? SERD_ANON_S_BEGIN : SERD_ANON_O_BEGIN; + eat_byte_safe(reader, '['); + if ((empty = peek_delim(reader, ']'))) { + *ctx.flags |= (subject) ? SERD_EMPTY_S : SERD_EMPTY_O; + } else { + *ctx.flags |= (subject) ? SERD_ANON_S_BEGIN : SERD_ANON_O_BEGIN; + if (peek_delim(reader, '=')) { + if (!(*dest = read_blankName(reader)) || + !eat_delim(reader, ';')) { + return false; + } } + } + if (!*dest) { *dest = blank_id(reader); - if (ctx.subject) { - TRY_RET(emit_statement(reader, ctx, *dest, 0, 0)); - } + } + if (ctx.subject) { + TRY_RET(emit_statement(reader, ctx, *dest, 0, 0)); + } - ctx.subject = *dest; - if (!empty) { - *ctx.flags &= ~(SERD_LIST_CONT); - if (!subject) { - *ctx.flags |= SERD_ANON_CONT; - } - bool ate_dot = false; - read_predicateObjectList(reader, ctx, &ate_dot); - if (ate_dot) { - return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n"); - } - read_ws_star(reader); - if (reader->end_sink) { - reader->end_sink(reader->handle, deref(reader, *dest)); - } - *ctx.flags = old_flags; + ctx.subject = *dest; + if (!empty) { + *ctx.flags &= ~(SERD_LIST_CONT); + if (!subject) { + *ctx.flags |= SERD_ANON_CONT; + } + bool ate_dot_in_list = false; + read_predicateObjectList(reader, ctx, &ate_dot_in_list); + if (ate_dot_in_list) { + return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n"); } - eat_byte_check(reader, ']'); - return true; - case '(': - return read_collection(reader, ctx, dest); - default: - return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid blank node\n"); + read_ws_star(reader); + if (reader->end_sink) { + reader->end_sink(reader->handle, deref(reader, *dest)); + } + *ctx.flags = old_flags; } + return (eat_byte_check(reader, ']') == ']'); } // Recurses, calling statement_sink for every statement encountered. @@ -1129,11 +1157,16 @@ case '\0': case ')': return false; - case '[': case '(': + case '[': emit = false; - // fall through + TRY_THROW(ret = read_anon(reader, ctx, false, &o)); + break; + case '(': + emit = false; + TRY_THROW(ret = read_collection(reader, ctx, &o)); + break; case '_': - TRY_THROW(ret = read_blank(reader, ctx, false, &o)); + TRY_THROW(ret = (o = read_BLANK_NODE_LABEL(reader, ate_dot))); break; case '<': case ':': TRY_THROW(ret = read_iri(reader, &o, ate_dot)); @@ -1298,11 +1331,17 @@ Ref subject = 0; bool ate_dot = false; switch (peek_byte(reader)) { - case '[': case '(': + case '[': + *nested = true; + read_anon(reader, ctx, true, &subject); + break; + case '(': *nested = true; - // nobreak + read_collection(reader, ctx, &subject); + break; case '_': - read_blank(reader, ctx, true, &subject); + *nested = false; + subject = read_BLANK_NODE_LABEL(reader, &ate_dot); break; default: read_iri(reader, &subject, &ate_dot); @@ -1320,10 +1359,10 @@ ctx.subject = subject; if (nested) { read_ws_star(reader); + ret = true; if (peek_byte(reader) != '.') { - read_predicateObjectList(reader, ctx, ate_dot); + ret = read_predicateObjectList(reader, ctx, ate_dot); } - ret = true; } else { TRY_RET(read_ws_plus(reader)); ret = read_predicateObjectList(reader, ctx, ate_dot); @@ -1411,14 +1450,15 @@ case '@': TRY_RET(read_directive(reader)); read_ws_star(reader); - return eat_byte_safe(reader, '.'); + return (eat_byte_check(reader, '.') == '.'); default: - TRY_RET(read_triples(reader, ctx, &ate_dot)); - if (ate_dot) { + if (!read_triples(reader, ctx, &ate_dot)) { + return false; + } else if (ate_dot) { return true; } else { read_ws_star(reader); - return eat_byte_check(reader, '.'); + return (eat_byte_check(reader, '.') == '.'); } break; } @@ -1466,6 +1506,7 @@ me->read_buf = 0; me->file_buf = 0; me->read_head = 0; + me->strict = false; me->eof = false; me->seen_genid = false; #ifdef SERD_STACK_CHECK @@ -1482,6 +1523,13 @@ SERD_API void +serd_reader_set_strict(SerdReader* reader, bool strict) +{ + reader->strict = strict; +} + +SERD_API +void serd_reader_set_error_sink(SerdReader* reader, SerdErrorSink error_sink, void* error_handle) @@ -1546,18 +1594,20 @@ serd_reader_read_file(SerdReader* reader, const uint8_t* uri) { - const uint8_t* path = serd_uri_to_path(uri); + uint8_t* const path = serd_file_uri_parse(uri, NULL); if (!path) { return SERD_ERR_BAD_ARG; } FILE* fd = serd_fopen((const char*)path, "r"); if (!fd) { + free(path); return SERD_ERR_UNKNOWN; } SerdStatus ret = serd_reader_read_file_handle(reader, fd, path); fclose(fd); + free(path); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/src/serd_internal.h new/serd-0.22.0/src/serd_internal.h --- old/serd-0.20.0/src/serd_internal.h 2014-08-08 16:40:02.000000000 +0200 +++ new/serd-0.22.0/src/serd_internal.h 2015-10-07 03:47:14.000000000 +0200 @@ -38,14 +38,6 @@ # define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif -#ifndef HAVE_FMAX -static inline double -fmax(double a, double b) -{ - return (a < b) ? b : a; -} -#endif - /* File and Buffer Utilities */ static inline FILE* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/src/serdi.c new/serd-0.22.0/src/serdi.c --- old/serd-0.20.0/src/serdi.c 2014-08-08 07:14:04.000000000 +0200 +++ new/serd-0.22.0/src/serdi.c 2015-10-08 21:32:14.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright 2011-2013 David Robillard <http://drobilla.net> + Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -21,6 +21,9 @@ #include <stdlib.h> #include <string.h> +#define SERDI_ERROR(msg) fprintf(stderr, "serdi: " msg); +#define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serdi: " fmt, __VA_ARGS__); + typedef struct { SerdEnv* env; SerdWriter* writer; @@ -41,6 +44,7 @@ print_usage(const char* name, bool error) { FILE* const os = error ? stderr : stdout; + fprintf(os, "%s", error ? "\n" : ""); fprintf(os, "Usage: %s [OPTION]... INPUT [BASE_URI]\n", name); fprintf(os, "Read and write RDF syntax.\n"); fprintf(os, "Use - for INPUT to read from standard input.\n\n"); @@ -50,6 +54,7 @@ fprintf(os, " -f Keep full URIs in input (don't qualify).\n"); fprintf(os, " -h Display this help and exit.\n"); fprintf(os, " -i SYNTAX Input syntax (`turtle' or `ntriples').\n"); + fprintf(os, " -l Lax (non-strict) parsing.\n"); fprintf(os, " -o SYNTAX Output syntax (`turtle' or `ntriples').\n"); fprintf(os, " -p PREFIX Add PREFIX to blank node IDs.\n"); fprintf(os, " -q Suppress all output except data.\n"); @@ -67,17 +72,17 @@ } else if (!strcmp(name, "ntriples")) { *syntax = SERD_NTRIPLES; } else { - fprintf(stderr, "Unknown input format `%s'\n", name); + SERDI_ERRORF("unknown syntax `%s'\n", name); return false; } return true; } static int -bad_arg(const char* name, char opt) +missing_arg(const char* name, char opt) { - fprintf(stderr, "%s: Bad or missing value for -%c\n", name, opt); - return 1; + SERDI_ERRORF("option requires an argument -- '%c'\n", opt); + return print_usage(name, true); } static SerdStatus @@ -100,6 +105,7 @@ bool bulk_read = true; bool bulk_write = false; bool full_uris = false; + bool lax = false; bool quiet = false; const uint8_t* in_name = NULL; const uint8_t* add_prefix = NULL; @@ -119,6 +125,8 @@ full_uris = true; } else if (argv[a][1] == 'h') { return print_usage(argv[0], false); + } else if (argv[a][1] == 'l') { + lax = true; } else if (argv[a][1] == 'q') { quiet = true; } else if (argv[a][1] == 'v') { @@ -129,36 +137,40 @@ ++a; break; } else if (argv[a][1] == 'i') { - if (++a == argc || !set_syntax(&input_syntax, argv[a])) { - return bad_arg(argv[0], 'i'); + if (++a == argc) { + return missing_arg(argv[0], 'i'); + } else if (!set_syntax(&input_syntax, argv[a])) { + return print_usage(argv[0], true); } } else if (argv[a][1] == 'o') { - if (++a == argc || !set_syntax(&output_syntax, argv[a])) { - return bad_arg(argv[0], 'o'); + if (++a == argc) { + return missing_arg(argv[0], 'o'); + } else if (!set_syntax(&output_syntax, argv[a])) { + return print_usage(argv[0], true); } } else if (argv[a][1] == 'p') { if (++a == argc) { - return bad_arg(argv[0], 'p'); + return missing_arg(argv[0], 'p'); } add_prefix = (const uint8_t*)argv[a]; } else if (argv[a][1] == 'c') { if (++a == argc) { - return bad_arg(argv[0], 'c'); + return missing_arg(argv[0], 'c'); } chop_prefix = (const uint8_t*)argv[a]; } else if (argv[a][1] == 'r') { if (++a == argc) { - return bad_arg(argv[0], 'r'); + return missing_arg(argv[0], 'r'); } root_uri = (const uint8_t*)argv[a]; } else { - fprintf(stderr, "%s: Unknown option `%s'\n", argv[0], argv[a]); + SERDI_ERRORF("invalid option -- '%s'\n", argv[a] + 1); return print_usage(argv[0], true); } } if (a == argc) { - fprintf(stderr, "%s: Missing input\n", argv[0]); + SERDI_ERROR("missing input\n"); return 1; } @@ -215,6 +227,7 @@ (SerdStatementSink)serd_writer_write_statement, (SerdEndSink)serd_writer_end_anon); + serd_reader_set_strict(reader, !lax); if (quiet) { serd_reader_set_error_sink(reader, quiet_error_sink, NULL); serd_writer_set_error_sink(writer, quiet_error_sink, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/src/writer.c new/serd-0.22.0/src/writer.c --- old/serd-0.20.0/src/writer.c 2014-08-08 07:14:03.000000000 +0200 +++ new/serd-0.22.0/src/writer.c 2015-10-08 21:32:14.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright 2011-2014 David Robillard <http://drobilla.net> + Copyright 2011-2015 David Robillard <http://drobilla.net> Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -177,7 +177,7 @@ size_t i = 0; uint8_t in = utf8[i++]; - + #define READ_BYTE() \ in = utf8[i++] & 0x3F; \ c = (c << 6) | in; @@ -237,7 +237,7 @@ return !in_range(c, 0x20, 0x7E); } } - + static size_t write_uri(SerdWriter* writer, const uint8_t* utf8, size_t n_bytes) { @@ -435,6 +435,14 @@ } Field; static bool +is_inline_start(const SerdWriter* writer, Field field, SerdStatementFlags flags) +{ + return (writer->syntax != SERD_NTRIPLES && + ((field == FIELD_SUBJECT && (flags & SERD_ANON_S_BEGIN)) || + (field == FIELD_OBJECT && (flags & SERD_ANON_O_BEGIN)))); +} + +static bool write_node(SerdWriter* writer, const SerdNode* node, const SerdNode* datatype, @@ -443,13 +451,12 @@ SerdStatementFlags flags) { SerdChunk uri_prefix; - SerdChunk uri_suffix; + SerdNode prefix; + SerdChunk suffix; bool has_scheme; switch (node->type) { case SERD_BLANK: - if (writer->syntax != SERD_NTRIPLES - && ((field == FIELD_SUBJECT && (flags & SERD_ANON_S_BEGIN)) - || (field == FIELD_OBJECT && (flags & SERD_ANON_O_BEGIN)))) { + if (is_inline_start(writer, field, flags)) { ++writer->indent; write_sep(writer, SEP_ANON_BEGIN); } else if (writer->syntax != SERD_NTRIPLES @@ -484,18 +491,27 @@ case SERD_CURIE: switch (writer->syntax) { case SERD_NTRIPLES: - if (serd_env_expand(writer->env, node, &uri_prefix, &uri_suffix)) { + if (serd_env_expand(writer->env, node, &uri_prefix, &suffix)) { w_err(writer, SERD_ERR_BAD_CURIE, "undefined namespace prefix `%s'\n", node->buf); return false; } sink("<", 1, writer); write_uri(writer, uri_prefix.buf, uri_prefix.len); - write_uri(writer, uri_suffix.buf, uri_suffix.len); + write_uri(writer, suffix.buf, suffix.len); sink(">", 1, writer); break; case SERD_TURTLE: + if (is_inline_start(writer, field, flags)) { + ++writer->indent; + write_sep(writer, SEP_ANON_BEGIN); + sink("== ", 3, writer); + } write_lname(writer, node->buf, node->n_bytes); + if (is_inline_start(writer, field, flags)) { + sink(" ;", 2, writer); + write_newline(writer); + } } break; case SERD_LITERAL: @@ -536,6 +552,11 @@ } break; case SERD_URI: + if (is_inline_start(writer, field, flags)) { + ++writer->indent; + write_sep(writer, SEP_ANON_BEGIN); + sink("== ", 3, writer); + } has_scheme = serd_uri_string_has_scheme(node->buf); if (field == FIELD_PREDICATE && (writer->syntax == SERD_TURTLE) && !strcmp((const char*)node->buf, NS_RDF "type")) { @@ -545,15 +566,12 @@ && !strcmp((const char*)node->buf, NS_RDF "nil")) { sink("()", 2, writer); break; - } else if (has_scheme && (writer->style & SERD_STYLE_CURIED)) { - SerdNode prefix; - SerdChunk suffix; - if (serd_env_qualify(writer->env, node, &prefix, &suffix)) { - write_uri(writer, prefix.buf, prefix.n_bytes); - sink(":", 1, writer); - write_uri(writer, suffix.buf, suffix.len); - break; - } + } else if (has_scheme && (writer->style & SERD_STYLE_CURIED) && + serd_env_qualify(writer->env, node, &prefix, &suffix)) { + write_uri(writer, prefix.buf, prefix.n_bytes); + sink(":", 1, writer); + write_uri(writer, suffix.buf, suffix.len); + break; } sink("<", 1, writer); if (writer->style & SERD_STYLE_RESOLVED) { @@ -574,6 +592,10 @@ write_uri(writer, node->buf, node->n_bytes); } sink(">", 1, writer); + if (is_inline_start(writer, field, flags)) { + sink(" ;", 2, writer); + write_newline(writer); + } default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/bad/bad-ext-namedblank-op.ttl new/serd-0.22.0/tests/bad/bad-ext-namedblank-op.ttl --- old/serd-0.20.0/tests/bad/bad-ext-namedblank-op.ttl 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/bad/bad-ext-namedblank-op.ttl 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1,3 @@ +@prefix eg: <http://example.org/eg#> . + +eg:s eg:p [ =: _:o ; eg:name "o" ] . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-blankdot.nt new/serd-0.22.0/tests/good/test-blankdot.nt --- old/serd-0.20.0/tests/good/test-blankdot.nt 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-blankdot.nt 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1 @@ +<http://example.org/subject> <http://example.org/predicate> _:c . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-blankdot.ttl new/serd-0.22.0/tests/good/test-blankdot.ttl --- old/serd-0.20.0/tests/good/test-blankdot.ttl 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-blankdot.ttl 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1 @@ +<http://example.org/subject> <http://example.org/predicate> _:c. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-ext-namedblank-iri.nt new/serd-0.22.0/tests/good/test-ext-namedblank-iri.nt --- old/serd-0.20.0/tests/good/test-ext-namedblank-iri.nt 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-ext-namedblank-iri.nt 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1,2 @@ +<http://example.org/eg#s> <http://example.org/eg#p> <http://example.org/object> . +<http://example.org/object> <http://example.org/eg#name> "o" . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-ext-namedblank-iri.ttl new/serd-0.22.0/tests/good/test-ext-namedblank-iri.ttl --- old/serd-0.20.0/tests/good/test-ext-namedblank-iri.ttl 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-ext-namedblank-iri.ttl 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1,3 @@ +@prefix eg: <http://example.org/eg#> . + +eg:s eg:p [ == <http://example.org/object> ; eg:name "o" ] . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-ext-namedblank-prefix.nt new/serd-0.22.0/tests/good/test-ext-namedblank-prefix.nt --- old/serd-0.20.0/tests/good/test-ext-namedblank-prefix.nt 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-ext-namedblank-prefix.nt 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1,2 @@ +<http://example.org/eg#s> <http://example.org/eg#p> <http://example.org/eg#o> . +<http://example.org/eg#o> <http://example.org/eg#name> "o" . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/good/test-ext-namedblank-prefix.ttl new/serd-0.22.0/tests/good/test-ext-namedblank-prefix.ttl --- old/serd-0.20.0/tests/good/test-ext-namedblank-prefix.ttl 1970-01-01 01:00:00.000000000 +0100 +++ new/serd-0.22.0/tests/good/test-ext-namedblank-prefix.ttl 2015-10-07 03:47:14.000000000 +0200 @@ -0,0 +1,3 @@ +@prefix eg: <http://example.org/eg#> . + +eg:s eg:p [ == eg:o ; eg:name "o" ] . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/tests/serd_test.c new/serd-0.22.0/tests/serd_test.c --- old/serd-0.20.0/tests/serd_test.c 2014-08-08 07:14:03.000000000 +0200 +++ new/serd-0.22.0/tests/serd_test.c 2015-10-07 03:47:14.000000000 +0200 @@ -25,9 +25,11 @@ #define USTR(s) ((const uint8_t*)(s)) -#ifdef _WIN32 +#ifndef INFINITY # define INFINITY (DBL_MAX + DBL_MAX) -# define NAN (INFINITY - INFINITY) +#endif +#ifndef NAN +# define NAN (INFINITY - INFINITY) #endif static int @@ -45,7 +47,7 @@ test_strtod(double dbl, double max_delta) { char buf[1024]; - snprintf(buf, sizeof(buf), "%lf", dbl); + snprintf(buf, sizeof(buf), "%f", dbl); char* endptr = NULL; const double out = serd_strtod(buf, &endptr); @@ -100,11 +102,11 @@ } const double expt_test_nums[] = { - 2.0E18, -5e19, +8e20, 2e+34, -5e-5, 8e0, 9e-0, 2e+0 + 2.0E18, -5e19, +8e20, 2e+24, -5e-5, 8e0, 9e-0, 2e+0 }; const char* expt_test_strs[] = { - "02e18", "-5e019", "+8e20", "2E+34", "-5E-5", "8E0", "9e-0", " 2e+0" + "02e18", "-5e019", "+8e20", "2E+24", "-5E-5", "8E0", "9e-0", " 2e+0" }; for (unsigned i = 0; i < sizeof(expt_test_nums) / sizeof(double); ++i) { @@ -399,6 +401,11 @@ // Test serd_node_new_uri_from_string + SerdNode nonsense = serd_node_new_uri_from_string(NULL, NULL, NULL); + if (nonsense.type != SERD_NOTHING) { + return failure("Successfully created NULL URI\n"); + } + SerdURI base_uri; SerdNode base = serd_node_new_uri_from_string(USTR("http://example.org/"), NULL, &base_uri); @@ -420,6 +427,10 @@ SerdEnv* env = serd_env_new(NULL); serd_env_set_prefix_from_strings(env, USTR("eg.2"), USTR("http://example.org/")); + if (!serd_env_set_base_uri(env, NULL)) { + return failure("Successfully set NULL base URI\n"); + } + if (!serd_env_set_base_uri(env, &node)) { return failure("Set base URI to %s\n", node.buf); } @@ -614,7 +625,10 @@ return failure("Apparently read an http URI\n"); } if (!serd_reader_read_file(reader, USTR("file:///better/not/exist"))) { - return failure("Apprently read a non-existent file\n"); + return failure("Apparently read a non-existent file\n"); + } + if (!serd_reader_read_file(reader, USTR("file://"))) { + return failure("Apparently read a file with no path\n"); } SerdStatus st = serd_reader_read_file(reader, USTR(path)); if (st) { Files old/serd-0.20.0/waf and new/serd-0.22.0/waf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/serd-0.20.0/wscript new/serd-0.22.0/wscript --- old/serd-0.20.0/wscript 2014-08-08 23:34:55.000000000 +0200 +++ new/serd-0.22.0/wscript 2015-10-08 21:34:01.000000000 +0200 @@ -11,7 +11,7 @@ # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -SERD_VERSION = '0.20.0' +SERD_VERSION = '0.22.0' SERD_MAJOR_VERSION = '0' # Mandatory waf variables @@ -27,6 +27,8 @@ help='Do not build command line utilities') opt.add_option('--test', action='store_true', dest='build_tests', help='Build unit tests') + opt.add_option('--no-coverage', action='store_true', dest='no_coverage', + help='Do not use gcov for code coverage') opt.add_option('--stack-check', action='store_true', dest='stack_check', help='Include runtime stack sanity checks') opt.add_option('--static', action='store_true', dest='static', @@ -62,16 +64,8 @@ if Options.options.largefile: conf.env.append_unique('DEFINES', ['_FILE_OFFSET_BITS=64']) - if conf.env.BUILD_TESTS: - conf.check(lib = 'gcov', - define_name = 'HAVE_GCOV', - mandatory = False) - - conf.check(function_name = 'fmax', - header_name = 'math.h', - define_name = 'HAVE_FMAX', - lib = ['m'], - mandatory = False) + if conf.env.BUILD_TESTS and not Options.options.no_coverage: + conf.check_cc(lib='gcov', define_name='HAVE_GCOV', mandatory=False) if not Options.options.no_posix: conf.check(function_name = 'posix_memalign', @@ -96,8 +90,8 @@ autowaf.set_lib_env(conf, 'serd', SERD_VERSION) conf.write_config_header('serd_config.h', remove=False) - autowaf.display_msg(conf, 'Utilities', str(conf.env.BUILD_UTILS)) - autowaf.display_msg(conf, 'Unit tests', str(conf.env.BUILD_TESTS)) + autowaf.display_msg(conf, 'Utilities', bool(conf.env.BUILD_UTILS)) + autowaf.display_msg(conf, 'Unit tests', bool(conf.env.BUILD_TESTS)) print('') lib_source = [ @@ -431,7 +425,7 @@ autowaf.run_tests(ctx, APPNAME, ['serd_test'], dirs=['.']) autowaf.run_tests(ctx, APPNAME, [ - 'serdi_static -q -o turtle %s/tests/good/base.ttl "base.ttl" > tests/good/base.ttl.out' % srcdir], + 'serdi_static -q -o turtle "%s/tests/good/base.ttl" "base.ttl" > tests/good/base.ttl.out' % srcdir], 0, name='base') if not file_equals('%s/tests/good/base.ttl' % srcdir, 'tests/good/base.ttl.out'): @@ -439,7 +433,7 @@ nul = os.devnull autowaf.run_tests(ctx, APPNAME, [ - 'serdi_static file://%s/tests/good/manifest.ttl > %s' % (srcdir, nul), + 'serdi_static "file://%s/tests/good/manifest.ttl" > %s' % (srcdir, nul), # 'serdi_static %s/tests/good/UTF-8.ttl > %s' % (srcdir, nul), 'serdi_static -v > %s' % nul, 'serdi_static -h > %s' % nul, @@ -448,7 +442,7 @@ 0, name='serdi-cmd-good') autowaf.run_tests(ctx, APPNAME, [ - 'serdi_static -q file://%s/tests/bad-id-clash.ttl > %s' % (srcdir, nul), + 'serdi_static -q "file://%s/tests/bad-id-clash.ttl" > %s' % (srcdir, nul), 'serdi_static > %s' % nul, 'serdi_static ftp://example.org/unsupported.ttl > %s' % nul, 'serdi_static -i > %s' % nul, @@ -472,9 +466,10 @@ commands = [] for test in tests: - path = os.path.join('tests', tdir, test) - commands += [ 'serdi_static -f "%s" "%s" > %s.out' % ( - os.path.join(srcdir, path), test_base(test), path) ] + for lax in ['', '-l']: + path = os.path.join('tests', tdir, test) + commands += [ 'serdi_static %s -f "%s" "%s" > %s.out' % ( + lax, os.path.join(srcdir, path), test_base(test), path) ] autowaf.run_tests(ctx, APPNAME, commands, 0, name=tdir) @@ -493,8 +488,9 @@ # Bad tests commands = [] for test in bad_tests: - commands += [ 'serdi_static -q "%s" "%s" > %s.out' % ( - os.path.join(srcdir, test), test_base(test), test) ] + for lax in ['', '-l']: + commands += [ 'serdi_static %s -q "%s" "%s" > %s.out' % ( + lax, os.path.join(srcdir, test), test_base(test), test) ] autowaf.run_tests(ctx, APPNAME, commands, 1, name='bad')

1 0

commit plplot for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '15

26 Nov '15

Hello community, here is the log from the commit of package plplot for openSUSE:Factory checked in at 2015-11-26 17:04:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plplot (Old) and /work/SRC/openSUSE:Factory/.plplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plplot" Changes: -------- --- /work/SRC/openSUSE:Factory/plplot/plplot.changes 2015-08-19 09:29:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plplot.new/plplot.changes 2015-11-26 17:04:37.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 25 22:23:07 UTC 2015 - p.drouand(a)gmail.com + +- Remove pkgconfig(libagg) requirement; the package doesn't build + against it anyway + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plplot.spec ++++++ --- /var/tmp/diff_new_pack.a24Kuq/_old 2015-11-26 17:04:39.000000000 +0100 +++ /var/tmp/diff_new_pack.a24Kuq/_new 2015-11-26 17:04:39.000000000 +0100 @@ -62,7 +62,6 @@ BuildRequires: perl(XML::DOM) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gnome-python-2.0) -BuildRequires: pkgconfig(libagg) BuildRequires: pkgconfig(libgnomeprintui-2.2) BuildRequires: pkgconfig(libgnomeui-2.0) BuildRequires: pkgconfig(lua)

1 0

commit rpmconf for openSUSE:Factory
by root＠hilbert.suse.de 26 Nov '15

26 Nov '15

Hello community, here is the log from the commit of package rpmconf for openSUSE:Factory checked in at 2015-11-26 17:04:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmconf (Old) and /work/SRC/openSUSE:Factory/.rpmconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmconf" Changes: -------- --- /work/SRC/openSUSE:Factory/rpmconf/rpmconf.changes 2015-11-17 14:23:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpmconf.new/rpmconf.changes 2015-11-26 17:04:36.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 25 20:45:35 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 1.0.14: + * Improve error message. + * Check for root privileges. + * Clarify man page. + +------------------------------------------------------------------- Old: ---- rpmconf-1.0.13.tar.gz New: ---- rpmconf-1.0.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmconf.spec ++++++ --- /var/tmp/diff_new_pack.kpIuAN/_old 2015-11-26 17:04:37.000000000 +0100 +++ /var/tmp/diff_new_pack.kpIuAN/_new 2015-11-26 17:04:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: rpmconf -Version: 1.0.13 +Version: 1.0.14 Release: 0 Summary: Tool to handle rpmnew and rpmsave files License: GPL-3.0+ @@ -59,7 +59,8 @@ SPHINXBUILD=sphinx-build-%{py3_ver} %install -python3 setup.py install --skip-build \ +python3 setup.py install \ + --skip-build \ --root %{buildroot} \ --install-scripts %{_sbindir} ++++++ rpmconf-1.0.13.tar.gz -> rpmconf-1.0.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf --- old/rpmconf-rpmconf-1.0.13-1/bin/rpmconf 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/bin/rpmconf 2015-11-24 11:01:18.000000000 +0100 @@ -1,5 +1,5 @@ -#!/usr/bin/env python3 -# +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # vim: noai:ts=4:sw=4:expandtab # # Copyright (C) 2015 Igor Gnatenko <i.gnatenko.brain(a)gmail.com> @@ -19,7 +19,10 @@ """ Main script which will end up in /usr/sbin/rpmconf """ import argparse from rpmconf import rpmconf +import errno +import os import sys +import time def main(): """ Main entry point. """ @@ -57,7 +60,18 @@ clean=args.clean, debug=args.debug, diff=args.diff, frontend=args.frontend, selinux=args.selinux) - rconf.run() + if os.geteuid() != 0: + sys.stderr.write("Most features are not useful without root privileges!!!\n") + time.sleep(5) + + try: + rconf.run() + except IOError as err: + if err.errno in (errno.EACCES, errno.EPERM): + sys.stderr.write("Error: You need root permissions to do this!\n") + sys.exit(1) + else: + raise if __name__ == "__main__": main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py --- old/rpmconf-rpmconf-1.0.13-1/docs/source/conf.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/docs/source/conf.py 2015-11-24 11:01:18.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # -*- coding: utf-8 -*- # # rpmconf documentation build configuration file, created by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf --- old/rpmconf-rpmconf-1.0.13-1/rel-eng/packages/rpmconf 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rel-eng/packages/rpmconf 2015-11-24 11:01:18.000000000 +0100 @@ -1 +1 @@ -1.0.13-1 ./ +1.0.14-1 ./ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py --- old/rpmconf-rpmconf-1.0.13-1/rpmconf/rpmconf.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf/rpmconf.py 2015-11-24 11:01:18.000000000 +0100 @@ -1,5 +1,5 @@ -#!/usr/bin/env python3 -# +#!/usr/bin/python3 +# -*- coding: utf-8 -*- # vim: noai:ts=4:sw=4:expandtab # pylint: disable=missing-docstring,too-many-arguments,too-many-branches # @@ -243,7 +243,8 @@ print(repr(merge_tool)) subprocess.check_call([merge_tool, conf_file, other_file]) else: - self.logger.error("You did not selected any frontend for merge") + self.logger.error("You did not selected any frontend for merge.\n" + + " Define it with environment variable 'MERGE' or flag -f.") sys.exit(2) except FileNotFoundError as err: sys.stderr.write("{0}\n".format(err.strerror)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf.sgml new/rpmconf-rpmconf-1.0.14-1/rpmconf.sgml --- old/rpmconf-rpmconf-1.0.13-1/rpmconf.sgml 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf.sgml 2015-11-24 11:01:18.000000000 +0100 @@ -26,10 +26,10 @@ <arg>-a, --all</arg> </cmdsynopsis> <cmdsynopsis> - <arg>-o<replaceable>package</replaceable>, --owner=<replaceable>package</replaceable></arg> + <arg>-o<replaceable><package></replaceable>, --owner=<replaceable><package></replaceable></arg> </cmdsynopsis> <cmdsynopsis> - <arg>-f<replaceable>type</replaceable> --frontend=<replaceable>type</replaceable></arg> + <arg>-f<replaceable><type></replaceable> --frontend=<replaceable><type></replaceable></arg> </cmdsynopsis> <cmdsynopsis> <arg>-c, --clean</arg> @@ -76,13 +76,13 @@ </listitem> </varlistentry> <varlistentry> - <term>-opackage, --owner=package</term> + <term>-o<package>, --owner=<package></term> <listitem> <para>Check only configuration files of given package.</para> </listitem> </varlistentry> <varlistentry> - <term>-ftype, --frontend=type</term> + <term>-f<type>, --frontend=<type></term> <listitem> <para>Define which frontend should be used for merging. Valid options are: vimdiff, gvimdiff, diffuse, kdiff3, meld and env. When set to env, the command to use is taken from the environment variable $MERGE. The default is env.</para> </listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/rpmconf.spec new/rpmconf-rpmconf-1.0.14-1/rpmconf.spec --- old/rpmconf-rpmconf-1.0.13-1/rpmconf.spec 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/rpmconf.spec 2015-11-24 11:01:18.000000000 +0100 @@ -1,7 +1,7 @@ Name: rpmconf Summary: Tool to handle rpmnew and rpmsave files License: GPLv3 -Version: 1.0.13 +Version: 1.0.14 Release: 1%{?dist} URL: http://wiki.github.com/xsuchy/rpmconf # source is created by: @@ -92,6 +92,13 @@ %dir %{_datadir}/rpmconf %changelog +* Tue Nov 24 2015 Miroslav Suchý <miroslav(a)suchy.cz> 1.0.14-1 +- we use utf8 +- call python3 directly +- 1258464 - improve error message +- 1282029 - check for root privileges +- 1283698 - clarify man page + * Fri Nov 13 2015 Miroslav Suchý <msuchy(a)redhat.com> 1.0.13-1 - 1278134 - do TB when somebody remove file under our hand diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmconf-rpmconf-1.0.13-1/setup.py new/rpmconf-rpmconf-1.0.14-1/setup.py --- old/rpmconf-rpmconf-1.0.13-1/setup.py 2015-11-13 16:56:44.000000000 +0100 +++ new/rpmconf-rpmconf-1.0.14-1/setup.py 2015-11-24 11:01:18.000000000 +0100 @@ -4,7 +4,7 @@ setup(name = "rpmconf", packages = ["rpmconf"], - version = "1.0.13", + version = "1.0.14", description = "Handle rpmnew and rpmsave files", author = "Igor Gnatenko", author_email = "i.gnatenko.brain(a)gmail.com",

1 0