Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9c4072af401e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1e5a60e825b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 4, 2020

  1. sddm: 0.18.1 -> 0.19.0 

    https://github.com/sddm/sddm/releases/tag/v0.19.0

Fixes: CVE-2020-28049
    @mweinelt
    mweinelt committed Nov 4, 2020
    Copy the full SHA
    0b5bcd8 View commit details

Commits on Nov 24, 2020

  1. Merge pull request #102759 from mweinelt/sddm 

    sddm: 0.18.1 -> 0.19.0
    @mweinelt
    mweinelt authored Nov 24, 2020
    Copy the full SHA
    f1e5a60 View commit details
Showing with 10 additions and 8 deletions.
  1. +2 −2 pkgs/applications/display-managers/sddm/default.nix
  2. +8 −6 pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
4 changes: 2 additions & 2 deletions pkgs/applications/display-managers/sddm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
}:

let
version = "0.18.1";
version = "0.19.0";

in mkDerivation {
pname = "sddm";
@@ -14,7 +14,7 @@ in mkDerivation {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq";
sha256 = "1s6icb5r1n6grfs137gdzfrcvwsb3hvlhib2zh6931x8pkl1qvxa";
};

patches = [
14 changes: 8 additions & 6 deletions pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
index 4b5983c..911c511 100644
index 041e5ed..efb1324 100644
--- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp
@@ -147,16 +147,13 @@ namespace SDDM {
@@ -148,17 +148,14 @@ namespace SDDM {
// * m_path (classic fallback /etc/sddm.conf)

QStringList files;
@@ -13,18 +13,20 @@ index 4b5983c..911c511 100644
QDir dir(m_sysConfigDir);
if (dir.exists()) {
- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified());
foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
for (const QFileInfo &file : dirFiles) {
files << (file.absoluteFilePath());
- latestModificationTime = std::max(latestModificationTime, file.lastModified());
}
}
}
@@ -164,21 +161,14 @@ namespace SDDM {
@@ -166,22 +163,15 @@ namespace SDDM {
//include the configDir in modification time so we also reload on any files added/removed
QDir dir(m_configDir);
if (dir.exists()) {
- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified());
foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
const auto dirFiles = dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware);
for (const QFileInfo &file : dirFiles) {
files << (file.absoluteFilePath());
- latestModificationTime = std::max(latestModificationTime, file.lastModified());
}
@@ -38,6 +40,6 @@ index 4b5983c..911c511 100644
- }
- m_fileModificationTime = latestModificationTime;
-
foreach (const QString &filepath, files) {
for (const QString &filepath : qAsConst(files)) {
loadInternal(filepath);
}