From c256dd0552f52fb946229a2c4f7f54add1ab2f481f066102814a87a0b8e1614d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 6 May 2021 15:08:08 +0000 Subject: [PATCH] Accepting request 888825 from home:polslinux:branches:security - Update to version 6.11: * Clamtk and Clamav do not update automatically * Add appdata.xml file * Remove code referencing old repo. * Bug: app doesn't scan files/folders on demand * Bug: Do not inject 'no-separator' into window decoration * Add --alert-broken-media option for versions >= 103.1 * Remove older repo (clamtk-gtk3), use clamtk only - Remove 0001-Do-not-inject-no-separator-into-window-decoration.patch OBS-URL: https://build.opensuse.org/request/show/888825 OBS-URL: https://build.opensuse.org/package/show/security/clamtk?expand=0&rev=73 --- ...-no-separator-into-window-decoration.patch | 59 ------------------- clamtk-6.07.tar.xz | 3 - clamtk-6.07.tar.xz.asc | 17 ------ clamtk-6.11.tar.xz | 3 + clamtk-6.11.tar.xz.asc | 17 ++++++ clamtk.changes | 13 ++++ clamtk.spec | 10 ++-- 7 files changed, 37 insertions(+), 85 deletions(-) delete mode 100644 0001-Do-not-inject-no-separator-into-window-decoration.patch delete mode 100644 clamtk-6.07.tar.xz delete mode 100644 clamtk-6.07.tar.xz.asc create mode 100644 clamtk-6.11.tar.xz create mode 100644 clamtk-6.11.tar.xz.asc diff --git a/0001-Do-not-inject-no-separator-into-window-decoration.patch b/0001-Do-not-inject-no-separator-into-window-decoration.patch deleted file mode 100644 index a42fb62..0000000 --- a/0001-Do-not-inject-no-separator-into-window-decoration.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e4ea51b9afb120b0d80db9ad82020a3246675a4e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Fri, 12 Feb 2021 10:47:22 +0100 -Subject: [PATCH] Do not inject 'no-separator' into window decoration - -Gtk3::Dialog->new was called with the parameter "no-separator" -which is invalid for Gtk3 as the error message states (it was valid in -Gtk2) - -This is exposed by perl-Gtk3 0.038, which handled these flags in a buggy -way. The fix in perl-Gtk3 exposed the issue in clamtk. ---- - lib/Analysis.pm | 2 +- - lib/History.pm | 2 +- - lib/Scan.pm | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/Analysis.pm b/lib/Analysis.pm -index 06a1bf7..6a82933 100644 ---- a/lib/Analysis.pm -+++ b/lib/Analysis.pm -@@ -48,7 +48,7 @@ sub show_window { - ( undef, $from_scan, $parent ) = @_; - $window = Gtk3::Dialog->new( - undef, $parent, -- [ qw| modal destroy-with-parent no-separator -+ [ qw| modal destroy-with-parent - use-header-bar | - ], - ); -diff --git a/lib/History.pm b/lib/History.pm -index f84aa97..b5906be 100644 ---- a/lib/History.pm -+++ b/lib/History.pm -@@ -148,7 +148,7 @@ sub view_history { - - my $win = Gtk3::Dialog->new( - sprintf( _( 'Viewing %s' ), $basename ), -- undef, [ qw| modal destroy-with-parent no-separator | ], -+ undef, [ qw| modal destroy-with-parent | ], - ); - $win->signal_connect( destroy => sub { $win->destroy; 1 } ); - $win->set_default_size( 800, 350 ); -diff --git a/lib/Scan.pm b/lib/Scan.pm -index 0de14df..b1a32fc 100644 ---- a/lib/Scan.pm -+++ b/lib/Scan.pm -@@ -90,7 +90,7 @@ sub filter { - # Begin popup scanning - $window = Gtk3::Dialog->new( - undef, undef, -- [ qw| modal destroy-with-parent no-separator -+ [ qw| modal destroy-with-parent - use-header-bar | - ], - ); --- -2.30.0 - diff --git a/clamtk-6.07.tar.xz b/clamtk-6.07.tar.xz deleted file mode 100644 index f29ca8d..0000000 --- a/clamtk-6.07.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec79b5eb3e6d9c6045a74725ec3a772c0b462347614f4055e97321845a754f8e -size 234112 diff --git a/clamtk-6.07.tar.xz.asc b/clamtk-6.07.tar.xz.asc deleted file mode 100644 index 7f62623..0000000 --- a/clamtk-6.07.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJIBAABCgAyFiEEXdR7OxIe5cNUogMF9R0ZVGraWd4FAmAWhIYUHGRhdmUubmVy -ZEBnbWFpbC5jb20ACgkQ9R0ZVGraWd4tNQ//R5Hbi7IIhkrTiDd1ti2OToH91dCe -i2mBtt/2NxEIwgIeptd/eDyCc8R59bbdItm48ClYuUWdnzwpNPKXODNTQQNDrllB -GirstBpnjH3XBrymNem3MIXEczNVVZOtFxmmqolWWwQoJ0w4xyvolo0Z7CccIJXs -2qvSBBV2oIq400ClIOIkgP3/yQuwnm4XWk7u+MauwAQRVEgEAhthtY+zf/UBxhjp -G7jgdl5+TZQl9jcJsKL7UgEi5m4MBM5x6VLP82cGwrxP2RYddbqGEun66d1EDkMK -tb5kY6qunr+dTYo5dwSiNBJ7yfDLS1GtaW5BtuhwyyJ77/GK5uVz8P1WJkFP39lE -Ye//UCfuTKm0nkvGddqOX2WbKQJh/5B8iebx1HlknP8cg9kd1zf7lB4CnnueJX4/ -8xhr1Ny2cwZzweWbGtsPoOxCQzOovrRh4PmLJ1qPvgUpmI2V2Co7h3o4jyPy4euL -5qaVjRzQ281oNSpmnqAZ4wdBxz6A0GNabwJM/i9Dr6n6sX1BOH87DujBdeZaet1y -ekDsWXgcqxFmkAwUWyrCd4a2NEsQF5ifzfCCw4IyDV8gN0hg0SeA6a05wIUTHYO/ -WtCGsHKcUrg8i2AmC6VutIyH+xsbV3oC8amufLfhND4XHjpFNGctq+ywXixL+nPL -dcHYutzUqR2usxc= -=ZoQh ------END PGP SIGNATURE----- diff --git a/clamtk-6.11.tar.xz b/clamtk-6.11.tar.xz new file mode 100644 index 0000000..8f6238b --- /dev/null +++ b/clamtk-6.11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93d0f265ad216984673ed261a24815f32c459d699148668ef460baf390de02a1 +size 286216 diff --git a/clamtk-6.11.tar.xz.asc b/clamtk-6.11.tar.xz.asc new file mode 100644 index 0000000..25c3284 --- /dev/null +++ b/clamtk-6.11.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- + +iQJIBAABCgAyFiEEXdR7OxIe5cNUogMF9R0ZVGraWd4FAmBwMEYUHGRhdmUubmVy +ZEBnbWFpbC5jb20ACgkQ9R0ZVGraWd5Q5A/8DvnT/eAv7wK3FgX+1xzDJzzn5WiX +FCdpy5V8IRYo29gksA2hqfK8JLY+4RW7riwRLoJRH32b5qkvWy0mXU9P9BwXkHwG +fheY/IKjPzM5G58V0JGO0a4XvLWxGxCzIRGzkxz11TvCSnQXHecvhmL3vjs5NjFo +jcPQHr7fOyvgT4ks3Gho/B+StA9yhHqZBkIUlJoCCy92vUxBza9cNy7Xo88DlOqJ +YK7fFeWDWKUQcauBCEXb96r04E4shTYmOMVIsWu9G++Y12QJIv7+k4rmga27E5cv +bhxGxcxUaUIoczxN/1NjN8564yeH+VNEJ0jM0sUfY5wneBC+6HQOzmV/ZELX9+5q +SP4a667Qo4gyr2hKu2nV57AgmyVASPySEAzCn4w1RdOBOPb06uYSPN9UirjeE685 +nMVEYUZ66ZIsXtk7CC+nz8Gm4OKfrMSTHN7LnxUiFsVo6LtM/+y8NXD9bSNxdKMh +9FmZmY7PT3WLlgs41+nNATtcObLChHEB91XxdDi5JRMTxOt5J7kouTZ/Ase0VjS/ +EQwbL9N/Q+FqgIDw7MYYZc53p4/FoA1iOKoPtQknB/g+8hV0XRNjTAx0samH60+A +I6eP5IP/lxyZkFEtQNllY2EVNZ3v66fa3hUOzGaCB/xRl/sZJzg4NgZxSNiaIoLY +tC55aNNlGhADXSw= +=jfvh +-----END PGP SIGNATURE----- diff --git a/clamtk.changes b/clamtk.changes index a05a60d..1257c51 100644 --- a/clamtk.changes +++ b/clamtk.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 27 14:08:44 UTC 2021 - Paolo Stivanin + +- Update to version 6.11: + * Clamtk and Clamav do not update automatically + * Add appdata.xml file + * Remove code referencing old repo. + * Bug: app doesn't scan files/folders on demand + * Bug: Do not inject 'no-separator' into window decoration + * Add --alert-broken-media option for versions >= 103.1 + * Remove older repo (clamtk-gtk3), use clamtk only +- Remove 0001-Do-not-inject-no-separator-into-window-decoration.patch + ------------------------------------------------------------------- Fri Feb 12 09:45:59 UTC 2021 - Dominique Leuenberger diff --git a/clamtk.spec b/clamtk.spec index ece2bd5..5c9a048 100644 --- a/clamtk.spec +++ b/clamtk.spec @@ -18,17 +18,16 @@ Name: clamtk -Version: 6.07 +Version: 6.11 Release: 0 Summary: GUI for the ClamAV Antivirus -License: GPL-1.0-or-later OR Artistic-1.0 +License: Artistic-1.0 OR GPL-1.0-or-later Group: Productivity/Security URL: https://github.com/dave-theunsub/clamtk -Source: https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-%{version}.tar.xz -Source1: https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-%{version}.tar.xz.asc +Source: https://github.com/dave-theunsub/clamtk/releases/download/v%{version}/clamtk-%{version}.tar.xz +Source1: https://github.com/dave-theunsub/clamtk/releases/download/v%{version}/clamtk-%{version}.tar.xz.asc Source2: %{name}.keyring Patch0: clamtk-add_searchpath.patch -Patch1: 0001-Do-not-inject-no-separator-into-window-decoration.patch BuildRequires: update-desktop-files Requires: clamav >= 0.88 Requires: gnome-icon-theme @@ -66,7 +65,6 @@ It is designed to be an easy-to-use, point and click virus scanner. %prep %setup -q %patch0 -%patch1 -p1 %build gzip -dc clamtk.1.gz > clamtk.1