openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2017
- 1 participants
- 1390 discussions
Hello community,
here is the log from the commit of package rebootmgr for openSUSE:Factory checked in at 2017-04-03 11:05:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rebootmgr (Old)
and /work/SRC/openSUSE:Factory/.rebootmgr.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rebootmgr"
Mon Apr 3 11:05:22 2017 rev:5 rq:484072 version:0.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/rebootmgr/rebootmgr.changes 2017-03-16 09:51:55.282509086 +0100
+++ /work/SRC/openSUSE:Factory/.rebootmgr.new/rebootmgr.changes 2017-04-03 11:06:02.439776115 +0200
@@ -1,0 +2,6 @@
+Fri Mar 31 13:30:03 CEST 2017 - kukuk(a)suse.de
+
+- Update to version 0.14
+ - Allow to have no maintenance window configured [bsc#1031619]
+
+-------------------------------------------------------------------
Old:
----
rebootmgr-0.13.tar.bz2
New:
----
rebootmgr-0.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rebootmgr.spec ++++++
--- /var/tmp/diff_new_pack.Rd5KeL/_old 2017-04-03 11:06:03.147676100 +0200
+++ /var/tmp/diff_new_pack.Rd5KeL/_new 2017-04-03 11:06:03.147676100 +0200
@@ -17,7 +17,7 @@
Name: rebootmgr
-Version: 0.13
+Version: 0.14
Release: 0
Summary: Automatic controlled reboot during a maintenance window
License: GPL-2.0 and LGPL-2.1+
++++++ rebootmgr-0.13.tar.bz2 -> rebootmgr-0.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/NEWS new/rebootmgr-0.14/NEWS
--- old/rebootmgr-0.13/NEWS 2017-03-15 13:11:58.000000000 +0100
+++ new/rebootmgr-0.14/NEWS 2017-03-31 13:26:33.000000000 +0200
@@ -2,6 +2,9 @@
Copyright (C) 2016, 2017 Thorsten Kukuk
+Version 0.14
+* Allow to have no maintenance window configured [bsc#1031619]
+
Version 0.13
* Cancel reboot if we run out of the maintenance window with etcd-lock
[bsc#1028060]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/configure new/rebootmgr-0.14/configure
--- old/rebootmgr-0.13/configure 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/configure 2017-03-31 13:26:59.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rebootmgr 0.13.
+# Generated by GNU Autoconf 2.69 for rebootmgr 0.14.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='rebootmgr'
PACKAGE_TARNAME='rebootmgr'
-PACKAGE_VERSION='0.13'
-PACKAGE_STRING='rebootmgr 0.13'
+PACKAGE_VERSION='0.14'
+PACKAGE_STRING='rebootmgr 0.14'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1326,7 +1326,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 rebootmgr 0.13 to adapt to many kinds of systems.
+\`configure' configures rebootmgr 0.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,7 +1396,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rebootmgr 0.13:";;
+ short | recursive ) echo "Configuration of rebootmgr 0.14:";;
esac
cat <<\_ACEOF
@@ -1511,7 +1511,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rebootmgr configure 0.13
+rebootmgr configure 0.14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1876,7 +1876,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by rebootmgr $as_me 0.13, which was
+It was created by rebootmgr $as_me 0.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2740,7 +2740,7 @@
# Define the identity of the package.
PACKAGE='rebootmgr'
- VERSION='0.13'
+ VERSION='0.14'
cat >>confdefs.h <<_ACEOF
@@ -8627,7 +8627,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by rebootmgr $as_me 0.13, which was
+This file was extended by rebootmgr $as_me 0.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8693,7 +8693,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-rebootmgr config.status 0.13
+rebootmgr config.status 0.14
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/rebootmgr-0.13/configure.ac new/rebootmgr-0.14/configure.ac
--- old/rebootmgr-0.13/configure.ac 2017-03-15 13:10:38.000000000 +0100
+++ new/rebootmgr-0.14/configure.ac 2017-03-31 13:26:08.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(rebootmgr, 0.13)
+AC_INIT(rebootmgr, 0.14)
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src/rebootmgrd.c])
AM_CONFIG_HEADER(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/dbus/Makefile.in new/rebootmgr-0.14/dbus/Makefile.in
--- old/rebootmgr-0.13/dbus/Makefile.in 2017-03-15 13:12:07.000000000 +0100
+++ new/rebootmgr-0.14/dbus/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -292,9 +292,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dbus/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dbus/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign dbus/Makefile
+ $(AUTOMAKE) --gnu dbus/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/etc/Makefile.in new/rebootmgr-0.14/etc/Makefile.in
--- old/rebootmgr-0.13/etc/Makefile.in 2017-03-15 13:12:07.000000000 +0100
+++ new/rebootmgr-0.14/etc/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -288,9 +288,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign etc/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign etc/Makefile
+ $(AUTOMAKE) --gnu etc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/lib/Makefile.in new/rebootmgr-0.14/lib/Makefile.in
--- old/rebootmgr-0.13/lib/Makefile.in 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/lib/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -316,9 +316,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign lib/Makefile
+ $(AUTOMAKE) --gnu lib/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/Makefile.in new/rebootmgr-0.14/man/Makefile.in
--- old/rebootmgr-0.13/man/Makefile.in 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/man/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -316,9 +316,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign man/Makefile
+ $(AUTOMAKE) --gnu man/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/org.opensuse.RebootMgr.conf.8.html new/rebootmgr-0.14/man/org.opensuse.RebootMgr.conf.8.html
--- old/rebootmgr-0.13/man/org.opensuse.RebootMgr.conf.8.html 2017-03-15 13:09:22.000000000 +0100
+++ new/rebootmgr-0.14/man/org.opensuse.RebootMgr.conf.8.html 2017-03-31 13:27:02.000000000 +0200
@@ -15,7 +15,7 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
reboot at the same there, <span class="emphasis"><em>rebootmgrd</em></span> reboots
the machine following configured policies.</p><div class="refsect2"><a name="reboot_strategy_options"></a><h3 id="Reboot Strategies">Reboot Strategies<a class="headerlink" title="Permalink to this headline" href="#Reboot%20Strategies">¶</a></h3><p>
rebootmgr supports different strategies, when a reboot should be done:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgr.conf.5 new/rebootmgr-0.14/man/rebootmgr.conf.5
--- old/rebootmgr-0.13/man/rebootmgr.conf.5 2017-03-03 16:41:44.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgr.conf.5 2017-03-31 13:27:02.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: rebootmgr.conf
.\" Author: Thorsten Kukuk <kukuk(a)suse.com>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/03/2017
+.\" Date: 03/31/2017
.\" Manual: resolved.conf
.\" Source: rebootmgr
.\" Language: English
.\"
-.TH "REBOOTMGR\&.CONF" "5" "03/03/2017" "rebootmgr" "resolved.conf"
+.TH "REBOOTMGR\&.CONF" "5" "03/31/2017" "rebootmgr" "resolved.conf"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgr.conf.5.html new/rebootmgr-0.14/man/rebootmgr.conf.5.html
--- old/rebootmgr-0.13/man/rebootmgr.conf.5.html 2017-03-03 16:41:45.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgr.conf.5.html 2017-03-31 13:27:03.000000000 +0200
@@ -15,7 +15,7 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgr.conf.5"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>rebootmgr.conf — Reboot Manager configuration files</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><p><code class="filename">/etc/rebootmgr.conf</code></p></div><div class="refsect1"><a name="id-1.5"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>These configuration file controls and defines the reboot policy for
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgr.conf.5"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>rebootmgr.conf — Reboot Manager configuration files</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><p><code class="filename">/etc/rebootmgr.conf</code></p></div><div class="refsect1"><a name="id-1.5"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>These configuration file controls and defines the reboot policy for
<a href="rebootmgrd.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrd</span>(8)</span></a>.</p></div><div class="refsect1"><a name="id-1.6"></a><h2 id="Options">Options<a class="headerlink" title="Permalink to this headline" href="#Options">¶</a></h2><p>The following options are available in the "<code class="literal">rebootmgr</code>"
section:</p><div class="variablelist"><dl class="variablelist"><dt id="window-start="><span class="term"><code class="varname">window-start=</code></span><a class="headerlink" title="Permalink to this term" href="#window-start=">¶</a></dt><dd><p>
The format of <code class="varname">window-start</code> is the same as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgr.index.html new/rebootmgr-0.14/man/rebootmgr.index.html
--- old/rebootmgr-0.13/man/rebootmgr.index.html 2017-03-15 13:09:22.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgr.index.html 2017-03-31 13:27:03.000000000 +0200
@@ -15,4 +15,4 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgr.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>rebootmgr.index — List all manpages from the rebootmgr project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="O">O<a class="headerlink" title="Permalink to this headline" href="#O">¶</a></h2><p><a href="org.opensuse.RebootMgr.conf.8.html"><span class="citerefentry"><span class="refentrytitle">org.opensuse.RebootMgr.conf</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br></p></div><div class="refsect1"><a name="id-1.5"></a><h2 id="R">R<a class="headerlink" title="Permalink to this headline" href="#R">¶</a></h2><p><a href="rebootmgr.conf.5.html"><span class="citerefentry"><span class="refentrytitle">rebootmgr.conf</span>(5)</span></a> -- Reboot Manager configuration files<br><a href="rebootmgr.service.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgr.service</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br><a href="rebootmgrctl.1.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrctl</span>(1)</span></a> -- Tool to control and configure the reboot manager daemon.<br><a href="rebootmgrd.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrd</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br></p></div><div class="refsect1"><a name="id-1.6"></a><p><a name="counts"></a>This index contains 5 entries, referring to 3 individual manual pages.</p></div></div></body></html>
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgr.index"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>rebootmgr.index — List all manpages from the rebootmgr project</p></div><div class="refsect1"><a name="id-1.4"></a><h2 id="O">O<a class="headerlink" title="Permalink to this headline" href="#O">¶</a></h2><p><a href="org.opensuse.RebootMgr.conf.8.html"><span class="citerefentry"><span class="refentrytitle">org.opensuse.RebootMgr.conf</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br></p></div><div class="refsect1"><a name="id-1.5"></a><h2 id="R">R<a class="headerlink" title="Permalink to this headline" href="#R">¶</a></h2><p><a href="rebootmgr.conf.5.html"><span class="citerefentry"><span class="refentrytitle">rebootmgr.conf</span>(5)</span></a> -- Reboot Manager configuration files<br><a href="rebootmgr.service.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgr.service</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br><a href="rebootmgrctl.1.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrctl</span>(1)</span></a> -- Tool to control and configure the reboot manager daemon.<br><a href="rebootmgrd.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrd</span>(8)</span></a> -- Reboot the machine during a maintenance window.<br></p></div><div class="refsect1"><a name="id-1.6"></a><p><a name="counts"></a>This index contains 5 entries, referring to 3 individual manual pages.</p></div></div></body></html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgr.service.8.html new/rebootmgr-0.14/man/rebootmgr.service.8.html
--- old/rebootmgr-0.13/man/rebootmgr.service.8.html 2017-03-15 13:09:22.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgr.service.8.html 2017-03-31 13:27:02.000000000 +0200
@@ -15,7 +15,7 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
reboot at the same there, <span class="emphasis"><em>rebootmgrd</em></span> reboots
the machine following configured policies.</p><div class="refsect2"><a name="reboot_strategy_options"></a><h3 id="Reboot Strategies">Reboot Strategies<a class="headerlink" title="Permalink to this headline" href="#Reboot%20Strategies">¶</a></h3><p>
rebootmgr supports different strategies, when a reboot should be done:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgrctl.1 new/rebootmgr-0.14/man/rebootmgrctl.1
--- old/rebootmgr-0.13/man/rebootmgrctl.1 2017-03-03 16:41:44.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgrctl.1 2017-03-31 13:27:02.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: rebootmgrctl
.\" Author: Thorsten Kukuk <kukuk(a)suse.de>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/03/2017
+.\" Date: 03/31/2017
.\" Manual: rebootmgrctl
.\" Source: rebootmgr
.\" Language: English
.\"
-.TH "REBOOTMGRCTL" "1" "03/03/2017" "rebootmgr" "rebootmgrctl"
+.TH "REBOOTMGRCTL" "1" "03/31/2017" "rebootmgr" "rebootmgrctl"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgrctl.1.html new/rebootmgr-0.14/man/rebootmgrctl.1.html
--- old/rebootmgr-0.13/man/rebootmgrctl.1.html 2017-03-03 16:41:45.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgrctl.1.html 2017-03-31 13:27:03.000000000 +0200
@@ -15,7 +15,7 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgrctl.1"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrctl — Tool to control and configure the reboot manager daemon.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> [ --help | --version ]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> is-active [--quiet]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> reboot [ fast | now ]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> cancel </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> status [--quiet]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-strategy best-effort | etcd-lock | maint-window | instantly | off </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-strategy </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-group <em class="replaceable"><code>group</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-group </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-window <em class="replaceable"><code>time</code></em> <em class="replaceable"><code>duration</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-window </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-max [--group <em class="replaceable"><code>group</code></em>] <em class="replaceable"><code>number</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> lock [--group <em class="replaceable"><code>group</code></em>] [<em class="replaceable"><code>machine-id</code></em>]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> unlock [--group <em class="replaceable"><code>group</code></em>] [<em class="replaceable"><code>machine-id</code></em>]</p></div></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p><span class="emphasis"><em>rebootmgrctl</em></span> is used to
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgrctl.1"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrctl — Tool to control and configure the reboot manager daemon.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> [ --help | --version ]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> is-active [--quiet]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> reboot [ fast | now ]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> cancel </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> status [--quiet]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-strategy best-effort | etcd-lock | maint-window | instantly | off </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-strategy </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-group <em class="replaceable"><code>group</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-group </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-window <em class="replaceable"><code>time</code></em> <em class="replaceable"><code>duration</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> get-window </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> set-max [--group <em class="replaceable"><code>group</code></em>] <em class="replaceable"><code>number</code></em> </p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> lock [--group <em class="replaceable"><code>group</code></em>] [<em class="replaceable"><code>machine-id</code></em>]</p></div><div class="cmdsynopsis"><p><code class="command">rebootmgrctl</code> unlock [--group <em class="replaceable"><code>group</code></em>] [<em class="replaceable"><code>machine-id</code></em>]</p></div></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p><span class="emphasis"><em>rebootmgrctl</em></span> is used to
query and configure the
<a href="rebootmgrd.8.html"><span class="citerefentry"><span class="refentrytitle">rebootmgrd</span>(8)</span></a>
process.</p></div><div class="refsect1"><a name="options"></a><h2 id="Options">Options<a class="headerlink" title="Permalink to this headline" href="#Options">¶</a></h2><div class="variablelist"><dl class="variablelist"><dt id="--help"><span class="term"><code class="option">--help</code></span><a class="headerlink" title="Permalink to this term" href="#--help">¶</a></dt><dd><p>display help text and exit</p></dd><dt id="--version"><span class="term"><code class="option">--version</code></span><a class="headerlink" title="Permalink to this term" href="#--version">¶</a></dt><dd><p>output version information and exit</p></dd><dt id="cancel"><span class="term"><code class="option">cancel</code></span><a class="headerlink" title="Permalink to this term" href="#cancel">¶</a></dt><dd><p>Cancels an already running reboot.</p></dd><dt id="is-active --quiet"><span class="term"><code class="option">is-active</code> [<span class="optional">--quiet</span>]</span><a class="headerlink" title="Permalink to this term" href="#is-active%20--quiet">¶</a></dt><dd><p>Prints if the rebootmgrd is running and active or not. With the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgrd.8 new/rebootmgr-0.14/man/rebootmgrd.8
--- old/rebootmgr-0.13/man/rebootmgrd.8 2017-03-15 13:09:22.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgrd.8 2017-03-31 13:27:02.000000000 +0200
@@ -2,12 +2,12 @@
.\" Title: rebootmgrd
.\" Author: Thorsten Kukuk <kukuk(a)suse.de>
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 03/15/2017
+.\" Date: 03/31/2017
.\" Manual: rebootmgrd
.\" Source: rebootmgr
.\" Language: English
.\"
-.TH "REBOOTMGRD" "8" "03/15/2017" "rebootmgr" "rebootmgrd"
+.TH "REBOOTMGRD" "8" "03/31/2017" "rebootmgr" "rebootmgrd"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/man/rebootmgrd.8.html new/rebootmgr-0.14/man/rebootmgrd.8.html
--- old/rebootmgr-0.13/man/rebootmgrd.8.html 2017-03-15 13:09:22.000000000 +0100
+++ new/rebootmgr-0.14/man/rebootmgrd.8.html 2017-03-31 13:27:02.000000000 +0200
@@ -15,7 +15,7 @@
h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, dt:hover > a.headerlink {
visibility: visible;
}
- </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.12</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
+ </style><a href="rebootmgr.index.html">Index </a><span style="float:right">rebootmgr 0.14</span><hr><div class="refentry"><a name="rebootmgrd.8"></a><div class="titlepage"></div><div class="refnamediv"><a name="name"></a><h2>Name</h2><p>rebootmgrd, rebootmgr.service, org.opensuse.RebootMgr.conf — Reboot the machine during a maintenance window.</p></div><div class="refsynopsisdiv"><a name="synopsis"></a><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">/usr/sbin/rebootmgrd</code> [ --debug | --help | --version ]</p></div><p><code class="filename">/usr/lib/systemd/system/rebootmgr.service</code></p><p><code class="filename">/etc/dbus-1/system.d/org.opensuse.RebootMgr.conf</code></p></div><div class="refsect1"><a name="description"></a><h2 id="Description">Description<a class="headerlink" title="Permalink to this headline" href="#Description">¶</a></h2><p>To avoid that a whole cluster or a set of machines with the same task
reboot at the same there, <span class="emphasis"><em>rebootmgrd</em></span> reboots
the machine following configured policies.</p><div class="refsect2"><a name="reboot_strategy_options"></a><h3 id="Reboot Strategies">Reboot Strategies<a class="headerlink" title="Permalink to this headline" href="#Reboot%20Strategies">¶</a></h3><p>
rebootmgr supports different strategies, when a reboot should be done:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/src/Makefile.in new/rebootmgr-0.14/src/Makefile.in
--- old/rebootmgr-0.13/src/Makefile.in 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/src/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -327,9 +327,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
+ $(AUTOMAKE) --gnu src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/src/config_file.c new/rebootmgr-0.14/src/config_file.c
--- old/rebootmgr-0.13/src/config_file.c 2017-01-27 12:33:41.000000000 +0100
+++ new/rebootmgr-0.14/src/config_file.c 2017-03-31 12:58:53.000000000 +0200
@@ -97,12 +97,15 @@
}
g_key_file_set_string(key_file, RM_GROUP, "strategy", strategy_to_string(ctx->reboot_strategy, NULL));
- char *p = spec_to_string(ctx->maint_window_start);
- g_key_file_set_string(key_file, RM_GROUP, "window-start", p);
- free(p);
- p = duration_to_string(ctx->maint_window_duration);
- g_key_file_set_string(key_file, RM_GROUP, "window-duration", p);
- free(p);
+ if (ctx->maint_window_start != NULL)
+ {
+ char *p = spec_to_string(ctx->maint_window_start);
+ g_key_file_set_string(key_file, RM_GROUP, "window-start", p);
+ free(p);
+ p = duration_to_string(ctx->maint_window_duration);
+ g_key_file_set_string(key_file, RM_GROUP, "window-duration", p);
+ free(p);
+ }
g_key_file_set_string (key_file, RM_GROUP, "lock-group", ctx->lock_group);
error = NULL;
@@ -142,17 +145,20 @@
str_strategy = g_key_file_get_string (key_file, RM_GROUP, "strategy", NULL);
lock_group = g_key_file_get_string (key_file, RM_GROUP, "lock-group", NULL);
- if (str_start == NULL)
- str_start = strdup ("03:30");
- if (str_duration == NULL)
- str_duration = strdup ("1h");
+ if (str_start == NULL && str_duration != NULL)
+ str_duration = NULL;
ctx->reboot_strategy = string_to_strategy(str_strategy, NULL);
- if ((ret = calendar_spec_from_string (str_start, &ctx->maint_window_start)) < 0)
- log_msg (LOG_ERR, "ERROR: cannot parse window-start (%s): %s",
- str_start, strerror (-ret));
- if ((ctx->maint_window_duration = parse_duration (str_duration)) == BAD_TIME)
- log_msg (LOG_ERR, "ERROR: cannot parse window-duration '%s'",
- str_duration);
+ if (str_start != NULL)
+ {
+ if ((ret = calendar_spec_from_string (str_start,
+ &ctx->maint_window_start)) < 0)
+ log_msg (LOG_ERR, "ERROR: cannot parse window-start (%s): %s",
+ str_start, strerror (-ret));
+ if ((ctx->maint_window_duration =
+ parse_duration (str_duration)) == BAD_TIME)
+ log_msg (LOG_ERR, "ERROR: cannot parse window-duration '%s'",
+ str_duration);
+ }
if (ctx->lock_group)
free (ctx->lock_group);
if (lock_group == NULL)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/src/rebootmgrctl.c new/rebootmgr-0.14/src/rebootmgrctl.c
--- old/rebootmgr-0.13/src/rebootmgrctl.c 2017-03-03 16:29:33.000000000 +0100
+++ new/rebootmgr-0.14/src/rebootmgrctl.c 2017-03-31 13:22:23.000000000 +0200
@@ -207,7 +207,10 @@
if (dbus_message_get_args (reply, &error, DBUS_TYPE_STRING, &start,
DBUS_TYPE_STRING, &duration, DBUS_TYPE_INVALID))
{
- printf (_("Maintenance window is set to %s, lasting %s.\n"), start, duration);
+ if (start != NULL && strlen (start) > 0)
+ printf (_("Maintenance window is set to %s, lasting %s.\n"), start, duration);
+ else
+ printf (_("No maintenance window set.\n"));
}
else
{
@@ -618,17 +621,21 @@
const char *duration = argv[3];
CalendarSpec *tmp = NULL;
- if ((calendar_spec_from_string (start, &tmp)) < 0)
- {
- printf (_("Invalid time for maintenance window\n"));
- retval = 1;
- }
- else if (parse_duration (duration) == BAD_TIME)
+ if (strlen (argv[2]) > 0)
{
- printf (_("Invalid duration format for maintenance window\n"));
- retval = 1;
+
+ if ((calendar_spec_from_string (start, &tmp)) < 0)
+ {
+ printf (_("Invalid time for maintenance window\n"));
+ retval = 1;
+ }
+ else if (parse_duration (duration) == BAD_TIME)
+ {
+ printf (_("Invalid duration format for maintenance window\n"));
+ retval = 1;
+ }
}
- else
+ if (retval == 0)
retval = set_window (connection, start, duration);
}
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/src/rebootmgrd.c new/rebootmgr-0.14/src/rebootmgrd.c
--- old/rebootmgr-0.13/src/rebootmgrd.c 2017-03-15 12:45:04.000000000 +0100
+++ new/rebootmgr-0.14/src/rebootmgrd.c 2017-03-31 13:13:23.000000000 +0200
@@ -433,9 +433,19 @@
else if (dbus_message_is_method_call (message, RM_DBUS_INTERFACE,
RM_DBUS_METHOD_GET_MAINTWINDOW))
{
- char *str_start = spec_to_string(ctx->maint_window_start);
- char *str_duration = duration_to_string(ctx->maint_window_duration);
+ char *str_start;
+ char *str_duration;
+ if (ctx->maint_window_start != NULL)
+ {
+ str_start = spec_to_string(ctx->maint_window_start);
+ str_duration = duration_to_string(ctx->maint_window_duration);
+ }
+ else
+ {
+ str_start = strdup ("");
+ str_duration = strdup ("");
+ }
log_msg (LOG_DEBUG, "str_start: '%s' str_duration: '%s'",
str_start, str_duration);
/* create a reply from the message */
@@ -459,13 +469,20 @@
DBUS_TYPE_STRING, &str_duration,
DBUS_TYPE_INVALID))
{
-
- if ((calendar_spec_from_string (str_start, &ctx->maint_window_start)) < 0)
- return reply;
-
- if ((ctx->maint_window_duration = parse_duration (str_duration)) ==
- BAD_TIME)
- return reply;
+ if (str_start && strlen (str_start) > 0)
+ {
+ if ((calendar_spec_from_string (str_start, &ctx->maint_window_start)) < 0)
+ return reply;
+
+ if ((ctx->maint_window_duration = parse_duration (str_duration)) ==
+ BAD_TIME)
+ return reply;
+ }
+ else if (ctx->maint_window_start != NULL)
+ {
+ calendar_spec_free (ctx->maint_window_start);
+ ctx->maint_window_start = NULL;
+ }
save_config(ctx);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/systemd/Makefile.in new/rebootmgr-0.14/systemd/Makefile.in
--- old/rebootmgr-0.13/systemd/Makefile.in 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/systemd/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -289,9 +289,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign systemd/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu systemd/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign systemd/Makefile
+ $(AUTOMAKE) --gnu systemd/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rebootmgr-0.13/tests/Makefile.in new/rebootmgr-0.14/tests/Makefile.in
--- old/rebootmgr-0.13/tests/Makefile.in 2017-03-15 13:12:08.000000000 +0100
+++ new/rebootmgr-0.14/tests/Makefile.in 2017-03-31 13:26:56.000000000 +0200
@@ -531,9 +531,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign tests/Makefile
+ $(AUTOMAKE) --gnu tests/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
1
0
Hello community,
here is the log from the commit of package mate-menu for openSUSE:Factory checked in at 2017-04-03 11:05:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-menu (Old)
and /work/SRC/openSUSE:Factory/.mate-menu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-menu"
Mon Apr 3 11:05:19 2017 rev:10 rq:484068 version:17.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-menu/mate-menu.changes 2017-03-20 17:11:54.529994656 +0100
+++ /work/SRC/openSUSE:Factory/.mate-menu.new/mate-menu.changes 2017-04-03 11:06:01.323933765 +0200
@@ -1,0 +2,9 @@
+Fri Mar 31 11:05:58 UTC 2017 - sor.alexei(a)meowr.ru
+
+- Update to version 17.04.3:
+ * Menu icon: Scale SVG files to 22px to prevent them from getting
+ too big.
+ * Fix launching some Wine applications.
+ * Better categories hovering state.
+
+-------------------------------------------------------------------
Old:
----
mate-menu_17.04.2.orig.tar.gz
New:
----
mate-menu_17.04.3.orig.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-menu.spec ++++++
--- /var/tmp/diff_new_pack.XJ1ytn/_old 2017-04-03 11:06:02.135819059 +0200
+++ /var/tmp/diff_new_pack.XJ1ytn/_new 2017-04-03 11:06:02.139818494 +0200
@@ -17,9 +17,9 @@
%define _name mate_menu
-%define _rev f13d0b5158b8
+%define _rev f4328f0400ec
Name: mate-menu
-Version: 17.04.2
+Version: 17.04.3
Release: 0
Summary: Advanced MATE menu
License: GPL-2.0+
++++++ mate-menu_17.04.2.orig.tar.gz -> mate-menu_17.04.3.orig.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-f13d0b5158b8/lib/mate-menu-config.py new/ubuntu-mate-mate-menu-f4328f0400ec/lib/mate-menu-config.py
--- old/ubuntu-mate-mate-menu-f13d0b5158b8/lib/mate-menu-config.py 2017-03-17 15:10:44.000000000 +0100
+++ new/ubuntu-mate-mate-menu-f4328f0400ec/lib/mate-menu-config.py 2017-03-29 00:36:39.000000000 +0200
@@ -27,7 +27,7 @@
gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk, Gdk
+from gi.repository import Gtk, Gdk, GdkPixbuf
import mate_menu.keybinding as keybinding
signal.signal(signal.SIGINT, signal.SIG_DFL)
@@ -348,7 +348,8 @@
def setButtonIcon( self, value ):
self.buttonIconChooser.set_filename(value)
- self.buttonIconImage.set_from_file(value)
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(value, -1, 22)
+ self.buttonIconImage.set_from_pixbuf(pixbuf)
def getShowButtonIcon( self ):
return not self.showButtonIcon.get_active()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-f13d0b5158b8/lib/mate-menu.py new/ubuntu-mate-mate-menu-f4328f0400ec/lib/mate-menu.py
--- old/ubuntu-mate-mate-menu-f13d0b5158b8/lib/mate-menu.py 2017-03-17 15:10:44.000000000 +0100
+++ new/ubuntu-mate-mate-menu-f4328f0400ec/lib/mate-menu.py 2017-03-29 00:36:39.000000000 +0200
@@ -19,7 +19,7 @@
# Free Software Foundation, Inc.,
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-__VERSION__='17.04.2'
+__VERSION__='17.04.3'
import gc
import gi
@@ -576,13 +576,17 @@
self.do_image(self.buttonIcon, False)
def do_image(self, image_file, saturate):
- pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_file)
+ if image_file.endswith(".svg"):
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(image_file, -1, 22)
+ else:
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_file)
if saturate:
GdkPixbuf.Pixbuf.saturate_and_pixelate(pixbuf, pixbuf, 1.5, False)
self.button_icon.set_from_pixbuf(pixbuf)
def createPanelButton( self ):
- self.button_icon = Gtk.Image.new_from_file( self.buttonIcon )
+ self.button_icon = Gtk.Image()
+ self.do_image(self.buttonIcon, False)
self.systemlabel = Gtk.Label(label= "%s " % self.buttonText )
try:
process = subprocess.Popen(['lsb_release', '-d'], stdout=subprocess.PIPE)
@@ -681,7 +685,7 @@
def updateButton( self ):
self.systemlabel.set_text( self.buttonText )
self.button_icon.clear()
- self.button_icon.set_from_file( self.buttonIcon )
+ self.do_image(self.buttonIcon, False)
self.sizeButton()
def bind_hot_key (self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-f13d0b5158b8/mate_menu/easybuttons.py new/ubuntu-mate-mate-menu-f4328f0400ec/mate_menu/easybuttons.py
--- old/ubuntu-mate-mate-menu-f13d0b5158b8/mate_menu/easybuttons.py 2017-03-17 15:10:44.000000000 +0100
+++ new/ubuntu-mate-mate-menu-f4328f0400ec/mate_menu/easybuttons.py 2017-03-29 00:36:39.000000000 +0200
@@ -305,7 +305,7 @@
self.appName = self.strip_accents(desktopItem.getName())
self.appGenericName = self.strip_accents(desktopItem.getGenericName())
self.appComment = self.strip_accents(desktopItem.getComment())
- self.appExec = self.strip_accents(desktopItem.getExec())
+ self.appExec = self.strip_accents(desktopItem.getExec().replace('\\\\', '\\'))
self.appIconName = desktopItem.getIcon()
self.appCategories = desktopItem.getCategories()
self.appMateDocPath = desktopItem.get( "X-MATE-DocPath" ) or ""
@@ -567,6 +567,7 @@
def __init__( self, iconName, iconSize, labels , f ):
easyButton.__init__( self, iconName, iconSize, labels )
self.filter = f
+ self.set_focus_on_click(False)
iconManager = IconManager()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ubuntu-mate-mate-menu-f13d0b5158b8/mate_menu/plugins/applications.py new/ubuntu-mate-mate-menu-f4328f0400ec/mate_menu/plugins/applications.py
--- old/ubuntu-mate-mate-menu-f13d0b5158b8/mate_menu/plugins/applications.py 2017-03-17 15:10:44.000000000 +0100
+++ new/ubuntu-mate-mate-menu-f4328f0400ec/mate_menu/plugins/applications.py 2017-03-29 00:36:39.000000000 +0200
@@ -640,7 +640,6 @@
self.current_results = []
for i in self.categoriesBox.get_children():
- i.released()
i.set_relief( Gtk.ReliefStyle.NONE )
allButton = self.categoriesBox.get_children()[0];
@@ -662,7 +661,6 @@
i.filterCategory( category )
for i in self.categoriesBox.get_children():
- i.released()
i.set_relief( Gtk.ReliefStyle.NONE )
widget.set_relief( Gtk.ReliefStyle.HALF )
1
0
Hello community,
here is the log from the commit of package nano for openSUSE:Factory checked in at 2017-04-03 11:05:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nano (Old)
and /work/SRC/openSUSE:Factory/.nano.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nano"
Mon Apr 3 11:05:17 2017 rev:55 rq:484058 version:2.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/nano/nano.changes 2017-03-02 19:29:58.546128481 +0100
+++ /work/SRC/openSUSE:Factory/.nano.new/nano.changes 2017-04-03 11:05:59.888136620 +0200
@@ -1,0 +2,13 @@
+Fri Mar 31 10:39:21 UTC 2017 - fstrba(a)suse.com
+
+- Update to version 2.8.0
+ * the Up and Down keys now step from visual row to visual row
+ instead of jumping between logical lines
+ * the Home and End keys now move to the start and end of a row,
+ and only when already there, then to the start and end of the
+ logical line
+ * the screen can now scroll per row instead of always per logical
+ line
+ * makes use of gnulib, to make it build on more platforms
+
+-------------------------------------------------------------------
Old:
----
nano-2.7.5.tar.xz
nano-2.7.5.tar.xz.asc
New:
----
nano-2.8.0.tar.xz
nano-2.8.0.tar.xz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nano.spec ++++++
--- /var/tmp/diff_new_pack.hKkZ9T/_old 2017-04-03 11:06:00.556042256 +0200
+++ /var/tmp/diff_new_pack.hKkZ9T/_new 2017-04-03 11:06:00.556042256 +0200
@@ -16,9 +16,9 @@
#
-%define _version 2.7
+%define _version 2.8
Name: nano
-Version: 2.7.5
+Version: 2.8.0
Release: 0
Summary: Pico editor clone with enhancements
License: GPL-3.0+
++++++ nano-2.7.5.tar.xz -> nano-2.8.0.tar.xz ++++++
++++ 218194 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package chromium for openSUSE:Factory checked in at 2017-04-03 11:05:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium (Old)
and /work/SRC/openSUSE:Factory/.chromium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium"
Mon Apr 3 11:05:15 2017 rev:152 rq:483829 version:57.0.2987.133
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium/chromium.changes 2017-03-20 17:10:58.809862306 +0100
+++ /work/SRC/openSUSE:Factory/.chromium.new/chromium.changes 2017-04-03 11:05:40.962810459 +0200
@@ -1,0 +2,21 @@
+Thu Mar 30 13:07:50 UTC 2017 - tchvatal(a)suse.com
+
+- Version update to 57.0.2987.133 bsc#1031677:
+ * Critical CVE-2017-5055: Use after free in printing. Credit to Wadih Matar
+ * High CVE-2017-5054: Heap buffer overflow in V8. Credit to Nicolas Trippar of Zimperium zLabs
+ * High CVE-2017-5052: Bad cast in Blink. Credit to JeongHoon Shin
+ * High CVE-2017-5056: Use after free in Blink. Credit to anonymous
+ * High CVE-2017-5053: Out of bounds memory access in V8. Credit to Team Sniper (Keen Lab and PC Mgr) reported through ZDI (ZDI-CAN-4587)
+
+-------------------------------------------------------------------
+Fri Mar 24 15:22:38 UTC 2017 - tchvatal(a)suse.com
+
+- Drop the browser(npapi) provide which is not true
+
+-------------------------------------------------------------------
+Sun Mar 19 11:04:47 UTC 2017 - tchvatal(a)suse.com
+
+- Add patch to build with gcc4
+ * chromium-57-gcc4.patch
+
+-------------------------------------------------------------------
Old:
----
chromium-57.0.2987.110.tar.xz
New:
----
chromium-57-gcc4.patch
chromium-57.0.2987.133.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium.spec ++++++
--- /var/tmp/diff_new_pack.IzCfe0/_old 2017-04-03 11:05:58.856282405 +0200
+++ /var/tmp/diff_new_pack.IzCfe0/_new 2017-04-03 11:05:58.860281840 +0200
@@ -42,7 +42,7 @@
%endif
%bcond_with clang
Name: chromium
-Version: 57.0.2987.110
+Version: 57.0.2987.133
Release: 0
Summary: Google's open source browser project
License: BSD-3-Clause and LGPL-2.1+
@@ -78,6 +78,8 @@
Patch10: gcc60-fixes.diff
# PATCH-FIX-SUSE make ld use less memory by tweaking compiler flags
Patch13: chromium-linker-memory.patch
+# PATCH-FIX-UPSTREAM work with old gcc
+Patch14: chromium-57-gcc4.patch
# archlinux arm enhancement patches
Patch100: arm-webrtc-fix.patch
Patch101: arm_use_right_compiler.patch
@@ -181,7 +183,6 @@
Conflicts: otherproviders(chromium-browser)
Provides: chromium-based-browser = %{version}
Provides: chromium-browser = %{version}
-Provides: browser(npapi)
Obsoletes: %{name}-suid-helper < %{version}
Obsoletes: chromium-browser < %{version}
Provides: %{name}-suid-helper = %{version}
@@ -265,6 +266,7 @@
%endif
%patch10
%patch13 -p1
+%patch14 -p1
# archlinux arm enhancements
%patch100
++++++ chromium-57-gcc4.patch ++++++
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -676,7 +676,7 @@
: nullptr);
}
- return gtk_border;
+ return std::move(gtk_border);
}
void GtkUi::AddWindowButtonOrderObserver(
--- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
+++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
@@ -412,7 +412,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer(
return nullptr;
}
- return capturer;
+ return std::move(capturer);
}
} // namespace webrtc
++++++ chromium-57.0.2987.110.tar.xz -> chromium-57.0.2987.133.tar.xz ++++++
/work/SRC/openSUSE:Factory/chromium/chromium-57.0.2987.110.tar.xz /work/SRC/openSUSE:Factory/.chromium.new/chromium-57.0.2987.133.tar.xz differ: char 27, line 1
1
0
Hello community,
here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2017-04-03 11:05:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-lib (Old)
and /work/SRC/openSUSE:Factory/.xine-lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib"
Mon Apr 3 11:05:12 2017 rev:65 rq:483107 version:1.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2016-08-05 18:16:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2017-04-03 11:05:15.338430752 +0200
@@ -1,0 +2,6 @@
+Tue Mar 28 07:52:49 UTC 2017 - pgajdos(a)suse.com
+
+- fix build with ImageMagick 7
+ + xine-lib-ImageMagick7.patch
+
+-------------------------------------------------------------------
New:
----
xine-lib-ImageMagick7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.HLBxTK/_old 2017-04-03 11:05:16.374284403 +0200
+++ /var/tmp/diff_new_pack.HLBxTK/_new 2017-04-03 11:05:16.378283838 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xine-lib
#
-# 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
@@ -147,6 +147,12 @@
Patch4: xine-lib-theora.patch
# PATCH-FIX-UPSTREAM xine-lib-link-xcb.patch https://bugs.xine-project.org/show_bug.cgi?id=573 dimstar(a)opensuse.org -- Look for xcb, not xcb-shape
Patch6: xine-lib-link-xcb.patch
+# This should be fixed upstream, but this patch will not work for them.
+# wand/magick_wand.h is already deprecated even in ImageMagick-6; package should
+# include wand/MagickWand.h for ImageMagick-6 and MagickWand/MagickWand.h for
+# ImageMagick-7. Including wand/MagickWand.h will work for us also for
+# ImageMagick-7, because we package wand/ symlink to ./MagickWand/MagickWand.h
+Patch8: xine-lib-ImageMagick7.patch
%description
<p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.</p>
@@ -534,6 +540,7 @@
%endif
%patch4
%patch6 -p1
+%patch8 -p1
rm -f m4/libtool15.m4
sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c
++++++ xine-lib-ImageMagick7.patch ++++++
Index: xine-lib-1.2.6/src/video_dec/image.c
===================================================================
--- xine-lib-1.2.6.orig/src/video_dec/image.c 2013-09-18 12:04:54.000000000 +0200
+++ xine-lib-1.2.6/src/video_dec/image.c 2017-03-28 09:22:17.137733960 +0200
@@ -39,7 +39,7 @@
#define LOG
*/
-#include <wand/magick_wand.h>
+#include <wand/MagickWand.h>
#ifdef PACKAGE_NAME
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
1
0
Hello community,
here is the log from the commit of package libpreludedb for openSUSE:Factory checked in at 2017-04-03 11:05:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libpreludedb (Old)
and /work/SRC/openSUSE:Factory/.libpreludedb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpreludedb"
Mon Apr 3 11:05:10 2017 rev:3 rq:482280 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libpreludedb/libpreludedb.changes 2016-10-02 00:09:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libpreludedb.new/libpreludedb.changes 2017-04-03 11:05:12.358851715 +0200
@@ -1,0 +2,8 @@
+Sun Nov 27 20:16:55 UTC 2016 - thomas.andrejak(a)gmail.com
+
+- Update to 3.1.0 (Prelude 3.1.0 released on 14 Sept 2016)
+- Remove unnecessary patches (libpreludedb-python-swig.patch)
+- Use a lib directory with soname
+- Spec-Cleaner
+
+-------------------------------------------------------------------
Old:
----
libpreludedb-3.0.0.tar.gz
libpreludedb-python-swig.patch
New:
----
libpreludedb-3.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpreludedb.spec ++++++
--- /var/tmp/diff_new_pack.4btCm4/_old 2017-04-03 11:05:13.542684460 +0200
+++ /var/tmp/diff_new_pack.4btCm4/_new 2017-04-03 11:05:13.546683895 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libpreludedb
#
-# 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
@@ -16,28 +16,28 @@
#
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?python_sitearch3: %global python_sitearch3 %(%{__python}3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%define sover 7
-%define sover_cpp 2
-
+%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch3: %global python_sitearch3 %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%define soname 7
+%define soname_cpp 2
Name: libpreludedb
-Version: 3.0.0
+Version: 3.1.0
Release: 0
Summary: Framework to easy access to the Prelude database
-License: GPL-3.0+
+# Prelude is GPL-2.0+
+# libmissing is LGPL-2.1+
+# libmissing/test is GPL-3.0+
+License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+
Group: Productivity/Networking/Security
Url: https://www.prelude-siem.org
-Source0: https://www.prelude-siem.org/pkg/src/3.0.0/%{name}-%{version}.tar.gz
-Patch0: libpreludedb-python-swig.patch
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: gtk-doc
BuildRequires: libgcrypt-devel
BuildRequires: libprelude-devel
BuildRequires: mysql-devel
-BuildRequires: pkg-config
-BuildRequires: postgresql94-devel
+BuildRequires: pkgconfig
+BuildRequires: postgresql-devel
BuildRequires: python-devel
BuildRequires: python3-devel
BuildRequires: sqlite-devel
@@ -51,22 +51,22 @@
worrying about SQL, and to access the database independently of the
type/format of the database.
-%package -n %{name}%{sover}
+%package -n %{name}%{soname}
Summary: Prelude Libraries
Group: System/Libraries
-%description -n %{name}%{sover}
+%description -n %{name}%{soname}
The PreludeDB Library provides an abstraction layer upon the type and the
format of the database used to store IDMEF alerts. It allows developers
to use the Prelude IDMEF database easily and efficiently without
worrying about SQL, and to access the database independently of the
type/format of the database.
-%package -n %{name}cpp%{sover_cpp}
+%package -n %{name}cpp%{soname_cpp}
Summary: Prelude Libraries
Group: System/Libraries
-%description -n %{name}cpp%{sover_cpp}
+%description -n %{name}cpp%{soname_cpp}
The PreludeDB Library provides an abstraction layer upon the type and the
format of the database used to store IDMEF alerts. It allows developers
to use the Prelude IDMEF database easily and efficiently without
@@ -78,10 +78,10 @@
Group: Development/Libraries/C and C++
Requires: automake
Requires: libprelude-devel
-Requires: libpreludedb%{sover} = %{version}
-Requires: libpreludedbcpp%{sover_cpp} = %{version}
+Requires: libpreludedb%{soname} = %{version}
+Requires: libpreludedbcpp%{soname_cpp} = %{version}
Requires: mysql-devel
-Requires: postgresql94-devel
+Requires: postgresql-devel
Requires: sqlite-devel
%description devel
@@ -139,7 +139,7 @@
Summary: Plugin to use prelude with a pgsql database
Group: Productivity/Networking/Security
Requires: libpreludedb-plugins = %{version}
-Requires: postgresql94-server
+Requires: postgresql-server
%description pgsql
This plugin allows prelude to store alerts into a pgsql database.
@@ -162,7 +162,7 @@
%package -n python3-%{name}
Summary: Python 3 bindings for libpreludedb
-Group: Development/Languages/Python3
+Group: Development/Languages/Python
%description -n python3-%{name}
Python 3 bindings for libpreludedb generated by SWIG.
@@ -176,7 +176,6 @@
%prep
%setup -q
-%patch0 -p0
%build
%configure --with-html-dir=%{_defaultdocdir}/%{name}-%{version}/html \
@@ -184,31 +183,34 @@
--enable-gtk-doc
sed -i.rpath -e 's|LD_RUN_PATH=""||' bindings/Makefile
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib %{_prefix}/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
make %{?_smp_mflags}
%install
-make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/usr/share/libpreludedb/swig/python
-cp bindings/libpreludedbcpp.i %{buildroot}/usr/share/libpreludedb/swig/
-cp bindings/python/libpreludedbcpp-python.i %{buildroot}/usr/share/libpreludedb/swig/python
-find %{buildroot}%{_libdir} -name "*.la" -delete
+%make_install
+mkdir -p %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/python
+cp bindings/libpreludedbcpp.i %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/
+cp bindings/python/libpreludedbcpp-python.i %{buildroot}%{_datadir}/libpreludedb%{soname}/swig/python
+find %{buildroot} -type f -name "*.la" -delete -print
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-%post -n libpreludedb%{sover} -p /sbin/ldconfig
-%post -n libpreludedbcpp%{sover_cpp} -p /sbin/ldconfig
+%post -n libpreludedb%{soname} -p /sbin/ldconfig
+%post -n libpreludedbcpp%{soname_cpp} -p /sbin/ldconfig
+%postun -n libpreludedb%{soname} -p /sbin/ldconfig
+%postun -n libpreludedbcpp%{soname_cpp} -p /sbin/ldconfig
-%postun -n libpreludedb%{sover} -p /sbin/ldconfig
-%postun -n libpreludedbcpp%{sover_cpp} -p /sbin/ldconfig
+%files -n %{name}%{soname}
+%defattr(-,root,root)
+%{_libdir}/libpreludedb.so.%{soname}*
-%files -n %{name}%{sover}
+%files -n %{name}cpp%{soname_cpp}
%defattr(-,root,root)
-%{_libdir}/libpreludedb.so.%{sover}*
+%{_libdir}/libpreludedbcpp.so.%{soname_cpp}*
%files -n preludedb-tools
%defattr(-,root,root)
-%{_mandir}/man1/preludedb-admin.1.*
+%{_mandir}/man1/preludedb-admin.1%{ext_man}
%{_bindir}/preludedb-admin
%files plugins
@@ -217,10 +219,6 @@
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/formats/
-%files -n %{name}cpp%{sover_cpp}
-%defattr(-,root,root)
-%{_libdir}/libpreludedbcpp.so.%{sover_cpp}*
-
%files devel
%defattr(-,root,root)
%{_bindir}/libpreludedb-config
@@ -228,11 +226,15 @@
%{_libdir}/libpreludedb.so
%{_libdir}/libpreludedbcpp.so
%{_datadir}/aclocal/libpreludedb.m4
+%{_mandir}/man1/libpreludedb-config.1%{ext_man}
%files devel-bindings
%defattr(-,root,root)
-%dir %{_datadir}/libpreludedb/
-%{_datadir}/libpreludedb/swig/
+%dir %{_datadir}/libpreludedb%{soname}/
+%dir %{_datadir}/libpreludedb%{soname}/swig/
+%{_datadir}/libpreludedb%{soname}/swig/libpreludedbcpp.i
+%dir %{_datadir}/libpreludedb%{soname}/swig/python/
+%{_datadir}/libpreludedb%{soname}/swig/python/libpreludedbcpp-python.i
%files -n python-%{name}
%defattr(-,root,root)
++++++ libpreludedb-3.0.0.tar.gz -> libpreludedb-3.1.0.tar.gz ++++++
++++ 19365 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package prelude-lml for openSUSE:Factory checked in at 2017-04-03 11:05:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prelude-lml (Old)
and /work/SRC/openSUSE:Factory/.prelude-lml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prelude-lml"
Mon Apr 3 11:05:08 2017 rev:3 rq:482279 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/prelude-lml/prelude-lml.changes 2017-02-19 01:00:53.424775878 +0100
+++ /work/SRC/openSUSE:Factory/.prelude-lml.new/prelude-lml.changes 2017-04-03 11:05:09.603241035 +0200
@@ -1,0 +2,15 @@
+Thu Mar 23 14:41:36 UTC 2017 - aj(a)ajaissle.de
+
+- Added %ghost /run/%{name}
+
+-------------------------------------------------------------------
+Fri Feb 10 00:33:55 UTC 2017 - thomas.andrejak(a)gmail.com
+
+- Update to 3.1.0 (Prelude 3.1.0 released on 14 Sept 2016)
+- Add missing /var/lib/prelude-lml dir
+- Remove unnecessary spool directory
+- Patch the configuration to be naturally OK with rsyslog
+ prelude-lml-conf_rsyslog.patch
+- Spec-Cleaner
+
+-------------------------------------------------------------------
Old:
----
prelude-lml-3.0.0.tar.gz
New:
----
prelude-lml-3.1.0.tar.gz
prelude-lml-conf_rsyslog.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ prelude-lml.spec ++++++
--- /var/tmp/diff_new_pack.U9gM2u/_old 2017-04-03 11:05:10.483116724 +0200
+++ /var/tmp/diff_new_pack.U9gM2u/_new 2017-04-03 11:05:10.487116159 +0200
@@ -17,20 +17,24 @@
Name: prelude-lml
-Version: 3.0.0
+Version: 3.1.0
Release: 0
Summary: The prelude log analyzer
-License: GPL-3.0+
+# Prelude is GPL-2.0+
+# libmissing is LGPL-2.1+
+# libmissing/test is GPL-3.0+
+License: GPL-2.0+ and LGPL-2.1 and GPL-3.0+
Group: System/Daemons
Url: https://www.prelude-siem.org
-Source0: https://www.prelude-siem.org/pkg/src/3.0.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.run
+# Add default syslog format to work out of the box
+Patch0: %{name}-conf_rsyslog.patch
BuildRequires: gamin-devel
BuildRequires: libprelude-devel
BuildRequires: pcre-devel
BuildRequires: systemd
-Requires: libprelude23
%{?systemd_requires}
%description
@@ -52,6 +56,7 @@
%prep
%setup -q
+%patch0
%build
%configure
@@ -60,13 +65,13 @@
%install
mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/ruleset/
mkdir -p %{buildroot}/%{_sbindir}
-make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
+%make_install
rm -f %{buildroot}/%{_libdir}/%{name}/debug.la
rm -f %{buildroot}/%{_libdir}/%{name}/pcre.la
install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-mkdir -p %{buildroot}/%{_localstatedir}/spool/prelude/%{name}/
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+mkdir -p %{buildroot}/%{_var}/lib/%{name}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
rm -rf %{buildroot}/%{_localstatedir}/run/%{name}
install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
@@ -75,7 +80,7 @@
%post
/sbin/ldconfig
-/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%service_add_post %{name}.service
%preun
@@ -99,8 +104,9 @@
%{_sbindir}/rc%{name}
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/%{name}.conf
-%attr(0750,-,-) %dir %{_localstatedir}/spool/prelude/%{name}
%{_unitdir}/%{name}.service
+%dir %{_var}/lib/%{name}
+%ghost /run/%{name}
%files devel
%defattr(-,root,root,-)
++++++ prelude-lml-3.0.0.tar.gz -> prelude-lml-3.1.0.tar.gz ++++++
++++ 18766 lines of diff (skipped)
++++++ prelude-lml-conf_rsyslog.patch ++++++
From: Thomas Andrejak <thomas.andrejak(a)gmail.com>
Date: 2017-02-27 23:25:00 +0100
References: Specific
Upstream: no
Subject: Add default syslog format to work out of the box
--- prelude-lml.conf 2016-09-15 09:03:39.835000884 +0200
+++ prelude-lml.conf 2017-02-18 00:46:18.061525071 +0100
@@ -88,6 +88,13 @@
#
+[format=rsyslog]
+time-format = "%Y-%m-%dT%H:%M:%S"
+prefix-regex = "^(?P<timestamp>.{20}).{12} (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
+file = /var/log/messages
+file = /var/log/secure
+
+
[format=syslog]
time-format = "%b %d %H:%M:%S"
prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
--- prelude-lml.conf.in 2016-09-15 08:49:20.170000884 +0200
+++ prelude-lml.conf.in 2017-02-18 00:46:47.168897144 +0100
@@ -88,6 +88,13 @@
#
+[format=rsyslog]
+time-format = "%Y-%m-%dT%H:%M:%S"
+prefix-regex = "^(?P<timestamp>.{20}).{12} (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
+file = /var/log/messages
+file = /var/log/secure
+
+
[format=syslog]
time-format = "%b %d %H:%M:%S"
prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?"
1
0
Hello community,
here is the log from the commit of package prelude-correlator for openSUSE:Factory checked in at 2017-04-03 11:05:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/prelude-correlator (Old)
and /work/SRC/openSUSE:Factory/.prelude-correlator.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "prelude-correlator"
Mon Apr 3 11:05:06 2017 rev:2 rq:482271 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/prelude-correlator/prelude-correlator.changes 2016-09-16 11:01:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.prelude-correlator.new/prelude-correlator.changes 2017-04-03 11:05:07.747503219 +0200
@@ -1,0 +2,8 @@
+Fri Feb 10 00:33:55 UTC 2017 - thomas.andrejak(a)gmail.com
+
+- Update to 3.1.0 (Prelude 3.1.0 released on 14 Sept 2016)
+- Remove unnecessary patches (prelude-correlator-main_py.patch)
+- Remove unnecessary spool directory
+- Spec-Cleaner
+
+-------------------------------------------------------------------
Old:
----
prelude-correlator-3.0.1.tar.gz
prelude-correlator-main_py.patch
New:
----
prelude-correlator-3.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ prelude-correlator.spec ++++++
--- /var/tmp/diff_new_pack.kb1Sqo/_old 2017-04-03 11:05:08.583385123 +0200
+++ /var/tmp/diff_new_pack.kb1Sqo/_new 2017-04-03 11:05:08.587384558 +0200
@@ -1,7 +1,7 @@
#
# spec file for package prelude-correlator
#
-# Copyright (c) 2016 SUSE LINUX Products 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,27 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: prelude-correlator
-Version: 3.0.1
+Version: 3.1.0
Release: 0
Summary: Real time correlator of events received by Prelude Manager
License: GPL-2.0+
-Group: Applications/Internet
+Group: Productivity/Networking/Security
Url: https://www.prelude-siem.org
-Source0: https://www.prelude-siem.org/pkg/src/3.0.0/%{name}-%{version}.tar.gz
+Source0: https://www.prelude-siem.org/pkg/src/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}.service
Source2: %{name}.run
+# Backport ez_setup to be compatible with old (Open)SuSE
Patch0: prelude-correlator-ez_setup.patch
-Patch1: prelude-correlator-main_py.patch
+BuildRequires: libprelude-devel
BuildRequires: python-devel
BuildRequires: python-setuptools
-BuildRequires: libprelude-devel
BuildRequires: systemd
-Requires: python-setuptools
-Requires: python-netaddr
Requires: python-libprelude
-%{?systemd_requires}
+Requires: python-netaddr
+Requires: python-setuptools
BuildArch: noarch
+%{?systemd_requires}
%description
Prelude-Correlator allows conducting multi-stream correlations
@@ -48,9 +49,7 @@
%prep
%setup -q
-
-%patch0 -p0
-%patch1 -p0
+%patch0
%build
python setup.py build
@@ -60,8 +59,7 @@
mkdir -p %{buildroot}/%{_sbindir}
install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
install -m 0644 %{SOURCE2} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-mkdir -p %{buildroot}/%{_localstatedir}/spool/prelude/%{name}/
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
rm -rf %{buildroot}/%{_localstatedir}/run/%{name}
install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
@@ -69,7 +67,7 @@
%service_add_pre %{name}.service
%post
-/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
+%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%service_add_post %{name}.service
%preun
@@ -96,8 +94,7 @@
%{_sbindir}/rc%{name}
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/%{name}.conf
-%dir %attr(0711,-,-) %{_localstatedir}/spool/prelude
-%dir %{_localstatedir}/spool/prelude/%{name}
+%dir %ghost /run/%{name}
%{_unitdir}/%{name}.service
%changelog
++++++ prelude-correlator-3.0.1.tar.gz -> prelude-correlator-3.1.0.tar.gz ++++++
++++ 24626 lines of diff (skipped)
++++++ prelude-correlator-ez_setup.patch ++++++
--- /var/tmp/diff_new_pack.kb1Sqo/_old 2017-04-03 11:05:08.735363651 +0200
+++ /var/tmp/diff_new_pack.kb1Sqo/_new 2017-04-03 11:05:08.739363086 +0200
@@ -1,3 +1,9 @@
+From: Thomas Andrejak <thomas.andrejak(a)gmail.com>
+Date: 2017-02-27 23:25:00 +0100
+References: no
+Upstream: no
+Subject: Backport ez_setup to be compatible with old (Open)SuSE
+
--- ez_setup.py 2016-04-24 12:42:55.000000000 +0200
+++ ez_setup.py 2016-05-02 00:23:50.498917032 +0200
@@ -36,7 +36,7 @@
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-04-03 11:04:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Mon Apr 3 11:04:53 2017 rev:358 rq:484248 version:4.10.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-03-29 13:23:44.583481810 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-04-03 11:04:54.405388226 +0200
@@ -1,0 +2,72 @@
+Fri Mar 31 19:16:00 CEST 2017 - mkubecek(a)suse.cz
+
+- Update patches.kernel.org/patch-4.10.7-8 references (add CVE-2017-7184 bsc#1030573).
+- commit ea9dcd4
+
+-------------------------------------------------------------------
+Fri Mar 31 18:33:34 CEST 2017 - mkubecek(a)suse.cz
+
+- tcp: mark skbs with SCM_TIMESTAMPING_OPT_STATS (CVE-2017-7277
+ bsc#1031265).
+- tcp: fix SCM_TIMESTAMPING_OPT_STATS for normal skbs
+ (CVE-2017-7277 bsc#1031265).
+- commit 37681e8
+
+-------------------------------------------------------------------
+Fri Mar 31 18:25:50 CEST 2017 - mkubecek(a)suse.cz
+
+- net/packet: fix overflow in check for tp_reserve (CVE-2017-7308
+ bsc#1031579).
+- net/packet: fix overflow in check for tp_frame_nr (CVE-2017-7308
+ bsc#1031579).
+- net/packet: fix overflow in check for priv area size
+ (CVE-2017-7308 bsc#1031579).
+- commit fbe9fc9
+
+-------------------------------------------------------------------
+Fri Mar 31 18:17:42 CEST 2017 - mkubecek(a)suse.cz
+
+- ping: implement proper locking (bsc#1031003).
+- commit 3ea493f
+
+-------------------------------------------------------------------
+Fri Mar 31 12:00:42 CEST 2017 - jslaby(a)suse.cz
+
+- Linux 4.10.8 (bnc#1012628).
+- commit fd89662
+
+-------------------------------------------------------------------
+Thu Mar 30 11:49:42 CEST 2017 - jslaby(a)suse.cz
+
+- drm/i915: disable KASAN for handlers (bnc#1025903).
+- commit 0161cd4
+
+-------------------------------------------------------------------
+Thu Mar 30 11:43:27 CEST 2017 - jslaby(a)suse.cz
+
+- Linux 4.10.7 (bnc#1007962 bnc#1012628 bsc#1013576 bsc#1028489
+ bsc#1000619).
+- Delete patches.drivers/drm-reference-count-event-completion.
+- Delete patches.drivers/fbcon-Fix-vc-attr-at-deinit.
+- Delete
+ patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch.
+- Delete
+ patches.fixes/genetlink-fix-counting-regression-on-ctrl_dumpfamily.patch.
+- commit 24e2bda
+
+-------------------------------------------------------------------
+Sun Mar 26 20:39:41 CEST 2017 - jslaby(a)suse.cz
+
+- Linux 4.10.6 (bnc#1012628 bnc#1025903).
+- Delete
+ patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch.
+- commit e326586
+
+-------------------------------------------------------------------
+Fri Mar 24 12:46:53 CET 2017 - mkubecek(a)suse.cz
+
+- genetlink: fix counting regression on ctrl_dumpfamily()
+ (bsc#1028489).
+- commit 5182272
+
+-------------------------------------------------------------------
dtb-armv6l.changes: same change
dtb-armv7l.changes: same change
kernel-64kb.changes: same change
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-docs.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-syzkaller.changes: same change
kernel-vanilla.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.036592636 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.036592636 +0200
@@ -16,15 +16,15 @@
#
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define vanilla_only 0
%include %_sourcedir/kernel-spec-macros
Name: dtb-aarch64
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
dtb-armv6l.spec: same change
dtb-armv7l.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.124580205 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.124580205 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.10
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -58,9 +58,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.204568904 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.208568339 +0200
@@ -16,7 +16,7 @@
#
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -42,9 +42,9 @@
Summary: Kernel Documentation (man pages)
License: GPL-2.0
Group: Documentation/Man
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-lpae.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.228565514 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.232564949 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.10
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -58,9 +58,9 @@
Summary: Kernel for LPAE enabled systems
License: GPL-2.0
Group: System/Kernel
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.252562124 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.252562124 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -57,9 +57,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.276558733 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.276558733 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0
Group: SLES
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.300555343 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.304554778 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.10
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -58,9 +58,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.328551388 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.332550823 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.10
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.360546867 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.360546867 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 4.10.5
+Version: 4.10.8
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
++++++ kernel-syzkaller.spec ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:00.380544042 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:00.384543477 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.10
-%define patchversion 4.10.5
+%define patchversion 4.10.8
%define variant %{nil}
%define vanilla_only 0
@@ -58,9 +58,9 @@
Summary: Kernel used for fuzzing by syzkaller
License: GPL-2.0
Group: System/Kernel
-Version: 4.10.5
+Version: 4.10.8
%if 0%{?is_kotd}
-Release: <RELEASE>.gf3fbfc6
+Release: <RELEASE>.gea9dcd4
%else
Release: 0
%endif
kernel-vanilla.spec: same change
++++++ patches.drivers.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/drm-reference-count-event-completion new/patches.drivers/drm-reference-count-event-completion
--- old/patches.drivers/drm-reference-count-event-completion 2017-01-30 17:46:39.000000000 +0100
+++ new/patches.drivers/drm-reference-count-event-completion 1970-01-01 01:00:00.000000000 +0100
@@ -1,99 +0,0 @@
-From 24835e442f289813aa568d142a755672a740503c Mon Sep 17 00:00:00 2001
-From: Daniel Vetter <daniel.vetter(a)ffwll.ch>
-Date: Wed, 21 Dec 2016 11:23:30 +0100
-Subject: [PATCH] drm: reference count event->completion
-Git-commit: 24835e442f289813aa568d142a755672a740503c
-References: bsc#1013576
-Git-repo: git://anongit.freedesktop.org/drm-intel
-Patch-mainline: Queued in subsystem maintainer repository
-
-When writing the generic nonblocking commit code I assumed that
-through clever lifetime management I can assure that the completion
-(stored in drm_crtc_commit) only gets freed after it is completed. And
-that worked.
-
-I also wanted to make nonblocking helpers resilient against driver
-bugs, by having timeouts everywhere. And that worked too.
-
-Unfortunately taking boths things together results in oopses :( Well,
-at least sometimes: What seems to happen is that the drm event hangs
-around forever stuck in limbo land. The nonblocking helpers eventually
-time out, move on and release it. Now the bug I tested all this
-against is drivers that just entirely fail to deliver the vblank
-events like they should, and in those cases the event is simply
-leaked. But what seems to happen, at least sometimes, on i915 is that
-the event is set up correctly, but somohow the vblank fails to fire in
-time. Which means the event isn't leaked, it's still there waiting for
-eventually a vblank to fire. That tends to happen when re-enabling the
-pipe, and then the trap springs and the kernel oopses.
-
-The correct fix here is simply to refcount the crtc commit to make
-sure that the event sticks around even for drivers which only
-sometimes fail to deliver vblanks for some arbitrary reasons. Since
-crtc commits are already refcounted that's easy to do.
-
-Reference: https://bugs.freedesktop.org/show_bug.cgi?id=96781
-Cc: Jim Rees <rees(a)umich.edu>
-Cc: Chris Wilson <chris(a)chris-wilson.co.uk>
-Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com>
-Cc: Jani Nikula <jani.nikula(a)linux.intel.com>
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com>
-Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com>
-Link: http://patchwork.freedesktop.org/patch/msgid/20161221102331.31033-1-daniel.…
-Acked-by: Takashi Iwai <tiwai(a)suse.de>
-
----
- drivers/gpu/drm/drm_atomic_helper.c | 11 +++++++++++
- drivers/gpu/drm/drm_fops.c | 2 +-
- include/drm/drmP.h | 1 +
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/drm_atomic_helper.c
-+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -1389,6 +1389,15 @@ static int stall_checks(struct drm_crtc
- return ret < 0 ? ret : 0;
- }
-
-+void release_crtc_commit(struct completion *completion)
-+{
-+ struct drm_crtc_commit *commit = container_of(completion,
-+ typeof(*commit),
-+ flip_done);
-+
-+ drm_crtc_commit_put(commit);
-+}
-+
- /**
- * drm_atomic_helper_setup_commit - setup possibly nonblocking commit
- * @state: new modeset state to be committed
-@@ -1481,6 +1490,8 @@ int drm_atomic_helper_setup_commit(struc
- }
-
- crtc_state->event->base.completion = &commit->flip_done;
-+ crtc_state->event->base.completion_release = release_crtc_commit;
-+ drm_crtc_commit_get(commit);
- }
-
- return 0;
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -689,8 +689,8 @@ void drm_send_event_locked(struct drm_de
- assert_spin_locked(&dev->event_lock);
-
- if (e->completion) {
-- /* ->completion might disappear as soon as it signalled. */
- complete_all(e->completion);
-+ e->completion_release(e->completion);
- e->completion = NULL;
- }
-
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
-@@ -360,6 +360,7 @@ struct drm_ioctl_desc {
- /* Event queued up for userspace to read */
- struct drm_pending_event {
- struct completion *completion;
-+ void (*completion_release)(struct completion *completion);
- struct drm_event *event;
- struct dma_fence *fence;
- struct list_head link;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/fbcon-Fix-vc-attr-at-deinit new/patches.drivers/fbcon-Fix-vc-attr-at-deinit
--- old/patches.drivers/fbcon-Fix-vc-attr-at-deinit 2017-01-30 17:46:39.000000000 +0100
+++ new/patches.drivers/fbcon-Fix-vc-attr-at-deinit 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-From: Takashi Iwai <tiwai(a)suse.de>
-Date: Tue, 3 Jan 2017 14:47:46 +0100
-Subject: [PATCH] fbcon: Fix vc attr at deinit
-Message-Id: <20170103150322.10350-1-tiwai(a)suse.de>
-Patch-mainline: Submitted, linux-fbdev ML
-References: bsc#1000619
-
-fbcon can deal with vc_hi_font_mask (the upper 256 chars) and adjust
-the vc attrs dynamically when vc_hi_font_mask is changed at
-fbcon_init(). When the vc_hi_font_mask is set, it remaps the attrs in
-the existing console buffer with one bit shift up (for 9 bits), while
-it remaps with one bit shift down (for 8 bits) when the value is
-cleared. It works fine as long as the font gets updated after fbcon
-was initialized.
-
-However, we hit a bizarre problem when the console is switched to
-another fb driver (typically from vesafb or efifb to drmfb). At
-switching to the new fb driver, we temporarily rebind the console to
-the dummy console, then rebind to the new driver. During the
-switching, we leave the modified attrs as is. Thus, the new fbcon
-takes over the old buffer as if it were to contain 8 bits chars
-(although the attrs are still shifted for 9 bits), and effectively
-this results in the yellow color texts instead of the original white
-color, as found in the bugzilla entry below.
-
-An easy fix for this is to re-adjust the attrs before leaving the
-fbcon at con_deinit callback. Since the code to adjust the attrs is
-already present in the current fbcon code, in this patch, we simply
-factor out the relevant code, and call it from fbcon_deinit().
-
-Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1000619
-Signed-off-by: Takashi Iwai <tiwai(a)suse.de>
----
- drivers/video/console/fbcon.c | 67 +++++++++++++++++++++++++-----------------
- 1 file changed, 40 insertions(+), 27 deletions(-)
-
---- a/drivers/video/console/fbcon.c
-+++ b/drivers/video/console/fbcon.c
-@@ -1165,6 +1165,8 @@ static void fbcon_free_font(struct displ
- p->userfont = 0;
- }
-
-+static void set_vc_hi_font(struct vc_data *vc, bool set);
-+
- static void fbcon_deinit(struct vc_data *vc)
- {
- struct display *p = &fb_display[vc->vc_num];
-@@ -1200,6 +1202,9 @@ finished:
- if (free_font)
- vc->vc_font.data = NULL;
-
-+ if (vc->vc_hi_font_mask)
-+ set_vc_hi_font(vc, false);
-+
- if (!con_is_bound(&fb_con))
- fbcon_exit();
-
-@@ -2436,32 +2441,10 @@ static int fbcon_get_font(struct vc_data
- return 0;
- }
-
--static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
-- const u8 * data, int userfont)
-+/* set/clear vc_hi_font_mask and update vc attrs accordingly */
-+static void set_vc_hi_font(struct vc_data *vc, bool set)
- {
-- struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-- struct fbcon_ops *ops = info->fbcon_par;
-- struct display *p = &fb_display[vc->vc_num];
-- int resize;
-- int cnt;
-- char *old_data = NULL;
--
-- if (con_is_visible(vc) && softback_lines)
-- fbcon_set_origin(vc);
--
-- resize = (w != vc->vc_font.width) || (h != vc->vc_font.height);
-- if (p->userfont)
-- old_data = vc->vc_font.data;
-- if (userfont)
-- cnt = FNTCHARCNT(data);
-- else
-- cnt = 256;
-- vc->vc_font.data = (void *)(p->fontdata = data);
-- if ((p->userfont = userfont))
-- REFCOUNT(data)++;
-- vc->vc_font.width = w;
-- vc->vc_font.height = h;
-- if (vc->vc_hi_font_mask && cnt == 256) {
-+ if (!set) {
- vc->vc_hi_font_mask = 0;
- if (vc->vc_can_do_color) {
- vc->vc_complement_mask >>= 1;
-@@ -2484,7 +2467,7 @@ static int fbcon_do_set_font(struct vc_d
- ((c & 0xfe00) >> 1) | (c & 0xff);
- vc->vc_attr >>= 1;
- }
-- } else if (!vc->vc_hi_font_mask && cnt == 512) {
-+ } else {
- vc->vc_hi_font_mask = 0x100;
- if (vc->vc_can_do_color) {
- vc->vc_complement_mask <<= 1;
-@@ -2516,8 +2499,38 @@ static int fbcon_do_set_font(struct vc_d
- } else
- vc->vc_video_erase_char = c & ~0x100;
- }
--
- }
-+}
-+
-+static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
-+ const u8 * data, int userfont)
-+{
-+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-+ struct fbcon_ops *ops = info->fbcon_par;
-+ struct display *p = &fb_display[vc->vc_num];
-+ int resize;
-+ int cnt;
-+ char *old_data = NULL;
-+
-+ if (con_is_visible(vc) && softback_lines)
-+ fbcon_set_origin(vc);
-+
-+ resize = (w != vc->vc_font.width) || (h != vc->vc_font.height);
-+ if (p->userfont)
-+ old_data = vc->vc_font.data;
-+ if (userfont)
-+ cnt = FNTCHARCNT(data);
-+ else
-+ cnt = 256;
-+ vc->vc_font.data = (void *)(p->fontdata = data);
-+ if ((p->userfont = userfont))
-+ REFCOUNT(data)++;
-+ vc->vc_font.width = w;
-+ vc->vc_font.height = h;
-+ if (vc->vc_hi_font_mask && cnt == 256)
-+ set_vc_hi_font(vc, false);
-+ else if (!vc->vc_hi_font_mask && cnt == 512)
-+ set_vc_hi_font(vc, true);
-
- if (resize) {
- int cols, rows;
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch new/patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch
--- old/patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch 2017-03-22 14:15:00.000000000 +0100
+++ new/patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-From: Jiri Slaby <jslaby(a)suse.cz>
-Date: Thu, 15 Dec 2016 14:31:01 +0100
-Subject: crypto: algif_hash - avoid zero-sized array
-Git-commit: 6207119444595d287b1e9e83a2066c17209698f3
-Patch-mainline: 4.11-rc1
-References: bnc#1007962
-
-With this reproducer:
- struct sockaddr_alg alg = {
- .salg_family = 0x26,
- .salg_type = "hash",
- .salg_feat = 0xf,
- .salg_mask = 0x5,
- .salg_name = "digest_null",
- };
- int sock, sock2;
-
- sock = socket(AF_ALG, SOCK_SEQPACKET, 0);
- bind(sock, (struct sockaddr *)&alg, sizeof(alg));
- sock2 = accept(sock, NULL, NULL);
- setsockopt(sock, SOL_ALG, ALG_SET_KEY, "\x9b\xca", 2);
- accept(sock2, NULL, NULL);
-
-==== 8< ======== 8< ======== 8< ======== 8< ====
-
-one can immediatelly see an UBSAN warning:
-UBSAN: Undefined behaviour in crypto/algif_hash.c:187:7
-variable length array bound value 0 <= 0
-CPU: 0 PID: 15949 Comm: syz-executor Tainted: G E 4.4.30-0-default #1
-...
-Call Trace:
-...
- [<ffffffff81d598fd>] ? __ubsan_handle_vla_bound_not_positive+0x13d/0x188
- [<ffffffff81d597c0>] ? __ubsan_handle_out_of_bounds+0x1bc/0x1bc
- [<ffffffffa0e2204d>] ? hash_accept+0x5bd/0x7d0 [algif_hash]
- [<ffffffffa0e2293f>] ? hash_accept_nokey+0x3f/0x51 [algif_hash]
- [<ffffffffa0e206b0>] ? hash_accept_parent_nokey+0x4a0/0x4a0 [algif_hash]
- [<ffffffff8235c42b>] ? SyS_accept+0x2b/0x40
-
-It is a correct warning, as hash state is propagated to accept as zero,
-but creating a zero-length variable array is not allowed in C.
-
-Fix this as proposed by Herbert -- do "?: 1" on that site. No sizeof or
-similar happens in the code there, so we just allocate one byte even
-though we do not use the array.
-
-Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
-Cc: Herbert Xu <herbert(a)gondor.apana.org.au>
-Cc: "David S. Miller" <davem(a)davemloft.net> (maintainer:CRYPTO API)
-Reported-by: Sasha Levin <sasha.levin(a)oracle.com>
-Signed-off-by: Herbert Xu <herbert(a)gondor.apana.org.au>
----
- crypto/algif_hash.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/crypto/algif_hash.c
-+++ b/crypto/algif_hash.c
-@@ -245,7 +245,7 @@ static int hash_accept(struct socket *so
- struct alg_sock *ask = alg_sk(sk);
- struct hash_ctx *ctx = ask->private;
- struct ahash_request *req = &ctx->req;
-- char state[crypto_ahash_statesize(crypto_ahash_reqtfm(req))];
-+ char state[crypto_ahash_statesize(crypto_ahash_reqtfm(req)) ? : 1];
- struct sock *sk2;
- struct alg_sock *ask2;
- struct hash_ctx *ctx2;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch new/patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch
--- old/patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,44 @@
+From: Andrey Konovalov <andreyknvl(a)google.com>
+Date: Wed, 29 Mar 2017 16:11:20 +0200
+Subject: net/packet: fix overflow in check for priv area size
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: 2b6867c2ce76c596676bec7d2d525af525fdc6e2
+References: CVE-2017-7308 bsc#1031579
+
+Subtracting tp_sizeof_priv from tp_block_size and casting to int
+to check whether one is less then the other doesn't always work
+(both of them are unsigned ints).
+
+Compare them as is instead.
+
+Also cast tp_sizeof_priv to u64 before using BLK_PLUS_PRIV, as
+it can overflow inside BLK_PLUS_PRIV otherwise.
+
+Signed-off-by: Andrey Konovalov <andreyknvl(a)google.com>
+Acked-by: Eric Dumazet <edumazet(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ net/packet/af_packet.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index c59fcc79ba32..5c919933a39b 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -4177,8 +4177,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
+ if (unlikely(!PAGE_ALIGNED(req->tp_block_size)))
+ goto out;
+ if (po->tp_version >= TPACKET_V3 &&
+- (int)(req->tp_block_size -
+- BLK_PLUS_PRIV(req_u->req3.tp_sizeof_priv)) <= 0)
++ req->tp_block_size <=
++ BLK_PLUS_PRIV((u64)req_u->req3.tp_sizeof_priv))
+ goto out;
+ if (unlikely(req->tp_frame_size < po->tp_hdrlen +
+ po->tp_reserve))
+--
+2.12.2
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch new/patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch
--- old/patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,41 @@
+From: Andrey Konovalov <andreyknvl(a)google.com>
+Date: Wed, 29 Mar 2017 16:11:21 +0200
+Subject: net/packet: fix overflow in check for tp_frame_nr
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: 8f8d28e4d6d815a391285e121c3a53a0b6cb9e7b
+References: CVE-2017-7308 bsc#1031579
+
+When calculating rb->frames_per_block * req->tp_block_nr the result
+can overflow.
+
+Add a check that tp_block_size * tp_block_nr <= UINT_MAX.
+
+Since frames_per_block <= tp_block_size, the expression would
+never overflow.
+
+Signed-off-by: Andrey Konovalov <andreyknvl(a)google.com>
+Acked-by: Eric Dumazet <edumazet(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ net/packet/af_packet.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index 5c919933a39b..624d188bf705 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -4189,6 +4189,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u,
+ rb->frames_per_block = req->tp_block_size / req->tp_frame_size;
+ if (unlikely(rb->frames_per_block == 0))
+ goto out;
++ if (unlikely(req->tp_block_size > UINT_MAX / req->tp_block_nr))
++ goto out;
+ if (unlikely((rb->frames_per_block * req->tp_block_nr) !=
+ req->tp_frame_nr))
+ goto out;
+--
+2.12.2
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch new/patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch
--- old/patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,37 @@
+From: Andrey Konovalov <andreyknvl(a)google.com>
+Date: Wed, 29 Mar 2017 16:11:22 +0200
+Subject: net/packet: fix overflow in check for tp_reserve
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: bcc5364bdcfe131e6379363f089e7b4108d35b70
+References: CVE-2017-7308 bsc#1031579
+
+When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.
+
+Fix by checking that tp_reserve <= INT_MAX on assign.
+
+Signed-off-by: Andrey Konovalov <andreyknvl(a)google.com>
+Acked-by: Eric Dumazet <edumazet(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ net/packet/af_packet.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index 624d188bf705..0f074c96f43f 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
+@@ -3644,6 +3644,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
+ return -EBUSY;
+ if (copy_from_user(&val, optval, sizeof(val)))
+ return -EFAULT;
++ if (val > INT_MAX)
++ return -EINVAL;
+ po->tp_reserve = val;
+ return 0;
+ }
+--
+2.12.2
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/ping-implement-proper-locking.patch new/patches.fixes/ping-implement-proper-locking.patch
--- old/patches.fixes/ping-implement-proper-locking.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/ping-implement-proper-locking.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,58 @@
+From: Eric Dumazet <edumazet(a)google.com>
+Date: Fri, 24 Mar 2017 19:36:13 -0700
+Subject: ping: implement proper locking
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Git-commit: 43a6684519ab0a6c52024b5e25322476cabad893
+References: bsc#1031003
+
+We got a report of yet another bug in ping
+
+http://www.openwall.com/lists/oss-security/2017/03/24/6
+
+->disconnect() is not called with socket lock held.
+
+Fix this by acquiring ping rwlock earlier.
+
+Thanks to Daniel, Alexander and Andrey for letting us know this problem.
+
+Fixes: c319b4d76b9e ("net: ipv4: add IPPROTO_ICMP socket kind")
+Signed-off-by: Eric Dumazet <edumazet(a)google.com>
+Reported-by: Daniel Jiang <danieljiang0415(a)gmail.com>
+Reported-by: Solar Designer <solar(a)openwall.com>
+Reported-by: Andrey Konovalov <andreyknvl(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ net/ipv4/ping.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
+index 68d77b1f1495..51e2f3c5e954 100644
+--- a/net/ipv4/ping.c
++++ b/net/ipv4/ping.c
+@@ -156,17 +156,18 @@ int ping_hash(struct sock *sk)
+ void ping_unhash(struct sock *sk)
+ {
+ struct inet_sock *isk = inet_sk(sk);
++
+ pr_debug("ping_unhash(isk=%p,isk->num=%u)\n", isk, isk->inet_num);
++ write_lock_bh(&ping_table.lock);
+ if (sk_hashed(sk)) {
+- write_lock_bh(&ping_table.lock);
+ hlist_nulls_del(&sk->sk_nulls_node);
+ sk_nulls_node_init(&sk->sk_nulls_node);
+ sock_put(sk);
+ isk->inet_num = 0;
+ isk->inet_sport = 0;
+ sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
+- write_unlock_bh(&ping_table.lock);
+ }
++ write_unlock_bh(&ping_table.lock);
+ }
+ EXPORT_SYMBOL_GPL(ping_unhash);
+
+--
+2.12.2
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tcp-fix-SCM_TIMESTAMPING_OPT_STATS-for-normal-skbs.patch new/patches.fixes/tcp-fix-SCM_TIMESTAMPING_OPT_STATS-for-normal-skbs.patch
--- old/patches.fixes/tcp-fix-SCM_TIMESTAMPING_OPT_STATS-for-normal-skbs.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/tcp-fix-SCM_TIMESTAMPING_OPT_STATS-for-normal-skbs.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,99 @@
+From: Soheil Hassas Yeganeh <soheil(a)google.com>
+Date: Sat, 18 Mar 2017 17:02:59 -0400
+Subject: tcp: fix SCM_TIMESTAMPING_OPT_STATS for normal skbs
+Patch-mainline: v4.11-rc4
+Git-commit: 8605330aac5a5785630aec8f64378a54891937cc
+References: CVE-2017-7277 bsc#1031265
+
+__sock_recv_timestamp can be called for both normal skbs (for
+receive timestamps) and for skbs on the error queue (for transmit
+timestamps).
+
+Commit 1c885808e456
+(tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING)
+assumes any skb passed to __sock_recv_timestamp are from
+the error queue, containing OPT_STATS in the content of the skb.
+This results in accessing invalid memory or generating junk
+data.
+
+To fix this, set skb->pkt_type to PACKET_OUTGOING for packets
+on the error queue. This is safe because on the receive path
+on local sockets skb->pkt_type is never set to PACKET_OUTGOING.
+With that, copy OPT_STATS from a packet, only if its pkt_type
+is PACKET_OUTGOING.
+
+Fixes: 1c885808e456 ("tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING")
+Reported-by: JongHwan Kim <zzoru007(a)gmail.com>
+Signed-off-by: Soheil Hassas Yeganeh <soheil(a)google.com>
+Signed-off-by: Eric Dumazet <edumazet(a)google.com>
+Signed-off-by: Willem de Bruijn <willemb(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ net/core/skbuff.c | 10 ++++++++++
+ net/socket.c | 13 ++++++++++++-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index aa3a13378c90..f21a29efdfc9 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -3690,6 +3690,15 @@ static void sock_rmem_free(struct sk_buff *skb)
+ atomic_sub(skb->truesize, &sk->sk_rmem_alloc);
+ }
+
++static void skb_set_err_queue(struct sk_buff *skb)
++{
++ /* pkt_type of skbs received on local sockets is never PACKET_OUTGOING.
++ * So, it is safe to (mis)use it to mark skbs on the error queue.
++ */
++ skb->pkt_type = PACKET_OUTGOING;
++ BUILD_BUG_ON(PACKET_OUTGOING == 0);
++}
++
+ /*
+ * Note: We dont mem charge error packets (no sk_forward_alloc changes)
+ */
+@@ -3703,6 +3712,7 @@ int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb)
+ skb->sk = sk;
+ skb->destructor = sock_rmem_free;
+ atomic_add(skb->truesize, &sk->sk_rmem_alloc);
++ skb_set_err_queue(skb);
+
+ /* before exiting rcu section, make sure dst is refcounted */
+ skb_dst_force(skb);
+diff --git a/net/socket.c b/net/socket.c
+index 02bd9249e295..bfdb35898e4c 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -654,6 +654,16 @@ int kernel_sendmsg(struct socket *sock, struct msghdr *msg,
+ }
+ EXPORT_SYMBOL(kernel_sendmsg);
+
++static bool skb_is_err_queue(const struct sk_buff *skb)
++{
++ /* pkt_type of skbs enqueued on the error queue are set to
++ * PACKET_OUTGOING in skb_set_err_queue(). This is only safe to do
++ * in recvmsg, since skbs received on a local socket will never
++ * have a pkt_type of PACKET_OUTGOING.
++ */
++ return skb->pkt_type == PACKET_OUTGOING;
++}
++
+ /*
+ * called from sock_recv_timestamp() if sock_flag(sk, SOCK_RCVTSTAMP)
+ */
+@@ -697,7 +707,8 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
+ put_cmsg(msg, SOL_SOCKET,
+ SCM_TIMESTAMPING, sizeof(tss), &tss);
+
+- if (skb->len && (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS))
++ if (skb_is_err_queue(skb) && skb->len &&
++ (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS))
+ put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_OPT_STATS,
+ skb->len, skb->data);
+ }
+--
+2.12.2
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch new/patches.fixes/tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch
--- old/patches.fixes/tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch 2017-03-31 19:14:49.000000000 +0200
@@ -0,0 +1,125 @@
+From: Soheil Hassas Yeganeh <soheil(a)google.com>
+Date: Sat, 18 Mar 2017 17:03:00 -0400
+Subject: tcp: mark skbs with SCM_TIMESTAMPING_OPT_STATS
+Patch-mainline: v4.11-rc4
+Git-commit: 4ef1b2869447411ad3ef91ad7d4891a83c1a509a
+References: CVE-2017-7277 bsc#1031265
+
+SOF_TIMESTAMPING_OPT_STATS can be enabled and disabled
+while packets are collected on the error queue.
+So, checking SOF_TIMESTAMPING_OPT_STATS in sk->sk_tsflags
+is not enough to safely assume that the skb contains
+OPT_STATS data.
+
+Add a bit in sock_exterr_skb to indicate whether the
+skb contains opt_stats data.
+
+Fixes: 1c885808e456 ("tcp: SOF_TIMESTAMPING_OPT_STATS option for SO_TIMESTAMPING")
+Reported-by: JongHwan Kim <zzoru007(a)gmail.com>
+Signed-off-by: Soheil Hassas Yeganeh <soheil(a)google.com>
+Signed-off-by: Eric Dumazet <edumazet(a)google.com>
+Signed-off-by: Willem de Bruijn <willemb(a)google.com>
+Signed-off-by: David S. Miller <davem(a)davemloft.net>
+Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
+
+---
+ include/linux/errqueue.h | 2 ++
+ net/core/skbuff.c | 17 +++++++++++------
+ net/socket.c | 2 +-
+ 3 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/include/linux/errqueue.h b/include/linux/errqueue.h
+index 9ca23fcfb5d7..6fdfc884fdeb 100644
+--- a/include/linux/errqueue.h
++++ b/include/linux/errqueue.h
+@@ -20,6 +20,8 @@ struct sock_exterr_skb {
+ struct sock_extended_err ee;
+ u16 addr_offset;
+ __be16 port;
++ u8 opt_stats:1,
++ unused:7;
+ };
+
+ #endif
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index f21a29efdfc9..941b8c76739d 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -3789,16 +3789,20 @@ EXPORT_SYMBOL(skb_clone_sk);
+
+ static void __skb_complete_tx_timestamp(struct sk_buff *skb,
+ struct sock *sk,
+- int tstype)
++ int tstype,
++ bool opt_stats)
+ {
+ struct sock_exterr_skb *serr;
+ int err;
+
++ BUILD_BUG_ON(sizeof(struct sock_exterr_skb) > sizeof(skb->cb));
++
+ serr = SKB_EXT_ERR(skb);
+ memset(serr, 0, sizeof(*serr));
+ serr->ee.ee_errno = ENOMSG;
+ serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING;
+ serr->ee.ee_info = tstype;
++ serr->opt_stats = opt_stats;
+ if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) {
+ serr->ee.ee_data = skb_shinfo(skb)->tskey;
+ if (sk->sk_protocol == IPPROTO_TCP &&
+@@ -3839,7 +3843,7 @@ void skb_complete_tx_timestamp(struct sk_buff *skb,
+ */
+ if (likely(atomic_inc_not_zero(&sk->sk_refcnt))) {
+ *skb_hwtstamps(skb) = *hwtstamps;
+- __skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND);
++ __skb_complete_tx_timestamp(skb, sk, SCM_TSTAMP_SND, false);
+ sock_put(sk);
+ }
+ }
+@@ -3850,7 +3854,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
+ struct sock *sk, int tstype)
+ {
+ struct sk_buff *skb;
+- bool tsonly;
++ bool tsonly, opt_stats = false;
+
+ if (!sk)
+ return;
+@@ -3863,9 +3867,10 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
+ #ifdef CONFIG_INET
+ if ((sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS) &&
+ sk->sk_protocol == IPPROTO_TCP &&
+- sk->sk_type == SOCK_STREAM)
++ sk->sk_type == SOCK_STREAM) {
+ skb = tcp_get_timestamping_opt_stats(sk);
+- else
++ opt_stats = true;
++ } else
+ #endif
+ skb = alloc_skb(0, GFP_ATOMIC);
+ } else {
+@@ -3884,7 +3889,7 @@ void __skb_tstamp_tx(struct sk_buff *orig_skb,
+ else
+ skb->tstamp = ktime_get_real();
+
+- __skb_complete_tx_timestamp(skb, sk, tstype);
++ __skb_complete_tx_timestamp(skb, sk, tstype, opt_stats);
+ }
+ EXPORT_SYMBOL_GPL(__skb_tstamp_tx);
+
+diff --git a/net/socket.c b/net/socket.c
+index bfdb35898e4c..6361d3161120 100644
+--- a/net/socket.c
++++ b/net/socket.c
+@@ -708,7 +708,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
+ SCM_TIMESTAMPING, sizeof(tss), &tss);
+
+ if (skb_is_err_queue(skb) && skb->len &&
+- (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_STATS))
++ SKB_EXT_ERR(skb)->opt_stats)
+ put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_OPT_STATS,
+ skb->len, skb->data);
+ }
+--
+2.12.2
+
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 6800 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch new/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch
--- old/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch 2017-03-30 11:49:42.000000000 +0200
@@ -0,0 +1,40 @@
+From: Jiri Slaby <jslaby(a)suse.cz>
+Date: Thu, 30 Mar 2017 10:52:48 +0200
+Subject: drm/i915: disable KASAN for handlers
+Patch-mainline: submitted, https://lkml.kernel.org/r/<20170330094627.29460-1-jslaby(a)suse.cz>
+References: bnc#1025903
+
+Handlers are currently the only blocker to compile the kernel with gcc 7
+and KASAN+use-after-scope enabled:
+drivers/gpu/drm/i915/gvt/handlers.c:2200:1: error: the frame size of 43760 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
+drivers/gpu/drm/i915/gvt/handlers.c:2402:1: error: the frame size of 9400 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
+drivers/gpu/drm/i915/gvt/handlers.c:2628:1: error: the frame size of 11256 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
+
+It is due to many expansions of MMIO_* macros in init_generic_mmio_info.
+INTEL_GVT_MMIO_OFFSET generates for each such line a __reg and an
+offset. There are too many for KASAN to keep up.
+
+So disable KASAN for this file.
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+Cc: Martin Liska <mliska(a)suse.cz>
+Cc: Zhenyu Wang <zhenyuw(a)linux.intel.com>
+Cc: Zhi Wang <zhi.a.wang(a)intel.com>
+Cc: Daniel Vetter <daniel.vetter(a)intel.com>
+Cc: Jani Nikula <jani.nikula(a)linux.intel.com>
+Cc: David Airlie <airlied(a)linux.ie>
+Cc: intel-gvt-dev(a)lists.freedesktop.org
+Cc: intel-gfx(a)lists.freedesktop.org
+Cc: dri-devel(a)lists.freedesktop.org
+---
+ drivers/gpu/drm/i915/gvt/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/gpu/drm/i915/gvt/Makefile
++++ b/drivers/gpu/drm/i915/gvt/Makefile
+@@ -6,3 +6,5 @@ GVT_SOURCE := gvt.o aperture_gm.o handle
+ ccflags-y += -I$(src) -I$(src)/$(GVT_DIR) -Wall
+ i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
+ obj-$(CONFIG_DRM_I915_GVT_KVMGT) += $(GVT_DIR)/kvmgt.o
++
++KASAN_SANITIZE_handlers.o := n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch new/patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch
--- old/patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch 2017-03-20 11:31:28.000000000 +0100
+++ new/patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-From: Linus Torvalds <torvalds(a)linux-foundation.org>
-Date: Thu, 2 Mar 2017 12:17:22 -0800
-Subject: give up on gcc ilog2() constant optimizations
-Git-commit: 474c90156c8dcc2fa815e6716cc9394d7930cb9c
-Patch-mainline: v4.11-rc1
-References: bnc#1025903
-
-gcc-7 has an "optimization" pass that completely screws up, and
-generates the code expansion for the (impossible) case of calling
-ilog2() with a zero constant, even when the code gcc compiles does not
-actually have a zero constant.
-
-And we try to generate a compile-time error for anybody doing ilog2() on
-a constant where that doesn't make sense (be it zero or negative). So
-now gcc7 will fail the build due to our sanity checking, because it
-created that constant-zero case that didn't actually exist in the source
-code.
-
-There's a whole long discussion on the kernel mailing about how to work
-around this gcc bug. The gcc people themselevs have discussed their
-"feature" in
-
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785
-
-but it's all water under the bridge, because while it looked at one
-point like it would be solved by the time gcc7 was released, that was
-not to be.
-
-So now we have to deal with this compiler braindamage.
-
-And the only simple approach seems to be to just delete the code that
-tries to warn about bad uses of ilog2().
-
-So now "ilog2()" will just return 0 not just for the value 1, but for
-any non-positive value too.
-
-It's not like I can recall anybody having ever actually tried to use
-this function on any invalid value, but maybe the sanity check just
-meant that such code never made it out in public.
-
-Reported-by: Laura Abbott <labbott(a)redhat.com>
-Cc: John Stultz <john.stultz(a)linaro.org>,
-Cc: Thomas Gleixner <tglx(a)linutronix.de>
-Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org>
-Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
-Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
----
- include/linux/log2.h | 13 ++-----------
- tools/include/linux/log2.h | 13 ++-----------
- 2 files changed, 4 insertions(+), 22 deletions(-)
-
---- a/include/linux/log2.h
-+++ b/include/linux/log2.h
-@@ -16,12 +16,6 @@
- #include <linux/bitops.h>
-
- /*
-- * deal with unrepresentable constant logarithms
-- */
--extern __attribute__((const, noreturn))
--int ____ilog2_NaN(void);
--
--/*
- * non-constant log of base 2 calculators
- * - the arch may override these in asm/bitops.h if they can be implemented
- * more efficiently than using fls() and fls64()
-@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(uns
- #define ilog2(n) \
- ( \
- __builtin_constant_p(n) ? ( \
-- (n) < 1 ? ____ilog2_NaN() : \
-+ (n) < 2 ? 0 : \
- (n) & (1ULL << 63) ? 63 : \
- (n) & (1ULL << 62) ? 62 : \
- (n) & (1ULL << 61) ? 61 : \
-@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(uns
- (n) & (1ULL << 4) ? 4 : \
- (n) & (1ULL << 3) ? 3 : \
- (n) & (1ULL << 2) ? 2 : \
-- (n) & (1ULL << 1) ? 1 : \
-- (n) & (1ULL << 0) ? 0 : \
-- ____ilog2_NaN() \
-- ) : \
-+ 1 ) : \
- (sizeof(n) <= 4) ? \
- __ilog2_u32(n) : \
- __ilog2_u64(n) \
---- a/tools/include/linux/log2.h
-+++ b/tools/include/linux/log2.h
-@@ -13,12 +13,6 @@
- #define _TOOLS_LINUX_LOG2_H
-
- /*
-- * deal with unrepresentable constant logarithms
-- */
--extern __attribute__((const, noreturn))
--int ____ilog2_NaN(void);
--
--/*
- * non-constant log of base 2 calculators
- * - the arch may override these in asm/bitops.h if they can be implemented
- * more efficiently than using fls() and fls64()
-@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(uns
- #define ilog2(n) \
- ( \
- __builtin_constant_p(n) ? ( \
-- (n) < 1 ? ____ilog2_NaN() : \
-+ (n) < 2 ? 0 : \
- (n) & (1ULL << 63) ? 63 : \
- (n) & (1ULL << 62) ? 62 : \
- (n) & (1ULL << 61) ? 61 : \
-@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(uns
- (n) & (1ULL << 4) ? 4 : \
- (n) & (1ULL << 3) ? 3 : \
- (n) & (1ULL << 2) ? 2 : \
-- (n) & (1ULL << 1) ? 1 : \
-- (n) & (1ULL << 0) ? 0 : \
-- ____ilog2_NaN() \
-- ) : \
-+ 1 ) : \
- (sizeof(n) <= 4) ? \
- __ilog2_u32(n) : \
- __ilog2_u64(n) \
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:01.440394304 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:01.440394304 +0200
@@ -32,13 +32,15 @@
patches.kernel.org/patch-4.10.2-3
patches.kernel.org/patch-4.10.3-4
patches.kernel.org/patch-4.10.4-5
+ patches.kernel.org/patch-4.10.5-6
+ patches.kernel.org/patch-4.10.6-7
+ patches.kernel.org/patch-4.10.7-8
########################################################
# Build fixes that apply to the vanilla kernel too.
# Patches in patches.rpmify are applied to both -vanilla
# and patched flavors.
########################################################
- patches.rpmify/give-up-on-gcc-ilog2-constant-optimizations.patch
########################################################
# kABI consistency patches
@@ -56,6 +58,7 @@
patches.rpmify/firmware-path
patches.rpmify/cloneconfig.diff
patches.rpmify/get_builtin_firmware-gcc-7.patch
+ patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch
########################################################
# kbuild/module infrastructure fixes
@@ -184,7 +187,6 @@
########################################################
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
- patches.fixes/crypto-algif_hash-avoid-zero-sized-array.patch
########################################################
#
@@ -215,6 +217,12 @@
# Networking, IPv6
########################################################
patches.fixes/openvswitch-Set-internal-device-max-mtu-to-ETH_MAX_M.patch
+ patches.fixes/ping-implement-proper-locking.patch
+ patches.fixes/net-packet-fix-overflow-in-check-for-priv-area-size.patch
+ patches.fixes/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch
+ patches.fixes/net-packet-fix-overflow-in-check-for-tp_reserve.patch
+ patches.fixes/tcp-fix-SCM_TIMESTAMPING_OPT_STATS-for-normal-skbs.patch
+ patches.fixes/tcp-mark-skbs-with-SCM_TIMESTAMPING_OPT_STATS.patch
########################################################
# Netfilter
@@ -321,7 +329,6 @@
# DRM/Video
########################################################
patches.fixes/drm-i915-Fix-S4-resume-breakage
- patches.drivers/drm-reference-count-event-completion
########################################################
# video4linux
@@ -375,7 +382,6 @@
########################################################
# Char / serial
########################################################
- patches.drivers/fbcon-Fix-vc-attr-at-deinit
########################################################
# Other driver fixes
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.NjYCQA/_old 2017-04-03 11:05:01.480388653 +0200
+++ /var/tmp/diff_new_pack.NjYCQA/_new 2017-04-03 11:05:01.484388088 +0200
@@ -1,3 +1,3 @@
-2017-03-22 14:15:00 +0100
-GIT Revision: f3fbfc6e0759d457c1c47e1ac5a962624a67e66d
+2017-03-31 19:16:00 +0200
+GIT Revision: ea9dcd468d472551aa10e99534387143f44aa33f
GIT Branch: stable
1
0
Hello community,
here is the log from the commit of package acl for openSUSE:Factory checked in at 2017-04-03 11:04:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/acl (Old)
and /work/SRC/openSUSE:Factory/.acl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "acl"
Mon Apr 3 11:04:40 2017 rev:41 rq:484099 version:2.2.52
Changes:
--------
--- /work/SRC/openSUSE:Factory/acl/acl.changes 2017-03-29 13:21:38.537307783 +0200
+++ /work/SRC/openSUSE:Factory/.acl.new/acl.changes 2017-04-03 11:04:41.311238197 +0200
@@ -1,0 +2,6 @@
+Wed Mar 29 14:25:36 UTC 2017 - fvogt(a)suse.com
+
+- Make it possible to disable tests (for Ring0)
+- Add BuildRequires: system-user-daemon for the testsuite
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ acl.spec ++++++
--- /var/tmp/diff_new_pack.i4ggtI/_old 2017-04-03 11:04:43.062990705 +0200
+++ /var/tmp/diff_new_pack.i4ggtI/_new 2017-04-03 11:04:43.062990705 +0200
@@ -16,6 +16,9 @@
#
+# Ring0 does not have system-user-bin/system-user-daemon
+%bcond_without acl_tests
+
Name: acl
%define lname libacl1
Summary: Commands for Manipulating POSIX Access Control Lists
@@ -78,8 +81,9 @@
BuildRequires: libattr-devel
BuildRequires: libtool
BuildRequires: pkg-config
-%if 0%{?suse_version} > 1320
+%if %{with acl_tests} && 0%{?suse_version} > 1320
BuildRequires: system-user-bin
+BuildRequires: system-user-daemon
%endif
#BuildRequires: gpg-offline
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -178,12 +182,14 @@
%{__make} %{?_smp_mflags}
%check
-if ./setfacl -m u:`id -u`:rwx .; then
+%if %{with acl_tests}
+ if ./setfacl -m u:`id -u`:rwx .; then
make check || (cat test-suite.log ; false)
-else
+ else
echo '*** ACLs are probably not supported by the file system,' \
'the test-suite will NOT run ***'
-fi
+ fi
+%endif
%install
%make_install
1
0