Update to 0.103.4
This commit is contained in:
Sérgio M. Basto
parent
a1ea20866b
commit
3bfeeeeeec
|
|
@ -4,7 +4,7 @@ diff -up clamav-0.103.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service
|
|||
@@ -4,14 +4,12 @@
|
||||
[Unit]
|
||||
Description=ClamAV On-Access Scanner
|
||||
Documentation=man:clamonacc(8) man:clamd.conf(5) https://www.clamav.net/documents
|
||||
Documentation=man:clamonacc(8) man:clamd.conf(5) https://docs.clamav.net/
|
||||
-Requires=clamav-daemon.service
|
||||
-After=clamav-daemon.service syslog.target network.target
|
||||
+After=clamd@scan.service syslog.target network.target
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
+++ ./freshclam/clamav-freshclam.service.in 2021-06-14 10:37:53.621423748 +0100
|
||||
@@ -2,13 +2,12 @@
|
||||
Description=ClamAV virus database updater
|
||||
Documentation=man:freshclam(1) man:freshclam.conf(5) https://www.clamav.net/documents
|
||||
Documentation=man:freshclam(1) man:freshclam.conf(5) https://docs.clamav.net/
|
||||
# If user wants it run from cron, don't start the daemon.
|
||||
-ConditionPathExists=!/etc/cron.d/clamav-freshclam
|
||||
+# ConditionPathExists=!/etc/cron.d/clamav-update
|
||||
|
|
|
|||
12
clamav.spec
12
clamav.spec
|
|
@ -33,8 +33,8 @@
|
|||
|
||||
Summary: End-user tools for the Clam Antivirus scanner
|
||||
Name: clamav
|
||||
Version: 0.103.3
|
||||
Release: 9%{?dist}
|
||||
Version: 0.103.4
|
||||
Release: 1%{?dist}
|
||||
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
|
||||
URL: https://www.clamav.net/
|
||||
%if %{with unrar}
|
||||
|
|
@ -43,8 +43,7 @@ Source999: https://www.clamav.net/downloads/production/%name-%version%{?prerele
|
|||
%else
|
||||
# Unfortunately, clamav includes support for RAR v3, derived from GPL
|
||||
# incompatible unrar from RARlabs. We have to pull this code out.
|
||||
# tarball was created by
|
||||
# make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz
|
||||
# tarball was created with update_clamav.sh
|
||||
Source0: %name-%version%{?prerelease}-norar.tar.xz
|
||||
%endif
|
||||
#for server
|
||||
|
|
@ -57,7 +56,7 @@ Source5: clamd-README
|
|||
#http://database.clamav.net/main.cvd
|
||||
Source10: main-62.cvd
|
||||
#http://database.clamav.net/daily.cvd
|
||||
Source11: daily-26299.cvd
|
||||
Source11: daily-26345.cvd
|
||||
#http://database.clamav.net/bytecode.cvd
|
||||
Source12: bytecode-333.cvd
|
||||
#for update
|
||||
|
|
@ -579,6 +578,9 @@ test -e %{freshclamlog} || {
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Nov 07 2021 Sérgio Basto <sergio@serjux.com> - 0.103.4-1
|
||||
- Update to 0.103.4
|
||||
|
||||
* Sun Oct 03 2021 Sérgio Basto <sergio@serjux.com> - 0.103.3-9
|
||||
- Get rid of pkgdatadir variable %%{_datadir}/%%{name} is more informative
|
||||
- Get rid og milterlog variable %%{_var}/log/clamav-milter.log is more readable
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,4 +1,4 @@
|
|||
SHA512 (clamav-0.103.3-norar.tar.xz) = 3f3be128e201403a380213e270155fa4dfd4268c08da408ec185eb02dcbf36240826424af0fb746bdb3e5671d9201513b5ed74b2eab491b6b9915991a80d17ab
|
||||
SHA512 (clamav-0.103.4-norar.tar.xz) = bcdb1cc1f5dd1d4a881156e0e2b3a4662a0a67fe944ae1ebae149980149cd14a512d5364fcbdf6d9aa2f4cd843a225057fe044c2fd58bf255fe1fd3fe6422c1e
|
||||
SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e
|
||||
SHA512 (daily-26299.cvd) = 127525f78df687fa2524f7b49db1a406e45ee6d5c074453f107cdd2e187fac9fb039a92188ad563f4cee4b7a7f51f51d98df5a410e55daa3f2c388a4fe71808b
|
||||
SHA512 (daily-26345.cvd) = 7a7d004fa26a33b4b46a9ee09fb390865e32f9d746a42fa12d9a2143c2eb1006294ccf758ed1daed7c7e8b826f013e5da020eb271e291b21c3b1ff5ffc71401c
|
||||
SHA512 (bytecode-333.cvd) = 895c41266b9bc332f3a00c9267907251ad32abe3a5bff7584285e087430fe0dd7343e4ac0245308f3734d971d6ecb5656fd9ce6caf0fa24f9da7a41a96bc4d07
|
||||
|
|
|
|||
|
|
@ -1,44 +1,51 @@
|
|||
VERSION=0.103.3
|
||||
VERSION=0.103.4
|
||||
NAME=clamav
|
||||
TARBALL_CLEAN=${NAME}-${VERSION}-norar.tar.xz
|
||||
TARBALL=${NAME}-${VERSION}.tar.gz
|
||||
|
||||
wget https://www.clamav.net/downloads/production/${TARBALL}
|
||||
wget https://www.clamav.net/downloads/production/${TARBALL}.sig
|
||||
wget -c https://www.clamav.net/downloads/production/${TARBALL}
|
||||
wget -c https://www.clamav.net/downloads/production/${TARBALL}.sig
|
||||
gpg --verify ${TARBALL}.sig ${TARBALL}
|
||||
zcat ${TARBALL} | tar --delete -f - '*/libclamunrar/*' | xz -c > ${TARBALL_CLEAN}
|
||||
|
||||
# WIP clouflare don't allow wget we need download with browser
|
||||
wget http://database.clamav.net/main.cvd
|
||||
wget http://database.clamav.net/daily.cvd
|
||||
wget http://database.clamav.net/bytecode.cvd
|
||||
#wget http://database.clamav.net/main.cvd
|
||||
#get http://database.clamav.net/daily.cvd
|
||||
#get http://database.clamav.net/bytecode.cvd
|
||||
|
||||
main_ver=$(file main.cvd | sed -e 's/.*version /main-/;s/,.*/.cvd/')
|
||||
daily_ver=$(file daily.cvd | sed -e 's/.*version /daily-/;s/,.*/.cvd/')
|
||||
bytecode_ver=$(file bytecode.cvd | sed -e 's/.*version /bytecode-/;s/,.*/.cvd/')
|
||||
|
||||
mv -f main.cvd $main_ver
|
||||
mv -f daily.cvd $daily_ver
|
||||
mv -f bytecode.cvd $bytecode_ver
|
||||
cp -f main.cvd $main_ver
|
||||
cp -f daily.cvd $daily_ver
|
||||
cp -f bytecode.cvd $bytecode_ver
|
||||
|
||||
sed -i "s|^Source10: .*|Source10: $main_ver|" clamav.spec
|
||||
sed -i "s|^Source11: .*|Source11: $daily_ver|" clamav.spec
|
||||
sed -i "s|^Source12: .*|Source12: $bytecode_ver|" clamav.spec
|
||||
|
||||
rpmdev-bumpspec -n 0.103.3 -c "Update to 0.103.3 (#1974601)" clamav.spec
|
||||
fkinit -u sergiomb
|
||||
fedpkg scratch-build --srpm
|
||||
rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" clamav.spec
|
||||
echo fedpkg new-sources ${TARBALL_CLEAN} $main_ver $daily_ver $bytecode_ver
|
||||
echo Press enter scratch-build or n to skip ; read dummy;
|
||||
if [[ "$dummy" != "n" ]]; then
|
||||
#fkinit -u sergiomb
|
||||
fedpkg scratch-build --srpm
|
||||
fi
|
||||
echo Press enter to upload sources and commit ; read dummy;
|
||||
fedpkg new-sources ${TARBALL_CLEAN} $main_ver $daily_ver $bytecode_ver
|
||||
fedpkg ci -c
|
||||
git push && fedpkg build
|
||||
fedpkg ci -c && git show
|
||||
|
||||
git checkout f34 && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
git checkout f33 && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
git checkout epel8-playground && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
git checkout epel8 && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
git checkout epel7 && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
echo Press enter to build rawhide; read dummy;
|
||||
git push && fedpkg build --nowait
|
||||
|
||||
for repo in "f35 f34 f33 epel8-playground epel8 epel7" ; do
|
||||
echo Press enter to build on branch $repo; read dummy;
|
||||
git checkout $repo && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
|
||||
done
|
||||
|
||||
exit
|
||||
# not finished yet
|
||||
/usr/bin/bodhi updates new --autokarma --autotime --type bugfix --severity medium --notes "https://blog.clamav.net/2021/06/clamav-01033-patch-release.html" --bugs 1974601 --request testing clamav-0.103.3-1.fc34
|
||||
/usr/bin/bodhi updates new --autokarma --autotime --type bugfix --severity medium --notes "https://blog.clamav.net/2021/06/clamav-01033-patch-release.html" --bugs 1974601 --request testing clamav-0.103.3-1.fc33
|
||||
/usr/bin/bodhi updates new --autokarma --autotime --type bugfix --severity medium --notes "https://blog.clamav.net/2021/06/clamav-01033-patch-release.html" --bugs 1974601 --request testing clamav-0.103.3-1.el8
|
||||
Loading…
Reference in New Issue