June 2017 - openSUSE Commits - openSUSE Mailing Lists

commit libinput for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package libinput for openSUSE:Factory checked in at 2017-06-23 09:16:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libinput (Old) and /work/SRC/openSUSE:Factory/.libinput.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libinput" Fri Jun 23 09:16:30 2017 rev:45 rq:504033 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libinput/libinput.changes 2017-05-18 20:47:01.718196419 +0200 +++ /work/SRC/openSUSE:Factory/.libinput.new/libinput.changes 2017-06-23 09:16:34.001679585 +0200 @@ -1,0 +2,11 @@ +Fri Jun 9 07:58:39 UTC 2017 - jengelh(a)inai.de + +- Update to new upstream release 1.7.3 + * Fix a crash caused by the lid switch handler on device removal + (depending on the removal order, an assertion was triggered). + * A slight palm detection improvement - tapping in + the palm edge detection zone is now ignored, thus reducing the + number of inadvertant focus changes while typing. Previously, + we only ignored those taps in the top half of the touchpad. + +------------------------------------------------------------------- Old: ---- libinput-1.7.2.tar.xz libinput-1.7.2.tar.xz.sig New: ---- libinput-1.7.3.tar.xz libinput-1.7.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinput.spec ++++++ --- /var/tmp/diff_new_pack.2L5aFO/_old 2017-06-23 09:16:34.793567692 +0200 +++ /var/tmp/diff_new_pack.2L5aFO/_new 2017-06-23 09:16:34.797567127 +0200 @@ -18,7 +18,7 @@ Name: libinput %define lname libinput10 -Version: 1.7.2 +Version: 1.7.3 Release: 0 Summary: Input device and event processing library License: MIT ++++++ libinput-1.7.2.tar.xz -> libinput-1.7.3.tar.xz ++++++ ++++ 1821 lines of diff (skipped)

1 0

commit protobuf for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2017-06-23 09:16:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "protobuf" Fri Jun 23 09:16:24 2017 rev:28 rq:504018 version:3.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2017-01-25 22:35:32.247848202 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2017-06-23 09:16:30.582162757 +0200 @@ -1,0 +2,76 @@ +Fri Jun 16 07:57:00 UTC 2017 - mpluskal(a)suse.com + +- Install LICENSE + +------------------------------------------------------------------- +Sun Jun 11 17:15:13 UTC 2017 - alarrosa(a)suse.com + +- Update to 3.3.0 : + * C++: + * Fixed map fields serialization of DynamicMessage to correctly serialize + both key and value regardless of their presence. + * Parser now rejects field number 0 correctly. + * New API Message::SpaceUsedLong() that’s equivalent to + Message::SpaceUsed() but returns the value in size_t. + * JSON support + - New flag always_print_enums_as_ints in JsonPrintOptions. + - New flag preserve_proto_field_names in JsonPrintOptions. It will instruct + the JSON printer to use the original field name declared in the .proto + file instead of converting them to lowerCamelCase when printing JSON. + - JsonPrintOptions.always_print_primtive_fields now works for oneof message + fields. + - Fixed a bug that doesn’t allow different fields to set the same json_name + value. + - Fixed a performance bug that causes excessive memory copy when printing + large messages. + * Various performance optimizations. + * Java: + * Map field setters eagerly validate inputs and throw NullPointerExceptions + as appropriate. + * Added ByteBuffer overloads to the generated parsing methods and the Parser + interface. + * proto3 enum's getNumber() method now throws on UNRECOGNIZED values. + * Output of JsonFormat is now locale independent. + * Python: + * Added FindServiceByName() in the pure-Python DescriptorPool. This works only + for descriptors added with DescriptorPool.Add(). Generated descriptor_pool + does not support this yet. + * Added a descriptor_pool parameter for parsing Any in text_format.Parse(). + * descriptor_pool.FindFileContainingSymbol() now is able to find nested + extensions. + * Extending empty [] to repeated field now sets parent message presence. +- Update to 3.2.0 : + * Added protoc version number to protoc plugin protocol. It can be used by + protoc plugin to detect which version of protoc is used with the plugin and + mitigate known problems in certain version of protoc. + * C++: + * The default parsing byte size limit has been raised from 64MB to 2GB. + * Added rvalue setters for non-arena string fields. + * Enabled debug logging for Android. + * Fixed a double-free problem when using Reflection::SetAllocatedMessage() + with extension fields. + * Fixed several deterministic serialization bugs: + * MessageLite::SerializeAsString() now respects the global deterministic + serialization flag. + * Extension fields are serialized deterministically as well. Fixed protocol + compiler to correctly report importing-self as an error. + * Fixed FileDescriptor::DebugString() to print custom options correctly. + * Various performance/codesize optimizations and cleanups. + * Java: + * The default parsing byte size limit has been raised from 64MB to 2GB. + * Added recursion limit when parsing JSON. + * Fixed a bug that enumType.getDescriptor().getOptions() doesn't have custom + options. + * Fixed generated code to support field numbers up to 2^29-1. + * Python: + * You can now assign NumPy scalars/arrays (np.int32, np.int64) to protobuf + fields, and assigning other numeric types has been optimized for + performance. + * Pure-Python: message types are now garbage-collectable. + * Python/C++: a lot of internal cleanup/refactoring. +- Increase soname to 13 +- Generate python2-protobuf and python3-protobuf packages in Factory +- Make the python2-protobuf package provide and obsolete python-protobuf + to make the transition smooth in Tumbleweed + +------------------------------------------------------------------- Old: ---- protobuf-3.1.0.tar.gz New: ---- protobuf-3.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.adxSUs/_old 2017-06-23 09:16:31.602018653 +0200 +++ /var/tmp/diff_new_pack.adxSUs/_new 2017-06-23 09:16:31.602018653 +0200 @@ -16,15 +16,25 @@ # -%define soname 11 +%define soname 13 %define tarname protobuf # requires gmock, which is not yet in the distribution %bcond_with check %bcond_without protobuf_java %bcond_without protobuf_python +%if %{with protobuf_python} +%if 0%{?suse_version} > 1320 +%define protobuf_python3 1 +%define python2_prefix python2 +%else +%define protobuf_python3 0 +%define python2_prefix python +%endif +%endif + Name: protobuf -Version: 3.1.0 +Version: 3.3.0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause @@ -47,11 +57,18 @@ BuildRequires: java-devel >= 1.6.0 %endif %if %{with protobuf_python} -BuildRequires: python-dateutil -BuildRequires: python-devel -BuildRequires: python-python-gflags -BuildRequires: python-pytz -BuildRequires: python-setuptools +BuildRequires: %{python2_prefix}-devel +BuildRequires: %{python2_prefix}-python-dateutil +BuildRequires: %{python2_prefix}-python-gflags +BuildRequires: %{python2_prefix}-pytz +BuildRequires: %{python2_prefix}-setuptools +%if %{protobuf_python3} +BuildRequires: python3-devel +BuildRequires: python3-python-dateutil +BuildRequires: python3-python-gflags +BuildRequires: python3-pytz +BuildRequires: python3-setuptools +%endif BuildRequires: zlib-devel %endif @@ -113,18 +130,32 @@ %endif %if %{with protobuf_python} -%package -n python-%{name} -Summary: Python Bindings for Google Protocol Buffers +%package -n %{python2_prefix}-%{name} +Summary: Python2 Bindings for Google Protocol Buffers Group: Development/Libraries/Python +%if 0%{?protobuf_python3} +Provides: python-%{name} = %{version} +Obsoletes: python-%{name} < %{version} +%endif %if 0%{?suse_version} %py_requires %else Requires: python %endif -%description -n python-%{name} +%description -n %{python2_prefix}-%{name} +This package contains the Python bindings for Google Protocol Buffers. + +%if 0%{?protobuf_python3} +%package -n python3-%{name} +Summary: Python3 Bindings for Google Protocol Buffers +Group: Development/Libraries/Python +Requires: python3 + +%description -n python3-%{name} This package contains the Python bindings for Google Protocol Buffers. %endif +%endif %prep @@ -161,11 +192,21 @@ %endif %if %{with protobuf_python} -pushd python -python setup.py build +cp -Ra python python2 +pushd python2 +python2 setup.py build # setup.py seems to be broken, some files are only installed on the second invocation -python setup.py build +python2 setup.py build popd + +%if 0%{?protobuf_python3} +cp -Ra python python3 +pushd python3 +python3 setup.py build +# setup.py seems to be broken, some files are only installed on the second invocation +python3 setup.py build +popd +%endif %endif %if %{with check} @@ -188,17 +229,28 @@ %endif %if %{with protobuf_python} -pushd python -python setup.py install --skip-build \ +pushd python2 +python2 setup.py install --skip-build \ --prefix=%{_prefix} \ --root %{buildroot} \ - --install-lib=%{py_sitedir} \ + --install-lib=%{python_sitearch} \ --install-data=%{_datadir} \ --record-rpm=INSTALLED_FILES popd -%endif +%fdupes -s %{buildroot}%{python_sitearch} -%fdupes -s %{buildroot}%{py_sitedir} +%if 0%{?protobuf_python3} +pushd python3 +python3 setup.py install --skip-build \ + --prefix=%{_prefix} \ + --root %{buildroot} \ + --install-lib=%{python3_sitearch} \ + --install-data=%{_datadir} \ + --record-rpm=INSTALLED_FILES +popd +%fdupes -s %{buildroot}%{python3_sitearch} +%endif +%endif %post -n libprotobuf%{soname} -p /sbin/ldconfig @@ -214,6 +266,7 @@ %files -n libprotobuf%{soname} %defattr(-, root, root) +%doc LICENSE %{_libdir}/libprotobuf.so.%{soname}* %files -n libprotoc%{soname} @@ -240,8 +293,13 @@ %endif %if %{with protobuf_python} -%files -n python-%{name} -f python/INSTALLED_FILES +%files -n %{python2_prefix}-%{name} -f python2/INSTALLED_FILES %defattr(-,root,root) + +%if 0%{?protobuf_python3} +%files -n python3-%{name} -f python3/INSTALLED_FILES +%defattr(-,root,root) +%endif %endif %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.adxSUs/_old 2017-06-23 09:16:31.630014697 +0200 +++ /var/tmp/diff_new_pack.adxSUs/_new 2017-06-23 09:16:31.630014697 +0200 @@ -1,3 +1,3 @@ -libprotobuf11 -libprotoc11 -libprotobuf-lite11 +libprotobuf13 +libprotoc13 +libprotobuf-lite13 ++++++ protobuf-3.1.0.tar.gz -> protobuf-3.3.0.tar.gz ++++++ ++++ 178235 lines of diff (skipped)

1 0

commit gnome-music for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package gnome-music for openSUSE:Factory checked in at 2017-06-23 09:16:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-music (Old) and /work/SRC/openSUSE:Factory/.gnome-music.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-music" Fri Jun 23 09:16:02 2017 rev:30 rq:505722 version:3.24.2 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-music/gnome-music.changes 2017-05-31 12:14:05.280289495 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-music.new/gnome-music.changes 2017-06-23 09:16:04.745813379 +0200 @@ -1,0 +2,6 @@ +Thu Jun 22 11:54:09 UTC 2017 - zaitor(a)opensuse.org + +- Add gnome-music-group-configs.patch: Fix sefault at launch with + updated python-cairo (bgo#774500, bgo#781326). + +------------------------------------------------------------------- New: ---- gnome-music-group-configs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-music.spec ++++++ --- /var/tmp/diff_new_pack.t2Z6xX/_old 2017-06-23 09:16:06.377582814 +0200 +++ /var/tmp/diff_new_pack.t2Z6xX/_new 2017-06-23 09:16:06.381582249 +0200 @@ -25,6 +25,8 @@ Url: http://www.gnome.org Source0: http://download.gnome.org/sources/gnome-music/3.24/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM gnome-music-group-configs.patch bgo#774500 bgo#781326 zaitor(a)opensuse.org -- Fix sefault at launch with updated python-cairo +Patch0: gnome-music-group-configs.patch BuildRequires: fdupes BuildRequires: intltool >= 0.26 BuildRequires: itstool @@ -59,6 +61,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build %configure ++++++ gnome-music-group-configs.patch ++++++ >From e2d375f7ea3fdfaab9012bd1924b44a68dd3021e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Pal=C3=A1cios?= <ppalacios992(a)gmail.com> Date: Tue, 28 Feb 2017 19:20:57 -0300 Subject: gnome-music.in: Group configuration in functions All pre-configurations that must be set before starting gnome-music were grouped in proper functions so it is now easier to read, understand and maintain. It also follows PEP-8 when possible. https://bugzilla.gnome.org/show_bug.cgi?id=774500 --- gnome-music.in | 139 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 91 insertions(+), 48 deletions(-) diff --git a/gnome-music.in b/gnome-music.in index e23e357..debe77c 100644 --- a/gnome-music.in +++ b/gnome-music.in @@ -23,88 +23,131 @@ # code, but you are not obligated to do so. If you do not wish to do so, # delete this exception statement from your version. -import sys -import signal -import os -import locale +import argparse import gettext +import locale +import logging +import os +import signal +import sys # Make sure we'll find the pygobject module, even in JHBuild sys.path.insert(1, '@pyexecdir@') # Make sure we'll find the gnomemusic module, even in JHBuild sys.path.insert(1, '@pythondir@') -import argparse -import logging import gi -from gi.repository import Gio -import gnomemusic -localedir = '@localedir@' -srcdir = os.path.abspath(os.path.join(os.path.dirname(gnomemusic.__file__), '..')) -if os.path.exists(os.path.join(srcdir, 'gnome-music.doap')): - print('Running from source tree, using local files') - pkgdatadir = os.path.join(srcdir, 'data') - libgd_libdir = os.path.join(srcdir, 'libgd', '.libs') - libgd_typelibdir = os.path.join(srcdir, 'libgd') - if not os.environ.get('GSETTINGS_SCHEMA_DIR'): - os.environ['GSETTINGS_SCHEMA_DIR'] = pkgdatadir -else: - pkgdatadir = '@pkgdatadir@' - libgd_libdir = '@pkglibdir@' - libgd_typelibdir = '@pkglibdir@/girepository-1.0' - -# We use our own libgd.so, so let gi.repository find it +gi.require_version('Gtk', '3.0') gi.require_version('GIRepository', '2.0') -from gi.repository import GIRepository -GIRepository.Repository.prepend_search_path(libgd_typelibdir) -GIRepository.Repository.prepend_library_path(libgd_libdir) +from gi.repository import GIRepository, Gio, Gtk +import gnomemusic -def install_excepthook(): - """ Make sure we exit when an unhandled exception occurs. """ - gi.require_version('Gtk', '3.0') - from gi.repository import Gtk - old_hook = sys.excepthook + +SOURCE_DIR = os.path.abspath( + os.path.join(os.path.dirname(gnomemusic.__file__), '..')) + +# Defines if we are running from inside project source. This is +# necessary so we can set data and libgd directories correctly. +_LOCAL = os.path.exists(os.path.join(SOURCE_DIR, 'gnome-music.doap')) + +# Directory settings +LOCALE_DIR = '@localedir@' +PKGDATA_DIR = os.path.join(SOURCE_DIR, 'data') if _LOCAL else '@pkgdatadir@' + +# Log settings +LOG_FORMAT = '%(asctime)s %(levelname)s\t%(message)s' +LOG_DATE_FORMAT = '%H:%M:%S' + + +def set_environment_variables(): + """Sets application environment variables.""" + if _LOCAL: + os.environ.setdefault('GSETTINGS_SCHEMA_DIR', PKGDATA_DIR) + + +def set_libgd(): + """Configures application to run our own libgd copy.""" + if _LOCAL: + libgd_libdir = os.path.join(SOURCE_DIR, 'libgd', '.libs') + libgd_typelibdir = os.path.join(SOURCE_DIR, 'libgd') + else: + libgd_libdir = '@pkglibdir@' + libgd_typelibdir = '@pkglibdir@/girepository-1.0' + + GIRepository.Repository.prepend_search_path(libgd_typelibdir) + GIRepository.Repository.prepend_library_path(libgd_libdir) + + +def set_exception_hook(): + """Configures sys.excepthook to enforce Gtk application exiting.""" def new_hook(etype, evalue, etb): old_hook(etype, evalue, etb) while Gtk.main_level(): Gtk.main_quit() sys.exit() + + old_hook = sys.excepthook sys.excepthook = new_hook -if __name__ == "__main__": - install_excepthook() +def set_log_level(): + """Sets application log level according to debug value.""" parser = argparse.ArgumentParser() - parser.add_argument('-d', "--debug", action="store_true", default=False, dest="debug") + parser.add_argument('-d', '--debug', action='store_true', + default=False, dest='debug') args = parser.parse_args() if args.debug: - logging.basicConfig(level=logging.DEBUG, - format='%(asctime)s %(levelname)s\t%(message)s', - datefmt='%H:%M:%S') + logging.basicConfig(level=logging.DEBUG, format=LOG_FORMAT, + datefmt=LOG_DATE_FORMAT) # Gtk hates "-d" switch, so lets drop it if '-d' in sys.argv: - sys.argv.remove("-d") + sys.argv.remove('-d') if '--debug' in sys.argv: - sys.argv.remove("--debug") + sys.argv.remove('--debug') else: - logging.basicConfig(level=logging.WARN, - format='%(asctime)s %(levelname)s\t%(message)s', - datefmt='%H:%M:%S') + logging.basicConfig(level=logging.WARN, format=LOG_FORMAT, + datefmt=LOG_DATE_FORMAT) + - locale.bindtextdomain('gnome-music', localedir) +def set_internationalization(): + """Sets application internationalization.""" + locale.bindtextdomain('gnome-music', LOCALE_DIR) locale.textdomain('gnome-music') - gettext.bindtextdomain('gnome-music', localedir) + gettext.bindtextdomain('gnome-music', LOCALE_DIR) gettext.textdomain('gnome-music') - resource = Gio.resource_load(os.path.join(pkgdatadir, 'gnome-music.gresource')) - Gio.Resource._register(resource) +def set_resources(): + """Sets application ressource file.""" + resource = Gio.resource_load( + os.path.join(PKGDATA_DIR, 'gnome-music.gresource')) + Gio.Resource._register(resource) # nopep8 + + +def run_application(): + """Runs GNOME Music application and returns its exit code.""" from gnomemusic.application import Application app = Application() signal.signal(signal.SIGINT, signal.SIG_DFL) - exit_status = app.run(sys.argv) - sys.exit(exit_status) + return app.run(sys.argv) + + +def main(): + """Sets environment and runs GNOME Music.""" + set_environment_variables() + set_libgd() + set_exception_hook() + set_log_level() + set_internationalization() + set_resources() + return run_application() + + +if __name__ == '__main__': + if _LOCAL: + print('Running from source tree, using local files.') + sys.exit(main()) -- cgit v0.12 >From e2b2a30a9a185e9cc0aca63916409b67d5ad490f Mon Sep 17 00:00:00 2001 From: Felipe Borges <felipeborges(a)gnome.org> Date: Wed, 26 Apr 2017 11:53:43 +0200 Subject: window: Fix media-player-keys bus name See https://bugzilla.gnome.org/show_bug.cgi?id=781326 https://bugzilla.gnome.org/show_bug.cgi?id=781754 --- gnomemusic/window.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnomemusic/window.py b/gnomemusic/window.py index dd37c51..71b7a99 100644 --- a/gnomemusic/window.py +++ b/gnomemusic/window.py @@ -215,7 +215,7 @@ class Window(Gtk.ApplicationWindow): self.proxy = Gio.DBusProxy.new_sync(Gio.bus_get_sync(Gio.BusType.SESSION, None), Gio.DBusProxyFlags.NONE, None, - 'org.gnome.SettingsDaemon', + 'org.gnome.SettingsDaemon.MediaKeys', '/org/gnome/SettingsDaemon/MediaKeys', 'org.gnome.SettingsDaemon.MediaKeys', None) -- cgit v0.12

1 0

commit webkit2gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2017-06-23 09:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old) and /work/SRC/openSUSE:Factory/.webkit2gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webkit2gtk3" Fri Jun 23 09:15:56 2017 rev:40 rq:505721 version:2.16.4 Changes: -------- --- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2017-06-07 09:53:10.621730124 +0200 +++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkit2gtk3.changes 2017-06-23 09:15:57.658814754 +0200 @@ -1,0 +2,11 @@ +Wed Jun 21 18:28:01 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 2.16.4 (CVE-2017-2538): + + Fix web process deadlock when seeking youtube videos. + + Fix blob downloads. + + Improve theme rendering performance when using GTK+ >= 3.20. + + Fix positioning of popup menus in Wayland. + + Fix several crashes and rendering issues. + + Security fixes: CVE-2017-2538. + +------------------------------------------------------------------- Old: ---- webkitgtk-2.16.3.tar.xz New: ---- webkitgtk-2.16.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkit2gtk3.spec ++++++ --- /var/tmp/diff_new_pack.ebFZGM/_old 2017-06-23 09:15:59.342576843 +0200 +++ /var/tmp/diff_new_pack.ebFZGM/_new 2017-06-23 09:15:59.346576278 +0200 @@ -26,7 +26,7 @@ %define _pkgconfig_suffix gtk-3.0 %define _name webkitgtk Name: webkit2gtk3 -Version: 2.16.3 +Version: 2.16.4 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause ++++++ webkitgtk-2.16.3.tar.xz -> webkitgtk-2.16.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/webkit2gtk3/webkitgtk-2.16.3.tar.xz /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkitgtk-2.16.4.tar.xz differ: char 27, line 1

1 0

commit gjs for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package gjs for openSUSE:Factory checked in at 2017-06-23 09:15:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjs (Old) and /work/SRC/openSUSE:Factory/.gjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gjs" Fri Jun 23 09:15:50 2017 rev:65 rq:505720 version:1.48.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gjs/gjs.changes 2017-06-19 13:22:51.244973718 +0200 +++ /work/SRC/openSUSE:Factory/.gjs.new/gjs.changes 2017-06-23 09:15:51.131737011 +0200 @@ -1,0 +2,9 @@ +Wed Jun 21 18:52:29 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 1.48.5: + + GJS crash in needsPostBarrier, possible access from wrong + thread (bgo#783935). + + Fix format string, caught by static analysis. + + Fixes for regression in 1.48.4. + +------------------------------------------------------------------- Old: ---- gjs-1.48.4.tar.xz New: ---- gjs-1.48.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjs.spec ++++++ --- /var/tmp/diff_new_pack.533iCN/_old 2017-06-23 09:15:52.103599690 +0200 +++ /var/tmp/diff_new_pack.533iCN/_new 2017-06-23 09:15:52.107599125 +0200 @@ -17,7 +17,7 @@ Name: gjs -Version: 1.48.4 +Version: 1.48.5 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: JavaScript bindings based on gobject-introspection and Mozilla ++++++ gjs-1.48.4.tar.xz -> gjs-1.48.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/NEWS new/gjs-1.48.5/NEWS --- old/gjs-1.48.4/NEWS 2017-06-16 02:32:20.000000000 +0200 +++ new/gjs-1.48.5/NEWS 2017-06-21 20:33:37.000000000 +0200 @@ -1,3 +1,14 @@ +Version 1.48.5 +-------------- + +- Closed bugs: + + * GJS crash in needsPostBarrier, possible access from wrong thread [#783935, + Philip Chimento] + +- Fix format string, caught by static analysis [Claudio André] +- Fixes for regression in 1.48.4 [Philip Chimento] + Version 1.48.4 -------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/configure new/gjs-1.48.5/configure --- old/gjs-1.48.4/configure 2017-06-16 02:45:43.000000000 +0200 +++ new/gjs-1.48.5/configure 2017-06-21 20:05:27.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gjs 1.48.4. +# Generated by GNU Autoconf 2.69 for gjs 1.48.5. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gjs' PACKAGE_TARNAME='gjs' -PACKAGE_VERSION='1.48.4' -PACKAGE_STRING='gjs 1.48.4' +PACKAGE_VERSION='1.48.5' +PACKAGE_STRING='gjs 1.48.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs' PACKAGE_URL='https://wiki.gnome.org/Projects/Gjs' @@ -1428,7 +1428,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 gjs 1.48.4 to adapt to many kinds of systems. +\`configure' configures gjs 1.48.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1498,7 +1498,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gjs 1.48.4:";; + short | recursive ) echo "Configuration of gjs 1.48.5:";; esac cat <<\_ACEOF @@ -1663,7 +1663,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gjs configure 1.48.4 +gjs configure 1.48.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2153,7 +2153,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gjs $as_me 1.48.4, which was +It was created by gjs $as_me 1.48.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3016,7 +3016,7 @@ # Define the identity of the package. PACKAGE='gjs' - VERSION='1.48.4' + VERSION='1.48.5' cat >>confdefs.h <<_ACEOF @@ -3243,10 +3243,10 @@ -GJS_VERSION=14804 +GJS_VERSION=14805 -$as_echo "#define GJS_VERSION (1 * 100 + 48) * 100 + 4" >>confdefs.h +$as_echo "#define GJS_VERSION (1 * 100 + 48) * 100 + 5" >>confdefs.h GETTEXT_PACKAGE=gjs @@ -20547,7 +20547,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gjs $as_me 1.48.4, which was +This file was extended by gjs $as_me 1.48.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20618,7 +20618,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gjs config.status 1.48.4 +gjs config.status 1.48.5 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/gjs-1.48.4/configure.ac new/gjs-1.48.5/configure.ac --- old/gjs-1.48.4/configure.ac 2017-06-16 02:22:48.000000000 +0200 +++ new/gjs-1.48.5/configure.ac 2017-06-21 20:03:50.000000000 +0200 @@ -3,7 +3,7 @@ m4_define(pkg_major_version, 1) m4_define(pkg_minor_version, 48) -m4_define(pkg_micro_version, 4) +m4_define(pkg_micro_version, 5) m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version) m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100 + pkg_micro_version) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/gi/closure.cpp new/gjs-1.48.5/gi/closure.cpp --- old/gjs-1.48.4/gi/closure.cpp 2017-06-16 02:22:16.000000000 +0200 +++ new/gjs-1.48.5/gi/closure.cpp 2017-06-21 20:04:26.000000000 +0200 @@ -36,6 +36,7 @@ JSRuntime *runtime; JSContext *context; GjsMaybeOwned<JSObject *> obj; + unsigned idle_clear_id; }; struct GjsClosure { @@ -132,6 +133,7 @@ closure->priv.obj.reset(); closure->priv.context = nullptr; closure->priv.runtime = nullptr; + closure->priv.idle_clear_id = 0; g_closure_unref(static_cast<GClosure *>(data)); return G_SOURCE_REMOVE; @@ -177,7 +179,7 @@ "removing our destroy notifier on global object)", closure); - g_idle_add(closure_clear_idle, closure); + c->idle_clear_id = g_idle_add(closure_clear_idle, closure); g_closure_ref(closure); } @@ -186,7 +188,8 @@ GClosure *closure) { GJS_DEC_COUNTER(closure); - g_idle_add(closure_clear_idle, closure); + Closure *c = &(reinterpret_cast<GjsClosure *>(closure))->priv; + c->idle_clear_id = g_idle_add(closure_clear_idle, closure); g_closure_ref(closure); } @@ -196,6 +199,13 @@ { Closure *self = &((GjsClosure*) closure)->priv; + if (self->idle_clear_id > 0) { + /* Remove any pending closure_clear_idle(), we are doing it + * immediately here. */ + g_source_remove(self->idle_clear_id); + closure_clear_idle(closure); + } + self->~Closure(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/gi/object.cpp new/gjs-1.48.5/gi/object.cpp --- old/gjs-1.48.4/gi/object.cpp 2017-06-16 02:30:12.000000000 +0200 +++ new/gjs-1.48.5/gi/object.cpp 2017-06-21 20:03:50.000000000 +0200 @@ -1631,15 +1631,16 @@ */ for (ConnectData *cd : priv->signals) { /* First remove any pending invalidation, we are doing it now. */ - if (cd->idle_invalidate_id > 0) + if (cd->idle_invalidate_id > 0) { g_source_remove(cd->idle_invalidate_id); + } else { + /* We have to remove the invalidate notifier, which would + * otherwise schedule a new pending invalidation. */ + g_closure_remove_invalidate_notifier(cd->closure, cd, + signal_connection_invalidated); + g_closure_invalidate(cd->closure); + } - /* We also have to remove the invalidate notifier, which would - * otherwise schedule a new pending invalidation. */ - g_closure_remove_invalidate_notifier(cd->closure, cd, - signal_connection_invalidated); - - g_closure_invalidate(cd->closure); g_slice_free(ConnectData, cd); } priv->signals.clear(); @@ -1828,7 +1829,7 @@ if (closure == NULL) goto out; - connect_data = g_slice_new(ConnectData); + connect_data = g_slice_new0(ConnectData); priv->signals.insert(connect_data); connect_data->obj = priv; /* This is a weak reference, and will be cleared when the closure is invalidated */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/test/gjs-test-coverage.cpp new/gjs-1.48.5/test/gjs-test-coverage.cpp --- old/gjs-1.48.4/test/gjs-test-coverage.cpp 2017-06-16 02:22:16.000000000 +0200 +++ new/gjs-1.48.5/test/gjs-test-coverage.cpp 2017-06-21 20:03:50.000000000 +0200 @@ -902,7 +902,7 @@ max_buf_size = strcspn(line, "\n"); detected_function = g_new(char, max_buf_size + 1); - nmatches = sscanf(line, "%i,%s", &hit_count, detected_function); + nmatches = sscanf(line, "%u,%s", &hit_count, detected_function); if (nmatches != 2) { if (errno != 0) g_error("sscanf: %s", strerror(errno)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-1.48.4/win32/config.h.win32 new/gjs-1.48.5/win32/config.h.win32 --- old/gjs-1.48.4/win32/config.h.win32 2017-06-16 02:45:49.000000000 +0200 +++ new/gjs-1.48.5/win32/config.h.win32 2017-06-21 20:05:35.000000000 +0200 @@ -13,7 +13,7 @@ #define GETTEXT_PACKAGE "gjs" /* The gjs version as an integer */ -#define GJS_VERSION 14804 +#define GJS_VERSION 14805 /* define if the compiler supports basic C++11 syntax */ #define HAVE_CXX11 1 @@ -74,7 +74,7 @@ #define PACKAGE_NAME "gjs" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gjs 1.48.4" +#define PACKAGE_STRING "gjs 1.48.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gjs" @@ -83,10 +83,10 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.48.4" +#define PACKAGE_VERSION "1.48.5" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.48.4" +#define VERSION "1.48.5"

1 0

commit gucharmap for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package gucharmap for openSUSE:Factory checked in at 2017-06-23 09:15:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gucharmap (Old) and /work/SRC/openSUSE:Factory/.gucharmap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gucharmap" Fri Jun 23 09:15:42 2017 rev:89 rq:505615 version:10.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gucharmap/gucharmap.changes 2017-05-18 20:41:32.868605273 +0200 +++ /work/SRC/openSUSE:Factory/.gucharmap.new/gucharmap.changes 2017-06-23 09:15:44.216714083 +0200 @@ -1,0 +2,7 @@ +Wed Jun 21 13:54:47 UTC 2017 - dimstar(a)opensuse.org + +- Update to version 10.0.0: + + Unicode: Prepare update to unicode 10.0.0. + + Updated translations. + +------------------------------------------------------------------- Old: ---- gucharmap-9.0.4.tar.xz New: ---- gucharmap-10.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gucharmap.spec ++++++ --- /var/tmp/diff_new_pack.h8awx4/_old 2017-06-23 09:15:45.284563199 +0200 +++ /var/tmp/diff_new_pack.h8awx4/_new 2017-06-23 09:15:45.288562634 +0200 @@ -22,13 +22,13 @@ %define pc_api 2.90 Name: gucharmap -Version: 9.0.4 +Version: 10.0.0 Release: 0 Summary: A Featureful Unicode Character Map License: GPL-3.0+ and LGPL-2.1+ Group: System/GUI/GNOME Url: http://gucharmap.sourceforge.net/ -Source: http://download.gnome.org/sources/gucharmap/9.0/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gucharmap/10.0/%{name}-%{version}.tar.xz BuildRequires: appdata-tools BuildRequires: fdupes BuildRequires: gettext ++++++ gucharmap-9.0.4.tar.xz -> gucharmap-10.0.0.tar.xz ++++++ ++++ 16182 lines of diff (skipped)

1 0

commit highlight for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package highlight for openSUSE:Factory checked in at 2017-06-23 09:15:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/highlight (Old) and /work/SRC/openSUSE:Factory/.highlight.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "highlight" Fri Jun 23 09:15:04 2017 rev:12 rq:505584 version:3.38 Changes: -------- --- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2017-06-04 01:48:29.768268220 +0200 +++ /work/SRC/openSUSE:Factory/.highlight.new/highlight.changes 2017-06-23 09:15:08.157809070 +0200 @@ -1,0 +2,12 @@ +Wed Jun 21 21:36:29 UTC 2017 - antoine.belvire(a)opensuse.org + +- Update to version 3.38: + * Fix Bash variable highlighting issue + * Update astyle code to release 3.0.1 + * Add bash_ref_man7_org.lua plugin +- Improve spec file: + * Create separate gui-lang subpackage for gui translations + * Use find_lang macro + * Add desktop database update calls in pre and post + +------------------------------------------------------------------- Old: ---- highlight-3.37.tar.bz2 highlight-3.37.tar.bz2.asc New: ---- highlight-3.38.tar.bz2 highlight-3.38.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ highlight.spec ++++++ --- /var/tmp/diff_new_pack.o98tpE/_old 2017-06-23 09:15:08.801718089 +0200 +++ /var/tmp/diff_new_pack.o98tpE/_new 2017-06-23 09:15:08.805717524 +0200 @@ -17,7 +17,7 @@ Name: highlight -Version: 3.37 +Version: 3.38 Release: 0 Summary: Universal Source Code to Formatted Text Converter License: GPL-3.0+ @@ -39,6 +39,8 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: lua-devel BuildRequires: update-desktop-files +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,17 +52,24 @@ It is easily possible to create new language definitions and colour themes. %package gui -Summary: Universal Source Code to Formatted Text Converter +Summary: Universal Source Code to Formatted Text Converter -- Graphical Interface Group: Development/Tools/Other Requires: %{name} = %{version} %description gui -A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX, XML or ANSI -escape sequences with syntax highlighting. -It supports several programming and markup languages. -Language descriptions are configurable and support regular expressions. -The utility offers indentation and reformatting capabilities. -It is easily possible to create new language definitions and colour themes. +This package provides graphical interface for %{name}. + +%package gui-lang +Summary: Universal Source Code to Formatted Text Converter -- GUI Translations +Group: System/Localization +Requires: %{name}-gui = %{version} +Provides: %{name}-gui-lang-all = %{version} +Supplements: packageand(bundle-lang-other:%{name}-gui) +Provides: %{name}-gui-lang-all = %{version} +BuildArch: noarch + +%description gui-lang +This package provides translations for %{name}-gui. %prep %setup -q @@ -74,18 +83,13 @@ %install %makeinstall install-gui %suse_update_desktop_file -G "Text converter" -r %{name} Utility TextEditor +%find_lang %{name} --with-qt + +%post gui +%desktop_database_post -L="$PWD/%{name}.lang" -LDIR="%{_datadir}/%{name}/gui_files/l10n" -echo -n >"$L" -pushd "%{buildroot}$LDIR" -/bin/ls -1 *.qm | while read qm; do - [ -f "$qm" ] || continue - l="${qm#*_}" - l="${l%.qm}" - echo "%lang($l) $LDIR/$qm" >>"$L" -done -popd +%postun gui +%desktop_database_postun %files %defattr(-,root,root,-) @@ -104,14 +108,16 @@ %{_mandir}/man1/%{name}.1%{ext_man} %exclude %{_docdir}/%{name}/INSTALL -%files gui -f "%{name}.lang" +%files gui %defattr(-,root,root,-) %{_bindir}/%{name}-gui %{_datadir}/applications/%{name}.desktop %dir %{_datadir}/%{name}/gui_files %dir %{_datadir}/%{name}/gui_files/ext %{_datadir}/%{name}/gui_files/ext/fileopenfilter.conf -%dir %{_datadir}/%{name}/gui_files/l10n %{_datadir}/pixmaps/%{name}.xpm +%files gui-lang -f %{name}.lang +%dir %{_datadir}/%{name}/gui_files/l10n + %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.o98tpE/_old 2017-06-23 09:15:08.837713003 +0200 +++ /var/tmp/diff_new_pack.o98tpE/_new 2017-06-23 09:15:08.837713003 +0200 @@ -1,6 +1,6 @@ <services> <service name="set_version" mode="disabled"> - <param name="version">3.37</param> + <param name="version">3.38</param> </service> <service name="download_files" mode="disabled"> <param name="changesgenerate">enable</param> ++++++ highlight-3.37.tar.bz2 -> highlight-3.38.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/ChangeLog new/highlight-3.38/ChangeLog --- old/highlight-3.37/ChangeLog 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/ChangeLog 2017-06-21 11:05:22.000000000 +0200 @@ -1,6 +1,15 @@ CHANGELOG Highlight +highlight 3.38 + +20.06.2017 + +-fixed Bash variable highlighting issue +-updated astyle code to release 3.0.1 (https://sourceforge.net/p/astyle/bugs/438/) +-added bash_ref_man7_org.lua plugin + +--- highlight 3.37 30.05.2017 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/langDefs/html.lang new/highlight-3.38/langDefs/html.lang --- old/highlight-3.37/langDefs/html.lang 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/langDefs/html.lang 2017-06-21 11:05:22.000000000 +0200 @@ -23,6 +23,8 @@ Strings={ Delimiter=[["]], + Escape=[[\A(?!x)x]] + -- see http://stackoverflow.com/questions/1723182/a-regex-that-will-never-be-match… } Comments={ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/langDefs/sh.lang new/highlight-3.38/langDefs/sh.lang --- old/highlight-3.37/langDefs/sh.lang 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/langDefs/sh.lang 2017-06-21 11:05:22.000000000 +0200 @@ -34,9 +34,9 @@ "printenv", "lp", "tee", "mkfifo", "pathchk", "dd", "od", "hexdump", "m4"}, }, - -- FIXME issue with expressions like ${SHELL="${CONFIG_SHELL-/bin/sh}"} + -- fixes issue with expressions like ${SHELL="${CONFIG_SHELL-/bin/sh}"} { Id=4, - Regex=[[\$\{.+?\}]], + Regex=[[\$\{.+\$\{.+?\}.+?\}|\$\{.+?\} ]], }, { Id=4, Regex=[[ \$[\w\#]+ ]], @@ -71,7 +71,7 @@ if (string.sub(token,1,1) =="$" ) and oldState==HL_STRING and newState==HL_KEYWORD then return HL_INTERPOLATION end - + if hereDoc~=nil then return HL_STRING end @@ -80,6 +80,6 @@ if oldState==HL_STANDARD and newState==HL_STRING and not string.find("\"'`", token) then hereDoc = string.match(token, "<<%-?'?%s*([%-%a%d_]+)" ) end - + return newState end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/langDefs/xml.lang new/highlight-3.38/langDefs/xml.lang --- old/highlight-3.37/langDefs/xml.lang 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/langDefs/xml.lang 2017-06-21 11:05:22.000000000 +0200 @@ -16,6 +16,8 @@ Strings={ Delimiter=[["]], + Escape=[[\A(?!x)x]] + -- see http://stackoverflow.com/questions/1723182/a-regex-that-will-never-be-match… } Comments={ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/plugins/bash_ref_man7_org.lua new/highlight-3.38/plugins/bash_ref_man7_org.lua --- old/highlight-3.37/plugins/bash_ref_man7_org.lua 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.38/plugins/bash_ref_man7_org.lua 2017-06-21 11:05:22.000000000 +0200 @@ -0,0 +1,348 @@ + +Description="Add man7.org reference links to HTML, LaTeX, RTF and ODT output of Bash scripts" + +function syntaxUpdate(desc) + + if desc~="Bash" then + return + end + + function Set (list) + local set = {} + for _, l in ipairs(list) do set[l] = true end + return set + end + + man1_items = Set { + "abicompat", "abidiff", "abidw", "abilint", "abipkgdiff", "ac", "addftinfo", + "addr2line", "afmtodit", "apropos", "ar", "aria_chk", "aria_dump_log", + "aria_ftdump", "aria_pack", "aria_read_log", "AS", "as", "attr", "audit2allow", + "audit2why", "autofsd-probe", "autopoint", "b2sum", "babeltrace-log", + "babeltrace", "base32", "base64", "basename", "bash", "blkparse", + "blkrawverify", "bno_plot", "bootctl", "btt", "busctl", "cal", + "callgrind_annotate", "callgrind_control", "cancel", "capsh", "cat", "certtool", + "cg_annotate", "cgcc", "cg_diff", "cg_merge", "chacl", "chage", "chattr", + "chcon", "chem", "chfn", "chgrp", "chkhelp", "chmod", "chown", "chroot", "chrt", + "chsh", "chvt", "cifsiostat", "cksum", "CLEAR", "clear", "cmp", "col", "colcrt", + "collectl2pcp", "colrm", "column", "comm", "comp_err", "coredumpctl", "cp", + "cpp", "cronnext", "crontab", "csplit", "cups-config", "cups", "cupstestdsc", + "cupstestppd", "cut", "danetool", "dash", "date", "dbpmda", "dbprobe", "dd", + "deallocvt", "debuginfo-install", "df", "diff", "diff3", "dir", "dircolors", + "dirname", "dlltool", "dmesg", "dnsdomainname", "domainname", + "dpkg-architecture", "dpkg-buildflags", "dpkg-buildpackage", + "dpkg-checkbuilddeps", "dpkg-deb", "dpkg-distaddfile", "dpkg-divert", + "dpkg-genbuildinfo", "dpkg-genchanges", "dpkg-gencontrol", "dpkg-gensymbols", + "dpkg-maintscript-helper", "dpkg-mergechangelogs", "dpkg-name", + "dpkg-parsechangelog", "dpkg-query", "dpkg-scanpackages", "dpkg-scansources", + "dpkg-shlibdeps", "dpkg-source", "dpkg-split", "dpkg-statoverride", + "dpkg-trigger", "dpkg-vendor", "dpkg", "dselect", "dtrace", "du", "dumpkeys", + "echo", "egrep", "eject", "elfedit", "env", "envsubst", "eqn", "eqn2graph", + "expand", "expect", "expiry", "expr", "factor", "fallocate", "false", + "fedabipkgdiff", "fgconsole", "fgrep", "file", "fincore", + "find-repos-of-install", "find", "flock", "fmt", "fold", "free", "fuse2fs", + "fuser", "fusermount3", "g++", "galera_new_cluster", "galera_recovery", + "ganglia2pcp", "gawk", "gcc", "gcore", "gcov-dump", "gcov-tool", "gcov", "gdb", + "gdbserver", "gdiffmk", "genpmda", "getent", "getfacl", "getfattr", "getopt", + "gettext", "gettextize", "gfortran", "git-add", "git-am", "git-annotate", + "git-apply", "git-archimport", "git-archive", "git-bisect", "git-blame", + "git-branch", "git-bundle", "git-cat-file", "git-check-attr", + "git-check-ignore", "git-check-mailmap", "git-check-ref-format", + "git-checkout-index", "git-checkout", "git-cherry-pick", "git-cherry", + "git-citool", "git-clean", "git-clone", "git-column", "git-commit-tree", + "git-commit", "git-config", "git-count-objects", "git-credential-cache--daemon", + "git-credential-cache", "git-credential-store", "git-credential", + "git-cvsexportcommit", "git-cvsimport", "git-cvsserver", "git-daemon", + "git-describe", "git-diff-files", "git-diff-index", "git-diff-tree", "git-diff", + "git-difftool", "git-fast-export", "git-fast-import", "git-fetch-pack", + "git-fetch", "git-filter-branch", "git-fmt-merge-msg", "git-for-each-ref", + "git-format-patch", "git-fsck-objects", "git-fsck", "git-gc", + "git-get-tar-commit-id", "git-grep", "git-gui", "git-hash-object", "git-help", + "git-http-backend", "git-http-fetch", "git-http-push", "git-imap-send", + "git-index-pack", "git-init-db", "git-init", "git-instaweb", + "git-interpret-trailers", "git-log", "git-ls-files", "git-ls-remote", + "git-ls-tree", "git-mailinfo", "git-mailsplit", "git-merge-base", + "git-merge-file", "git-merge-index", "git-merge-one-file", "git-merge-tree", + "git-merge", "git-mergetool--lib", "git-mergetool", "git-mktag", "git-mktree", + "git-mv", "git-name-rev", "git-notes", "git-p4", "git-pack-objects", + "git-pack-redundant", "git-pack-refs", "git-parse-remote", "git-patch-id", + "git-prune-packed", "git-prune", "git-pull", "git-push", "git-quiltimport", + "git-read-tree", "git-rebase", "git-receive-pack", "git-reflog", "git-relink", + "git-remote-ext", "git-remote-fd", "git-remote-testgit", "git-remote", + "git-repack", "git-replace", "git-request-pull", "git-rerere", "git-reset", + "git-rev-list", "git-rev-parse", "git-revert", "git-rm", "git-send-email", + "git-send-pack", "git-series", "git-sh-i18n--envsubst", "git-sh-i18n", + "git-sh-setup", "git-shell", "git-shortlog", "git-show-branch", + "git-show-index", "git-show-ref", "git-show", "git-stage", "git-stash", + "git-status", "git-stripspace", "git-submodule", "git-svn", "git-symbolic-ref", + "git-tag", "git-unpack-file", "git-unpack-objects", "git-update-index", + "git-update-ref", "git-update-server-info", "git-upload-archive", + "git-upload-pack", "git-var", "git-verify-commit", "git-verify-pack", + "git-verify-tag", "git-web--browse", "git-whatchanged", "git-worktree", + "git-write-tree", "git", "gitk", "gitremote-helpers", "gitweb", "glilypond", + "gnutls-cli-debug", "gnutls-cli", "gnutls-serv", "gpasswd", "gperl", "gpinyin", + "gprof", "grap2graph", "grep", "grn", "grodvi", "groff", "groffer", "grog", + "grohtml", "grolbp", "grolj4", "gropdf", "grops", "grotty", "groups", "guards", + "head", "hexdump", "hg", "hostid", "hostname", "hostnamectl", "hpftodit", + "htop", "iconv", "id", "indent", "indxbib", "init", "innochecksum", + "inotifywait", "inotifywatch", "install", "intro", "ionice", "iostat", + "iostat2pcp", "iowatcher", "ipcmk", "ipcrm", "ipcs", "ippfind", "ipptool", + "join", "journalctl", "kbd_mode", "kernelshark", "keyctl", "kill", "killall", + "last", "lastb", "lastcomm", "ld", "ldapadd", "ldapcompare", "ldapdelete", + "ldapexop", "ldapmodify", "ldapmodrdn", "ldappasswd", "ldapsearch", "ldapurl", + "ldapwhoami", "ldd", "less", "lessecho", "lesskey", "lexgrog", "line", "link", + "lkbib", "ln", "loadkeys", "locale", "localectl", "localedef", "locate", + "logger", "login", "loginctl", "logname", "look", "lookbib", "lp", "lpoptions", + "lpq", "lpr", "lprm", "lpstat", "ls", "lsattr", "lscpu", "lsinitrd", "lsipc", + "lslogins", "lsmem", "ltrace", "lttng-add-context", "lttng-calibrate", + "lttng-crash", "lttng-create", "lttng-destroy", "lttng-disable-channel", + "lttng-disable-event", "lttng-enable-channel", "lttng-enable-event", + "lttng-gen-tp", "lttng-help", "lttng-list", "lttng-load", "lttng-metadata", + "lttng-regenerate", "lttng-save", "lttng-set-session", "lttng-snapshot", + "lttng-start", "lttng-status", "lttng-stop", "lttng-track", "lttng-untrack", + "lttng-version", "lttng-view", "lttng", "lttngtop", "lttngtoptrace", + "lxc-attach", "lxc-autostart", "lxc-cgroup", "lxc-checkconfig", + "lxc-checkpoint", "lxc-config", "lxc-console", "lxc-copy", "lxc-create", + "lxc-destroy", "lxc-device", "lxc-execute", "lxc-freeze", "lxc-info", "lxc-ls", + "lxc-monitor", "lxc-snapshot", "lxc-start", "lxc-stop", "lxc-top", + "lxc-unfreeze", "lxc-unshare", "lxc-user-nic", "lxc-usernsexec", "lxc-wait", + "machinectl", "make", "make_win_bin_dist", "man", "manconv", "manpath", + "mariadb-service-convert", "mcookie", "md5sum", "memusage", "memusagestat", + "mesg", "mkaf", "mkdir", "mkfifo", "mknod", "mktemp", "mmroff", "more", + "mountpoint", "mpstat", "mrtg2pcp", "msgattrib", "msgcat", "msgcmp", "msgcomm", + "msgconv", "msgen", "msgexec", "msgfilter", "msgfmt", "msggrep", "msginit", + "msgmerge", "msgunfmt", "msguniq", "ms_print", "msql2mysql", "mtrace", "mv", + "myisamchk", "myisam_ftdump", "myisamlog", "myisampack", "my_print_defaults", + "my_safe_process", "mysql-stress-test.pl", "mysql-test-run.pl", "mysql", + "mysql.server", "mysqlaccess", "mysqladmin", "mysqlbinlog", "mysqlbug", + "mysqlcheck", "mysql_client_test", "mysql_client_test_embedded", "mysql_config", + "mysql_convert_table_format", "mysqld_multi", "mysqld_safe", + "mysqld_safe_helper", "mysqldump", "mysqldumpslow", "mysql_find_rows", + "mysql_fix_extensions", "mysqlhotcopy", "mysqlimport", "mysql_install_db", + "mysql_plugin", "mysql_secure_installation", "mysql_setpermission", "mysqlshow", + "mysqlslap", "mysqltest", "mysqltest_embedded", "mysql_tzinfo_to_sql", + "mysql_upgrade", "mysql_waitpid", "mysql_zap", "namei", "ncat", + "ncurses5-config", "ncurses6-config", "ndiff", "needs-restarting", "neqn", + "networkctl", "newgidmap", "newgrp", "newhelp", "newrole", "newuidmap", + "nfs4_editfacl", "nfs4_getfacl", "nfs4_setfacl", "nfsiostat-sysstat", + "ngettext", "nice", "nisdomainname", "nl", "nlmconv", "nm", "nmap-update", + "nmap", "nodename", "nohup", "nping", "nproc", "nroff", "nsenter", "numfmt", + "objcopy", "objdump", "ocount", "ocsptool", "od", "op-check-perfevents", + "opannotate", "oparchive", "opcontrol", "openvt", "operf", "opgprof", "ophelp", + "opimport", "opreport", "oprofile", "oprof_start", "p11tool", "package-cleanup", + "passwd", "paste", "patch", "pathchk", "pcap-config", "pcp-atop", "pcp-atopsar", + "pcp-collectl", "pcp-dmcache", "pcp-free", "pcp-iostat", "pcp-ipcs", + "pcp-lvmcache", "pcp-mpstat", "pcp-numastat", "pcp-pidstat", "pcp-python", + "pcp-shping", "pcp-summary", "pcp-tapestat", "pcp-uptime", "pcp-verify", + "pcp-vmstat", "pcp", "pcp2graphite", "pcp2influxdb", "PCPIntro", "pcpintro", + "pcre-config", "pcregrep", "pcretest", "pdfmom", "pdfroff", "peekfd", + "perf-annotate", "perf-archive", "perf-bench", "perf-buildid-cache", + "perf-buildid-list", "perf-c2c", "perf-config", "perf-data", "perf-diff", + "perf-evlist", "perf-ftrace", "perf-help", "perf-inject", "perf-kallsyms", + "perf-kmem", "perf-kvm", "perf-list", "perf-lock", "perf-mem", "perf-probe", + "perf-record", "perf-report", "perf-sched", "perf-script-perl", + "perf-script-python", "perf-script", "perf-stat", "perf-test", "perf-timechart", + "perf-top", "perf-trace", "perf", "perfalloc", "perror", "pfbtops", "pg", + "pgrep", "pic", "pic2graph", "pidof", "pidstat", "pinky", "pkill", "pldd", + "pmafm", "pmap", "pmatop", "pmcd", "pmcd_wait", "pmchart", "pmclient", + "pmclient_fg", "pmcollectl", "pmconfig", "pmconfirm", "pmcpp", "pmdaactivemq", + "pmdaaix", "pmdaapache", "pmdabash", "pmdabind2", "pmdabonding", "pmdacifs", + "pmdacisco", "pmdadarwin", "pmdadbping", "pmdadm", "pmdadocker", "pmdads389", + "pmdads389log", "pmdaelasticsearch", "pmdafreebsd", "pmdagfs2", "pmdagluster", + "pmdagpfs", "pmdaib", "pmdajbd2", "pmdajson", "pmdakernel", "pmdakvm", + "pmdalibvirt", "pmdalinux", "pmdalio", "pmdalmsensors", "pmdalogger", + "pmdalustre", "pmdalustrecomm", "pmdamailq", "pmdamemcache", "pmdamic", + "pmdammv", "pmdamounts", "pmdamysql", "pmdanetbsd", "pmdanetfilter", + "pmdanfsclient", "pmdanginx", "pmdanutcracker", "pmdanvidia", "pmdaoracle", + "pmdapapi", "pmdaperfevent", "pmdapipe", "pmdapostfix", "pmdapostgresql", + "pmdaproc", "pmdaredis", "pmdaroomtemp", "pmdaroot", "pmdarpm", "pmdarsyslog", + "pmdasample", "pmdasendmail", "pmdashping", "pmdasimple", "pmdaslurm", + "pmdasolaris", "pmdasummary", "pmdasystemd", "pmdate", "pmdatrace", + "pmdatrivial", "pmdatxmon", "pmdaunbound", "pmdaweblog", "pmdawindows", + "pmdaxfs", "pmdazimbra", "pmdazswap", "pmdbg", "pmdiff", "pmdumplog", + "pmdumptext", "pmerr", "pmevent", "pmfind", "pmgenmap", "pmgetopt", + "pmhostname", "pmie", "pmie2col", "pmie_check", "pmieconf", "pmie_daily", + "pmiestatus", "pminfo", "pmiostat", "pmlc", "pmlock", "pmlogcheck", "pmlogconf", + "pmlogextract", "pmlogger", "pmlogger_check", "pmlogger_daily", + "pmlogger_merge", "pmloglabel", "pmlogmv", "pmlogreduce", "pmlogrewrite", + "pmlogsummary", "pmmessage", "pmmgr", "pmnewlog", "pmnsadd", "pmnscomp", + "pmnsdel", "pmnsmerge", "pmpause", "pmpost", "pmprobe", "pmproxy", "pmpython", + "pmquery", "pmrep", "pmsignal", "pmsleep", "pmsnap", "pmsocks", "pmstat", + "pmstore", "pmtime", "pmtrace", "pmval", "pmview", "pmwebd", "ppdc", "ppdhtml", + "ppdi", "ppdmerge", "ppdpo", "pr", "preconv", "printenv", "printf", "prlimit", + "prtstat", "ps", "psfaddtable", "psfgettable", "psfstriptable", "psfxtable", + "psktool", "pslog", "pstree", "ptx", "pv", "pwd", "pwdx", "quilt", "quota", + "quotasync", "ranlib", "readelf", "readlink", "realpath", "recode-sr-latin", + "refer", "rename", "renice", "replace", "repo-graph", "repo-rss", "repoclosure", + "repodiff", "repomanage", "repoquery", "reposync", "repotrack", "RESET", + "reset", "resolveip", "resolve_stack_dump", "rev", "rm", "rmdir", "roff2dvi", + "roff2html", "roff2pdf", "roff2ps", "roff2text", "roff2x", "rsync", "runcon", + "runuser", "sadf", "sar", "sar2pcp", "scmp_sys_resolver", "scp", "screen", + "script", "scriptreplay", "sdiff", "secon", "sed", "seq", "setfacl", "setfattr", + "setleds", "setmetamode", "setpriv", "setsid", "setterm", "sftp", "sg", + "sha1sum", "sha224sum", "sha256sum", "sha384sum", "sha512sum", "sheet2pcp", + "show-changed-rco", "show-installed", "showkey", "shred", "shuf", "size", + "skill", "slabtop", "sleep", "snice", "soelim", "sort", "sparse", "split", + "sprof", "srptool", "ssh-add", "ssh-agent", "ssh-keygen", "ssh-keyscan", "ssh", + "SSHFS", "sshfs", "stap-merge", "stap-prep", "stap-report", "stap", "stapref", + "stapvirt", "stat", "stdbuf", "stg-branch", "stg-clean", "stg-clone", + "stg-commit", "stg-delete", "stg-diff", "stg-edit", "stg-export", "stg-files", + "stg-float", "stg-fold", "stg-goto", "stg-hide", "stg-id", "stg-import", + "stg-init", "stg-log", "stg-mail", "stg-new", "stg-next", "stg-patches", + "stg-pick", "stg-pop", "stg-prev", "stg-publish", "stg-pull", "stg-push", + "stg-rebase", "stg-redo", "stg-refresh", "stg-rename", "stg-repair", + "stg-reset", "stg-series", "stg-show", "stg-sink", "stg-squash", "stg-sync", + "stg-top", "stg-uncommit", "stg-undo", "stg-unhide", "stg", "strace", "strings", + "strip", "stty", "su", "sum", "sync", "systemctl", "systemd-analyze", + "systemd-ask-password", "systemd-bootchart", "systemd-cat", "systemd-cgls", + "systemd-cgtop", "systemd-delta", "systemd-detect-virt", "systemd-escape", + "systemd-firstboot", "systemd-firstboot.service", "systemd-inhibit", + "systemd-machine-id-setup", "systemd-mount", "systemd-notify", "systemd-nspawn", + "systemd-path", "systemd-resolve", "systemd-run", "systemd-socket-activate", + "systemd-tty-ask-password-agent", "systemd-umount", "systemd", "systemkey-tool", + "TABS", "tabs", "tac", "tail", "tapestat", "tar", "taskset", "tbl", "tcpdump", + "tee", "telnet-probe", "test", "tfmtodit", "time", "timedatectl", "timeout", + "tload", "tmux", "tokuftdump", "tokuft_logdump", "tokuft_logprint", "top", + "touch", "tpmtool", "TPUT", "tput", "tr", "trace-cmd-check-events", + "trace-cmd-extract", "trace-cmd-hist", "trace-cmd-list", "trace-cmd-listen", + "trace-cmd-mem", "trace-cmd-options", "trace-cmd-profile", "trace-cmd-record", + "trace-cmd-report", "trace-cmd-reset", "trace-cmd-restore", "trace-cmd-show", + "trace-cmd-snapshot", "trace-cmd-split", "trace-cmd-stack", "trace-cmd-start", + "trace-cmd-stat", "trace-cmd-stop", "trace-cmd-stream", "trace-cmd", "troff", + "true", "truncate", "TSET", "tset", "tsort", "tty", "ul", "uname", "unexpand", + "unicode_start", "unicode_stop", "uniq", "unlink", "unshare", + "update-alternatives", "updatedb", "uptime", "usb-devices", "users", "utmpdump", + "uuidgen", "valgrind-listener", "valgrind", "vdir", "verify_blkparse", + "verifytree", "vgdb", "vlock", "w", "wall", "watch", "wc", "Wget", "wget", + "whatis", "whereis", "who", "whoami", "windmc", "windres", "write", + "wsrep_sst_common", "wsrep_sst_mysqldump", "wsrep_sst_rsync", + "wsrep_sst_xtrabackup-v2", "wsrep_sst_xtrabackup", "xargs", "xgettext", "yes", + "ypdomainname", "yum-aliases", "yum-builddep", "yum-changelog", + "yum-config-manager", "yum-debug-dump", "yum-debug-restore", "yum-filter-data", + "yum-fs-snapshot", "yum-groups-manager", "yum-list-data", "yum-ovl", + "yum-utils", "yum-verify", "yum-versionlock", "yumdownloader", "zenmap", + "zsoelim" +} + +man1p_items = Set { + "admin", "alias", "ar", "asa", "at", "awk", "basename", "batch", "bc", + "bg", "break", "c99", "cal", "cat", "cd", "cflow", "chgrp", "chmod", + "chown", "cksum", "cmp", "colon", "comm", "command", "compress", + "continue", "cp", "crontab", "csplit", "ctags", "cut", "cxref", "date", + "dd", "delta", "df", "diff", "dirname", "dot", "du", "echo", "ed", + "env", "eval", "ex", "exec", "exit", "expand", "export", "expr", + "false", "fc", "fg", "file", "find", "fold", "fort77", "fuser", + "gencat", "get", "getconf", "getopts", "grep", "hash", "head", "iconv", + "id", "ipcrm", "ipcs", "jobs", "join", "kill", "lex", "link", "ln", + "locale", "localedef", "logger", "logname", "lp", "ls", "m4", "mailx", + "make", "man", "mesg", "mkdir", "mkfifo", "more", "mv", "newgrp", + "nice", "nl", "nm", "nohup", "od", "paste", "patch", "pathchk", "pax", + "pr", "printf", "prs", "ps", "pwd", "qalter", "qdel", "qhold", "qmove", + "qmsg", "qrerun", "qrls", "qselect", "qsig", "qstat", "qsub", "read", + "readonly", "renice", "return", "rm", "rmdel", "rmdir", "sact", "sccs", + "sed", "set", "sh", "shift", "sleep", "sort", "split", "strings", + "strip", "stty", "tabs", "tail", "talk", "tee", "test", "time", + "times", "touch", "tput", "tr", "trap", "true", "tsort", "tty", "type", + "ulimit", "umask", "unalias", "uname", "uncompress", "unexpand", "unget", + "uniq", "unlink", "unset", "uucp", "uudecode", "uuencode", "uustat", + "uux", "val", "vi", "wait", "wc", "what", "who", "write", "xargs", + "yacc", "zcat" +} +man2_items = Set { + +"accept","access","acct","adjtimex","afs_syscall","alarm","alloc_hugepages", +"arch_prctl","bdflush","bind","break","brk","cacheflush","capget","capset", +"chdir","chmod","chown","chroot","clone","close","connect","creat", +"create_module","DC_CTX_new","DC_PLUG_new","DC_PLUG_read","DC_SERVER_new", +"delete_module","dup2","dup","epoll_create","epoll_ctl","epoll_wait","execve", +"_exit","fchdir","fchmod","fchown","fcntl","fdatasync","fgetxattr","flistxattr", +"flock","fork","free_hugepages","fremovexattr","fsetxattr","fstat","fstatfs", +"fstatvfs","fsync","ftruncate","futex","getcontext","getdents","getdomainname", +"getdtablesize","getegid","geteuid","getgid","getgroups","gethostid", +"gethostname","getitimer","get_kernel_syms","getpagesize","getpeername", +"getpgid","getpgrp","getpid","getpmsg","getppid","getpriority","getresgid", +"getresuid","getrlimit","getrusage","getsid","getsockname","getsockopt", +"get_thread_area","gettid","gettimeofday","getuid","getxattr","gtty","idle", +"inb","inb_p","init_module","inl","inl_p","insb","insl","insw","intro","inw", +"inw_p","io_cancel","ioctl","ioctl_list","io_destroy","io_getevents","ioperm", +"iopl","io_setup","io_submit","ipc","kill","killpg","lchown","lgetxattr","link", +"listen","listxattr","llistxattr","_llseek","llseek","lock","lookup_dcookie", +"lremovexattr","lseek","lsetxattr","lstat","madvise","mbind","mincore","mkdir", +"mknod","mlock.2","mlock","mlockall.2","mlockall","mmap2","mmap","modify_ldt", +"mount","mprotect","mpx","mremap","msgctl","msgget","msgop","msgrcv","msgsnd", +"msync","munlock","munlockall","munmap","NAL_ADDRESS_new","NAL_BUFFER_new", +"NAL_CONNECTION_new","NAL_decode_uint32","NAL_LISTENER_new","NAL_SELECTOR_new", +"nanosleep","_newselect","nfsservctl","nice","obsolete","oldfstat","oldlstat", +"oldolduname","oldstat","olduname","open","outb","outb_p","outl","outl_p", +"outsb","outsl","outsw","outw","outw_p","pause","pciconfig_iobase", +"pciconfig_read","pciconfig_write","personality","pipe","pivot_root","poll", +"posix_fadvise","prctl","pread","prof","pselect","ptrace","putpmsg","pwrite", +"query_module","quotactl","read","readahead","readdir","readlink","readv", +"reboot","recv","recvfrom","recvmsg","remap_file_pages","removexattr","rename", +"rmdir","sbrk","sched_getaffinity","sched_getparam","sched_get_priority_max", +"sched_get_priority_min","sched_getscheduler","sched_rr_get_interval", +"sched_setaffinity","sched_setparam","sched_setscheduler","sched_yield", +"security","select","select_tut","semctl","semget","semop","semtimedop","send", +"sendfile","sendmsg","sendto","setcontext","setdomainname","setegid","seteuid", +"setfsgid","setfsuid","setgid","setgroups","sethostid","sethostname","setitimer" +,"set_mempolicy","setpgid","setpgrp","setpriority","setregid","setresgid", +"setresuid","setreuid","setrlimit","setsid","setsockopt","set_thread_area", +"settimeofday","setuid","setup","setxattr","sgetmask","shmat","shmctl","shmdt", +"shmget","shmop","shutdown","sigaction","sigaltstack","sigblock","siggetmask", +"sigmask","signal","sigpause","sigpending","sigprocmask","sigqueue","sigreturn", +"sigsetmask","sigsuspend","sigtimedwait","sigvec","sigwaitinfo","socket", +"socketcall","socketpair","ssetmask","sstk","stat","statfs","statvfs","stime", +"stty","swapoff","swapon","symlink","sync","syscall","syscalls","_sysctl", +"sysctl","sysfs","sysinfo","syslog","time","times","tkill","truncate","tux", +"umask","umount2","umount","uname","undocumented","unimplemented","unlink", +"uselib","ustat","utime","utimes","vfork","vhangup","vm86","wait","wait3", +"wait4","waitpid","write","writev" +} + + + function getURL(token, manId, pId) + url='http://man7.org/linux/man-pages/man'..manId .. '/' .. token .. '.'..manId..pId..'.html' + + if (HL_OUTPUT== HL_FORMAT_HTML or HL_OUTPUT == HL_FORMAT_XHTML) then + return '<a class="hl" target="new" href="' .. url .. '">'.. token .. '</a>' + elseif (HL_OUTPUT == HL_FORMAT_LATEX) then + return '\\href{'..url..'}{'..token..'}' + elseif (HL_OUTPUT == HL_FORMAT_RTF) then + return '{{\\field{\\*\\fldinst HYPERLINK "'..url..'" }{\\fldrslt\\ul\\ulc0 '..token..'}}}' + elseif (HL_OUTPUT == HL_FORMAT_ODT) then + return '<text:a xlink:type="simple" xlink:href="'..url..'">'..token..'</text:a>' + end + end + + function Decorate(token, state) + + if state~=HL_KEYWORD and state ~=HL_STANDARD then return end + + if man1_items[token] then + return getURL(token, 1, "") + elseif man1p_items[token] then + return getURL(token, 1, "p") + elseif man2_items[token] then + return getURL(token, 2, "") + end + + end +end + +function themeUpdate(desc) + if (HL_OUTPUT == HL_FORMAT_HTML or HL_OUTPUT == HL_FORMAT_XHTML) then + Injections[#Injections+1]="a.hl, a.hl:visited {color:inherit;font-weight:inherit;}" + elseif (HL_OUTPUT==HL_FORMAT_LATEX) then + Injections[#Injections+1]="\\usepackage[colorlinks=false, pdfborderstyle={/S/U/W 1}]{hyperref}" + end +end + +--The Plugins array assigns code chunks to themes or language definitions. +--The chunks are interpreted after the theme or lang file were parsed, +--so you can refer to elements of these files + +Plugins={ + + { Type="lang", Chunk=syntaxUpdate }, + { Type="theme", Chunk=themeUpdate }, + +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/src/core/astyle/ASBeautifier.cpp new/highlight-3.38/src/core/astyle/ASBeautifier.cpp --- old/highlight-3.37/src/core/astyle/ASBeautifier.cpp 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/src/core/astyle/ASBeautifier.cpp 2017-06-21 11:05:22.000000000 +0200 @@ -1348,7 +1348,7 @@ if (firstChar == (size_t) i) // firstChar is ':' { size_t firstWord = line.find_first_not_of(" \t", firstChar + 1); - if (firstChar != string::npos) + if (firstWord != string::npos) { int continuationIndentCount = firstWord + spaceIndentCount + tabIncrementIn; continuationIndentStack->emplace_back(continuationIndentCount); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/src/core/astyle/ASFormatter.cpp new/highlight-3.38/src/core/astyle/ASFormatter.cpp --- old/highlight-3.37/src/core/astyle/ASFormatter.cpp 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/src/core/astyle/ASFormatter.cpp 2017-06-21 11:05:22.000000000 +0200 @@ -3017,6 +3017,8 @@ //check for rvalue reference if (currentChar == '&' && nextChar == '&') { + if (lastWord == "auto") + return true; if (previousNonWSChar == '>') return true; string followingText; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/src/core/astyle/ASResource.cpp new/highlight-3.38/src/core/astyle/ASResource.cpp --- old/highlight-3.37/src/core/astyle/ASResource.cpp 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/src/core/astyle/ASResource.cpp 2017-06-21 11:05:22.000000000 +0200 @@ -36,6 +36,7 @@ const string ASResource::AS_END = string("end"); const string ASResource::AS_ENUM = string("enum"); const string ASResource::AS_EXTERN = string("extern"); +const string ASResource::AS_FINAL = string("final"); const string ASResource::AS_FINALLY = string("finally"); const string ASResource::AS_FIXED = string("fixed"); const string ASResource::AS_FOR = string("for"); @@ -593,10 +594,11 @@ if (fileType == C_TYPE) { preCommandHeaders->emplace_back(&AS_CONST); - preCommandHeaders->emplace_back(&AS_VOLATILE); + preCommandHeaders->emplace_back(&AS_FINAL); preCommandHeaders->emplace_back(&AS_INTERRUPT); preCommandHeaders->emplace_back(&AS_NOEXCEPT); preCommandHeaders->emplace_back(&AS_OVERRIDE); + preCommandHeaders->emplace_back(&AS_VOLATILE); preCommandHeaders->emplace_back(&AS_SEALED); // Visual C only preCommandHeaders->emplace_back(&AS_AUTORELEASEPOOL); // Obj-C only } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/src/include/astyle/astyle.h new/highlight-3.38/src/include/astyle/astyle.h --- old/highlight-3.37/src/include/astyle/astyle.h 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/src/include/astyle/astyle.h 2017-06-21 11:05:22.000000000 +0200 @@ -39,6 +39,10 @@ #pragma warn -8004 // variable is assigned a value that is never used #endif +#ifdef __GNUC__ + #pragma GCC diagnostic ignored "-Wconversion" +#endif + #ifdef __INTEL_COMPILER #pragma warning(disable: 383) // value copied to temporary, reference to temporary used #pragma warning(disable: 981) // operands are evaluated in unspecified order @@ -250,7 +254,8 @@ static const string AS_END; static const string AS_SELECTOR; static const string AS_EXTERN, AS_ENUM; - static const string AS_STATIC, AS_CONST, AS_SEALED, AS_OVERRIDE, AS_VOLATILE, AS_NEW, AS_DELETE; + static const string AS_FINAL, AS_OVERRIDE; + static const string AS_STATIC, AS_CONST, AS_SEALED, AS_VOLATILE, AS_NEW, AS_DELETE; static const string AS_NOEXCEPT, AS_INTERRUPT, AS_AUTORELEASEPOOL; static const string AS_WHERE, AS_LET, AS_SYNCHRONIZED; static const string AS_OPERATOR, AS_TEMPLATE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.37/src/include/version.h new/highlight-3.38/src/include/version.h --- old/highlight-3.37/src/include/version.h 2017-05-30 20:27:16.000000000 +0200 +++ new/highlight-3.38/src/include/version.h 2017-06-21 11:05:22.000000000 +0200 @@ -28,7 +28,7 @@ #ifndef VERSION_H #define VERSION_H -#define HIGHLIGHT_VERSION "3.37" +#define HIGHLIGHT_VERSION "3.38" #define HIGHLIGHT_URL "http://www.andre-simon.de/" #define HIGHLIGHT_EMAIL "andre.simon1(a)gmx.de"

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2017-06-23 09:14:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen" Fri Jun 23 09:14:58 2017 rev:231 rq:505582 version:4.9.0_08 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2017-06-17 10:18:09.900583236 +0200 +++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2017-06-23 09:15:00.454897458 +0200 @@ -1,0 +2,14 @@ +Wed Jun 21 14:03:40 MDT 2017 - carnold(a)suse.com + +- Update block-dmmd script (bsc#1002573) + block-dmmd + +------------------------------------------------------------------- +Tue Jun 20 15:18:25 MDT 2017 - carnold(a)suse.com + +- Update to Xen 4.9.0-rc8+ (fate#321394, fate#323108) + xen-4.9.0-testing-src.tar.bz2 + gcc7-arm.patch +- Drop gcc7-error-xenpmd.patch + +------------------------------------------------------------------- Old: ---- gcc7-error-xenpmd.patch New: ---- gcc7-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.qXUB07/_old 2017-06-23 09:15:05.126237418 +0200 +++ /var/tmp/diff_new_pack.qXUB07/_new 2017-06-23 09:15:05.126237418 +0200 @@ -278,9 +278,9 @@ Patch421: xenpaging.doc.patch Patch422: stubdom-have-iovec.patch Patch423: vif-route.patch -Patch424: gcc7-error-xenpmd.patch -Patch425: gcc7-mini-os.patch -Patch426: gcc7-xen.patch +Patch424: gcc7-mini-os.patch +Patch425: gcc7-xen.patch +Patch426: gcc7-arm.patch # Other bug fixes or features Patch451: xenconsole-no-multiple-connections.patch Patch452: hibernate.patch ++++++ block-dmmd ++++++ --- /var/tmp/diff_new_pack.qXUB07/_old 2017-06-23 09:15:05.334208033 +0200 +++ /var/tmp/diff_new_pack.qXUB07/_new 2017-06-23 09:15:05.334208033 +0200 @@ -2,20 +2,32 @@ # Usage: block-dmmd [add args | remove args] # -# the dmmd device syntax (in xm/xl commands/configs) is something like: -# dmmd:md;/dev/md0;md;/dev/md1;lvm;/dev/vg1/lv1 +# the dmmd device syntax (in xl commands/configs) is something like: +# script=block-dmmd,md;/dev/md0;md;/dev/md1;lvm;/dev/vg1/lv1 # or -# dmmd:lvm;/dev/vg1/lv1;lvm;/dev/vg1/lv2;md;/dev/md0 +# script=block-dmmd,lvm;/dev/vg1/lv1;lvm;/dev/vg1/lv2;md;/dev/md0 # device pairs (type;dev) are processed in order, with the last device # assigned to the VM # +# Note - When using the libxl stack, the "script=block-dmmd" option +# is required. See man xl-disk-configuration(5) for more information. +# # md devices can optionally: # specify a config file through: # md;/dev/md100(/var/xen/config/mdadm.conf) # use an array name (mdadm -N option): -# dmmd:md;My-MD-name;lvm;/dev/vg1/lv1 +# md;My-MD-name;lvm;/dev/vg1/lv1 +# +# Completely expressive syntax should be similar to: +# "format=raw, vdev=xvdb, access=rw, script=block-dmmd, \ +# target=md;/dev/md0(/etc/mdadm.conf);lvm;/dev/vg1/lv1" # +## # History: +# 2017-06-12, mlatimer(a)suse.com: +# Merge LVM improvements by loic.devulder(a)mpsa.com +# Document libxl "script=block-dmmd" syntax in examples +# Remove xm/xend references (e.g. parsed_timeout from xend-config.sxp) # 2016-05-27, mlatimer(a)suse.com: # Merge improvements by loic.devulder(a)mpsa.com. Highlights include: # - Re-write and simplification to speed up the script! @@ -51,6 +63,7 @@ typeset -rx PVSCAN_BIN=/sbin/pvscan typeset -rx VGSCAN_BIN=/sbin/vgscan typeset -rx VGCHANGE_BIN=/sbin/vgchange +typeset -rx CLVMD_BIN=/usr/sbin/clvmd typeset -rx DATE_LOG="date +%F_%T.%N" typeset -rx DATE_SEC="date +%s" @@ -61,6 +74,21 @@ # We check for errors ourselves set +e +function reload_clvm() +{ + # If we are in cluster mode + if ps -e | grep -q [c]lvmd 2>/dev/null; then + # Logging message + log err "Synchronizing cLVM..." + + # Synchronize cLVM + ${CLVMD_BIN} -R > /dev/null 2>&1 \ + || return 1 + fi + + return 0 +} + function run_mdadm() { local mdadm_cmd=$1 @@ -118,21 +146,22 @@ # Is MD device already active? # We need to use full path name, aliase is not possible... - if [ -e $dev_path/${dev##*/} ]; then - ${MDADM_BIN} -Q -D $dev_path/${dev##*/} 2>/dev/null \ + if [ -e ${dev_path}/${dev##*/} ]; then + ${MDADM_BIN} -Q -D ${dev_path}/${dev##*/} 2>/dev/null \ | grep -iq state.*\:.*inactive || return 0 fi # Activate MD device run_mdadm "-A ${mdadm_opts} ${dev} ${cfg}" rc=$? + # A return code of 2 can indicate the array configuration was incorrect if [[ ${rc} == 2 ]]; then # Logging message echo "[$(${DATE_LOG})] verifying MD device ${dev} activation..." >&2 # If the array is active, return 0, otherwise return an error - ${MDADM_BIN} -Q -D $dev_path/${dev##*/} &>/dev/null && return 0 \ + ${MDADM_BIN} -Q -D ${dev_path}/${dev##*/} &>/dev/null && return 0 \ || return 1 fi @@ -167,46 +196,52 @@ return $? } -function activate_lvm() +function lvm_action() { + local action=$1 + local dev=$2 local run_timeout=90 - local parsed_timeout local end_time - # If /etc/xen/xend-config.sxp exists (e.g. SLES11), use - # device-create-timeout, instead of the default setting - if [[ -f /etc/xen/xend-config.sxp ]]; then - parsed_timeout=$(grep -v "^[ \t]*#.*" /etc/xen/xend-config.sxp \ - |sed -n 's/(device-create-timeout \+$[0-9]\+$)/\1/p') - if [[ ! -z $parsed_timeout ]]; then - run_timeout=$((${parsed_timeout}*9/10)) - fi - fi - - # First scan for PVs and VGs - # We need this for using MD device as PV - ${PVSCAN_BIN} > /dev/null 2>&1 -# ${VGSCAN_BIN} --mknodes > /dev/null 2>&1 - # Logging message - echo "[$(${DATE_LOG})] activate LVM device ${dev}..." >&2 + echo "[$(${DATE_LOG})] ${action} LVM device ${dev}..." >&2 # Set end_time for the loop (( end_time = $(${DATE_SEC}) + run_timeout )) while true; do - ${LVCHANGE_BIN} -aey $1 > /dev/null 2>&1 - - if [ $? -eq 0 -a -e $1 ]; then - return 0 + # Action depends of what the user asks + if [[ ${action} == activate ]]; then + # First scan for PVs and VGs + # We need this for using MD device as PV + ${PVSCAN_BIN} > /dev/null 2>&1 + + ${LVCHANGE_BIN} -aey ${dev} > /dev/null 2>&1 \ + && [[ -e ${dev} ]] \ + && return 0 + elif [[ ${action} == deactivate ]]; then + ${LVCHANGE_BIN} -aen ${dev} > /dev/null 2>&1 \ + && return 0 + + # If the LV is already deactivated we may be in an infinite loop + # So we need to test if the LV is still present + [[ -e ${dev} ]] || return 0 fi - sleep 0.1 + # It seems that we had a problem during lvchange + # If we are in a cluster the problem may be due to a cLVM locking bug, + # so try to reload it + reload_clvm + # If it takes too long we need to return an error if (( $(${DATE_SEC}) >= end_time )); then - log err "Failed to activate $1 within ${run_timeout} seconds" + log err "Failed to ${action} $1 within ${run_timeout} seconds" return 1 fi + + # Briefly sleep before restarting the loop + sleep 0.1 + done # Normally we should not get here, but if this happens @@ -214,23 +249,6 @@ return 1 } -function deactivate_lvm() -{ - # Logging message - echo "[$(${DATE_LOG})] deactivate LVM device ${dev}..." >&2 - - ${LVCHANGE_BIN} -aen $1 > /dev/null 2>&1 - - if [ $? -eq 0 ]; then - # We may have to deactivate the VG now, but can ignore errors: -# ${VGCHANGE_BIN} -an ${1%/*} || : - # Maybe we need to cleanup the LVM cache: -# ${VGSCAN_BIN} --mknodes || : - return 0 - fi - return 1 -} - # Variables typeset command=$1 typeset BP=100 @@ -265,7 +283,7 @@ return $? ;; "lvm") - activate_lvm $2 + lvm_action activate $2 return $? ;; esac @@ -283,7 +301,7 @@ return $? ;; "lvm") - deactivate_lvm $2 + lvm_action deactivate $2 return $? ;; esac ++++++ gcc7-arm.patch ++++++ Fixes compile time warning -> error xc_dom_arm.c: In function 'meminit': xc_dom_arm.c:229:31: error: 'domctl.u.address_size.size' may be used uninitialized in this function [-Werror=maybe-uninitialized] --- xen-4.9.0-testing/tools/libxc/xc_dom_arm.c.orig 2017-06-21 15:17:54.663169127 -0600 +++ xen-4.9.0-testing/tools/libxc/xc_dom_arm.c 2017-06-21 15:18:44.141295411 -0600 @@ -223,6 +223,7 @@ static int set_mode(xc_interface *xch, d domctl.domain = domid; domctl.cmd = XEN_DOMCTL_set_address_size; + domctl.u.address_size.size = 0; for ( i = 0; i < ARRAY_SIZE(types); i++ ) if ( !strcmp(types[i].guest, guest_type) ) domctl.u.address_size.size = types[i].size; ++++++ libxl.pvscsi.patch ++++++ --- /var/tmp/diff_new_pack.qXUB07/_old 2017-06-23 09:15:05.522181473 +0200 +++ /var/tmp/diff_new_pack.qXUB07/_new 2017-06-23 09:15:05.522181473 +0200 @@ -38,7 +38,7 @@ =================================================================== --- xen-4.9.0-testing.orig/docs/man/xl.cfg.pod.5.in +++ xen-4.9.0-testing/docs/man/xl.cfg.pod.5.in -@@ -548,6 +548,62 @@ Specify the backend domain name or id, d +@@ -550,6 +550,62 @@ Specify the backend domain name or id, d =back ++++++ xen-4.9.0-testing-src.tar.bz2 ++++++ ++++ 4266 lines of diff (skipped)

1 0

commit unicode-ucd for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package unicode-ucd for openSUSE:Factory checked in at 2017-06-23 09:14:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unicode-ucd (Old) and /work/SRC/openSUSE:Factory/.unicode-ucd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unicode-ucd" Fri Jun 23 09:14:53 2017 rev:2 rq:505469 version:10.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/unicode-ucd/unicode-ucd.changes 2017-01-22 00:34:11.464252928 +0100 +++ /work/SRC/openSUSE:Factory/.unicode-ucd.new/unicode-ucd.changes 2017-06-23 09:14:56.531451822 +0200 @@ -1,0 +2,5 @@ +Wed Jun 21 13:57:57 UTC 2017 - dimstar(a)opensuse.org + +- Update to Unicode 10.0.0. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unicode-ucd.spec ++++++ --- /var/tmp/diff_new_pack.IRgFUl/_old 2017-06-23 09:14:57.611299244 +0200 +++ /var/tmp/diff_new_pack.IRgFUl/_new 2017-06-23 09:14:57.611299244 +0200 @@ -1,7 +1,7 @@ # # spec file for package unicode-ucd # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + # For other future directories from http://www.unicode.org/Public %global unicodedir %{_datadir}/unicode %global ucddir %{unicodedir}/ucd - Name: unicode-ucd -Version: 9.0.0 +Version: 10.0.0 Release: 0 -License: Unicode-TOU Summary: Unicode Character Database -Url: http://www.unicode.org/ucd/ +License: Unicode-TOU Group: System/I18n +Url: http://www.unicode.org/ucd/ Source0: http://www.unicode.org/Public/zipped/%{version}/UCD.zip # http://www.unicode.org/terms_of_use.html referenced in ReadMe.txt redirects to: Source1: http://www.unicode.org/copyright.html Source2: http://www.unicode.org/Public/zipped/%{version}/Unihan.zip BuildRequires: unzip -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The Unicode Character Database (UCD) consists of a number of data files listing @@ -42,6 +42,7 @@ %package unihan Summary: Unicode Han Database # for the license and dirs +Group: System/I18n Requires: %{name} = %{version}-%{release} %description unihan @@ -71,6 +72,7 @@ %exclude %{ucddir}/Unihan.zip %files unihan +%defattr(-,root,root) %{ucddir}/Unihan.zip %changelog ++++++ UCD.zip ++++++ Binary files /var/tmp/diff_new_pack.IRgFUl/_old and /var/tmp/diff_new_pack.IRgFUl/_new differ ++++++ Unihan.zip ++++++ Binary files /var/tmp/diff_new_pack.IRgFUl/_old and /var/tmp/diff_new_pack.IRgFUl/_new differ ++++++ copyright.html ++++++ --- /var/tmp/diff_new_pack.IRgFUl/_old 2017-06-23 09:14:57.735281726 +0200 +++ /var/tmp/diff_new_pack.IRgFUl/_new 2017-06-23 09:14:57.739281161 +0200 @@ -131,7 +131,7 @@ <ol type="A"> <li><u><a name="1"></a>Unicode Copyright.</u> <ol> - <li>Copyright © 1991-2016 Unicode, Inc. All rights reserved.</li> + <li>Copyright © 1991-2017 Unicode, Inc. All rights reserved.</li> <li>Certain documents and files on this website contain a legend indicating that "Modification is permitted." Any person is hereby authorized, without fee, to modify such documents and @@ -274,7 +274,7 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright © 1991-2016 Unicode, Inc. All rights reserved. +Copyright © 1991-2017 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. Permission is hereby granted, free of charge, to any person obtaining

1 0

commit net-tools for openSUSE:Factory
by root＠hilbert.suse.de 23 Jun '17

23 Jun '17

Hello community, here is the log from the commit of package net-tools for openSUSE:Factory checked in at 2017-06-23 09:14:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/net-tools (Old) and /work/SRC/openSUSE:Factory/.net-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "net-tools" Fri Jun 23 09:14:37 2017 rev:51 rq:504900 version:2.0+git20170221.479bb4a Changes: -------- --- /work/SRC/openSUSE:Factory/net-tools/net-tools.changes 2016-11-04 20:49:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.net-tools.new/net-tools.changes 2017-06-23 09:14:39.429868189 +0200 @@ -1,0 +2,129 @@ +Sun Jun 18 07:29:18 UTC 2017 - tchvatal(a)suse.com + +- Drop netstat xinetd service as we are phasing xinetd out + There is probably no need to replace it here as netstat was + deprecated and now users should favor 'ss' command from + iproute2 + +------------------------------------------------------------------- +Sun Jun 18 07:27:20 UTC 2017 - tchvatal(a)suse.com + +- Provide compat symlink to /bin and /sbin to be on safe side + if someone hardcoded them in scripts (most distros switched + 7 years ago) + +------------------------------------------------------------------- +Sat Jun 17 19:53:44 UTC 2017 - tchvatal(a)suse.com + +- Disable removed binaries for build rather than on install + * Refresh patch net-tools-configure.patch +- Make sure we respect optflags +- Add patch 0001-Add-ether-wake-binary.patch replacing standalone + ether-wake code in the archive +- Add patch 0002-Do-not-warn-about-interface-socket-not-binded.patch + replacing net-tools-1.60-interface_socket.diff +- Add patch 0003-Add-support-for-EiB-in-interface.c.patch enabling + EiB support in interfaces +- Add patch 0004-By-default-do-not-fopen-anything-in-netrom_gr.patch + relpacing net-tools-1.60-netrom-fopen.diff +- Add patch 0005-Add-support-for-interface-rename-in-nameif.patch + replacing nameif-rename.patch +- Add patch 0006-Allow-interface-stacking.patch + replacing net-tools-1.60-interface_stack.patch +- Add patch 0007-Introduce-T-notrim-option-in-netstat.patch + replacing net-tools-1.60-dont-trim-foreign-addr6.diff + and also net-tools-1.60-notrim.diff +- Drop net-tools-1.60-use-gai.patch as it should be upstreamed first + and it does not apply clearly at all now + +------------------------------------------------------------------- +Sat Jun 17 19:41:08 UTC 2017 - tchvatal(a)suse.com + +- Move binaries to sbindir and bindir respectively +- Switch from generating filelists to actually state them within + the spec-file, now it is quite readable +- Move ifconfig and route to %{_bindir} as upstream does + (and debian/rh/... do too) + +------------------------------------------------------------------- +Sat Jun 17 08:09:20 UTC 2017 - tchvatal(a)suse.com + +- Remove all the manpage altering patches as they are from 2002 and + older while it changed and touching different languages for + rebasing is not bright idea, the same applies for translations + as upstream updated the translations we will pretend their + strings win +- Switch to git service repacking so we don't have to carry all + the patches ourselves +- Update to version 2.0+git20170221.479bb4a: + * slattach/plipconfig: add a config knob to control them + * Fixed trailing whitespace issue with a and i flags (#7) + * iptunnel: drop netinet/ip.h include + * iptunnel: fix building w/older linux headers + * build: respect standard $(LDLIBS) variable + * netstat: improve ROSE support + * AX.25: Rename all references to axattach to kissattach. + * Update all instances of my email address. + * Fix conversion of some ROSE addresses. + * Fix incorrect ARP output +- Merge patch net-tools-1.60-miioff.diff in the main config patch +- Rename net-tools-1.60.dif to net-tools-configure.patch in order + to reflect what it actually does +- Drop nstrcmp.c as VCS contains newer version +- Drop patches that were either merged upstream or fixed bit differently: + * manpages.diff + * net-tools-1.60-arp-unaligned-access.patch + * net-tools-1.60-compoundstatement.diff + * net-tools-1.60-cont-buff.patch + * net-tools-1.60-cs_CZ.bnc715580.diff + * net-tools-1.60-doc.dif + * net-tools-1.60-errors.patch + * net-tools-1.60-fclose.diff + * net-tools-1.60-fix-header-conflict.patch + * net-tools-1.60-hostname-ipv6.patch + * net-tools-1.60-hostname-s.patch + * net-tools-1.60-hostname-space.patch + * net-tools-1.60-ifconfig-SIOCSIFNETMASK.diff + * net-tools-1.60-ifconfig.8.diff + * net-tools-1.60-ifindex.diff + * net-tools-1.60-infiniband.diff + * net-tools-1.60-ipv6-statistics.diff + * net-tools-1.60-krn26.dif + * net-tools-1.60-long_to_int.diff + * net-tools-1.60-multilinestr.diff + * net-tools-1.60-nameif.diff + * net-tools-1.60-netstat-ci.diff + * net-tools-1.60-netstat-output.patch + * net-tools-1.60-netstat-p.patch + * net-tools-1.60-netstat.8.diff + * net-tools-1.60-netstat_retval.diff + * net-tools-1.60-numericstuff.diff + * net-tools-1.60-plipconfig-ecode.patch + * net-tools-1.60-plipconfig-manpage.patch + * net-tools-1.60-plipconfig-usage.patch + * net-tools-1.60-printval-conversion.patch + * net-tools-1.60-sctp-quiet + * net-tools-1.60-sctp.patch + * net-tools-1.60-snmp-counter-overflow.patch + * net-tools-1.60-sockios-SIOCGMIIPHY.diff + * net-tools-1.60-strictaliasing.diff + * net-tools-1.60-tcp-recvq-listen.patch + * netstat-trunc.dif + * net-tools-1.60-if_tr.diff + * net-tools-1.60-interface_mtu.diff + +------------------------------------------------------------------- +Sat Jun 17 08:02:18 UTC 2017 - tchvatal(a)suse.com + +- Cleanup a bit with spec-cleaner and remove sle11 conditions +- Drop the patch net-tools-1.60-obsolete.diff + * If restored it is in the VCS and it silences all the rpm warnings + +------------------------------------------------------------------- +Tue Nov 1 10:01:53 UTC 2016 - giecrilj(a)stegny.2a.pl + +- add COPYING +- net-tools-1.60-use-gai.patch: + use getaddrinfo instead of gethostbyname + +------------------------------------------------------------------- Old: ---- ether-wake.8 ether-wake.c manpages.diff nameif-rename.patch net-tools-1.60-arp-unaligned-access.patch net-tools-1.60-compoundstatement.diff net-tools-1.60-cont-buff.patch net-tools-1.60-cs_CZ.bnc715580.diff net-tools-1.60-doc.dif net-tools-1.60-dont-trim-foreign-addr6.diff net-tools-1.60-errors.patch net-tools-1.60-fclose.diff net-tools-1.60-fix-header-conflict.patch net-tools-1.60-hostname-ipv6.patch net-tools-1.60-hostname-s.patch net-tools-1.60-hostname-space.patch net-tools-1.60-if_tr.diff net-tools-1.60-ifconfig-SIOCSIFNETMASK.diff net-tools-1.60-ifconfig.8.diff net-tools-1.60-ifindex.diff net-tools-1.60-infiniband.diff net-tools-1.60-interface_mtu.diff net-tools-1.60-interface_socket.diff net-tools-1.60-interface_stack.patch net-tools-1.60-ipv6-statistics.diff net-tools-1.60-krn26.dif net-tools-1.60-long_to_int.diff net-tools-1.60-miioff.diff net-tools-1.60-multilinestr.diff net-tools-1.60-nameif.diff net-tools-1.60-netrom-fopen.diff net-tools-1.60-netstat-ci.diff net-tools-1.60-netstat-output.patch net-tools-1.60-netstat-p.patch net-tools-1.60-netstat.8.diff net-tools-1.60-netstat_retval.diff net-tools-1.60-notrim.diff net-tools-1.60-numericstuff.diff net-tools-1.60-obsolete.diff net-tools-1.60-plipconfig-ecode.patch net-tools-1.60-plipconfig-manpage.patch net-tools-1.60-plipconfig-usage.patch net-tools-1.60-printval-conversion.patch net-tools-1.60-sctp-quiet net-tools-1.60-sctp.patch net-tools-1.60-snmp-counter-overflow.patch net-tools-1.60-sockios-SIOCGMIIPHY.diff net-tools-1.60-strictaliasing.diff net-tools-1.60-tcp-recvq-listen.patch net-tools-1.60.dif net-tools-1.60.tar.bz2 netstat-trunc.dif netstat.xinetd nstrcmp.c New: ---- 0001-Add-ether-wake-binary.patch 0002-Do-not-warn-about-interface-socket-not-binded.patch 0003-Add-support-for-EiB-in-interface.c.patch 0004-By-default-do-not-fopen-anything-in-netrom_gr.patch 0005-Add-support-for-interface-rename-in-nameif.patch 0006-Allow-interface-stacking.patch 0007-Introduce-T-notrim-option-in-netstat.patch _service net-tools-2.0+git20170221.479bb4a.tar.xz net-tools-configure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-tools.spec ++++++ --- /var/tmp/diff_new_pack.xjdxy2/_old 2017-06-23 09:14:40.765679446 +0200 +++ /var/tmp/diff_new_pack.xjdxy2/_new 2017-06-23 09:14:40.765679446 +0200 @@ -1,7 +1,7 @@ # # spec file for package net-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX 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,93 +17,40 @@ Name: net-tools -Url: http://www.tazenda.demon.co.uk/phil/net-tools/ -Provides: iputils:/usr/sbin/traceroute6 -Provides: net_tool -Obsoletes: net_tool -#force new traceroute or else.. -Recommends: traceroute >= 2.0.0 -# provides hostname, domainname and dnsdomainname -Requires: hostname -Version: 1.60 +Version: 2.0+git20170221.479bb4a Release: 0 Summary: Important Programs for Networking License: GPL-2.0+ Group: Productivity/Networking/Other -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 -Source2: netstat.xinetd -Source3: nstrcmp.c -Source4: ether-wake.c -Source5: ether-wake.8 -Patch: net-tools-%{version}.dif -Patch1: netstat-trunc.dif -Patch2: manpages.diff -Patch4: net-tools-1.60-multilinestr.diff -Patch5: net-tools-1.60-krn26.dif -Patch7: net-tools-1.60-long_to_int.diff -Patch8: net-tools-1.60-compoundstatement.diff -Patch9: nameif-rename.patch -Patch10: net-tools-1.60-errors.patch -Patch11: net-tools-1.60-cont-buff.patch -Patch12: net-tools-1.60-miioff.diff -Patch13: net-tools-1.60-nameif.diff -Patch14: net-tools-1.60-sockios-SIOCGMIIPHY.diff -Patch15: net-tools-1.60-numericstuff.diff -Patch16: net-tools-1.60-if_tr.diff -Patch18: net-tools-1.60-netstat.8.diff -Patch19: net-tools-1.60-strictaliasing.diff -Patch20: net-tools-1.60-interface_stack.patch -Patch21: net-tools-1.60-arp-unaligned-access.patch -Patch22: net-tools-1.60-snmp-counter-overflow.patch -Patch23: net-tools-1.60-netstat-output.patch -Patch24: net-tools-1.60-netstat-p.patch -Patch25: net-tools-1.60-sctp.patch -Patch26: net-tools-1.60-sctp-quiet -Patch27: net-tools-1.60-hostname-space.patch -Patch30: net-tools-1.60-ifconfig.8.diff -Patch31: net-tools-1.60-tcp-recvq-listen.patch -Patch32: net-tools-1.60-netstat-ci.diff -Patch33: net-tools-1.60-ifconfig-SIOCSIFNETMASK.diff -Patch34: net-tools-1.60-interface_socket.diff -Patch35: net-tools-1.60-interface_mtu.diff -Patch36: net-tools-1.60-printval-conversion.patch -Patch38: net-tools-1.60-obsolete.diff -Patch39: net-tools-1.60-fclose.diff -Patch40: net-tools-1.60-notrim.diff -Patch41: net-tools-1.60-ipv6-statistics.diff -Patch42: net-tools-1.60-ifindex.diff -Patch43: net-tools-1.60-infiniband.diff -Patch44: net-tools-1.60-netrom-fopen.diff -Patch45: net-tools-1.60-doc.dif -Patch46: net-tools-1.60-netstat_retval.diff -Patch47: net-tools-1.60-hostname-ipv6.patch -Patch48: net-tools-1.60-dont-trim-foreign-addr6.diff -Patch49: net-tools-1.60-cs_CZ.bnc715580.diff -Patch50: net-tools-1.60-plipconfig-usage.patch -Patch51: net-tools-1.60-plipconfig-manpage.patch -Patch52: net-tools-1.60-plipconfig-ecode.patch -# PATCH-FIX-UPSTREAM net-tools-1.60-hostname-s.patch boo#872264 ticket#14 commit#452f8e -Patch53: net-tools-1.60-hostname-s.patch -Patch54: net-tools-1.60-fix-header-conflict.patch +Url: https://sourceforge.net/projects/net-tools/ +# Repacked by the service file from git +Source: %{name}-%{version}.tar.xz +# PATCH-FEATURE-SUSE: set configure values to our liking as we do not need +# everything here +Patch0: net-tools-configure.patch +# Git formatted patches described in each patch +Patch1: 0001-Add-ether-wake-binary.patch +Patch2: 0002-Do-not-warn-about-interface-socket-not-binded.patch +Patch3: 0003-Add-support-for-EiB-in-interface.c.patch +Patch4: 0004-By-default-do-not-fopen-anything-in-netrom_gr.patch +Patch5: 0005-Add-support-for-interface-rename-in-nameif.patch +Patch6: 0006-Allow-interface-stacking.patch +Patch7: 0007-Introduce-T-notrim-option-in-netstat.patch +BuildRequires: help2man +Requires: hostname +Recommends: %{name}-lang = %{version} +Recommends: traceroute >= 2.0.0 +Provides: net_tool = %{version} +Obsoletes: net_tool < %{version} %description This package contains essential programs for network administration and maintenance: netstat, arp, ifconfig, rarp, and route. - - -Authors: --------- - Fred N. van Kempen <waltje(a)uwalt.nl.mugnet.org> - Bernd Eckenfels <net-tools(a)lina.inka.de> - Fred Baumgarten <dc6iq(a)insu1.etec.uni-karlsruhe.de> - Peter Tobias <tobias(a)et-inf.fho-emden.de> - Olaf Kirch <okir(a)suse.de> - %package deprecated Summary: Deprecated Networking Utilities Group: Productivity/Networking/Other +Recommends: %{name}-lang = %{version} %description deprecated This package contains the arp, ifconfig, netstat and route utilities, @@ -113,118 +60,101 @@ * netstat -> ss [-r] * route -> ip r +%lang_package + %prep %setup -q -cp %{S:3} lib/ -%patch -%patch1 -%patch2 -p1 -%patch4 -%patch5 -%patch7 -p1 -%patch8 -p1 -%patch9 -%patch10 -p1 -b .errors -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -#not applied, see bugzilla discussion -##%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -%patch42 -%patch43 -%patch44 -%patch45 -%patch46 -%patch47 -%patch48 -%patch49 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -cp %{S:4} . -cp %{S:5} ./man/en_US +%autopatch -p1 %build - -# Kernel 3.6 removes if_strip.h - disable STRIP -%if 0%{?suse_version} > 1220 -%__sed -i -e '/HAVE_HWSTRIP y/s/y$/n/' config.in -%endif -# - -make config -make COPTS="-D_GNU_SOURCE $RPM_OPT_FLAGS" LOPTS="$RPM_OPT_FLAGS" -gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -fwhole-program -o ether-wake ether-wake.c +export CFLAGS="%{optflags}" +make %{?_smp_mflags} config +make %{?_smp_mflags} %install -install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d -install -m 644 %{S:2} $RPM_BUILD_ROOT/etc/xinetd.d/netstat -make install BASEDIR=$RPM_BUILD_ROOT -install -m 755 ether-wake %{buildroot}/sbin -for tool in \ -%ifarch s390 - plipconfig slattach \ -%endif - hostname domainname dnsdomainname nisdomainname ypdomainname mii-tool rarp -do - rm -f $RPM_BUILD_ROOT/*bin/$tool - rm -f $RPM_BUILD_ROOT/%{_mandir}/man*/$tool.* - rm -f $RPM_BUILD_ROOT/%{_mandir}/*/man*/$tool.* +%make_install BINDIR=%{_bindir} SBINDIR=%{_sbindir} + +# remove rarp as it is not usefull with our kernel +rm -fv %{buildroot}/usr/*bin/rarp +rm -fv %{buildroot}/%{_mandir}/man*/rarp.* +rm -fv %{buildroot}/%{_mandir}/*/man*/rarp.* +# Fix manpage locations +mv %{buildroot}/%{_mandir}/de_DE %{buildroot}/%{_mandir}/de +mv %{buildroot}/%{_mandir}/fr_FR %{buildroot}/%{_mandir}/fr +# Generate missing manpages +for tool in iptunnel ipmaddr; do + t="%{buildroot}/%{_mandir}/man8/${tool}.8" + help2man -s8 "%{buildroot}%{_sbindir}/${tool}" --no-discard-stderr >"${t}" done -mv $RPM_BUILD_ROOT/%{_mandir}/de_DE $RPM_BUILD_ROOT/%{_mandir}/de -mv $RPM_BUILD_ROOT/%{_mandir}/fr_FR $RPM_BUILD_ROOT/%{_mandir}/fr -%if 0%{?suse_version} < 1120 -rm -rf $RPM_BUILD_ROOT/%{_mandir}/pt_BR -%endif -%find_lang %{name} --all-name --with-man - -# generate the filelist for net-tools-deprecated -echo '%%defattr(-,root,root)' >deprecated.list -for tool in arp ifconfig ipmaddr iptunnel netstat route; do - for dir in bin sbin; do - if test -x $RPM_BUILD_ROOT/$dir/$tool; then - break - fi - done - echo /$dir/$tool >>deprecated.list - find $RPM_BUILD_ROOT/%_mandir -name "$tool.*"\ - -printf '%_mandir/%%P*\n' >>deprecated.list +# generate bin/sbin compat symlinks +mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}/bin +for i in ether-wake nameif plipconfig slattach arp ipmaddr iptunnel; do +ln -s %{_sbindir}/$i %{buildroot}/sbin/$i done -cat deprecated.list -sed 's/^/%%exclude /' deprecated.list >>%name.lang +for i in netstat ifconfig route; do +ln -s %{_bindir}/$i %{buildroot}/bin/$i +done +%find_lang %{name} --all-name + +%files +%defattr(-,root,root) +%doc COPYING README ABOUT-NLS +%{_sbindir}/ether-wake +/sbin/ether-wake +%{_sbindir}/nameif +/sbin/nameif +%{_sbindir}/plipconfig +/sbin/plipconfig +%{_sbindir}/slattach +/sbin/slattach +%{_mandir}/de/man5/ethers.5%{ext_man} +%{_mandir}/de/man8/plipconfig.8%{ext_man} +%{_mandir}/de/man8/slattach.8%{ext_man} +%{_mandir}/fr/man5/ethers.5%{ext_man} +%{_mandir}/fr/man8/plipconfig.8%{ext_man} +%{_mandir}/fr/man8/slattach.8%{ext_man} +%{_mandir}/man5/ethers.5%{ext_man} +%{_mandir}/man8/ether-wake.8%{ext_man} +%{_mandir}/man8/nameif.8%{ext_man} +%{_mandir}/man8/plipconfig.8%{ext_man} +%{_mandir}/man8/slattach.8%{ext_man} -%files -f %{name}.lang +%files deprecated %defattr(-,root,root) -/bin/* -/sbin/* -%_mandir/man*/* -%config(noreplace) /etc/xinetd.d/netstat +%doc COPYING +%{_bindir}/netstat +/bin/netstat +%{_sbindir}/arp +/sbin/arp +%{_bindir}/ifconfig +/bin/ifconfig +%{_sbindir}/ipmaddr +/sbin/ipmaddr +%{_sbindir}/iptunnel +/sbin/iptunnel +%{_bindir}/route +/bin/route +%{_mandir}/de/man8/arp.8%{ext_man} +%{_mandir}/de/man8/ifconfig.8%{ext_man} +%{_mandir}/de/man8/netstat.8%{ext_man} +%{_mandir}/de/man8/route.8%{ext_man} +%{_mandir}/fr/man8/arp.8%{ext_man} +%{_mandir}/fr/man8/ifconfig.8%{ext_man} +%{_mandir}/fr/man8/netstat.8%{ext_man} +%{_mandir}/fr/man8/route.8%{ext_man} +%{_mandir}/man8/arp.8%{ext_man} +%{_mandir}/man8/ifconfig.8%{ext_man} +%{_mandir}/man8/netstat.8%{ext_man} +%{_mandir}/man8/route.8%{ext_man} +%{_mandir}/man8/ipmaddr.8%{ext_man} +%{_mandir}/man8/iptunnel.8%{ext_man} +%{_mandir}/pt_BR/man8/arp.8%{ext_man} +%{_mandir}/pt_BR/man8/ifconfig.8%{ext_man} +%{_mandir}/pt_BR/man8/netstat.8%{ext_man} +%{_mandir}/pt_BR/man8/route.8%{ext_man} -%files deprecated -f deprecated.list +%files lang -f %{name}.lang +%defattr(-,root,root) %changelog ++++++ 0001-Add-ether-wake-binary.patch ++++++ >From 259d1c453c7dc3b0291f3b4755567a94b778480e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sat, 17 Jun 2017 22:06:03 +0200 Subject: [PATCH 1/7] Add ether-wake binary --- Makefile | 6 +- ether-wake.c | 445 +++++++++++++++++++++++++++++++++++++++++++++++++ man/en_US/ether-wake.8 | 81 +++++++++ 3 files changed, 531 insertions(+), 1 deletion(-) create mode 100644 ether-wake.c create mode 100644 man/en_US/ether-wake.8 diff --git a/Makefile b/Makefile index bf67bc6..cb171a0 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ SBINDIR ?= /sbin NET_LIB_PATH = lib NET_LIB_NAME = net-tools -PROGS := ifconfig netstat route nameif +PROGS := ifconfig netstat route nameif ether-wake -include config.make ifeq ($(HAVE_ARP_TOOLS),1) @@ -205,6 +205,9 @@ ipmaddr: $(NET_LIB) ipmaddr.o mii-tool: $(NET_LIB) mii-tool.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS) +ether-wake: $(NET_LIB) ether-wake.o + $(CC) $(CFLAGS) $(LDFLAGS) -o ether-wake ether-wake.o $(NLIB) $(LDLIBS) + installbin: @echo @echo "######################################################" @@ -217,6 +220,7 @@ installbin: install -m 0755 nameif ${BASEDIR}${SBINDIR} install -m 0755 netstat ${BASEDIR}${BINDIR} install -m 0755 route ${BASEDIR}${BINDIR} + install -m 0755 ether-wake ${BASEDIR}${SBINDIR} ifeq ($(HAVE_ARP_TOOLS),1) install -m 0755 arp ${BASEDIR}${SBINDIR} install -m 0755 rarp ${BASEDIR}${SBINDIR} diff --git a/ether-wake.c b/ether-wake.c new file mode 100644 index 0000000..cfceb44 --- /dev/null +++ b/ether-wake.c @@ -0,0 +1,445 @@ +/* ether-wake.c: Send a magic packet to wake up sleeping machines. */ + +static char version_msg[] = +"ether-wake.c: v1.09 11/12/2003 Donald Becker, http://www.scyld.com/"; +static char brief_usage_msg[] = +"usage: ether-wake -i <ifname> [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n" +" Use '-u' to see the complete set of options.\n"; +static char usage_msg[] = +"usage: ether-wake -i <ifname> [-p aa:bb:cc:dd[:ee:ff]] 00:11:22:33:44:55\n" +"\n" +" This program generates and transmits a Wake-On-LAN (WOL)\n" +" \"Magic Packet\", used for restarting machines that have been\n" +" soft-powered-down (ACPI D3-warm state).\n" +" It currently generates the standard AMD Magic Packet format, with\n" +" an optional password appended.\n" +"\n" +" The single required parameter is the Ethernet MAC (station) address\n" +" of the machine to wake or a host ID with known NSS 'ethers' entry.\n" +" The MAC address may be found with the 'arp' program while the target\n" +" machine is awake.\n" +"\n" +" Options:\n" +" -b Send wake-up packet to the broadcast address.\n" +" -D Increase the debug level.\n" +" -i ifname Use interface ifname instead of sending a wake packet to all interfaces.\n" +" -p <pw> Append the four or six byte password PW to the packet.\n" +" A password is only required for a few adapter types.\n" +" The password may be specified in ethernet hex format\n" +" or dotted decimal (Internet address)\n" +" -p 00:22:44:66:88:aa\n" +" -p 192.168.1.1\n"; + +/* + This program generates and transmits a Wake-On-LAN (WOL) "Magic Packet", + used for restarting machines that have been soft-powered-down + (ACPI D3-warm state). It currently generates the standard AMD Magic Packet + format, with an optional password appended. + + This software may be used and distributed according to the terms + of the GNU Public License, incorporated herein by reference. + Contact the author for use under other terms. + + This source file was originally part of the network tricks package, and + is now distributed to support the Scyld Beowulf system. + Copyright 1999-2003 Donald Becker and Scyld Computing Corporation. + + The author may be reached as becker@scyld, or C/O + Scyld Computing Corporation + 914 Bay Ridge Road, Suite 220 + Annapolis MD 21403 + + Notes: + On some systems dropping root capability allows the process to be + dumped, traced or debugged. + If someone traces this program, they get control of a raw socket. + Linux handles this safely, but beware when porting this program. + + An alternative to needing 'root' is using a UDP broadcast socket, however + doing so only works with adapters configured for unicast+broadcast Rx + filter. That configuration consumes more power. +*/ + +#include <unistd.h> +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <ctype.h> +#include <string.h> + +#if 0 /* Only exists on some versions. */ +#include <ioctls.h> +#endif + +#include <sys/socket.h> + +#include <sys/types.h> +#include <sys/ioctl.h> +#include <linux/if.h> + +#include <features.h> +#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 +#include <netpacket/packet.h> +#include <net/ethernet.h> +#else +#include <asm/types.h> +#include <linux/if_packet.h> +#include <linux/if_ether.h> +#endif +#include <netdb.h> +#include <netinet/ether.h> + +#include "interface.h" +#include "sockets.h" + +/* Grrr, no consistency between include versions. + Enable this if setsockopt() isn't declared with your library. */ +#if 0 +extern int setsockopt __P ((int __fd, int __level, int __optname, + __ptr_t __optval, int __optlen)); +#else /* New, correct head files. */ +#include <sys/socket.h> +#endif + +u_char outpack[1000]; +int outpack_sz = 0; +int debug = 0; +u_char wol_passwd[6]; +int wol_passwd_sz = 0; + +static int opt_no_src_addr = 0, opt_broadcast = 0; + +static int get_dest_addr(const char *arg, struct ether_addr *eaddr); +static int get_fill(unsigned char *pkt, struct ether_addr *eaddr); +static int get_wol_pw(const char *optarg); + +typedef struct { + int s; + int verbose; + int pktsize; +} if_info; + +static int send_wol_packet(char *ifname, int s, int verbose, int pktsize); + +static int do_wake(struct interface *ife, void *cookie) { + if_info *info = (if_info *)cookie; + send_wol_packet(ife->name, info->s, info->verbose, info->pktsize); + return 0; +} + +int main(int argc, char *argv[]) +{ + char *ifname = NULL; + int s; /* Raw socket */ + int errflag = 0, verbose = 0, do_version = 0; + int perm_failure = 0; + int c, pktsize; + struct ether_addr eaddr; + if_info info; + + while ((c = getopt(argc, argv, "bDi:p:uvV")) != -1) + switch (c) { + case 'b': opt_broadcast++; break; + case 'D': debug++; break; + case 'i': ifname = optarg; break; + case 'p': get_wol_pw(optarg); break; + case 'u': printf("%s",usage_msg); return 0; + case 'v': verbose++; break; + case 'V': do_version++; break; + case '?': + errflag++; + } + if (verbose || do_version) + printf("%s\n", version_msg); + if (errflag) { + fprintf(stderr,"%s", brief_usage_msg); + return 3; + } + + if (ifname == NULL) { + fprintf(stderr, "Specify -i <interface>.\n"); + return 3; + } + + if (optind == argc) { + fprintf(stderr, "Specify the Ethernet address as 00:11:22:33:44:55.\n"); + return 3; + } + + /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to + work as non-root, but we need SOCK_PACKET to specify the Ethernet + destination address. */ +#if defined(PF_PACKET) + s = socket(PF_PACKET, SOCK_RAW, 0); +#else + s = socket(AF_INET, SOCK_PACKET, SOCK_PACKET); +#endif + if (s < 0) { + if (errno == EPERM) + fprintf(stderr, "ether-wake: This program must be run as root.\n"); + else + perror("ether-wake: socket"); + perm_failure++; + } + /* Don't revert if debugging allows a normal user to get the raw socket. */ + setuid(getuid()); + + /* We look up the station address before reporting failure so that + errors may be reported even when run as a normal user. + */ + if (get_dest_addr(argv[optind], &eaddr) != 0) + return 3; + if (perm_failure && ! debug) + return 2; + + pktsize = get_fill(outpack, &eaddr); + + if (ifname == NULL) { + info.s = s; + info.verbose = verbose; + info.pktsize = pktsize; + + /* Create a channel to the NET kernel. */ + if ((sockets_open(0)) < 0) { + perror("socket"); + exit(1); + } + + return for_all_interfaces(do_wake, &info); + } + + return send_wol_packet(ifname, s, verbose, pktsize); +} + +/* Send a Wake-On-LAN (WOL) "Magic Packet" to Interface IFNAME using + Socket S with a packet size PKTSIZE. VERBOSE implies + verbosity. */ + +static int send_wol_packet(char *ifname, int s, int verbose, int pktsize) +{ + int i; + int one = 1; /* True, for socket options. */ +#if defined(PF_PACKET) + struct sockaddr_ll whereto; +#else + struct sockaddr whereto; /* who to wake up */ +#endif + + /* Fill in the source address, if possible. + The code to retrieve the local station address is Linux specific. */ + if (! opt_no_src_addr) { + struct ifreq if_hwaddr; + const char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data; + + strncpy(if_hwaddr.ifr_name, ifname, IFNAMSIZ); + if_hwaddr.ifr_name[IFNAMSIZ-1] = '\0'; + if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0) { + fprintf(stderr, "SIOCGIFHWADDR on %s failed: %s\n", ifname, + strerror(errno)); + /* Magic packets still work if our source address is bogus, but + we fail just to be anal. */ + return 1; + } + memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6); + + if (verbose) { + printf("The hardware address (SIOCGIFHWADDR) of %s is type %d " + "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", ifname, + if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1], + hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]); + } + } + + if (wol_passwd_sz > 0) { + memcpy(outpack+pktsize, wol_passwd, wol_passwd_sz); + pktsize += wol_passwd_sz; + } + + if (verbose > 1) { + printf("The final packet is: "); + for (i = 0; i < pktsize; i++) + printf(" %2.2x", outpack[i]); + printf(".\n"); + } + + /* This is necessary for broadcasts to work */ + if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (char *)&one, sizeof(one)) < 0) + perror("setsockopt: SO_BROADCAST"); + +#if defined(PF_PACKET) + { + struct ifreq ifr; + strncpy(ifr.ifr_name, ifname, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ-1] = '\0'; + if (ioctl(s, SIOCGIFINDEX, &ifr) == -1) { + fprintf(stderr, "SIOCGIFINDEX on %s failed: %s\n", ifname, + strerror(errno)); + return 1; + } + memset(&whereto, 0, sizeof(whereto)); + whereto.sll_family = AF_PACKET; + whereto.sll_ifindex = ifr.ifr_ifindex; + /* The manual page incorrectly claims the address must be filled. + We do so because the code may change to match the docs. */ + whereto.sll_halen = ETH_ALEN; + memcpy(whereto.sll_addr, outpack, ETH_ALEN); + + } +#else + whereto.sa_family = 0; + strcpy(whereto.sa_data, ifname); +#endif + + char senderrmsg[IFNAMSIZ+16] = "'"; + strcat(senderrmsg, ifname); + strcat(senderrmsg, "', sendto"); + if ((i = sendto(s, outpack, pktsize, 0, (struct sockaddr *)&whereto, + sizeof(whereto))) < 0) + perror(senderrmsg); + else if (debug) + printf("'%s', Sendto worked ! %d.\n", ifname, i); + +#ifdef USE_SEND + if (bind(s, (struct sockaddr *)&whereto, sizeof(whereto)) < 0) + perror("bind"); + else if (send(s, outpack, 100, 0) < 0) + perror("send"); +#endif +#ifdef USE_SENDMSG + { + struct msghdr msghdr = { 0,}; + struct iovec iovector[1]; + msghdr.msg_name = &whereto; + msghdr.msg_namelen = sizeof(whereto); + msghdr.msg_iov = iovector; + msghdr.msg_iovlen = 1; + iovector[0].iov_base = outpack; + iovector[0].iov_len = pktsize; + if ((i = sendmsg(s, &msghdr, 0)) < 0) + perror("sendmsg"); + else if (debug) + printf("sendmsg worked, %d (%d).\n", i, errno); + } +#endif + + return 0; +} + +/* Convert the host ID string to a MAC address. + The string may be a + Host name + IP address string + MAC address string +*/ + +static int get_dest_addr(const char *hostid, struct ether_addr *eaddr) +{ + struct ether_addr *eap; + + eap = ether_aton(hostid); + if (eap) { + *eaddr = *eap; + if (debug) + fprintf(stderr, "The target station address is %s.\n", + ether_ntoa(eaddr)); + } else if (ether_hostton(hostid, eaddr) == 0) { + if (debug) + fprintf(stderr, "Station address for hostname %s is %s.\n", + hostid, ether_ntoa(eaddr)); + } else { + (void)fprintf(stderr, + "ether-wake: The Magic Packet host address must be " + "specified as\n" + " - a station address, 00:11:22:33:44:55, or\n" + " - a hostname with a known 'ethers' entry.\n"); + return -1; + } + return 0; +} + + +static int get_fill(unsigned char *pkt, struct ether_addr *eaddr) +{ + int offset, i; + unsigned char *station_addr = eaddr->ether_addr_octet; + + if (opt_broadcast) + memset(pkt+0, 0xff, 6); + else + memcpy(pkt, station_addr, 6); + memcpy(pkt+6, station_addr, 6); + pkt[12] = 0x08; /* Or 0x0806 for ARP, 0x8035 for RARP */ + pkt[13] = 0x42; + offset = 14; + + memset(pkt+offset, 0xff, 6); + offset += 6; + + for (i = 0; i < 16; i++) { + memcpy(pkt+offset, station_addr, 6); + offset += 6; + } + if (debug) { + fprintf(stderr, "Packet is "); + for (i = 0; i < offset; i++) + fprintf(stderr, " %2.2x", pkt[i]); + fprintf(stderr, ".\n"); + } + return offset; +} + +static int get_wol_pw(const char *optarg) +{ + int passwd[6]; + int byte_cnt; + int i; + + byte_cnt = sscanf(optarg, "%2x:%2x:%2x:%2x:%2x:%2x", + &passwd[0], &passwd[1], &passwd[2], + &passwd[3], &passwd[4], &passwd[5]); + if (byte_cnt < 4) + byte_cnt = sscanf(optarg, "%d.%d.%d.%d", + &passwd[0], &passwd[1], &passwd[2], &passwd[3]); + if (byte_cnt < 4) { + fprintf(stderr, "Unable to read the Wake-On-LAN password.\n"); + return 0; + } + printf(" The Magic packet password is %2.2x %2.2x %2.2x %2.2x (%d).\n", + passwd[0], passwd[1], passwd[2], passwd[3], byte_cnt); + for (i = 0; i < byte_cnt; i++) + wol_passwd[i] = passwd[i]; + return wol_passwd_sz = byte_cnt; +} + +#if 0 +{ + to = (struct sockaddr_in *)&whereto; + to->sin_family = AF_INET; + if (inet_aton(target, &to->sin_addr)) { + hostname = target; + } + memset (&sa, 0, sizeof sa); + sa.sa_family = AF_INET; + strncpy (sa.sa_data, interface, sizeof sa.sa_data); + sendto (sock, buf, bufix + len, 0, &sa, sizeof sa); + strncpy (sa.sa_data, interface, sizeof sa.sa_data); +#if 1 + sendto (sock, buf, bufix + len, 0, &sa, sizeof sa); +#else + bind (sock, &sa, sizeof sa); + connect(); + send (sock, buf, bufix + len, 0); +#endif +} +#endif + + +/* + * Local variables: + * compile-command: "gcc -O -Wall -o ether-wake ether-wake.c" + * c-indent-level: 4 + * c-basic-offset: 4 + * c-indent-level: 4 + * tab-width: 4 + * End: + */ diff --git a/man/en_US/ether-wake.8 b/man/en_US/ether-wake.8 new file mode 100644 index 0000000..d0569c2 --- /dev/null +++ b/man/en_US/ether-wake.8 @@ -0,0 +1,81 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH ETHER-WAKE 8 "March 31, 2003" "Scyld" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +ether-wake \- A tool to send a Wake-On-LAN "Magic Packet" +.SH SYNOPSIS +.B ether-wake +.RI [ options ] " Host-ID" +.SH DESCRIPTION +This manual page documents the usage of the +.B ether-wake +command. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, +.\" respectively. +\fBether-wake\fP is a program that generates and transmits a Wake-On-LAN +(WOL) "Magic Packet", used for restarting machines that have been +soft-powered-down (ACPI D3-warm state). It generates the standard +AMD Magic Packet format, optionally with a password included. The +single required parameter is a station (MAC) address or a host ID that can +be translated to a MAC address by an +.BR ethers (5) +database specified in +.BR nsswitch.conf (5) +. +.SH OPTIONS +\fBether-wake\fP needs a single dash (´-´) in front of options. +A summary of options is included below. +.TP +.B \-b +Send the wake-up packet to the broadcast address. +.TP +.B \-D +Increase the Debug Level. +.TP +.B \-i ifname +Use interface ifname instead of sending a wake packet to all interfaces. +.TP +.B \-p passwd +Append a four or six byte password to the packet. Only a few adapters +need or support this. A six byte password may be specified in Ethernet hex +format (00:22:44:66:88:aa) or four byte dotted decimal (192.168.1.1) format. +A four byte password must use the dotted decimal format. + +.TP +.B \-V +Show the program version information. + +.SH EXIT STATUS +This program returns 0 on success. +A permission failures (e.g. run as a non-root user) results in an exit +status of 2. Unrecognized or invalid parameters result in an exit +status of 3. Failure to retrieve network interface information or send +a packet will result in an exit status of 1. + +.SH SEE ALSO +.BR arp (8). +.br +.SH SECURITY +On some non-Linux systems dropping root capability allows the process to be +dumped, traced or debugged. +If someone traces this program, they get control of a raw socket. +Linux handles this safely, but beware when porting this program. +.SH AUTHOR +The ether-wake program was written by Donald Becker at Scyld Computing +Corporation for use with the Scyld(\*(Tm) Beowulf System. -- 2.13.1 ++++++ 0002-Do-not-warn-about-interface-socket-not-binded.patch ++++++ >From 5b612570220e66ea3197b88b5f9d81e064f9e873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sat, 17 Jun 2017 22:15:06 +0200 Subject: [PATCH 2/7] Do not warn about interface socket not binded --- lib/interface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/interface.c b/lib/interface.c index e8ab2b8..94e554b 100644 --- a/lib/interface.c +++ b/lib/interface.c @@ -173,12 +173,10 @@ static int if_readconf(void) (as of 2.1.128) */ skfd = get_socket_for_af(AF_INET); if (skfd < 0) { - fprintf(stderr, _("warning: no inet socket available: %s\n"), - strerror(errno)); - /* Try to soldier on with whatever socket we can get hold of. */ - skfd = sockets_open(0); - if (skfd < 0) - return -1; + /* Try to soldier on with whatever socket we can get hold of. */ + skfd = sockets_open(0); + if (skfd < 0) + return -1; } ifc.ifc_buf = NULL; -- 2.13.1 ++++++ 0003-Add-support-for-EiB-in-interface.c.patch ++++++ >From 1198aae1c5d434f6e9bc6a0af8060e82eed3a6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sat, 17 Jun 2017 22:21:34 +0200 Subject: [PATCH 3/7] Add support for EiB in interface.c Taken from Fedora package --- lib/interface.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/interface.c b/lib/interface.c index 94e554b..7e326a0 100644 --- a/lib/interface.c +++ b/lib/interface.c @@ -864,10 +864,10 @@ void ife_print_long(struct interface *ptr) */ rx = ptr->stats.rx_bytes; short_rx = rx * 10; - if (rx > 1125899906842624ull) { - if (rx > (9223372036854775807ull / 10)) - short_rx = rx / 112589990684262ull; - else + if (rx > 1152921504606846976ull) { + short_rx = rx / 115292150460684697ull; + Rext = "EiB"; + } else if (rx > 1125899906842624ull) { short_rx /= 1125899906842624ull; Rext = "PiB"; } else if (rx > 1099511627776ull) { @@ -885,10 +885,10 @@ void ife_print_long(struct interface *ptr) } tx = ptr->stats.tx_bytes; short_tx = tx * 10; - if (tx > 1125899906842624ull) { - if (tx > (9223372036854775807ull / 10)) - short_tx = tx / 112589990684262ull; - else + if (tx > 1152921504606846976ull) { + short_tx = tx / 115292150460684697ull; + Text = "EiB"; + } else if (tx > 1125899906842624ull) { short_tx /= 1125899906842624ull; Text = "PiB"; } else if (tx > 1099511627776ull) { -- 2.13.1 ++++++ 0004-By-default-do-not-fopen-anything-in-netrom_gr.patch ++++++ >From 70a4077962be2dc3ea7dc20a3687e9f1c7458ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sat, 17 Jun 2017 22:26:14 +0200 Subject: [PATCH 4/7] By default do not fopen anything in netrom_gr This is SUSE specific patch basically disabling this functionality. --- lib/netrom_gr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/netrom_gr.c b/lib/netrom_gr.c index ec82fe8..eecf148 100644 --- a/lib/netrom_gr.c +++ b/lib/netrom_gr.c @@ -32,8 +32,8 @@ int NETROM_rprint(int options) { - FILE *f1 = fopen(_PATH_PROCNET_NR_NODES, "r"); - FILE *f2 = fopen(_PATH_PROCNET_NR_NEIGH, "r"); + FILE *f1 = NULL; + FILE *f2 = NULL; char buffer[256]; int qual, n, w; /*int ext = options & FLAG_EXT; -- 2.13.1 ++++++ 0005-Add-support-for-interface-rename-in-nameif.patch ++++++ >From 2f92b974dd8f6c0885e060b53254d4470d06235f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sat, 17 Jun 2017 23:07:04 +0200 Subject: [PATCH 5/7] Add support for interface rename in nameif --- man/en_US/nameif.8 | 43 ++++++++++++++++++++++++-------------- nameif.c | 61 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 70 insertions(+), 34 deletions(-) diff --git a/man/en_US/nameif.8 b/man/en_US/nameif.8 index 195304d..ccea694 100644 --- a/man/en_US/nameif.8 +++ b/man/en_US/nameif.8 @@ -4,26 +4,37 @@ nameif \- name network interfaces based on MAC addresses .SH SYNOPSIS .B "nameif [\-c configfile] [\-s]" .br -.B "nameif [\-c configfile] [\-s] {interface macaddress}" +.B "nameif [\-c configfile] [\-s] [interface macaddress]" +.br +.B "nameif [-c configfile] [-r] [newifname oldifname]" .SH DESCRIPTION -.B nameif -renames network interfaces based on mac addresses. When no arguments are -given +.B nameif +renames network interfaces based on mac addresses or interface names. +When no arguments are given .I /etc/mactab -is read. Each line of it contains an interface name and a Ethernet MAC -address. Comments are allowed starting with #. +is read. Each line of it contains an interface name and a Ethernet MAC +address. Comments are allowed starting with #. Otherwise the interfaces specified on the command line are processed. .I nameif -looks for the interface with the given MAC address and renames it to the -name given. - -When the -.I \-s -argument is given all error messages go to the syslog. - -When the -.I \-c -argument is given with a file name that file is read instead of /etc/mactab. +looks for the interface with the given MAC address or old interface name +and renames it to the name given. +.SH OPTIONS +.TP +.B "[-s|--syslog]" +Log all error messages to syslog. +.TP +.B "[-r|--rename]" +Rename the interface given by +.I oldifname +to the new name +.I newifname +without consulting any macaddress. +.TP +.B "[-c|--config-file configfile]" +Read +.I configfile +instead of +.I /etc/mactab. .SH NOTES .I nameif diff --git a/nameif.c b/nameif.c index b280e59..bdc1dfa 100644 --- a/nameif.c +++ b/nameif.c @@ -28,6 +28,7 @@ const char default_conf[] = "/etc/mactab"; const char *fname = default_conf; int use_syslog; +int do_rename; int ctl_sk = -1; void err(char *msg) @@ -114,7 +115,8 @@ int getmac(char *name, unsigned char *mac) struct change { struct change *next; int found; - char ifname[IFNAMSIZ+1]; + unsigned char ifname_old[IFNAMSIZ+1]; + unsigned char ifname_new[IFNAMSIZ+1]; unsigned char mac[6]; }; struct change *clist; @@ -128,13 +130,28 @@ struct change *lookupmac(unsigned char *mac) return NULL; } +struct change *lookupifname(unsigned char *ifname_old) +{ + struct change *ch; + for (ch = clist;ch;ch = ch->next) + if (!strcmp(ch->ifname_old, ifname_old)) + return ch; + return NULL; +} + int addchange(char *p, struct change *ch, char *pos) { - if (strchr(ch->ifname, ':')) - warning(_("alias device %s at %s probably has no mac"), - ch->ifname, pos); - if (parsemac(p,ch->mac) < 0) - complain(_("cannot parse MAC `%s' at %s"), p, pos); + if (do_rename) { + if (strlen(p)+1>IFNAMSIZ) + complain(_("interface name `%s' too long"), p); + strcpy(ch->ifname_old, p); + } else { + if (strchr(ch->ifname_new, ':')) + warning(_("alias device %s at %s probably has no mac"), + ch->ifname_new, pos); + if (parsemac(p,ch->mac) < 0) + complain(_("cannot parse MAC `%s' at %s"), p, pos); + } ch->next = clist; clist = ch; return 0; @@ -173,8 +190,8 @@ void readconf(void) if (n > IFNAMSIZ-1) complain(_("interface name too long at line %d"), line); ch = xmalloc(sizeof(struct change)); - memcpy(ch->ifname, p, n); - ch->ifname[n] = 0; + memcpy(ch->ifname_new, p, n); + ch->ifname_new[n] = 0; p += n; p += strspn(p, " \t"); n = strspn(p, "0123456789ABCDEFabcdef:"); @@ -187,6 +204,7 @@ void readconf(void) struct option lopt[] = { {"syslog", 0, NULL, 's' }, + {"rename", 0, NULL, 'r' }, {"config-file", 1, NULL, 'c' }, {"help", 0, NULL, '?' }, {NULL}, @@ -194,7 +212,7 @@ struct option lopt[] = { void usage(void) { - fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); + fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] [-r] {ifname macaddress|oldifname}\n")); exit(E_USAGE); } @@ -209,7 +227,7 @@ int main(int ac, char **av) int ret = 0; for (;;) { - int c = getopt_long(ac,av,"c:s",lopt,NULL); + int c = getopt_long(ac,av,"c:sr",lopt,NULL); if (c == -1) break; switch (c) { default: @@ -221,6 +239,9 @@ int main(int ac, char **av) case 's': use_syslog = 1; break; + case 'r': + do_rename = 1; + break; } } @@ -235,7 +256,7 @@ int main(int ac, char **av) usage(); if (strlen(av[optind])+1>IFNAMSIZ) complain(_("interface name `%s' too long"), av[optind]); - safe_strncpy(ch->ifname, av[optind], sizeof(ch->ifname)); + safe_strncpy(ch->ifname_new, av[optind], sizeof(ch->ifname_new)); optind++; sprintf(pos,_("argument %d"),optind); addchange(av[optind], ch, pos); @@ -266,18 +287,22 @@ int main(int ac, char **av) if (n > IFNAMSIZ-1) complain(_("interface name `%s' too long"), p); - if (getmac(p, mac) < 0) - continue; + if (do_rename) { + ch = lookupifname(p); + } else { + if (getmac(p, mac) < 0) + continue; - ch = lookupmac(mac); + ch = lookupmac(mac); + } if (!ch) continue; ch->found = 1; - if (strcmp(p, ch->ifname)) { - if (setname(p, ch->ifname) < 0) + if (strcmp(p, ch->ifname_new)) { + if (setname(p, ch->ifname_new) < 0) complain(_("cannot change name of %s to %s: %s"), - p, ch->ifname, strerror(errno)); + p, ch->ifname_new, strerror(errno)); } } fclose(ifh); @@ -286,7 +311,7 @@ int main(int ac, char **av) struct change *ch = clist; clist = clist->next; if (!ch->found){ - warning(_("interface '%s' not found"), ch->ifname); + complain(_("interface '%s' not found"), ch->ifname_new); ret = 1; } free(ch); -- 2.13.1 ++++++ 0006-Allow-interface-stacking.patch ++++++ >From 3e27ced0c24be18dc443f7eb1421c7c3c1755cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sun, 18 Jun 2017 08:54:17 +0200 Subject: [PATCH 6/7] Allow interface stacking --- lib/interface.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/interface.c b/lib/interface.c index 7e326a0..42d86fb 100644 --- a/lib/interface.c +++ b/lib/interface.c @@ -208,10 +208,11 @@ out: return err; } -static const char *get_name(char *name, const char *p) +static const char *get_name(char **namep, const char *p) { while (isspace(*p)) p++; + char *name = *namep = p; while (*p) { if (isspace(*p)) break; @@ -314,9 +315,10 @@ static int get_dev_fields(const char *bp, struct interface *ife) static int if_readlist_proc(const char *target) { FILE *fh; - char buf[512]; struct interface *ife; int err; + char *line = NULL; + size_t linelen = 0; fh = fopen(_PATH_PROCNET_DEV, "r"); if (!fh) { @@ -324,10 +326,11 @@ static int if_readlist_proc(const char *target) _PATH_PROCNET_DEV, strerror(errno)); return -2; } - if (fgets(buf, sizeof buf, fh)) - /* eat line */; - if (fgets(buf, sizeof buf, fh)) - /* eat line */; + if (getline(&line, &linelen, fh) == -1 /* eat line */ + || getline(&line, &linelen, fh) == -1) { + err = -1; + goto out; + } #if 0 /* pretty, but can't cope with missing fields */ fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh, @@ -352,14 +355,14 @@ static int if_readlist_proc(const char *target) if (!fmt) return -1; #else - procnetdev_vsn = procnetdev_version(buf); + procnetdev_vsn = procnetdev_version(line); #endif err = 0; - while (fgets(buf, sizeof buf, fh)) { + while (getline(&line, &linelen, fh) != -1) { const char *s; - char name[IFNAMSIZ]; - s = get_name(name, buf); + char *name; + s = get_name(&name, line); ife = if_cache_add(name); get_dev_fields(s, ife); ife->statistics_valid = 1; @@ -374,6 +377,8 @@ static int if_readlist_proc(const char *target) #if 0 free(fmt); #endif + out: + free(line); fclose(fh); return err; } -- 2.13.1 ++++++ 0007-Introduce-T-notrim-option-in-netstat.patch ++++++ >From 0e30aa568f29e1626177458cfe1d33b25c6da7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal(a)suse.com> Date: Sun, 18 Jun 2017 09:12:33 +0200 Subject: [PATCH 7/7] Introduce T notrim option in netstat This is the same as wide option but unfortunately SUSE carried for last 10 years patch using the -T option so we need not to regress in script usage. --- netstat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netstat.c b/netstat.c index fe25e92..401ac3b 100644 --- a/netstat.c +++ b/netstat.c @@ -2043,6 +2043,7 @@ int main {"fib", 0, 0, 'F'}, {"groups", 0, 0, 'g'}, {"context", 0, 0, 'Z'}, + {"notrim", 0, 0, 'T'}, {NULL, 0, 0, 0} }; @@ -2054,7 +2055,7 @@ int main getroute_init(); /* Set up AF routing support */ afname[0] = '\0'; - while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?Z", longopts, &lop)) != EOF) + while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWw2fx64?ZT", longopts, &lop)) != EOF) switch (i) { case -1: break; @@ -2098,6 +2099,7 @@ int main case 'i': flag_int++; break; + case 'T': case 'W': flag_wide++; break; -- 2.13.1 ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">git://git.code.sf.net/p/net-tools/code</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">net-tools</param> <param name="versionformat">2.0+git%cd.%h</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ net-tools-configure.patch ++++++ Index: Makefile =================================================================== --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ all: config.h version.h subdirs $(PROGS config: cleanconfig config.h -install: all savebin installbin installdata +install: all installbin installdata update: all installbin installdata Index: config.in =================================================================== --- a/config.in +++ b/config.in @@ -42,7 +42,7 @@ * course, welcome. Answer `n' here if you have no support for * internationalization on your system. * -bool 'Does your system support GNU gettext?' I18N n +bool 'Does your system support GNU gettext?' I18N y * * * Protocol Families. @@ -91,10 +91,10 @@ bool 'InfiniBand hardware support' HAVE_ * bool 'IP Masquerading support' HAVE_FW_MASQUERADE y bool 'Build arp and rarp' HAVE_ARP_TOOLS y -bool 'Build hostname' HAVE_HOSTNAME_TOOLS y -bool 'Install hostname NIS/YP symlinks' HAVE_HOSTNAME_SYMLINKS y +bool 'Build hostname' HAVE_HOSTNAME_TOOLS n +bool 'Install hostname NIS/YP symlinks' HAVE_HOSTNAME_SYMLINKS n bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y -bool 'Build mii-tool' HAVE_MII y +bool 'Build mii-tool' HAVE_MII n bool 'Build plipconfig' HAVE_PLIP_TOOLS y bool 'Build slattach' HAVE_SERIAL_TOOLS y bool 'SELinux support' HAVE_SELINUX n Index: configure.sh =================================================================== --- a/configure.sh +++ b/configure.sh @@ -66,9 +66,8 @@ config_fd_redir='<&7' # function readln() { - echo -n "$1" - IFS='@' read ans || exit 1 - [ -z "$ans" ] && ans=$2 + echo "$1" + ans=$2 } # bool processes a boolean argument

1 0