Skip to content

Commit

Permalink
add 6.12 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dave-theunsub committed Jul 5, 2021
1 parent e867ac6 commit 14d03fd
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 36 deletions.
4 changes: 2 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CHANGELOG for ClamTk:

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

6.11 - 20210409
Expand Down
31 changes: 13 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This README was last updated on 13 March 2021.
This README was last updated on 5 July 2021.

# Readme for ClamTk

Expand Down Expand Up @@ -34,11 +34,6 @@ https://gitlab.com/dave_m/clamtk/wikis/home
https://github.com/dave-theunsub/clamtk/
https://launchpad.net/clamtk

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

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

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.06. The name of the file may differ based on your distribution.
For these examples, we will use version 6.12. The name of the file may differ based on your distribution.

To install using a terminal window:

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

To remove clamtk:

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

```
tar xzf clamtk-6.10.tar.xz
tar xzf clamtk-6.12.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
Expand Down Expand Up @@ -102,7 +97,7 @@ From the commandline, you can do this:

If you downloaded the file, then use this:

sudo apt install clamtk_6.09-1_all.deb
sudo apt install clamtk_6.12-1_all.deb

To remove clamtk:

Expand All @@ -120,20 +115,20 @@ While the Debian/Ubuntu .debs have always been digitally signed, the rpms have n
`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.10:
`rpm --checksig clamtk-6.10-1.fc.noarch.rpm`
3. Check the signature of the rpm. For this example, we'll use version 6.12:
`rpm --checksig clamtk-6.12-1.fc.noarch.rpm`
4. You should see something like this:
`/home/you/clamtk-6.10-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK`
`/home/you/clamtk-6.12-1.fc.noarch.rpm: rsa sha1 (md5) pgp md5 OK`

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

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.10.tar.xz.asc clamtk-6.10.tar.gz` or
`gpg --verify clamtk-6.10.tar.xz.asc clamtk-6.10.tar.xz`
`gpg2 --verify clamtk-6.12.tar.xz.asc clamtk-6.12.tar.gz` or
`gpg --verify clamtk-6.12.tar.xz.asc clamtk-6.12.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).

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

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

Now, you verify like so:
```
minisign -V -x clamtk-6.10.tar.xz.minisig -p davemminisign.pub -m clamtk-6.10.tar.xz
minisign -V -x clamtk-6.12.tar.xz.minisig -p davemminisign.pub -m clamtk-6.12.tar.xz
```


Expand Down
28 changes: 17 additions & 11 deletions clamtk.appdata.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2021 Dave M <[email protected]> -->
<component type="desktop">
<id>clamtk.desktop</id>
<component type="desktop-application">
<id>com.github.davetheunsub.clamtk</id>
<metadata_license>FSFAP</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>ClamTk</name>
Expand Down Expand Up @@ -70,18 +70,24 @@
<description>
<p>ClamTk is intended to be an easy to use, light-weight, on-demand scanner for Linux systems.</p>
</description>
<screenshots>
<screenshot type="default">
<caption>An easy to use virus scanner for Linux systems.</caption>
<image type="source" width="300" height="300">https://github.com/dave-theunsub/clamtk/raw/master/images/clamtk_300x300.png</image>
</screenshot>
</screenshots>.
<categories>

<categories>
<category>System</category>
</categories>
<icon type="local" width="128" height="128">/usr/share/pixmaps/clamtk.png</icon>

<screenshots>
<screenshot type="default">
<caption>The initial screen</caption>
<image>https://davem.fedorapeople.org/images/clamtk-1-screenshot.png</image>
</screenshot>
<screenshot>
<caption>Program settings dialog</caption>
<image>https://davem.fedorapeople.org/images/clamtk-2-screenshot.png</image>
</screenshot>
</screenshots>

<releases>
<release version="6.09" date="2021-02-27">
<release version="6.12" date="2021-06-05">
<description>
<p>Bug fixes</p>
</description>
Expand Down
8 changes: 7 additions & 1 deletion clamtk.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ GenericName[el]=Ανιχνευτής ιών
GenericName[en_AU]=Virus Scanner
GenericName[en_CA]=Virus Scanner
GenericName[en_GB]=Virus Scanner
GenericName[eo]=Viruskontrolilo
GenericName[es]=Analizador de Virus
GenericName[eu]=Birus eskanerra
GenericName[fi]=Virustorjuntasovellus
GenericName[fo]=Virus skannari
GenericName[fr]=Module de recherche et analyse de virus
Expand Down Expand Up @@ -52,6 +54,7 @@ GenericName[uz]=Вирусларни текшириш
GenericName[zh_CN]=病毒扫描工具
GenericName[zh_TW]=病毒掃描程式
Comment=Scan for threats...
Comment[af]=Skandeer vir virusse...
Comment[ar]=إمسح للكشف عن الفيروسات
Comment[ast]=Buscar amenaces...
Comment[az]=Təhlükə mövcudluğuna yoxla...
Expand All @@ -75,13 +78,15 @@ Comment[hr]=Pretraživanje virusa...
Comment[hu]=Vírusok keresése...
Comment[id]=Pindai untuk ancaman...
Comment[it]=Analizza per la ricerca di minacce...
Comment[ja]=ウィルスをスキャンします...
Comment[ja]=ウィルスをスキャンします..
Comment[km]=វិភាគរកការគំរាមកំហៃង...
Comment[ko]=위험 요소를 검사합니다...
Comment[mnw_MM]=စိစောတ်ဂၠိုက်ဂၠာဲအန္တရာယ်
Comment[ms]=Imbas jika ada ancaman...
Comment[nl]=Scannen op virussen…
Comment[nb]=Skann etter virus...
Comment[nn]=Skann...
Comment[pa]=ਧਮਕਿਯਾੰ ਲਈ ਖੋਜ ਕਰੋ
Comment[pl]=Przeskanuj pliki w poszukiwaniu wirusów...
Comment[pt]=A analizar ameaças...
Comment[pt_BR]=Verificar se há vírus...
Expand All @@ -92,6 +97,7 @@ Comment[sl]=Preglej za virusi...
Comment[sr@latin]=Skeniranje pretnji...
Comment[sv]=Skanna efter virus...
Comment[te]=వైరస్సుల కోసం సంశోధిస్తున్నది...
Comment[th]=สแกนภัยคุกคาม...
Comment[tr]=Virüs taraması yap...
Comment[ug]=ۋىرۇس تەكشۈر…
Comment[uk]=Шукати загрози…
Expand Down
2 changes: 1 addition & 1 deletion lib/App.pm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use Encode 'decode';

sub get_TK_version {
# Stick with %.2f format - 4.50 vice 4.5
return '6.10';
return '6.12';
}

sub get_path {
Expand Down
7 changes: 5 additions & 2 deletions lib/GUI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ sub start_gui {
$top_box->set_homogeneous( FALSE );
$eb->add( $top_box );

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

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

$dialog->run;
$dialog->destroy;
Expand Down
19 changes: 18 additions & 1 deletion lib/Update.pm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sub show_window {

$liststore = Gtk3::ListStore->new(
# product, local version,
'Glib::String', 'Glib::String',
'Glib::String', 'Glib::String', 'Glib::String',
);

# Product column
Expand All @@ -61,6 +61,7 @@ sub show_window {
Gtk3::CellRendererText->new,
text => 0,
);
$column->set_alignment( 0.5 );
$view->append_column( $column );

# Installed version column
Expand All @@ -69,16 +70,30 @@ sub show_window {
Gtk3::CellRendererText->new,
text => 1,
);
$column->set_alignment( 0.5 );
$view->append_column( $column );

# Date of signatures
$column = Gtk3::TreeViewColumn->new_with_attributes(
_( 'Date' ),
Gtk3::CellRendererText->new,
text => 2,
);
$column->set_alignment( 0.5 );
$view->append_column( $column );

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

# Get date of signatures
my $av_date = ClamTk::App->get_sigtool_info( 'date' );

#<<<
my @data = (
{
product => _( 'Antivirus signatures' ),
local => $local_sig_version,
date => $av_date,
},
);

Expand All @@ -91,6 +106,7 @@ sub show_window {
$liststore->set( $iter,
0, $item->{ product },
1, $item->{ local },
2, $item->{ date },
);
}
#>>>
Expand Down Expand Up @@ -123,6 +139,7 @@ sub show_window {
$box->pack_start( $infobar, FALSE, FALSE, 0 );
$box->pack_start( $pb, FALSE, FALSE, 0 );

$view->columns_autosize();
$box->show_all;
$pb->hide;
return $box;
Expand Down

0 comments on commit 14d03fd

Please sign in to comment.