Author: ensc
Update of /cvs/extras/rpms/clamav/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20253/F-7
Modified Files:
clamav-notify-servers clamav.spec clamd-gen clamd-wrapper
freshclam-sleep lastver sources verinfo
Added Files:
README.fedora clamav-0.92-private.patch
Removed Files:
clamav-0.90rc3-private.patch clamav-0.91.2-open.patch
clamav-0.92-nounrar.patch
Log Message:
merged with F-8
--- NEW FILE README.fedora ---
Add
INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=,
T=S:4m;R:4m')dnl
to your sendmail.mc.
clamav-0.92-private.patch:
--- NEW FILE clamav-0.92-private.patch ---
--- clamav-0.92/libclamav.pc.in.private
+++ clamav-0.92/libclamav.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libclamav
Description: A GPL virus scanner
Version: @LIBCLAMAV_VERSION@
-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
-Cflags: -I${includedir} @CFLAGS@
-
+Libs: -L${libdir} -lclamav
+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
+Cflags: -I${includedir}
--- clamav-0.92/clamav-config.in.private
+++ clamav-0.92/clamav-config.in
@@ -54,12 +54,8 @@ while test $# -gt 0; do
usage 0
;;
- --cflags)
- echo -I@includedir@ @CFLAGS@
- ;;
-
- --libs)
- echo -L@libdir@ @LIBCLAMAV_LIBS@
+ (--cflags|--libs)
+ ${PKG_CONFIG:-pkg-config} "$1" libclamav
;;
*)
Index: clamav-notify-servers
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/clamav-notify-servers,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clamav-notify-servers 28 Jul 2005 12:10:28 -0000 1.2
+++ clamav-notify-servers 1 Jan 2008 13:19:05 -0000 1.3
@@ -1,16 +1,16 @@
#! /bin/bash
# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/clamav.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- clamav.spec 21 Dec 2007 18:11:14 -0000 1.60
+++ clamav.spec 1 Jan 2008 13:19:05 -0000 1.61
@@ -1,7 +1,8 @@
## $Id$
## Fedora Extras specific customization below...
-%bcond_without fedora
+%bcond_without fedora
+%bcond_with unrar
##
%global username clamav
@@ -18,19 +19,13 @@
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
Version: 0.92
-Release: %release_func 3
+Release: %release_func 4
-License: GPLv2
+License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
Group: Applications/File
URL:
http://www.clamav.net
-# Unfortunately, clamav includes support for RAR v3, derived from GPL
-# incompatible unrar from RARlabs. We have to pull this code out.
-# All that is needed to make the clean tarball is: rm -rf libclamunrar*
-# Note that you also need patch26.
-Source0: clamav-%{version}.clean.tar.gz
-# Source0:
http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
-# No sense in using this file for the time being.
-#
Source999:
http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
+Source0:
http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz
+Source999:
http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig
Source1: clamd-wrapper
Source2: clamd.sysconfig
Source3: clamd.logrotate
@@ -40,9 +35,8 @@
Source8: clamav-notify-servers
Patch21: clamav-0.70-path.patch
Patch22: clamav-0.80-initoff.patch
-Patch24: clamav-0.90rc3-private.patch
+Patch24: clamav-0.92-private.patch
Patch25: clamav-0.92-open.patch
-Patch26: clamav-0.92-nounrar.patch
BuildRoot: %_tmppath/%name-%version-%release-root
Requires: clamav-lib = %version-%release
Requires: data(clamav)
@@ -73,6 +67,7 @@
Requires: clamav-lib = %version-%release
Requires: clamav-filesystem = %version-%release
Requires(pre): %_libdir/pkgconfig
+Requires: pkgconfig
%package data
Summary: Virus signature data for the Clam Antivirus scanner
@@ -122,6 +117,7 @@
Summary: Sendmail-milter for the Clam Antivirus scanner
Group: System Environment/Daemons
Requires: init(clamav-milter)
+Source300: README.fedora
BuildRequires: sendmail-devel
BuildRequires: fedora-usermgmt-devel
Provides: user(%milteruser)
@@ -215,12 +211,7 @@
%description milter
-This package contains files which are needed to run the clamav-milter. It
-can be activated by adding
-
-| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=,
T=S:4m;R:4m')dnl
-
-to your sendmail.mc.
+This package contains files which are needed to run the clamav-milter.
%description milter-sysv
The SysV initscripts for clamav-milter.
@@ -235,7 +226,9 @@
%patch22 -p1 -b .initoff
%patch24 -p1 -b .private
%patch25 -p1 -b .open
-%patch26 -p1 -b .nounrar
+
+install -p -m0644 %SOURCE300 clamav-milter/
+
perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g;
s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;
@@ -254,12 +247,16 @@
export LDFLAGS='-Wl,--as-needed'
# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check
export LIBS='-lmilter -lpthread'
-%configure --disable-clamav --with-dbdir=/var/lib/clamav \
- --enable-milter --disable-static --disable-unrar
-sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
-# No rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+%configure --disable-clamav --with-dbdir=/var/lib/clamav \
+ --enable-milter --disable-static --disable-rpath \
+ %{!?with_unrar:--disable-unrar}
+
+# build with --as-needed and disable rpath
+sed -i \
+ -e 's! -shared ! -Wl,--as-needed\0!g' \
+ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+ libtool
make %{?_smp_mflags}
@@ -291,15 +288,20 @@
${RPM_BUILD_ROOT}%milterstatedir \
${RPM_BUILD_ROOT}%pkgdatadir/template \
${RPM_BUILD_ROOT}%_initrddir \
- ${RPM_BUILD_ROOT}%homedir/daily.inc
+ ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc
rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \
${RPM_BUILD_ROOT}%_libdir/*.la
-for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do
- touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i
+
+for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do
+ touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i
+ touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i
done
+touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING
+touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING
+
## prepare the server-files
mkdir _doc_server
@@ -470,14 +472,8 @@
%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb
-%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd
+%ghost %attr(0664,%username,%username) %homedir/daily.inc/*
+%ghost %attr(0664,%username,%username) %homedir/main.inc/*
## -----------------------
@@ -503,7 +499,7 @@
%files milter
%defattr(-,root,root,-)
-%doc clamav-milter/INSTALL
+%doc clamav-milter/INSTALL clamav-milter/README.fedora
%_sbindir/*milter*
%_mandir/man8/clamav-milter*
%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf
@@ -519,6 +515,16 @@
%changelog
+* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4
+- added a README.fedora to the milter package (#240610)
+- ship original sources again; unrar is now licensed correctly (no more
+ stolen code put under GPL). Nevertheless, this license is not GPL
+ compatible, and to allow libclamav to be used by GPL applications,
+ unrar is disabled by a ./configure switch.
+- use pkg-config in clamav-config to emulate --cflags and --libs
+ operations (fixes partly multilib issues)
+- registered some more auto-updated files and marked them as %%ghost
+
* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3
- updated to 0.92 (SECURITY):
- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability
Index: clamd-gen
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/clamd-gen,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- clamd-gen 21 Sep 2006 18:27:43 -0000 1.3
+++ clamd-gen 1 Jan 2008 13:19:05 -0000 1.4
@@ -1,16 +1,16 @@
#! /bin/bash
# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -19,7 +19,7 @@
{
echo \
$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION>
--release=<RELEASE>
- --license=<LICENSE> --username=>USERNAME>
+ --license=<LICENSE> --username=>USERNAME>
"
exit 0
}
@@ -227,7 +227,7 @@
%dir %minitsvcdir
%config(noreplace) %verify(not mtime) %minitsvcdir/params
%config %minitsvcdir/run
- %minitsvcdir/respawn
+ %minitsvcdir/respawn
%endif
EOF
}
Index: clamd-wrapper
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/clamd-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clamd-wrapper 8 Nov 2004 04:10:52 -0000 1.1
+++ clamd-wrapper 1 Jan 2008 13:19:05 -0000 1.2
@@ -28,7 +28,7 @@
CLAMD_OPTIONS=
## backward-compatibility check...
for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \
- /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
+ /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do
CLAMD_SOCKET=$i
test ! -e "$i" || break
done
Index: freshclam-sleep
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/freshclam-sleep,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- freshclam-sleep 28 Jul 2005 12:06:36 -0000 1.2
+++ freshclam-sleep 1 Jan 2008 13:19:05 -0000 1.3
@@ -1,15 +1,15 @@
#! /bin/bash
# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de>
-#
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -33,7 +33,7 @@
(disabled-warn)
echo $"\
WARNING: update of clamav database is disabled; please see
- '$f'
+ '$f'
for information how to enable the periodic update resp. how to turn
off this message." >&2
exit 1
Index: lastver
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/lastver,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lastver 1 Sep 2007 14:44:41 -0000 1.1
+++ lastver 1 Jan 2008 13:19:05 -0000 1.2
@@ -1 +1 @@
-0.91.2
+0.92
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 21 Dec 2007 18:06:17 -0000 1.31
+++ sources 1 Jan 2008 13:19:05 -0000 1.32
@@ -1 +1,2 @@
-554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz
+e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz
+5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig
Index: verinfo
===================================================================
RCS file: /cvs/extras/rpms/clamav/F-7/verinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- verinfo 1 Sep 2007 14:44:41 -0000 1.1
+++ verinfo 1 Jan 2008 13:19:05 -0000 1.2
@@ -1,2 +1,2 @@
http://prdownloads.sourceforge.net/sourceforge/clamav/
-clamav-(.*?)\.tar\.
+clamav-([0-9.-]*?)\.tar\.
--- clamav-0.90rc3-private.patch DELETED ---
--- clamav-0.91.2-open.patch DELETED ---
--- clamav-0.92-nounrar.patch DELETED ---