Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8711 from Rmys/master

Browse Source 
qtermwidget5
This commit is contained in:
Rmys
2020-09-10 08:35:07 +00:00
committed by GitHub
parent f0573a53b4 e43945f794
commit 5ec2606c1f
6 changed files with 167 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/lxqt/lxqt-build-tools/pspec.xml
+7
View File
@@ -29,6 +29,13 @@
</Package> </Package>
<History> <History>
<Update release="12">
<Date>2020-09-09</Date>
<Version>0.7.0</Version>
<Comment>rebuild qt5.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11"> <Update release="11">
<Date>2020-04-26</Date> <Date>2020-04-26</Date>
<Version>0.7.0</Version> <Version>0.7.0</Version>
desktop/toolkit/qtermwidget5/pspec.xml
+10 -3
View File
@@ -16,8 +16,8 @@
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="0.6.0">lxqt-build-tools</Dependency> <Dependency versionFrom="0.6.0">lxqt-build-tools</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-linguist</Dependency> <Dependency versionFrom="5.15.1">qt5-linguist</Dependency>
</BuildDependencies> </BuildDependencies>
</Source> </Source>
<Package> <Package>
@@ -25,7 +25,7 @@
<Summary>Development files for qtermwidget5</Summary> <Summary>Development files for qtermwidget5</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="5.14.2">qt5-base</Dependency> <Dependency versionFrom="5.15.1">qt5-base</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="executable">/usr/bin/consoleq</Path> <Path fileType="executable">/usr/bin/consoleq</Path>
@@ -48,6 +48,13 @@
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="19">
<Date>2020-09-09</Date>
<Version>0.15.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18"> <Update release="18">
<Date>2020-04-26</Date> <Date>2020-04-26</Date>
<Version>0.15.0</Version> <Version>0.15.0</Version>
hardware/printer/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
+58
View File
@@ -0,0 +1,58 @@
From cf9903466c1a2d18a701f3b5e8c7e03483e1244d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
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;
}
hardware/printer/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch
+72
View File
@@ -0,0 +1,72 @@
From b9289dfe105bdb502f183f0afe7a115ecae5f2af Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
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;
}
hardware/printer/system-config-printer/pspec.xml
+11 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:gui</IsA> <IsA>app:gui</IsA>
<Summary>A printer administration tool</Summary> <Summary>A printer administration tool</Summary>
<Description>system-config-printer is a graphical user interface that allows the user to configure a CUPS print server.</Description> <Description>system-config-printer is a graphical user interface that allows the user to configure a CUPS print server.</Description>
<Archive sha1sum="2375c76f695165b7b976390abd55aaf721285df8" type="targz">https://github.com/zdohnal/system-config-printer/archive/1.5.11.tar.gz</Archive> <Archive sha1sum="c6653790bc6861c3367f6bb3813fe61d1e35ac6c" type="targz">https://github.com/OpenPrinting/system-config-printer/archive/1.5.12.tar.gz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile target="po/tr.po">tr.po</AdditionalFile> <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
@@ -36,7 +36,9 @@
<Patch level="1">fix-icon.patch</Patch> <Patch level="1">fix-icon.patch</Patch>
<!--make it actually work without libgnome-keyring --> <!--make it actually work without libgnome-keyring -->
<!-- <Patch>pass_libgnome_keyring_missing.diff</Patch> --> <!-- <Patch>pass_libgnome_keyring_missing.diff</Patch> -->
<Patch>0001-Fix-constructing-the-auth-dialog.patch</Patch>
<Patch>system-config-printer-1.5.12-check-for-null.patch</Patch>
<Patch>system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -104,6 +106,13 @@
</Package> </Package>
<History> <History>
<Update release="12">
<Date>2020-09-08</Date>
<Version>1.5.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11"> <Update release="11">
<Date>2020-03-10</Date> <Date>2020-03-10</Date>
<Version>1.5.11</Version> <Version>1.5.11</Version>
programming/language/python/pyqtermwidget5/pspec.xml
+9 -2
View File
@@ -14,8 +14,8 @@
<Dependency>python-sip</Dependency> <Dependency>python-sip</Dependency>
<Dependency>python-devel</Dependency> <Dependency>python-devel</Dependency>
<Dependency>qtermwidget5-devel</Dependency> <Dependency>qtermwidget5-devel</Dependency>
<Dependency versionFrom="5.14.2">qt5-base-devel</Dependency> <Dependency versionFrom="5.15.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.2">python-qt5-devel</Dependency> <Dependency versionFrom="5.15.0">python-qt5-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Archive sha1sum="8a73e7c31be379f306b637a9e7cb82d24214de02" type="targz">https://github.com/Rmys/pyqtermwidget5/archive/v0.1.2.tar.gz</Archive> <Archive sha1sum="8a73e7c31be379f306b637a9e7cb82d24214de02" type="targz">https://github.com/Rmys/pyqtermwidget5/archive/v0.1.2.tar.gz</Archive>
<Patches> <Patches>
@@ -38,6 +38,13 @@
</Files> </Files>
</Package> </Package>
<History> <History>
<Update release="15">
<Date>2020-09-09</Date>
<Version>0.1.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14"> <Update release="14">
<Date>2020-04-26</Date> <Date>2020-04-26</Date>
<Version>0.1.2</Version> <Version>0.1.2</Version>