openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- 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
July 2019
- 2 participants
- 2045 discussions
Hello community,
here is the log from the commit of package DisplayCAL for openSUSE:Factory checked in at 2019-07-03 15:15:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/DisplayCAL (Old)
and /work/SRC/openSUSE:Factory/.DisplayCAL.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "DisplayCAL"
Wed Jul 3 15:15:08 2019 rev:31 rq:713116 version:3.8.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/DisplayCAL/DisplayCAL.changes 2019-06-12 13:19:14.672553153 +0200
+++ /work/SRC/openSUSE:Factory/.DisplayCAL.new.4615/DisplayCAL.changes 2019-07-03 15:15:10.578985470 +0200
@@ -1,0 +2,10 @@
+Tue Jul 02 21:04:00 UTC 2019 - obs-packaging(a)displaycal.net
+
+- Update to 3.8.3:
+ * [Minor] Verification: Prevent unintended mixing of unicode and
+ binary strings when a device link profile is used.
+ * [Cosmetic] [UI] (KDE) Centering the measurement window would
+ increase its size slightly and resetting its size would move
+ the window down and right (regression of SVN revision r6137).
+
+-------------------------------------------------------------------
Old:
----
DisplayCAL-3.8.2.0.tar.gz
New:
----
DisplayCAL-3.8.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ DisplayCAL.spec ++++++
--- /var/tmp/diff_new_pack.cPExBu/_old 2019-07-03 15:15:11.962988286 +0200
+++ /var/tmp/diff_new_pack.cPExBu/_new 2019-07-03 15:15:11.970988302 +0200
@@ -30,7 +30,7 @@
License: GPL-3.0+
Group: Productivity/Graphics/Other
Name: DisplayCAL
-Version: 3.8.2.0
+Version: 3.8.3.0
Release: 0
Source0: http://displaycal.net/download/%{name}-%version.tar.gz
Url: https://displaycal.net/
@@ -53,6 +53,8 @@
Requires: libSDL2_mixer-2_0-0
Requires: python2-wxWidgets >= %{wx_minversion}
Requires: python2-psutil
+Requires: python2-gobject
+Requires: python2-xml
%py_requires
%description
++++++ DisplayCAL-3.8.2.0.tar.gz -> DisplayCAL-3.8.3.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/DisplayCAL/DisplayCAL-3.8.2.0.tar.gz /work/SRC/openSUSE:Factory/.DisplayCAL.new.4615/DisplayCAL-3.8.3.0.tar.gz differ: char 5, line 1
1
0
Hello community,
here is the log from the commit of package elisa for openSUSE:Factory checked in at 2019-07-03 15:15:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/elisa (Old)
and /work/SRC/openSUSE:Factory/.elisa.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elisa"
Wed Jul 3 15:15:06 2019 rev:8 rq:713103 version:0.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/elisa/elisa.changes 2019-06-24 21:53:38.876119213 +0200
+++ /work/SRC/openSUSE:Factory/.elisa.new.4615/elisa.changes 2019-07-03 15:15:06.830977843 +0200
@@ -1,0 +2,8 @@
+Sun Jun 30 20:33:02 UTC 2019 - wbauer(a)tmo.at
+
+- Update to 0.4.2
+ * Fix restore of tracks with missing metadata in playlist (this
+ was the case for tracks without album metadata)
+ * Fix view selector not following the color theme (kde#408435)
+
+-------------------------------------------------------------------
Old:
----
elisa-0.4.1.tar.xz
elisa-0.4.1.tar.xz.sig
New:
----
elisa-0.4.2.tar.xz
elisa-0.4.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ elisa.spec ++++++
--- /var/tmp/diff_new_pack.DWm53n/_old 2019-07-03 15:15:09.610983500 +0200
+++ /var/tmp/diff_new_pack.DWm53n/_new 2019-07-03 15:15:09.626983533 +0200
@@ -20,7 +20,7 @@
%define kf5_version 5.48.0
%bcond_without lang
Name: elisa
-Version: 0.4.1
+Version: 0.4.2
Release: 0
Summary: Music player and collection organizer
License: LGPL-3.0-or-later
++++++ elisa-0.4.1.tar.xz -> elisa-0.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/CMakeLists.txt new/elisa-0.4.2/CMakeLists.txt
--- old/elisa-0.4.1/CMakeLists.txt 2019-06-19 22:41:34.000000000 +0200
+++ new/elisa-0.4.2/CMakeLists.txt 2019-06-29 15:03:26.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.8)
project(elisa
- VERSION 0.4.1
+ VERSION 0.4.2
LANGUAGES CXX)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/autotests/databaseinterfacetest.cpp new/elisa-0.4.2/autotests/databaseinterfacetest.cpp
--- old/elisa-0.4.1/autotests/databaseinterfacetest.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/autotests/databaseinterfacetest.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -4958,6 +4958,155 @@
QCOMPARE(musicDbTrackModifiedSpy.count(), 0);
QCOMPARE(musicDbDatabaseErrorSpy.count(), 0);
}
+
+ void enqueueTracksWithMissingMetadata()
+ {
+ QTemporaryFile databaseFile;
+ databaseFile.open();
+
+ qDebug() << "enqueueTracksWithMissingMetadata" << databaseFile.fileName();
+
+ DatabaseInterface musicDb;
+
+ musicDb.init(QStringLiteral("enqueueTracksWithMissingMetadata"), databaseFile.fileName());
+
+ QSignalSpy musicDbArtistAddedSpy(&musicDb, &DatabaseInterface::artistsAdded);
+ QSignalSpy musicDbAlbumAddedSpy(&musicDb, &DatabaseInterface::albumsAdded);
+ QSignalSpy musicDbTrackAddedSpy(&musicDb, &DatabaseInterface::tracksAdded);
+ QSignalSpy musicDbArtistRemovedSpy(&musicDb, &DatabaseInterface::artistRemoved);
+ QSignalSpy musicDbAlbumRemovedSpy(&musicDb, &DatabaseInterface::albumRemoved);
+ QSignalSpy musicDbTrackRemovedSpy(&musicDb, &DatabaseInterface::trackRemoved);
+ QSignalSpy musicDbAlbumModifiedSpy(&musicDb, &DatabaseInterface::albumModified);
+ QSignalSpy musicDbTrackModifiedSpy(&musicDb, &DatabaseInterface::trackModified);
+ QSignalSpy musicDbDatabaseErrorSpy(&musicDb, &DatabaseInterface::databaseError);
+
+ QCOMPARE(musicDb.allAlbumsData().count(), 0);
+ QCOMPARE(musicDb.allArtistsData().count(), 0);
+ QCOMPARE(musicDb.allTracksData().count(), 0);
+ QCOMPARE(musicDbArtistAddedSpy.count(), 0);
+ QCOMPARE(musicDbAlbumAddedSpy.count(), 0);
+ QCOMPARE(musicDbTrackAddedSpy.count(), 0);
+ QCOMPARE(musicDbArtistRemovedSpy.count(), 0);
+ QCOMPARE(musicDbAlbumRemovedSpy.count(), 0);
+ QCOMPARE(musicDbTrackRemovedSpy.count(), 0);
+ QCOMPARE(musicDbAlbumModifiedSpy.count(), 0);
+ QCOMPARE(musicDbTrackModifiedSpy.count(), 0);
+ QCOMPARE(musicDbDatabaseErrorSpy.count(), 0);
+
+ auto fullTrack = MusicAudioTrack{true, QStringLiteral("$23"), QStringLiteral("0"), QStringLiteral("track6"),
+ QStringLiteral("artist2"), QStringLiteral("album3"), QStringLiteral("artist2"),
+ 6, 1, QTime::fromMSecsSinceStartOfDay(23), {QUrl::fromLocalFile(QStringLiteral("/test/$23"))},
+ QDateTime::fromMSecsSinceEpoch(23),
+ QUrl::fromLocalFile(QStringLiteral("album3")), 5, true,
+ QStringLiteral("genre1"), QStringLiteral("composer1"), QStringLiteral("lyricist1"), false};
+
+ fullTrack.setBitRate(154);
+ fullTrack.setChannels(2);
+ fullTrack.setSampleRate(48000);
+
+ auto newTrack = MusicAudioTrack{};
+
+ newTrack.setValid(true);
+ newTrack.setId(QStringLiteral("$29"));
+ newTrack.setParentId(QStringLiteral("0"));
+ newTrack.setTitle(QStringLiteral("track19"));
+ newTrack.setArtist(QStringLiteral("artist2"));
+ newTrack.setDuration(QTime::fromMSecsSinceStartOfDay(29));
+ newTrack.setResourceURI(QUrl::fromLocalFile(QStringLiteral("/$29")));
+ newTrack.setFileModificationTime(QDateTime::fromMSecsSinceEpoch(29));
+ newTrack.setAlbumCover(QUrl::fromLocalFile(QStringLiteral("/withoutAlbum")));
+ newTrack.setRating(9);
+ newTrack.setIsSingleDiscAlbum(true);
+ newTrack.setGenre(QStringLiteral("genre1"));
+ newTrack.setComposer(QStringLiteral("composer1"));
+ newTrack.setLyricist(QStringLiteral("lyricist1"));
+ newTrack.setHasEmbeddedCover(false);
+
+ musicDb.insertTracksList({fullTrack, newTrack}, mNewCovers);
+
+ QCOMPARE(musicDb.allAlbumsData().count(), 1);
+ QCOMPARE(musicDb.allArtistsData().count(), 1);
+ QCOMPARE(musicDb.allTracksData().count(), 2);
+ QCOMPARE(musicDbArtistAddedSpy.count(), 1);
+ QCOMPARE(musicDbAlbumAddedSpy.count(), 1);
+ QCOMPARE(musicDbTrackAddedSpy.count(), 1);
+ QCOMPARE(musicDbArtistRemovedSpy.count(), 0);
+ QCOMPARE(musicDbAlbumRemovedSpy.count(), 0);
+ QCOMPARE(musicDbTrackRemovedSpy.count(), 0);
+ QCOMPARE(musicDbAlbumModifiedSpy.count(), 0);
+ QCOMPARE(musicDbTrackModifiedSpy.count(), 0);
+ QCOMPARE(musicDbDatabaseErrorSpy.count(), 0);
+
+ auto firstTrackId = musicDb.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track6"), QStringLiteral("artist2"),
+ QStringLiteral("album3"), 6, 1);
+ auto firstTrack = musicDb.trackDataFromDatabaseId(firstTrackId);
+
+ auto firstTrackTitle = firstTrack.title();
+ auto firstTrackArtist = firstTrack.artist();
+ auto firstTrackAlbumArtist = firstTrack.albumArtist();
+ auto firstTrackAlbum = firstTrack.album();
+ auto firstTrackImage = firstTrack.albumCover();
+ auto firstTrackDuration = firstTrack.duration();
+ auto firstTrackMilliSecondsDuration = firstTrack.duration().msecsSinceStartOfDay();
+ auto firstTrackTrackNumber = firstTrack.trackNumber();
+ auto firstTrackDiscNumber = firstTrack.discNumber();
+ const auto &firstTrackResource = firstTrack.resourceURI();
+ auto firstTrackRating = firstTrack.rating();
+ auto firstIsSingleDiscAlbum = firstTrack.isSingleDiscAlbum();
+
+ QCOMPARE(firstTrack.isValid(), true);
+ QCOMPARE(firstTrackTitle, QStringLiteral("track6"));
+ QCOMPARE(firstTrackArtist, QStringLiteral("artist2"));
+ QCOMPARE(firstTrackAlbumArtist, QStringLiteral("artist2"));
+ QCOMPARE(firstTrackAlbum, QStringLiteral("album3"));
+ QCOMPARE(firstTrackImage.isValid(), true);
+ QCOMPARE(firstTrackImage, QUrl::fromLocalFile(QStringLiteral("album3")));
+ QCOMPARE(firstTrackDuration, QTime::fromMSecsSinceStartOfDay(23));
+ QCOMPARE(firstTrackMilliSecondsDuration, 23);
+ QCOMPARE(firstTrackTrackNumber, 6);
+ QCOMPARE(firstTrackDiscNumber, 1);
+ QCOMPARE(firstTrackResource.isValid(), true);
+ QCOMPARE(firstTrackResource, QUrl::fromLocalFile(QStringLiteral("/test/$23")));
+ QCOMPARE(firstTrackRating, 5);
+ QCOMPARE(firstIsSingleDiscAlbum, true);
+
+ auto secondTrackId = musicDb.trackIdFromTitleAlbumTrackDiscNumber(QStringLiteral("track19"), QStringLiteral("artist2"), {}, {}, {});
+ auto secondTrack = musicDb.trackDataFromDatabaseId(secondTrackId);
+
+ auto secondTrackTitle = secondTrack.title();
+ auto secondTrackArtist = secondTrack.artist();
+ auto secondTrackAlbumArtist = secondTrack.albumArtist();
+ auto secondTrackAlbum = secondTrack.album();
+ auto secondTrackImage = secondTrack.albumCover();
+ auto secondTrackDuration = secondTrack.duration();
+ auto secondTrackMilliSecondsDuration = secondTrack.duration().msecsSinceStartOfDay();
+ auto secondTrackTrackNumber = secondTrack.trackNumber();
+ auto secondTrackDiscNumber = secondTrack.discNumber();
+ auto secondTrackChannels = secondTrack.channels();
+ auto secondTrackBitRate = secondTrack.bitRate();
+ auto secondTrackSampleRate = secondTrack.sampleRate();
+ const auto &secondTrackResource = secondTrack.resourceURI();
+ auto secondTrackRating = secondTrack.rating();
+ auto secondIsSingleDiscAlbum = secondTrack.isSingleDiscAlbum();
+
+ QCOMPARE(secondTrack.isValid(), true);
+ QCOMPARE(secondTrackTitle, QStringLiteral("track19"));
+ QCOMPARE(secondTrackArtist, QStringLiteral("artist2"));
+ QCOMPARE(secondTrackAlbumArtist, QString());
+ QCOMPARE(secondTrackAlbum, QString());
+ QCOMPARE(secondTrackImage.isValid(), false);
+ QCOMPARE(secondTrackDuration, QTime::fromMSecsSinceStartOfDay(29));
+ QCOMPARE(secondTrackMilliSecondsDuration, 29);
+ QCOMPARE(secondTrackTrackNumber, 0);
+ QCOMPARE(secondTrackDiscNumber, 0);
+ QCOMPARE(secondTrackChannels, 0);
+ QCOMPARE(secondTrackBitRate, 0);
+ QCOMPARE(secondTrackSampleRate, 0);
+ QCOMPARE(secondTrackResource.isValid(), true);
+ QCOMPARE(secondTrackResource, QUrl::fromLocalFile(QStringLiteral("/$29")));
+ QCOMPARE(secondTrackRating, 9);
+ QCOMPARE(secondIsSingleDiscAlbum, true);
+ }
};
QTEST_GUILESS_MAIN(DatabaseInterfaceTests)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/autotests/mediaplaylisttest.cpp new/elisa-0.4.2/autotests/mediaplaylisttest.cpp
--- old/elisa-0.4.1/autotests/mediaplaylisttest.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/autotests/mediaplaylisttest.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -2918,6 +2918,140 @@
QCOMPARE(myPlayList.data(myPlayList.index(3, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 3);
}
+void MediaPlayListTest::restoreTrackWithoutAlbum()
+{
+ QTemporaryFile databaseFile;
+ databaseFile.open();
+
+ qDebug() << "restoreTrackWithoutAlbum" << databaseFile.fileName();
+
+ MediaPlayList myPlayList;
+ QAbstractItemModelTester testModel(&myPlayList);
+ DatabaseInterface myDatabaseContent;
+ TracksListener myListener(&myDatabaseContent);
+
+ QSignalSpy rowsAboutToBeMovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeMoved);
+ QSignalSpy rowsAboutToBeRemovedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeRemoved);
+ QSignalSpy rowsAboutToBeInsertedSpy(&myPlayList, &MediaPlayList::rowsAboutToBeInserted);
+ QSignalSpy rowsMovedSpy(&myPlayList, &MediaPlayList::rowsMoved);
+ QSignalSpy rowsRemovedSpy(&myPlayList, &MediaPlayList::rowsRemoved);
+ QSignalSpy rowsInsertedSpy(&myPlayList, &MediaPlayList::rowsInserted);
+ QSignalSpy persistentStateChangedSpy(&myPlayList, &MediaPlayList::persistentStateChanged);
+ QSignalSpy dataChangedSpy(&myPlayList, &MediaPlayList::dataChanged);
+ QSignalSpy newTrackByNameInListSpy(&myPlayList, &MediaPlayList::newTrackByNameInList);
+ QSignalSpy newEntryInListSpy(&myPlayList, &MediaPlayList::newEntryInList);
+
+ QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
+ QCOMPARE(rowsRemovedSpy.count(), 0);
+ QCOMPARE(rowsMovedSpy.count(), 0);
+ QCOMPARE(rowsInsertedSpy.count(), 0);
+ QCOMPARE(persistentStateChangedSpy.count(), 0);
+ QCOMPARE(dataChangedSpy.count(), 0);
+ QCOMPARE(newTrackByNameInListSpy.count(), 0);
+ QCOMPARE(newEntryInListSpy.count(), 0);
+
+ myDatabaseContent.init(QStringLiteral("restoreTrackWithoutAlbum"), databaseFile.fileName());
+
+ connect(&myListener, &TracksListener::trackHasChanged,
+ &myPlayList, &MediaPlayList::trackChanged,
+ Qt::QueuedConnection);
+ connect(&myListener, &TracksListener::tracksListAdded,
+ &myPlayList, &MediaPlayList::tracksListAdded,
+ Qt::QueuedConnection);
+ connect(&myPlayList, &MediaPlayList::newTrackByNameInList,
+ &myListener, &TracksListener::trackByNameInList,
+ Qt::QueuedConnection);
+ connect(&myPlayList, &MediaPlayList::newEntryInList,
+ &myListener, &TracksListener::newEntryInList,
+ Qt::QueuedConnection);
+ connect(&myDatabaseContent, &DatabaseInterface::tracksAdded,
+ &myListener, &TracksListener::tracksAdded);
+
+ myDatabaseContent.insertTracksList(mNewTracks, mNewCovers);
+
+ QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
+ QCOMPARE(rowsRemovedSpy.count(), 0);
+ QCOMPARE(rowsMovedSpy.count(), 0);
+ QCOMPARE(rowsInsertedSpy.count(), 0);
+ QCOMPARE(persistentStateChangedSpy.count(), 0);
+ QCOMPARE(dataChangedSpy.count(), 0);
+ QCOMPARE(newTrackByNameInListSpy.count(), 0);
+ QCOMPARE(newEntryInListSpy.count(), 0);
+
+ auto newTrack = MusicAudioTrack{};
+
+ newTrack.setValid(true);
+ newTrack.setId(QStringLiteral("$29"));
+ newTrack.setParentId(QStringLiteral("0"));
+ newTrack.setTitle(QStringLiteral("track19"));
+ newTrack.setArtist(QStringLiteral("artist2"));
+ newTrack.setDuration(QTime::fromMSecsSinceStartOfDay(29));
+ newTrack.setResourceURI(QUrl::fromLocalFile(QStringLiteral("/$29")));
+ newTrack.setFileModificationTime(QDateTime::fromMSecsSinceEpoch(29));
+ newTrack.setAlbumCover(QUrl::fromLocalFile(QStringLiteral("withoutAlbum")));
+ newTrack.setRating(9);
+ newTrack.setIsSingleDiscAlbum(true);
+ newTrack.setGenre(QStringLiteral("genre1"));
+ newTrack.setComposer(QStringLiteral("composer1"));
+ newTrack.setLyricist(QStringLiteral("lyricist1"));
+ newTrack.setHasEmbeddedCover(false);
+
+ myDatabaseContent.insertTracksList({newTrack}, mNewCovers);
+
+ QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeInsertedSpy.count(), 0);
+ QCOMPARE(rowsRemovedSpy.count(), 0);
+ QCOMPARE(rowsMovedSpy.count(), 0);
+ QCOMPARE(rowsInsertedSpy.count(), 0);
+ QCOMPARE(persistentStateChangedSpy.count(), 0);
+ QCOMPARE(dataChangedSpy.count(), 0);
+ QCOMPARE(newTrackByNameInListSpy.count(), 0);
+ QCOMPARE(newEntryInListSpy.count(), 0);
+
+ auto newEntry = MediaPlayListEntry{};
+
+ newEntry.mTitle = QStringLiteral("track19");
+ newEntry.mArtist = QStringLiteral("artist2");
+
+ myPlayList.enqueueRestoredEntry(newEntry);
+
+ QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
+ QCOMPARE(rowsRemovedSpy.count(), 0);
+ QCOMPARE(rowsMovedSpy.count(), 0);
+ QCOMPARE(rowsInsertedSpy.count(), 1);
+ QCOMPARE(persistentStateChangedSpy.count(), 1);
+ QCOMPARE(dataChangedSpy.count(), 1);
+ QCOMPARE(newTrackByNameInListSpy.count(), 1);
+ QCOMPARE(newEntryInListSpy.count(), 0);
+
+ QCOMPARE(dataChangedSpy.wait(), true);
+
+ QCOMPARE(rowsAboutToBeRemovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeMovedSpy.count(), 0);
+ QCOMPARE(rowsAboutToBeInsertedSpy.count(), 1);
+ QCOMPARE(rowsRemovedSpy.count(), 0);
+ QCOMPARE(rowsMovedSpy.count(), 0);
+ QCOMPARE(rowsInsertedSpy.count(), 1);
+ QCOMPARE(persistentStateChangedSpy.count(), 1);
+ QCOMPARE(dataChangedSpy.count(), 2);
+ QCOMPARE(newTrackByNameInListSpy.count(), 1);
+ QCOMPARE(newEntryInListSpy.count(), 0);
+
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TitleRole).toString(), QStringLiteral("track19"));
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::AlbumRole).toString(), {});
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::ArtistRole).toString(), QStringLiteral("artist2"));
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::TrackNumberRole).toInt(), 0);
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::DiscNumberRole).toInt(), 0);
+ QCOMPARE(myPlayList.data(myPlayList.index(0, 0), MediaPlayList::MilliSecondsDurationRole).toInt(), 29);
+}
+
void MediaPlayListTest::testHasHeaderAlbumWithSameTitle()
{
MediaPlayList myPlayList;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/autotests/mediaplaylisttest.h new/elisa-0.4.2/autotests/mediaplaylisttest.h
--- old/elisa-0.4.1/autotests/mediaplaylisttest.h 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/autotests/mediaplaylisttest.h 2019-06-29 15:02:46.000000000 +0200
@@ -73,6 +73,8 @@
void restoreMultipleIdenticalTracks();
+ void restoreTrackWithoutAlbum();
+
void testHasHeaderAlbumWithSameTitle();
void testSavePersistentState();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/org.kde.elisa.appdata.xml new/elisa-0.4.2/org.kde.elisa.appdata.xml
--- old/elisa-0.4.1/org.kde.elisa.appdata.xml 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/org.kde.elisa.appdata.xml 2019-06-29 15:02:46.000000000 +0200
@@ -140,6 +140,8 @@
<project_group>KDE</project_group>
<content_rating type="oars-1.0"/>
<releases>
+ <release version="0.4.2" date="2019-06-30"/>
+ <release version="0.4.1" date="2019-06-20"/>
<release version="0.4.0" date="2019-05-20"/>
<release version="0.3.80" date="2019-05-04"/>
<release version="0.3.0" date="2018-09-29"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/po/de/elisa.po new/elisa-0.4.2/po/de/elisa.po
--- old/elisa-0.4.1/po/de/elisa.po 2019-06-19 22:41:06.000000000 +0200
+++ new/elisa-0.4.2/po/de/elisa.po 2019-06-29 15:03:00.000000000 +0200
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Burkhard Lück <lueck(a)hube-lueck.de>, 2016, 2017, 2018.
+# Burkhard Lück <lueck(a)hube-lueck.de>, 2016, 2017, 2018, 2019.
# Frederik Schwarzer <schwarzer(a)kde.org>, 2016, 2018.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-06-13 07:41+0200\n"
-"PO-Revision-Date: 2018-09-23 20:42+0100\n"
+"PO-Revision-Date: 2019-06-24 14:33+0200\n"
"Last-Translator: Burkhard Lück <lueck(a)hube-lueck.de>\n"
"Language-Team: German <kde-i18n-de(a)kde.org>\n"
"Language: de\n"
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -69,10 +69,9 @@
msgstr "Ein einfacher Medienspieler geschrieben mit KDE Frameworks"
#: main.cpp:118
-#, fuzzy, kde-format
-#| msgid "(c) 2015-2018, Elisa contributors"
+#, kde-format
msgid "(c) 2015-2019, Elisa contributors"
-msgstr "(c) 2015-2018, Elisa-Mitwirkende"
+msgstr "(c) 2015-2019, Elisa-Mitwirkende"
#: main.cpp:120
#, kde-format
@@ -105,154 +104,118 @@
msgstr "Verschiedene Verbesserungen an der Bedienungsoberfläche"
#: models/trackmetadatamodel.cpp:64
-#, fuzzy, kde-format
-#| msgctxt "Track title for track metadata view"
-#| msgid "Title:"
+#, kde-format
msgctxt "Track title for track metadata view"
msgid "Title"
-msgstr "Titel:"
+msgstr "Titel"
#: models/trackmetadatamodel.cpp:67
-#, fuzzy, kde-format
-#| msgctxt "Duration label for track metadata view"
-#| msgid "Duration:"
+#, kde-format
msgctxt "Duration label for track metadata view"
msgid "Duration"
-msgstr "Dauer:"
+msgstr "Dauer"
#: models/trackmetadatamodel.cpp:70
-#, fuzzy, kde-format
-#| msgctxt "Track artist for track metadata view"
-#| msgid "Artist:"
+#, kde-format
msgctxt "Track artist for track metadata view"
msgid "Artist"
-msgstr "Interpret:"
+msgstr "Interpret"
#: models/trackmetadatamodel.cpp:73
-#, fuzzy, kde-format
-#| msgctxt "Album name for track metadata view"
-#| msgid "Album:"
+#, kde-format
msgctxt "Album name for track metadata view"
msgid "Album"
-msgstr "Album:"
+msgstr "Album"
#: models/trackmetadatamodel.cpp:76
-#, fuzzy, kde-format
-#| msgctxt "Album artist for track metadata view"
-#| msgid "Album Artist:"
+#, kde-format
msgctxt "Album artist for track metadata view"
msgid "Album Artist"
-msgstr "Interpret des Albums:"
+msgstr "Interpret des Albums"
#: models/trackmetadatamodel.cpp:79
-#, fuzzy, kde-format
-#| msgctxt "Track number for track metadata view"
-#| msgid "Track Number:"
+#, kde-format
msgctxt "Track number for track metadata view"
msgid "Track Number"
-msgstr "Nummer des Stücks:"
+msgstr "Nummer des Stücks"
#: models/trackmetadatamodel.cpp:82
-#, fuzzy, kde-format
-#| msgctxt "Disc number for track metadata view"
-#| msgid "Disc Number:"
+#, kde-format
msgctxt "Disc number for track metadata view"
msgid "Disc Number"
-msgstr "CD-Nummer:"
+msgstr "CD-Nummer"
#: models/trackmetadatamodel.cpp:85
-#, fuzzy, kde-format
-#| msgctxt "Rating label for information panel"
-#| msgid "Rating:"
+#, kde-format
msgctxt "Rating label for information panel"
msgid "Rating"
-msgstr "Bewertung:"
+msgstr "Bewertung"
#: models/trackmetadatamodel.cpp:88
-#, fuzzy, kde-format
-#| msgctxt "Genre label for track metadata view"
-#| msgid "Genre:"
+#, kde-format
msgctxt "Genre label for track metadata view"
msgid "Genre"
-msgstr "Genre:"
+msgstr "Genre"
#: models/trackmetadatamodel.cpp:91
-#, fuzzy, kde-format
-#| msgctxt "Lyricist label for track metadata view"
-#| msgid "Lyricist:"
+#, kde-format
msgctxt "Lyricist label for track metadata view"
msgid "Lyricist"
-msgstr "Texter:"
+msgstr "Texter"
#: models/trackmetadatamodel.cpp:94
-#, fuzzy, kde-format
-#| msgctxt "Composer name for track metadata view"
-#| msgid "Composer:"
+#, kde-format
msgctxt "Composer name for track metadata view"
msgid "Composer"
-msgstr "Komponist:"
+msgstr "Komponist"
#: models/trackmetadatamodel.cpp:97
-#, fuzzy, kde-format
-#| msgctxt "Comment label for track metadata view"
-#| msgid "Comment:"
+#, kde-format
msgctxt "Comment label for track metadata view"
msgid "Comment"
-msgstr "Kommentar:"
+msgstr "Kommentar"
#: models/trackmetadatamodel.cpp:100
-#, fuzzy, kde-format
-#| msgctxt "Year label for track metadata view"
-#| msgid "Year:"
+#, kde-format
msgctxt "Year label for track metadata view"
msgid "Year"
-msgstr "Jahr:"
+msgstr "Jahr"
#: models/trackmetadatamodel.cpp:103
-#, fuzzy, kde-format
-#| msgctxt "Channels label for track metadata view"
-#| msgid "Channels:"
+#, kde-format
msgctxt "Channels label for track metadata view"
msgid "Channels"
-msgstr "Kanäle:"
+msgstr "Kanäle"
#: models/trackmetadatamodel.cpp:106
-#, fuzzy, kde-format
-#| msgctxt "Bit rate label for track metadata view"
-#| msgid "Bit Rate:"
+#, kde-format
msgctxt "Bit rate label for track metadata view"
msgid "Bit Rate"
-msgstr "Bitrate:"
+msgstr "Bitrate"
#: models/trackmetadatamodel.cpp:109
-#, fuzzy, kde-format
-#| msgctxt "Sample Rate label for track metadata view"
-#| msgid "Sample Rate:"
+#, kde-format
msgctxt "Sample Rate label for track metadata view"
msgid "Sample Rate"
-msgstr "Abtastrate:"
+msgstr "Abtastrate"
#: models/trackmetadatamodel.cpp:112
#, kde-format
msgctxt "Last play date label for track metadata view"
msgid "Last played"
-msgstr ""
+msgstr "Letzte Wiedergabe"
#: models/trackmetadatamodel.cpp:115
-#, fuzzy, kde-format
-#| msgctxt "Play now current track from play list"
-#| msgid "Play Now"
+#, kde-format
msgctxt "Play counter label for track metadata view"
msgid "Play count"
-msgstr "Jetzt abspielen"
+msgstr "Wiedergabezähler"
#: models/trackmetadatamodel.cpp:118 qml/ContextViewLyrics.qml:32
-#, fuzzy, kde-format
-#| msgctxt "Lyricist label for track metadata view"
-#| msgid "Lyricist:"
+#, kde-format
msgctxt "Lyrics label for track metadata view"
msgid "Lyrics"
-msgstr "Texter:"
+msgstr "Liedtext"
#: models/viewsmodel.cpp:44
#, kde-format
@@ -261,18 +224,16 @@
msgstr "Wiedergabe"
#: models/viewsmodel.cpp:45
-#, fuzzy, kde-format
-#| msgctxt "Clear playlist and play"
-#| msgid "Replace and Play"
+#, kde-format
msgctxt "Title of the view of recently played tracks"
msgid "Recently Played"
-msgstr "Ersetzen und abspielen"
+msgstr "Vor kurzem gespielt"
#: models/viewsmodel.cpp:46
#, kde-format
msgctxt "Title of the view of frequently played tracks"
msgid "Frequently Played"
-msgstr ""
+msgstr "Oft gespielt"
#: models/viewsmodel.cpp:51 qml/FileBrowserView.qml:70
#, kde-format
@@ -284,7 +245,7 @@
#, kde-format
msgctxt "explanation for sleep inhibit during play of music"
msgid "Playing Music"
-msgstr ""
+msgstr "Musik-Wiedergabe"
#: qml/ApplicationMenu.qml:26 qml/MediaPlayerControl.qml:62
#, kde-format
@@ -296,7 +257,7 @@
#, kde-format
msgctxt "Refresh Music Collection application menu entry"
msgid "Refresh Music Collection"
-msgstr ""
+msgstr "Musik-Sammlung neu einlesen"
#: qml/ApplicationMenu.qml:63
#, kde-format
@@ -311,9 +272,7 @@
msgstr "Wiedergabeliste anzeigen"
#: qml/ContextView.qml:55
-#, fuzzy, kde-format
-#| msgctxt "Title of the view of the playlist"
-#| msgid "Now Playing"
+#, kde-format
msgctxt "Title of the context view related to the currently playing track"
msgid "Now Playing"
msgstr "Wiedergabe"
@@ -352,12 +311,10 @@
msgstr "Jetzt abspielen und Wiedergabeliste ersetzen"
#: qml/GridBrowserDelegate.qml:162
-#, fuzzy, kde-format
-#| msgctxt "Hide playlist"
-#| msgid "Hide Playlist"
+#, kde-format
msgctxt "Add whole container to play list"
msgid "Add to playlist"
-msgstr "Wiedergabeliste ausblenden"
+msgstr "Zur Wiedergabeliste hinzufügen"
#: qml/HeaderBar.qml:335
#, kde-format
@@ -461,9 +418,7 @@
msgstr "Wiedergabeliste"
#: qml/MediaPlayListView.qml:131
-#, fuzzy, kde-format
-#| msgid "1 track"
-#| msgid_plural "%1 track"
+#, kde-format
msgid "1 track"
msgid_plural "%1 tracks"
msgstr[0] "1 Stück"
@@ -484,18 +439,16 @@
msgstr ""
#: qml/MediaPlayListView.qml:273
-#, fuzzy, kde-format
-#| msgctxt "Title of the view of the playlist"
-#| msgid "Playlist"
+#, kde-format
msgctxt "Playlist cleared"
msgid "Playlist cleared"
-msgstr "Wiedergabeliste"
+msgstr "Wiedergabeliste geleert"
#: qml/MediaPlayListView.qml:292
#, kde-format
msgctxt "Undo"
msgid "Undo"
-msgstr ""
+msgstr "Zurücknehmen"
#: qml/MediaTrackDelegate.qml:134
#, kde-format
@@ -629,4 +582,4 @@
#, kde-format
msgctxt "message to show when Elisa is scanning music files"
msgid "Scanning music"
-msgstr ""
\ No newline at end of file
+msgstr "Musik wird durchsucht"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/po/it/elisa.po new/elisa-0.4.2/po/it/elisa.po
--- old/elisa-0.4.1/po/it/elisa.po 2019-06-19 22:41:12.000000000 +0200
+++ new/elisa-0.4.2/po/it/elisa.po 2019-06-29 15:03:06.000000000 +0200
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.2\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/po/pl/elisa.po new/elisa-0.4.2/po/pl/elisa.po
--- old/elisa-0.4.1/po/pl/elisa.po 2019-06-19 22:41:18.000000000 +0200
+++ new/elisa-0.4.2/po/pl/elisa.po 2019-06-29 15:03:11.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
"POT-Creation-Date: 2019-06-13 07:41+0200\n"
-"PO-Revision-Date: 2019-05-25 07:50+0200\n"
+"PO-Revision-Date: 2019-06-20 20:56+0200\n"
"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc(a)kde.org>\n"
"Language: pl\n"
@@ -203,15 +203,13 @@
#, kde-format
msgctxt "Last play date label for track metadata view"
msgid "Last played"
-msgstr ""
+msgstr "Ostatnie odtworzenie"
#: models/trackmetadatamodel.cpp:115
-#, fuzzy, kde-format
-#| msgctxt "Play now current track from play list"
-#| msgid "Play Now"
+#, kde-format
msgctxt "Play counter label for track metadata view"
msgid "Play count"
-msgstr "Odtwórz teraz"
+msgstr "Licznik odtworzeń"
#: models/trackmetadatamodel.cpp:118 qml/ContextViewLyrics.qml:32
#, kde-format
@@ -226,18 +224,16 @@
msgstr "Teraz odtwarzany"
#: models/viewsmodel.cpp:45
-#, fuzzy, kde-format
-#| msgctxt "Clear playlist and play"
-#| msgid "Replace and Play"
+#, kde-format
msgctxt "Title of the view of recently played tracks"
msgid "Recently Played"
-msgstr "Zastąp i odtwarzaj"
+msgstr "Ostatnio odtwarzane"
#: models/viewsmodel.cpp:46
#, kde-format
msgctxt "Title of the view of frequently played tracks"
msgid "Frequently Played"
-msgstr ""
+msgstr "Najczęściej odtwarzane"
#: models/viewsmodel.cpp:51 qml/FileBrowserView.qml:70
#, kde-format
@@ -261,7 +257,7 @@
#, kde-format
msgctxt "Refresh Music Collection application menu entry"
msgid "Refresh Music Collection"
-msgstr ""
+msgstr "Odśwież zbiór muzyki"
#: qml/ApplicationMenu.qml:63
#, kde-format
@@ -327,50 +323,46 @@
msgstr[2] "jeszcze %1 utworów"
#: qml/MediaPlayerControl.qml:69
-#, fuzzy, kde-format
-#| msgid "Repeat"
+#, kde-format
msgctxt "toggle repeat mode for playlist"
msgid "Toggle Repeat"
-msgstr "Powtórz"
+msgstr "Włącz/wyłącz powtarzanie"
#: qml/MediaPlayerControl.qml:76
-#, fuzzy, kde-format
-#| msgid "Shuffle"
+#, kde-format
msgctxt "toggle shuffle mode for playlist"
msgid "Toggle Shuffle"
-msgstr "Kolejność losowa"
+msgstr "Przełącz losową kolejność"
#: qml/MediaPlayerControl.qml:83
-#, fuzzy, kde-format
-#| msgctxt "Toggle between ascending and descending order"
-#| msgid "Toggle sort order"
+#, kde-format
msgctxt "toggle mute mode for player"
msgid "Toggle Mute"
-msgstr "Przełącz porządek szeregowania"
+msgstr "Przełącz wyciszenie"
#: qml/MediaPlayerControl.qml:90
#, kde-format
msgctxt "toggle play and pause for the audio player"
msgid "Toggle Play and Pause"
-msgstr ""
+msgstr "Odtwarzaj/Wstrzymaj"
#: qml/MediaPlayerControl.qml:98
#, kde-format
msgctxt "skip backward in playlists"
msgid "Skip Backward"
-msgstr ""
+msgstr "Przejdź wstecz"
#: qml/MediaPlayerControl.qml:106
#, kde-format
msgctxt "skip forward in playlists"
msgid "Skip Forward"
-msgstr ""
+msgstr "Przejdź naprzód"
#: qml/MediaPlayerControl.qml:114
#, kde-format
msgctxt "toggle between maximized and minimized ivre"
msgid "Toggle Maximize"
-msgstr ""
+msgstr "Przełącz maksymalizację"
#: qml/MediaPlayerControl.qml:189
#, kde-format
@@ -432,7 +424,7 @@
#, kde-format
msgctxt "Your playlist is empty"
msgid "Your playlist is empty"
-msgstr ""
+msgstr "Twoja lista odtwarzania jest pusta"
#: qml/MediaPlayListView.qml:222
#, kde-format
@@ -441,6 +433,8 @@
"Add some songs to get started. You can browse your music using the views on "
"the left."
msgstr ""
+"Dodaj jakieś utwory, aby zacząć. Swoją muzykę możesz przeglądać w widokach "
+"po lewej."
#: qml/MediaPlayListView.qml:273
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/databaseinterface.cpp new/elisa-0.4.2/src/databaseinterface.cpp
--- old/elisa-0.4.1/src/databaseinterface.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/databaseinterface.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -702,8 +702,8 @@
return result;
}
-qulonglong DatabaseInterface::trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const QString &album,
- int trackNumber, int discNumber)
+qulonglong DatabaseInterface::trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const std::optional<QString> &album,
+ std::optional<int> trackNumber, std::optional<int> discNumber)
{
auto result = qulonglong(0);
@@ -3070,6 +3070,20 @@
"GROUP_CONCAT(tracks.`ArtistName`, ', ') as AllArtists, "
"MAX(tracks.`Rating`) as HighestRating, "
"GROUP_CONCAT(genres.`Name`, ', ') as AllGenres, "
+ "("
+ "SELECT "
+ "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
+ "FROM "
+ "`Tracks` tracks2 "
+ "WHERE "
+ "tracks2.`AlbumTitle` = album.`Title` AND "
+ "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
+ "(tracks2.`AlbumArtistName` IS NULL AND "
+ "album.`ArtistName` IS NULL"
+ ")"
+ ") AND "
+ "tracks2.`AlbumPath` = album.`AlbumPath` "
+ ") as `IsSingleDiscAlbum`, "
"( "
"SELECT tracksCover.`FileName` "
"FROM "
@@ -3131,6 +3145,20 @@
"GROUP_CONCAT(tracks.`ArtistName`, ', ') as AllArtists, "
"MAX(tracks.`Rating`) as HighestRating, "
"GROUP_CONCAT(genres.`Name`, ', ') as AllGenres, "
+ "("
+ "SELECT "
+ "COUNT(DISTINCT tracks2.DiscNumber) <= 1 "
+ "FROM "
+ "`Tracks` tracks2 "
+ "WHERE "
+ "tracks2.`AlbumTitle` = album.`Title` AND "
+ "(tracks2.`AlbumArtistName` = album.`ArtistName` OR "
+ "(tracks2.`AlbumArtistName` IS NULL AND "
+ "album.`ArtistName` IS NULL"
+ ")"
+ ") AND "
+ "tracks2.`AlbumPath` = album.`AlbumPath` "
+ ") as `IsSingleDiscAlbum`, "
"( "
"SELECT tracksCover.`FileName` "
"FROM "
@@ -4770,9 +4798,9 @@
"`Tracks` tracks "
"WHERE "
"tracks.`Title` = :title AND "
- "tracks.`AlbumTitle` = :album AND "
- "tracks.`TrackNumber` = :trackNumber AND "
- "tracks.`DiscNumber` = :discNumber AND "
+ "(tracks.`AlbumTitle` = :album OR (:album IS NULL AND tracks.`AlbumTitle` IS NULL)) AND "
+ "(tracks.`TrackNumber` = :trackNumber OR (:trackNumber IS NULL AND tracks.`TrackNumber` IS NULL)) AND "
+ "(tracks.`DiscNumber` = :discNumber OR (:discNumber IS NULL AND tracks.`DiscNumber` IS NULL)) AND "
"tracks.`ArtistName` = :artist");
auto result = prepareQuery(d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery, selectTrackQueryText);
@@ -5632,9 +5660,13 @@
d->mInsertTrackQuery.bindValue(QStringLiteral(":albumPath"), trackPath);
if (oneTrack.trackNumberIsValid()) {
d->mInsertTrackQuery.bindValue(QStringLiteral(":trackNumber"), oneTrack.trackNumber());
+ } else {
+ d->mInsertTrackQuery.bindValue(QStringLiteral(":trackNumber"), {});
}
if (oneTrack.discNumberIsValid()) {
d->mInsertTrackQuery.bindValue(QStringLiteral(":discNumber"), oneTrack.discNumber());
+ } else {
+ d->mInsertTrackQuery.bindValue(QStringLiteral(":discNumber"), {});
}
d->mInsertTrackQuery.bindValue(QStringLiteral(":trackDuration"), QVariant::fromValue<qlonglong>(oneTrack.duration().msecsSinceStartOfDay()));
d->mInsertTrackQuery.bindValue(QStringLiteral(":trackRating"), oneTrack.rating());
@@ -5657,12 +5689,18 @@
d->mInsertTrackQuery.bindValue(QStringLiteral(":year"), oneTrack.year());
if (oneTrack.channelsIsValid()) {
d->mInsertTrackQuery.bindValue(QStringLiteral(":channels"), oneTrack.channels());
+ } else {
+ d->mInsertTrackQuery.bindValue(QStringLiteral(":channels"), {});
}
if (oneTrack.bitRateIsValid()) {
d->mInsertTrackQuery.bindValue(QStringLiteral(":bitRate"), oneTrack.bitRate());
+ } else {
+ d->mInsertTrackQuery.bindValue(QStringLiteral(":bitRate"), {});
}
if (oneTrack.sampleRateIsValid()) {
d->mInsertTrackQuery.bindValue(QStringLiteral(":sampleRate"), oneTrack.sampleRate());
+ } else {
+ d->mInsertTrackQuery.bindValue(QStringLiteral(":sampleRate"), {});
}
d->mInsertTrackQuery.bindValue(QStringLiteral(":hasEmbeddedCover"), oneTrack.hasEmbeddedCover());
@@ -6455,8 +6493,8 @@
return result;
}
-qulonglong DatabaseInterface::internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const QString &album,
- int trackNumber, int discNumber)
+qulonglong DatabaseInterface::internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const std::optional<QString> &album,
+ std::optional<int> trackNumber, std::optional<int> discNumber)
{
auto result = qulonglong(0);
@@ -6466,9 +6504,21 @@
d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":title"), title);
d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":artist"), artist);
- d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":album"), album);
- d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":trackNumber"), trackNumber);
- d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":discNumber"), discNumber);
+ if (album.has_value()) {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":album"), album.value());
+ } else {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":album"), {});
+ }
+ if (trackNumber.has_value()) {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":trackNumber"), trackNumber.value());
+ } else {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":trackNumber"), {});
+ }
+ if (discNumber.has_value()) {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":discNumber"), discNumber.value());
+ } else {
+ d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery.bindValue(QStringLiteral(":discNumber"), {});
+ }
auto queryResult = execQuery(d->mSelectTrackIdFromTitleArtistAlbumTrackDiscNumberQuery);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/databaseinterface.h new/elisa-0.4.2/src/databaseinterface.h
--- old/elisa-0.4.1/src/databaseinterface.h 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/databaseinterface.h 2019-06-29 15:02:46.000000000 +0200
@@ -33,6 +33,7 @@
#include <QPair>
#include <memory>
+#include <optional>
class DatabaseInterfacePrivate;
class QMutex;
@@ -127,6 +128,11 @@
return operator[](key_type::AlbumIdRole).toULongLong();
}
+ bool hasAlbum() const
+ {
+ return find(key_type::AlbumRole) != end();
+ }
+
QString album() const
{
return operator[](key_type::AlbumRole).toString();
@@ -137,11 +143,21 @@
return operator[](key_type::AlbumArtistRole).toString();
}
+ bool hasTrackNumber() const
+ {
+ return find(key_type::TrackNumberRole) != end();
+ }
+
int trackNumber() const
{
return operator[](key_type::TrackNumberRole).toInt();
}
+ bool hasDiscNumber() const
+ {
+ return find(key_type::DiscNumberRole) != end();
+ }
+
int discNumber() const
{
return operator[](key_type::DiscNumberRole).toInt();
@@ -367,8 +383,8 @@
TrackDataType trackDataFromDatabaseId(qulonglong id);
- qulonglong trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const QString &album,
- int trackNumber, int discNumber);
+ qulonglong trackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &artist, const std::optional<QString> &album,
+ std::optional<int> trackNumber, std::optional<int> discNumber);
qulonglong trackIdFromFileName(const QUrl &fileName);
@@ -447,8 +463,8 @@
MusicAudioTrack internalTrackFromDatabaseId(qulonglong id);
- qulonglong internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const QString &album,
- int trackNumber, int discNumber);
+ qulonglong internalTrackIdFromTitleAlbumTracDiscNumber(const QString &title, const QString &artist, const std::optional<QString> &album,
+ std::optional<int> trackNumber, std::optional<int> discNumber);
qulonglong getDuplicateTrackIdFromTitleAlbumTrackDiscNumber(const QString &title, const QString &trackArtist, const QString &album,
const QString &albumArtist, const QString &trackPath, int trackNumber,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/manageaudioplayer.cpp new/elisa-0.4.2/src/manageaudioplayer.cpp
--- old/elisa-0.4.1/src/manageaudioplayer.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/manageaudioplayer.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -557,8 +557,9 @@
return;
}
- if (*itTitle != mCurrentTrack.data(mTitleRole) || *itArtistName != mCurrentTrack.data(mArtistNameRole) ||
- *itAlbumName != mCurrentTrack.data(mAlbumNameRole)) {
+ if (*itTitle != mCurrentTrack.data(mTitleRole) ||
+ (itArtistName->isValid() && *itArtistName != mCurrentTrack.data(mArtistNameRole)) ||
+ (itAlbumName->isValid() && *itAlbumName != mCurrentTrack.data(mAlbumNameRole))) {
if (mCurrentTrack.isValid() && mCurrentTrack.data(mTitleRole).isValid() && mCurrentTrack.data(mArtistNameRole).isValid() &&
mCurrentTrack.data(mAlbumNameRole).isValid()) {
mPersistentState.clear();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/mediaplaylist.cpp new/elisa-0.4.2/src/mediaplaylist.cpp
--- old/elisa-0.4.1/src/mediaplaylist.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/mediaplaylist.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -146,7 +146,14 @@
d->mTrackData[index.row()][TrackDataType::key_type::ImageUrlRole].toUrl().toString()}}.toJson();
break;
default:
- result = d->mTrackData[index.row()][static_cast<TrackDataType::key_type>(role)];
+ const auto &trackData = d->mTrackData[index.row()];
+ auto roleEnum = static_cast<TrackDataType::key_type>(role);
+ auto itData = trackData.find(roleEnum);
+ if (itData != trackData.end()) {
+ result = itData.value();
+ } else {
+ result = {};
+ }
}
} else {
switch(role)
@@ -338,11 +345,11 @@
Q_EMIT newEntryInList(0, entryString, ElisaUtils::FileName);
}
} else {
- Q_EMIT newTrackByNameInList(newEntry.mTitle.toString(),
- newEntry.mArtist.toString(),
- newEntry.mAlbum.toString(),
- newEntry.mTrackNumber.toInt(),
- newEntry.mDiscNumber.toInt());
+ Q_EMIT newTrackByNameInList(newEntry.mTitle,
+ newEntry.mArtist,
+ newEntry.mAlbum,
+ newEntry.mTrackNumber,
+ newEntry.mDiscNumber);
}
} else {
Q_EMIT newEntryInList(newEntry.mId, {}, ElisaUtils::Track);
@@ -710,9 +717,21 @@
oneData.push_back(oneTrack.title());
oneData.push_back(oneTrack.artist());
- oneData.push_back(oneTrack.album());
- oneData.push_back(QString::number(oneTrack.trackNumber()));
- oneData.push_back(QString::number(oneTrack.discNumber()));
+ if (oneTrack.hasAlbum()) {
+ oneData.push_back(oneTrack.album());
+ } else {
+ oneData.push_back({});
+ }
+ if (oneTrack.hasTrackNumber()) {
+ oneData.push_back(QString::number(oneTrack.trackNumber()));
+ } else {
+ oneData.push_back({});
+ }
+ if (oneTrack.hasDiscNumber()) {
+ oneData.push_back(QString::number(oneTrack.discNumber()));
+ } else {
+ oneData.push_back({});
+ }
oneData.push_back(QString::number(oneEntry.mEntryType));
result.push_back(QVariant(oneData));
@@ -778,10 +797,10 @@
auto restoredTitle = trackData[0];
auto restoredArtist = trackData[1];
auto restoredAlbum = trackData[2];
- auto restoredTrackNumber = trackData[3].toInt();
- auto restoredDiscNumber = trackData[4].toInt();
+ auto restoredTrackNumber = trackData[3];
+ auto restoredDiscNumber = trackData[4];
- ElisaUtils::PlayListEntryType mEntryType = static_cast<ElisaUtils::PlayListEntryType>(trackData[5].toInt());
+ auto mEntryType = static_cast<ElisaUtils::PlayListEntryType>(trackData[5].toInt());
enqueueRestoredEntry({restoredTitle, restoredArtist, restoredAlbum, restoredTrackNumber, restoredDiscNumber, mEntryType});
}
@@ -893,19 +912,23 @@
}
continue;
} else if (oneEntry.mEntryType != ElisaUtils::Artist && !oneEntry.mIsValid && !oneEntry.mTrackUrl.isValid()) {
- if (track.title() != oneEntry.mTitle) {
+ if (track.find(TrackDataType::key_type::TitleRole) != track.end() &&
+ track.title() != oneEntry.mTitle) {
continue;
}
- if (track.album() != oneEntry.mAlbum) {
+ if (track.find(TrackDataType::key_type::AlbumRole) != track.end() &&
+ track.album() != oneEntry.mAlbum) {
continue;
}
- if (track.trackNumber() != oneEntry.mTrackNumber) {
+ if (track.find(TrackDataType::key_type::TrackNumberRole) != track.end() &&
+ track.trackNumber() != oneEntry.mTrackNumber) {
continue;
}
- if (track.discNumber() != oneEntry.mDiscNumber) {
+ if (track.find(TrackDataType::key_type::DiscNumberRole) != track.end() &&
+ track.discNumber() != oneEntry.mDiscNumber) {
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/mediaplaylist.h new/elisa-0.4.2/src/mediaplaylist.h
--- old/elisa-0.4.1/src/mediaplaylist.h 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/mediaplaylist.h 2019-06-29 15:02:46.000000000 +0200
@@ -175,7 +175,7 @@
void hideUndoInline();
- void newTrackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber);
+ void newTrackByNameInList(const QVariant &title, const QVariant &artist, const QVariant &album, const QVariant &trackNumber, const QVariant &discNumber);
void newEntryInList(qulonglong newDatabaseId,
const QString &entryTitle,
@@ -319,6 +319,12 @@
mTrackNumber(trackNumber), mDiscNumber(discNumber), mEntryType(entryType) {
}
+ MediaPlayListEntry(QVariant title, QVariant artist, QVariant album, QVariant trackNumber,
+ QVariant discNumber, ElisaUtils::PlayListEntryType entryType = ElisaUtils::Unknown)
+ : mTitle(std::move(title)), mAlbum(std::move(album)), mArtist(std::move(artist)),
+ mTrackNumber(std::move(trackNumber)), mDiscNumber(std::move(discNumber)), mEntryType(entryType) {
+ }
+
explicit MediaPlayListEntry(const MusicAudioTrack &track)
: mTitle(track.title()), mAlbum(track.albumName()), mTrackNumber(track.trackNumber()),
mDiscNumber(track.discNumber()), mId(track.databaseId()), mIsValid(true) {
@@ -353,9 +359,9 @@
QVariant mTrackUrl;
- QVariant mTrackNumber = -1;
+ QVariant mTrackNumber;
- QVariant mDiscNumber = -1;
+ QVariant mDiscNumber;
qulonglong mId = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/qml/ViewSelector.qml new/elisa-0.4.2/src/qml/ViewSelector.qml
--- old/elisa-0.4.1/src/qml/ViewSelector.qml 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/qml/ViewSelector.qml 2019-06-29 15:02:46.000000000 +0200
@@ -40,19 +40,6 @@
implicitWidth: elisaTheme.dp(225)
- Rectangle {
- anchors.fill: parent
- z: 1
-
- border.color: myPalette.base
-
- Behavior on border.color {
- ColorAnimation {
- duration: 300
- }
- }
- }
-
ScrollView {
focus: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/trackslistener.cpp new/elisa-0.4.2/src/trackslistener.cpp
--- old/elisa-0.4.1/src/trackslistener.cpp 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/trackslistener.cpp 2019-06-29 15:02:46.000000000 +0200
@@ -66,17 +66,17 @@
}
for (auto itTrack = d->mTracksByNameSet.begin(); itTrack != d->mTracksByNameSet.end(); ) {
- if (std::get<0>(*itTrack) != oneTrack.title()) {
+ if (!std::get<0>(*itTrack).isEmpty() && std::get<0>(*itTrack) != oneTrack.title()) {
++itTrack;
continue;
}
- if (std::get<1>(*itTrack) != oneTrack.artist()) {
+ if (!std::get<1>(*itTrack).isEmpty() && std::get<1>(*itTrack) != oneTrack.artist()) {
++itTrack;
continue;
}
- if (std::get<2>(*itTrack) != oneTrack.album()) {
+ if (!std::get<2>(*itTrack).isEmpty() && std::get<2>(*itTrack) != oneTrack.album()) {
++itTrack;
continue;
}
@@ -113,11 +113,33 @@
}
}
-void TracksListener::trackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber)
+void TracksListener::trackByNameInList(const QVariant &title, const QVariant &artist, const QVariant &album,
+ const QVariant &trackNumber, const QVariant &discNumber)
{
- auto newTrackId = d->mDatabase->trackIdFromTitleAlbumTrackDiscNumber(title, artist, album, trackNumber, discNumber);
+ const auto realTitle = title.toString();
+ const auto realArtist = artist.toString();
+ const auto albumIsValid = !album.isNull() && album.isValid() && !album.toString().isEmpty();
+ auto realAlbum = std::optional<QString>{};
+ if (albumIsValid) {
+ realAlbum = album.toString();
+ }
+ auto trackNumberIsValid = bool{};
+ const auto trackNumberValue = trackNumber.toInt(&trackNumberIsValid);
+ auto realTrackNumber = std::optional<int>{};
+ if (trackNumberIsValid) {
+ realTrackNumber = trackNumberValue;
+ }
+ auto discNumberIsValid = bool{};
+ const auto discNumberValue = discNumber.toInt(&discNumberIsValid);
+ auto realDiscNumber = std::optional<int>{};
+ if (discNumberIsValid) {
+ realDiscNumber = discNumberValue;
+ }
+
+ auto newTrackId = d->mDatabase->trackIdFromTitleAlbumTrackDiscNumber(realTitle, realArtist, realAlbum,
+ realTrackNumber, realDiscNumber);
if (newTrackId == 0) {
- auto newTrack = std::tuple<QString, QString, QString, int, int>(title, artist, album, trackNumber, discNumber);
+ auto newTrack = std::tuple<QString, QString, QString, int, int>(realTitle, realArtist, album.toString(), trackNumber.toInt(), discNumber.toInt());
d->mTracksByNameSet.push_back(newTrack);
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/elisa-0.4.1/src/trackslistener.h new/elisa-0.4.2/src/trackslistener.h
--- old/elisa-0.4.1/src/trackslistener.h 2019-06-19 22:40:52.000000000 +0200
+++ new/elisa-0.4.2/src/trackslistener.h 2019-06-29 15:02:46.000000000 +0200
@@ -63,7 +63,7 @@
void trackModified(const TracksListener::TrackDataType &modifiedTrack);
- void trackByNameInList(const QString &title, const QString &artist, const QString &album, int trackNumber, int discNumber);
+ void trackByNameInList(const QVariant &title, const QVariant &artist, const QVariant &album, const QVariant &trackNumber, const QVariant &discNumber);
void newEntryInList(qulonglong newDatabaseId,
const QString &entryTitle,
1
0
Hello community,
here is the log from the commit of package libfilezilla for openSUSE:Factory checked in at 2019-07-03 15:15:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libfilezilla (Old)
and /work/SRC/openSUSE:Factory/.libfilezilla.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfilezilla"
Wed Jul 3 15:15:02 2019 rev:25 rq:713092 version:0.17.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libfilezilla/libfilezilla.changes 2019-05-21 10:37:32.291198002 +0200
+++ /work/SRC/openSUSE:Factory/.libfilezilla.new.4615/libfilezilla.changes 2019-07-03 15:15:04.674973457 +0200
@@ -1,0 +2,26 @@
+Sat Jun 29 08:16:28 UTC 2019 - ecsos(a)opensuse.org
+
+- Update to 0.17.1
+ * New features:
+ - Added support for detached signatures
+ * Bugfixes and minor changes:
+ - Fixed crash if using the system trust store
+
+- Changes from 0.17.0
+ * New features:
+ - libfilezilla now requires C++17
+ - Changed a lot of functions to use std::string_view
+ - Added fz::socket_layer as base class for layers on top of
+ sockets
+ - Added fz::tls_layer, a Transport Layer Security layer,
+ requiring GnuTLS 3.5.7 or later
+ - Added fz::translate for gettext-style translatable strings.
+ GNU Gettext is now a built-time (but not runtime) dependency
+ - Added fz::bitscan and fz::bitscan_reverse to get the index of
+ least and most significant bit set
+ - Added fz::logger_interface as a base for logging system
+ * Bugfixes and minor changes:
+ - *nix: Small speed-up of fz::local_filesys through the use of
+ fstatat()
+
+-------------------------------------------------------------------
Old:
----
libfilezilla-0.16.0.tar.bz2
New:
----
libfilezilla-0.17.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfilezilla.spec ++++++
--- /var/tmp/diff_new_pack.AwpRYV/_old 2019-07-03 15:15:06.010976175 +0200
+++ /var/tmp/diff_new_pack.AwpRYV/_new 2019-07-03 15:15:06.022976200 +0200
@@ -20,7 +20,7 @@
%define libname %{name}%{major}
%define develname %{name}-devel
Name: libfilezilla
-Version: 0.16.0
+Version: 0.17.1
Release: 0
Summary: C++ library for filezilla
License: GPL-2.0-or-later
@@ -37,6 +37,7 @@
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(cppunit)
+BuildRequires: pkgconfig(gnutls) >= 3.5.7
BuildRequires: pkgconfig(nettle) >= 3.1
%description
@@ -83,18 +84,18 @@
%install
%make_install
-
# we don't want this
find %{buildroot} -type f -name "*.la" -delete -print
mkdir -p %{buildroot}%{_docdir}/%{develname}
cp -r doc/doxygen-doc/* %{buildroot}%{_docdir}/%{develname}/
rm -f %{buildroot}%{_docdir}/%{develname}/latex/refman.tex
%fdupes -s %{buildroot}%{_docdir}/%{develname}
+%find_lang %name
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
-%files -n %{libname}
+%files -n %{libname} -f %{name}.lang
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%{_libdir}/%{name}.so.%{major}*
++++++ libfilezilla-0.16.0.tar.bz2 -> libfilezilla-0.17.1.tar.bz2 ++++++
++++ 25477 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package python-pytest-html for openSUSE:Factory checked in at 2019-07-03 15:15:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-html (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-html.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-html"
Wed Jul 3 15:15:00 2019 rev:3 rq:713053 version:1.21.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-html/python-pytest-html.changes 2019-02-27 15:10:06.418374496 +0100
+++ /work/SRC/openSUSE:Factory/.python-pytest-html.new.4615/python-pytest-html.changes 2019-07-03 15:15:02.258968542 +0200
@@ -1,0 +2,9 @@
+Tue Jul 2 12:29:33 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 1.21.1:
+ * Fix issue with assets filenames being too long.
+ * Allow opening generated html report in browser (@ssbarnea)
+ * Handle when report title is stored as an environment variable (@BeyondEvil)
+ * Change assets naming method (@SunInJuly)
+
+-------------------------------------------------------------------
Old:
----
pytest-html-1.20.0.tar.gz
New:
----
pytest-html-1.21.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-html.spec ++++++
--- /var/tmp/diff_new_pack.L9fMYR/_old 2019-07-03 15:15:03.290970641 +0200
+++ /var/tmp/diff_new_pack.L9fMYR/_new 2019-07-03 15:15:03.302970665 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pytest-html
-Version: 1.20.0
+Version: 1.21.1
Release: 0
Summary: pytest plugin for generating HTML reports
License: MPL-2.0
++++++ pytest-html-1.20.0.tar.gz -> pytest-html-1.21.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/.gitignore new/pytest-html-1.21.1/.gitignore
--- old/pytest-html-1.20.0/.gitignore 2019-01-14 18:53:41.000000000 +0100
+++ new/pytest-html-1.21.1/.gitignore 2019-06-19 21:40:20.000000000 +0200
@@ -30,3 +30,5 @@
##Tests JS
node_modules/
+
+Pipfile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/CHANGES.rst new/pytest-html-1.21.1/CHANGES.rst
--- old/pytest-html-1.20.0/CHANGES.rst 2019-01-14 18:53:41.000000000 +0100
+++ new/pytest-html-1.21.1/CHANGES.rst 2019-06-19 21:40:20.000000000 +0200
@@ -1,6 +1,20 @@
Release Notes
-------------
+**1.21.1 (2019-06-19)**
+
+* Fix issue with assets filenames being too long.
+
+ * Thanks to `@D3X <https://github.com/D3X>`_ for reporting and providing a fix
+
+**1.21.0 (2019-06-17)**
+
+* Allow opening generated html report in browser (`@ssbarnea <https://github.com/ssbarnea>`_)
+
+* Handle when report title is stored as an environment variable (`@BeyondEvil <https://github.com/BeyondEvil>`_)
+
+* Change assets naming method (`@SunInJuly <https://github.com/SunInJuly>`_)
+
**1.20.0 (2019-01-14)**
* Tests running with Pytest 4.0 and Python 3.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/PKG-INFO new/pytest-html-1.21.1/PKG-INFO
--- old/pytest-html-1.20.0/PKG-INFO 2019-01-14 18:54:02.000000000 +0100
+++ new/pytest-html-1.21.1/PKG-INFO 2019-06-19 21:40:40.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pytest-html
-Version: 1.20.0
+Version: 1.21.1
Summary: pytest plugin for generating HTML reports
Home-page: https://github.com/pytest-dev/pytest-html
Author: Dave Hunt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/pytest_html/plugin.py new/pytest-html-1.21.1/pytest_html/plugin.py
--- old/pytest-html-1.20.0/pytest_html/plugin.py 2019-01-14 18:53:41.000000000 +0100
+++ new/pytest-html-1.21.1/pytest_html/plugin.py 2019-06-19 21:40:20.000000000 +0200
@@ -145,12 +145,19 @@
def create_asset(self, content, extra_index,
test_index, file_extension, mode='w'):
+
hash_key = ''.join([self.test_id, str(extra_index),
- str(test_index)]).encode('utf-8')
+ str(test_index)])
hash_generator = hashlib.md5()
- hash_generator.update(hash_key)
- asset_file_name = '{0}.{1}'.format(hash_generator.hexdigest(),
- file_extension)
+ hash_generator.update(hash_key.encode('utf-8'))
+ hex_digest = hash_generator.hexdigest()
+ # 255 is the common max filename length on various filesystems,
+ # we subtract hash length, file extension length and 2 more
+ # characters for the underscore and dot
+ max_length = 255 - len(hex_digest) - len(file_extension) - 2
+ asset_file_name = '{0}_{1}.{2}'.format(hash_key[:max_length],
+ hex_digest,
+ file_extension)
asset_path = os.path.join(os.path.dirname(self.logfile),
'assets', asset_file_name)
if not os.path.exists(os.path.dirname(asset_path)):
@@ -430,7 +437,7 @@
body = html.body(
html.script(raw(main_js)),
- html.h1(os.path.basename(session.config.option.htmlpath)),
+ html.h1(os.path.basename(self.logfile)),
html.p('Report generated on {0} at {1} by '.format(
generated.strftime('%d-%b-%Y'),
generated.strftime('%H:%M:%S')),
@@ -519,5 +526,6 @@
self._save_report(report_content)
def pytest_terminal_summary(self, terminalreporter):
- terminalreporter.write_sep('-', 'generated html file: {0}'.format(
- self.logfile))
+ terminalreporter.write_sep(
+ '-',
+ 'generated html file: file://{0}'.format(self.logfile))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/pytest_html.egg-info/PKG-INFO new/pytest-html-1.21.1/pytest_html.egg-info/PKG-INFO
--- old/pytest-html-1.20.0/pytest_html.egg-info/PKG-INFO 2019-01-14 18:54:01.000000000 +0100
+++ new/pytest-html-1.21.1/pytest_html.egg-info/PKG-INFO 2019-06-19 21:40:40.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pytest-html
-Version: 1.20.0
+Version: 1.21.1
Summary: pytest plugin for generating HTML reports
Home-page: https://github.com/pytest-dev/pytest-html
Author: Dave Hunt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-html-1.20.0/testing/test_pytest_html.py new/pytest-html-1.21.1/testing/test_pytest_html.py
--- old/pytest-html-1.20.0/testing/test_pytest_html.py 2019-01-14 18:53:41.000000000 +0100
+++ new/pytest-html-1.21.1/testing/test_pytest_html.py 2019-06-19 21:40:20.000000000 +0200
@@ -21,9 +21,12 @@
def run(testdir, path='report.html', *args):
path = testdir.tmpdir.join(path)
result = testdir.runpytest('--html', path, *args)
+ return result, read_html(path)
+
+
+def read_html(path):
with open(str(path)) as f:
- html = f.read()
- return result, html
+ return f.read()
def assert_results_by_outcome(html, test_outcome, test_outcome_number,
@@ -193,6 +196,25 @@
report_title = "<h1>{0}</h1>".format(report_name)
assert report_title in html
+ def test_report_title_addopts_env_var(self, testdir, monkeypatch):
+ report_location = "REPORT_LOCATION"
+ report_name = "MuhReport"
+ monkeypatch.setenv(report_location, report_name)
+ testdir.makefile(
+ ".ini",
+ pytest="""
+ [pytest]
+ addopts = --html ${0}
+ """.format(
+ report_location
+ ),
+ )
+ testdir.makepyfile('def test_pass(): pass')
+ result = testdir.runpytest()
+ assert result.ret == 0
+ report_title = "<h1>{0}</h1>".format(report_name)
+ assert report_title in read_html(report_name)
+
def test_resources_inline_css(self, testdir):
testdir.makepyfile('def test_pass(): pass')
result, html = run(testdir, 'report.html', '--self-contained-html')
@@ -383,12 +405,12 @@
testdir.makepyfile('def test_pass(): pass')
result, html = run(testdir)
hash_key = ('test_extra_text_separated.py::'
- 'test_pass00').encode('utf-8')
+ 'test_pass00')
hash_generator = hashlib.md5()
- hash_generator.update(hash_key)
+ hash_generator.update(hash_key.encode('utf-8'))
assert result.ret == 0
- src = '{0}/{1}'.format('assets', '{0}.txt'.
- format(hash_generator.hexdigest()))
+ src = '{0}/{1}'.format('assets', '{0}_{1}.txt'.
+ format(hash_key, hash_generator.hexdigest()))
link = ('<a class="text" href="{0}" target="_blank">'.format(src))
assert link in html
assert os.path.exists(src)
@@ -412,13 +434,12 @@
""".format(extra_type, content))
testdir.makepyfile('def test_pass(): pass')
result, html = run(testdir)
- hash_key = ('test_extra_image_separated.py::'
- 'test_pass00').encode('utf-8')
+ hash_key = 'test_extra_image_separated.py::test_pass00'
hash_generator = hashlib.md5()
- hash_generator.update(hash_key)
+ hash_generator.update(hash_key.encode('utf-8'))
assert result.ret == 0
- src = '{0}/{1}'.format('assets', '{0}.{1}'.
- format(hash_generator.hexdigest(),
+ src = '{0}/{1}'.format('assets', '{0}_{1}.{2}'.
+ format(hash_key, hash_generator.hexdigest(),
file_extension))
link = ('<a class="image" href="{0}" target="_blank">'.format(src))
assert link in html
@@ -451,11 +472,12 @@
for i in range(1, 4):
hash_key = ('test_extra_image_separated_rerun.py::'
- 'test_fail0{0}'.format(i)).encode('utf-8')
+ 'test_fail0{0}'.format(i))
hash_generator = hashlib.md5()
- hash_generator.update(hash_key)
- src = 'assets/{0}.{1}'.format(hash_generator.hexdigest(),
- file_extension)
+ hash_generator.update(hash_key.encode('utf-8'))
+ src = 'assets/{0}_{1}.{2}'.format(hash_key,
+ hash_generator.hexdigest(),
+ file_extension)
link = ('<a class="image" href="{0}" target="_blank">'.format(src))
assert result.ret
assert link in html
@@ -481,6 +503,35 @@
assert result.ret == 0
assert '<a href="{0}"><img src="{0}"/>'.format(content) in html
+ def test_very_long_test_name(self, testdir):
+ testdir.makeconftest("""
+ import pytest
+ @pytest.mark.hookwrapper
+ def pytest_runtest_makereport(item, call):
+ outcome = yield
+ report = outcome.get_result()
+ if report.when == 'call':
+ from pytest_html import extras
+ report.extra = [extras.image('image.png')]
+ """)
+ # This will get truncated
+ test_name = 'test_{}'.format('a' * 300)
+ testdir.makepyfile("""
+ def {0}():
+ assert False
+ """.format(test_name))
+ result, html = run(testdir)
+
+ hash_key = 'test_very_long_test_name.py::{}00'.format(test_name)
+ hash_generator = hashlib.md5()
+ hash_generator.update(hash_key.encode('utf-8'))
+ src = 'assets/{0}_{1}.png'.format(hash_key[:218],
+ hash_generator.hexdigest())
+ link = ('<a class="image" href="{0}" target="_blank">'.format(src))
+ assert result.ret
+ assert link in html
+ assert os.path.exists(src)
+
def test_no_environment(self, testdir):
testdir.makeconftest("""
def pytest_configure(config):
1
0
Hello community,
here is the log from the commit of package python-django-model-utils for openSUSE:Factory checked in at 2019-07-03 15:14:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-model-utils (Old)
and /work/SRC/openSUSE:Factory/.python-django-model-utils.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-model-utils"
Wed Jul 3 15:14:58 2019 rev:3 rq:713052 version:3.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-django-model-utils/python-django-model-utils.changes 2019-04-30 13:01:20.982156784 +0200
+++ /work/SRC/openSUSE:Factory/.python-django-model-utils.new.4615/python-django-model-utils.changes 2019-07-03 15:14:59.990963927 +0200
@@ -1,0 +2,24 @@
+Tue Jul 2 12:20:16 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Add patch use-sqlite.patch to use sqlite for testing and not
+ postgresql
+
+-------------------------------------------------------------------
+Tue Jul 2 12:13:32 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 3.2.0:
+ * Catch AttributeError for deferred abstract fields, fixes GH-331.
+ * Update documentation to explain usage of timeframed model manager, fixes GH-118
+ * Honor OneToOneField.parent_link=False.
+ * Fix handling of deferred attributes on Django 1.10+, fixes GH-278
+ * Fix FieldTracker.has_changed() and FieldTracker.previous() to return correct responses for deferred fields.
+ * Add Simplified Chinese translations.
+ * Update AutoLastModifiedField so that at instance creation it will always be set equal to created to make querying easier. Fixes GH-254
+ * Support reversed for all kinds of Choices objects, fixes GH-309
+ * Fix Model instance non picklable GH-330
+ * Fix patched save in FieldTracker
+ * Upgrades test requirements (pytest, pytest-django, pytest-cov) and skips tox test with Python 3.5 and Django (trunk)
+ * Add UUIDModel and UUIDField support.
+- Remove upstream merged fix-deferred.patch
+
+-------------------------------------------------------------------
Old:
----
django-model-utils-3.1.2.tar.gz
fix-deferred.patch
New:
----
django-model-utils-3.2.0.tar.gz
use-sqlite.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-model-utils.spec ++++++
--- /var/tmp/diff_new_pack.aAstrw/_old 2019-07-03 15:15:00.950965880 +0200
+++ /var/tmp/diff_new_pack.aAstrw/_new 2019-07-03 15:15:00.954965888 +0200
@@ -17,16 +17,15 @@
Name: python-django-model-utils
-Version: 3.1.2
+Version: 3.2.0
Release: 0
Summary: Django model mixins and utilities
License: BSD-3-Clause
Group: Development/Languages/Python
URL: http://github.com/carljm/django-model-utils/
-Source: https://github.com/jazzband/django-model-utils/archive/3.1.2.tar.gz#/django…
-# Slightly modified https://github.com/jazzband/django-model-utils/commit/15f9393.patch
-# to patch cleanly against 3.1.2
-Patch0: fix-deferred.patch
+Source: https://github.com/jazzband/django-model-utils/archive/%{version}.tar.gz#/d…
+# PATCH-FIX-SUSE switch to sqlite from pgsql during testing
+Patch0: use-sqlite.patch
BuildRequires: %{python_module Django >= 1.4.2}
BuildRequires: %{python_module freezegun}
BuildRequires: %{python_module pytest-django}
@@ -51,8 +50,8 @@
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check
-export PYTHONPATH=.
-%python_expand django-admin-%{$python_bin_suffix} test --settings=tests.settings
+# skip JoinManagerTest tests as they need proper DB (pgsql/mysql)
+%pytest -k 'not JoinManagerTest'
%files %{python_files}
%license LICENSE.txt
++++++ django-model-utils-3.1.2.tar.gz -> django-model-utils-3.2.0.tar.gz ++++++
++++ 2502 lines of diff (skipped)
++++++ use-sqlite.patch ++++++
Index: django-model-utils-3.2.0/tests/settings.py
===================================================================
--- django-model-utils-3.2.0.orig/tests/settings.py
+++ django-model-utils-3.2.0/tests/settings.py
@@ -5,12 +5,8 @@ INSTALLED_APPS = (
'tests',
)
DATABASES = {
- "default": {
- "ENGINE": "django.db.backends.postgresql_psycopg2",
- "NAME": os.environ.get("DJANGO_DATABASE_NAME_POSTGRES", "modelutils"),
- "USER": os.environ.get("DJANGO_DATABASE_USER_POSTGRES", 'postgres'),
- "PASSWORD": os.environ.get("DJANGO_DATABASE_PASSWORD_POSTGRES", ""),
- "HOST": os.environ.get("DJANGO_DATABASE_HOST_POSTGRES", ""),
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3'
},
}
SECRET_KEY = 'dummy'
1
0
Hello community,
here is the log from the commit of package python-pytest-django for openSUSE:Factory checked in at 2019-07-03 15:14:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pytest-django (Old)
and /work/SRC/openSUSE:Factory/.python-pytest-django.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pytest-django"
Wed Jul 3 15:14:56 2019 rev:6 rq:713051 version:3.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pytest-django/python-pytest-django.changes 2019-06-17 21:35:17.514997845 +0200
+++ /work/SRC/openSUSE:Factory/.python-pytest-django.new.4615/python-pytest-django.changes 2019-07-03 15:14:57.382958620 +0200
@@ -1,0 +2,6 @@
+Tue Jul 2 12:10:47 UTC 2019 - Tomáš Chvátal <tchvatal(a)suse.com>
+
+- Update to 3.5.1:
+ * Fix compatibility with pytest 5.x (#751)
+
+-------------------------------------------------------------------
Old:
----
pytest-django-3.5.0.tar.gz
New:
----
pytest-django-3.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pytest-django.spec ++++++
--- /var/tmp/diff_new_pack.o8z1SH/_old 2019-07-03 15:14:58.910961729 +0200
+++ /var/tmp/diff_new_pack.o8z1SH/_new 2019-07-03 15:14:58.942961794 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-pytest-django
-Version: 3.5.0
+Version: 3.5.1
Release: 0
Summary: A Django plugin for py.test
License: BSD-3-Clause
@@ -29,9 +29,8 @@
BuildRequires: %{python_module pytest >= 3.6}
BuildRequires: %{python_module setuptools_scm >= 1.11.1}
BuildRequires: %{python_module setuptools}
-BuildRequires: fdupes
-# Used for tests
BuildRequires: %{python_module six}
+BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python2-pathlib2
BuildRequires: sqlite3
++++++ pytest-django-3.5.0.tar.gz -> pytest-django-3.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-django-3.5.0/PKG-INFO new/pytest-django-3.5.1/PKG-INFO
--- old/pytest-django-3.5.0/PKG-INFO 2019-06-03 16:24:46.000000000 +0200
+++ new/pytest-django-3.5.1/PKG-INFO 2019-06-29 18:28:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest-django
-Version: 3.5.0
+Version: 3.5.1
Summary: A Django plugin for pytest.
Home-page: https://pytest-django.readthedocs.io/
Author: Andreas Pelme
@@ -95,5 +95,5 @@
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Software Development :: Testing
Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
-Provides-Extra: testing
Provides-Extra: docs
+Provides-Extra: testing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-django-3.5.0/docs/changelog.rst new/pytest-django-3.5.1/docs/changelog.rst
--- old/pytest-django-3.5.0/docs/changelog.rst 2019-06-03 16:24:31.000000000 +0200
+++ new/pytest-django-3.5.1/docs/changelog.rst 2019-06-29 18:28:26.000000000 +0200
@@ -1,6 +1,40 @@
Changelog
=========
+3.5.1 (2019-06-29)
+------------------
+
+Bugfixes
+^^^^^^^^
+
+* Fix compatibility with pytest 5.x (#751)
+
+3.5.0 (2019-06-03)
+------------------
+
+Features
+^^^^^^^^
+
+* Run tests in the same order as Django (#223)
+
+* Use verbosity=0 with disabled migrations (#729, #730)
+
+Bugfixes
+^^^^^^^^
+
+* django_db_setup: warn instead of crash with teardown errors (#726)
+
+Misc
+^^^^
+* tests: fix test_sqlite_database_renamed (#739, #741)
+
+* tests/conftest.py: move import of db_helpers (#737)
+
+* Cleanup/improve coverage, mainly with tests (#706)
+
+* Slightly revisit unittest handling (#740)
+
+
3.4.8 (2019-02-26)
------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-django-3.5.0/pytest_django/fixtures.py new/pytest-django-3.5.1/pytest_django/fixtures.py
--- old/pytest-django-3.5.0/pytest_django/fixtures.py 2019-06-03 16:24:31.000000000 +0200
+++ new/pytest-django-3.5.1/pytest_django/fixtures.py 2019-06-29 18:28:26.000000000 +0200
@@ -129,7 +129,7 @@
if is_django_unittest(request):
return
- if not transactional and "live_server" in request.funcargnames:
+ if not transactional and "live_server" in request.fixturenames:
# Do nothing, we get called with transactional=True, too.
return
@@ -187,11 +187,11 @@
over each other in the following order (the last one wins): ``db``,
``transactional_db``, ``django_db_reset_sequences``.
"""
- if "django_db_reset_sequences" in request.funcargnames:
+ if "django_db_reset_sequences" in request.fixturenames:
request.getfixturevalue("django_db_reset_sequences")
if (
- "transactional_db" in request.funcargnames
- or "live_server" in request.funcargnames
+ "transactional_db" in request.fixturenames
+ or "live_server" in request.fixturenames
):
request.getfixturevalue("transactional_db")
else:
@@ -212,7 +212,7 @@
over each other in the following order (the last one wins): ``db``,
``transactional_db``, ``django_db_reset_sequences``.
"""
- if "django_db_reset_sequences" in request.funcargnames:
+ if "django_db_reset_sequences" in request.fixturenames:
request.getfixturevalue("django_db_reset_sequences")
_django_db_fixture_helper(request, django_db_blocker, transactional=True)
@@ -410,7 +410,7 @@
It will also override settings only for the duration of the test.
"""
- if "live_server" not in request.funcargnames:
+ if "live_server" not in request.fixturenames:
return
request.getfixturevalue("transactional_db")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-django-3.5.0/pytest_django/plugin.py new/pytest-django-3.5.1/pytest_django/plugin.py
--- old/pytest-django-3.5.0/pytest_django/plugin.py 2019-06-03 16:24:31.000000000 +0200
+++ new/pytest-django-3.5.1/pytest_django/plugin.py 2019-06-29 18:28:26.000000000 +0200
@@ -435,7 +435,7 @@
else:
transaction = None
- fixtures = getattr(test, 'funcargnames', [])
+ fixtures = getattr(test, 'fixturenames', [])
if "transactional_db" in fixtures:
return 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pytest-django-3.5.0/pytest_django.egg-info/PKG-INFO new/pytest-django-3.5.1/pytest_django.egg-info/PKG-INFO
--- old/pytest-django-3.5.0/pytest_django.egg-info/PKG-INFO 2019-06-03 16:24:46.000000000 +0200
+++ new/pytest-django-3.5.1/pytest_django.egg-info/PKG-INFO 2019-06-29 18:28:42.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pytest-django
-Version: 3.5.0
+Version: 3.5.1
Summary: A Django plugin for pytest.
Home-page: https://pytest-django.readthedocs.io/
Author: Andreas Pelme
@@ -95,5 +95,5 @@
Classifier: Programming Language :: Python :: Implementation :: PyPy
Classifier: Topic :: Software Development :: Testing
Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
-Provides-Extra: testing
Provides-Extra: docs
+Provides-Extra: testing
1
0
Hello community,
here is the log from the commit of package filezilla for openSUSE:Factory checked in at 2019-07-03 15:14:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/filezilla (Old)
and /work/SRC/openSUSE:Factory/.filezilla.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filezilla"
Wed Jul 3 15:14:48 2019 rev:78 rq:712521 version:3.43.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2019-05-21 10:37:35.707195784 +0200
+++ /work/SRC/openSUSE:Factory/.filezilla.new.4615/filezilla.changes 2019-07-03 15:14:50.270944149 +0200
@@ -1,0 +2,29 @@
+Sat Jun 29 08:41:54 UTC 2019 - ecsos(a)opensuse.org
+
+- Update to 3.43.0
+ * Fixed vulnerabilities:
+ - Filenames containing double-quotation marks were not escaped
+ correctly when selected for opening/editing. Depending on the
+ associated program, parts of the filename could be
+ interpreted as commands.
+ * Bugfixes and minor changes:
+ - Added a second layer of authentication to the update
+ mechanism
+- Update to 3.43.0-rc2
+ * Bugfixes and minor changes:
+ - Rebuilt against libfilezilla 0.17.1
+- Update to 3.43.0-rc1
+ * Bugfixes and minor changes:
+ - macOS: Minimum required macOS version has been increased to
+ 10.11 (El Capitan)
+ - *nix: Official Linux binaries are now built for Debian 10
+ (Buster)
+ - Building FileZilla now requires a C++17 compiler
+ - Building and running FileZilla now depends on
+ libfilezilla >= 0.17.0 (https://lib.filezilla-project.org/)
+ - When using SFTP, fix fallback to password authentication on
+ a server refusing a password-protected key
+ - Fix HTTP proxy support
+ - *nix: Improve resolution of program icon
+
+-------------------------------------------------------------------
Old:
----
FileZilla_3.42.1_src.tar.bz2
New:
----
FileZilla_3.43.0_src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ filezilla.spec ++++++
--- /var/tmp/diff_new_pack.v5fk1n/_old 2019-07-03 15:14:51.018945671 +0200
+++ /var/tmp/diff_new_pack.v5fk1n/_new 2019-07-03 15:14:51.018945671 +0200
@@ -17,7 +17,7 @@
Name: filezilla
-Version: 3.42.1
+Version: 3.43.0
Release: 0
Summary: A GUI FTP and SFTP Client
License: GPL-2.0-or-later
++++++ FileZilla_3.42.1_src.tar.bz2 -> FileZilla_3.43.0_src.tar.bz2 ++++++
++++ 658903 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-07-03 15:14:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Wed Jul 3 15:14:35 2019 rev:493 rq:713041 version:5.1.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2019-06-24 21:50:20.607965498 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.4615/dtb-aarch64.changes 2019-07-03 15:14:37.970919124 +0200
@@ -1,0 +2,642 @@
+Tue Jul 2 12:39:50 CEST 2019 - jslaby(a)suse.cz
+
+- Revert "ovl: detect overlapping layers" (openqa tests failing).
+- Revert "ovl: don't fail with disconnected lower NFS" (openqa
+ tests failing).
+- Revert "ovl: fix bogus -Wmaybe-unitialized warning" (openqa
+ tests failing).
+- commit cb24bc9
+
+-------------------------------------------------------------------
+Tue Jun 25 09:55:47 CEST 2019 - jslaby(a)suse.cz
+
+- Linux 5.1.15 (bnc#1012628).
+- tracing: Silence GCC 9 array bounds warning (bnc#1012628).
+- mmc: sdhci: sdhci-pci-o2micro: Correctly set bus width when
+ tuning (bnc#1012628).
+- mmc: sdhi: disallow HS400 for M3-W ES1.2, RZ/G2M, and V3H
+ (bnc#1012628).
+- mmc: mediatek: fix SDIO IRQ interrupt handle flow (bnc#1012628).
+- mmc: mediatek: fix SDIO IRQ detection issue (bnc#1012628).
+- mmc: core: API to temporarily disable retuning for SDIO CRC
+ errors (bnc#1012628).
+- mmc: core: Add sdio_retune_hold_now() and sdio_retune_release()
+ (bnc#1012628).
+- mmc: core: Prevent processing SDIO IRQs when the card is
+ suspended (bnc#1012628).
+- scsi: ufs: Avoid runtime suspend possibly being blocked forever
+ (bnc#1012628).
+- usb: chipidea: udc: workaround for endpoint conflict issue
+ (bnc#1012628).
+- xhci: detect USB 3.2 capable host controllers correctly
+ (bnc#1012628).
+- usb: xhci: Don't try to recover an endpoint if port is in
+ error state (bnc#1012628).
+- cifs: add spinlock for the openFileList to cifsInodeInfo
+ (bnc#1012628).
+- cifs: fix GlobalMid_Lock bug in cifs_reconnect (bnc#1012628).
+- IB/hfi1: Validate fault injection opcode user input
+ (bnc#1012628).
+- IB/hfi1: Close PSM sdma_progress sleep window (bnc#1012628).
+- IB/hfi1: Avoid hardlockup with flushlist_lock (bnc#1012628).
+- IB/hfi1: Correct tid qp rcd to match verbs context
+ (bnc#1012628).
+- IB/hfi1: Silence txreq allocation warnings (bnc#1012628).
+- iio: imu: st_lsm6dsx: fix PM support for st_lsm6dsx i2c
+ controller (bnc#1012628).
+- iio: temperature: mlx90632 Relax the compatibility check
+ (bnc#1012628).
+- Input: synaptics - enable SMBus on ThinkPad E480 and E580
+ (bnc#1012628).
+- Input: uinput - add compat ioctl number translation for
+ UI_*_FF_UPLOAD (bnc#1012628).
+- Input: silead - add MSSL0017 to acpi_device_id (bnc#1012628).
+- apparmor: fix PROFILE_MEDIATES for untrusted input
+ (bnc#1012628).
+- apparmor: enforce nullbyte at end of tag string (bnc#1012628).
+- apparmor: reset pos on failure to unpack for various functions
+ (bnc#1012628).
+- Revert "brcmfmac: disable command decode in sdio_aos"
+ (bnc#1012628).
+- brcmfmac: sdio: Disable auto-tuning around commands expected
+ to fail (bnc#1012628).
+- brcmfmac: sdio: Don't tune while the card is off (bnc#1012628).
+- lkdtm/usercopy: Moves the KERNEL_DS test to non-canonical
+ (bnc#1012628).
+- ARC: fix build warnings (bnc#1012628).
+- dmaengine: jz4780: Fix transfers being ACKed too soon
+ (bnc#1012628).
+- dmaengine: dw-axi-dmac: fix null dereference when pointer
+ first is null (bnc#1012628).
+- dmaengine: mediatek-cqdma: sleeping in atomic context
+ (bnc#1012628).
+- dmaengine: sprd: Fix the possible crash when getting descriptor
+ status (bnc#1012628).
+- dmaengine: sprd: Add validation of current descriptor in irq
+ handler (bnc#1012628).
+- dmaengine: sprd: Fix the incorrect start for 2-stage destination
+ channels (bnc#1012628).
+- dmaengine: sprd: Fix block length overflow (bnc#1012628).
+- dmaengine: sprd: Fix the right place to configure 2-stage
+ transfer (bnc#1012628).
+- ARC: [plat-hsdk]: Add missing multicast filter bins number to
+ GMAC node (bnc#1012628).
+- ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node
+ (bnc#1012628).
+- MIPS: mark ginvt() as __always_inline (bnc#1012628).
+- fpga: stratix10-soc: fix use-after-free on s10_init()
+ (bnc#1012628).
+- fpga: dfl: afu: Pass the correct device to dma_mapping_error()
+ (bnc#1012628).
+- fpga: dfl: Add lockdep classes for pdata->lock (bnc#1012628).
+- parport: Fix mem leak in parport_register_dev_model
+ (bnc#1012628).
+- parisc: Fix compiler warnings in float emulation code
+ (bnc#1012628).
+- habanalabs: fix bug in checking huge page optimization
+ (bnc#1012628).
+- IB/rdmavt: Fix alloc_qpn() WARN_ON() (bnc#1012628).
+- IB/hfi1: Insure freeze_work work_struct is canceled on shutdown
+ (bnc#1012628).
+- IB/{qib, hfi1, rdmavt}: Correct ibv_devinfo max_mr value
+ (bnc#1012628).
+- IB/hfi1: Validate page aligned for a given virtual address
+ (bnc#1012628).
+- MIPS: uprobes: remove set but not used variable 'epc'
+ (bnc#1012628).
+- crypto: hmac - fix memory leak in hmac_init_tfm() (bnc#1012628).
+- xtensa: Fix section mismatch between memblock_reserve and
+ mem_reserve (bnc#1012628).
+- kselftest/cgroup: fix unexpected testing failure on
+ test_memcontrol (bnc#1012628).
+- kselftest/cgroup: fix unexpected testing failure on test_core
+ (bnc#1012628).
+- kselftest/cgroup: fix incorrect test_core skip (bnc#1012628).
+- userfaultfd: selftest: fix compiler warning (bnc#1012628).
+- selftests: vm: install test_vmalloc.sh for run_vmtests
+ (bnc#1012628).
+- net: dsa: mv88e6xxx: avoid error message on remove from VLAN 0
+ (bnc#1012628).
+- net: hns: Fix loopback test failed at copper ports
+ (bnc#1012628).
+- mdesc: fix a missing-check bug in get_vdev_port_node_info()
+ (bnc#1012628).
+- sparc: perf: fix updated event period in response to
+ PERF_EVENT_IOC_PERIOD (bnc#1012628).
+- net: ethernet: mediatek: Use hw_feature to judge if HWLRO is
+ supported (bnc#1012628).
+- net: ethernet: mediatek: Use NET_IP_ALIGN to judge if HW
+ RX_2BYTE_OFFSET is enabled (bnc#1012628).
+- selftests: set sysctl bc_forwarding properly in
+ router_broadcast.sh (bnc#1012628).
+- drm/arm/mali-dp: Add a loop around the second set CVAL and
+ try 5 times (bnc#1012628).
+- drm/arm/hdlcd: Actually validate CRTC modes (bnc#1012628).
+- drm/arm/hdlcd: Allow a bit of clock tolerance (bnc#1012628).
+- nvmet: fix data_len to 0 for bdev-backed write_zeroes
+ (bnc#1012628).
+- kbuild: tar-pkg: enable communication with jobserver
+ (bnc#1012628).
+- scripts/checkstack.pl: Fix arm64 wrong or unknown architecture
+ (bnc#1012628).
+- net: phylink: avoid reducing support mask (bnc#1012628).
+- scsi: ufs: Check that space was properly alloced in
+ copy_query_response (bnc#1012628).
+- scsi: smartpqi: unlock on error in
+ pqi_submit_raid_request_synchronous() (bnc#1012628).
+- net: ipvlan: Fix ipvlan device tso disabled while
+ NETIF_F_IP_CSUM is set (bnc#1012628).
+- udmabuf: actually unmap the scatterlist (bnc#1012628).
+- tests: fix pidfd-test compilation (bnc#1012628).
+- s390/qeth: handle limited IPv4 broadcast in L3 TX path
+ (bnc#1012628).
+- s390/qeth: check dst entry before use (bnc#1012628).
+- s390/qeth: fix VLAN attribute in bridge_hostnotify udev event
+ (bnc#1012628).
+- hwmon: (core) add thermal sensors only if dev->of_node is
+ present (bnc#1012628).
+- hwmon: (pmbus/core) Treat parameters as paged if on multiple
+ pages (bnc#1012628).
+- arm64: Silence gcc warnings about arch ABI drift (bnc#1012628).
+- nvme: Fix u32 overflow in the number of namespace list
+ calculation (bnc#1012628).
+- ovl: detect overlapping layers (bnc#1012628).
+- ovl: don't fail with disconnected lower NFS (bnc#1012628).
+- ovl: fix bogus -Wmaybe-unitialized warning (bnc#1012628).
+- btrfs: start readahead also in seed devices (bnc#1012628).
+- can: xilinx_can: use correct bittiming_const for CAN FD core
+ (bnc#1012628).
+- can: flexcan: fix timeout when set small bitrate (bnc#1012628).
+- can: purge socket error queue on sock destruct (bnc#1012628).
+- riscv: mm: synchronize MMU after pte change (bnc#1012628).
+- powerpc/bpf: use unsigned division instruction for 64-bit
+ operations (bnc#1012628).
+- ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to
+ i.MX6SX (bnc#1012628).
+- ARM: mvebu_v7_defconfig: fix Ethernet on Clearfog (bnc#1012628).
+- ARM: dts: dra76x: Update MMC2_HS200_MANUAL1 iodelay values
+ (bnc#1012628).
+- ARM: dts: am57xx-idk: Remove support for voltage switching
+ for SD card (bnc#1012628).
+- arm64/sve: <uapi/asm/ptrace.h> should not depend on
+ <uapi/linux/prctl.h> (bnc#1012628).
+- arm64: ssbd: explicitly depend on <linux/prctl.h> (bnc#1012628).
+- KVM: x86/mmu: Allocate PAE root array when using SVM's 32-bit
+ NPT (bnc#1012628).
+- ovl: make i_ino consistent with st_ino in more cases
+ (bnc#1012628).
+- drm/vmwgfx: Use the backdoor port if the HB port is not
+ available (bnc#1012628).
+- drm/i915: Don't clobber M/N values during fastset check
+ (bnc#1012628).
+- binder: fix possible UAF when freeing buffer (bnc#1012628).
+- staging: erofs: add requirements field in superblock
+ (bnc#1012628).
+- Bluetooth: Align minimum encryption key size for LE and BR/EDR
+ connections (bnc#1012628).
+- Bluetooth: Fix regression with minimum encryption key size
++++ 451 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.4615/dtb-aarch64.changes
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-kvmsmall.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-vanilla.changes: same change
kernel-zfcpdump.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.334932072 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.338932080 +0200
@@ -17,7 +17,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -29,9 +29,9 @@
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-aarch64
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
dtb-armv6l.spec: same change
dtb-armv7l.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.402932210 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.406932218 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.430932267 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.430932267 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.454932316 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.458932324 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: The Standard Kernel
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.474932357 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.478932365 +0200
@@ -17,7 +17,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,9 +31,9 @@
Summary: Kernel Documentation
License: GPL-2.0
Group: Documentation/Man
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -63,7 +63,7 @@
%endif
Url: http://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.498932405 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.502932413 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.542932495 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.542932495 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -45,7 +45,7 @@
%endif
%endif
%endif
-BuildRequires: kernel%kernel_flavor-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+BuildRequires: kernel%kernel_flavor-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -64,9 +64,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.566932544 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.566932544 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%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: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.590932593 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.590932593 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.622932658 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.622932658 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -30,9 +30,9 @@
Summary: The Linux Kernel Sources
License: GPL-2.0
Group: Development/Sources
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -43,7 +43,7 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
Provides: linux
Provides: multiversion(kernel)
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.650932715 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.650932715 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 5.1.10
+Version: 5.1.15
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -55,7 +55,7 @@
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:44.674932763 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:44.674932763 +0200
@@ -18,7 +18,7 @@
%define srcversion 5.1
-%define patchversion 5.1.10
+%define patchversion 5.1.15
%define variant %{nil}
%define vanilla_only 0
@@ -62,9 +62,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0
Group: System/Kernel
-Version: 5.1.10
+Version: 5.1.15
%if 0%{?is_kotd}
-Release: <RELEASE>.gad24342
+Release: <RELEASE>.gcb24bc9
%else
Release: 0
%endif
@@ -169,10 +169,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides: kernel-%build_flavor-base-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
-Provides: kernel-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: kernel-%build_flavor-base-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
+Provides: kernel-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
# END COMMON DEPS
-Provides: %name-srchash-ad24342b53c2ac90b16b903f897bd01f775351e5
+Provides: %name-srchash-cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
%obsolete_rebuilds %name
Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
Source2: source-post.sh
kernel-zfcpdump.spec: same change
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default
--- old/config/arm64/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/arm64/default 2019-06-19 13:53:18.000000000 +0200
@@ -9449,7 +9449,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -9470,7 +9472,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default
--- old/config/armv6hl/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/armv6hl/default 2019-06-19 13:53:18.000000000 +0200
@@ -6944,7 +6944,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -6965,7 +6967,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default
--- old/config/armv7hl/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/armv7hl/default 2019-06-19 13:53:18.000000000 +0200
@@ -9668,7 +9668,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -9689,7 +9691,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae
--- old/config/armv7hl/lpae 2019-06-12 08:08:07.000000000 +0200
+++ new/config/armv7hl/lpae 2019-06-19 13:53:18.000000000 +0200
@@ -9263,7 +9263,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -9284,7 +9286,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2019-06-12 08:08:07.000000000 +0200
+++ new/config/i386/pae 2019-06-19 13:53:18.000000000 +0200
@@ -8594,7 +8594,9 @@
CONFIG_INTEL_TXT=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -8615,7 +8617,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default
--- old/config/ppc64/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/ppc64/default 2019-06-19 13:53:18.000000000 +0200
@@ -6726,7 +6726,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -6747,7 +6749,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default
--- old/config/ppc64le/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/ppc64le/default 2019-06-19 13:53:18.000000000 +0200
@@ -6585,7 +6585,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -6606,7 +6608,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default
--- old/config/s390x/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/s390x/default 2019-06-19 13:53:18.000000000 +0200
@@ -3196,7 +3196,9 @@
CONFIG_SECURITY_PATH=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -3217,7 +3219,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/zfcpdump new/config/s390x/zfcpdump
--- old/config/s390x/zfcpdump 2019-06-12 08:08:07.000000000 +0200
+++ new/config/s390x/zfcpdump 2019-06-19 13:53:18.000000000 +0200
@@ -1101,7 +1101,8 @@
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
CONFIG_FORTIFY_SOURCE=y
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_DEFAULT_SECURITY_DAC=y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2019-06-12 08:08:07.000000000 +0200
+++ new/config/x86_64/default 2019-06-19 13:53:18.000000000 +0200
@@ -8384,7 +8384,9 @@
CONFIG_INTEL_TXT=y
CONFIG_LSM_MMAP_MIN_ADDR=0
CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-# CONFIG_HARDENED_USERCOPY is not set
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_FALLBACK is not set
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
# CONFIG_FORTIFY_SOURCE is not set
# CONFIG_STATIC_USERMODEHELPER is not set
CONFIG_SECURITY_SELINUX=y
@@ -8405,7 +8407,7 @@
CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
# CONFIG_SECURITY_APPARMOR_DEBUG is not set
# CONFIG_SECURITY_LOADPIN is not set
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
# CONFIG_SECURITY_SAFESETID is not set
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 27292 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch new/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
--- old/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch 2019-07-02 12:39:52.000000000 +0200
@@ -0,0 +1,42 @@
+From 2292984907bdca09396f25c90bc1d30478d34fd5 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <msuchanek(a)suse.de>
+Date: Tue, 26 Mar 2019 22:37:42 +0100
+Subject: [PATCH] Revert "Bluetooth: btusb: driver to enable the usb-wakeup
+ feature"
+
+Patch-mainline: no, testing
+References: boo#1130448
+
+This reverts commit a0085f2510e8976614ad8f766b209448b385492f.
+
+Signed-off-by: Michal Suchanek <msuchanek(a)suse.de>
+---
+ drivers/bluetooth/btusb.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
+index 4761499db9ee..6d35cdb99c5e 100644
+--- a/drivers/bluetooth/btusb.c
++++ b/drivers/bluetooth/btusb.c
+@@ -1138,10 +1138,6 @@ static int btusb_open(struct hci_dev *hdev)
+ }
+
+ data->intf->needs_remote_wakeup = 1;
+- /* device specific wakeup source enabled and required for USB
+- * remote wakeup while host is suspended
+- */
+- device_wakeup_enable(&data->udev->dev);
+
+ if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
+ goto done;
+@@ -1205,7 +1201,6 @@ static int btusb_close(struct hci_dev *hdev)
+ goto failed;
+
+ data->intf->needs_remote_wakeup = 0;
+- device_wakeup_disable(&data->udev->dev);
+ usb_autopm_put_interface(data->intf);
+
+ failed:
+--
+2.20.1
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-ovl-detect-overlapping-layers.patch new/patches.suse/Revert-ovl-detect-overlapping-layers.patch
--- old/patches.suse/Revert-ovl-detect-overlapping-layers.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/Revert-ovl-detect-overlapping-layers.patch 2019-07-02 12:39:52.000000000 +0200
@@ -0,0 +1,495 @@
+From: Jiri Slaby <jslaby(a)suse.cz>
+Date: Tue, 2 Jul 2019 12:37:21 +0200
+Subject: Revert "ovl: detect overlapping layers"
+Patch-mainline: never, suse specific
+References: openqa tests failing
+
+This reverts commit 99eb836cd9a4df455ae90807bc00ee635be342f0, upstream
+commit 146d62e5a5867fbf84490d82455718bfb10fe824. It breaks openqa tests.
+So for now we revert these strict checks, but we will get them back with
+5.2.
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+---
+ fs/overlayfs/inode.c | 48 -------------
+ fs/overlayfs/namei.c | 8 --
+ fs/overlayfs/overlayfs.h | 3
+ fs/overlayfs/ovl_entry.h | 6 -
+ fs/overlayfs/super.c | 169 ++++-------------------------------------------
+ fs/overlayfs/util.c | 12 ---
+ 6 files changed, 17 insertions(+), 229 deletions(-)
+
+--- a/fs/overlayfs/inode.c
++++ b/fs/overlayfs/inode.c
+@@ -777,54 +777,6 @@ struct inode *ovl_lookup_inode(struct su
+ return inode;
+ }
+
+-bool ovl_lookup_trap_inode(struct super_block *sb, struct dentry *dir)
+-{
+- struct inode *key = d_inode(dir);
+- struct inode *trap;
+- bool res;
+-
+- trap = ilookup5(sb, (unsigned long) key, ovl_inode_test, key);
+- if (!trap)
+- return false;
+-
+- res = IS_DEADDIR(trap) && !ovl_inode_upper(trap) &&
+- !ovl_inode_lower(trap);
+-
+- iput(trap);
+- return res;
+-}
+-
+-/*
+- * Create an inode cache entry for layer root dir, that will intentionally
+- * fail ovl_verify_inode(), so any lookup that will find some layer root
+- * will fail.
+- */
+-struct inode *ovl_get_trap_inode(struct super_block *sb, struct dentry *dir)
+-{
+- struct inode *key = d_inode(dir);
+- struct inode *trap;
+-
+- if (!d_is_dir(dir))
+- return ERR_PTR(-ENOTDIR);
+-
+- trap = iget5_locked(sb, (unsigned long) key, ovl_inode_test,
+- ovl_inode_set, key);
+- if (!trap)
+- return ERR_PTR(-ENOMEM);
+-
+- if (!(trap->i_state & I_NEW)) {
+- /* Conflicting layer roots? */
+- iput(trap);
+- return ERR_PTR(-ELOOP);
+- }
+-
+- trap->i_mode = S_IFDIR;
+- trap->i_flags = S_DEAD;
+- unlock_new_inode(trap);
+-
+- return trap;
+-}
+-
+ /*
+ * Does overlay inode need to be hashed by lower inode?
+ */
+--- a/fs/overlayfs/namei.c
++++ b/fs/overlayfs/namei.c
+@@ -18,7 +18,6 @@
+ #include "overlayfs.h"
+
+ struct ovl_lookup_data {
+- struct super_block *sb;
+ struct qstr name;
+ bool is_dir;
+ bool opaque;
+@@ -245,12 +244,6 @@ static int ovl_lookup_single(struct dent
+ if (!d->metacopy || d->last)
+ goto out;
+ } else {
+- if (ovl_lookup_trap_inode(d->sb, this)) {
+- /* Caught in a trap of overlapping layers */
+- err = -ELOOP;
+- goto out_err;
+- }
+-
+ if (last_element)
+ d->is_dir = true;
+ if (d->last)
+@@ -826,7 +819,6 @@ struct dentry *ovl_lookup(struct inode *
+ int err;
+ bool metacopy = false;
+ struct ovl_lookup_data d = {
+- .sb = dentry->d_sb,
+ .name = dentry->d_name,
+ .is_dir = false,
+ .opaque = false,
+--- a/fs/overlayfs/overlayfs.h
++++ b/fs/overlayfs/overlayfs.h
+@@ -270,7 +270,6 @@ void ovl_clear_flag(unsigned long flag,
+ bool ovl_test_flag(unsigned long flag, struct inode *inode);
+ bool ovl_inuse_trylock(struct dentry *dentry);
+ void ovl_inuse_unlock(struct dentry *dentry);
+-bool ovl_is_inuse(struct dentry *dentry);
+ bool ovl_need_index(struct dentry *dentry);
+ int ovl_nlink_start(struct dentry *dentry);
+ void ovl_nlink_end(struct dentry *dentry);
+@@ -377,8 +376,6 @@ struct ovl_inode_params {
+ struct inode *ovl_new_inode(struct super_block *sb, umode_t mode, dev_t rdev);
+ struct inode *ovl_lookup_inode(struct super_block *sb, struct dentry *real,
+ bool is_upper);
+-bool ovl_lookup_trap_inode(struct super_block *sb, struct dentry *dir);
+-struct inode *ovl_get_trap_inode(struct super_block *sb, struct dentry *dir);
+ struct inode *ovl_get_inode(struct super_block *sb,
+ struct ovl_inode_params *oip);
+ static inline void ovl_copyattr(struct inode *from, struct inode *to)
+--- a/fs/overlayfs/ovl_entry.h
++++ b/fs/overlayfs/ovl_entry.h
+@@ -29,8 +29,6 @@ struct ovl_sb {
+
+ struct ovl_layer {
+ struct vfsmount *mnt;
+- /* Trap in ovl inode cache */
+- struct inode *trap;
+ struct ovl_sb *fs;
+ /* Index of this layer in fs root (upper idx == 0) */
+ int idx;
+@@ -67,10 +65,6 @@ struct ovl_fs {
+ /* Did we take the inuse lock? */
+ bool upperdir_locked;
+ bool workdir_locked;
+- /* Traps in ovl inode cache */
+- struct inode *upperdir_trap;
+- struct inode *workdir_trap;
+- struct inode *indexdir_trap;
+ /* Inode numbers in all layers do not use the high xino_bits */
+ unsigned int xino_bits;
+ };
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -217,9 +217,6 @@ static void ovl_free_fs(struct ovl_fs *o
+ {
+ unsigned i;
+
+- iput(ofs->indexdir_trap);
+- iput(ofs->workdir_trap);
+- iput(ofs->upperdir_trap);
+ dput(ofs->indexdir);
+ dput(ofs->workdir);
+ if (ofs->workdir_locked)
+@@ -228,10 +225,8 @@ static void ovl_free_fs(struct ovl_fs *o
+ if (ofs->upperdir_locked)
+ ovl_inuse_unlock(ofs->upper_mnt->mnt_root);
+ mntput(ofs->upper_mnt);
+- for (i = 0; i < ofs->numlower; i++) {
+- iput(ofs->lower_layers[i].trap);
++ for (i = 0; i < ofs->numlower; i++)
+ mntput(ofs->lower_layers[i].mnt);
+- }
+ for (i = 0; i < ofs->numlowerfs; i++)
+ free_anon_bdev(ofs->lower_fs[i].pseudo_dev);
+ kfree(ofs->lower_layers);
+@@ -989,26 +984,7 @@ static const struct xattr_handler *ovl_x
+ NULL
+ };
+
+-static int ovl_setup_trap(struct super_block *sb, struct dentry *dir,
+- struct inode **ptrap, const char *name)
+-{
+- struct inode *trap;
+- int err;
+-
+- trap = ovl_get_trap_inode(sb, dir);
+- err = PTR_ERR(trap);
+- if (IS_ERR(trap)) {
+- if (err == -ELOOP)
+- pr_err("overlayfs: conflicting %s path\n", name);
+- return err;
+- }
+-
+- *ptrap = trap;
+- return 0;
+-}
+-
+-static int ovl_get_upper(struct super_block *sb, struct ovl_fs *ofs,
+- struct path *upperpath)
++static int ovl_get_upper(struct ovl_fs *ofs, struct path *upperpath)
+ {
+ struct vfsmount *upper_mnt;
+ int err;
+@@ -1028,11 +1004,6 @@ static int ovl_get_upper(struct super_bl
+ if (err)
+ goto out;
+
+- err = ovl_setup_trap(sb, upperpath->dentry, &ofs->upperdir_trap,
+- "upperdir");
+- if (err)
+- goto out;
+-
+ upper_mnt = clone_private_mount(upperpath);
+ err = PTR_ERR(upper_mnt);
+ if (IS_ERR(upper_mnt)) {
+@@ -1059,8 +1030,7 @@ out:
+ return err;
+ }
+
+-static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
+- struct path *workpath)
++static int ovl_make_workdir(struct ovl_fs *ofs, struct path *workpath)
+ {
+ struct vfsmount *mnt = ofs->upper_mnt;
+ struct dentry *temp;
+@@ -1075,10 +1045,6 @@ static int ovl_make_workdir(struct super
+ if (!ofs->workdir)
+ goto out;
+
+- err = ovl_setup_trap(sb, ofs->workdir, &ofs->workdir_trap, "workdir");
+- if (err)
+- goto out;
+-
+ /*
+ * Upper should support d_type, else whiteouts are visible. Given
+ * workdir and upper are on same fs, we can do iterate_dir() on
+@@ -1139,8 +1105,7 @@ out:
+ return err;
+ }
+
+-static int ovl_get_workdir(struct super_block *sb, struct ovl_fs *ofs,
+- struct path *upperpath)
++static int ovl_get_workdir(struct ovl_fs *ofs, struct path *upperpath)
+ {
+ int err;
+ struct path workpath = { };
+@@ -1171,16 +1136,19 @@ static int ovl_get_workdir(struct super_
+ pr_warn("overlayfs: workdir is in-use by another mount, accessing files from both mounts will result in undefined behavior.\n");
+ }
+
+- err = ovl_make_workdir(sb, ofs, &workpath);
++ err = ovl_make_workdir(ofs, &workpath);
++ if (err)
++ goto out;
+
++ err = 0;
+ out:
+ path_put(&workpath);
+
+ return err;
+ }
+
+-static int ovl_get_indexdir(struct super_block *sb, struct ovl_fs *ofs,
+- struct ovl_entry *oe, struct path *upperpath)
++static int ovl_get_indexdir(struct ovl_fs *ofs, struct ovl_entry *oe,
++ struct path *upperpath)
+ {
+ struct vfsmount *mnt = ofs->upper_mnt;
+ int err;
+@@ -1199,11 +1167,6 @@ static int ovl_get_indexdir(struct super
+
+ ofs->indexdir = ovl_workdir_create(ofs, OVL_INDEXDIR_NAME, true);
+ if (ofs->indexdir) {
+- err = ovl_setup_trap(sb, ofs->indexdir, &ofs->indexdir_trap,
+- "indexdir");
+- if (err)
+- goto out;
+-
+ /*
+ * Verify upper root is exclusively associated with index dir.
+ * Older kernels stored upper fh in "trusted.overlay.origin"
+@@ -1291,8 +1254,8 @@ static int ovl_get_fsid(struct ovl_fs *o
+ return ofs->numlowerfs;
+ }
+
+-static int ovl_get_lower_layers(struct super_block *sb, struct ovl_fs *ofs,
+- struct path *stack, unsigned int numlower)
++static int ovl_get_lower_layers(struct ovl_fs *ofs, struct path *stack,
++ unsigned int numlower)
+ {
+ int err;
+ unsigned int i;
+@@ -1310,28 +1273,16 @@ static int ovl_get_lower_layers(struct s
+
+ for (i = 0; i < numlower; i++) {
+ struct vfsmount *mnt;
+- struct inode *trap;
+ int fsid;
+
+ err = fsid = ovl_get_fsid(ofs, &stack[i]);
+ if (err < 0)
+ goto out;
+
+- err = -EBUSY;
+- if (ovl_is_inuse(stack[i].dentry)) {
+- pr_err("overlayfs: lowerdir is in-use as upperdir/workdir\n");
+- goto out;
+- }
+-
+- err = ovl_setup_trap(sb, stack[i].dentry, &trap, "lowerdir");
+- if (err)
+- goto out;
+-
+ mnt = clone_private_mount(&stack[i]);
+ err = PTR_ERR(mnt);
+ if (IS_ERR(mnt)) {
+ pr_err("overlayfs: failed to clone lowerpath\n");
+- iput(trap);
+ goto out;
+ }
+
+@@ -1341,7 +1292,6 @@ static int ovl_get_lower_layers(struct s
+ */
+ mnt->mnt_flags |= MNT_READONLY | MNT_NOATIME;
+
+- ofs->lower_layers[ofs->numlower].trap = trap;
+ ofs->lower_layers[ofs->numlower].mnt = mnt;
+ ofs->lower_layers[ofs->numlower].idx = i + 1;
+ ofs->lower_layers[ofs->numlower].fsid = fsid;
+@@ -1436,7 +1386,7 @@ static struct ovl_entry *ovl_get_lowerst
+ goto out_err;
+ }
+
+- err = ovl_get_lower_layers(sb, ofs, stack, numlower);
++ err = ovl_get_lower_layers(ofs, stack, numlower);
+ if (err)
+ goto out_err;
+
+@@ -1468,85 +1418,6 @@ out_err:
+ goto out;
+ }
+
+-/*
+- * Check if this layer root is a descendant of:
+- * - another layer of this overlayfs instance
+- * - upper/work dir of any overlayfs instance
+- * - a disconnected dentry (detached root)
+- */
+-static int ovl_check_layer(struct super_block *sb, struct dentry *dentry,
+- const char *name)
+-{
+- struct dentry *next, *parent;
+- bool is_root = false;
+- int err = 0;
+-
+- if (!dentry || dentry == dentry->d_sb->s_root)
+- return 0;
+-
+- next = dget(dentry);
+- /* Walk back ancestors to fs root (inclusive) looking for traps */
+- do {
+- parent = dget_parent(next);
+- is_root = (parent == next);
+- if (ovl_is_inuse(parent)) {
+- err = -EBUSY;
+- pr_err("overlayfs: %s path overlapping in-use upperdir/workdir\n",
+- name);
+- } else if (ovl_lookup_trap_inode(sb, parent)) {
+- err = -ELOOP;
+- pr_err("overlayfs: overlapping %s path\n", name);
+- }
+- dput(next);
+- next = parent;
+- } while (!err && !is_root);
+-
+- /* Did we really walk to fs root or found a detached root? */
+- if (!err && next != dentry->d_sb->s_root) {
+- err = -ESTALE;
+- pr_err("overlayfs: disconnected %s path\n", name);
+- }
+-
+- dput(next);
+-
+- return err;
+-}
+-
+-/*
+- * Check if any of the layers or work dirs overlap.
+- */
+-static int ovl_check_overlapping_layers(struct super_block *sb,
+- struct ovl_fs *ofs)
+-{
+- int i, err;
+-
+- if (ofs->upper_mnt) {
+- err = ovl_check_layer(sb, ofs->upper_mnt->mnt_root, "upperdir");
+- if (err)
+- return err;
+-
+- /*
+- * Checking workbasedir avoids hitting ovl_is_inuse(parent) of
+- * this instance and covers overlapping work and index dirs,
+- * unless work or index dir have been moved since created inside
+- * workbasedir. In that case, we already have their traps in
+- * inode cache and we will catch that case on lookup.
+- */
+- err = ovl_check_layer(sb, ofs->workbasedir, "workdir");
+- if (err)
+- return err;
+- }
+-
+- for (i = 0; i < ofs->numlower; i++) {
+- err = ovl_check_layer(sb, ofs->lower_layers[i].mnt->mnt_root,
+- "lowerdir");
+- if (err)
+- return err;
+- }
+-
+- return 0;
+-}
+-
+ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
+ {
+ struct path upperpath = { };
+@@ -1586,20 +1457,17 @@ static int ovl_fill_super(struct super_b
+ if (ofs->config.xino != OVL_XINO_OFF)
+ ofs->xino_bits = BITS_PER_LONG - 32;
+
+- /* alloc/destroy_inode needed for setting up traps in inode cache */
+- sb->s_op = &ovl_super_operations;
+-
+ if (ofs->config.upperdir) {
+ if (!ofs->config.workdir) {
+ pr_err("overlayfs: missing 'workdir'\n");
+ goto out_err;
+ }
+
+- err = ovl_get_upper(sb, ofs, &upperpath);
++ err = ovl_get_upper(ofs, &upperpath);
+ if (err)
+ goto out_err;
+
+- err = ovl_get_workdir(sb, ofs, &upperpath);
++ err = ovl_get_workdir(ofs, &upperpath);
+ if (err)
+ goto out_err;
+
+@@ -1620,7 +1488,7 @@ static int ovl_fill_super(struct super_b
+ sb->s_flags |= SB_RDONLY;
+
+ if (!(ovl_force_readonly(ofs)) && ofs->config.index) {
+- err = ovl_get_indexdir(sb, ofs, oe, &upperpath);
++ err = ovl_get_indexdir(ofs, oe, &upperpath);
+ if (err)
+ goto out_free_oe;
+
+@@ -1633,10 +1501,6 @@ static int ovl_fill_super(struct super_b
+
+ }
+
+- err = ovl_check_overlapping_layers(sb, ofs);
+- if (err)
+- goto out_free_oe;
+-
+ /* Show index=off in /proc/mounts for forced r/o mount */
+ if (!ofs->indexdir) {
+ ofs->config.index = false;
+@@ -1658,6 +1522,7 @@ static int ovl_fill_super(struct super_b
+ cap_lower(cred->cap_effective, CAP_SYS_RESOURCE);
+
+ sb->s_magic = OVERLAYFS_SUPER_MAGIC;
++ sb->s_op = &ovl_super_operations;
+ sb->s_xattr = ovl_xattr_handlers;
+ sb->s_fs_info = ofs;
+ sb->s_flags |= SB_POSIXACL;
+--- a/fs/overlayfs/util.c
++++ b/fs/overlayfs/util.c
+@@ -652,18 +652,6 @@ void ovl_inuse_unlock(struct dentry *den
+ }
+ }
+
+-bool ovl_is_inuse(struct dentry *dentry)
+-{
+- struct inode *inode = d_inode(dentry);
+- bool inuse;
+-
+- spin_lock(&inode->i_lock);
+- inuse = (inode->i_state & I_OVL_INUSE);
+- spin_unlock(&inode->i_lock);
+-
+- return inuse;
+-}
+-
+ /*
+ * Does this overlay dentry need to be indexed on copy up?
+ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-ovl-don-t-fail-with-disconnected-lower-NFS.patch new/patches.suse/Revert-ovl-don-t-fail-with-disconnected-lower-NFS.patch
--- old/patches.suse/Revert-ovl-don-t-fail-with-disconnected-lower-NFS.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/Revert-ovl-don-t-fail-with-disconnected-lower-NFS.patch 2019-07-02 12:39:52.000000000 +0200
@@ -0,0 +1,68 @@
+From: Jiri Slaby <jslaby(a)suse.cz>
+Date: Tue, 2 Jul 2019 12:36:55 +0200
+Subject: Revert "ovl: don't fail with disconnected lower NFS"
+Patch-mainline: never, suse specific
+References: openqa tests failing
+
+This reverts commit 168835bbb0bff4c6294b7040e006251f105f7599, upstream
+commit 9179c21dc6ed1c993caa5fe4da876a6765c26af7. It depends on the
+following patch which is being reverted.
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+---
+ fs/overlayfs/super.c | 26 +++++++++++++++++---------
+ 1 file changed, 17 insertions(+), 9 deletions(-)
+
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -1472,20 +1472,23 @@ out_err:
+ * Check if this layer root is a descendant of:
+ * - another layer of this overlayfs instance
+ * - upper/work dir of any overlayfs instance
++ * - a disconnected dentry (detached root)
+ */
+ static int ovl_check_layer(struct super_block *sb, struct dentry *dentry,
+ const char *name)
+ {
+- struct dentry *next = dentry, *parent;
++ struct dentry *next, *parent;
++ bool is_root = false;
+ int err = 0;
+
+- if (!dentry)
++ if (!dentry || dentry == dentry->d_sb->s_root)
+ return 0;
+
+- parent = dget_parent(next);
+-
+- /* Walk back ancestors to root (inclusive) looking for traps */
+- while (!err && parent != next) {
++ next = dget(dentry);
++ /* Walk back ancestors to fs root (inclusive) looking for traps */
++ do {
++ parent = dget_parent(next);
++ is_root = (parent == next);
+ if (ovl_is_inuse(parent)) {
+ err = -EBUSY;
+ pr_err("overlayfs: %s path overlapping in-use upperdir/workdir\n",
+@@ -1494,12 +1497,17 @@ static int ovl_check_layer(struct super_
+ err = -ELOOP;
+ pr_err("overlayfs: overlapping %s path\n", name);
+ }
+- next = parent;
+- parent = dget_parent(next);
+ dput(next);
++ next = parent;
++ } while (!err && !is_root);
++
++ /* Did we really walk to fs root or found a detached root? */
++ if (!err && next != dentry->d_sb->s_root) {
++ err = -ESTALE;
++ pr_err("overlayfs: disconnected %s path\n", name);
+ }
+
+- dput(parent);
++ dput(next);
+
+ return err;
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/Revert-ovl-fix-bogus-Wmaybe-unitialized-warning.patch new/patches.suse/Revert-ovl-fix-bogus-Wmaybe-unitialized-warning.patch
--- old/patches.suse/Revert-ovl-fix-bogus-Wmaybe-unitialized-warning.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/Revert-ovl-fix-bogus-Wmaybe-unitialized-warning.patch 2019-07-02 12:39:52.000000000 +0200
@@ -0,0 +1,28 @@
+From: Jiri Slaby <jslaby(a)suse.cz>
+Date: Tue, 2 Jul 2019 12:34:11 +0200
+Subject: Revert "ovl: fix bogus -Wmaybe-unitialized warning"
+Patch-mainline: never, suse specific
+References: openqa tests failing
+
+This reverts commit 9b8bd98e23a92b4fa6b1f3dd9e381c47ce575642, upstream
+commit 1dac6f5b0ed2601be21bb4e27a44b0c3e667b7f4. It depends on the
+following patch which is being reverted.
+
+Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
+---
+ fs/overlayfs/super.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -996,8 +996,8 @@ static int ovl_setup_trap(struct super_b
+ int err;
+
+ trap = ovl_get_trap_inode(sb, dir);
+- err = PTR_ERR_OR_ZERO(trap);
+- if (err) {
++ err = PTR_ERR(trap);
++ if (IS_ERR(trap)) {
+ if (err == -ELOOP)
+ pr_err("overlayfs: conflicting %s path\n", name);
+ return err;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/apparmor-compatibility-with-v2.x-net.patch new/patches.suse/apparmor-compatibility-with-v2.x-net.patch
--- old/patches.suse/apparmor-compatibility-with-v2.x-net.patch 2019-06-17 16:44:35.000000000 +0200
+++ new/patches.suse/apparmor-compatibility-with-v2.x-net.patch 2019-07-02 12:39:52.000000000 +0200
@@ -15,18 +15,18 @@
Signed-off-by: John Johansen <john.johansen(a)canonical.com>
Acked-by: Goldwyn Rodrigues <rgoldwyn(a)suse.com>
---
- security/apparmor/apparmorfs.c | 1 +
- security/apparmor/include/apparmor.h | 2 +-
- security/apparmor/include/net.h | 11 ++++++
- security/apparmor/include/policy.h | 2 ++
- security/apparmor/net.c | 31 ++++++++++++----
- security/apparmor/policy.c | 1 +
- security/apparmor/policy_unpack.c | 54 ++++++++++++++++++++++++++--
+ security/apparmor/apparmorfs.c | 1
+ security/apparmor/include/apparmor.h | 2 -
+ security/apparmor/include/net.h | 11 +++++++
+ security/apparmor/include/policy.h | 2 +
+ security/apparmor/net.c | 31 +++++++++++++++-----
+ security/apparmor/policy.c | 1
+ security/apparmor/policy_unpack.c | 54 +++++++++++++++++++++++++++++++++--
7 files changed, 92 insertions(+), 10 deletions(-)
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
-@@ -2269,6 +2269,7 @@ static struct aa_sfs_entry aa_sfs_entry_features[] = {
+@@ -2275,6 +2275,7 @@ static struct aa_sfs_entry aa_sfs_entry_
AA_SFS_DIR("domain", aa_sfs_entry_domain),
AA_SFS_DIR("file", aa_sfs_entry_file),
AA_SFS_DIR("network_v8", aa_sfs_entry_network),
@@ -92,7 +92,7 @@
char **xattrs;
--- a/security/apparmor/net.c
+++ b/security/apparmor/net.c
-@@ -28,6 +28,11 @@ struct aa_sfs_entry aa_sfs_entry_network[] = {
+@@ -28,6 +28,11 @@ struct aa_sfs_entry aa_sfs_entry_network
{ }
};
@@ -104,11 +104,12 @@
static const char * const net_mask_names[] = {
"unknown",
"send",
-@@ -120,14 +125,26 @@ int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa,
+@@ -120,14 +125,26 @@ int aa_profile_af_perm(struct aa_profile
if (profile_unconfined(profile))
return 0;
state = PROFILE_MEDIATES(profile, AA_CLASS_NET);
- if (!state)
+- return 0;
+ if (state) {
+ if (!state)
+ return 0;
@@ -125,22 +126,21 @@
+ ALL_PERMS_MASK : 0;
+ perms.quiet = (profile->net_compat->quiet[family] & (1 << type)) ?
+ ALL_PERMS_MASK : 0;
-+
-+ } else {
- return 0;
--
+
- buffer[0] = cpu_to_be16(family);
- buffer[1] = cpu_to_be16((u16) type);
- state = aa_dfa_match_len(profile->policy.dfa, state, (char *) &buffer,
- 4);
- aa_compute_perms(profile->policy.dfa, state, &perms);
++ } else {
++ return 0;
+ }
aa_apply_modes_to_perms(profile, &perms);
return aa_check_perms(profile, &perms, request, sa, audit_net_cb);
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
-@@ -227,6 +227,7 @@ void aa_free_profile(struct aa_profile *profile)
+@@ -227,6 +227,7 @@ void aa_free_profile(struct aa_profile *
aa_free_file_rules(&profile->file);
aa_free_cap_rules(&profile->caps);
aa_free_rlimit_rules(&profile->rlimits);
@@ -159,7 +159,7 @@
#define v8 8 /* full network masking */
/*
-@@ -305,6 +305,19 @@ static bool unpack_u8(struct aa_ext *e, u8 *data, const char *name)
+@@ -315,6 +315,19 @@ fail:
return 0;
}
@@ -178,8 +178,8 @@
+
static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
{
- if (unpack_nameX(e, AA_U32, name)) {
-@@ -645,7 +658,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
+ void *pos = e->pos;
+@@ -677,7 +690,7 @@ static struct aa_profile *unpack_profile
struct aa_profile *profile = NULL;
const char *tmpname, *tmpns = NULL, *name = NULL;
const char *info = "failed to unpack profile";
@@ -188,7 +188,7 @@
struct rhashtable_params params = { 0 };
char *key = NULL;
struct aa_data *data;
-@@ -788,6 +801,43 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
+@@ -820,6 +833,43 @@ static struct aa_profile *unpack_profile
goto fail;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/tcp-add-tcp_min_snd_mss-sysctl.patch new/patches.suse/tcp-add-tcp_min_snd_mss-sysctl.patch
--- old/patches.suse/tcp-add-tcp_min_snd_mss-sysctl.patch 2019-06-17 16:44:35.000000000 +0200
+++ new/patches.suse/tcp-add-tcp_min_snd_mss-sysctl.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,121 +0,0 @@
-From: Eric Dumazet <edumazet(a)google.com>
-Date: Thu, 6 Jun 2019 09:38:47 -0700
-Subject: tcp: add tcp_min_snd_mss sysctl
-Patch-mainline: Not yet, embargo
-References: bsc#1137586 CVE-2019-11479
-
-Some TCP peers announce a very small MSS option in their SYN and/or
-SYN/ACK messages.
-
-This forces the stack to send packets with a very high network/cpu
-overhead.
-
-Linux has enforced a minimal value of 48. Since this value includes
-the size of TCP options, and that the options can consume up to 40
-bytes, this means that each segment can include only 8 bytes of payload.
-
-In some cases, it can be useful to increase the minimal value
-to a saner value.
-
-We still let the default to 48 (TCP_MIN_SND_MSS), for compatibility
-reasons.
-
-Note that TCP_MAXSEG socket option enforces a minimal value
-of (TCP_MIN_MSS). David Miller increased this minimal value
-in commit c39508d6f118 ("tcp: Make TCP_MAXSEG minimum more correct.")
-from 64 to 88.
-
-We might in the future merge TCP_MIN_SND_MSS and TCP_MIN_MSS.
-
-Signed-off-by: Eric Dumazet <edumazet(a)google.com>
-Suggested-by: Jonathan Looney <jtl(a)netflix.com>
-Cc: Neal Cardwell <ncardwell(a)google.com>
-Cc: Yuchung Cheng <ycheng(a)google.com>
-Cc: Tyler Hicks <tyhicks(a)canonical.com>
-Cc: Bruce Curtis <brucec(a)netflix.com>
-Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
-
----
- Documentation/networking/ip-sysctl.txt | 8 ++++++++
- include/net/netns/ipv4.h | 1 +
- net/ipv4/sysctl_net_ipv4.c | 11 +++++++++++
- net/ipv4/tcp_ipv4.c | 1 +
- net/ipv4/tcp_output.c | 3 +--
- 5 files changed, 22 insertions(+), 2 deletions(-)
-
---- a/Documentation/networking/ip-sysctl.txt
-+++ b/Documentation/networking/ip-sysctl.txt
-@@ -250,6 +250,14 @@ tcp_base_mss - INTEGER
- Path MTU discovery (MTU probing). If MTU probing is enabled,
- this is the initial MSS used by the connection.
-
-+tcp_min_snd_mss - INTEGER
-+ TCP SYN and SYNACK messages usually advertise an ADVMSS option,
-+ as described in RFC 1122 and RFC 6691.
-+ If this ADVMSS option is smaller than tcp_min_snd_mss,
-+ it is silently capped to tcp_min_snd_mss.
-+
-+ Default : 48 (at least 8 bytes of payload per segment)
-+
- tcp_congestion_control - STRING
- Set the congestion control algorithm to be used for new
- connections. The algorithm "reno" is always available, but
---- a/include/net/netns/ipv4.h
-+++ b/include/net/netns/ipv4.h
-@@ -117,6 +117,7 @@ struct netns_ipv4 {
- #endif
- int sysctl_tcp_mtu_probing;
- int sysctl_tcp_base_mss;
-+ int sysctl_tcp_min_snd_mss;
- int sysctl_tcp_probe_threshold;
- u32 sysctl_tcp_probe_interval;
-
---- a/net/ipv4/sysctl_net_ipv4.c
-+++ b/net/ipv4/sysctl_net_ipv4.c
-@@ -39,6 +39,8 @@ static int ip_local_port_range_min[] = {
- static int ip_local_port_range_max[] = { 65535, 65535 };
- static int tcp_adv_win_scale_min = -31;
- static int tcp_adv_win_scale_max = 31;
-+static int tcp_min_snd_mss_min = TCP_MIN_SND_MSS;
-+static int tcp_min_snd_mss_max = 65535;
- static int ip_privileged_port_min;
- static int ip_privileged_port_max = 65535;
- static int ip_ttl_min = 1;
-@@ -749,6 +751,15 @@ static struct ctl_table ipv4_net_table[]
- .proc_handler = proc_dointvec,
- },
- {
-+ .procname = "tcp_min_snd_mss",
-+ .data = &init_net.ipv4.sysctl_tcp_min_snd_mss,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = proc_dointvec_minmax,
-+ .extra1 = &tcp_min_snd_mss_min,
-+ .extra2 = &tcp_min_snd_mss_max,
-+ },
-+ {
- .procname = "tcp_probe_threshold",
- .data = &init_net.ipv4.sysctl_tcp_probe_threshold,
- .maxlen = sizeof(int),
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -2626,6 +2626,7 @@ static int __net_init tcp_sk_init(struct
- net->ipv4.sysctl_tcp_ecn_fallback = 1;
-
- net->ipv4.sysctl_tcp_base_mss = TCP_BASE_MSS;
-+ net->ipv4.sysctl_tcp_min_snd_mss = TCP_MIN_SND_MSS;
- net->ipv4.sysctl_tcp_probe_threshold = TCP_PROBE_THRESHOLD;
- net->ipv4.sysctl_tcp_probe_interval = TCP_PROBE_INTERVAL;
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1462,8 +1462,7 @@ static inline int __tcp_mtu_to_mss(struc
- mss_now -= icsk->icsk_ext_hdr_len;
-
- /* Then reserve room for full set of TCP options and 8 bytes of data */
-- if (mss_now < TCP_MIN_SND_MSS)
-- mss_now = TCP_MIN_SND_MSS;
-+ mss_now = max(mss_now, sock_net(sk)->ipv4.sysctl_tcp_min_snd_mss);
- return mss_now;
- }
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probing.patch new/patches.suse/tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probing.patch
--- old/patches.suse/tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probing.patch 2019-06-17 16:44:35.000000000 +0200
+++ new/patches.suse/tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probing.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-From: Eric Dumazet <edumazet(a)google.com>
-Date: Sat, 8 Jun 2019 10:38:08 -0700
-Subject: tcp: enforce tcp_min_snd_mss in tcp_mtu_probing()
-Patch-mainline: Not yet, embargo
-References: bsc#1137586 CVE-2019-11479
-
-If mtu probing is enabled tcp_mtu_probing() could very well end up
-with a too small MSS.
-
-Use the new sysctl tcp_min_snd_mss to make sure MSS search
-is performed in an acceptable range.
-
-Signed-off-by: Eric Dumazet <edumazet(a)google.com>
-Reported-by: Jonathan Lemon <jonathan.lemon(a)gmail.com>
-Cc: Jonathan Looney <jtl(a)netflix.com>
-Cc: Neal Cardwell <ncardwell(a)google.com>
-Cc: Yuchung Cheng <ycheng(a)google.com>
-Cc: Tyler Hicks <tyhicks(a)canonical.com>
-Cc: Bruce Curtis <brucec(a)netflix.com>
-Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
----
- net/ipv4/tcp_timer.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/net/ipv4/tcp_timer.c
-+++ b/net/ipv4/tcp_timer.c
-@@ -154,6 +154,7 @@ static void tcp_mtu_probing(struct inet_
- mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low) >> 1;
- mss = min(net->ipv4.sysctl_tcp_base_mss, mss);
- mss = max(mss, 68 - tcp_sk(sk)->tcp_header_len);
-+ mss = max(mss, net->ipv4.sysctl_tcp_min_snd_mss);
- icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss);
- }
- tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/tcp-limit-payload-size-of-sacked-skbs.patch new/patches.suse/tcp-limit-payload-size-of-sacked-skbs.patch
--- old/patches.suse/tcp-limit-payload-size-of-sacked-skbs.patch 2019-06-17 16:44:35.000000000 +0200
+++ new/patches.suse/tcp-limit-payload-size-of-sacked-skbs.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,153 +0,0 @@
-From: Eric Dumazet <edumazet(a)google.com>
-Date: Thu, 6 Jun 2019 09:38:45 -0700
-Subject: tcp: limit payload size of sacked skbs
-Patch-mainline: Not yet, embargo
-References: bsc#1137586 CVE-2019-11477
-
-Jonathan Looney reported that TCP can trigger the following crash
-in tcp_shifted_skb() :
-
- BUG_ON(tcp_skb_pcount(skb) < pcount);
-
-This can happen if the remote peer has advertized the smallest
-MSS that linux TCP accepts : 48
-
-An skb can hold 17 fragments, and each fragment can hold 32KB
-on x86, or 64KB on PowerPC.
-
-This means that the 16bit witdh of TCP_SKB_CB(skb)->tcp_gso_segs
-can overflow.
-
-Note that tcp_sendmsg() builds skbs with less than 64KB
-of payload, so this problem needs SACK to be enabled.
-SACK blocks allow TCP to coalesce multiple skbs in the retransmit
-queue, thus filling the 17 fragments to maximal capacity.
-
-Fixes: 832d11c5cd07 ("tcp: Try to restore large SKBs while SACK processing")
-Signed-off-by: Eric Dumazet <edumazet(a)google.com>
-Reported-by: Jonathan Looney <jtl(a)netflix.com>
-Acked-by: Neal Cardwell <ncardwell(a)google.com>
-Reviewed-by: Tyler Hicks <tyhicks(a)canonical.com>
-Cc: Yuchung Cheng <ycheng(a)google.com>
-Cc: Bruce Curtis <brucec(a)netflix.com>
-Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
-
----
- include/linux/tcp.h | 4 ++++
- include/net/tcp.h | 2 ++
- net/ipv4/tcp.c | 1 +
- net/ipv4/tcp_input.c | 26 ++++++++++++++++++++------
- net/ipv4/tcp_output.c | 6 +++---
- 5 files changed, 30 insertions(+), 9 deletions(-)
-
---- a/include/linux/tcp.h
-+++ b/include/linux/tcp.h
-@@ -488,4 +488,8 @@ static inline u16 tcp_mss_clamp(const st
-
- return (user_mss && user_mss < mss) ? user_mss : mss;
- }
-+
-+int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from, int pcount,
-+ int shiftlen);
-+
- #endif /* _LINUX_TCP_H */
---- a/include/net/tcp.h
-+++ b/include/net/tcp.h
-@@ -55,6 +55,8 @@ void tcp_time_wait(struct sock *sk, int
-
- #define MAX_TCP_HEADER (128 + MAX_HEADER)
- #define MAX_TCP_OPTION_SPACE 40
-+#define TCP_MIN_SND_MSS 48
-+#define TCP_MIN_GSO_SIZE (TCP_MIN_SND_MSS - MAX_TCP_OPTION_SPACE)
-
- /*
- * Never offer a window over 32767 without using window scaling. Some
---- a/net/ipv4/tcp.c
-+++ b/net/ipv4/tcp.c
-@@ -3889,6 +3889,7 @@ void __init tcp_init(void)
- unsigned long limit;
- unsigned int i;
-
-+ BUILD_BUG_ON(TCP_MIN_SND_MSS <= MAX_TCP_OPTION_SPACE);
- BUILD_BUG_ON(sizeof(struct tcp_skb_cb) >
- FIELD_SIZEOF(struct sk_buff, cb));
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -1296,7 +1296,7 @@ static bool tcp_shifted_skb(struct sock
- TCP_SKB_CB(skb)->seq += shifted;
-
- tcp_skb_pcount_add(prev, pcount);
-- BUG_ON(tcp_skb_pcount(skb) < pcount);
-+ WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);
- tcp_skb_pcount_add(skb, -pcount);
-
- /* When we're adding to gso_segs == 1, gso_size will be zero,
-@@ -1362,6 +1362,21 @@ static int skb_can_shift(const struct sk
- return !skb_headlen(skb) && skb_is_nonlinear(skb);
- }
-
-+int tcp_skb_shift(struct sk_buff *to, struct sk_buff *from,
-+ int pcount, int shiftlen)
-+{
-+ /* TCP min gso_size is 8 bytes (TCP_MIN_GSO_SIZE)
-+ * Since TCP_SKB_CB(skb)->tcp_gso_segs is 16 bits, we need
-+ * to make sure not storing more than 65535 * 8 bytes per skb,
-+ * even if current MSS is bigger.
-+ */
-+ if (unlikely(to->len + shiftlen >= 65535 * TCP_MIN_GSO_SIZE))
-+ return 0;
-+ if (unlikely(tcp_skb_pcount(to) + pcount > 65535))
-+ return 0;
-+ return skb_shift(to, from, shiftlen);
-+}
-+
- /* Try collapsing SACK blocks spanning across multiple skbs to a single
- * skb.
- */
-@@ -1467,7 +1482,7 @@ static struct sk_buff *tcp_shift_skb_dat
- if (!after(TCP_SKB_CB(skb)->seq + len, tp->snd_una))
- goto fallback;
-
-- if (!skb_shift(prev, skb, len))
-+ if (!tcp_skb_shift(prev, skb, pcount, len))
- goto fallback;
- if (!tcp_shifted_skb(sk, prev, skb, state, pcount, len, mss, dup_sack))
- goto out;
-@@ -1485,11 +1500,10 @@ static struct sk_buff *tcp_shift_skb_dat
- goto out;
-
- len = skb->len;
-- if (skb_shift(prev, skb, len)) {
-- pcount += tcp_skb_pcount(skb);
-- tcp_shifted_skb(sk, prev, skb, state, tcp_skb_pcount(skb),
-+ pcount = tcp_skb_pcount(skb);
-+ if (tcp_skb_shift(prev, skb, pcount, len))
-+ tcp_shifted_skb(sk, prev, skb, state, pcount,
- len, mss, 0);
-- }
-
- out:
- return prev;
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1457,8 +1457,8 @@ static inline int __tcp_mtu_to_mss(struc
- mss_now -= icsk->icsk_ext_hdr_len;
-
- /* Then reserve room for full set of TCP options and 8 bytes of data */
-- if (mss_now < 48)
-- mss_now = 48;
-+ if (mss_now < TCP_MIN_SND_MSS)
-+ mss_now = TCP_MIN_SND_MSS;
- return mss_now;
- }
-
-@@ -2750,7 +2750,7 @@ static bool tcp_collapse_retrans(struct
- if (next_skb_size <= skb_availroom(skb))
- skb_copy_bits(next_skb, 0, skb_put(skb, next_skb_size),
- next_skb_size);
-- else if (!skb_shift(skb, next_skb, next_skb_size))
-+ else if (!tcp_skb_shift(skb, next_skb, 1, next_skb_size))
- return false;
- }
- tcp_highest_sack_replace(sk, next_skb, skb);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/tcp-tcp_fragment-should-apply-sane-memory-limits.patch new/patches.suse/tcp-tcp_fragment-should-apply-sane-memory-limits.patch
--- old/patches.suse/tcp-tcp_fragment-should-apply-sane-memory-limits.patch 2019-06-17 16:44:35.000000000 +0200
+++ new/patches.suse/tcp-tcp_fragment-should-apply-sane-memory-limits.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-From: Eric Dumazet <edumazet(a)google.com>
-Date: Thu, 6 Jun 2019 09:38:46 -0700
-Subject: tcp: tcp_fragment() should apply sane memory limits
-Patch-mainline: Not yet, embargo
-References: bsc#1137586 CVE-2019-11478
-
-Jonathan Looney reported that a malicious peer can force a sender
-to fragment its retransmit queue into tiny skbs, inflating memory
-usage and/or overflow 32bit counters.
-
-TCP allows an application to queue up to sk_sndbuf bytes,
-so we need to give some allowance for non malicious splitting
-of retransmit queue.
-
-A new SNMP counter is added to monitor how many times TCP
-did not allow to split an skb if the allowance was exceeded.
-
-Note that this counter might increase in the case applications
-use SO_SNDBUF socket option to lower sk_sndbuf.
-
-Signed-off-by: Eric Dumazet <edumazet(a)google.com>
-Reported-by: Jonathan Looney <jtl(a)netflix.com>
-Acked-by: Neal Cardwell <ncardwell(a)google.com>
-Acked-by: Yuchung Cheng <ycheng(a)google.com>
-Reviewed-by: Tyler Hicks <tyhicks(a)canonical.com>
-Cc: Bruce Curtis <brucec(a)netflix.com>
-Acked-by: Michal Kubecek <mkubecek(a)suse.cz>
-
----
- include/uapi/linux/snmp.h | 1 +
- net/ipv4/proc.c | 1 +
- net/ipv4/tcp_output.c | 5 +++++
- 3 files changed, 7 insertions(+)
-
---- a/include/uapi/linux/snmp.h
-+++ b/include/uapi/linux/snmp.h
-@@ -283,6 +283,7 @@ enum
- LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */
- LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */
- LINUX_MIB_TCPRCVQDROP, /* TCPRcvQDrop */
-+ LINUX_MIB_TCPWQUEUETOOBIG, /* TCPWqueueTooBig */
- __LINUX_MIB_MAX
- };
-
---- a/net/ipv4/proc.c
-+++ b/net/ipv4/proc.c
-@@ -291,6 +291,7 @@ static const struct snmp_mib snmp4_net_l
- SNMP_MIB_ITEM("TCPAckCompressed", LINUX_MIB_TCPACKCOMPRESSED),
- SNMP_MIB_ITEM("TCPZeroWindowDrop", LINUX_MIB_TCPZEROWINDOWDROP),
- SNMP_MIB_ITEM("TCPRcvQDrop", LINUX_MIB_TCPRCVQDROP),
-+ SNMP_MIB_ITEM("TCPWqueueTooBig", LINUX_MIB_TCPWQUEUETOOBIG),
- SNMP_MIB_SENTINEL
- };
-
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -1299,6 +1299,11 @@ int tcp_fragment(struct sock *sk, enum t
- if (nsize < 0)
- nsize = 0;
-
-+ if (unlikely((sk->sk_wmem_queued >> 1) > sk->sk_sndbuf)) {
-+ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPWQUEUETOOBIG);
-+ return -ENOMEM;
-+ }
-+
- if (skb_unclone(skb, gfp))
- return -ENOMEM;
-
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:46.574936629 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:46.574936629 +0200
@@ -1142,6 +1142,350 @@
patches.kernel.org/5.1.10-155-ALSA-seq-Cover-unsubscribe_port-in-list_mutex…
patches.kernel.org/5.1.10-156-io_uring-fix-failure-to-verify-SQ_AFF-cpu.pat…
patches.kernel.org/5.1.10-157-Linux-5.1.10.patch
+ patches.kernel.org/5.1.11-001-tcp-limit-payload-size-of-sacked-skbs.patch
+ patches.kernel.org/5.1.11-002-tcp-tcp_fragment-should-apply-sane-memory-lim…
+ patches.kernel.org/5.1.11-003-tcp-add-tcp_min_snd_mss-sysctl.patch
+ patches.kernel.org/5.1.11-004-tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probin…
+ patches.kernel.org/5.1.11-005-Linux-5.1.11.patch
+ patches.kernel.org/5.1.12-001-drm-nouveau-add-kconfig-option-to-turn-off-no…
+ patches.kernel.org/5.1.12-002-nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_…
+ patches.kernel.org/5.1.12-003-HID-input-make-sure-the-wheel-high-resolution…
+ patches.kernel.org/5.1.12-004-HID-input-fix-assignment-of-.value.patch
+ patches.kernel.org/5.1.12-005-Revert-HID-Increase-maximum-report-size-allow…
+ patches.kernel.org/5.1.12-006-HID-multitouch-handle-faulty-Elo-touch-device…
+ patches.kernel.org/5.1.12-007-HID-wacom-Don-t-set-tool-type-until-we-re-in-…
+ patches.kernel.org/5.1.12-008-HID-wacom-Don-t-report-anything-prior-to-the-…
+ patches.kernel.org/5.1.12-009-HID-wacom-Send-BTN_TOUCH-in-response-to-INTUO…
+ patches.kernel.org/5.1.12-010-HID-wacom-Correct-button-numbering-2nd-gen-In…
+ patches.kernel.org/5.1.12-011-HID-wacom-Sync-INTUOSP2_BT-touch-state-after-…
+ patches.kernel.org/5.1.12-012-Revert-ALSA-hda-realtek-Improve-the-headset-m…
+ patches.kernel.org/5.1.12-013-ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1…
+ patches.kernel.org/5.1.12-014-ALSA-ice1712-Check-correct-return-value-to-sn…
+ patches.kernel.org/5.1.12-015-ALSA-hda-realtek-Update-headset-mode-for-ALC2…
+ patches.kernel.org/5.1.12-016-ALSA-firewire-motu-fix-destruction-of-data-fo…
+ patches.kernel.org/5.1.12-017-selinux-log-raw-contexts-as-untrusted-strings…
+ patches.kernel.org/5.1.12-018-selinux-fix-a-missing-check-bug-in-selinux_ad…
+ patches.kernel.org/5.1.12-019-selinux-fix-a-missing-check-bug-in-selinux_sb…
+ patches.kernel.org/5.1.12-020-libata-Extend-quirks-for-the-ST1000LM024-driv…
+ patches.kernel.org/5.1.12-021-io_uring-fix-memory-leak-of-UNIX-domain-socke…
+ patches.kernel.org/5.1.12-022-mm-list_lru.c-fix-memory-leak-in-__memcg_init…
+ patches.kernel.org/5.1.12-023-fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock…
+ patches.kernel.org/5.1.12-024-mm-vmscan.c-fix-trying-to-reclaim-unevictable…
+ patches.kernel.org/5.1.12-025-signal-ptrace-Don-t-leak-unitialized-kernel-m…
+ patches.kernel.org/5.1.12-026-ptrace-restore-smp_rmb-in-__ptrace_may_access…
+ patches.kernel.org/5.1.12-027-media-dvb-warning-about-dvb-frequency-limits-…
+ patches.kernel.org/5.1.12-028-iommu-arm-smmu-Avoid-constant-zero-in-TLBI-wr…
+ patches.kernel.org/5.1.12-029-Smack-Restore-the-smackfsdef-mount-option-and…
+ patches.kernel.org/5.1.12-030-i2c-acorn-fix-i2c-warning.patch
+ patches.kernel.org/5.1.12-031-bcache-fix-stack-corruption-by-PRECEDING_KEY.…
+ patches.kernel.org/5.1.12-032-bcache-only-set-BCACHE_DEV_WB_RUNNING-when-ca…
+ patches.kernel.org/5.1.12-033-cgroup-Use-css_tryget-instead-of-css_tryget_o…
+ patches.kernel.org/5.1.12-034-ASoC-cs42xx8-Add-regcache-mask-dirty.patch
+ patches.kernel.org/5.1.12-035-ASoC-fsl_asrc-Fix-the-issue-about-unsupported…
+ patches.kernel.org/5.1.12-036-ASoC-soc-core-fixup-references-at-soc_cleanup…
+ patches.kernel.org/5.1.12-037-drm-amdgpu-uvd-vcn-fetch-ring-s-read_ptr-afte…
+ patches.kernel.org/5.1.12-038-drm-i915-sdvo-Implement-proper-HDMI-audio-sup…
+ patches.kernel.org/5.1.12-039-drm-i915-dsi-Use-a-fuzzy-check-for-burst-mode…
+ patches.kernel.org/5.1.12-040-drm-i915-Fix-per-pixel-alpha-with-CCS.patch
+ patches.kernel.org/5.1.12-041-drm-i915-dmc-protect-against-reading-random-m…
+ patches.kernel.org/5.1.12-042-x86-uaccess-kcov-Disable-stack-protector.patch
+ patches.kernel.org/5.1.12-043-ALSA-seq-Protect-in-kernel-ioctl-calls-with-m…
+ patches.kernel.org/5.1.12-044-ALSA-seq-Fix-race-of-get-subscription-call-vs…
+ patches.kernel.org/5.1.12-045-Revert-ALSA-seq-Protect-in-kernel-ioctl-calls…
+ patches.kernel.org/5.1.12-046-Drivers-misc-fix-out-of-bounds-access-in-func…
+ patches.kernel.org/5.1.12-047-f2fs-fix-to-avoid-accessing-xattr-across-the-…
+ patches.kernel.org/5.1.12-048-drivers-perf-arm_spe-Don-t-error-on-high-orde…
+ patches.kernel.org/5.1.12-049-bpf-sockmap-only-stop-flush-strp-if-it-was-en…
+ patches.kernel.org/5.1.12-050-bpf-sockmap-remove-duplicate-queue-free.patch
+ patches.kernel.org/5.1.12-051-bpf-sockmap-fix-msg-sg.size-account-on-ingres…
+ patches.kernel.org/5.1.12-052-scsi-qla2xxx-Add-cleanup-for-PCI-EEH-recovery…
+ patches.kernel.org/5.1.12-053-scsi-qedi-remove-memset-memcpy-to-nfunc-and-u…
+ patches.kernel.org/5.1.12-054-scsi-qedi-remove-set-but-not-used-variables-c…
+ patches.kernel.org/5.1.12-055-scsi-lpfc-resolve-lockdep-warnings.patch
+ patches.kernel.org/5.1.12-056-scsi-lpfc-correct-rcu-unlock-issue-in-lpfc_nv…
+ patches.kernel.org/5.1.12-057-scsi-lpfc-add-check-for-loss-of-ndlp-when-sen…
+ patches.kernel.org/5.1.12-058-arm64-Print-physical-address-of-page-table-ba…
+ patches.kernel.org/5.1.12-059-net-macb-fix-error-format-in-dev_err.patch
+ patches.kernel.org/5.1.12-060-enetc-Fix-NULL-dma-address-unmap-for-Tx-BD-ex…
+ patches.kernel.org/5.1.12-061-bpf-tcp-correctly-handle-DONT_WAIT-flags-and-…
+ patches.kernel.org/5.1.12-062-arm64-mm-Inhibit-huge-vmap-with-ptdump.patch
+ patches.kernel.org/5.1.12-063-tools-bpftool-move-set_max_rlimit-before-__bp…
+ patches.kernel.org/5.1.12-064-selftests-bpf-fix-bpf_get_current_task.patch
+ patches.kernel.org/5.1.12-065-nvme-pci-Fix-controller-freeze-wait-disabling…
+ patches.kernel.org/5.1.12-066-nvme-fix-srcu-locking-on-error-return-in-nvme…
+ patches.kernel.org/5.1.12-067-nvme-remove-the-ifdef-around-nvme_nvm_ioctl.p…
+ patches.kernel.org/5.1.12-068-nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch
+ patches.kernel.org/5.1.12-069-nvme-release-namespace-SRCU-protection-before…
+ patches.kernel.org/5.1.12-070-nvme-fix-memory-leak-for-power-latency-tolera…
+ patches.kernel.org/5.1.12-071-platform-x86-pmc_atom-Add-Lex-3I380D-industri…
+ patches.kernel.org/5.1.12-072-platform-x86-pmc_atom-Add-several-Beckhoff-Au…
+ patches.kernel.org/5.1.12-073-scsi-myrs-Fix-uninitialized-variable.patch
+ patches.kernel.org/5.1.12-074-scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shif…
+ patches.kernel.org/5.1.12-075-drm-amdgpu-keep-stolen-memory-on-picasso.patch
+ patches.kernel.org/5.1.12-076-libnvdimm-Fix-compilation-warnings-with-W-1.p…
+ patches.kernel.org/5.1.12-077-selftests-fib_rule_tests-fix-local-IPv4-addre…
+ patches.kernel.org/5.1.12-078-selftests-timers-Add-missing-fflush-stdout-ca…
+ patches.kernel.org/5.1.12-079-tracing-Prevent-hist_field_var_ref-from-acces…
+ patches.kernel.org/5.1.12-080-usbnet-ipheth-fix-racing-condition.patch
+ patches.kernel.org/5.1.12-081-nvme-pci-use-blk-mq-mapping-for-unmanaged-irq…
+ patches.kernel.org/5.1.12-082-tools-io_uring-fix-Makefile-for-pthread-libra…
+ patches.kernel.org/5.1.12-083-KVM-arm-arm64-Move-cc-it-checks-under-hyp-s-M…
+ patches.kernel.org/5.1.12-084-KVM-nVMX-really-fix-the-size-checks-on-KVM_SE…
+ patches.kernel.org/5.1.12-085-KVM-selftests-Fix-a-condition-in-test_hv_cpui…
+ patches.kernel.org/5.1.12-086-kvm-vmx-Fix-Wmissing-prototypes-warnings.patch
+ patches.kernel.org/5.1.12-087-KVM-LAPIC-Fix-lapic_timer_advance_ns-paramete…
+ patches.kernel.org/5.1.12-088-KVM-x86-do-not-spam-dmesg-with-VMCS-VMCB-dump…
+ patches.kernel.org/5.1.12-089-KVM-x86-pmu-mask-the-result-of-rdpmc-accordin…
+ patches.kernel.org/5.1.12-090-KVM-x86-pmu-do-not-mask-the-value-that-is-wri…
+ patches.kernel.org/5.1.12-091-KVM-s390-fix-memory-slot-handling-for-KVM_SET…
+ patches.kernel.org/5.1.12-092-kvm-selftests-aarch64-dirty_log_test-fix-unal…
+ patches.kernel.org/5.1.12-093-kvm-selftests-aarch64-fix-default-vm-mode.pat…
+ patches.kernel.org/5.1.12-094-tools-kvm_stat-fix-fields-filter-for-child-ev…
+ patches.kernel.org/5.1.12-095-drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_se…
+ patches.kernel.org/5.1.12-096-drm-vmwgfx-NULL-pointer-dereference-from-vmw_…
+ patches.kernel.org/5.1.12-097-usb-dwc2-Fix-DMA-cache-alignment-issues.patch
+ patches.kernel.org/5.1.12-098-usb-dwc2-host-Fix-wMaxPacketSize-handling-fix…
+ patches.kernel.org/5.1.12-099-USB-Fix-chipmunk-like-voice-when-using-Logite…
+ patches.kernel.org/5.1.12-100-USB-usb-storage-Add-new-ID-to-ums-realtek.pat…
+ patches.kernel.org/5.1.12-101-USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.…
+ patches.kernel.org/5.1.12-102-USB-serial-option-add-support-for-Simcom-SIM7…
+ patches.kernel.org/5.1.12-103-USB-serial-option-add-Telit-0x1260-and-0x1261…
+ patches.kernel.org/5.1.12-104-tracing-uprobe-Fix-NULL-pointer-dereference-i…
+ patches.kernel.org/5.1.12-105-timekeeping-Repair-ktime_get_coarse-granulari…
+ patches.kernel.org/5.1.12-106-RAS-CEC-Convert-the-timer-callback-to-a-workq…
+ patches.kernel.org/5.1.12-107-RAS-CEC-Fix-binary-search-function.patch
+ patches.kernel.org/5.1.12-108-x86-microcode-cpuhotplug-Add-a-microcode-load…
+ patches.kernel.org/5.1.12-109-x86-kasan-Fix-boot-with-5-level-paging-and-KA…
+ patches.kernel.org/5.1.12-110-x86-mm-KASLR-Compute-the-size-of-the-vmemmap-…
+ patches.kernel.org/5.1.12-111-x86-resctrl-Prevent-NULL-pointer-dereference-…
+ patches.kernel.org/5.1.12-112-drm-edid-abstract-override-firmware-EDID-retr…
+ patches.kernel.org/5.1.12-113-drm-add-fallback-override-firmware-EDID-modes…
+ patches.kernel.org/5.1.12-114-powerpc-Fix-kexec-failure-on-book3s-32.patch
+ patches.kernel.org/5.1.12-115-powerpc-64s-Fix-THP-PMD-collapse-serialisatio…
+ patches.kernel.org/5.1.12-116-Linux-5.1.12.patch
+ patches.kernel.org/5.1.13-001-netfilter-nat-fix-udp-checksum-corruption.pat…
+ patches.kernel.org/5.1.13-002-ax25-fix-inconsistent-lock-state-in-ax25_dest…
+ patches.kernel.org/5.1.13-003-be2net-Fix-number-of-Rx-queues-used-for-flow-…
+ patches.kernel.org/5.1.13-004-hv_netvsc-Set-probe-mode-to-sync.patch
+ patches.kernel.org/5.1.13-005-ipv6-flowlabel-fl6_sock_lookup-must-use-atomi…
+ patches.kernel.org/5.1.13-006-lapb-fixed-leak-of-control-blocks.patch
+ patches.kernel.org/5.1.13-007-neigh-fix-use-after-free-read-in-pneigh_get_n…
+ patches.kernel.org/5.1.13-008-net-dsa-rtl8366-Fix-up-VLAN-filtering.patch
+ patches.kernel.org/5.1.13-009-net-openvswitch-do-not-free-vport-if-register…
+ patches.kernel.org/5.1.13-010-net-tls-correctly-account-for-copied-bytes-wi…
+ patches.kernel.org/5.1.13-011-nfc-Ensure-presence-of-required-attributes-in…
+ patches.kernel.org/5.1.13-012-sctp-Free-cookie-before-we-memdup-a-new-one.p…
+ patches.kernel.org/5.1.13-013-sunhv-Fix-device-naming-inconsistency-between…
+ patches.kernel.org/5.1.13-014-tipc-purge-deferredq-list-for-each-grp-member…
+ patches.kernel.org/5.1.13-015-vsock-virtio-set-SOCK_DONE-on-peer-shutdown.p…
+ patches.kernel.org/5.1.13-016-net-mlx5-Avoid-reloading-already-removed-devi…
+ patches.kernel.org/5.1.13-017-vxlan-Don-t-assume-linear-buffers-in-error-ha…
+ patches.kernel.org/5.1.13-018-geneve-Don-t-assume-linear-buffers-in-error-h…
+ patches.kernel.org/5.1.13-019-net-mvpp2-prs-Fix-parser-range-for-VID-filter…
+ patches.kernel.org/5.1.13-020-net-mvpp2-prs-Use-the-correct-helpers-when-re…
+ patches.kernel.org/5.1.13-021-net-dsa-microchip-Don-t-try-to-read-stats-for…
+ patches.kernel.org/5.1.13-022-net-ethtool-Allow-matching-on-vlan-DEI-bit.pa…
+ patches.kernel.org/5.1.13-023-net-mlx5-Update-pci-error-handler-entries-and…
+ patches.kernel.org/5.1.13-024-mlxsw-spectrum_router-Refresh-nexthop-neighbo…
+ patches.kernel.org/5.1.13-025-net-mlx5e-Add-ndo_set_feature-for-uplink-repr…
+ patches.kernel.org/5.1.13-026-mlxsw-spectrum_flower-Fix-TOS-matching.patch
+ patches.kernel.org/5.1.13-027-net-mlx5e-Fix-source-port-matching-in-fdb-pee…
+ patches.kernel.org/5.1.13-028-mlxsw-spectrum_buffers-Reduce-pool-size-on-Sp…
+ patches.kernel.org/5.1.13-029-net-mlx5e-Support-tagged-tunnel-over-bond.pat…
+ patches.kernel.org/5.1.13-030-net-correct-udp-zerocopy-refcnt-also-when-zer…
+ patches.kernel.org/5.1.13-031-net-mlx5e-Avoid-detaching-non-existing-netdev…
+ patches.kernel.org/5.1.13-032-iio-imu-mpu6050-Fix-FIFO-layout-for-ICM20602.…
+ patches.kernel.org/5.1.13-033-staging-erofs-set-sb-s_root-to-NULL-when-fail…
+ patches.kernel.org/5.1.13-034-Staging-vc04_services-Fix-a-couple-error-code…
+ patches.kernel.org/5.1.13-035-staging-wilc1000-Fix-some-double-unlock-bugs-…
+ patches.kernel.org/5.1.13-036-pinctrl-intel-Clear-interrupt-status-in-mask-…
+ patches.kernel.org/5.1.13-037-netfilter-nf_tables-fix-oops-during-rule-dump…
+ patches.kernel.org/5.1.13-038-perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-c…
+ patches.kernel.org/5.1.13-039-netfilter-nf_queue-fix-reinject-verdict-handl…
+ patches.kernel.org/5.1.13-040-netfilter-nft_fib-Fix-existence-check-support…
+ patches.kernel.org/5.1.13-041-ipvs-Fix-use-after-free-in-ip_vs_in.patch
+ patches.kernel.org/5.1.13-042-selftests-netfilter-missing-error-check-when-…
+ patches.kernel.org/5.1.13-043-clk-ti-clkctrl-Fix-clkdm_clk-handling.patch
+ patches.kernel.org/5.1.13-044-powerpc-powernv-Return-for-invalid-IMC-domain…
+ patches.kernel.org/5.1.13-045-usb-xhci-Fix-a-potential-null-pointer-derefer…
+ patches.kernel.org/5.1.13-046-mISDN-make-sure-device-name-is-NUL-terminated…
+ patches.kernel.org/5.1.13-047-x86-CPU-AMD-Don-t-force-the-CPB-cap-when-runn…
+ patches.kernel.org/5.1.13-048-perf-ring_buffer-Fix-exposing-a-temporarily-d…
+ patches.kernel.org/5.1.13-049-perf-ring_buffer-Add-ordering-to-rb-nest-incr…
+ patches.kernel.org/5.1.13-050-perf-ring-buffer-Always-use-READ-WRITE-_ONCE-…
+ patches.kernel.org/5.1.13-051-gpio-fix-gpio-adp5588-build-errors.patch
+ patches.kernel.org/5.1.13-052-net-stmmac-update-rx-tail-pointer-register-to…
+ patches.kernel.org/5.1.13-053-net-stmmac-fix-csr_clk-can-t-be-zero-issue.pa…
+ patches.kernel.org/5.1.13-054-net-stmmac-dwmac-mediatek-modify-csr_clk-valu…
+ patches.kernel.org/5.1.13-055-io_uring-Fix-__io_uring_register-false-succes…
+ patches.kernel.org/5.1.13-056-dpaa2-eth-Fix-potential-spectre-issue.patch
+ patches.kernel.org/5.1.13-057-dpaa2-eth-Use-PTR_ERR_OR_ZERO-where-appropria…
+ patches.kernel.org/5.1.13-058-net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_…
+ patches.kernel.org/5.1.13-059-ACPI-PCI-PM-Add-missing-wakeup.flags.valid-ch…
+ patches.kernel.org/5.1.13-060-drm-etnaviv-lock-MMU-while-dumping-core.patch
+ patches.kernel.org/5.1.13-061-net-aquantia-tx-clean-budget-logic-error.patch
+ patches.kernel.org/5.1.13-062-net-aquantia-fix-LRO-with-FCS-error.patch
+ patches.kernel.org/5.1.13-063-i2c-dev-fix-potential-memory-leak-in-i2cdev_i…
+ patches.kernel.org/5.1.13-064-ALSA-hda-Force-polling-mode-on-CNL-for-fixing…
+ patches.kernel.org/5.1.13-065-configfs-Fix-use-after-free-when-accessing-sd…
+ patches.kernel.org/5.1.13-066-perf-data-Fix-strncat-may-truncate-build-fail…
+ patches.kernel.org/5.1.13-067-s390-zcrypt-Fix-wrong-dispatching-for-control…
+ patches.kernel.org/5.1.13-068-perf-namespace-Protect-reading-thread-s-names…
+ patches.kernel.org/5.1.13-069-perf-record-Fix-s390-missing-module-symbol-an…
+ patches.kernel.org/5.1.13-070-ia64-fix-build-errors-by-exporting-paddr_to_n…
+ patches.kernel.org/5.1.13-071-dpaa_eth-use-only-online-CPU-portals.patch
+ patches.kernel.org/5.1.13-072-xen-pvcalls-Remove-set-but-not-used-variable.…
+ patches.kernel.org/5.1.13-073-xenbus-Avoid-deadlock-during-suspend-due-to-o…
+ patches.kernel.org/5.1.13-074-dfs_cache-fix-a-wrong-use-of-kfree-in-flush_c…
+ patches.kernel.org/5.1.13-075-KVM-PPC-Book3S-HV-Use-new-mutex-to-synchroniz…
+ patches.kernel.org/5.1.13-076-KVM-PPC-Book3S-Use-new-mutex-to-synchronize-a…
+ patches.kernel.org/5.1.13-077-KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-…
+ patches.kernel.org/5.1.13-078-ALSA-fireface-Use-ULL-suffixes-for-64-bit-con…
+ patches.kernel.org/5.1.13-079-arm64-fix-syscall_fn_t-type.patch
+ patches.kernel.org/5.1.13-080-arm64-use-the-correct-function-type-in-SYSCAL…
+ patches.kernel.org/5.1.13-081-arm64-use-the-correct-function-type-for-__arm…
+ patches.kernel.org/5.1.13-082-net-sh_eth-fix-mdio-access-in-sh_eth_close-fo…
+ patches.kernel.org/5.1.13-083-blk-mq-Fix-memory-leak-in-error-handling.patch
+ patches.kernel.org/5.1.13-084-net-phylink-ensure-consistent-phy-interface-m…
+ patches.kernel.org/5.1.13-085-net-phy-dp83867-fix-speed-10-in-sgmii-mode.pa…
+ patches.kernel.org/5.1.13-086-net-phy-dp83867-increase-SGMII-autoneg-timer-…
+ patches.kernel.org/5.1.13-087-net-phy-dp83867-Set-up-RGMII-TX-delay.patch
+ patches.kernel.org/5.1.13-088-scsi-libcxgbi-add-a-check-for-NULL-pointer-in…
+ patches.kernel.org/5.1.13-089-scsi-smartpqi-properly-set-both-the-DMA-mask-…
+ patches.kernel.org/5.1.13-090-scsi-scsi_dh_alua-Fix-possible-null-ptr-deref…
+ patches.kernel.org/5.1.13-091-scsi-libsas-delete-sas-port-if-expander-disco…
+ patches.kernel.org/5.1.13-092-mlxsw-spectrum-Prevent-force-of-56G.patch
+ patches.kernel.org/5.1.13-093-ocfs2-fix-error-path-kobject-memory-leak.patch
+ patches.kernel.org/5.1.13-094-mm-mmu_gather-remove-__tlb_reset_range-for-fo…
+ patches.kernel.org/5.1.13-095-nvme-tcp-rename-function-to-have-nvme_tcp-pre…
+ patches.kernel.org/5.1.13-096-nvme-tcp-fix-possible-null-deref-on-a-timed-o…
+ patches.kernel.org/5.1.13-097-nvme-tcp-fix-queue-mapping-when-queue-count-i…
+ patches.kernel.org/5.1.13-098-coredump-fix-race-condition-between-collapse_…
+ patches.kernel.org/5.1.13-099-Linux-5.1.13.patch
+ patches.kernel.org/5.1.14-001-tcp-refine-memory-limit-test-in-tcp_fragment.…
+ patches.kernel.org/5.1.14-002-Linux-5.1.14.patch
+ patches.kernel.org/5.1.15-001-tracing-Silence-GCC-9-array-bounds-warning.pa…
+ patches.kernel.org/5.1.15-002-mmc-sdhci-sdhci-pci-o2micro-Correctly-set-bus…
+ patches.kernel.org/5.1.15-003-mmc-sdhi-disallow-HS400-for-M3-W-ES1.2-RZ-G2M…
+ patches.kernel.org/5.1.15-004-mmc-mediatek-fix-SDIO-IRQ-interrupt-handle-fl…
+ patches.kernel.org/5.1.15-005-mmc-mediatek-fix-SDIO-IRQ-detection-issue.pat…
+ patches.kernel.org/5.1.15-006-mmc-core-API-to-temporarily-disable-retuning-…
+ patches.kernel.org/5.1.15-007-mmc-core-Add-sdio_retune_hold_now-and-sdio_re…
+ patches.kernel.org/5.1.15-008-mmc-core-Prevent-processing-SDIO-IRQs-when-th…
+ patches.kernel.org/5.1.15-009-scsi-ufs-Avoid-runtime-suspend-possibly-being…
+ patches.kernel.org/5.1.15-010-usb-chipidea-udc-workaround-for-endpoint-conf…
+ patches.kernel.org/5.1.15-011-xhci-detect-USB-3.2-capable-host-controllers-…
+ patches.kernel.org/5.1.15-012-usb-xhci-Don-t-try-to-recover-an-endpoint-if-…
+ patches.kernel.org/5.1.15-013-cifs-add-spinlock-for-the-openFileList-to-cif…
+ patches.kernel.org/5.1.15-014-cifs-fix-GlobalMid_Lock-bug-in-cifs_reconnect…
+ patches.kernel.org/5.1.15-015-IB-hfi1-Validate-fault-injection-opcode-user-…
+ patches.kernel.org/5.1.15-016-IB-hfi1-Close-PSM-sdma_progress-sleep-window.…
+ patches.kernel.org/5.1.15-017-IB-hfi1-Avoid-hardlockup-with-flushlist_lock.…
+ patches.kernel.org/5.1.15-018-IB-hfi1-Correct-tid-qp-rcd-to-match-verbs-con…
+ patches.kernel.org/5.1.15-019-IB-hfi1-Silence-txreq-allocation-warnings.pat…
+ patches.kernel.org/5.1.15-020-iio-imu-st_lsm6dsx-fix-PM-support-for-st_lsm6…
+ patches.kernel.org/5.1.15-021-iio-temperature-mlx90632-Relax-the-compatibil…
+ patches.kernel.org/5.1.15-022-Input-synaptics-enable-SMBus-on-ThinkPad-E480…
+ patches.kernel.org/5.1.15-023-Input-uinput-add-compat-ioctl-number-translat…
+ patches.kernel.org/5.1.15-024-Input-silead-add-MSSL0017-to-acpi_device_id.p…
+ patches.kernel.org/5.1.15-025-apparmor-fix-PROFILE_MEDIATES-for-untrusted-i…
+ patches.kernel.org/5.1.15-026-apparmor-enforce-nullbyte-at-end-of-tag-strin…
+ patches.kernel.org/5.1.15-027-apparmor-reset-pos-on-failure-to-unpack-for-v…
+ patches.kernel.org/5.1.15-028-Revert-brcmfmac-disable-command-decode-in-sdi…
+ patches.kernel.org/5.1.15-029-brcmfmac-sdio-Disable-auto-tuning-around-comm…
+ patches.kernel.org/5.1.15-030-brcmfmac-sdio-Don-t-tune-while-the-card-is-of…
+ patches.kernel.org/5.1.15-031-lkdtm-usercopy-Moves-the-KERNEL_DS-test-to-no…
+ patches.kernel.org/5.1.15-032-ARC-fix-build-warnings.patch
+ patches.kernel.org/5.1.15-033-dmaengine-jz4780-Fix-transfers-being-ACKed-to…
+ patches.kernel.org/5.1.15-034-dmaengine-dw-axi-dmac-fix-null-dereference-wh…
+ patches.kernel.org/5.1.15-035-dmaengine-mediatek-cqdma-sleeping-in-atomic-c…
+ patches.kernel.org/5.1.15-036-dmaengine-sprd-Fix-the-possible-crash-when-ge…
+ patches.kernel.org/5.1.15-037-dmaengine-sprd-Add-validation-of-current-desc…
+ patches.kernel.org/5.1.15-038-dmaengine-sprd-Fix-the-incorrect-start-for-2-…
+ patches.kernel.org/5.1.15-039-dmaengine-sprd-Fix-block-length-overflow.patch
+ patches.kernel.org/5.1.15-040-dmaengine-sprd-Fix-the-right-place-to-configu…
+ patches.kernel.org/5.1.15-041-ARC-plat-hsdk-Add-missing-multicast-filter-bi…
+ patches.kernel.org/5.1.15-042-ARC-plat-hsdk-Add-missing-FIFO-size-entry-in-…
+ patches.kernel.org/5.1.15-043-MIPS-mark-ginvt-as-__always_inline.patch
+ patches.kernel.org/5.1.15-044-fpga-stratix10-soc-fix-use-after-free-on-s10_…
+ patches.kernel.org/5.1.15-045-fpga-dfl-afu-Pass-the-correct-device-to-dma_m…
+ patches.kernel.org/5.1.15-046-fpga-dfl-Add-lockdep-classes-for-pdata-lock.p…
+ patches.kernel.org/5.1.15-047-parport-Fix-mem-leak-in-parport_register_dev_…
+ patches.kernel.org/5.1.15-048-parisc-Fix-compiler-warnings-in-float-emulati…
+ patches.kernel.org/5.1.15-049-habanalabs-fix-bug-in-checking-huge-page-opti…
+ patches.kernel.org/5.1.15-050-IB-rdmavt-Fix-alloc_qpn-WARN_ON.patch
+ patches.kernel.org/5.1.15-051-IB-hfi1-Insure-freeze_work-work_struct-is-can…
+ patches.kernel.org/5.1.15-052-IB-qib-hfi1-rdmavt-Correct-ibv_devinfo-max_mr…
+ patches.kernel.org/5.1.15-053-IB-hfi1-Validate-page-aligned-for-a-given-vir…
+ patches.kernel.org/5.1.15-054-MIPS-uprobes-remove-set-but-not-used-variable…
+ patches.kernel.org/5.1.15-055-crypto-hmac-fix-memory-leak-in-hmac_init_tfm.…
+ patches.kernel.org/5.1.15-056-xtensa-Fix-section-mismatch-between-memblock_…
+ patches.kernel.org/5.1.15-057-kselftest-cgroup-fix-unexpected-testing-failu…
+ patches.kernel.org/5.1.15-058-kselftest-cgroup-fix-unexpected-testing-failu…
+ patches.kernel.org/5.1.15-059-kselftest-cgroup-fix-incorrect-test_core-skip…
+ patches.kernel.org/5.1.15-060-userfaultfd-selftest-fix-compiler-warning.pat…
+ patches.kernel.org/5.1.15-061-selftests-vm-install-test_vmalloc.sh-for-run_…
+ patches.kernel.org/5.1.15-062-net-dsa-mv88e6xxx-avoid-error-message-on-remo…
+ patches.kernel.org/5.1.15-063-net-hns-Fix-loopback-test-failed-at-copper-po…
+ patches.kernel.org/5.1.15-064-mdesc-fix-a-missing-check-bug-in-get_vdev_por…
+ patches.kernel.org/5.1.15-065-sparc-perf-fix-updated-event-period-in-respon…
+ patches.kernel.org/5.1.15-066-net-ethernet-mediatek-Use-hw_feature-to-judge…
+ patches.kernel.org/5.1.15-067-net-ethernet-mediatek-Use-NET_IP_ALIGN-to-jud…
+ patches.kernel.org/5.1.15-068-selftests-set-sysctl-bc_forwarding-properly-i…
+ patches.kernel.org/5.1.15-069-drm-arm-mali-dp-Add-a-loop-around-the-second-…
+ patches.kernel.org/5.1.15-070-drm-arm-hdlcd-Actually-validate-CRTC-modes.pa…
+ patches.kernel.org/5.1.15-071-drm-arm-hdlcd-Allow-a-bit-of-clock-tolerance.…
+ patches.kernel.org/5.1.15-072-nvmet-fix-data_len-to-0-for-bdev-backed-write…
+ patches.kernel.org/5.1.15-073-kbuild-tar-pkg-enable-communication-with-jobs…
+ patches.kernel.org/5.1.15-074-scripts-checkstack.pl-Fix-arm64-wrong-or-unkn…
+ patches.kernel.org/5.1.15-075-net-phylink-avoid-reducing-support-mask.patch
+ patches.kernel.org/5.1.15-076-scsi-ufs-Check-that-space-was-properly-alloce…
+ patches.kernel.org/5.1.15-077-scsi-smartpqi-unlock-on-error-in-pqi_submit_r…
+ patches.kernel.org/5.1.15-078-net-ipvlan-Fix-ipvlan-device-tso-disabled-whi…
+ patches.kernel.org/5.1.15-079-udmabuf-actually-unmap-the-scatterlist.patch
+ patches.kernel.org/5.1.15-080-tests-fix-pidfd-test-compilation.patch
+ patches.kernel.org/5.1.15-081-s390-qeth-handle-limited-IPv4-broadcast-in-L3…
+ patches.kernel.org/5.1.15-082-s390-qeth-check-dst-entry-before-use.patch
+ patches.kernel.org/5.1.15-083-s390-qeth-fix-VLAN-attribute-in-bridge_hostno…
+ patches.kernel.org/5.1.15-084-hwmon-core-add-thermal-sensors-only-if-dev-of…
+ patches.kernel.org/5.1.15-085-hwmon-pmbus-core-Treat-parameters-as-paged-if…
+ patches.kernel.org/5.1.15-086-arm64-Silence-gcc-warnings-about-arch-ABI-dri…
+ patches.kernel.org/5.1.15-087-nvme-Fix-u32-overflow-in-the-number-of-namesp…
+ patches.kernel.org/5.1.15-088-ovl-detect-overlapping-layers.patch
+ patches.kernel.org/5.1.15-089-ovl-don-t-fail-with-disconnected-lower-NFS.pa…
+ patches.kernel.org/5.1.15-090-ovl-fix-bogus-Wmaybe-unitialized-warning.patch
+ patches.kernel.org/5.1.15-091-btrfs-start-readahead-also-in-seed-devices.pa…
+ patches.kernel.org/5.1.15-092-can-xilinx_can-use-correct-bittiming_const-fo…
+ patches.kernel.org/5.1.15-093-can-flexcan-fix-timeout-when-set-small-bitrat…
+ patches.kernel.org/5.1.15-094-can-purge-socket-error-queue-on-sock-destruct…
+ patches.kernel.org/5.1.15-095-riscv-mm-synchronize-MMU-after-pte-change.pat…
+ patches.kernel.org/5.1.15-096-powerpc-bpf-use-unsigned-division-instruction…
+ patches.kernel.org/5.1.15-097-ARM-imx-cpuidle-imx6sx-Restrict-the-SW2ISO-in…
+ patches.kernel.org/5.1.15-098-ARM-mvebu_v7_defconfig-fix-Ethernet-on-Clearf…
+ patches.kernel.org/5.1.15-099-ARM-dts-dra76x-Update-MMC2_HS200_MANUAL1-iode…
+ patches.kernel.org/5.1.15-100-ARM-dts-am57xx-idk-Remove-support-for-voltage…
+ patches.kernel.org/5.1.15-101-arm64-sve-uapi-asm-ptrace.h-should-not-depend…
+ patches.kernel.org/5.1.15-102-arm64-ssbd-explicitly-depend-on-linux-prctl.h…
+ patches.kernel.org/5.1.15-103-KVM-x86-mmu-Allocate-PAE-root-array-when-usin…
+ patches.kernel.org/5.1.15-104-ovl-make-i_ino-consistent-with-st_ino-in-more…
+ patches.kernel.org/5.1.15-105-drm-vmwgfx-Use-the-backdoor-port-if-the-HB-po…
+ patches.kernel.org/5.1.15-106-drm-i915-Don-t-clobber-M-N-values-during-fast…
+ patches.kernel.org/5.1.15-107-binder-fix-possible-UAF-when-freeing-buffer.p…
+ patches.kernel.org/5.1.15-108-staging-erofs-add-requirements-field-in-super…
+ patches.kernel.org/5.1.15-109-Bluetooth-Align-minimum-encryption-key-size-f…
+ patches.kernel.org/5.1.15-110-Bluetooth-Fix-regression-with-minimum-encrypt…
+ patches.kernel.org/5.1.15-111-SMB3-retry-on-STATUS_INSUFFICIENT_RESOURCES-i…
+ patches.kernel.org/5.1.15-112-x86-vdso-Prevent-segfaults-due-to-hoisted-vcl…
+ patches.kernel.org/5.1.15-113-fs-namespace-fix-unprivileged-mount-propagati…
+ patches.kernel.org/5.1.15-114-cfg80211-fix-memory-leak-of-wiphy-device-name…
+ patches.kernel.org/5.1.15-115-mac80211-drop-robust-management-frames-from-u…
+ patches.kernel.org/5.1.15-116-nl-mac-80211-allow-4addr-AP-operation-on-cryp…
+ patches.kernel.org/5.1.15-117-mac80211-handle-deauthentication-disassociati…
+ patches.kernel.org/5.1.15-118-nl80211-fix-station_info-pertid-memory-leak.p…
+ patches.kernel.org/5.1.15-119-mac80211-Do-not-use-stack-memory-with-scatter…
+ patches.kernel.org/5.1.15-120-x86-resctrl-Don-t-stop-walking-closids-when-a…
+ patches.kernel.org/5.1.15-121-powerpc-mm-64s-hash-Reallocate-context-ids-on…
+ patches.kernel.org/5.1.15-122-Linux-5.1.15.patch
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -1306,10 +1650,6 @@
########################################################
# Networking Core
########################################################
- patches.suse/tcp-limit-payload-size-of-sacked-skbs.patch
- patches.suse/tcp-tcp_fragment-should-apply-sane-memory-limits.patch
- patches.suse/tcp-add-tcp_min_snd_mss-sysctl.patch
- patches.suse/tcp-enforce-tcp_min_snd_mss-in-tcp_mtu_probing.patch
########################################################
# Netfilter
@@ -1378,6 +1718,9 @@
########################################################
# Overlayfs
########################################################
+ patches.suse/Revert-ovl-fix-bogus-Wmaybe-unitialized-warning.patch
+ patches.suse/Revert-ovl-don-t-fail-with-disconnected-lower-NFS.patch
+ patches.suse/Revert-ovl-detect-overlapping-layers.patch
########################################################
# Swap-over-NFS
@@ -1441,6 +1784,8 @@
# USB
########################################################
+ patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
+
########################################################
# I2C
########################################################
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.jXuFrX/_old 2019-07-03 15:14:46.614936711 +0200
+++ /var/tmp/diff_new_pack.jXuFrX/_new 2019-07-03 15:14:46.614936711 +0200
@@ -1,3 +1,3 @@
-2019-06-17 14:44:35 +0000
-GIT Revision: ad24342b53c2ac90b16b903f897bd01f775351e5
+2019-07-02 10:39:52 +0000
+GIT Revision: cb24bc9dd58259b08d1ba9d1a95711f657f1cf9b
GIT Branch: stable
1
0
Hello community,
here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-07-02 21:03:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000product (Old)
and /work/SRC/openSUSE:Factory/.000product.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000product"
Tue Jul 2 21:03:26 2019 rev:1389 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.691672515 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.695672522 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-Addon-NonOss___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE-Addon-NonOss___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190701,openSUSE NonOSS Addon</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-addon-nonoss:20190702,openSUSE NonOSS Addon</productinfo>
<productinfo name="LINGUAS">af ar be_BY bg br ca cy el et ga gl gu_IN he hi_IN hr ka km ko lt mk nn pa_IN rw sk sl sr_CS ss st tg th tr uk ve vi xh zu </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019… obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-Addon-NonOss/2019…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.711672546 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.715672552 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE-MicroOS___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE-MicroOS___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190701,openSUSE MicroOS</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-microos:20190702,openSUSE MicroOS</productinfo>
<productinfo name="LINGUAS">en_US </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190701/…</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE-MicroOS/20190702/…</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change
++++++ openSUSE-cd-mini-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.747672601 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.747672601 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190701,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190702,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-cd-mini-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.763672625 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.763672625 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190701,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190702,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ openSUSE-dvd5-dvd-i586.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.775672643 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.775672643 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -32,11 +32,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190701,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190702,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/i586</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/i586</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -4482,7 +4482,12 @@
<repopackage name="ruby2.6-rubygem-file-tail"/>
<repopackage name="ruby2.6-rubygem-flog"/>
<repopackage name="ruby2.6-rubygem-fluentd"/>
+ <repopackage name="ruby2.6-rubygem-fog-core"/>
+ <repopackage name="ruby2.6-rubygem-fog-json"/>
+ <repopackage name="ruby2.6-rubygem-fog-libvirt"/>
+ <repopackage name="ruby2.6-rubygem-fog-xml"/>
<repopackage name="ruby2.6-rubygem-font-awesome-rails"/>
+ <repopackage name="ruby2.6-rubygem-formatador"/>
<repopackage name="ruby2.6-rubygem-forwardable-extended"/>
<repopackage name="ruby2.6-rubygem-gem2rpm"/>
<repopackage name="ruby2.6-rubygem-get_process_mem"/>
++++++ openSUSE-dvd5-dvd-x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.791672668 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.791672668 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -35,11 +35,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190701,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190702,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
<productoption name="PLUGIN_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
@@ -4723,7 +4723,12 @@
<repopackage name="ruby2.6-rubygem-file-tail"/>
<repopackage name="ruby2.6-rubygem-flog"/>
<repopackage name="ruby2.6-rubygem-fluentd"/>
+ <repopackage name="ruby2.6-rubygem-fog-core"/>
+ <repopackage name="ruby2.6-rubygem-fog-json"/>
+ <repopackage name="ruby2.6-rubygem-fog-libvirt"/>
+ <repopackage name="ruby2.6-rubygem-fog-xml"/>
<repopackage name="ruby2.6-rubygem-font-awesome-rails"/>
+ <repopackage name="ruby2.6-rubygem-formatador"/>
<repopackage name="ruby2.6-rubygem-forwardable-extended"/>
<repopackage name="ruby2.6-rubygem-gem2rpm"/>
<repopackage name="ruby2.6-rubygem-get_process_mem"/>
++++++ openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.803672686 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.803672686 +0200
@@ -1,4 +1,4 @@
-<image name="OBS__openSUSE___20190701" schemaversion="4.1">
+<image name="OBS__openSUSE___20190702" schemaversion="4.1">
<description type="system">
<author>The SUSE Team</author>
<contact>build(a)opensuse.org</contact>
@@ -24,7 +24,7 @@
<productvar name="DISTNAME">openSUSE</productvar>
<productvar name="FLAVOR">ftp</productvar>
<productvar name="MAKE_LISTINGS">true</productvar>
- <productvar name="MEDIUM_NAME">openSUSE-20190701-i586-x86_64</productvar>
+ <productvar name="MEDIUM_NAME">openSUSE-20190702-i586-x86_64</productvar>
<productvar name="MULTIPLE_MEDIA">true</productvar>
<productvar name="PRODUCT_DIR">/</productvar>
<productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar>
@@ -36,11 +36,11 @@
<productvar name="SEPARATE_MEDIA">true</productvar>
<productvar name="SHA1OPT">-x -2</productvar>
<productvar name="VENDOR">openSUSE</productvar>
- <productvar name="VERSION">20190701</productvar>
+ <productvar name="VERSION">20190702</productvar>
<productinfo name="CONTENTSTYLE">11</productinfo>
- <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190701,openSUSE Tumbleweed</productinfo>
+ <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20190702,openSUSE Tumbleweed</productinfo>
<productinfo name="LINGUAS">cs da de el en en_GB en_US es fr hu it ja pl pt pt_BR ru zh zh_CN zh_TW </productinfo>
- <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190701/x86_64</productinfo>
+ <productinfo name="REPOID">obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/i586 obsproduct://build.opensuse.org/openSUSE:Factory/openSUSE/20190702/x86_64</productinfo>
<productinfo name="VENDOR">openSUSE</productinfo>
<productoption name="DEBUGMEDIUM">2</productoption>
<productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption>
++++++ dvd.group ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.899672833 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.903672838 +0200
@@ -4432,7 +4432,12 @@
<package name="ruby2.6-rubygem-file-tail" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-flog" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-fluentd" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+ <package name="ruby2.6-rubygem-fog-core" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+ <package name="ruby2.6-rubygem-fog-json" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+ <package name="ruby2.6-rubygem-fog-libvirt" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+ <package name="ruby2.6-rubygem-fog-xml" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-font-awesome-rails" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
+ <package name="ruby2.6-rubygem-formatador" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-forwardable-extended" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
<package name="ruby2.6-rubygem-gem2rpm" supportstatus="unsupported"/> <!-- reason: dvd:patterns-gnome-gnome -->
<package name="ruby2.6-rubygem-get_process_mem" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
++++++ unsorted.yml ++++++
--- /var/tmp/diff_new_pack.JSNDM8/_old 2019-07-02 21:03:42.999672985 +0200
+++ /var/tmp/diff_new_pack.JSNDM8/_new 2019-07-02 21:03:42.999672985 +0200
@@ -466,6 +466,8 @@
- apache-commons-compress-javadoc
- apache-commons-configuration
- apache-commons-configuration-javadoc
+ - apache-commons-csv
+ - apache-commons-csv-javadoc
- apache-commons-daemon
- apache-commons-daemon-javadoc
- apache-commons-daemon-jsvc
@@ -505,6 +507,8 @@
- apache-commons-pool-javadoc
- apache-commons-pool2
- apache-commons-pool2-javadoc
+ - apache-commons-text
+ - apache-commons-text-javadoc
- apache-commons-validator
- apache-commons-validator-javadoc
- apache-commons-vfs2
@@ -1937,6 +1941,9 @@
- csmith
- csound
- csound-devel
+ - csound-java-bindings
+ - csound-lang
+ - csound-plugins
- cspctl: [i586]
- csvprintf
- csync
@@ -5676,6 +5683,15 @@
- jrosetta
- jrtplib-devel
- jsch
+ - jsch-agent-proxy-connector-factory
+ - jsch-agent-proxy-core
+ - jsch-agent-proxy-javadoc
+ - jsch-agent-proxy-jsch
+ - jsch-agent-proxy-pageant
+ - jsch-agent-proxy-sshagent
+ - jsch-agent-proxy-svnkit-trilead-ssh2
+ - jsch-agent-proxy-usocket-jna
+ - jsch-agent-proxy-usocket-nc
- jsch-demo
- jsch-javadoc
- jshon
@@ -7969,6 +7985,8 @@
- libcrystalhd3-32bit: [x86_64]
- libcsirocsa0
- libcsironn0
+ - libcsnd6-6_0
+ - libcsound64-6_0
- libcsparse3
- libcsplit-devel
- libcsplit1
@@ -11456,7 +11474,7 @@
- libvamp-hostsdk3-32bit: [x86_64]
- libvamp-sdk2
- libvamp-sdk2-32bit: [x86_64]
- - libvapoursynth-45
+ - libvapoursynth-46
- libvapoursynth-script0
- libvarnishapi2
- libvbr2
@@ -12186,8 +12204,6 @@
- lpe
- lpsolve
- lpsolve-devel
- - lrcShow-X
- - lrcShow-X-lang
- lrslib
- lrslib-devel
- lsb
@@ -12703,6 +12719,8 @@
- maven-surefire-plugin-bootstrap
- maven-surefire-plugins-javadoc
- maven-surefire-provider-junit
+ - maven-surefire-provider-junit5
+ - maven-surefire-provider-junit5-javadoc
- maven-surefire-provider-testng
- maven-surefire-report-parser
- maven-surefire-report-plugin
@@ -22194,10 +22212,17 @@
- ruby2.6-rubygem-flog-testsuite
- ruby2.6-rubygem-fluentd-doc
- ruby2.6-rubygem-fluentd-testsuite
+ - ruby2.6-rubygem-fog-core-doc
+ - ruby2.6-rubygem-fog-core-testsuite
+ - ruby2.6-rubygem-fog-json-doc
+ - ruby2.6-rubygem-fog-json-testsuite
+ - ruby2.6-rubygem-fog-libvirt-doc
+ - ruby2.6-rubygem-fog-xml-doc
+ - ruby2.6-rubygem-fog-xml-testsuite
- ruby2.6-rubygem-font-awesome-rails-doc
- ruby2.6-rubygem-font-awesome-rails-testsuite
+ - ruby2.6-rubygem-formatador-doc
- ruby2.6-rubygem-forwardable-extended-doc
- - ruby2.6-rubygem-gem2rpm-doc
- ruby2.6-rubygem-get_process_mem-doc
- ruby2.6-rubygem-get_process_mem-testsuite
- ruby2.6-rubygem-gettext-doc
@@ -31586,7 +31611,6 @@
- vulkan-headers
- vulkan-tools
- vulkan-validationlayers
- - vulkan-validationlayers-devel
- vusb-analyzer
- w3c-markup-validator
- w3c-markup-validator-libs
1
0
Hello community,
here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2019-07-02 21:03:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/000release-packages (Old)
and /work/SRC/openSUSE:Factory/.000release-packages.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "000release-packages"
Tue Jul 2 21:03:22 2019 rev:187 rq: version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-Addon-NonOss-release.spec ++++++
--- /var/tmp/diff_new_pack.JL3STN/_old 2019-07-02 21:03:40.739669542 +0200
+++ /var/tmp/diff_new_pack.JL3STN/_new 2019-07-02 21:03:40.739669542 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package openSUSE-Addon-NonOss-release (Version 20190701)
+# spec file for package openSUSE-Addon-NonOss-release (Version 20190702)
#
# Copyright (c) 2019 openSUSE.
#
@@ -16,16 +16,16 @@
Name: openSUSE-Addon-NonOss-release
%define product openSUSE-Addon-NonOss
Summary: openSUSE NonOSS Addon
-Version: 20190701
+Version: 20190702
Release: 0
License: BSD-3-Clause
Group: System/Fhs
Provides: %name-%version
Provides: product() = openSUSE-Addon-NonOss
-Provides: product(openSUSE-Addon-NonOss) = 20190701-0
+Provides: product(openSUSE-Addon-NonOss) = 20190702-0
Provides: product-label() = non%20oss%20addon
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190701
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20190702
AutoReqProv: on
@@ -49,10 +49,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-Addon-NonOss</name>
- <version>20190701</version>
+ <version>20190702</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190701</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20190702</cpeid>
<register>
<pool>
</pool>
++++++ openSUSE-MicroOS-release.spec ++++++
--- /var/tmp/diff_new_pack.JL3STN/_old 2019-07-02 21:03:40.771669590 +0200
+++ /var/tmp/diff_new_pack.JL3STN/_new 2019-07-02 21:03:40.775669597 +0200
@@ -17,7 +17,7 @@
Name: openSUSE-MicroOS-release
-Version: 20190701
+Version: 20190702
Release: 0
Summary: openSUSE MicroOS
License: GPL-2.0-or-later
@@ -40,9 +40,9 @@
ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64
Provides: %name-%version
Provides: product() = openSUSE-MicroOS
-Provides: product(openSUSE-MicroOS) = 20190701-0
+Provides: product(openSUSE-MicroOS) = 20190702-0
Provides: product-label() = openSUSE%20MicroOS
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190701
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dmicroos%3A20190702
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-endoflife()
Requires: product_flavor(openSUSE-MicroOS)
@@ -58,7 +58,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE-MicroOS) = 20190701-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190702-0
Summary: openSUSE MicroOS
%description dvd
@@ -74,7 +74,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(kubic-dvd)
-Provides: product_flavor(openSUSE-MicroOS) = 20190701-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190702-0
Summary: openSUSE MicroOS
%description kubic-dvd
@@ -90,7 +90,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE-MicroOS) = 20190701-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190702-0
Summary: openSUSE MicroOS
%description appliance
@@ -106,7 +106,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance-kubic)
-Provides: product_flavor(openSUSE-MicroOS) = 20190701-0
+Provides: product_flavor(openSUSE-MicroOS) = 20190702-0
Summary: openSUSE MicroOS
%description appliance-kubic
@@ -164,11 +164,11 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE-MicroOS</name>
- <version>20190701</version>
+ <version>20190702</version>
<release>0</release>
<endoflife></endoflife>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse-microos:20190701</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse-microos:20190702</cpeid>
<productline>openSUSE-MicroOS</productline>
<register>
<pool>
++++++ openSUSE-release.spec ++++++
--- /var/tmp/diff_new_pack.JL3STN/_old 2019-07-02 21:03:40.791669621 +0200
+++ /var/tmp/diff_new_pack.JL3STN/_new 2019-07-02 21:03:40.795669627 +0200
@@ -20,7 +20,7 @@
#define betaversion %{nil}
%define codename Tumbleweed
Name: openSUSE-release
-Version: 20190701
+Version: 20190702
Release: 0
# 0 is the product release, not the build release of this package
Summary: openSUSE Tumbleweed
@@ -55,7 +55,7 @@
Obsoletes: aaa_version
Obsoletes: openSUSE-Promo-release <= 11.1
Obsoletes: openSUSE-release-live <= 11.0
-Obsoletes: product_flavor(%{product}) < 20190701
+Obsoletes: product_flavor(%{product}) < 20190702
# bnc#826592
Provides: weakremover(kernel-default) < 3.11
Provides: weakremover(kernel-desktop) < 4.2
@@ -183,7 +183,7 @@
%include %{SOURCE100}
Provides: %name-%version
Provides: product() = openSUSE
-Provides: product(openSUSE) = 20190701-0
+Provides: product(openSUSE) = 20190702-0
%ifarch x86_64
Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64
%endif
@@ -197,7 +197,7 @@
Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
%endif
Provides: product-label() = openSUSE
-Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190701
+Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20190702
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -211,7 +211,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(ftp)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description ftp
@@ -226,7 +226,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(mini)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description mini
@@ -241,7 +241,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(dvd)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description dvd
@@ -256,7 +256,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-kde)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description livecd-kde
@@ -271,7 +271,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-x11)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description livecd-x11
@@ -286,7 +286,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-gnome)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description livecd-gnome
@@ -301,7 +301,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(livecd-xfce)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description livecd-xfce
@@ -316,7 +316,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-kde)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description usb-kde
@@ -331,7 +331,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-gnome)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description usb-gnome
@@ -346,7 +346,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(usb-x11)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description usb-x11
@@ -361,7 +361,7 @@
Group: System/Fhs
Provides: product_flavor()
Provides: flavor(appliance)
-Provides: product_flavor(openSUSE) = 20190701-0
+Provides: product_flavor(openSUSE) = 20190702-0
Summary: openSUSE Tumbleweed
%description appliance
@@ -435,10 +435,10 @@
<product schemeversion="0">
<vendor>openSUSE</vendor>
<name>openSUSE</name>
- <version>20190701</version>
+ <version>20190702</version>
<release>0</release>
<arch>%{_target_cpu}</arch>
- <cpeid>cpe:/o:opensuse:opensuse:20190701</cpeid>
+ <cpeid>cpe:/o:opensuse:opensuse:20190702</cpeid>
<productline>openSUSE</productline>
<register>
<pool>
++++++ weakremovers.inc ++++++
--- /var/tmp/diff_new_pack.JL3STN/_old 2019-07-02 21:03:40.879669755 +0200
+++ /var/tmp/diff_new_pack.JL3STN/_new 2019-07-02 21:03:40.883669761 +0200
@@ -14496,6 +14496,7 @@
Provides: weakremover(libvaladoc-0_42-devel)
Provides: weakremover(libvapoursynth-40)
Provides: weakremover(libvapoursynth-43)
+Provides: weakremover(libvapoursynth-45)
Provides: weakremover(libvarnishapi1)
Provides: weakremover(libvirt-daemon-driver-uml)
Provides: weakremover(libvirt-daemon-driver-vbox)
@@ -14862,6 +14863,8 @@
Provides: weakremover(lmicc-software)
Provides: weakremover(lollypop-portal)
Provides: weakremover(lprof)
+Provides: weakremover(lrcShow-X)
+Provides: weakremover(lrcShow-X-lang)
Provides: weakremover(lrzip)
Provides: weakremover(lua-devel)
Provides: weakremover(lua-doc)
@@ -20291,6 +20294,7 @@
Provides: weakremover(ruby2.5-stdlib)
Provides: weakremover(ruby2.6-rubygem-asciidoctor-testsuite)
Provides: weakremover(ruby2.6-rubygem-devise-testsuite)
+Provides: weakremover(ruby2.6-rubygem-gem2rpm-doc)
Provides: weakremover(ruby2.6-rubygem-minitest)
Provides: weakremover(ruby2.6-rubygem-minitest-doc)
Provides: weakremover(ruby2.6-rubygem-minitest-testsuite)
@@ -20564,6 +20568,7 @@
Provides: weakremover(vtk-openmpi-tcl)
Provides: weakremover(vtk-openmpi2-tcl)
Provides: weakremover(vtk-tcl)
+Provides: weakremover(vulkan-validationlayers-devel)
Provides: weakremover(w3m-el-xemacs)
Provides: weakremover(wdfs)
Provides: weakremover(webkit-jsc-1)
1
0