pool/liblxqt
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update liblxqt-0.13.0-backlight.patch: use accepted one

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/liblxqt?expand=0&rev=12
This commit is contained in:
Michael Vetter
2018-06-20 13:17:42 +00:00
committed by Git OBS Bridge
parent 640579ab36
commit cca5c7af40
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
liblxqt-0.13.0-backlight.patch
View File

@@ -160,31 +160,32 @@ index 9586485..45c9281 100644
\ No newline at end of file
+}
From d6e47ca2b6acdfa0060f5ac5f62aeda56274cb63 Mon Sep 17 00:00:00 2001
From 318f85b2aca43ed6c9b4f6099f3d476bb8b9e1c2 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 16:36:41 +0200
Subject: [PATCH 2/8] lxqtbacklight: apply maximum string length to fscanf to
prevent overflow
---
lxqtbacklight/linux_backend/driver/libbacklight_backend.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
lxqtbacklight/linux_backend/driver/libbacklight_backend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
index 4d90c20..5fd0b68 100644
index 4d90c20..c7ce7ab 100644
--- a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
+++ b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
@@ -196,7 +196,7 @@ char *lxqt_backlight_backend_get_driver()
@@ -196,7 +196,8 @@ char *lxqt_backlight_backend_get_driver()
FILE *in = open_driver_file("/sys/class/backlight/%s/type", driver, "r");
if( in == NULL )
continue;
- int ok = fscanf(in, "%s", type);
+ int ok = fscanf(in, "%1024s", type);
+ // the maximum field width does not include '\0'!
+ int ok = fscanf(in, "%1023s", type);
fclose(in);
if( ok != EOF ) {
// firmware control should be preferred to platform control should be preferred to raw control.
From 6c214f8ba8774c6851aa7f9bc8b373462eb91d43 Mon Sep 17 00:00:00 2001
From 628dbd33fcaf93b79334572782991ac8d4362f14 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 16:49:07 +0200
Subject: [PATCH 3/8] lxqtbacklight: removed useless commented out code
@@ -239,7 +240,7 @@ index 45c9281..3dc7d7e 100644
{
return lxqt_backlight_backend_get_driver();
From 1e6a9880a44682f42b954aeda6d5b3af07abee6f Mon Sep 17 00:00:00 2001
From 8ddd5354c6e5175d0674ff77ff7093d9b4fdba3e Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 16:52:42 +0200
Subject: [PATCH 4/8] lxqtbacklight: constified char *driver, where appropriate
@@ -250,7 +251,7 @@ Subject: [PATCH 4/8] lxqtbacklight: constified char *driver, where appropriate
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
index 5fd0b68..bd6b849 100644
index c7ce7ab..bab2c48 100644
--- a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
+++ b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
@@ -69,9 +69,9 @@
@@ -310,7 +311,7 @@ index 3dc7d7e..4c895ae 100644
if(value>0) {
FILE *out = open_driver_file("/sys/class/backlight/%s/brightness", driver, "w");
From d39e2d15d650a3a98c9899d9514a90a401a7fd4a Mon Sep 17 00:00:00 2001
From 25114361c2e3bd60f917dde86807b4f1e72e7dc3 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 17:11:08 +0200
Subject: [PATCH 5/8] lxqtbacklight: centralized error output on empty
@@ -326,7 +327,7 @@ Subject: [PATCH 5/8] lxqtbacklight: centralized error output on empty
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
index bd6b849..dc802aa 100644
index bab2c48..484e3d5 100644
--- a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
+++ b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
@@ -72,12 +72,12 @@ static FILE* open_driver_file(const char *path, const char *driver, const char *
@@ -370,7 +371,7 @@ index bd6b849..dc802aa 100644
return NULL;
}
@@ -215,8 +213,9 @@ char *lxqt_backlight_backend_get_driver()
@@ -216,8 +214,9 @@ char *lxqt_backlight_backend_get_driver()
closedir(dirp);
@@ -382,7 +383,7 @@ index bd6b849..dc802aa 100644
driver = NULL;
for(n=0;n<N_BACKLIGHT;n++) {
@@ -226,6 +225,11 @@ char *lxqt_backlight_backend_get_driver()
@@ -227,6 +226,11 @@ char *lxqt_backlight_backend_get_driver()
free(drivers[n]);
}
@@ -441,7 +442,7 @@ index 4c895ae..bcf2b9e 100644
ok = scanf("%d", &value);
if( ok != EOF && value > 0 && value <= max_value) {
From 6c9565214efdbbcb677ba6201bab8c5772d61550 Mon Sep 17 00:00:00 2001
From 3b1610dd32e015b2625008235be44f51cae4a8c8 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 17:23:49 +0200
Subject: [PATCH 6/8] lxqtbacklight: removed extra whitespace
@@ -452,7 +453,7 @@ Subject: [PATCH 6/8] lxqtbacklight: removed extra whitespace
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
index dc802aa..b6affb5 100644
index 484e3d5..733fe9e 100644
--- a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
+++ b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
@@ -171,12 +171,12 @@ char *lxqt_backlight_backend_get_driver()
@@ -470,7 +471,7 @@ index dc802aa..b6affb5 100644
for(n=0;n<N_BACKLIGHT;n++)
drivers[n] = NULL;
@@ -216,7 +216,7 @@ char *lxqt_backlight_backend_get_driver()
@@ -217,7 +217,7 @@ char *lxqt_backlight_backend_get_driver()
if (errno != 0) {
fprintf(stderr, "Error reading directory %s: %s\n", sysfs_backlight_dir, strerror(errno));
}
@@ -508,7 +509,7 @@ index bcf2b9e..3e545a8 100644
return 0;
From 298d9941f4ed7615780e1c18b2912bca02726354 Mon Sep 17 00:00:00 2001
From f5c4cc47f60c674df2cc8a93343526a69c54a1aa Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Wed, 13 Jun 2018 18:01:36 +0200
Subject: [PATCH 7/8] lxqtbacklight: fix and improve command line parameter
@@ -565,7 +566,7 @@ index 3e545a8..836e3f3 100644
help(argv[0]);
return 0;
From 7c71fc4127eb56ad43a3bec482dac286a8cc60e5 Mon Sep 17 00:00:00 2001
From 7bd68881d6a65541437f2e4dfad0f6749b12034b Mon Sep 17 00:00:00 2001
From: Matthias Gerstner <matthias.gerstner@suse.de>
Date: Thu, 14 Jun 2018 11:28:14 +0200
Subject: [PATCH 8/8] lxqtbacklight: only pass basename into open_driver_file()
@@ -578,7 +579,7 @@ becomes better readable.
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
index b6affb5..eb9e07f 100644
index 733fe9e..1282706 100644
--- a/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
+++ b/lxqtbacklight/linux_backend/driver/libbacklight_backend.c
@@ -68,7 +68,7 @@
@@ -646,7 +647,7 @@ index b6affb5..eb9e07f 100644
+ FILE *in = open_driver_file("type", driver, "r");
if( in == NULL )
continue;
int ok = fscanf(in, "%1024s", type);
// the maximum field width does not include '\0'!
diff --git a/lxqtbacklight/linux_backend/driver/lxqtbacklight_backend.c b/lxqtbacklight/linux_backend/driver/lxqtbacklight_backend.c
index 836e3f3..8886a74 100644
--- a/lxqtbacklight/linux_backend/driver/lxqtbacklight_backend.c

5
liblxqt.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 20 13:17:20 UTC 2018 - mvetter@suse.com
- Update liblxqt-0.13.0-backlight.patch: use accepted one
-------------------------------------------------------------------
Thu Jun 14 13:23:36 UTC 2018 - mvetter@suse.com