scm-commits January 2008

scm-commits@lists.fedoraproject.org

1 participants
8943 discussions

rpms/clamav/F-7 README.fedora, NONE, 1.1 clamav-0.92-private.patch, NONE, 1.1 clamav-notify-servers, 1.2, 1.3 clamav.spec, 1.60, 1.61 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.31, 1.32 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/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 ---

1 0

rpms/roxterm/devel .cvsignore, 1.5, 1.6 roxterm.spec, 1.3, 1.4 sources, 1.5, 1.6
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: svahl Update of /cvs/extras/rpms/roxterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168 Modified Files: .cvsignore roxterm.spec sources Log Message: * Tue Jan 01 2008 Sebastian Vahl <fedora(a)deadbabylon.de> - 1.9.0-1 - new upstream version: 1.9.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/roxterm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Dec 2007 23:34:01 -0000 1.5 +++ .cvsignore 1 Jan 2008 13:17:23 -0000 1.6 @@ -1 +1 @@ -roxterm-1.8.1.tar.gz +roxterm-1.9.0.tar.gz Index: roxterm.spec =================================================================== RCS file: /cvs/extras/rpms/roxterm/devel/roxterm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- roxterm.spec 13 Dec 2007 22:35:06 -0000 1.3 +++ roxterm.spec 1 Jan 2008 13:17:23 -0000 1.4 @@ -1,5 +1,5 @@ Name: roxterm -Version: 1.8.1 +Version: 1.9.0 Release: 1%{?dist} Summary: A fast terminal emulator @@ -68,6 +68,9 @@ %{_datadir}/icons/hicolor/scalable/apps/roxterm.svg %changelog +* Tue Jan 01 2008 Sebastian Vahl <fedora(a)deadbabylon.de> - 1.9.0-1 +- new upstream version: 1.9.0 + * Thu Dec 13 2007 Sebastian Vahl <fedora(a)deadbabylon.de> - 1.8.1-1 - new upstream version: 1.8.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/roxterm/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Dec 2007 23:34:01 -0000 1.5 +++ sources 1 Jan 2008 13:17:23 -0000 1.6 @@ -1 +1 @@ -53b28ee08d6fb4d26a47cf9e40bcc68b roxterm-1.8.1.tar.gz +e76afb0f507d8ff41a810fbc61feeb8a roxterm-1.9.0.tar.gz

1 0

rpms/clamav/F-8 lastver,1.1,1.2
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-serv20022 Modified Files: lastver Log Message: version 0.92 Index: lastver =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/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:08:10 -0000 1.2 @@ -1 +1 @@ -0.91.2 +0.92

1 0

rpms/clamav/F-8 verinfo,1.1,1.2
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-serv19966 Modified Files: verinfo Log Message: fixed version regexp Index: verinfo =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/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:06:06 -0000 1.2 @@ -1,2 +1,2 @@ http://prdownloads.sourceforge.net/sourceforge/clamav/ -clamav-(.*?)\.tar\. +clamav-([0-9.-]*?)\.tar\.

1 0

rpms/clamav/F-8 clamav.spec,1.62,1.63
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-serv19908 Modified Files: clamav.spec Log Message: - 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 Index: clamav.spec =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/clamav.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- clamav.spec 21 Dec 2007 18:11:20 -0000 1.62 +++ clamav.spec 1 Jan 2008 13:03:20 -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

1 0

rpms/clamav/F-8 sources, 1.32, 1.33 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/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13163 Modified Files: sources Removed Files: clamav-0.92-nounrar.patch Log Message: - 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. Index: sources =================================================================== RCS file: /cvs/extras/rpms/clamav/F-8/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 21 Dec 2007 18:06:22 -0000 1.32 +++ sources 1 Jan 2008 12:59:02 -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 --- clamav-0.92-nounrar.patch DELETED ---

1 0

rpms/brasero/F-8 brasero-0.6.1-patchset.patch, NONE, 1.1 brasero.spec, 1.14, 1.15
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: denis Update of /cvs/pkgs/rpms/brasero/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5442 Modified Files: brasero.spec Added Files: brasero-0.6.1-patchset.patch Log Message: - Added patchset from 0.6 branch - Includes fix for audio CD size computation (#397951) brasero-0.6.1-patchset.patch: --- NEW FILE brasero-0.6.1-patchset.patch --- Index: ChangeLog =================================================================== --- a/ChangeLog (revision 311) +++ b/ChangeLog (working copy) @@ -1,3 +1,30 @@ +2007-09-30 Luis Medinas <metalgod(a)svn.gnome.org> + + * src/burn-medium.c: (brasero_medium_init_real): + + Revert broken merge. + +2007-09-28 Rouquier Philippe <philippr(a)svn.gnome.org> + + Increased debugging output for SCSI + +2007-09-25 Rouquier Philippe <philippr(a)svn.gnome.org> + + Backported changes from trunk as an attempt to fix some recurring scsi + errors + +2007-09-25 Rouquier Philippe <philippr(a)svn.gnome.org> + + fix stupid mistake in scsi error handling + +2007-09-24 Rouquier Philippe <bonfire-app(a)wanadoo.fr> + + fix 475442 + +2007-09-24 Rouquier Philippe <bonfire-app(a)wanadoo.fr> + + fix 465203 + 2007-08-25 Rouquier Philippe <bonfire-app(a)wanadoo.fr> fixes for libisofs 0.2.5 and 0.2.8 Index: src/burn.c =================================================================== --- a/src/burn.c (revision 311) +++ b/src/burn.c (working copy) @@ -943,7 +943,8 @@ GError **error) { gchar *failure; - gint64 media_size; + gint64 img_sectors; + gint64 media_sectors; BraseroBurnError berror; BraseroMediumInfo media; BraseroBurnResult result; @@ -1045,7 +1046,7 @@ * one exception if we don't have enough space left on * the disc. * NOTE: if MERGE or APPEND flag is on then don't check - */ + * NOTE: it's safe to compare size in bytes here */ NCB_MEDIA_GET_FREE_SPACE (drive, &size, NULL); if (!(flags & (BRASERO_BURN_FLAG_MERGE|BRASERO_BURN_FLAG_APPEND)) && size > burn->priv->image_size @@ -1106,17 +1107,36 @@ } } - /* we check that the image will fit on the media */ + /* we check that the image will fit on the media + * NOTE: we must use the sectors for comparison */ if (flags & (BRASERO_BURN_FLAG_MERGE|BRASERO_BURN_FLAG_APPEND)) - NCB_MEDIA_GET_FREE_SPACE (drive, &media_size, NULL); + NCB_MEDIA_GET_FREE_SPACE (drive, NULL, &media_sectors); else - NCB_MEDIA_GET_CAPACITY (drive, &media_size, NULL); + NCB_MEDIA_GET_CAPACITY (drive, NULL, &media_sectors); + if (source->type == BRASERO_TRACK_SOURCE_DATA) + img_sectors = burn->priv->image_size / 2048; + else if (source->type == BRASERO_TRACK_SOURCE_AUDIO) + img_sectors = burn->priv->image_size / 2352; + else if (source->type == BRASERO_TRACK_SOURCE_IMAGE) { + if (source->format == BRASERO_IMAGE_FORMAT_CLONE) + img_sectors = burn->priv->image_size / 2448; + else if (source->format == BRASERO_IMAGE_FORMAT_CUE + || source->format == BRASERO_IMAGE_FORMAT_CDRDAO) + img_sectors = burn->priv->image_size / 2352; + else + img_sectors = burn->priv->image_size / 2048; + } + else if (source->type == BRASERO_TRACK_SOURCE_DISC) + NCB_MEDIA_GET_DATA_SIZE (source->contents.drive.disc, NULL, &img_sectors); + else + img_sectors = 0; + /* NOTE: this is useful only for reloads since otherwise we still don't * know what's the image size yet */ if (!(flags & BRASERO_BURN_FLAG_OVERBURN) && (flags & BRASERO_BURN_FLAG_CHECK_SIZE) - && media_size < burn->priv->image_size) { + && media_sectors < img_sectors) { /* This is a recoverable error so try to ask the user again */ result = BRASERO_BURN_NEED_RELOAD; berror = BRASERO_BURN_ERROR_MEDIA_SPACE; @@ -1497,6 +1517,7 @@ } gnome_vfs_uri_unref (uri); + /* it's safe here to check with sizes */ if (burn->priv->image_size > vol_size) { g_set_error (error, BRASERO_BURN_ERROR, @@ -1824,6 +1845,7 @@ const gchar *output, GError **error) { + gint64 img_sectors; GError *ret_error = NULL; BraseroBurnResult result; @@ -1842,13 +1864,31 @@ } if (NCB_DRIVE_GET_TYPE (drive) != NAUTILUS_BURN_DRIVE_TYPE_FILE) { - gint64 media_size; + gint64 media_sectors; - NCB_MEDIA_GET_CAPACITY (drive, &media_size, NULL); + NCB_MEDIA_GET_CAPACITY (drive, NULL, &media_sectors); + if (source->type == BRASERO_TRACK_SOURCE_DATA) + img_sectors = burn->priv->image_size / 2048; + else if (source->type == BRASERO_TRACK_SOURCE_AUDIO) + img_sectors = burn->priv->image_size / 2352; + else if (source->type == BRASERO_TRACK_SOURCE_IMAGE) { + if (source->format == BRASERO_IMAGE_FORMAT_CLONE) + img_sectors = burn->priv->image_size / 2448; + else if (source->format == BRASERO_IMAGE_FORMAT_CUE + || source->format == BRASERO_IMAGE_FORMAT_CDRDAO) + img_sectors = burn->priv->image_size / 2352; + else + img_sectors = burn->priv->image_size / 2048; + } + else if (source->type == BRASERO_TRACK_SOURCE_DISC) + NCB_MEDIA_GET_DATA_SIZE (source->contents.drive.disc, NULL, &img_sectors); + else + img_sectors = 0; + /* check that the image can fit on the media */ if (!(flags & BRASERO_BURN_FLAG_OVERBURN) - && media_size < burn->priv->image_size) { + && media_sectors < img_sectors) { /* This is a recoverable error so try to ask the user again */ result = brasero_burn_reload_dest_media (burn, BRASERO_BURN_ERROR_MEDIA_SPACE, Index: src/burn-medium.c =================================================================== --- a/src/burn-medium.c (revision 311) +++ b/src/burn-medium.c (working copy) @@ -308,6 +308,8 @@ priv = BRASERO_MEDIUM_PRIVATE (self); + BRASERO_BURN_LOG ("Retrieving capacity from atip"); + result = brasero_mmc1_read_atip (fd, &atip_data, sizeof (atip_data), @@ -336,6 +338,8 @@ BraseroScsiResult result; gint size; + BRASERO_BURN_LOG ("Retrieving format capacity"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_mmc2_read_format_capacities (fd, &hdr, @@ -424,6 +428,8 @@ BraseroScsiWrtSpdDesc *desc; BraseroScsiGetPerfData *wrt_perf = NULL; + BRASERO_BURN_LOG ("Retrieving speed (Get Performance)"); + /* NOTE: this only work if there is RT streaming feature with * wspd bit set to 1. At least an MMC3 drive. */ priv = BRASERO_MEDIUM_PRIVATE (self); @@ -471,7 +477,7 @@ * function but don't report any speed. So if our top speed is 0 then * use the other way to get the speed. It was a Teac */ if (!priv->max_wrt) - return BRASERO_BURN_RETRY; + return BRASERO_BURN_ERR; return BRASERO_BURN_OK; } @@ -491,6 +497,8 @@ gint max_num; int size = 0; + BRASERO_BURN_LOG ("Retrieving speed (2A speeds)"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_spc1_mode_sense_get_page (fd, BRASERO_SPC_PAGE_STATUS, @@ -506,6 +514,7 @@ page_2A = (BraseroScsiStatusPage *) &data->page; + /* FIXME: the following is not necessarily true */ if (size < sizeof (BraseroScsiStatusPage)) { g_free (data); @@ -554,6 +563,8 @@ BraseroScsiResult result; int size = 0; + BRASERO_BURN_LOG ("Retrieving speed (2A max)"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_spc1_mode_sense_get_page (fd, @@ -590,11 +601,12 @@ BraseroScsiErrCode *code) { BraseroScsiGetConfigHdr *hdr = NULL; - BraseroScsiRTStreamDesc *stream; BraseroMediumPrivate *priv; BraseroScsiResult result; int size; + BRASERO_BURN_LOG ("Retrieving media profile"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_mmc2_get_configuration_feature (fd, BRASERO_SCSI_FEAT_REAL_TIME_STREAM, @@ -749,39 +761,35 @@ return BRASERO_BURN_NOT_SUPPORTED; } - BRASERO_BURN_LOG ("medium is %d", priv->info); + /* try all SCSI functions to get write/read speeds in order */ + if (hdr->desc->add_len >= sizeof (BraseroScsiRTStreamDesc)) { + BraseroScsiRTStreamDesc *stream; - /* see how we should get the speeds */ - if (hdr->desc->add_len != sizeof (BraseroScsiRTStreamDesc)) { - g_free (hdr); + /* means it's at least an MMC3 drive */ + stream = (BraseroScsiRTStreamDesc *) hdr->desc->data; + if (stream->wrt_spd) { + result = brasero_medium_get_speed_mmc3 (self, fd, code); + if (result == BRASERO_BURN_OK) + goto end; + } - BRASERO_BURN_LOG ("wrong size for Stream descriptor"); - return BRASERO_BURN_ERR; + if (stream->mp2a) { + result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code); + if (result == BRASERO_BURN_OK) + goto end; + } } - /* try all SCSI functions to get write/read speeds in order */ - stream = (BraseroScsiRTStreamDesc *) hdr->desc->data; - if (stream->wrt_spd) { - /* NOTE: the next function returns either OK or RETRY to make - * sure we always go and get over an error. There are other ways - * to get the information we want */ - result = brasero_medium_get_speed_mmc3 (self, fd, code); - if (result != BRASERO_BURN_RETRY) - goto end; - } + /* fallback for speeds */ + result = brasero_medium_get_page_2A_max_speed (self, fd, code); - if (stream->mp2a) - result = brasero_medium_get_page_2A_write_speed_desc (self, fd, code); - else - result = brasero_medium_get_page_2A_max_speed (self, fd, code); - end: g_free (hdr); if (result != BRASERO_BURN_OK) - return BRASERO_BURN_ERR; + return result; return BRASERO_BURN_OK; } @@ -797,6 +805,8 @@ int size; priv = BRASERO_MEDIUM_PRIVATE (self); + + BRASERO_BURN_LOG ("Testing for Css encrypted media"); result = brasero_mmc2_get_configuration_feature (fd, BRASERO_SCSI_FEAT_DVD_CSS, &hdr, @@ -809,14 +819,16 @@ return BRASERO_BURN_ERR; } - if (hdr->desc->add_len != sizeof (BraseroScsiDVDCssDesc)) { + if (hdr->desc->add_len < sizeof (BraseroScsiDVDCssDesc)) { g_free (hdr); - return BRASERO_BURN_ERR; + return BRASERO_BURN_OK; } /* here we just need to see if this feature is current or not */ - if (hdr->desc->current) + if (hdr->desc->current) { priv->info |= BRASERO_MEDIUM_PROTECTED; + BRASERO_BURN_LOG ("media is Css protected"); + } g_free (hdr); return BRASERO_BURN_OK; @@ -877,13 +889,26 @@ BraseroScsiTrackInfo track_info; BraseroMediumPrivate *priv; BraseroScsiResult result; + int size; + BRASERO_BURN_LOG ("Retrieving track information for %i", track_num); + priv = BRASERO_MEDIUM_PRIVATE (self); + /* at this point we know the type of the disc that's why we set the + * size according to this type. That may help to avoid outrange address + * errors. */ + if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DL|BRASERO_MEDIUM_WRITABLE)) + size = 48; + else if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_PLUS|BRASERO_MEDIUM_WRITABLE)) + size = 40; + else + size = 36; + result = brasero_mmc1_read_track_info (fd, track_num, &track_info, - sizeof (BraseroScsiTrackInfo), + &size, code); if (result != BRASERO_SCSI_OK) { @@ -921,6 +946,8 @@ BraseroMediumPrivate *priv; BraseroScsiFormattedTocData *toc = NULL; + BRASERO_BURN_LOG ("Reading toc"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_mmc1_read_toc_formatted (fd, 0, @@ -937,6 +964,8 @@ num = (size - sizeof (BraseroScsiFormattedTocData)) / sizeof (BraseroScsiTocDesc); + BRASERO_BURN_LOG ("%i track(s) found", num); + desc = toc->desc; for (i = 0; i < num; i ++, desc ++) { BraseroMediumTrack *track; @@ -1056,6 +1085,8 @@ BraseroMediumPrivate *priv; BraseroScsiDiscInfoStd *info = NULL; + BRASERO_BURN_LOG ("Retrieving media status"); + priv = BRASERO_MEDIUM_PRIVATE (self); result = brasero_mmc1_read_disc_information_std (fd, @@ -1075,6 +1106,8 @@ if (info->status == BRASERO_SCSI_DISC_EMPTY) { BraseroMediumTrack *track; + BRASERO_BURN_LOG ("Empty media"); + priv->info |= BRASERO_MEDIUM_BLANK; priv->block_size = 2048; @@ -1086,8 +1119,12 @@ goto end; } - if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) + if (info->status == BRASERO_SCSI_DISC_INCOMPLETE) { priv->info |= BRASERO_MEDIUM_APPENDABLE; + BRASERO_BURN_LOG ("Appendable media"); + } + else if (info->status == BRASERO_SCSI_DISC_FINALIZED) + BRASERO_BURN_LOG ("Closed media"); result = brasero_medium_get_sessions_info (self, fd, code); if (result != BRASERO_BURN_OK) @@ -1112,17 +1149,17 @@ if (result != BRASERO_BURN_OK) return; - if (priv->info & BRASERO_MEDIUM_DVD) { - result = brasero_medium_get_css_feature (object, fd, &code); - if (result != BRASERO_BURN_OK) - return; - } - result = brasero_medium_get_contents (object, fd, &code); if (result != BRASERO_BURN_OK) return; + /* assume that css feature is only for DVD-ROM which might be wrong but some drives + * wrongly reports that css is enabled for some blank DVD+R */ + if (BRASERO_MEDIUM_IS (priv->info, (BRASERO_MEDIUM_DVD/*|BRASERO_MEDIUM_ROM*/))) + brasero_medium_get_css_feature (object, fd, &code); + brasero_medium_get_capacity_by_type (object, fd, &code); + BRASERO_BURN_LOG ("media is %i", priv->info); } static gboolean Index: src/data-disc.c =================================================================== --- a/src/data-disc.c (revision 311) +++ b/src/data-disc.c (working copy) @@ -8048,6 +8048,9 @@ } if (disc->priv->is_loading) { + /* Translators: the following text is the reason why brasero + * failed to load a project: because it is already loading + * another project */ brasero_data_disc_import_session_error (disc, _("loading project")); return; } Index: src/scsi/scsi-read-track-information.c =================================================================== --- a/src/scsi/scsi-read-track-information.c (revision 311) +++ b/src/scsi/scsi-read-track-information.c (working copy) @@ -26,6 +26,8 @@ #include <glib.h> +#include "burn-debug.h" + #include "scsi-error.h" #include "scsi-utils.h" #include "scsi-base.h" @@ -85,115 +87,87 @@ #define BRASERO_SCSI_INCOMPLETE_TRACK 0xFF -/** - * - * NOTE: if media is a CD and track_num = 0 then returns leadin - * but since the other media don't have a leadin they error out. - * if track_num = 255 returns last incomplete track. - */ - -BraseroScsiResult -brasero_mmc1_read_track_info (int fd, - int track_num, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error) +static BraseroScsiResult +brasero_read_track_info (BraseroRdTrackInfoCDB *cdb, + BraseroScsiTrackInfo *info, + int *size, + BraseroScsiErrCode *error) { - BraseroRdTrackInfoCDB *cdb; + BraseroScsiTrackInfo hdr; BraseroScsiResult res; + int datasize; - cdb = brasero_scsi_command_new (&info, fd); - cdb->addr_num_type = BRASERO_FIELD_TRACK_NUM; - BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, track_num); - BRASERO_SET_16 (cdb->alloc_len, size); + if (!info || !size) { + BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_BAD_ARGUMENT); + return BRASERO_SCSI_FAILURE; + } - memset (track_info, 0, sizeof (BraseroScsiTrackInfo)); - res = brasero_scsi_command_issue_sync (cdb, track_info, size, error); - brasero_scsi_command_free (cdb); - return res; -} + /* first ask the drive how long should the data be and then ... */ + datasize = 4; + memset (&hdr, 0, sizeof (info)); + BRASERO_SET_16 (cdb->alloc_len, datasize); + res = brasero_scsi_command_issue_sync (cdb, &hdr, datasize, error); + if (res) + return res; -BraseroScsiResult -brasero_mmc1_read_track_info_for_block (int fd, - int block, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error) -{ - BraseroRdTrackInfoCDB *cdb; - BraseroScsiResult res; + /* ... check the size in case of a buggy firmware ... */ + if (BRASERO_GET_16 (hdr.len) + sizeof (hdr.len) >= datasize) { + datasize = BRASERO_GET_16 (hdr.len) + sizeof (hdr.len); - cdb = brasero_scsi_command_new (&info, fd); + if (datasize > *size) { + BRASERO_BURN_LOG ("Oversized data received (%i) setting to %i", datasize, *size); + datasize = *size; + } + else if (*size < datasize) { + BRASERO_BURN_LOG ("Oversized data required (%i) setting to %i", *size, datasize); + *size = datasize; + } + } + else { + BRASERO_BURN_LOG ("Undersized data received (%i) setting to %i", datasize, *size); + datasize = *size; + } - cdb->addr_num_type = BRASERO_FIELD_LBA; - BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, block); - BRASERO_SET_16 (cdb->alloc_len, size); + /* ... and re-issue the command */ + memset (info, 0, sizeof (BraseroScsiTrackInfo)); + BRASERO_SET_16 (cdb->alloc_len, datasize); + res = brasero_scsi_command_issue_sync (cdb, info, datasize, error); - memset (track_info, 0, sizeof (BraseroScsiTrackInfo)); - res = brasero_scsi_command_issue_sync (cdb, track_info, size, error); - brasero_scsi_command_free (cdb); - return res; -} + if (!res) { + if (datasize != BRASERO_GET_16 (info->len) + sizeof (info->len)) + BRASERO_BURN_LOG ("Sizes mismatch asked %i / received %i", + datasize, + BRASERO_GET_16 (info->len) + sizeof (info->len)); -BraseroScsiResult -brasero_mmc1_read_session_first_track_info (int fd, - int session, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error) -{ - BraseroRdTrackInfoCDB *cdb; - BraseroScsiResult res; + *size = MIN (datasize, BRASERO_GET_16 (info->len) + sizeof (info->len)); + } - cdb = brasero_scsi_command_new (&info, fd); - - BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, session); - cdb->addr_num_type = BRASERO_FIELD_SESSION_NUM; - BRASERO_SET_16 (cdb->alloc_len, size); - - memset (track_info, 0, sizeof (BraseroScsiTrackInfo)); - res = brasero_scsi_command_issue_sync (cdb, track_info, size, error); - brasero_scsi_command_free (cdb); return res; } +/** + * + * NOTE: if media is a CD and track_num = 0 then returns leadin + * but since the other media don't have a leadin they error out. + * if track_num = 255 returns last incomplete track. + */ + BraseroScsiResult -brasero_mmc1_read_first_open_session_track_info (int fd, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error) +brasero_mmc1_read_track_info (int fd, + int track_num, + BraseroScsiTrackInfo *track_info, + int *size, + BraseroScsiErrCode *error) { BraseroRdTrackInfoCDB *cdb; BraseroScsiResult res; cdb = brasero_scsi_command_new (&info, fd); cdb->addr_num_type = BRASERO_FIELD_TRACK_NUM; - BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, BRASERO_SCSI_INCOMPLETE_TRACK); - BRASERO_SET_16 (cdb->alloc_len, size); + BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, track_num); - memset (track_info, 0, sizeof (BraseroScsiTrackInfo)); - res = brasero_scsi_command_issue_sync (cdb, track_info, size, error); + res = brasero_read_track_info (cdb, track_info, size, error); brasero_scsi_command_free (cdb); - return res; -} -BraseroScsiResult -brasero_mmc5_read_first_open_session_track_info (int fd, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error) -{ - BraseroRdTrackInfoCDB *cdb; - BraseroScsiResult res; - - cdb = brasero_scsi_command_new (&info, fd); - cdb->open = 1; - cdb->addr_num_type = BRASERO_FIELD_TRACK_NUM; - BRASERO_SET_32 (cdb->blk_addr_trk_ses_num, 1); - BRASERO_SET_16 (cdb->alloc_len, size); - - memset (track_info, 0, sizeof (BraseroScsiTrackInfo)); - res = brasero_scsi_command_issue_sync (cdb, track_info, size, error); - brasero_scsi_command_free (cdb); return res; } Index: src/scsi/scsi-read-track-information.h =================================================================== --- a/src/scsi/scsi-read-track-information.h (revision 311) +++ b/src/scsi/scsi-read-track-information.h (working copy) @@ -29,10 +29,7 @@ #ifndef _SCSI_READ_TRACK_INFORMATION_H #define _SCSI_READ_TRACK_INFORMATION_H -#ifdef __cplusplus -extern "C" -{ -#endif +G_BEGIN_DECLS typedef enum { BRASERO_SCSI_DATA_MODE_1 = 0x01, @@ -135,9 +132,7 @@ #define BRASERO_SCSI_TRACK_NUM_PTR(track) (((track)->track_num_high << 8) + (track)->track_num_low) #define BRASERO_SCSI_SESSION_NUM_PTR(track) (((track)->session_num_high << 8) + (track)->session_num_low) -#ifdef __cplusplus -} -#endif +G_END_DECLS #endif /* _SCSI_READ_TRACK_INFORMATION_H */ Index: src/scsi/scsi-utils.h =================================================================== --- a/src/scsi/scsi-utils.h (revision 311) +++ b/src/scsi/scsi-utils.h (working copy) @@ -55,7 +55,7 @@ strerror (errno)); \ } else { \ BRASERO_BURN_LOG ("SCSI command error: %s", \ - brasero_scsi_strerror (errno)); \ + brasero_scsi_strerror (code)); \ } \ if (err) \ *(err) = code; \ Index: src/scsi/scsi-read-disc-info.c =================================================================== --- a/src/scsi/scsi-read-disc-info.c (revision 311) +++ b/src/scsi/scsi-read-disc-info.c (working copy) @@ -30,6 +30,8 @@ #include <glib.h> +#include "burn-debug.h" + #include "scsi-error.h" #include "scsi-utils.h" #include "scsi-base.h" @@ -93,6 +95,7 @@ BraseroRdDiscInfoCDB *cdb; BraseroScsiResult res; int request_size; + int buffer_size; if (!info_return || !size) { BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_BAD_ARGUMENT); @@ -122,16 +125,16 @@ goto end; } - if (request_size != BRASERO_GET_16 (buffer->len) + sizeof (buffer->len)) { - BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_SIZE_MISMATCH); + buffer_size = BRASERO_GET_16 (buffer->len) + + sizeof (buffer->len); - res = BRASERO_SCSI_FAILURE; - g_free (buffer); - goto end; - } + if (request_size != buffer_size) + BRASERO_BURN_LOG ("Sizes mismatch asked %i / received %i", + request_size, + buffer_size); *info_return = buffer; - *size = request_size; + *size = MIN (request_size, buffer_size); end: Index: src/scsi/scsi-get-configuration.c =================================================================== --- a/src/scsi/scsi-get-configuration.c (revision 311) +++ b/src/scsi/scsi-get-configuration.c (working copy) @@ -26,6 +26,8 @@ #include <glib.h> +#include "burn-debug.h" + #include "scsi-error.h" #include "scsi-utils.h" #include "scsi-base.h" @@ -99,18 +101,29 @@ return BRASERO_SCSI_FAILURE; } + /* first issue the command once ... */ memset (&hdr, 0, sizeof (hdr)); - BRASERO_SET_16 (cdb->alloc_len, sizeof (hdr)); res = brasero_scsi_command_issue_sync (cdb, &hdr, sizeof (hdr), error); if (res) return res; - /* ... allocate a buffer and re-issue the command */ + /* ... check the size returned ... */ request_size = BRASERO_GET_32 (hdr.len) + G_STRUCT_OFFSET (BraseroScsiGetConfigHdr, len) + sizeof (hdr.len); + /* NOTE: if size is not valid use the maximum possible size */ + if ((request_size - sizeof (hdr)) % 8) { + BRASERO_BURN_LOG ("Unaligned data (%i) setting to max (65530)", request_size); + request_size = 65530; + } + else if (request_size <= sizeof (hdr)) { + BRASERO_BURN_LOG ("Undersized data (%i) setting to max (65530)", request_size); + request_size = 65530; + } + + /* ... allocate a buffer and re-issue the command */ buffer = (BraseroScsiGetConfigHdr *) g_new0 (uchar, request_size); BRASERO_SET_16 (cdb->alloc_len, request_size); @@ -125,16 +138,13 @@ G_STRUCT_OFFSET (BraseroScsiGetConfigHdr, len) + sizeof (hdr.len); - if (buffer_size != request_size) { - g_free (buffer); + if (buffer_size != request_size) + BRASERO_BURN_LOG ("Sizes mismatch asked %i / received %i", + request_size, + buffer_size); - BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_SIZE_MISMATCH); - return BRASERO_SCSI_FAILURE; - } - *data = buffer; - *size = request_size; - + *size = MIN (buffer_size, request_size); return BRASERO_SCSI_OK; } @@ -148,34 +158,24 @@ BraseroGetConfigCDB *cdb; BraseroScsiResult res; + g_return_val_if_fail (data != NULL, BRASERO_SCSI_FAILURE); + g_return_val_if_fail (size != NULL, BRASERO_SCSI_FAILURE); + cdb = brasero_scsi_command_new (&info, fd); BRASERO_SET_16 (cdb->feature_num, type); cdb->returned_data = BRASERO_GET_CONFIG_RETURN_ONLY_FEATURE; res = brasero_get_configuration (cdb, data, size, error); brasero_scsi_command_free (cdb); - return res; -} -BraseroScsiResult -brasero_mmc2_get_configuration_all_features (int fd, - int only_current, - BraseroScsiGetConfigHdr **data, - int *size, - BraseroScsiErrCode *error) -{ - BraseroGetConfigCDB *cdb; - BraseroScsiResult res; + /* make sure the desc is the one we want */ + if ((*data) && BRASERO_GET_16 ((*data)->desc->code) != type) { + BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_TYPE_MISMATCH); - cdb = brasero_scsi_command_new (&info, fd); - BRASERO_SET_16 (cdb->feature_num, BRASERO_SCSI_FEAT_PROFILES); + g_free (*data); + *size = 0; + return BRASERO_SCSI_FAILURE; + } - if (only_current) - cdb->returned_data = BRASERO_GET_CONFIG_RETURN_ALL_CURRENT; - else - cdb->returned_data = BRASERO_GET_CONFIG_RETURN_ALL_FEATURES; - - res = brasero_get_configuration (cdb, data, size, error); - brasero_scsi_command_free (cdb); return res; } Index: src/scsi/scsi-get-configuration.h =================================================================== --- a/src/scsi/scsi-get-configuration.h (revision 311) +++ b/src/scsi/scsi-get-configuration.h (working copy) @@ -177,7 +177,6 @@ uchar inq2 :1; uchar reserved0 :6; - uchar mmc4 [0]; uchar reserved1 [3]; }; Index: src/scsi/scsi-mmc1.h =================================================================== --- a/src/scsi/scsi-mmc1.h (revision 311) +++ b/src/scsi/scsi-mmc1.h (working copy) @@ -52,16 +52,10 @@ BraseroScsiErrCode *error); BraseroScsiResult -brasero_mmc1_read_first_open_session_track_info (int fd, - BraseroScsiTrackInfo *track_info, - int size, - BraseroScsiErrCode *error); - -BraseroScsiResult brasero_mmc1_read_track_info (int fd, int track_num, BraseroScsiTrackInfo *track_info, - int size, + int *size, BraseroScsiErrCode *error); G_END_DECLS Index: src/scsi/scsi-get-performance.c =================================================================== --- a/src/scsi/scsi-get-performance.c (revision 311) +++ b/src/scsi/scsi-get-performance.c (working copy) @@ -25,6 +25,8 @@ #include <fcntl.h> #include <glib.h> +#include "burn-debug.h" + #include "scsi-error.h" #include "scsi-utils.h" #include "scsi-command.h" @@ -112,22 +114,37 @@ return BRASERO_SCSI_FAILURE; } + /* Issue the command once to get the size ... */ memset (&hdr, 0, sizeof (hdr)); BRASERO_SET_16 (cdb->max_desc, 0); res = brasero_scsi_command_issue_sync (cdb, &hdr, sizeof (hdr), error); if (res) return res; - /* ... allocate a buffer and re-issue the command */ + /* ... check the request size ... */ request_size = BRASERO_GET_32 (hdr.len) + G_STRUCT_OFFSET (BraseroScsiGetPerfHdr, len) + sizeof (hdr.len); - desc_num = (request_size - sizeof (BraseroScsiGetPerfHdr)) / sizeof_descriptors; - BRASERO_SET_16 (cdb->max_desc, desc_num); + if (request_size > 2048) { + BRASERO_BURN_LOG ("Oversized data (%i) setting to max (2048)", request_size); + request_size = 2048; + } + else if ((request_size - sizeof (hdr)) % sizeof_descriptors) { + BRASERO_BURN_LOG ("Unaligned data (%i) setting to max (2048)", request_size); + request_size = 2048; + } + else if (request_size < sizeof (hdr)) { + BRASERO_BURN_LOG ("Undersized data (%i) setting to max (2048)", request_size); + request_size = 2048; + } + desc_num = (request_size - sizeof (hdr)) / sizeof_descriptors; + + /* ... allocate a buffer and re-issue the command */ buffer = (BraseroScsiGetPerfData *) g_new0 (uchar, request_size); + BRASERO_SET_16 (cdb->max_desc, desc_num); res = brasero_scsi_command_issue_sync (cdb, buffer, request_size, error); if (res) { g_free (buffer); @@ -139,48 +156,18 @@ G_STRUCT_OFFSET (BraseroScsiGetPerfHdr, len) + sizeof (buffer->hdr.len); - if (buffer_size != request_size) { - g_free (buffer); + if (request_size != buffer_size) + BRASERO_BURN_LOG ("Sizes mismatch asked %i / received %i", + request_size, + buffer_size); - BRASERO_SCSI_SET_ERRCODE (error, BRASERO_SCSI_SIZE_MISMATCH); - return BRASERO_SCSI_FAILURE; - } - *data = buffer; - *data_size = request_size; + *data_size = MIN (buffer_size, request_size); return res; } /** - * MMC2 command extension - */ - -BraseroScsiResult -brasero_mmc2_get_performance_perf (int fd, - BraseroScsiPerfParam param, - BraseroScsiGetPerfData **data, - int *size, - BraseroScsiErrCode *error) -{ - BraseroGetPerformanceCDB *cdb; - BraseroScsiResult res; - - cdb = brasero_scsi_command_new (&info, fd); - cdb->type = BRASERO_GET_PERFORMANCE_PERF_TYPE; - - if (param & BRASERO_SCSI_PERF_LIST) - cdb->except= 0x01; - - if (param & BRASERO_SCSI_PERF_WRITE) - cdb->write = 0x01; - - res = brasero_get_performance (cdb, sizeof (BraseroScsiPerfDesc), data, size, error); - brasero_scsi_command_free (cdb); - return res; -} - -/** * MMC3 command extension */ Index: src/scsi/scsi-get-performance.h =================================================================== --- a/src/scsi/scsi-get-performance.h (revision 311) +++ b/src/scsi/scsi-get-performance.h (working copy) @@ -29,10 +29,7 @@ #ifndef _BURN_GET_PERFORMANCE_H #define _BURN_GET_PERFORMANCE_H -#ifdef __cplusplus -extern "C" -{ -#endif +G_BEGIN_DECLS #if G_BYTE_ORDER == G_LITTLE_ENDIAN @@ -88,15 +85,7 @@ #endif -struct _BraseroScsiPerfDesc { - uchar start_lba [4]; - uchar start_perf [4]; - uchar end_lba [4]; - uchar end_perf [4]; -}; - typedef struct _BraseroScsiGetPerfHdr BraseroScsiGetPerfHdr; -typedef struct _BraseroScsiPerfDesc BraseroScsiPerfDesc; typedef struct _BraseroScsiWrtSpdDesc BraseroScsiWrtSpdDesc; struct _BraseroScsiGetPerfData { @@ -105,16 +94,8 @@ }; typedef struct _BraseroScsiGetPerfData BraseroScsiGetPerfData; -typedef enum { - BRASERO_SCSI_PERF_READ = 0, - BRASERO_SCSI_PERF_WRITE = 1, - BRASERO_SCSI_PERF_LIST = 1 << 1, -} BraseroScsiPerfParam; +G_END_DECLS -#ifdef __cplusplus -} -#endif - #endif /* _BURN_GET_PERFORMANCE_H */ Index: brasero.spec =================================================================== RCS file: /cvs/pkgs/rpms/brasero/F-8/brasero.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- brasero.spec 25 Aug 2007 17:09:54 -0000 1.14 +++ brasero.spec 1 Jan 2008 11:18:49 -0000 1.15 @@ -1,14 +1,15 @@ Name: brasero Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gnome CD/DVD burning application Group: Applications/Multimedia License: GPLv2+ URL: http://www.gnome.org/projects/brasero/ Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/0.6/%{name}-%{version}.tar.b… Patch0: brasero-0.6.0-tooltips.patch -Patch2: brasero-0.6.0-open.patch +Patch1: brasero-0.6.0-open.patch +Patch2: brasero-0.6.1-patchset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext intltool @@ -44,7 +45,8 @@ %prep %setup -q %patch0 -p1 -b .tooltips -%patch2 -p1 -b .open +%patch1 -p1 -b .open +%patch2 -p1 -b .patchset %build @@ -121,6 +123,10 @@ %changelog +* Tue Jan 1 2008 Denis Leroy <denis(a)poolshark.org> - 0.6.1-2 +- Added patchset from 0.6 branch +- Includes fix for audio CD size computation (#397951) + * Sat Aug 25 2007 Denis Leroy <denis(a)poolshark.org> - 0.6.1-1 - Update to upstream version 0.6.1 - Filter UI patch is now upstream

1 0

rpms/perl-Class-Factory-Util/F-7 perl-Class-Factory-Util.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Factory-Util/F-7 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227/F-7 Modified Files: perl-Class-Factory-Util.spec Log Message: * Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: perl-Class-Factory-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Factory-Util/F-7/perl-Class-Factory-Util.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Factory-Util.spec 2 Apr 2007 16:37:42 -0000 1.4 +++ perl-Class-Factory-Util.spec 1 Jan 2008 11:16:28 -0000 1.5 @@ -1,16 +1,19 @@ Name: perl-Class-Factory-Util Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provide utility methods for factory classes Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Factory-Util Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Factory-Util-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(Module::Build) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) >= 1.14 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -51,6 +54,11 @@ %changelog +* Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 +- Adjust License-tag. +- BR: perl(Test::More) (BZ 419631). +- BR: perl(Test::Pod), perl(Test::Pod::Coverage). + * Mon Apr 02 2007 Chris Weyl <cweyl(a)alumni.drew.edu> 1.7-1 - update to 1.7 - switch to Build.PL

1 0

rpms/perl-Class-Factory-Util/devel perl-Class-Factory-Util.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Factory-Util/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227/devel Modified Files: perl-Class-Factory-Util.spec Log Message: * Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: perl-Class-Factory-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Factory-Util/devel/perl-Class-Factory-Util.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Factory-Util.spec 2 Apr 2007 16:37:42 -0000 1.4 +++ perl-Class-Factory-Util.spec 1 Jan 2008 11:15:52 -0000 1.5 @@ -1,16 +1,19 @@ Name: perl-Class-Factory-Util Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provide utility methods for factory classes Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Factory-Util Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Factory-Util-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(Module::Build) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) >= 1.14 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -51,6 +54,11 @@ %changelog +* Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 +- Adjust License-tag. +- BR: perl(Test::More) (BZ 419631). +- BR: perl(Test::Pod), perl(Test::Pod::Coverage). + * Mon Apr 02 2007 Chris Weyl <cweyl(a)alumni.drew.edu> 1.7-1 - update to 1.7 - switch to Build.PL

1 0

rpms/perl-Class-Factory-Util/F-8 perl-Class-Factory-Util.spec, 1.4, 1.5
by fedora-extras-commits＠redhat.com 01 Jan '08

01 Jan '08

Author: corsepiu Update of /cvs/pkgs/rpms/perl-Class-Factory-Util/F-8 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227/F-8 Modified Files: perl-Class-Factory-Util.spec Log Message: * Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 - Adjust License-tag. - BR: perl(Test::More) (BZ 419631). - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: perl-Class-Factory-Util.spec =================================================================== RCS file: /cvs/pkgs/rpms/perl-Class-Factory-Util/F-8/perl-Class-Factory-Util.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Class-Factory-Util.spec 2 Apr 2007 16:37:42 -0000 1.4 +++ perl-Class-Factory-Util.spec 1 Jan 2008 11:15:59 -0000 1.5 @@ -1,16 +1,19 @@ Name: perl-Class-Factory-Util Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Provide utility methods for factory classes Group: Development/Libraries -License: Artistic or GPL +License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Factory-Util Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Class-Factory-Util-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl, perl(Module::Build) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod) >= 1.14 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -51,6 +54,11 @@ %changelog +* Tue Jan 01 2008 Ralf Corsépius <rc040203(a)freenet.de> 1.7-2 +- Adjust License-tag. +- BR: perl(Test::More) (BZ 419631). +- BR: perl(Test::Pod), perl(Test::Pod::Coverage). + * Mon Apr 02 2007 Chris Weyl <cweyl(a)alumni.drew.edu> 1.7-1 - update to 1.7 - switch to Build.PL

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