Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package clamtk for openSUSE:Factory checked in at 2021-02-16 22:40:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clamtk (Old) and /work/SRC/openSUSE:Factory/.clamtk.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clamtk" Tue Feb 16 22:40:10 2021 rev:7 rq:872778 version:6.07 Changes: -------- --- /work/SRC/openSUSE:Factory/clamtk/clamtk.changes 2020-09-28 14:29:33.634173437 +0200 +++ /work/SRC/openSUSE:Factory/.clamtk.new.28504/clamtk.changes 2021-02-16 22:50:48.590691518 +0100 @@ -1,0 +2,10 @@ +Fri Feb 12 09:45:59 UTC 2021 - Dominique Leuenberger <[email protected]> + +- Update to version 6.07: + + Update to look for additional information during update to know + when finished. + + Update dates to 2021. +- Add 0001-Do-not-inject-no-separator-into-window-decoration.patch: + Do not add no-separator to window decoration (boo#1182151). + +------------------------------------------------------------------- Old: ---- clamtk-6.06.tar.xz clamtk-6.06.tar.xz.asc New: ---- 0001-Do-not-inject-no-separator-into-window-decoration.patch clamtk-6.07.tar.xz clamtk-6.07.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamtk.spec ++++++ --- /var/tmp/diff_new_pack.XQY16I/_old 2021-02-16 22:50:49.310692455 +0100 +++ /var/tmp/diff_new_pack.XQY16I/_new 2021-02-16 22:50:49.314692461 +0100 @@ -1,7 +1,7 @@ # # spec file for package clamtk # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: clamtk -Version: 6.06 +Version: 6.07 Release: 0 Summary: GUI for the ClamAV Antivirus License: GPL-1.0-or-later OR Artistic-1.0 @@ -28,6 +28,7 @@ Source1: https://bitbucket.org/davem_/clamtk-gtk3/downloads/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 @@ -65,6 +66,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build gzip -dc clamtk.1.gz > clamtk.1 ++++++ 0001-Do-not-inject-no-separator-into-window-decoration.patch ++++++ >From e4ea51b9afb120b0d80db9ad82020a3246675a4e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> 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 ++++++ clamtk-6.06.tar.xz -> clamtk-6.07.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/CHANGES new/clamtk-6.07/CHANGES --- old/clamtk-6.06/CHANGES 2020-09-16 11:49:54.000000000 +0200 +++ new/clamtk-6.07/CHANGES 2021-01-31 11:03:29.000000000 +0100 @@ -1,5 +1,11 @@ CHANGELOG for ClamTk: +6.07 - 20210130 +--------------- + * Update to look for additional information during update + to know when finished + * Update dates to 2021 + 6.06 - 20200916 --------------- * Fix for 'Show Hidden Files' checkbox automatically diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/LICENSE new/clamtk-6.07/LICENSE --- old/clamtk-6.06/LICENSE 2020-03-22 11:11:26.000000000 +0100 +++ new/clamtk-6.07/LICENSE 2021-01-31 11:03:51.000000000 +0100 @@ -1,6 +1,6 @@ COPYRIGHT AND LICENSE -ClamTk, copyright (C) 2004-2020 Dave M +ClamTk, copyright (C) 2004-2021 Dave M https://gitlab.com/dave_m/clamtk https://gitlab.com/dave_m/clamtk/wikis/Home https://bitbucket.org/davem_/clamtk/ @@ -28,7 +28,7 @@ [Source: http://www.opensource.org/licenses/bsd-license.php] -Copyright (c) 2004-2020, Dave M. All rights reserved. +Copyright (c) 2004-2021, Dave M. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/README.md new/clamtk-6.07/README.md --- old/clamtk-6.06/README.md 2020-07-25 12:29:38.000000000 +0200 +++ new/clamtk-6.07/README.md 2020-10-18 10:54:21.000000000 +0200 @@ -1,4 +1,4 @@ -This README was last updated on 25 July 2020. +This README was last updated on 18 October 2020. # Readme for ClamTk @@ -33,8 +33,8 @@ https://bitbucket.org/davem_/clamtk-gtk3/ https://gitlab.com/dave_m/clamtk/wikis/home https://launchpad.net/clamtk -https://code.google.com/p/clamtk/ (not used anymore) -http://clamtk.sourceforge.net (not used anymore) +https://code.google.com/p/clamtk/ (deprecated) +http://clamtk.sourceforge.net (deprecated) https://dave-theunsub.github.io/clamtk/ (deprecated) https://github.com/dave-theunsub/clamtk/ (deprecated) @@ -55,11 +55,11 @@ If this does not work, download the file from [the official site](https://gitlab.com/dave_m/clamtk/-/wikis/Home). You should be able to just double click the file for installation or upgrade. -For these examples, we will use version 6.04. The name of the file may differ based on your distribution. +For these examples, we will use version 6.06. The name of the file may differ based on your distribution. To install using a terminal window: -`sudo yum install clamtk-6.04-1.el8.noarch.rpm` or `sudo dnf install clamtk-6.04-1.fc.noarch.rpm` +`sudo yum install clamtk-6.06-1.el8.noarch.rpm` or `sudo dnf install clamtk-6.06-1.fc.noarch.rpm` To remove clamtk: @@ -71,10 +71,11 @@ The tarball contains all the sources. One way to do this, as tested on Fedora, is to run the following commands: ``` -mkdir -p /usr/share/perl5/vendor_perl/ClamTk -cp lib/*.pm /usr/share/perl5/vendor_perl/ClamTk -chmod +x clamtk -cp clamtk /usr/local/bin (or /usr/bin) +tar xzf clamtk-6.06.tar.xz +sudo mkdir -p /usr/share/perl5/vendor_perl/ClamTk +sudo cp lib/*.pm /usr/share/perl5/vendor_perl/ClamTk +sudo chmod +x clamtk +sudo cp clamtk /usr/local/bin (or /usr/bin) ``` Examples: @@ -99,7 +100,7 @@ If you downloaded the file, then use this: - sudo apt install clamtk_6.04-1_all.deb + sudo apt install clamtk_6.06-1_all.deb To remove clamtk: @@ -117,20 +118,20 @@ `rpm --import https://davem.fedorapeople.org/RPM-GPG-KEY-DaveM-21-June-2018` 2. Verify the list of gpg keys installed in RPM DB: `rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n'` -3. Check the signature of the rpm. For this example, we'll use version 6.04: -`rpm --checksig clamtk-6.04-1.fc.noarch.rpm` +3. Check the signature of the rpm. For this example, we'll use version 6.06: +`rpm --checksig clamtk-6.06-1.fc.noarch.rpm` 4. You should see something like this: -`/home/you/clamtk-6.04-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK` +`/home/you/clamtk-6.06-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK` -You can also verify the tarball. Using 6.04 as the example version, ensure you have downloaded the tarball, its detached signature (.asc), and the key in step 1 above. +You can also verify the tarball. Using 6.06 as the example version, ensure you have downloaded the tarball, its detached signature (.asc), and the key in step 1 above. 1. Get the key (skip this step if you already have it): `wget https://davem.fedorapeople.org/RPM-GPG-KEY-DaveM-21-June-2018` 2. Import it (skip this step if you have done it already): `gpg --import RPM-GPG-KEY-DaveM-21-June-2018` 3. Verify like so: -`gpg2 --verify clamtk-6.04.tar.xz.asc clamtk-6.04.tar.gz` or -`gpg --verify clamtk-6.04.tar.xz.asc clamtk-6.04.tar.xz` +`gpg2 --verify clamtk-6.06.tar.xz.asc clamtk-6.06.tar.gz` or +`gpg --verify clamtk-6.06.tar.xz.asc clamtk-6.06.tar.xz` 4. You should see something like this: `gpg: Signature made Sun 11 Sep 2016 06:29:41 AM CDT using RSA key ID` (snipped for brevity). @@ -145,11 +146,11 @@ A link to it will be with the rest of the downloads. For this example: -https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.04.tar.xz.minisig +https://bitbucket.org/davem_/clamtk-gtk3/downloads/clamtk-6.06.tar.xz.minisig Now, you verify like so: ``` -minisign -V -x clamtk-6.04.tar.xz.minisig -p davemminisign.pub -m clamtk-6.04.tar.xz +minisign -V -x clamtk-6.06.tar.xz.minisig -p davemminisign.pub -m clamtk-6.06.tar.xz ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/clamtk new/clamtk-6.07/clamtk --- old/clamtk-6.06/clamtk 2020-09-16 11:50:20.000000000 +0200 +++ new/clamtk-6.07/clamtk 2021-01-31 11:09:05.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Analysis.pm new/clamtk-6.07/lib/Analysis.pm --- old/clamtk-6.06/lib/Analysis.pm 2020-08-18 12:28:58.000000000 +0200 +++ new/clamtk-6.07/lib/Analysis.pm 2021-01-31 11:04:58.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/App.pm new/clamtk-6.07/lib/App.pm --- old/clamtk-6.06/lib/App.pm 2020-08-21 14:32:40.000000000 +0200 +++ new/clamtk-6.07/lib/App.pm 2021-01-31 11:07:09.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). @@ -25,7 +25,7 @@ sub get_TK_version { # Stick with %.2f format - 4.50 vice 4.5 - return '6.06'; + return '6.07'; } sub get_path { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Assistant.pm new/clamtk-6.07/lib/Assistant.pm --- old/clamtk-6.06/lib/Assistant.pm 2020-08-18 12:29:06.000000000 +0200 +++ new/clamtk-6.07/lib/Assistant.pm 2021-01-31 11:06:53.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk (https://gitlab.com/dave_m/clamtk/). # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/GUI.pm new/clamtk-6.07/lib/GUI.pm --- old/clamtk-6.06/lib/GUI.pm 2020-08-21 14:32:31.000000000 +0200 +++ new/clamtk-6.07/lib/GUI.pm 2021-01-31 11:07:01.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). @@ -67,7 +67,7 @@ $eb->add( $top_box ); $hb->set_title( _( 'Virus Scanner' ) ); - $hb->set_decoration_layout( 'menu:minimize,close' ); + $hb->set_decoration_layout( 'menu,icon:minimize,close' ); $hb->set_show_close_button( TRUE ); my $separator = Gtk3::SeparatorToolItem->new; @@ -712,7 +712,7 @@ $dialog->set_logo( $pixbuf ); $dialog->set_translator_credits( 'Please see the credits.md for full listing' ); - $dialog->set_copyright( "\x{a9} Dave M 2004 - 2020" ); + $dialog->set_copyright( "\x{a9} Dave M 2004 - 2021" ); $dialog->set_program_name( 'ClamTk' ); $dialog->set_authors( [ 'Dave M', '[email protected]' ] ); $dialog->set_comments( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/History.pm new/clamtk-6.07/lib/History.pm --- old/clamtk-6.06/lib/History.pm 2020-08-18 12:29:12.000000000 +0200 +++ new/clamtk-6.07/lib/History.pm 2021-01-31 11:05:31.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Icons.pm new/clamtk-6.07/lib/Icons.pm --- old/clamtk-6.06/lib/Icons.pm 2020-08-21 14:33:00.000000000 +0200 +++ new/clamtk-6.07/lib/Icons.pm 2021-01-31 11:06:15.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Network.pm new/clamtk-6.07/lib/Network.pm --- old/clamtk-6.06/lib/Network.pm 2020-08-18 12:29:24.000000000 +0200 +++ new/clamtk-6.07/lib/Network.pm 2021-01-31 11:04:45.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Prefs.pm new/clamtk-6.07/lib/Prefs.pm --- old/clamtk-6.06/lib/Prefs.pm 2020-08-18 12:29:38.000000000 +0200 +++ new/clamtk-6.07/lib/Prefs.pm 2021-01-31 11:05:22.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Quarantine.pm new/clamtk-6.07/lib/Quarantine.pm --- old/clamtk-6.06/lib/Quarantine.pm 2020-08-18 12:29:42.000000000 +0200 +++ new/clamtk-6.07/lib/Quarantine.pm 2021-01-31 11:06:21.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Results.pm new/clamtk-6.07/lib/Results.pm --- old/clamtk-6.06/lib/Results.pm 2020-08-18 12:29:47.000000000 +0200 +++ new/clamtk-6.07/lib/Results.pm 2021-01-31 11:06:49.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Scan.pm new/clamtk-6.07/lib/Scan.pm --- old/clamtk-6.06/lib/Scan.pm 2020-08-21 14:35:11.000000000 +0200 +++ new/clamtk-6.07/lib/Scan.pm 2021-01-31 11:15:26.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). @@ -559,6 +559,7 @@ sub logit { my $db_total = ClamTk::App->get_sigtool_info( 'count' ); + # warn "in Scan: db_total = >$db_total<\n"; my $REPORT; # filehandle for histories log #<<< diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Schedule.pm new/clamtk-6.07/lib/Schedule.pm --- old/clamtk-6.06/lib/Schedule.pm 2020-08-18 12:29:55.000000000 +0200 +++ new/clamtk-6.07/lib/Schedule.pm 2021-01-31 11:05:16.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Settings.pm new/clamtk-6.07/lib/Settings.pm --- old/clamtk-6.06/lib/Settings.pm 2020-08-18 12:30:00.000000000 +0200 +++ new/clamtk-6.07/lib/Settings.pm 2021-01-31 11:04:51.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Shortcuts.pm new/clamtk-6.07/lib/Shortcuts.pm --- old/clamtk-6.06/lib/Shortcuts.pm 2020-08-18 12:30:07.000000000 +0200 +++ new/clamtk-6.07/lib/Shortcuts.pm 2021-01-31 11:04:39.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Startup.pm new/clamtk-6.07/lib/Startup.pm --- old/clamtk-6.06/lib/Startup.pm 2020-08-18 12:30:13.000000000 +0200 +++ new/clamtk-6.07/lib/Startup.pm 2021-01-31 11:05:26.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Update.pm new/clamtk-6.07/lib/Update.pm --- old/clamtk-6.06/lib/Update.pm 2020-08-18 12:30:18.000000000 +0200 +++ new/clamtk-6.07/lib/Update.pm 2021-01-31 11:05:44.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). @@ -108,13 +108,13 @@ $text = _( 'Check for updates' ); $infobar->add_button( $text, -5 ); - #<<< $infobar->signal_connect( response => sub { - update_signatures(); + Gtk3::main_iteration while Gtk3::events_pending; + update_signatures(); + Gtk3::main_iteration while Gtk3::events_pending; } ); - #>>> } $box->pack_start( Gtk3::VBox->new, TRUE, TRUE, 5 ); @@ -170,16 +170,18 @@ my $update; my $update_sig_pid; eval { - local $SIG{ ALRM } - = sub { die "failed updating signatures (timeout)\n" }; + local $SIG{ ALRM } = sub { + die "failed updating signatures (timeout)\n"; + }; alarm 100; $update_sig_pid = open( $update, '-|', "$freshclam --stdout" ); - defined( $update_sig_pid ) or do { + defined( $update_sig_pid ) + or do { set_infobar_text( 'error', _( 'Error updating: try again later' ) ); return 0; - }; + }; alarm 0; }; if ( $@ && $@ eq "failed\n" ) { @@ -193,13 +195,42 @@ # We can't just print stuff out; that's bad for non-English # speaking users. So, we'll grab the first couple words # and try to sum it up. + # + # logg("!Database update process failed: %s (%d)\n" + # Downloading database patch # 25961.. while ( defined( my $line = <$update> ) ) { Gtk3::main_iteration while Gtk3::events_pending; $pb->set_text( _( 'Downloading...' ) ); chomp( $line ); - if ( $line =~ /^Downloading daily-(\d+)/ ) { + if ( $line =~ /failed/ ) { + # Print these out to terminal window for now + warn $line, "\n"; + + } elsif ( $line =~ /Database test passed./ ) { + warn "Database test passed.\n"; + + } elsif ( $line =~ /^Downloading daily-(\d+).*?$/ ) { + # This one should probably be removed; + # was probably changed to the next elsif + my $new_daily = $1; + + $liststore->set( $iter_hash, 0, _( 'Antivirus signatures' ), + 1, $new_daily, ); + + } elsif ( $line + =~ q#^Retrieving https://database.clamav.net/daily-(\d+).cdiff# ) + { + my $new_daily = $1; + + $liststore->set( $iter_hash, 0, _( 'Antivirus signatures' ), + 1, $new_daily, ); + + } elsif ( $line =~ /^Testing database/ ) { + $pb->set_text( _( 'Testing database' ) ); + + } elsif ( $line =~ /^Downloading database patch # (\d+).*?$/ ) { my $new_daily = $1; $liststore->set( $iter_hash, 0, _( 'Antivirus signatures' ), @@ -207,10 +238,20 @@ } elsif ( $line =~ /Database updated/ ) { $pb->set_fraction( 1.0 ); + + } elsif ( + # bytecode appears to be last + $line =~ /.*?bytecode.*?$/ && ( $line =~ /.*?up-to-date\.$/ + || $line =~ /.*?up to date .*?/ + || $line =~ /.*?updated\.$/ ) + ) + { + $pb->set_fraction( 1.0 ); } else { # warn "skipping line: >$line<\n"; next; } + Gtk3::main_iteration while Gtk3::events_pending; } # Get local information. It would probably be okay to just # keep the same number we saw during the update, but this @@ -226,8 +267,8 @@ # Update infobar type and text; remove button set_infobar_text( 'info', _( 'Complete' ) ); ClamTk::GUI::set_infobar_mode( 'info', '' ); - # $pb->hide; - # destroy_button(); + $pb->hide; + destroy_button(); return TRUE; } @@ -242,6 +283,8 @@ $command .= " --datadir=$paths->{db} --log=$paths->{db}/freshclam.log"; } + # Add verbosity + $command .= " --verbose"; # Did the user set the proxy option? if ( ClamTk::Prefs->get_preference( 'HTTPProxy' ) ) { @@ -314,7 +357,8 @@ if ( /HTTPProxyServer\s+(.*?)$/ ) { $url = $1; } - last if ( !$url ); + last + if ( !$url ); if ( /HTTPProxyPort\s+(\d+)$/ ) { $port = $1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/lib/Whitelist.pm new/clamtk-6.07/lib/Whitelist.pm --- old/clamtk-6.06/lib/Whitelist.pm 2020-08-18 12:30:23.000000000 +0200 +++ new/clamtk-6.07/lib/Whitelist.pm 2021-01-31 11:06:24.000000000 +0100 @@ -1,4 +1,4 @@ -# ClamTk, copyright (C) 2004-2020 Dave M +# ClamTk, copyright (C) 2004-2021 Dave M # # This file is part of ClamTk # (https://gitlab.com/dave_m/clamtk-gtk3/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/clamtk-6.06/ubuntufresh.txt new/clamtk-6.07/ubuntufresh.txt --- old/clamtk-6.06/ubuntufresh.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/clamtk-6.07/ubuntufresh.txt 2020-11-01 14:09:32.000000000 +0100 @@ -0,0 +1,163 @@ +GLib-LOG **: unsetenv() is not thread-safe and should not be used after threads are created at /usr/share/perl5/Gtk3.pm line 555. +line = >ClamAV update process started at Sun Nov 1 07:07:43 2020< +this was skip area +line = >Current working dir is /home/dave/.clamtk/db/< +this was skip area +line = >Querying current.cvd.clamav.net< +this was skip area +line = >TTL: 82< +this was skip area +line = >fc_dns_query_update_info: Software version from DNS: 0.103.0< +this was skip area +line = >Current working dir is /home/dave/.clamtk/db/< +this was skip area +line = >check_for_new_database_version: Local copy of daily found: daily.cld.< +this was skip area +line = >query_remote_database_version: daily.cvd version from DNS: 25975< +this was skip area +line = >daily database available for update (local version: 25974, remote version: 25975)< +this was skip area +line = >Retrieving https://database.clamav.net/daily-25975.cdiff< +line = >downloadFile: Download source: https://database.clamav.net/daily-25975.cdiff< +this was skip area +line = >downloadFile: Download destination: ./clamav-367ddc00377d8d396350d401b8c04b60.tmp< +this was skip area +line = >* Trying 104.16.219.84:443...< +this was skip area +line = >* TCP_NODELAY set< +this was skip area +line = >* Connected to database.clamav.net (104.16.219.84) port 443 (#0)< +this was skip area +line = >* ALPN, offering h2< +this was skip area +line = >* ALPN, offering http/1.1< +this was skip area +line = >* successfully set certificate verify locations:< +this was skip area +line = >* CAfile: /etc/ssl/certs/ca-certificates.crt< +this was skip area +line = > CApath: /etc/ssl/certs< +this was skip area +line = >* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384< +this was skip area +line = >* ALPN, server accepted to use h2< +this was skip area +line = >* Server certificate:< +this was skip area +line = >* subject: C=US; ST=CA; L=San Francisco; O=Cloudflare, Inc.; CN=sni.cloudflaressl.com< +this was skip area +line = >* start date: Aug 15 00:00:00 2020 GMT< +this was skip area +line = >* expire date: Aug 15 12:00:00 2021 GMT< +this was skip area +line = >* subjectAltName: host "database.clamav.net" matched cert's "database.clamav.net"< +this was skip area +line = >* issuer: C=US; O=Cloudflare, Inc.; CN=Cloudflare Inc ECC CA-3< +this was skip area +line = >* SSL certificate verify ok.< +this was skip area +line = >* Using HTTP2, server supports multi-use< +this was skip area +line = >* Connection state changed (HTTP/2 confirmed)< +this was skip area +line = >* Copying HTTP/2 data in stream buffer to connection buffer after upgrade: len=0< +this was skip area +line = >* Using Stream ID: 1 (easy handle 0x55e5db355ba0)< +this was skip area +<ine = >> GET /daily-25975.cdiff HTTP/2 +this was skip area +<ine = >Host: database.clamav.net +this was skip area +<ine = >user-agent: ClamAV/0.102.4 (OS: linux-gnu, ARCH: x86_64, CPU: x86_64) +this was skip area +<ine = >accept: */* +this was skip area +<ine = >connection: close +this was skip area +<ine = > +this was skip area +line = >* old SSL session ID is stale, removing< +this was skip area +line = >* Connection state changed (MAX_CONCURRENT_STREAMS == 256)!< +this was skip area +<ine = >< HTTP/2 200 +this was skip area +<ine = >< date: Sun, 01 Nov 2020 13:07:44 GMT +this was skip area +<ine = >< content-type: application/octet-stream +this was skip area +<ine = >< content-length: 19064 +this was skip area +line = >< set-cookie: __cfduid=d051dd737cbb99d63fcb184c6a387f5951604236064; expires=Tue, 01-Dec-20 13:07:44 GMT; path=/; domain=.clamav.net; HttpOnly; SameSit<=Lax +this was skip area +<ine = >< last-modified: Sun, 01 Nov 2020 12:18:00 GMT +this was skip area +<ine = >< etag: "5f9ea778-4a78" +this was skip area +<ine = >< expires: Mon, 01 Nov 2021 13:00:19 GMT +this was skip area +<ine = >< cache-control: public, max-age=31535555 +this was skip area +<ine = >< cf-cache-status: HIT +this was skip area +<ine = >< age: 2539 +this was skip area +<ine = >< accept-ranges: bytes +this was skip area +<ine = >< cf-request-id: 062584cde800000edac429b000000001 +this was skip area +line = >< expect-ct: max-age=604800, report-uri="https://report-uri.cloudflare.<om/cdn-cgi/beacon/expect-ct" +this was skip area +<ine = >< strict-transport-security: max-age=15552000 +this was skip area +<ine = >< x-content-type-options: nosniff +this was skip area +<ine = >< server: cloudflare +this was skip area +<ine = >< cf-ray: 5eb5d7297aa80eda-DFW +this was skip area +<ine = >< +this was skip area +line = >* Connection #0 to host database.clamav.net left intact< +this was skip area +line = >cdiff_apply: Parsed 284 lines and executed 284 commands< +this was skip area +line = >updatedb: Running g_cb_download_complete callback...< +this was skip area +line = >download_complete_callback: Download complete for database : /home/dave/.clamtk/db/tmp.ffed5/clamav-6ecebcf7363c1f9e99aa13cbf72acf4c.tmp-daily.cld< +this was skip area +line = >download_complete_callback: fc_context->bTestDatabases : 1< +this was skip area +line = >download_complete_callback: fc_context->bBytecodeEnabled : 1< +this was skip area +line = >Testing database: '/home/dave/.clamtk/db/tmp.ffed5/clamav-6ecebcf7363c1f9e99aa13cbf72acf4c.tmp-daily.cld' ...< +this was skip area +line = >Loading signatures from /home/dave/.clamtk/db/tmp.ffed5/clamav-6ecebcf7363c1f9e99aa13cbf72acf4c.tmp-daily.cld< +this was skip area +line = >Properly loaded 4380136 signatures from /home/dave/.clamtk/db/tmp.ffed5/clamav-6ecebcf7363c1f9e99aa13cbf72acf4c.tmp-daily.cld< +this was skip area +line = >Database test passed.< +Database test passed. +line = >daily.cld updated (version: 25975, sigs: 4337770, f-level: 63, builder: raynman)< +this was skip area +line = >fc_update_database: daily.cld updated.< +this was skip area +line = >Current working dir is /home/dave/.clamtk/db/< +this was skip area +line = >check_for_new_database_version: Local copy of main found: main.cld.< +this was skip area +line = >query_remote_database_version: main.cvd version from DNS: 59< +this was skip area +line = >main.cld database is up to date (version: 59, sigs: 4564902, f-level: 60, builder: sigmgr)< +this was skip area +line = >fc_update_database: main.cld already up-to-date.< +this was skip area +line = >Current working dir is /home/dave/.clamtk/db/< +this was skip area +line = >check_for_new_database_version: Local copy of bytecode found: bytecode.cld.< +this was skip area +line = >query_remote_database_version: bytecode.cvd version from DNS: 331< +this was skip area +line = >bytecode.cld database is up to date (version: 331, sigs: 94, f-level: 63, builder: anvilleg)< +line = >fc_update_database: bytecode.cld already up-to-date.< +about to say complete
