[klamav] fix pointless gzip API abuse causing FTBFS
Kevin Kofler
kkofler at fedoraproject.org
Sat Aug 4 22:29:50 UTC 2012
commit 340a46b9edfc4463640590547445295764a2fca5
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sun Aug 5 00:29:34 2012 +0200
fix pointless gzip API abuse causing FTBFS
* Sat Aug 04 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.46-10
- fix pointless gzip API abuse causing FTBFS
- drop ancient conditional for Fedora < 7
klamav-0.46-gzip-api.patch | 17 +++++++++++++++++
klamav.spec | 13 ++++++++-----
2 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/klamav-0.46-gzip-api.patch b/klamav-0.46-gzip-api.patch
new file mode 100644
index 0000000..7c4c5d3
--- /dev/null
+++ b/klamav-0.46-gzip-api.patch
@@ -0,0 +1,17 @@
+diff -ur klamav-0.46/src/dbviewer.cpp klamav-0.46-gzip-api/src/dbviewer.cpp
+--- klamav-0.46/src/dbviewer.cpp 2009-02-28 11:27:28.000000000 +0100
++++ klamav-0.46-gzip-api/src/dbviewer.cpp 2012-08-05 00:25:27.000000000 +0200
+@@ -430,11 +430,11 @@
+ int nbytes, nread, nwritten, in_block = 0;
+ unsigned int size;
+ FILE *outfile = NULL;
+- gzFile *infile;
++ gzFile infile;
+
+ printf("in cli_untgz()\n");
+
+- if((infile = (gzFile*) gzdopen(fd, "rb")) == NULL) {
++ if((infile = gzdopen(fd, "rb")) == NULL) {
+ printf("Can't gzdopen() descriptor %d\n", fd);
+ return -1;
+ }
diff --git a/klamav.spec b/klamav.spec
index 56ab731..f46ce26 100644
--- a/klamav.spec
+++ b/klamav.spec
@@ -1,7 +1,7 @@
Summary: Clam Anti-Virus on the KDE Desktop
Name: klamav
Version: 0.46
-Release: 9%{?dist}.1
+Release: 10%{?dist}
Source0: http://downloads.sourceforge.net/klamav/%{name}-%{version}.tar.bz2
Patch0: klamav-0.46-suse-clamav-path.patch
# Upstream notified via mailing list:
@@ -11,17 +11,15 @@ Patch1: klamav-0.41.1-pwd-echo.patch
Patch2: klamav-0.44-no-kde3-mediamanager.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=553811
Patch3: klamav-0.46-fix-docpath.patch
+# fix pointless gzip API abuse causing FTBFS
+Patch4: klamav-0.46-gzip-api.patch
URL: http://klamav.sourceforge.net
Group: Applications/System
License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: clamav >= 0.93
Requires: clamav-update >= 0.93
-%if 0%{?fedora} >= 7
BuildRequires: kdelibs3-devel >= 3.5.2
-%else
-BuildRequires: kdelibs-devel >= 3.5.2
-%endif
BuildRequires: clamav-devel >= 0.93
BuildRequires: curl-devel
BuildRequires: gmp-devel
@@ -38,6 +36,7 @@ ClamAV Anti-Virus protection for the KDE desktop.
%patch1 -p1 -b .pwd-echo
%patch2 -p1 -b .no-kde3-mediamanager
%patch3 -p1 -b .fix-docpath
+%patch4 -p1 -b .gzip-api
# Remove staled files (#553807)
%{__rm} -f po/*.gmo
@@ -96,6 +95,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_datadir}/icons/*/*x*/apps/klamav.png
%changelog
+* Sat Aug 04 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.46-10
+- fix pointless gzip API abuse causing FTBFS
+- drop ancient conditional for Fedora < 7
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.46-9.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list