From 666ac5043e59cea95819b95a319d26b0c63496cf Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 10 Sep 2020 10:35:14 +0300 Subject: [PATCH 1/3] qtermwidget5 --- desktop/toolkit/qtermwidget5/pspec.xml | 13 ++++++++++--- .../language/python/pyqtermwidget5/pspec.xml | 11 +++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/desktop/toolkit/qtermwidget5/pspec.xml b/desktop/toolkit/qtermwidget5/pspec.xml index a8aa98e404..2621969ec9 100755 --- a/desktop/toolkit/qtermwidget5/pspec.xml +++ b/desktop/toolkit/qtermwidget5/pspec.xml @@ -16,8 +16,8 @@ cmake libgcc lxqt-build-tools - qt5-base-devel - qt5-linguist + qt5-base-devel + qt5-linguist @@ -25,7 +25,7 @@ Development files for qtermwidget5 libgcc - qt5-base + qt5-base /usr/bin/consoleq @@ -48,6 +48,13 @@ + + 2020-09-09 + 0.15.0 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-26 0.15.0 diff --git a/programming/language/python/pyqtermwidget5/pspec.xml b/programming/language/python/pyqtermwidget5/pspec.xml index 6fba120a03..97e7564274 100644 --- a/programming/language/python/pyqtermwidget5/pspec.xml +++ b/programming/language/python/pyqtermwidget5/pspec.xml @@ -14,8 +14,8 @@ python-sip python-devel qtermwidget5-devel - qt5-base-devel - python-qt5-devel + qt5-base-devel + python-qt5-devel https://github.com/Rmys/pyqtermwidget5/archive/v0.1.2.tar.gz @@ -38,6 +38,13 @@ + + 2020-09-09 + 0.1.2 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-26 0.1.2 From 0ba4b56d3f74e54d6234a072235865caba50f0df Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 10 Sep 2020 10:51:34 +0300 Subject: [PATCH 2/3] qtermwidget5 --- desktop/lxqt/lxqt-build-tools/pspec.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/desktop/lxqt/lxqt-build-tools/pspec.xml b/desktop/lxqt/lxqt-build-tools/pspec.xml index 4e92dd44b7..fa3e4a358e 100755 --- a/desktop/lxqt/lxqt-build-tools/pspec.xml +++ b/desktop/lxqt/lxqt-build-tools/pspec.xml @@ -29,6 +29,13 @@ + + 2020-09-09 + 0.7.0 + rebuild qt5. + Mustafa Cinasal + muscnsl@gmail.com + 2020-04-26 0.7.0 From e43945f794c1e534dace8efb93095bd11d812c70 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 10 Sep 2020 11:05:35 +0300 Subject: [PATCH 3/3] system-config-printer ver. bump --- ...config-printer-1.5.12-check-for-null.patch | 58 +++++++++++++++ ...2-fix-abrt-in-udev-configure-printer.patch | 72 +++++++++++++++++++ .../printer/system-config-printer/pspec.xml | 13 +++- 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 hardware/printer/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch create mode 100644 hardware/printer/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch diff --git a/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch b/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch new file mode 100644 index 0000000000..1c03bbd193 --- /dev/null +++ b/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch @@ -0,0 +1,58 @@ +From cf9903466c1a2d18a701f3b5e8c7e03483e1244d Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Mon, 14 Oct 2019 16:39:28 +0200 +Subject: [PATCH] udev-configure-printer: Add checks for NULL + +--- + NEWS | 1 + + udev/udev-configure-printer.c | 12 +++++++++--- + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/NEWS b/NEWS +index f4b774e5c..0b53aa8ef 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,6 @@ + 1.5.13 changes + -------------- ++- add checks for NULL in udev-configure-printer (Fedora #1761097) + + 1.5.12 changes + -------------- +diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c +index 83092fc21..d753bbeaf 100644 +--- a/udev/udev-configure-printer.c ++++ b/udev/udev-configure-printer.c +@@ -1411,7 +1411,7 @@ for_each_matching_queue (struct device_uris *device_uris, + const char *printer_state_message = NULL; + int state = 0; + size_t i, l; +- char *this_device_uri_n, *device_uri_n; ++ char *this_device_uri_n = NULL, *device_uri_n = NULL; + const char *ps1, *ps2, *pi1, *pi2; + + while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER) +@@ -1448,6 +1448,8 @@ for_each_matching_queue (struct device_uris *device_uris, + for (i = 0; i < device_uris->n_uris; i++) + { + device_uri_n = normalize_device_uri(device_uris->uri[i]); ++ if (this_device_uri_n == NULL || device_uri_n == NULL) ++ goto skip; + /* As for the same device different URIs can come out when the + device is accessed via the usblp kernel module or via low- + level USB (libusb) we cannot simply compare URIs, must +@@ -1512,8 +1514,12 @@ for_each_matching_queue (struct device_uris *device_uris, + firstqueue = 0; + + skip: +- free(device_uri_n); +- free(this_device_uri_n); ++ if (device_uri_n != NULL) ++ free(device_uri_n); ++ device_uri_n = NULL; ++ if (this_device_uri_n != NULL) ++ free(this_device_uri_n); ++ this_device_uri_n = NULL; + if (!attr) + break; + } diff --git a/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch b/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch new file mode 100644 index 0000000000..7aed67584f --- /dev/null +++ b/hardware/printer/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch @@ -0,0 +1,72 @@ +From b9289dfe105bdb502f183f0afe7a115ecae5f2af Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Fri, 1 Nov 2019 15:55:34 +0100 +Subject: [PATCH] Fix abrt in udev-configure-printer + +The abrt was due invalid free - several printer models have its normalized uri cropped. +The original pointer from strdup() was lost so its freeing was invalid. +--- + udev/udev-configure-printer.c | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c +index d753bbeaf..a44520f9c 100644 +--- a/udev/udev-configure-printer.c ++++ b/udev/udev-configure-printer.c +@@ -1285,7 +1285,8 @@ normalize_device_uri(const char *str_orig) + { + int i, j; + int havespace = 0; +- char *str; ++ char *str = NULL; ++ char *cropped_str = NULL; + + if (str_orig == NULL) + return NULL; +@@ -1333,7 +1334,11 @@ normalize_device_uri(const char *str_orig) + (strstr(str, "packard ") == str) || + (strstr(str, "apollo ") == str) || + (strstr(str, "usb ") == str)) +- str = strchr(str, ' ') + 1; ++ { ++ cropped_str = strdup(strchr(str, ' ') + 1); ++ free(str); ++ str = cropped_str; ++ } + + return str; + } +@@ -1448,8 +1453,6 @@ for_each_matching_queue (struct device_uris *device_uris, + for (i = 0; i < device_uris->n_uris; i++) + { + device_uri_n = normalize_device_uri(device_uris->uri[i]); +- if (this_device_uri_n == NULL || device_uri_n == NULL) +- goto skip; + /* As for the same device different URIs can come out when the + device is accessed via the usblp kernel module or via low- + level USB (libusb) we cannot simply compare URIs, must +@@ -1509,17 +1512,21 @@ for_each_matching_queue (struct device_uris *device_uris, + break; + } + } ++ if (device_uri_n != NULL) ++ { ++ free(device_uri_n); ++ device_uri_n = NULL; ++ } + } + + firstqueue = 0; + + skip: +- if (device_uri_n != NULL) +- free(device_uri_n); +- device_uri_n = NULL; + if (this_device_uri_n != NULL) ++ { + free(this_device_uri_n); + this_device_uri_n = NULL; ++ } + if (!attr) + break; + } diff --git a/hardware/printer/system-config-printer/pspec.xml b/hardware/printer/system-config-printer/pspec.xml index ba53b4f00b..cba3b8960b 100755 --- a/hardware/printer/system-config-printer/pspec.xml +++ b/hardware/printer/system-config-printer/pspec.xml @@ -12,7 +12,7 @@ app:gui A printer administration tool system-config-printer is a graphical user interface that allows the user to configure a CUPS print server. - https://github.com/zdohnal/system-config-printer/archive/1.5.11.tar.gz + https://github.com/OpenPrinting/system-config-printer/archive/1.5.12.tar.gz tr.po @@ -36,7 +36,9 @@ fix-icon.patch - 0001-Fix-constructing-the-auth-dialog.patch + + system-config-printer-1.5.12-check-for-null.patch + system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch @@ -104,6 +106,13 @@ + + 2020-09-08 + 1.5.12 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-03-10 1.5.11