Skip to content

Commit 14d03fd

Browse files
committed
add 6.12 changes
1 parent e867ac6 commit 14d03fd

File tree

7 files changed

+63
-36
lines changed

7 files changed

+63
-36
lines changed

CHANGES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
CHANGELOG for ClamTk:
22

3-
6.12 - 20210605
3+
6.12 - 20210705
44
---------------
55
* Fixes for appdata.xml (Github #128, Bugzilla #1819344)
6-
* Partially work Github #129 (add engine version, date of sigs)
6+
* Partially work Github #129 (engine version, date of sigs, title)
77
* Update translations in clamtk.desktop
88

99
6.11 - 20210409

README.md

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This README was last updated on 13 March 2021.
1+
This README was last updated on 5 July 2021.
22

33
# Readme for ClamTk
44

@@ -34,11 +34,6 @@ https://gitlab.com/dave_m/clamtk/wikis/home
3434
https://github.com/dave-theunsub/clamtk/
3535
https://launchpad.net/clamtk
3636

37-
https://code.google.com/p/clamtk/ (deprecated)
38-
http://clamtk.sourceforge.net (deprecated)
39-
https://dave-theunsub.github.io/clamtk/ (deprecated)
40-
https://bitbucket.org/davem_/clamtk-gtk3/ (deprecated)
41-
https://bitbucket.org/davem_/clamtk/ (deprecated)
4237

4338
[ClamAV](https://www.clamav.net)
4439
[Gtk2-Perl](http://gtk2-perl.sourceforge.net)
@@ -57,11 +52,11 @@ First, start with the official repositories.
5752

5853
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.
5954

60-
For these examples, we will use version 6.06. The name of the file may differ based on your distribution.
55+
For these examples, we will use version 6.12. The name of the file may differ based on your distribution.
6156

6257
To install using a terminal window:
6358

64-
`sudo yum install clamtk-6.10-1.el8.noarch.rpm` or `sudo dnf install clamtk-6.10-1.fc.noarch.rpm`
59+
`sudo yum install clamtk-6.12-1.el8.noarch.rpm` or `sudo dnf install clamtk-6.12-1.fc.noarch.rpm`
6560

6661
To remove clamtk:
6762

@@ -73,7 +68,7 @@ To remove clamtk:
7368
The tarball contains all the sources. One way to do this, as tested on Fedora, is to run the following commands:
7469

7570
```
76-
tar xzf clamtk-6.10.tar.xz
71+
tar xzf clamtk-6.12.tar.xz
7772
sudo mkdir -p /usr/share/perl5/vendor_perl/ClamTk
7873
sudo cp lib/*.pm /usr/share/perl5/vendor_perl/ClamTk
7974
sudo chmod +x clamtk
@@ -102,7 +97,7 @@ From the commandline, you can do this:
10297

10398
If you downloaded the file, then use this:
10499

105-
sudo apt install clamtk_6.09-1_all.deb
100+
sudo apt install clamtk_6.12-1_all.deb
106101

107102
To remove clamtk:
108103

@@ -120,20 +115,20 @@ While the Debian/Ubuntu .debs have always been digitally signed, the rpms have n
120115
`rpm --import https://davem.fedorapeople.org/RPM-GPG-KEY-DaveM-21-June-2018`
121116
2. Verify the list of gpg keys installed in RPM DB:
122117
`rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release} --> %{summary}\n'`
123-
3. Check the signature of the rpm. For this example, we'll use version 6.10:
124-
`rpm --checksig clamtk-6.10-1.fc.noarch.rpm`
118+
3. Check the signature of the rpm. For this example, we'll use version 6.12:
119+
`rpm --checksig clamtk-6.12-1.fc.noarch.rpm`
125120
4. You should see something like this:
126-
`/home/you/clamtk-6.10-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK`
121+
`/home/you/clamtk-6.12-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK`
127122

128-
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.
123+
You can also verify the tarball. Using 6.12 as the example version, ensure you have downloaded the tarball, its detached signature (.asc), and the key in step 1 above.
129124

130125
1. Get the key (skip this step if you already have it):
131126
`wget https://davem.fedorapeople.org/RPM-GPG-KEY-DaveM-21-June-2018`
132127
2. Import it (skip this step if you have done it already):
133128
`gpg --import RPM-GPG-KEY-DaveM-21-June-2018`
134129
3. Verify like so:
135-
`gpg2 --verify clamtk-6.10.tar.xz.asc clamtk-6.10.tar.gz` or
136-
`gpg --verify clamtk-6.10.tar.xz.asc clamtk-6.10.tar.xz`
130+
`gpg2 --verify clamtk-6.12.tar.xz.asc clamtk-6.12.tar.gz` or
131+
`gpg --verify clamtk-6.12.tar.xz.asc clamtk-6.12.tar.xz`
137132
4. You should see something like this:
138133
`gpg: Signature made Sun 11 Sep 2016 06:29:41 AM CDT using RSA key ID` (snipped for brevity).
139134

@@ -148,11 +143,11 @@ Then, you will need the minisig file for the program you are verifying.
148143
A link to it will be with the rest of the downloads.
149144

150145
For this example:
151-
https://github.com/dave-theunsub/clamtk/releases/download/v6.10/clamtk-6.10.tar.xz.minisig
146+
https://github.com/dave-theunsub/clamtk/releases/download/v6.12/clamtk-6.12.tar.xz.minisig
152147

153148
Now, you verify like so:
154149
```
155-
minisign -V -x clamtk-6.10.tar.xz.minisig -p davemminisign.pub -m clamtk-6.10.tar.xz
150+
minisign -V -x clamtk-6.12.tar.xz.minisig -p davemminisign.pub -m clamtk-6.12.tar.xz
156151
```
157152

158153

clamtk.appdata.xml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Copyright 2021 Dave M <[email protected]> -->
3-
<component type="desktop">
4-
<id>clamtk.desktop</id>
3+
<component type="desktop-application">
4+
<id>com.github.davetheunsub.clamtk</id>
55
<metadata_license>FSFAP</metadata_license>
66
<project_license>GPL-2.0+</project_license>
77
<name>ClamTk</name>
@@ -70,18 +70,24 @@
7070
<description>
7171
<p>ClamTk is intended to be an easy to use, light-weight, on-demand scanner for Linux systems.</p>
7272
</description>
73-
<screenshots>
74-
<screenshot type="default">
75-
<caption>An easy to use virus scanner for Linux systems.</caption>
76-
<image type="source" width="300" height="300">https://github.com/dave-theunsub/clamtk/raw/master/images/clamtk_300x300.png</image>
77-
</screenshot>
78-
</screenshots>.
79-
<categories>
73+
74+
<categories>
8075
<category>System</category>
8176
</categories>
82-
<icon type="local" width="128" height="128">/usr/share/pixmaps/clamtk.png</icon>
77+
78+
<screenshots>
79+
<screenshot type="default">
80+
<caption>The initial screen</caption>
81+
<image>https://davem.fedorapeople.org/images/clamtk-1-screenshot.png</image>
82+
</screenshot>
83+
<screenshot>
84+
<caption>Program settings dialog</caption>
85+
<image>https://davem.fedorapeople.org/images/clamtk-2-screenshot.png</image>
86+
</screenshot>
87+
</screenshots>
88+
8389
<releases>
84-
<release version="6.09" date="2021-02-27">
90+
<release version="6.12" date="2021-06-05">
8591
<description>
8692
<p>Bug fixes</p>
8793
</description>

clamtk.desktop

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ GenericName[el]=Ανιχνευτής ιών
1414
GenericName[en_AU]=Virus Scanner
1515
GenericName[en_CA]=Virus Scanner
1616
GenericName[en_GB]=Virus Scanner
17+
GenericName[eo]=Viruskontrolilo
1718
GenericName[es]=Analizador de Virus
19+
GenericName[eu]=Birus eskanerra
1820
GenericName[fi]=Virustorjuntasovellus
1921
GenericName[fo]=Virus skannari
2022
GenericName[fr]=Module de recherche et analyse de virus
@@ -52,6 +54,7 @@ GenericName[uz]=Вирусларни текшириш
5254
GenericName[zh_CN]=病毒扫描工具
5355
GenericName[zh_TW]=病毒掃描程式
5456
Comment=Scan for threats...
57+
Comment[af]=Skandeer vir virusse...
5558
Comment[ar]=إمسح للكشف عن الفيروسات
5659
Comment[ast]=Buscar amenaces...
5760
Comment[az]=Təhlükə mövcudluğuna yoxla...
@@ -75,13 +78,15 @@ Comment[hr]=Pretraživanje virusa...
7578
Comment[hu]=Vírusok keresése...
7679
Comment[id]=Pindai untuk ancaman...
7780
Comment[it]=Analizza per la ricerca di minacce...
78-
Comment[ja]=ウィルスをスキャンします...
81+
Comment[ja]=ウィルスをスキャンします..
82+
Comment[km]=វិភាគរកការគំរាមកំហៃង...
7983
Comment[ko]=위험 요소를 검사합니다...
8084
Comment[mnw_MM]=စိစောတ်ဂၠိုက်ဂၠာဲအန္တရာယ်
8185
Comment[ms]=Imbas jika ada ancaman...
8286
Comment[nl]=Scannen op virussen…
8387
Comment[nb]=Skann etter virus...
8488
Comment[nn]=Skann...
89+
Comment[pa]=ਧਮਕਿਯਾੰ ਲਈ ਖੋਜ ਕਰੋ
8590
Comment[pl]=Przeskanuj pliki w poszukiwaniu wirusów...
8691
Comment[pt]=A analizar ameaças...
8792
Comment[pt_BR]=Verificar se há vírus...
@@ -92,6 +97,7 @@ Comment[sl]=Preglej za virusi...
9297
Comment[sr@latin]=Skeniranje pretnji...
9398
Comment[sv]=Skanna efter virus...
9499
Comment[te]=వైరస్సుల కోసం సంశోధిస్తున్నది...
100+
Comment[th]=สแกนภัยคุกคาม...
95101
Comment[tr]=Virüs taraması yap...
96102
Comment[ug]=ۋىرۇس تەكشۈر…
97103
Comment[uk]=Шукати загрози…

lib/App.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use Encode 'decode';
2525

2626
sub get_TK_version {
2727
# Stick with %.2f format - 4.50 vice 4.5
28-
return '6.10';
28+
return '6.12';
2929
}
3030

3131
sub get_path {

lib/GUI.pm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sub start_gui {
6666
$top_box->set_homogeneous( FALSE );
6767
$eb->add( $top_box );
6868

69-
$hb->set_title( _( 'Virus Scanner' ) );
69+
$hb->set_title( _( 'ClamTk Virus Scanner' ) );
7070
$hb->set_decoration_layout( 'menu,icon:minimize,close' );
7171
$hb->set_show_close_button( TRUE );
7272

@@ -716,7 +716,10 @@ sub about {
716716
$dialog->set_program_name( 'ClamTk' );
717717
$dialog->set_authors( [ 'Dave M', '[email protected]' ] );
718718
$dialog->set_comments(
719-
_( 'ClamTk is a graphical front-end for Clam Antivirus' ) );
719+
_( 'ClamTk is a graphical front-end for Clam Antivirus' ) . "\n"
720+
. '(ClamAV '
721+
. ClamTk::App->get_AV_version()
722+
. ')' );
720723

721724
$dialog->run;
722725
$dialog->destroy;

lib/Update.pm

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sub show_window {
4949

5050
$liststore = Gtk3::ListStore->new(
5151
# product, local version,
52-
'Glib::String', 'Glib::String',
52+
'Glib::String', 'Glib::String', 'Glib::String',
5353
);
5454

5555
# Product column
@@ -61,6 +61,7 @@ sub show_window {
6161
Gtk3::CellRendererText->new,
6262
text => 0,
6363
);
64+
$column->set_alignment( 0.5 );
6465
$view->append_column( $column );
6566

6667
# Installed version column
@@ -69,16 +70,30 @@ sub show_window {
6970
Gtk3::CellRendererText->new,
7071
text => 1,
7172
);
73+
$column->set_alignment( 0.5 );
74+
$view->append_column( $column );
75+
76+
# Date of signatures
77+
$column = Gtk3::TreeViewColumn->new_with_attributes(
78+
_( 'Date' ),
79+
Gtk3::CellRendererText->new,
80+
text => 2,
81+
);
82+
$column->set_alignment( 0.5 );
7283
$view->append_column( $column );
7384

7485
# Get local information
7586
my $local_sig_version = ClamTk::App->get_local_sig_version();
7687

88+
# Get date of signatures
89+
my $av_date = ClamTk::App->get_sigtool_info( 'date' );
90+
7791
#<<<
7892
my @data = (
7993
{
8094
product => _( 'Antivirus signatures' ),
8195
local => $local_sig_version,
96+
date => $av_date,
8297
},
8398
);
8499

@@ -91,6 +106,7 @@ sub show_window {
91106
$liststore->set( $iter,
92107
0, $item->{ product },
93108
1, $item->{ local },
109+
2, $item->{ date },
94110
);
95111
}
96112
#>>>
@@ -123,6 +139,7 @@ sub show_window {
123139
$box->pack_start( $infobar, FALSE, FALSE, 0 );
124140
$box->pack_start( $pb, FALSE, FALSE, 0 );
125141

142+
$view->columns_autosize();
126143
$box->show_all;
127144
$pb->hide;
128145
return $box;

0 commit comments

Comments
 (0)