scm-commits January 2008

scm-commits@lists.fedoraproject.org

1 participants
8943 discussions

rpms/clamav/devel clamav.spec,1.65,1.66
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17593/devel Modified Files: clamav.spec Log Message: minor optimizations Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- clamav.spec 1 Jan 2008 17:10:12 -0000 1.65 +++ clamav.spec 1 Jan 2008 17:33:05 -0000 1.66 @@ -257,7 +257,7 @@ install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} +%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g;

1 0

rpms/ekg/devel ekg-unicode,NONE,1.1 ekg.spec,1.6,1.7
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: rathann Update of /cvs/pkgs/rpms/ekg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17490 Modified Files: ekg.spec Added Files: ekg-unicode Log Message: - use luit wrapper to work around lack of unicode support (bug #210745) - fix line endings and docs encoding in prep instead of install section --- NEW FILE ekg-unicode --- #!/bin/sh exec luit -encoding 'ISO 8859-2' ekg.wrapped "$@" Index: ekg.spec =================================================================== RCS file: /cvs/pkgs/rpms/ekg/devel/ekg.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ekg.spec 6 Dec 2007 16:16:21 -0000 1.6 +++ ekg.spec 1 Jan 2008 17:31:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: ekg Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A client compatible with Gadu-Gadu Summary(de): Ein Cliente kompatibel mit Gadu-Gadu Summary(es): Un cliente compatible con Gadu-Gadu @@ -10,6 +10,7 @@ Group: Applications/Internet Source0: http://ekg.chmurka.net/%{name}-%{version}.tar.gz Source1: %{name}.conf +Source2: ekg-unicode Patch0: %{name}-rpm.patch Patch1: %{name}-external-libgadu.patch URL: http://ekg.chmurka.net/ @@ -24,6 +25,7 @@ BuildRequires: perl BuildRequires: python-devel BuildRequires: zlib-devel +Requires: %{_bindir}/luit BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) %description @@ -75,6 +77,18 @@ %setup -q %patch0 -p1 -b .r %patch1 -p1 -b .libgadu +# fix line endings and encoding +tr -d '\r' < contrib/ekl2.pl > contrib/ekl2.pl.unix ; mv contrib/ekl2.pl.unix contrib/ekl2.pl +for file in \ + contrib/ekl2* \ + docs/api/functions.txt \ + docs/*.txt \ + docs/FAQ docs/IDEAS-2.0 docs/README docs/TODO docs/ULOTKA \ + docs/*.man.pl \ + ChangeLog* \ +; do + iconv -f iso8859-2 -t utf8 -o $file.utf $file && mv $file.utf $file +done %build rm -f missing @@ -99,30 +113,19 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir} -# fix line endings and encoding befor make install -tr -d '\r' < contrib/ekl2.pl > contrib/ekl2.pl.unix ; mv contrib/ekl2.pl.unix contrib/ekl2.pl - -for file in \ - contrib/ekl2* \ - docs/api/functions.txt \ - docs/*.txt \ - docs/FAQ docs/IDEAS-2.0 docs/README docs/TODO docs/ULOTKA \ - docs/*.man.pl \ - ChangeLog* \ -; do -iconv -f iso8859-2 -t utf8 -o $file.utf $file ; mv $file.utf $file -done - %{__make} install install-ekl2 \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} +install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} # For libgadu-devel rm -f examples/Makefile examples/Makefile.in examples/.cvsignore rm -rf examples/CVS +mv $RPM_BUILD_ROOT%{_bindir}/ekg $RPM_BUILD_ROOT%{_bindir}/ekg.wrapped +install -pm755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/ekg + %clean rm -rf $RPM_BUILD_ROOT @@ -140,6 +143,10 @@ %lang(pl) %{_mandir}/pl/man1/* %changelog +* Tue Jan 01 2008 Dominik Mierzejewski <rpm(a)greysector.net> 1.7-4 +- use luit wrapper to work around lack of unicode support (bug #210745) +- fix line endings and docs encoding in prep instead of install section + * Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.7-3 - Rebuild for deps

1 0

rpms/clamav/devel sources,1.33,1.34 clamav.spec,1.64,1.65
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17120/devel Modified Files: sources clamav.spec Log Message: - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail (#239037) Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 1 Jan 2008 13:19:16 -0000 1.33 +++ sources 1 Jan 2008 17:10:12 -0000 1.34 @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- clamav.spec 1 Jan 2008 14:59:15 -0000 1.64 +++ clamav.spec 1 Jan 2008 17:10:12 -0000 1.65 @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# 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* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -114,18 +121,32 @@ Requires(postun): %_initrddir %package milter -Summary: Sendmail-milter for the Clam Antivirus scanner +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: clamav-milter-core = %version-%release +Requires: milter(clamav) + +%package milter-core +Summary: Core milter module 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) Provides: group(%milteruser) -Requires: sendmail Requires(post): coreutils %{?FE_USERADD_REQ} +%package milter-sendmail +Summary: Sendmail customizations for clamav-milter +Group: System Environment/Daemons +Source300: README.fedora +Requires: sendmail +Requires: clamav-milter-core = %version-%release +Provides: milter(clamav) = sendmail +Conflicts: milter(clamav) < sendmail +Conflicts: milter(clamav) > sendmail + %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons @@ -216,6 +237,12 @@ %description milter-sysv The SysV initscripts for clamav-milter. +%description milter-core +Core files for the clamav-milter. + +%description milter-sendmail +Sendmail customizations of the clamav-milter. + ## ------------------------------------------------------------ @@ -229,6 +256,8 @@ install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -498,14 +527,20 @@ %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL clamav-milter/README.fedora + +%files milter-core +%defattr(-,root,root,-) +%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%files milter-sendmail +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv %defattr(-,root,root,-) @@ -514,6 +549,11 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds)

1 0

rpms/clamav/F-8 clamav.spec,1.64,1.65 sources,1.33,1.34
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17033/F-8 Modified Files: clamav.spec sources Log Message: redisabled unrar stuff completely by using clean sources Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- clamav.spec 1 Jan 2008 14:59:21 -0000 1.64 +++ clamav.spec 1 Jan 2008 17:07:44 -0000 1.65 @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# 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* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -229,6 +236,8 @@ install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -514,6 +523,9 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds) Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 1 Jan 2008 12:59:02 -0000 1.33 +++ sources 1 Jan 2008 17:07:44 -0000 1.34 @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz

1 0

rpms/clamav/F-7 clamav.spec,1.62,1.63 sources,1.32,1.33
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17033/F-7 Modified Files: clamav.spec sources Log Message: redisabled unrar stuff completely by using clean sources Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-7/clamav.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- clamav.spec 1 Jan 2008 14:59:33 -0000 1.62 +++ clamav.spec 1 Jan 2008 17:07:24 -0000 1.63 @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# 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* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -229,6 +236,8 @@ install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -514,6 +523,9 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds) Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/F-7/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 1 Jan 2008 13:19:05 -0000 1.32 +++ sources 1 Jan 2008 17:07:24 -0000 1.33 @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz

1 0

rpms/kbibtex/F-8 kbibtex-0.2-desktop-file-type.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kbibtex.spec, 1.10, 1.11 sources, 1.5, 1.6
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: noltec Update of /cvs/pkgs/rpms/kbibtex/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2599 Modified Files: .cvsignore kbibtex.spec sources Added Files: kbibtex-0.2-desktop-file-type.patch Log Message: - update to current upstream version 0.2 kbibtex-0.2-desktop-file-type.patch: --- NEW FILE kbibtex-0.2-desktop-file-type.patch --- diff -up kbibtex-0.2/src/kbibtex_part.desktop.type kbibtex-0.2/src/kbibtex_part.desktop --- kbibtex-0.2/src/kbibtex_part.desktop.type 2008-01-01 16:14:47.000000000 +0100 +++ kbibtex-0.2/src/kbibtex_part.desktop 2008-01-01 16:15:09.000000000 +0100 @@ -12,4 +12,4 @@ Name[de]=Einbettungsfähige Komponente v MimeType=text/x-bibtex;application/x-endnote-library; ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-KDE-Library=libkbibtexpart -Type=Service +Type=Application Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/kbibtex/F-8/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jul 2007 20:57:29 -0000 1.5 +++ .cvsignore 1 Jan 2008 15:27:52 -0000 1.6 @@ -1 +1 @@ -kbibtex-0.1.5.52.tar.bz2 +kbibtex-0.2.tar.bz2 Index: kbibtex.spec =================================================================== RCS file: /cvs/pkgs/rpms/kbibtex/F-8/kbibtex.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kbibtex.spec 9 Jul 2007 20:57:29 -0000 1.10 +++ kbibtex.spec 1 Jan 2008 15:27:52 -0000 1.11 @@ -1,12 +1,13 @@ Name: kbibtex -Version: 0.1.5.52 -Release: 11%{?dist} +Version: 0.2 +Release: 13%{?dist} Summary: A BibTeX editor for KDE Group: Applications/Editors -License: GPL +License: GPLv2+ URL: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/ Source0: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.t… +Patch1: kbibtex-0.2-desktop-file-type.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdebase-devel >= 3.3 libxslt-devel desktop-file-utils @@ -19,6 +20,7 @@ %prep %setup -q +%patch1 -p1 -b .type %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -113,6 +115,10 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog +* Tue Jan 01 2008 Christian Nolte <ch.nolte at noltec.org> - 0.2-13 +- Updated to latest upstream version 0.2 +- Desktop-File kbibtex_part.desktop patched: Type is Application now + * Mon Jul 09 2007 Christian Nolte <ch.nolte at noltec.org> - 0.1.5.52-11 - Updated to latest upstream version Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/kbibtex/F-8/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jul 2007 20:57:29 -0000 1.5 +++ sources 1 Jan 2008 15:27:52 -0000 1.6 @@ -1 +1 @@ -8e02b898f96a8f6fbb31afc70ebdb123 kbibtex-0.1.5.52.tar.bz2 +4ed33020f68c970e5ec37a20d3a49b59 kbibtex-0.2.tar.bz2

1 0

rpms/clamav/F-7 clamav.spec,1.61,1.62
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/F-7 Modified Files: clamav.spec Log Message: use a better way to disable RPATH-generation (needed for '--with unrar' builds) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-7/clamav.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- clamav.spec 1 Jan 2008 13:19:05 -0000 1.61 +++ clamav.spec 1 Jan 2008 14:59:33 -0000 1.62 @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ # 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-rpath \ + --enable-milter --disable-static \ %{!?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' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * 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

1 0

rpms/clamav/F-8 clamav.spec,1.63,1.64
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/F-8 Modified Files: clamav.spec Log Message: use a better way to disable RPATH-generation (needed for '--with unrar' builds) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- clamav.spec 1 Jan 2008 13:03:20 -0000 1.63 +++ clamav.spec 1 Jan 2008 14:59:21 -0000 1.64 @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ # 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-rpath \ + --enable-milter --disable-static \ %{!?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' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * 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

1 0

rpms/clamav/devel clamav.spec,1.63,1.64
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/devel Modified Files: clamav.spec Log Message: use a better way to disable RPATH-generation (needed for '--with unrar' builds) Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- clamav.spec 1 Jan 2008 13:19:16 -0000 1.63 +++ clamav.spec 1 Jan 2008 14:59:15 -0000 1.64 @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ # 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-rpath \ + --enable-milter --disable-static \ %{!?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' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * 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

1 0

rpms/clamav/devel README.fedora, NONE, 1.1 clamav-0.92-private.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 clamav-notify-servers, 1.2, 1.3 clamav.spec, 1.62, 1.63 clamd-gen, 1.3, 1.4 clamd-wrapper, 1.1, 1.2 freshclam-sleep, 1.2, 1.3 lastver, 1.1, 1.2 sources, 1.32, 1.33 verinfo, 1.1, 1.2 clamav-0.90rc3-private.patch, 1.1, NONE clamav-0.91.2-open.patch, 1.1, NONE clamav-0.92-nounrar.patch, 1.1, NONE
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: ensc Update of /cvs/extras/rpms/clamav/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20253/devel Modified Files: .cvsignore 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: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Dec 2007 18:06:29 -0000 1.8 +++ .cvsignore 1 Jan 2008 13:19:16 -0000 1.9 @@ -1 +1,2 @@ -clamav-0.92.clean.tar.gz +clamav-*.tar.gz* +clamav-*.*.rpm Index: clamav-notify-servers =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/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:16 -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/devel/clamav.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- clamav.spec 21 Dec 2007 18:11:32 -0000 1.62 +++ clamav.spec 1 Jan 2008 13:19:16 -0000 1.63 @@ -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/devel/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:16 -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/devel/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:16 -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/devel/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:16 -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/devel/lastver,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lastver 2 Sep 2007 11:30:08 -0000 1.1 +++ lastver 1 Jan 2008 13:19:16 -0000 1.2 @@ -1 +1 @@ -0.91.2 +0.92 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 21 Dec 2007 18:06:29 -0000 1.32 +++ sources 1 Jan 2008 13:19:16 -0000 1.33 @@ -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/devel/verinfo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- verinfo 2 Sep 2007 11:30:08 -0000 1.1 +++ verinfo 1 Jan 2008 13:19:16 -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 ---

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits January 2008