From rjones at redhat.com Thu Oct 1 22:50:07 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Thu, 1 Oct 2009 23:50:07 +0100 Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: <4AC139B4.9030508@cora.nwra.com> References: <4AC139B4.9030508@cora.nwra.com> Message-ID: <20091001225007.GB8172@amd.home.annexia.org> On Mon, Sep 28, 2009 at 04:33:24PM -0600, Orion Poplawski wrote: > I package plplot which ships bindings for oodles of languages, among > them perl and ocaml. The ocaml packaging guidelines suggest: > > %global _use_internal_dependency_generator 0 > %global __find_requires /usr/lib/rpm/ocaml-find-requires.sh > %global __find_provides /usr/lib/rpm/ocaml-find-provides.sh > > to add the required ocaml Requires/Provides. However, this breaks the > automatic perl (and other?) generation for the perl sub-package. > > How should this be handled? Is there a way to add the > ocaml-find-requires/provides to the normal list of providers? Shouldn't > this be done automatically by the build system? Yes - really those should be pushed into upstream RPM. However that isn't done at the moment. The reason for having the alternate dependency generator is to make dependencies of the form: ocaml(Module) = MD5 where MD5 is the md5sum of the dependent Module's interface (use 'ocamlobjinfo plplot.cma' to discover this). This avoids the dreaded 'interface mismatch' error, and ensures that only a consistent set of packages can be installed together, which is good news if you are developing OCaml software that uses plplot. If you are willing to have the occasional inconsistent package set, you can just as easily forgo the above and simply add explicit dependencies on any packages you need, plus the ABI, eg: Requires: ocaml-foo Requires: ocaml(runtime) = 3.11.1 This is still how Debian package things, although they are moving slowly to a system which is similar (but different in the details) from the one we use in Fedora. In Debian you still get 'interface mismatch' errors. Really we need to get the OCaml dep generator into upstream RPM ... Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw From bugzilla at redhat.com Sat Oct 3 19:01:11 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sat, 3 Oct 2009 15:01:11 -0400 Subject: [Bug 523547] virt-df doesn't pull correct dependencies In-Reply-To: References: Message-ID: <200910031901.n93J1BuL028434@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=523547 --- Comment #10 from Fedora Update System 2009-10-03 15:01:09 EDT --- libguestfs-1.0.70-2.fc11 has been pushed to the Fedora 11 stable repository. If problems still persist, please make note of it in this bug report. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sat Oct 3 22:15:48 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sat, 3 Oct 2009 18:15:48 -0400 Subject: [Bug 481522] Updated Brazilian Portuguese translation of virt-top In-Reply-To: References: Message-ID: <200910032215.n93MFm9M010456@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=481522 Piotr Dr?g changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED CC| |piotrdrag at gmail.com Resolution| |DUPLICATE --- Comment #3 from Piotr Dr?g 2009-10-03 18:15:46 EDT --- I've included this translation in tarball in bug #493799. *** This bug has been marked as a duplicate of 493799 *** -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sat Oct 3 22:15:50 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sat, 3 Oct 2009 18:15:50 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910032215.n93MFoEa010545@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 Piotr Dr?g changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jyulliano at gmail.com Bug 493799 depends on bug 481522, which changed state. Bug 481522 Summary: Updated Brazilian Portuguese translation of virt-top https://bugzilla.redhat.com/show_bug.cgi?id=481522 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |DUPLICATE --- Comment #22 from Piotr Dr?g 2009-10-03 18:15:46 EDT --- *** Bug 481522 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sat Oct 3 22:14:46 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sat, 3 Oct 2009 18:14:46 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910032214.n93MEkvi024556@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 Piotr Dr?g changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #362632|0 |1 is obsolete| | --- Comment #21 from Piotr Dr?g 2009-10-03 18:14:39 EDT --- Created an attachment (id=363578) --> (https://bugzilla.redhat.com/attachment.cgi?id=363578) New tarball with updated Polish translation and added Brazilian Portuguese translation -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Sun Oct 4 18:18:37 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Sun, 4 Oct 2009 14:18:37 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910041818.n94IIbPM018173@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 Piotr Dr?g changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #363578|0 |1 is obsolete| | --- Comment #23 from Piotr Dr?g 2009-10-04 14:18:35 EDT --- Created an attachment (id=363606) --> (https://bugzilla.redhat.com/attachment.cgi?id=363606) New tarball with another update of Polish translation -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From pmatilai at laiskiainen.org Sun Oct 4 08:03:33 2009 From: pmatilai at laiskiainen.org (Panu Matilainen) Date: Sun, 4 Oct 2009 11:03:33 +0300 (EEST) Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: <20091001225007.GB8172@amd.home.annexia.org> References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> Message-ID: On Thu, 1 Oct 2009, Richard W.M. Jones wrote: > On Mon, Sep 28, 2009 at 04:33:24PM -0600, Orion Poplawski wrote: >> I package plplot which ships bindings for oodles of languages, among >> them perl and ocaml. The ocaml packaging guidelines suggest: >> >> %global _use_internal_dependency_generator 0 >> %global __find_requires /usr/lib/rpm/ocaml-find-requires.sh >> %global __find_provides /usr/lib/rpm/ocaml-find-provides.sh >> >> to add the required ocaml Requires/Provides. However, this breaks the >> automatic perl (and other?) generation for the perl sub-package. >> >> How should this be handled? Is there a way to add the >> ocaml-find-requires/provides to the normal list of providers? Shouldn't >> this be done automatically by the build system? > > Yes - really those should be pushed into upstream RPM. However that > isn't done at the moment. > > The reason for having the alternate dependency generator is to > make dependencies of the form: > > ocaml(Module) = MD5 > > where MD5 is the md5sum of the dependent Module's interface (use > 'ocamlobjinfo plplot.cma' to discover this). This avoids the dreaded > 'interface mismatch' error, and ensures that only a consistent set of > packages can be installed together, which is good news if you are > developing OCaml software that uses plplot. > > If you are willing to have the occasional inconsistent package set, > you can just as easily forgo the above and simply add explicit > dependencies on any packages you need, plus the ABI, eg: > > Requires: ocaml-foo > Requires: ocaml(runtime) = 3.11.1 > > This is still how Debian package things, although they are moving > slowly to a system which is similar (but different in the details) > from the one we use in Fedora. In Debian you still get 'interface > mismatch' errors. > > Really we need to get the OCaml dep generator into upstream RPM ... I seem to recall commenting on this earlier (like at least a year ago :) but just as well I might've just intended to comment... anyway. I would've pulled it to RPM upstream ages ago if it didn't have Fedora packaging specifics bolted in: if [ -n "$emit_compiler_version" ]; then # Every OCaml program depends on the version of the # runtime which was used to compile it. echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" fi I suppose there's a reason why this is not generated with "ocaml -version" or "ocamlrun -version" as needed? - Panu - From rjones at fedoraproject.org Sun Oct 4 20:39:27 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 20:39:27 +0000 (UTC) Subject: rpms/ocaml-findlib/devel .cvsignore, 1.6, 1.7 ocaml-findlib.spec, 1.23, 1.24 sources, 1.6, 1.7 ocaml-findlib-1.2.3-camlp4-META.patch, 1.1, NONE Message-ID: <20091004203927.7A80211C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-findlib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22795 Modified Files: .cvsignore ocaml-findlib.spec sources Removed Files: ocaml-findlib-1.2.3-camlp4-META.patch Log Message: New upstream version 1.2.5. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 22 May 2009 21:31:10 -0000 1.6 +++ .cvsignore 4 Oct 2009 20:39:27 -0000 1.7 @@ -1 +1 @@ -findlib-1.2.4.tar.gz +findlib-1.2.5.tar.gz Index: ocaml-findlib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- ocaml-findlib.spec 25 Jul 2009 19:56:58 -0000 1.23 +++ ocaml-findlib.spec 4 Oct 2009 20:39:27 -0000 1.24 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-findlib -Version: 1.2.4 -Release: 4%{?dist} +Version: 1.2.5 +Release: 1%{?dist} Summary: Objective CAML package manager and build helper Group: Development/Libraries @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 1.2.5-1 +- New upstream version 1.2.5. + * Sat Jul 25 2009 Fedora Release Engineering - 1.2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 22 May 2009 21:31:10 -0000 1.6 +++ sources 4 Oct 2009 20:39:27 -0000 1.7 @@ -1 +1 @@ -52cfcacff3e07a94bc3adb977fbb3c07 findlib-1.2.4.tar.gz +db12a92903c2869bb89e1a6446db269e findlib-1.2.5.tar.gz --- ocaml-findlib-1.2.3-camlp4-META.patch DELETED --- From rjones at fedoraproject.org Sun Oct 4 20:47:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 20:47:49 +0000 (UTC) Subject: rpms/ocaml-lacaml/devel .cvsignore, 1.8, 1.9 ocaml-lacaml.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <20091004204749.5AA0411C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lacaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24378 Modified Files: .cvsignore ocaml-lacaml.spec sources Log Message: New upstream release 5.4.7. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- .cvsignore 23 May 2009 08:29:34 -0000 1.8 +++ .cvsignore 4 Oct 2009 20:47:49 -0000 1.9 @@ -1 +1 @@ -release-5.1.0.tar.bz2 +release-5.4.7.tar.bz2 Index: ocaml-lacaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/ocaml-lacaml.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- ocaml-lacaml.spec 25 Jul 2009 19:58:50 -0000 1.12 +++ ocaml-lacaml.spec 4 Oct 2009 20:47:49 -0000 1.13 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-lacaml -Version: 5.1.0 -Release: 2%{?dist} +Version: 5.4.7 +Release: 1%{?dist} Summary: BLAS/LAPACK-interface for OCaml Group: Development/Libraries @@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 5.4.7-1 +- New upstream release 5.4.7. + * Sat Jul 25 2009 Fedora Release Engineering - 5.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lacaml/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- sources 23 May 2009 08:29:34 -0000 1.8 +++ sources 4 Oct 2009 20:47:49 -0000 1.9 @@ -1 +1 @@ -3a7da60fd0559a05ed0d1e9f7bee3537 release-5.1.0.tar.bz2 +435b43102a7ff4bdbafc1b3a014fdf71 release-5.4.7.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 20:56:22 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 20:56:22 +0000 (UTC) Subject: rpms/ocaml-sexplib/devel .cvsignore, 1.6, 1.7 ocaml-sexplib.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <20091004205622.F1D0511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sexplib/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28403 Modified Files: .cvsignore ocaml-sexplib.spec sources Log Message: New upstream version 4.2.15. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 23 May 2009 11:07:54 -0000 1.6 +++ .cvsignore 4 Oct 2009 20:56:22 -0000 1.7 @@ -1 +1 @@ -release-4.2.10.tar.bz2 +release-4.2.15.tar.bz2 Index: ocaml-sexplib.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/ocaml-sexplib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ocaml-sexplib.spec 25 Jul 2009 20:04:53 -0000 1.11 +++ ocaml-sexplib.spec 4 Oct 2009 20:56:22 -0000 1.12 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-sexplib -Version: 4.2.10 -Release: 3%{?dist} +Version: 4.2.15 +Release: 1%{?dist} Summary: OCaml library for converting OCaml values to S-expressions Group: Development/Libraries @@ -100,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 4.2.15-1 +- New upstream version 4.2.15. + * Sat Jul 25 2009 Fedora Release Engineering - 4.2.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sexplib/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 May 2009 11:07:54 -0000 1.6 +++ sources 4 Oct 2009 20:56:22 -0000 1.7 @@ -1 +1 @@ -b7d9564386a6a0eebe14d76322245291 release-4.2.10.tar.bz2 +65e12e71b9adc9c255fd61a0b5148e5f release-4.2.15.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 20:56:31 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 20:56:31 +0000 (UTC) Subject: rpms/ocaml-type-conv/devel .cvsignore, 1.7, 1.8 ocaml-type-conv.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <20091004205631.4274B11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-type-conv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28447 Modified Files: .cvsignore ocaml-type-conv.spec sources Log Message: New upstream version 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 10 Mar 2009 14:18:14 -0000 1.7 +++ .cvsignore 4 Oct 2009 20:56:31 -0000 1.8 @@ -1 +1 @@ -release-1.6.7.tar.bz2 +release-1.6.10.tar.bz2 Index: ocaml-type-conv.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ocaml-type-conv.spec 25 Jul 2009 20:05:38 -0000 1.14 +++ ocaml-type-conv.spec 4 Oct 2009 20:56:31 -0000 1.15 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-type-conv -Version: 1.6.7 -Release: 3%{?dist} +Version: 1.6.10 +Release: 1%{?dist} Summary: OCaml base library for type conversion Group: Development/Libraries @@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 1.6.10-1 +- New upstream version 1.6.10. + * Sat Jul 25 2009 Fedora Release Engineering - 1.6.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 10 Mar 2009 14:18:14 -0000 1.7 +++ sources 4 Oct 2009 20:56:31 -0000 1.8 @@ -1 +1 @@ -2e62bb45147041d73f17a8b214afec1c release-1.6.7.tar.bz2 +70bc643ceaaed9bd5528dd702a0a6e8f release-1.6.10.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 21:01:55 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:01:55 +0000 (UTC) Subject: rpms/ocaml-type-conv/devel ocaml-type-conv.spec,1.15,1.16 Message-ID: <20091004210155.31CF511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-type-conv/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30142 Modified Files: ocaml-type-conv.spec Log Message: Changelog file changed name. Index: ocaml-type-conv.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-type-conv/devel/ocaml-type-conv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ocaml-type-conv.spec 4 Oct 2009 20:56:31 -0000 1.15 +++ ocaml-type-conv.spec 4 Oct 2009 21:01:54 -0000 1.16 @@ -3,7 +3,7 @@ Name: ocaml-type-conv Version: 1.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml base library for type conversion Group: Development/Libraries @@ -54,13 +54,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE LICENSE.Tywith CHANGES COPYRIGHT README.txt +%doc LICENSE LICENSE.Tywith Changelog COPYRIGHT README.txt %{_libdir}/ocaml/type-conv %changelog -* Sun Oct 4 2009 Richard W.M. Jones - 1.6.10-1 +* Sun Oct 4 2009 Richard W.M. Jones - 1.6.10-2 - New upstream version 1.6.10. +- "CHANGES" -> "Changelog" * Sat Jul 25 2009 Fedora Release Engineering - 1.6.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Sun Oct 4 21:03:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:03:49 +0000 (UTC) Subject: rpms/ocaml-postgresql/devel .cvsignore, 1.6, 1.7 ocaml-postgresql.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20091004210349.A19F411C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30861 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: New upstream version 1.12.1 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 23 May 2009 08:12:43 -0000 1.6 +++ .cvsignore 4 Oct 2009 21:03:48 -0000 1.7 @@ -1 +1 @@ -release-1.11.1.tar.bz2 +release-1.12.1.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ocaml-postgresql.spec 25 Jul 2009 20:03:37 -0000 1.16 +++ ocaml-postgresql.spec 4 Oct 2009 21:03:49 -0000 1.17 @@ -2,7 +2,7 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.11.1 +Version: 1.12.1 Release: 2%{?dist} Summary: OCaml library for accessing PostgreSQL databases @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 1.12.1-1 +- New upstream version 1.12.1. + * Sat Jul 25 2009 Fedora Release Engineering - 1.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 May 2009 08:12:43 -0000 1.6 +++ sources 4 Oct 2009 21:03:49 -0000 1.7 @@ -1 +1 @@ -d293714bd15824db031a47d1c42c1f36 release-1.11.1.tar.bz2 +e912df9259d74c123660072e12335871 release-1.12.1.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 21:08:40 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:08:40 +0000 (UTC) Subject: rpms/ocaml-sqlite/devel ocaml-sqlite.spec,1.14,1.15 Message-ID: <20091004210840.3D16411C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32171 Modified Files: ocaml-sqlite.spec Log Message: New upstream 1.5.6. Index: ocaml-sqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ocaml-sqlite.spec 25 Jul 2009 20:05:07 -0000 1.14 +++ ocaml-sqlite.spec 4 Oct 2009 21:08:38 -0000 1.15 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-sqlite -Version: 1.5.0 -Release: 2%{?dist} +Version: 1.5.6 +Release: 1%{?dist} Summary: OCaml library for accessing SQLite3 databases Group: Development/Libraries @@ -55,9 +55,7 @@ make all %check pushd test -# test_stmt test was broken in 1.5.0: -#tests="test_agg test_db test_exec test_stmt test_fun" -tests="test_agg test_db test_exec test_fun" +tests="test_agg test_db test_exec test_stmt test_fun" for f in $tests; do ocamlopt -I .. str.cmxa sqlite3.cmxa $f.ml -o $f ./$f @@ -106,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 1.5.6-1 +- New upstream version 1.5.6. +- Upstream tests should be fixed now, so reenable all of them. + * Sat Jul 25 2009 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Sun Oct 4 21:13:15 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:13:15 +0000 (UTC) Subject: rpms/ocaml-pcre/devel .cvsignore, 1.7, 1.8 ocaml-pcre.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <20091004211315.57CA611C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pcre/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1429 Modified Files: .cvsignore ocaml-pcre.spec sources Log Message: New upstream version 6.0.1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 23 May 2009 08:11:09 -0000 1.7 +++ .cvsignore 4 Oct 2009 21:13:14 -0000 1.8 @@ -1 +1 @@ -release-6.0.0.tar.bz2 +release-6.0.1.tar.bz2 Index: ocaml-pcre.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/ocaml-pcre.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ocaml-pcre.spec 25 Jul 2009 20:02:52 -0000 1.16 +++ ocaml-pcre.spec 4 Oct 2009 21:13:14 -0000 1.17 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-pcre -Version: 6.0.0 -Release: 2%{?dist} +Version: 6.0.1 +Release: 1%{?dist} Summary: Perl compatibility regular expressions (PCRE) for OCaml Group: Development/Libraries @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 6.0.1-1 +- New upstream version 6.0.1. + * Sat Jul 25 2009 Fedora Release Engineering - 6.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pcre/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 23 May 2009 08:11:09 -0000 1.7 +++ sources 4 Oct 2009 21:13:14 -0000 1.8 @@ -1 +1 @@ -91081a9147451495f8d2b246ef196983 release-6.0.0.tar.bz2 +9a52fe104be01af086a9ef68a9817e58 release-6.0.1.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 21:17:22 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:17:22 +0000 (UTC) Subject: rpms/ocaml-res/devel .cvsignore, 1.5, 1.6 ocaml-res.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <20091004211722.4DF2811C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-res/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3466 Modified Files: .cvsignore ocaml-res.spec sources Log Message: New upstream release 3.2.0. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 10 Mar 2009 14:12:17 -0000 1.5 +++ .cvsignore 4 Oct 2009 21:17:20 -0000 1.6 @@ -1 +1 @@ -release-3.1.1.tar.bz2 +release-3.2.0.tar.bz2 Index: ocaml-res.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ocaml-res.spec 25 Jul 2009 20:04:38 -0000 1.10 +++ ocaml-res.spec 4 Oct 2009 21:17:21 -0000 1.11 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-res -Version: 3.1.1 -Release: 4%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: OCaml library for resizing arrays and strings Group: Development/Libraries @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 3.2.0-1 +- New upstream release 3.2.0. + * Sat Jul 25 2009 Fedora Release Engineering - 3.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 10 Mar 2009 14:12:17 -0000 1.5 +++ sources 4 Oct 2009 21:17:21 -0000 1.6 @@ -1 +1 @@ -2be2152f0d16e4bb88cdb67a1d46dd21 release-3.1.1.tar.bz2 +21545649743375ef57693fb6f025c48e release-3.2.0.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 21:17:50 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:17:50 +0000 (UTC) Subject: rpms/ocaml-sqlite/devel .cvsignore, 1.5, 1.6 ocaml-sqlite.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <20091004211750.6231D11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-sqlite/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3681 Modified Files: .cvsignore ocaml-sqlite.spec sources Log Message: Remember to upload new sources. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 23 May 2009 07:56:37 -0000 1.5 +++ .cvsignore 4 Oct 2009 21:17:48 -0000 1.6 @@ -1 +1 @@ -release-1.5.0.tar.bz2 +release-1.5.6.tar.bz2 Index: ocaml-sqlite.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/ocaml-sqlite.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ocaml-sqlite.spec 4 Oct 2009 21:08:38 -0000 1.15 +++ ocaml-sqlite.spec 4 Oct 2009 21:17:49 -0000 1.16 @@ -3,7 +3,7 @@ Name: ocaml-sqlite Version: 1.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for accessing SQLite3 databases Group: Development/Libraries @@ -104,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Oct 4 2009 Richard W.M. Jones - 1.5.6-1 +* Sun Oct 4 2009 Richard W.M. Jones - 1.5.6-2 - New upstream version 1.5.6. - Upstream tests should be fixed now, so reenable all of them. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-sqlite/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 23 May 2009 07:56:37 -0000 1.5 +++ sources 4 Oct 2009 21:17:49 -0000 1.6 @@ -1 +1 @@ -1cdeda5aa3f42125492a17e453878e8e release-1.5.0.tar.bz2 +c93f7216f4c9f76865c29b9b4612d05c release-1.5.6.tar.bz2 From rjones at fedoraproject.org Sun Oct 4 21:24:27 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 21:24:27 +0000 (UTC) Subject: rpms/ocaml-res/devel ocaml-res.spec,1.11,1.12 Message-ID: <20091004212427.6D57C11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-res/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6466 Modified Files: ocaml-res.spec Log Message: Force retag. Index: ocaml-res.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ocaml-res.spec 4 Oct 2009 21:17:21 -0000 1.11 +++ ocaml-res.spec 4 Oct 2009 21:24:26 -0000 1.12 @@ -3,7 +3,7 @@ Name: ocaml-res Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for resizing arrays and strings Group: Development/Libraries @@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Oct 4 2009 Richard W.M. Jones - 3.2.0-1 +* Sun Oct 4 2009 Richard W.M. Jones - 3.2.0-2 - New upstream release 3.2.0. * Sat Jul 25 2009 Fedora Release Engineering - 3.1.1-4 From rjones at redhat.com Sun Oct 4 22:38:52 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Sun, 4 Oct 2009 23:38:52 +0100 Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> Message-ID: <20091004223852.GA32000@amd.home.annexia.org> On Sun, Oct 04, 2009 at 11:03:33AM +0300, Panu Matilainen wrote: > I seem to recall commenting on this earlier (like at least a year ago :) > but just as well I might've just intended to comment... anyway. > I would've pulled it to RPM upstream ages ago if it didn't have Fedora > packaging specifics bolted in: > > if [ -n "$emit_compiler_version" ]; then > # Every OCaml program depends on the version of the > # runtime which was used to compile it. > echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" > fi > > I suppose there's a reason why this is not generated with "ocaml > -version" or "ocamlrun -version" as needed? Yes, I can't remember why we did that either :-( I've changed it in the OCaml package in Fedora 13, we should give it a few more months to see if anything breaks. http://cvs.fedoraproject.org/viewvc/devel/ocaml/ocaml-find-requires.sh?r1=1.4&r2=1.5 Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/ From bugzilla at redhat.com Mon Oct 5 07:32:55 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 03:32:55 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910050732.n957WtrA001975@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 --- Comment #24 from Yulia 2009-10-05 03:32:51 EDT --- Created an attachment (id=363643) --> (https://bugzilla.redhat.com/attachment.cgi?id=363643) Russian translation of virt-top Attached is Russian translation of virt-top for F12. Would it be possible to include it into the build or is it too late? Thank you, Yulia -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:40:11 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:40:11 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910051040.n95AeB6H008311@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |UPSTREAM --- Comment #25 from Richard W.M. Jones 2009-10-05 06:40:09 EDT --- Thanks, both these are upstream now as: http://hg.et.redhat.com/cgi-bin/hg-virt.cgi/applications/virt-top--devel/rev/7995034939ff -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:41:31 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:41:31 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910051041.n95AfVpL023533@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Component|virt-top |virt-top Version|11 |1 Product|Fedora |Virtualization Tools QAContact|extras-qa at fedoraproject.org | --- Comment #3 from Richard W.M. Jones 2009-10-05 06:41:30 EDT --- Set the product to Virtualization Tools. I'll have a look at this for real later today. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:53:18 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:53:18 -0400 Subject: [Bug 493796] [virt-ctrl] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910051053.n95ArICx011017@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493796 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |CLOSED Resolution| |UPSTREAM --- Comment #52 from Richard W.M. Jones 2009-10-05 06:53:17 EDT --- Thanks, these have been pushed upstream to: http://hg.et.redhat.com/cgi-bin/hg-virt.cgi/applications/virt-ctrl--devel/rev/225974734670 However, virt-ctrl is mostly dead. Users should use http://virt-manager.org instead, and likely we will remove virt-ctrl from Fedora soon. Please don't do any more translations on the following for now: virt-p2v: Major rewrite in progress. virt-ctrl: Obsolete project, use http://virt-manager.org/ virt-mem: Obsolete, replaced by http://git.et.redhat.com/?p=virt-tools.git;a=summary -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:54:10 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:54:10 -0400 Subject: [Bug 483091] Updated Brazilian Portuguese translation of virt-ctrl In-Reply-To: References: Message-ID: <200910051054.n95AsAg0026683@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=483091 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |DUPLICATE --- Comment #2 from Richard W.M. Jones 2009-10-05 06:54:09 EDT --- *** This bug has been marked as a duplicate of 493796 *** -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:54:11 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:54:11 -0400 Subject: [Bug 493796] [virt-ctrl] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910051054.n95AsBqM026700@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493796 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |igor at projetofedora.org Bug 493796 depends on bug 483091, which changed state. Bug 483091 Summary: Updated Brazilian Portuguese translation of virt-ctrl https://bugzilla.redhat.com/show_bug.cgi?id=483091 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |DUPLICATE --- Comment #53 from Richard W.M. Jones 2009-10-05 06:54:10 EDT --- *** Bug 483091 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 10:56:33 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 06:56:33 -0400 Subject: [Bug 493796] [virt-ctrl] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910051056.n95AuXIg011979@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493796 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |fabian at bernewireless.net Bug 493796 depends on bug 472745, which changed state. Bug 472745 Summary: German translation https://bugzilla.redhat.com/show_bug.cgi?id=472745 What |Old Value |New Value ---------------------------------------------------------------------------- Status|ASSIGNED |CLOSED Resolution| |DUPLICATE --- Comment #54 from Richard W.M. Jones 2009-10-05 06:56:31 EDT --- *** Bug 472745 has been marked as a duplicate of this bug. *** -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 13:26:31 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 09:26:31 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910051326.n95DQV8k031132@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Component|virt-top |ocaml-gettext Version|1 |rawhide Product|Virtualization Tools |Fedora QAContact| |extras-qa at fedoraproject.org --- Comment #4 from Richard W.M. Jones 2009-10-05 09:26:30 EDT --- Confirmed this is a bug in ocaml-gettext, discussing with upstream. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 14:09:38 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 10:09:38 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910051409.n95E9ch6009744@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 --- Comment #5 from Richard W.M. Jones 2009-10-05 10:09:37 EDT --- OK we fixed this now. The *.mo files were corrupt. Try this to demonstrate the problem: msgunfmt /usr/share/locale/ja/LC_MESSAGES/virt-top.mo We've changed the tool upstream which we use to generate the *.mo files, so this shouldn't happen in future. Now however there is a second problem - curses messes up strings containing Japanese characters. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 14:11:14 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 10:11:14 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910051411.n95EBECZ026479@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 --- Comment #6 from Richard W.M. Jones 2009-10-05 10:11:14 EDT --- Commit which fixes the first problem: http://git.et.redhat.com/?p=virt-top.git;a=commitdiff;h=8b098ba7e7f700aa6d63cba47bf56e006cbaace9 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 5 14:39:23 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 5 Oct 2009 10:39:23 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910051439.n95EdNHG001371@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |CLOSED Resolution| |UPSTREAM --- Comment #7 from Richard W.M. Jones 2009-10-05 10:39:22 EDT --- OK we fixed the second problem too by linking against ncursesw instead of ncurses. http://cvs.fedoraproject.org/viewvc/devel/ocaml-curses/ocaml-curses.spec?r1=1.13&r2=1.14 I'm going to declare this bug "closed upstream", because everything now works for me. I will build a new virt-top in Fedora later once I've fixed a few of the other bugs. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at redhat.com Mon Oct 5 17:23:13 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Mon, 5 Oct 2009 18:23:13 +0100 Subject: [ANNOUNCE] virt-top 1.0.4 Message-ID: <20091005172313.GA9574@amd.home.annexia.org> virt-top is the sane replacement for xentop. Virt-top looks and acts like the familiar top(1) command, displays virtual machines, and uses libvirt so it works with just about every virtualization system out there. It also has cool features for sysadmins, like you can use it to log stats into a database or spreadsheet. This version fixes a few long-standing bugs, particularly in the handling of languages other than English. We've also tidied up the source and moved to using git for source control. Home page: http://et.redhat.com/~rjones/virt-top/ Source: http://et.redhat.com/~rjones/virt-top/files/ Repo: http://git.et.redhat.com/?p=virt-top.git;a=summary My blog: http://rwmj.wordpress.com/tag/virt-top/ There's already a build in Fedora 13 which will probably work in earlier versions of Fedora: http://koji.fedoraproject.org/koji/packageinfo?packageID=6211 Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/ From pmatilai at laiskiainen.org Tue Oct 6 09:43:13 2009 From: pmatilai at laiskiainen.org (Panu Matilainen) Date: Tue, 6 Oct 2009 12:43:13 +0300 (EEST) Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: <20091004223852.GA32000@amd.home.annexia.org> References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> <20091004223852.GA32000@amd.home.annexia.org> Message-ID: On Sun, 4 Oct 2009, Richard W.M. Jones wrote: > On Sun, Oct 04, 2009 at 11:03:33AM +0300, Panu Matilainen wrote: >> I seem to recall commenting on this earlier (like at least a year ago :) >> but just as well I might've just intended to comment... anyway. >> I would've pulled it to RPM upstream ages ago if it didn't have Fedora >> packaging specifics bolted in: >> >> if [ -n "$emit_compiler_version" ]; then >> # Every OCaml program depends on the version of the >> # runtime which was used to compile it. >> echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" >> fi >> >> I suppose there's a reason why this is not generated with "ocaml >> -version" or "ocamlrun -version" as needed? > > Yes, I can't remember why we did that either :-( > > I've changed it in the OCaml package in Fedora 13, we should give it a > few more months to see if anything breaks. > > http://cvs.fedoraproject.org/viewvc/devel/ocaml/ocaml-find-requires.sh?r1=1.4&r2=1.5 Okay... added upstream now and integrated with the internal dependency generator too so you dont need to fiddle with that in specfile, plus the external dependency generator misses some fairly important dependency bits. http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=82e7dd702013d3679fda438333de30afdec17a4f http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=15fb8ccb41ce4cc02c78508b936fb74f7165683c - Panu - From rjones at redhat.com Tue Oct 6 15:07:45 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Tue, 6 Oct 2009 16:07:45 +0100 Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> <20091004223852.GA32000@amd.home.annexia.org> Message-ID: <20091006150745.GA19053@amd.home.annexia.org> On Tue, Oct 06, 2009 at 12:43:13PM +0300, Panu Matilainen wrote: > On Sun, 4 Oct 2009, Richard W.M. Jones wrote: > >> On Sun, Oct 04, 2009 at 11:03:33AM +0300, Panu Matilainen wrote: >>> I seem to recall commenting on this earlier (like at least a year ago :) >>> but just as well I might've just intended to comment... anyway. >>> I would've pulled it to RPM upstream ages ago if it didn't have Fedora >>> packaging specifics bolted in: >>> >>> if [ -n "$emit_compiler_version" ]; then >>> # Every OCaml program depends on the version of the >>> # runtime which was used to compile it. >>> echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" >>> fi >>> >>> I suppose there's a reason why this is not generated with "ocaml >>> -version" or "ocamlrun -version" as needed? >> >> Yes, I can't remember why we did that either :-( >> >> I've changed it in the OCaml package in Fedora 13, we should give it a >> few more months to see if anything breaks. >> >> http://cvs.fedoraproject.org/viewvc/devel/ocaml/ocaml-find-requires.sh?r1=1.4&r2=1.5 > > Okay... added upstream now and integrated with the internal dependency > generator too so you dont need to fiddle with that in specfile, plus > the external dependency generator misses some fairly important > dependency bits. > > http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=82e7dd702013d3679fda438333de30afdec17a4f > http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=15fb8ccb41ce4cc02c78508b936fb74f7165683c Just a question about this: If we need to pass extra options to the dependency scripts (as in the example specfile below), can we still do that? http://cvs.fedoraproject.org/viewvc/devel/ocaml-pxp/ocaml-pxp.spec?revision=1.11&view=markup Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html From bugzilla at redhat.com Tue Oct 6 16:09:27 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 6 Oct 2009 12:09:27 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910061609.n96G9RIS001646@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 --- Comment #8 from Fedora Update System 2009-10-06 12:09:27 EDT --- ocaml-curses-1.0.3-6.fc12.1 has been submitted as an update for Fedora 12. http://admin.fedoraproject.org/updates/ocaml-curses-1.0.3-6.fc12.1 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at fedoraproject.org Sun Oct 4 22:31:21 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 22:31:21 +0000 (UTC) Subject: rpms/ocaml-res/devel ocaml-res.spec,1.12,1.13 Message-ID: <20091004223122.0B3AF11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-res/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv528 Modified Files: ocaml-res.spec Log Message: Changes -> Changelog Index: ocaml-res.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-res/devel/ocaml-res.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- ocaml-res.spec 4 Oct 2009 21:24:26 -0000 1.12 +++ ocaml-res.spec 4 Oct 2009 22:31:21 -0000 1.13 @@ -3,7 +3,7 @@ Name: ocaml-res Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OCaml library for resizing arrays and strings Group: Development/Libraries @@ -81,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc LICENSE README.txt Changes TODO +%doc LICENSE README.txt Changelog TODO %doc lib/doc/res/html %doc lib/doc/res/latex/*.dvi lib/doc/res/latex/*.ps lib/doc/res/latex/*.pdf %if %opt @@ -92,8 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Oct 4 2009 Richard W.M. Jones - 3.2.0-2 +* Sun Oct 4 2009 Richard W.M. Jones - 3.2.0-3 - New upstream release 3.2.0. +- Changes file -> Changelog * Sat Jul 25 2009 Fedora Release Engineering - 3.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Sun Oct 4 22:34:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Sun, 4 Oct 2009 22:34:51 +0000 (UTC) Subject: rpms/ocaml/devel ocaml-find-requires.sh, 1.4, 1.5 ocaml.spec, 1.58, 1.59 Message-ID: <20091004223451.B4D6511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155 Modified Files: ocaml-find-requires.sh ocaml.spec Log Message: - ocaml-find-requires.sh: Calculate runtime version using ocamlrun -version instead of fedora-ocaml-release file. Index: ocaml-find-requires.sh =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- ocaml-find-requires.sh 20 Nov 2008 15:30:55 -0000 1.4 +++ ocaml-find-requires.sh 4 Oct 2009 22:34:51 -0000 1.5 @@ -69,5 +69,5 @@ sort -u if [ -n "$emit_compiler_version" ]; then # Every OCaml program depends on the version of the # runtime which was used to compile it. - echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" + echo "ocaml(runtime) = `ocamlrun -version | awk '{print $NF}' | sed 's/\+.*//'`" fi Index: ocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- ocaml.spec 30 Sep 2009 12:25:22 -0000 1.58 +++ ocaml.spec 4 Oct 2009 22:34:51 -0000 1.59 @@ -2,7 +2,7 @@ Name: ocaml Version: 3.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective Caml compiler and programming environment @@ -433,6 +433,10 @@ fi %changelog +* Sun Oct 4 2009 Richard W.M. Jones - 3.11.1-2 +- ocaml-find-requires.sh: Calculate runtime version using ocamlrun + -version instead of fedora-ocaml-release file. + * Wed Sep 30 2009 Richard W.M. Jones - 3.11.1-1 - OCaml 3.11.1 (this is virtually the same as the release candidate that we were using for Fedora 12). From rjones at fedoraproject.org Mon Oct 5 14:37:02 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 5 Oct 2009 14:37:02 +0000 (UTC) Subject: rpms/ocaml-curses/devel ocaml-curses.spec,1.13,1.14 Message-ID: <20091005143702.6E0C611C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-curses/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5289 Modified Files: ocaml-curses.spec Log Message: Use ncursesw for wide character support. Index: ocaml-curses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-curses/devel/ocaml-curses.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ocaml-curses.spec 25 Jul 2009 19:55:04 -0000 1.13 +++ ocaml-curses.spec 5 Oct 2009 14:37:02 -0000 1.14 @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: OCaml bindings for ncurses Group: Development/Libraries @@ -47,7 +47,7 @@ autoreconf %build -%configure +%configure --enable-widec make all opt strip dllcurses_stubs.so @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 4 2009 Richard W.M. Jones - 1.0.3-7 +- Use ncursesw for wide character support. + * Sat Jul 25 2009 Fedora Release Engineering - 1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Mon Oct 5 15:26:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 5 Oct 2009 15:26:51 +0000 (UTC) Subject: rpms/virt-top/devel virt-top-1.0.4-bogus-ja-plurals.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 virt-top-1.0.3-bogus-zh_CN-plurals.patch, 1.1, 1.2 virt-top.spec, 1.7, 1.8 Message-ID: <20091005152651.1FEBB11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-top/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23079 Modified Files: .cvsignore sources virt-top-1.0.3-bogus-zh_CN-plurals.patch virt-top.spec Added Files: virt-top-1.0.4-bogus-ja-plurals.patch Log Message: * Mon Oct 5 2009 Richard W.M. Jones - 1.0.4-1 - New upstream release 1.0.4. - Includes new translations (RHBZ#493799). - Overall hardware memory is now displayed in CSV file (RHBZ#521785). - Several fixes to Japanese support (RHBZ#508197). - Japanese PO file also has bogus plural forms. virt-top-1.0.4-bogus-ja-plurals.patch: ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE virt-top-1.0.4-bogus-ja-plurals.patch --- diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po --- virt-top-1.0.4.orig/po/ja.po 2009-10-05 16:24:06.295900599 +0100 +++ virt-top-1.0.4/po/ja.po 2009-10-05 16:24:49.296650985 +0100 @@ -10,7 +10,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n" +"Plural-Forms: nplurals=1; plural=0;\n\n" "X-Generator: KBabel 1.11.4\n" #: ../virt-top/virt_top.ml:1492 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 21 Oct 2008 09:29:56 -0000 1.3 +++ .cvsignore 5 Oct 2009 15:26:50 -0000 1.4 @@ -1,2 +1 @@ -virt-top-1.0.1.tar.gz -virt-top-1.0.3.tar.gz +virt-top-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 21 Oct 2008 09:59:18 -0000 1.4 +++ sources 5 Oct 2009 15:26:50 -0000 1.5 @@ -1 +1 @@ -18662bfbaa13c314ed07734cb1f5913e virt-top-1.0.3.tar.gz +491929219b5b49b4e502a1643599be95 virt-top-1.0.4.tar.gz virt-top-1.0.3-bogus-zh_CN-plurals.patch: zh_CN.po | 1 - 1 file changed, 1 deletion(-) Index: virt-top-1.0.3-bogus-zh_CN-plurals.patch =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top-1.0.3-bogus-zh_CN-plurals.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- virt-top-1.0.3-bogus-zh_CN-plurals.patch 21 Oct 2008 09:59:18 -0000 1.1 +++ virt-top-1.0.3-bogus-zh_CN-plurals.patch 5 Oct 2009 15:26:50 -0000 1.2 @@ -7,4 +7,4 @@ -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "X-Generator: KBabel 1.11.4\n" - #: ../virt-top/virt_top.ml:1490 + #: ../virt-top/virt_top.ml:1492 Index: virt-top.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- virt-top.spec 27 Jul 2009 06:55:36 -0000 1.7 +++ virt-top.spec 5 Oct 2009 15:26:50 -0000 1.8 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: virt-top -Version: 1.0.3 -Release: 5%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: Utility like top(1) for displaying virtualization stats Group: Development/Libraries @@ -14,11 +14,13 @@ BuildRoot: %{_tmppath}/%{name}-%{ve ExcludeArch: sparc64 s390 s390x Patch0: virt-top-1.0.3-bogus-zh_CN-plurals.patch +Patch1: virt-top-1.0.4-bogus-ja-plurals.patch BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-curses-devel +# Need the ncurses / ncursesw (--enable-widec) fix. +BuildRequires: ocaml-curses-devel >= 1.0.3-7 BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-csv-devel @@ -37,9 +39,6 @@ BuildRequires: libvirt-devel BuildRequires: perl BuildRequires: gawk -#%define _use_internal_dependency_generator 0 -#%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -#%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description virt-top is a 'top(1)'-like utility for showing stats of virtualized @@ -53,6 +52,7 @@ different virtualization systems. %prep %setup -q %patch0 -p1 +%patch1 -p1 chmod -x COPYING @@ -99,6 +99,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 5 2009 Richard W.M. Jones - 1.0.4-1 +- New upstream release 1.0.4. +- Includes new translations (RHBZ#493799). +- Overall hardware memory is now displayed in CSV file (RHBZ#521785). +- Several fixes to Japanese support (RHBZ#508197). +- Japanese PO file also has bogus plural forms. + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Mon Oct 5 15:36:15 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 5 Oct 2009 15:36:15 +0000 (UTC) Subject: rpms/virt-top/devel virt-top.spec,1.8,1.9 Message-ID: <20091005153615.55EBE11C0298@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-top/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26690 Modified Files: virt-top.spec Log Message: Additional BR on gettext (for msgfmt). Index: virt-top.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/devel/virt-top.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- virt-top.spec 5 Oct 2009 15:26:50 -0000 1.8 +++ virt-top.spec 5 Oct 2009 15:36:15 -0000 1.9 @@ -3,7 +3,7 @@ Name: virt-top Version: 1.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility like top(1) for displaying virtualization stats Group: Development/Libraries @@ -33,6 +33,8 @@ BuildRequires: ocaml-fileutils-devel %ifnarch ppc64 BuildRequires: ocaml-camomile-data %endif +# For msgfmt: +BuildRequires: gettext # Non-OCaml BRs. BuildRequires: libvirt-devel @@ -99,12 +101,13 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Oct 5 2009 Richard W.M. Jones - 1.0.4-1 +* Mon Oct 5 2009 Richard W.M. Jones - 1.0.4-2 - New upstream release 1.0.4. - Includes new translations (RHBZ#493799). - Overall hardware memory is now displayed in CSV file (RHBZ#521785). - Several fixes to Japanese support (RHBZ#508197). - Japanese PO file also has bogus plural forms. +- Additional BR on gettext (for msgfmt). * Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Tue Oct 6 15:50:44 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 6 Oct 2009 15:50:44 +0000 (UTC) Subject: rpms/ocaml-curses/F-12 ocaml-curses.spec,1.13,1.14 Message-ID: <20091006155044.1EDEC11C02A0@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-curses/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18698 Modified Files: ocaml-curses.spec Log Message: Use ncursesw for wide character support. Index: ocaml-curses.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-curses/F-12/ocaml-curses.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ocaml-curses.spec 25 Jul 2009 19:55:04 -0000 1.13 +++ ocaml-curses.spec 6 Oct 2009 15:50:43 -0000 1.14 @@ -3,7 +3,7 @@ Name: ocaml-curses Version: 1.0.3 -Release: 6%{?dist} +Release: 6%{?dist}.1 Summary: OCaml bindings for ncurses Group: Development/Libraries @@ -47,7 +47,7 @@ autoreconf %build -%configure +%configure --enable-widec make all opt strip dllcurses_stubs.so @@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 6 2009 Richard W.M. Jones - 1.0.3-6.fc12.1 +- Use ncursesw for wide character support. + * Sat Jul 25 2009 Fedora Release Engineering - 1.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Tue Oct 6 16:07:46 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 6 Oct 2009 16:07:46 +0000 (UTC) Subject: rpms/virt-top/F-12 virt-top-1.0.4-bogus-ja-plurals.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 virt-top-1.0.3-bogus-zh_CN-plurals.patch, 1.1, 1.2 virt-top.spec, 1.7, 1.8 Message-ID: <20091006160746.B6A5811C00C1@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/virt-top/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25034 Modified Files: .cvsignore sources virt-top-1.0.3-bogus-zh_CN-plurals.patch virt-top.spec Added Files: virt-top-1.0.4-bogus-ja-plurals.patch Log Message: NOTE: (1) Not built yet, (2) Requires updated ocaml-curses. * Tue Oct 6 2009 Richard W.M. Jones - 1.0.4-1.fc12.1 - New upstream release 1.0.4. - Includes new translations (RHBZ#493799). - Overall hardware memory is now displayed in CSV file (RHBZ#521785). - Several fixes to Japanese support (RHBZ#508197). - Japanese PO file also has bogus plural forms. - Additional BR on gettext (for msgfmt). virt-top-1.0.4-bogus-ja-plurals.patch: ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE virt-top-1.0.4-bogus-ja-plurals.patch --- diff -ur virt-top-1.0.4.orig/po/ja.po virt-top-1.0.4/po/ja.po --- virt-top-1.0.4.orig/po/ja.po 2009-10-05 16:24:06.295900599 +0100 +++ virt-top-1.0.4/po/ja.po 2009-10-05 16:24:49.296650985 +0100 @@ -10,7 +10,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: Plural-Forms: nplurals=1; plural=0;\n\n" +"Plural-Forms: nplurals=1; plural=0;\n\n" "X-Generator: KBabel 1.11.4\n" #: ../virt-top/virt_top.ml:1492 Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/F-12/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 21 Oct 2008 09:29:56 -0000 1.3 +++ .cvsignore 6 Oct 2009 16:07:46 -0000 1.4 @@ -1,2 +1 @@ -virt-top-1.0.1.tar.gz -virt-top-1.0.3.tar.gz +virt-top-1.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/F-12/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- sources 21 Oct 2008 09:59:18 -0000 1.4 +++ sources 6 Oct 2009 16:07:46 -0000 1.5 @@ -1 +1 @@ -18662bfbaa13c314ed07734cb1f5913e virt-top-1.0.3.tar.gz +491929219b5b49b4e502a1643599be95 virt-top-1.0.4.tar.gz virt-top-1.0.3-bogus-zh_CN-plurals.patch: zh_CN.po | 1 - 1 file changed, 1 deletion(-) Index: virt-top-1.0.3-bogus-zh_CN-plurals.patch =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/F-12/virt-top-1.0.3-bogus-zh_CN-plurals.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- virt-top-1.0.3-bogus-zh_CN-plurals.patch 21 Oct 2008 09:59:18 -0000 1.1 +++ virt-top-1.0.3-bogus-zh_CN-plurals.patch 6 Oct 2009 16:07:46 -0000 1.2 @@ -7,4 +7,4 @@ -"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "X-Generator: KBabel 1.11.4\n" - #: ../virt-top/virt_top.ml:1490 + #: ../virt-top/virt_top.ml:1492 Index: virt-top.spec =================================================================== RCS file: /cvs/pkgs/rpms/virt-top/F-12/virt-top.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- virt-top.spec 27 Jul 2009 06:55:36 -0000 1.7 +++ virt-top.spec 6 Oct 2009 16:07:46 -0000 1.8 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: virt-top -Version: 1.0.3 -Release: 5%{?dist} +Version: 1.0.4 +Release: 1%{?dist}.1 Summary: Utility like top(1) for displaying virtualization stats Group: Development/Libraries @@ -14,11 +14,13 @@ BuildRoot: %{_tmppath}/%{name}-%{ve ExcludeArch: sparc64 s390 s390x Patch0: virt-top-1.0.3-bogus-zh_CN-plurals.patch +Patch1: virt-top-1.0.4-bogus-ja-plurals.patch BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-curses-devel +# Need the ncurses / ncursesw (--enable-widec) fix. +BuildRequires: ocaml-curses-devel >= 1.0.3-6.fc12.1 BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-xml-light-devel BuildRequires: ocaml-csv-devel @@ -31,15 +33,14 @@ BuildRequires: ocaml-fileutils-devel %ifnarch ppc64 BuildRequires: ocaml-camomile-data %endif +# For msgfmt: +BuildRequires: gettext # Non-OCaml BRs. BuildRequires: libvirt-devel BuildRequires: perl BuildRequires: gawk -#%define _use_internal_dependency_generator 0 -#%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -#%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description virt-top is a 'top(1)'-like utility for showing stats of virtualized @@ -53,6 +54,7 @@ different virtualization systems. %prep %setup -q %patch0 -p1 +%patch1 -p1 chmod -x COPYING @@ -99,6 +101,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 6 2009 Richard W.M. Jones - 1.0.4-1.fc12.1 +- New upstream release 1.0.4. +- Includes new translations (RHBZ#493799). +- Overall hardware memory is now displayed in CSV file (RHBZ#521785). +- Several fixes to Japanese support (RHBZ#508197). +- Japanese PO file also has bogus plural forms. +- Additional BR on gettext (for msgfmt). + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From pmatilai at laiskiainen.org Tue Oct 6 17:45:38 2009 From: pmatilai at laiskiainen.org (Panu Matilainen) Date: Tue, 6 Oct 2009 20:45:38 +0300 (EEST) Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: <20091006150745.GA19053@amd.home.annexia.org> References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> <20091004223852.GA32000@amd.home.annexia.org> <20091006150745.GA19053@amd.home.annexia.org> Message-ID: On Tue, 6 Oct 2009, Richard W.M. Jones wrote: > On Tue, Oct 06, 2009 at 12:43:13PM +0300, Panu Matilainen wrote: >> On Sun, 4 Oct 2009, Richard W.M. Jones wrote: >> >>> On Sun, Oct 04, 2009 at 11:03:33AM +0300, Panu Matilainen wrote: >>>> I seem to recall commenting on this earlier (like at least a year ago :) >>>> but just as well I might've just intended to comment... anyway. >>>> I would've pulled it to RPM upstream ages ago if it didn't have Fedora >>>> packaging specifics bolted in: >>>> >>>> if [ -n "$emit_compiler_version" ]; then >>>> # Every OCaml program depends on the version of the >>>> # runtime which was used to compile it. >>>> echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" >>>> fi >>>> >>>> I suppose there's a reason why this is not generated with "ocaml >>>> -version" or "ocamlrun -version" as needed? >>> >>> Yes, I can't remember why we did that either :-( >>> >>> I've changed it in the OCaml package in Fedora 13, we should give it a >>> few more months to see if anything breaks. >>> >>> http://cvs.fedoraproject.org/viewvc/devel/ocaml/ocaml-find-requires.sh?r1=1.4&r2=1.5 >> >> Okay... added upstream now and integrated with the internal dependency >> generator too so you dont need to fiddle with that in specfile, plus >> the external dependency generator misses some fairly important >> dependency bits. >> >> http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=82e7dd702013d3679fda438333de30afdec17a4f >> http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=15fb8ccb41ce4cc02c78508b936fb74f7165683c > > Just a question about this: If we need to pass extra options to the > dependency scripts (as in the example specfile below), can we still do > that? For now, you can override the macros much like before, the only difference being the macro to override: instead of %__find_requires and %__find_provides, you'd now override %__ocaml_requires and %__ocaml_provides. Another, perhaps nicer option would be adding per-script optional option-macros for these, something like: %__ocaml_provides %{_rpmconfigdir}/ocaml-find-provides.sh %{?ocaml_find_provides_opts} So in spec you'd just have to set the provides/requires options if necessary, instead of redefining the entire thing. Similar mechanism could be useful for other similar dep extractors too. - Panu - From tcallawa at redhat.com Tue Oct 6 17:52:57 2009 From: tcallawa at redhat.com (Tom "spot" Callaway) Date: Tue, 06 Oct 2009 13:52:57 -0400 Subject: [Fedora-packaging] Ocaml sub-package issue In-Reply-To: References: <4AC139B4.9030508@cora.nwra.com> <20091001225007.GB8172@amd.home.annexia.org> <20091004223852.GA32000@amd.home.annexia.org> <20091006150745.GA19053@amd.home.annexia.org> Message-ID: <4ACB83F9.7020603@redhat.com> On 10/06/2009 01:45 PM, Panu Matilainen wrote: > Another, perhaps nicer option would be adding per-script optional > option-macros for these, something like: > > %__ocaml_provides %{_rpmconfigdir}/ocaml-find-provides.sh > %{?ocaml_find_provides_opts} That would be very nice. :) ~spot From bugzilla at redhat.com Wed Oct 7 17:06:14 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Wed, 7 Oct 2009 13:06:14 -0400 Subject: [Bug 508197] virt-top segfaults if run in Japanese In-Reply-To: References: Message-ID: <200910071706.n97H6EUj016100@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=508197 --- Comment #9 from Fedora Update System 2009-10-07 13:06:13 EDT --- virt-top-1.0.4-1.fc12.1 has been submitted as an update for Fedora 12. http://admin.fedoraproject.org/updates/virt-top-1.0.4-1.fc12.1 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Wed Oct 7 17:06:04 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Wed, 7 Oct 2009 13:06:04 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910071706.n97H64Jd016044@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 --- Comment #26 from Fedora Update System 2009-10-07 13:06:02 EDT --- virt-top-1.0.4-1.fc12.1 has been submitted as an update for Fedora 12. http://admin.fedoraproject.org/updates/virt-top-1.0.4-1.fc12.1 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at fedoraproject.org Thu Oct 8 11:51:35 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 11:51:35 +0000 (UTC) Subject: rpms/ocaml-cairo/devel cairo-ocaml-1.0.0-bigarray.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ocaml-cairo.spec, 1.13, 1.14 sources, 1.2, 1.3 Message-ID: <20091008115135.49C4711C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cairo/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19053 Modified Files: .cvsignore ocaml-cairo.spec sources Added Files: cairo-ocaml-1.0.0-bigarray.patch Log Message: * Thu Oct 8 2009 Richard W.M. Jones - 1:1.0.0-1 - New upstream version 1.0.0. - Yes, version number really did roll backwards, so now we're using Epoch. - Patch for compatibility with OCaml 3.11.1 (renamed bigarray structs). cairo-ocaml-1.0.0-bigarray.patch: ml_cairo_bigarr.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE cairo-ocaml-1.0.0-bigarray.patch --- diff -ur cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c --- cairo-ocaml-1.0.0.orig/src/ml_cairo_bigarr.c 2009-06-18 19:01:26.000000000 +0100 +++ cairo-ocaml-1.0.0.compat/src/ml_cairo_bigarr.c 2009-10-08 12:46:54.795555155 +0100 @@ -9,6 +9,8 @@ #include "ml_cairo.h" #include +#undef CAML_NAME_SPACE +#include unsigned long bigarray_byte_size (struct caml_bigarray *); Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 1 Mar 2008 19:03:48 -0000 1.2 +++ .cvsignore 8 Oct 2009 11:51:34 -0000 1.3 @@ -1 +1 @@ -ocaml-cairo-1.2.0.cvs20080301.tar.gz +cairo-ocaml-1.0.0.tar.bz2 Index: ocaml-cairo.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/ocaml-cairo.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ocaml-cairo.spec 29 Sep 2009 15:16:06 -0000 1.13 +++ ocaml-cairo.spec 8 Oct 2009 11:51:35 -0000 1.14 @@ -1,28 +1,22 @@ %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) %define debug_package %{nil} -# There are no source releases for ocaml-cairo. To get the source -# matching this you have to do: -# -# cvs -d:pserver:anonymous at cvs.cairographics.org:/cvs/cairo co -D 2008-03-01 cairo-ocaml -# tar zcf /tmp/ocaml-cairo-1.2.0.cvs20080301.tar.gz --exclude CVS cairo-ocaml -# -# Whether you'll get precisely the same tarball by this method is -# questionable. If files get checked out in a different order then -# you might need to use 'diff -urN' instead of comparing MD5 hashes. - Name: ocaml-cairo -Version: 1.2.0.cvs20080301 -Release: 11%{?dist} +Epoch: 1 +Version: 1.0.0 +Release: 1%{?dist} Summary: OCaml library for accessing cairo graphics +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: sparc64 s390 s390x + Group: Development/Libraries License: LGPLv2 URL: http://cairographics.org/cairo-ocaml/ -Source0: ocaml-cairo-%{version}.tar.gz + +Source0: cairo-ocaml-%{version}.tar.bz2 Source1: ocaml-cairo-META -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: sparc64 s390 s390x +Patch0: cairo-ocaml-1.0.0-bigarray.patch BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel @@ -56,7 +50,7 @@ PDF 1.4. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel @@ -65,7 +59,9 @@ developing applications that use %{name} %prep -%setup -q -n cairo-ocaml +%setup -q -n cairo-ocaml-%{version} +%patch0 -p1 + aclocal -I support autoconf ./configure --libdir=%{_libdir} @@ -119,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 1:1.0.0-1 +- New upstream version 1.0.0. +- Yes, version number really did roll backwards, so now we're using Epoch. +- Patch for compatibility with OCaml 3.11.1 (renamed bigarray structs). + * Tue Sep 29 2009 Richard W.M. Jones - 1.2.0.cvs20080301-11 - Force rebuild against newer lablgtk. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cairo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 1 Mar 2008 19:03:48 -0000 1.2 +++ sources 8 Oct 2009 11:51:35 -0000 1.3 @@ -1 +1 @@ -a4a91f25a2c18d5d26f2f19cf5b12980 ocaml-cairo-1.2.0.cvs20080301.tar.gz +2b7e6f4dc7b78236eadaac16e16af0a9 cairo-ocaml-1.0.0.tar.bz2 From rjones at fedoraproject.org Thu Oct 8 11:58:23 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 11:58:23 +0000 (UTC) Subject: rpms/ocaml-calendar/devel .cvsignore, 1.5, 1.6 ocaml-calendar.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <20091008115823.45D0011C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-calendar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23114 Modified Files: .cvsignore ocaml-calendar.spec sources Log Message: * Thu Oct 8 2009 Richard W.M. Jones - 2.01.1-1 - New upstream release 2.01.1. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 10 Jul 2008 09:01:56 -0000 1.5 +++ .cvsignore 8 Oct 2009 11:58:23 -0000 1.6 @@ -1 +1 @@ -calendar-2.0.4.tar.gz +calendar-2.01.1.tar.gz Index: ocaml-calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- ocaml-calendar.spec 25 Jul 2009 19:52:04 -0000 1.15 +++ ocaml-calendar.spec 8 Oct 2009 11:58:23 -0000 1.16 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-calendar -Version: 2.0.4 -Release: 7%{?dist} +Version: 2.01.1 +Release: 1%{?dist} Summary: Objective Caml library for managing dates and times Group: Development/Libraries License: LGPLv2 URL: http://calendar.forge.ocamlcore.org/ -Source0: http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz +Source0: http://forge.ocamlcore.org/frs/download.php/173/calendar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 2.01.1-1 +- New upstream release 2.01.1. + * Sat Jul 25 2009 Fedora Release Engineering - 2.0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 10 Jul 2008 09:01:56 -0000 1.5 +++ sources 8 Oct 2009 11:58:23 -0000 1.6 @@ -1 +1 @@ -f460b1f0544d6c29b9d6517ef8a4b282 calendar-2.0.4.tar.gz +a30974a97f718688198c5a5dc6235cff calendar-2.01.1.tar.gz From rjones at fedoraproject.org Thu Oct 8 12:04:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:04:17 +0000 (UTC) Subject: rpms/ocaml-camomile/devel .cvsignore, 1.2, 1.3 ocaml-camomile.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <20091008120417.DCCA911C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camomile/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25175 Modified Files: .cvsignore ocaml-camomile.spec sources Log Message: Version 0.7.2. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 20 Mar 2008 20:36:35 -0000 1.2 +++ .cvsignore 8 Oct 2009 12:04:15 -0000 1.3 @@ -1 +1 @@ -camomile-0.7.1.tar.bz2 +camomile-0.7.2.tar.bz2 Index: ocaml-camomile.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/ocaml-camomile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- ocaml-camomile.spec 25 Jul 2009 19:53:06 -0000 1.9 +++ ocaml-camomile.spec 8 Oct 2009 12:04:15 -0000 1.10 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-camomile -Version: 0.7.1 -Release: 12%{?dist} +Version: 0.7.2 +Release: 1%{?dist} Summary: Unicode library for OCaml Group: Development/Libraries @@ -12,7 +12,7 @@ Group: Development/Libraries # https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html License: LGPLv2+ URL: http://sourceforge.net/projects/camomile/ -Source0: http://downloads.sourceforge.net/camomile/camomile-0.7.1.tar.bz2 +Source0: http://downloads.sourceforge.net/camomile/camomile-0.7.2.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 sparc64 s390 s390x @@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 0.7.2-1 +- New upstream version 0.7.2. + * Sat Jul 25 2009 Fedora Release Engineering - 0.7.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camomile/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 20 Mar 2008 20:36:35 -0000 1.2 +++ sources 8 Oct 2009 12:04:15 -0000 1.3 @@ -1 +1 @@ -9b8cedcf91e9795f85aaade5a6f1c515 camomile-0.7.1.tar.bz2 +288e17838fedc52aacb733952b25d5dd camomile-0.7.2.tar.bz2 From rjones at fedoraproject.org Thu Oct 8 12:06:58 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:06:58 +0000 (UTC) Subject: rpms/ocaml-dbus/devel .cvsignore, 1.6, 1.7 ocaml-dbus.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <20091008120658.097BD11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-dbus/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26680 Modified Files: .cvsignore ocaml-dbus.spec sources Log Message: New upstream version 0.24. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 31 Aug 2008 09:52:40 -0000 1.6 +++ .cvsignore 8 Oct 2009 12:06:57 -0000 1.7 @@ -1 +1 @@ -ocaml_dbus-0.07.tar.bz2 +ocaml_dbus-0.24.tar.bz2 Index: ocaml-dbus.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ocaml-dbus.spec 25 Jul 2009 19:55:20 -0000 1.13 +++ ocaml-dbus.spec 8 Oct 2009 12:06:57 -0000 1.14 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-dbus -Version: 0.07 -Release: 6%{?dist} +Version: 0.24 +Release: 1%{?dist} Summary: OCaml library for using D-Bus Group: Development/Libraries @@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 0.24-1 +- New upstream version 0.24. + * Sat Jul 25 2009 Fedora Release Engineering - 0.07-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 31 Aug 2008 09:52:40 -0000 1.6 +++ sources 8 Oct 2009 12:06:57 -0000 1.7 @@ -1 +1 @@ -5291a08a135b00ddbe3d38e51511ccb6 ocaml_dbus-0.07.tar.bz2 +b769af9141a5c073056ed46ef76ba5be ocaml_dbus-0.24.tar.bz2 From rjones at fedoraproject.org Thu Oct 8 12:17:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:17:06 +0000 (UTC) Subject: rpms/ocaml-fileutils/devel .cvsignore, 1.2, 1.3 ocaml-fileutils.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <20091008121706.F2D0D11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-fileutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29974 Modified Files: .cvsignore ocaml-fileutils.spec sources Log Message: * Thu Oct 8 2009 Richard W.M. Jones - 0.4.0-1 - New upstream version 0.4.0. - Upstream build system has been rationalized, so remove all the hacks we were using. - Upstream now contains tests, run them. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 22 Feb 2008 18:40:38 -0000 1.2 +++ .cvsignore 8 Oct 2009 12:17:05 -0000 1.3 @@ -1 +1 @@ -ocaml-fileutils-0.3.0.tar.gz +ocaml-fileutils-0.4.0.tar.gz Index: ocaml-fileutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- ocaml-fileutils.spec 25 Jul 2009 19:56:44 -0000 1.9 +++ ocaml-fileutils.spec 8 Oct 2009 12:17:05 -0000 1.10 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-fileutils -Version: 0.3.0 -Release: 11%{?dist} +Version: 0.4.0 +Release: 1%{?dist} Summary: OCaml library for common file and filename operations Group: Development/Libraries License: LGPLv2 with exceptions URL: http://www.gallu.homelinux.org/download/ -Source0: http://www.gallu.homelinux.org/download/ocaml-fileutils-0.3.0.tar.gz +Source0: http://www.gallu.homelinux.org/download/ocaml-fileutils-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -46,29 +46,26 @@ developing applications that use %{name} %prep %setup -q -# The whole build system for this package is totally broken. -# We build into a temporary directory then copy the files -# to the right place. -./configure --prefix=%{_prefix} --libdir=%{_libdir} \ - --enable-ocamlfind \ - --with-builddir=`pwd`/tmp +%configure %build -# Nothing: 'make' builds and installs. Stupid! +make %install -# Go and do your broken stuff now ... -rm -rf tmp -make -# make doc (borked) - -# ... and copy the files to the right places. rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml -cp -r tmp/lib/fileutils $RPM_BUILD_ROOT%{_libdir}/ocaml -rm -rf tmp +export DESTDIR=$RPM_BUILD_ROOT +export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs + +# Set htmldir to current directory, then copy the docs (in api/) +# as a %doc rule. +make htmldir=. install + + +%check +make test %clean @@ -81,20 +78,32 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/ocaml/fileutils %if %opt %exclude %{_libdir}/ocaml/fileutils/*.a +%exclude %{_libdir}/ocaml/fileutils/*.cmx %exclude %{_libdir}/ocaml/fileutils/*.cmxa %endif +%exclude %{_libdir}/ocaml/fileutils/*.ml +%exclude %{_libdir}/ocaml/fileutils/*.mli %files devel %defattr(-,root,root,-) -%doc COPYING AUTHOR CHANGELOG README TODO +%doc COPYING AUTHOR CHANGELOG README TODO api %if %opt %{_libdir}/ocaml/fileutils/*.a +%{_libdir}/ocaml/fileutils/*.cmx %{_libdir}/ocaml/fileutils/*.cmxa %endif +%{_libdir}/ocaml/fileutils/*.ml +%{_libdir}/ocaml/fileutils/*.mli %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 0.4.0-1 +- New upstream version 0.4.0. +- Upstream build system has been rationalized, so remove all the + hacks we were using. +- Upstream now contains tests, run them. + * Sat Jul 25 2009 Fedora Release Engineering - 0.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 22 Feb 2008 18:40:38 -0000 1.2 +++ sources 8 Oct 2009 12:17:05 -0000 1.3 @@ -1 +1 @@ -a3c24bb6e928dc9deb8d8f7e30206057 ocaml-fileutils-0.3.0.tar.gz +93437c0fe6fa0e02c30e87af6a0d4e14 ocaml-fileutils-0.4.0.tar.gz From rjones at fedoraproject.org Thu Oct 8 12:19:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:19:49 +0000 (UTC) Subject: rpms/ocaml-json-static/devel .cvsignore, 1.2, 1.3 ocaml-json-static.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <20091008121949.5831611C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-json-static/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31108 Modified Files: .cvsignore ocaml-json-static.spec sources Log Message: Version 0.9.8. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 13 May 2008 18:24:39 -0000 1.2 +++ .cvsignore 8 Oct 2009 12:19:49 -0000 1.3 @@ -1 +1 @@ -json-static-0.9.6.tar.bz2 +json-static-0.9.8.tar.bz2 Index: ocaml-json-static.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/ocaml-json-static.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- ocaml-json-static.spec 25 Jul 2009 19:57:44 -0000 1.8 +++ ocaml-json-static.spec 8 Oct 2009 12:19:49 -0000 1.9 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-json-static -Version: 0.9.6 -Release: 10%{?dist} +Version: 0.9.8 +Release: 1%{?dist} Summary: OCaml JSON validator and converter (syntax extension) Group: Development/Libraries @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 0.9.8-1 +- New upstream version 0.9.8. + * Sat Jul 25 2009 Fedora Release Engineering - 0.9.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-json-static/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 13 May 2008 18:24:39 -0000 1.2 +++ sources 8 Oct 2009 12:19:49 -0000 1.3 @@ -1 +1 @@ -7ffc8c00353a6fc14fde490c4edeb1d0 json-static-0.9.6.tar.bz2 +a8b586a4c7851f5e34c28da60ebf8904 json-static-0.9.8.tar.bz2 From rjones at fedoraproject.org Thu Oct 8 12:42:49 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:42:49 +0000 (UTC) Subject: rpms/ocaml-lwt/devel .cvsignore, 1.2, 1.3 ocaml-lwt.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <20091008124249.A310711C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lwt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4872 Modified Files: .cvsignore ocaml-lwt.spec sources Log Message: - New upstream version 2.0.0+rc1. - NB. This cannot be built as it depends on new package ocaml-react (RHBZ#527971). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 3 Sep 2008 21:02:17 -0000 1.2 +++ .cvsignore 8 Oct 2009 12:42:49 -0000 1.3 @@ -1 +1 @@ -lwt-1.1.0.tar.gz +lwt-2.0.0+rc1.tar.gz Index: ocaml-lwt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ocaml-lwt.spec 25 Jul 2009 19:59:20 -0000 1.7 +++ ocaml-lwt.spec 8 Oct 2009 12:42:49 -0000 1.8 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-lwt -Version: 1.1.0 -Release: 6%{?dist} +Version: 2.0.0 +Release: 0.rc1%{?dist} Summary: OCaml lightweight thread library Group: Development/Libraries License: LGPLv2+ with exceptions -URL: http://ocsigen.org/install/lwt -Source0: http://ocsigen.org/download/lwt-%{version}.tar.gz +URL: http://ocsigen.org/lwt +Source0: http://ocsigen.org/download/lwt-%{version}+rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -17,6 +17,8 @@ BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ssl >= 0.4.0 +BuildRequires: ocaml-react >= 0.9.0 +BuildRequires: chrpath %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh @@ -40,7 +42,7 @@ developing applications that use %{name} %prep -%setup -q -n lwt-%{version} +%setup -q -n lwt-%{version}+rc1 mv README README.old iconv -f iso-8859-1 -t utf-8 < README.old > README @@ -57,6 +59,9 @@ export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs make install +strip $OCAMLFIND_DESTDIR/stublibs/dll*.so +chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so + %clean rm -rf $RPM_BUILD_ROOT @@ -72,11 +77,13 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/ocaml/lwt/*.cmx %endif %exclude %{_libdir}/ocaml/lwt/*.mli +%{_libdir}/ocaml/stublibs/*.so +%{_libdir}/ocaml/stublibs/*.so.owner %files devel %defattr(-,root,root,-) -%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION _build/lwt.docdir +%doc LICENSE COPYING CHANGES CHANGES.darcs README VERSION %if %opt %{_libdir}/ocaml/lwt/*.a %{_libdir}/ocaml/lwt/*.cmxa @@ -86,6 +93,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 2.0.0-0.rc1.fc13 +- New upstream version 2.0.0+rc1. +- NB. This cannot be built as it depends on new package ocaml-react + (RHBZ#527971). + * Sat Jul 25 2009 Fedora Release Engineering - 1.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 3 Sep 2008 21:02:17 -0000 1.2 +++ sources 8 Oct 2009 12:42:49 -0000 1.3 @@ -1 +1 @@ -dcc43458f3e39647bb7992749de43fa5 lwt-1.1.0.tar.gz +da266196ee3a1245eed3cf5df09f9ce1 lwt-2.0.0+rc1.tar.gz From rjones at fedoraproject.org Thu Oct 8 12:47:34 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:47:34 +0000 (UTC) Subject: rpms/ocaml-fileutils/devel ocaml-fileutils.spec,1.10,1.11 Message-ID: <20091008124734.250AE11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-fileutils/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069 Modified Files: ocaml-fileutils.spec Log Message: - Needs ounit in order to carry out the tests. Index: ocaml-fileutils.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-fileutils/devel/ocaml-fileutils.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ocaml-fileutils.spec 8 Oct 2009 12:17:05 -0000 1.10 +++ ocaml-fileutils.spec 8 Oct 2009 12:47:33 -0000 1.11 @@ -3,7 +3,7 @@ Name: ocaml-fileutils Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCaml library for common file and filename operations Group: Development/Libraries @@ -17,6 +17,7 @@ BuildRequires: ocaml BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-ounit-devel %define _use_internal_dependency_generator 0 %define __find_requires /usr/lib/rpm/ocaml-find-requires.sh @@ -98,11 +99,12 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Oct 8 2009 Richard W.M. Jones - 0.4.0-1 +* Thu Oct 8 2009 Richard W.M. Jones - 0.4.0-2 - New upstream version 0.4.0. - Upstream build system has been rationalized, so remove all the hacks we were using. - Upstream now contains tests, run them. +- Needs ounit in order to carry out the tests. * Sat Jul 25 2009 Fedora Release Engineering - 0.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Thu Oct 8 12:52:18 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:52:18 +0000 (UTC) Subject: rpms/ocaml-mikmatch/devel .cvsignore, 1.2, 1.3 ocaml-mikmatch.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <20091008125219.0047411C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mikmatch/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7069 Modified Files: .cvsignore ocaml-mikmatch.spec sources Log Message: - New upstream version 1.0.2. - Removed dynlink patch (now upstream). Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 24 Aug 2008 09:51:35 -0000 1.2 +++ .cvsignore 8 Oct 2009 12:52:18 -0000 1.3 @@ -1 +1 @@ -mikmatch-1.0.0.tar.bz2 +mikmatch-1.0.2.tar.bz2 Index: ocaml-mikmatch.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/ocaml-mikmatch.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- ocaml-mikmatch.spec 25 Jul 2009 19:59:36 -0000 1.8 +++ ocaml-mikmatch.spec 8 Oct 2009 12:52:18 -0000 1.9 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-mikmatch -Version: 1.0.0 -Release: 7%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: OCaml extension for pattern matching with regexps Group: Development/Libraries @@ -13,8 +13,6 @@ Source0: http://martin.jambon.fre BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x -Patch0: ocaml-mikmatch-1.0.0-dynlink.patch - BuildRequires: ocaml >= 3.11.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -54,7 +52,6 @@ developing applications that use %{name} %prep %setup -q -n mikmatch-%{version} -%patch0 -p1 %build @@ -109,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 1.0.2-1 +- New upstream version 1.0.2. +- Removed dynlink patch (now upstream). + * Sat Jul 25 2009 Fedora Release Engineering - 1.0.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mikmatch/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 24 Aug 2008 09:51:37 -0000 1.2 +++ sources 8 Oct 2009 12:52:18 -0000 1.3 @@ -1 +1 @@ -39a649bfea0217880d3a343193b128c3 mikmatch-1.0.0.tar.bz2 +aa1846c37dd3bd20fbbe9e2b57d35bf2 mikmatch-1.0.2.tar.bz2 From rjones at fedoraproject.org Thu Oct 8 12:58:38 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 12:58:38 +0000 (UTC) Subject: rpms/ocaml-mikmatch/devel ocaml-mikmatch-1.0.0-dynlink.patch, 1.1, NONE Message-ID: <20091008125838.2EF1B11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mikmatch/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9146 Removed Files: ocaml-mikmatch-1.0.0-dynlink.patch Log Message: Remove dynlink patch from CVS. --- ocaml-mikmatch-1.0.0-dynlink.patch DELETED --- From rjones at fedoraproject.org Thu Oct 8 13:31:17 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 13:31:17 +0000 (UTC) Subject: rpms/ocaml-calendar/devel ocaml-calendar-2.01.1-META.patch, NONE, 1.1 ocaml-calendar.spec, 1.16, 1.17 Message-ID: <20091008133117.0EFCA11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-calendar/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18338 Modified Files: ocaml-calendar.spec Added Files: ocaml-calendar-2.01.1-META.patch Log Message: Patch META file so it doesn't include the library twice. ocaml-calendar-2.01.1-META.patch: Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE ocaml-calendar-2.01.1-META.patch --- --- calendar-2.01.1/Makefile.in.orig 2009-10-08 14:28:50.633555407 +0100 +++ calendar-2.01.1/Makefile.in 2009-10-08 14:29:07.767560374 +0100 @@ -114,8 +114,8 @@ META: Makefile echo "description = \"$(NAME) library\"" > $@ echo "version = \"$(VERSION)\"" >> $@ - echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@ - echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@ + echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@ + echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@ echo "requires = \"unix str\"" >> $@ # Generic rules Index: ocaml-calendar.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-calendar/devel/ocaml-calendar.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ocaml-calendar.spec 8 Oct 2009 11:58:23 -0000 1.16 +++ ocaml-calendar.spec 8 Oct 2009 13:31:16 -0000 1.17 @@ -3,7 +3,7 @@ Name: ocaml-calendar Version: 2.01.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Objective Caml library for managing dates and times Group: Development/Libraries @@ -17,6 +17,8 @@ BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc BuildRequires: gawk +Patch0: ocaml-calendar-2.01.1-META.patch + # Ignore all generated modules *except* CalendarLib, since everything # now appears in that namespace. %define _use_internal_dependency_generator 0 @@ -40,6 +42,7 @@ developing applications that use %{name} %prep %setup -q -n calendar-%{version} +%patch0 -p1 %build @@ -83,8 +86,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Oct 8 2009 Richard W.M. Jones - 2.01.1-1 +* Thu Oct 8 2009 Richard W.M. Jones - 2.01.1-2 - New upstream release 2.01.1. +- Patch META file so it doesn't include the library twice. * Sat Jul 25 2009 Fedora Release Engineering - 2.0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Thu Oct 8 13:33:39 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Thu, 8 Oct 2009 13:33:39 +0000 (UTC) Subject: rpms/ocaml-pgocaml/devel .cvsignore, 1.2, 1.3 ocaml-pgocaml.spec, 1.10, 1.11 sources, 1.2, 1.3 Message-ID: <20091008133339.E9EA711C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-pgocaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19026 Modified Files: .cvsignore ocaml-pgocaml.spec sources Log Message: * Thu Oct 8 2009 Richard W.M. Jones - 1.3-1 - New upstream version 1.3. - Simplify build system. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 12 May 2008 19:15:57 -0000 1.2 +++ .cvsignore 8 Oct 2009 13:33:39 -0000 1.3 @@ -1 +1 @@ -pgocaml-1.1.tar.gz +pgocaml-1.3.tgz Index: ocaml-pgocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/ocaml-pgocaml.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ocaml-pgocaml.spec 25 Jul 2009 20:03:21 -0000 1.10 +++ ocaml-pgocaml.spec 8 Oct 2009 13:33:39 -0000 1.11 @@ -2,14 +2,14 @@ %define debug_package %{nil} Name: ocaml-pgocaml -Version: 1.1 -Release: 10%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: OCaml library for type-safe access to PostgreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://developer.berlios.de/projects/pgocaml/ -Source0: http://download.berlios.de/pgocaml/pgocaml-%{version}.tar.gz +Source0: http://download.berlios.de/pgocaml/pgocaml-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -17,7 +17,7 @@ BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc BuildRequires: ocaml-extlib-devel BuildRequires: ocaml-pcre-devel, pcre-devel -BuildRequires: ocaml-calendar-devel >= 2.0.4 +BuildRequires: ocaml-calendar-devel >= 2.01.1-2 BuildRequires: ocaml-csv-devel BuildRequires: ocaml-camlp4-devel @@ -48,10 +48,8 @@ developing applications that use %{name} %build -# Don't build or run the test programs because that would need -# a live PostgreSQL database around. -make pGOCaml_config.ml pgocaml.cma pgocaml.cmxa pa_pgsql.cmo \ - pgocaml_prof META +make depend +make all make doc strip pgocaml_prof @@ -96,6 +94,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 8 2009 Richard W.M. Jones - 1.3-1 +- New upstream version 1.3. +- Simplify build system. + * Sat Jul 25 2009 Fedora Release Engineering - 1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-pgocaml/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 12 May 2008 19:15:57 -0000 1.2 +++ sources 8 Oct 2009 13:33:39 -0000 1.3 @@ -1 +1 @@ -e52d0f88b4ce850aa592a033c7e7b64d pgocaml-1.1.tar.gz +dcc98b672d684d7c4da8586a3671a4ac pgocaml-1.3.tgz From bugzilla at redhat.com Thu Oct 8 18:03:12 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 8 Oct 2009 14:03:12 -0400 Subject: [Bug 523547] virt-df doesn't pull correct dependencies In-Reply-To: References: Message-ID: <200910081803.n98I3CaF024082@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=523547 --- Comment #11 from Fedora Update System 2009-10-08 14:03:10 EDT --- libguestfs-1.0.70-2.el5 has been pushed to the Fedora EPEL 5 stable repository. If problems still persist, please make note of it in this bug report. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at fedoraproject.org Mon Oct 12 08:39:51 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 12 Oct 2009 08:39:51 +0000 (UTC) Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.8,1.9 Message-ID: <20091012083951.4EB2C11C00DB@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lwt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14846 Modified Files: ocaml-lwt.spec Log Message: ocaml-react is now in Fedora, so build this package. Index: ocaml-lwt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- ocaml-lwt.spec 8 Oct 2009 12:42:49 -0000 1.8 +++ ocaml-lwt.spec 12 Oct 2009 08:39:50 -0000 1.9 @@ -3,7 +3,7 @@ Name: ocaml-lwt Version: 2.0.0 -Release: 0.rc1%{?dist} +Release: 0.1.rc1%{?dist} Summary: OCaml lightweight thread library Group: Development/Libraries @@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 12 2009 Richard W.M. Jones - 2.0.0-0.1.rc1.fc13 +- ocaml-react is now in Fedora, so build this package. + * Thu Oct 8 2009 Richard W.M. Jones - 2.0.0-0.rc1.fc13 - New upstream version 2.0.0+rc1. - NB. This cannot be built as it depends on new package ocaml-react From rjones at fedoraproject.org Mon Oct 12 08:50:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 12 Oct 2009 08:50:06 +0000 (UTC) Subject: rpms/ocaml-lwt/devel ocaml-lwt.spec,1.9,1.10 Message-ID: <20091012085006.CAE4411C029E@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-lwt/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18815 Modified Files: ocaml-lwt.spec Log Message: Missing BR on camlp4. Index: ocaml-lwt.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-lwt/devel/ocaml-lwt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- ocaml-lwt.spec 12 Oct 2009 08:39:50 -0000 1.9 +++ ocaml-lwt.spec 12 Oct 2009 08:50:06 -0000 1.10 @@ -3,7 +3,7 @@ Name: ocaml-lwt Version: 2.0.0 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc1%{?dist} Summary: OCaml lightweight thread library Group: Development/Libraries @@ -16,6 +16,7 @@ ExcludeArch: sparc64 s390 s390x BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-ssl >= 0.4.0 BuildRequires: ocaml-react >= 0.9.0 BuildRequires: chrpath @@ -93,8 +94,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Oct 12 2009 Richard W.M. Jones - 2.0.0-0.1.rc1.fc13 +* Mon Oct 12 2009 Richard W.M. Jones - 2.0.0-0.2.rc1.fc13 - ocaml-react is now in Fedora, so build this package. +- Missing BR on camlp4. * Thu Oct 8 2009 Richard W.M. Jones - 2.0.0-0.rc1.fc13 - New upstream version 2.0.0+rc1. From rjones at redhat.com Mon Oct 12 12:06:40 2009 From: rjones at redhat.com (Richard W.M. Jones) Date: Mon, 12 Oct 2009 13:06:40 +0100 Subject: New OCaml packages needing review Message-ID: <20091012120640.GA8753@amd.home.annexia.org> https://bugzilla.redhat.com/show_bug.cgi?id=445068 ocaml-bin-prot - Read and write OCaml values in a type-safe binary protocol - Updated today to the latest upstream version. https://bugzilla.redhat.com/show_bug.cgi?id=528461 ocaml-fieldslib - OCaml library for folding over record fields - A brand new library / syntax extension from Jane St for performing multiple operations over records. https://bugzilla.redhat.com/show_bug.cgi?id=445074 ocaml-janest-core - Many and various enhancements to the OCaml standard library - Jane St released new upstream version 0.6.0 of their 'Core' library, with renewed emphasis on performance and consistency. https://bugzilla.redhat.com/show_bug.cgi?id=528454 ocaml-batteries - OCaml Batteries Included - OCaml "Batteries Included" is another contender for an enhanced standard library. Slides from this year's OCaml Users Conference are here: https://forge.ocamlcore.org/docman/view.php/77/36/batteries-included.pdf https://bugzilla.redhat.com/show_bug.cgi?id=487080 jocaml - Join-calculus extension of Objective Caml (This needs work from the package submitter) https://bugzilla.redhat.com/show_bug.cgi?id=526034 ocaml-xmlm - OCaml library for streaming XML input and output Slightly baffling library for parsing XML stream. TBH I couldn't work out how to use this one ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw From bugzilla at redhat.com Wed Oct 14 15:28:15 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Wed, 14 Oct 2009 11:28:15 -0400 Subject: [Bug 493799] [virt-top] Translations for Fedora 12 In-Reply-To: References: Message-ID: <200910141528.n9EFSFeX003963@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=493799 --- Comment #27 from daniel cabrera 2009-10-14 11:28:13 EDT --- Created an attachment (id=364767) --> (https://bugzilla.redhat.com/attachment.cgi?id=364767) Updated Spanish Translation -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Fri Oct 16 10:03:28 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 16 Oct 2009 06:03:28 -0400 Subject: [Bug 509531] CVE-2009-2295 ocaml-camlimages: PNG reader multiple integer overflows (oCERT-2009-009) In-Reply-To: References: Message-ID: <200910161003.n9GA3SJw001270@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=509531 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|MODIFIED |CLOSED Resolution| |RAWHIDE --- Comment #18 from Richard W.M. Jones 2009-10-16 06:03:26 EDT --- Long fixed ... Closing. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Thu Oct 22 01:33:37 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Wed, 21 Oct 2009 21:33:37 -0400 Subject: [Bug 530254] New: Package mime-type information for Coq files Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Package mime-type information for Coq files https://bugzilla.redhat.com/show_bug.cgi?id=530254 Summary: Package mime-type information for Coq files Product: Fedora Version: 11 Platform: All OS/Version: Linux Status: NEW Severity: low Priority: low Component: coq AssignedTo: amdunn at gmail.com ReportedBy: matt at mattmccutchen.net QAContact: extras-qa at fedoraproject.org CC: amdunn at gmail.com, fedora-ocaml-list at redhat.com Classification: Fedora Created an attachment (id=365637) --> (https://bugzilla.redhat.com/attachment.cgi?id=365637) Draft mime-type information Description of problem: It might be nice to package some mime-type information for Coq files as a step toward making them xdg-openable in coqide or Proof General. Version-Release number of selected component (if applicable): coq-8.2-1.fc11.x86_64 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Thu Oct 22 08:03:23 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 22 Oct 2009 04:03:23 -0400 Subject: [Bug 530254] Package mime-type information for Coq files In-Reply-To: References: Message-ID: <200910220803.n9M83NMk032763@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=530254 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |rjones at redhat.com --- Comment #1 from Richard W.M. Jones 2009-10-22 04:03:21 EDT --- I have no idea what this involves though. Should the bug be assigned to another package in Fedora or to some upstream project? -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Thu Oct 22 14:31:38 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 22 Oct 2009 10:31:38 -0400 Subject: [Bug 530254] Package mime-type information for Coq files In-Reply-To: References: Message-ID: <200910221431.n9MEVc5n029847@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=530254 --- Comment #2 from Matt McCutchen 2009-10-22 10:31:36 EDT --- The mime types could be in either the Coq package or the main "freedesktop.org.xml" catalog in the shared-mime-info package. I was leaning toward putting them in the Coq package since they seem so specialized. Under that assumption, since the upstream Coq project doesn't provide any desktop integration, I thought it would be appropriate to add the mime types in Fedora. If the mime types are to go in "freedesktop.org.xml", that just requires entering a freedesktop bug. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Thu Oct 22 22:03:48 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Thu, 22 Oct 2009 18:03:48 -0400 Subject: [Bug 521324] cil.mli is missing from ocaml-cil-devel In-Reply-To: References: Message-ID: <200910222203.n9MM3mZH019771@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=521324 --- Comment #1 from Jerry James 2009-10-22 18:03:47 EDT --- I took another look at this today, because I finally got my CIL-consuming app working on F-12 and it would be nice to have it buildable on F-11. I noticed that a number of files are byte-compiled only; there is no native version. Invoking: make RELEASE=1 fixes that. But that didn't solve the problem of the missing cil.mli. It turns out that NONE of the *.mli files in src are copied over to obj/$archos by the build rules. It should be sufficient to change the ocamlfind invocation in %install to this: ocamlfind install cil META obj/$archos/*.{ml,mli,cmi,cmo,cmx,cma,cmxa,o,a} src/*.mli -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Fri Oct 23 08:19:27 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 23 Oct 2009 04:19:27 -0400 Subject: [Bug 521324] cil.mli is missing from ocaml-cil-devel In-Reply-To: References: Message-ID: <200910230819.n9N8JRLg031380@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=521324 --- Comment #2 from Richard W.M. Jones 2009-10-23 04:19:26 EDT --- For some reason I didn't see this bug before now. I'll try the fixes you suggest now. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Fri Oct 23 08:29:07 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 23 Oct 2009 04:29:07 -0400 Subject: [Bug 521324] cil.mli is missing from ocaml-cil-devel In-Reply-To: References: Message-ID: <200910230829.n9N8T79X000953@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=521324 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |RAWHIDE --- Comment #3 from Richard W.M. Jones 2009-10-23 04:28:59 EDT --- I made the suggested changes in the new F13 build here: http://koji.fedoraproject.org/koji/taskinfo?taskID=1764205 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Fri Oct 23 15:27:02 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Fri, 23 Oct 2009 11:27:02 -0400 Subject: [Bug 521324] cil.mli is missing from ocaml-cil-devel In-Reply-To: References: Message-ID: <200910231527.n9NFR2Et027770@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=521324 --- Comment #4 from Jerry James 2009-10-23 11:27:01 EDT --- I seem to be suffering from some kind of version hysteria. I see that I reported this bug against Rawhide and listed an f12 RPM in the version (before the F-13 split), but I'm not actually seeing the problem on F-12 currently. I AM seeing it on F-11, hence the remark about F-11 in comment 1. I also see that the version of CIL in F-11 is 1.3.6, so maybe upstream did something to address this issue in 1.3.7. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 14:41:30 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 10:41:30 -0400 Subject: [Bug 531019] New: Wrong dependency for cduce Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: Wrong dependency for cduce https://bugzilla.redhat.com/show_bug.cgi?id=531019 Summary: Wrong dependency for cduce Product: Fedora Version: 11 Platform: All OS/Version: Linux Status: NEW Severity: high Priority: low Component: cduce AssignedTo: rjones at redhat.com ReportedBy: gc at pps.jussieu.fr QAContact: extras-qa at fedoraproject.org CC: rjones at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora Description of problem: The cduce binary in the distribution (i586) is compiled for libcurl.so.3 while the package libcurl-7.19.6-1.fc11.i586 provides libcurl.so.4 Version-Release number of selected component (if applicable): cduce-0.5.2.1-14 How reproducible: Call cduce toplevel and you obtain cduce: error while loading shared libraries: libcurl.so.3: cannot open shared object file: No such file or directory Additional info: cduce 0.5.3 is out -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:00:26 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:00:26 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261700.n9QH0QR1024300@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED --- Comment #1 from Richard W.M. Jones 2009-10-26 13:00:25 EDT --- Hi Giuseppe, are you sure this is Fedora 11? It's working for me over here. I'm glad to see that cduce 0.5.3 is out. I will package this soon, and then hopefully any dependency problem will be resolved at the same time. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:02:30 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:02:30 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261702.n9QH2UNV020133@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Flag| |needinfo?(gc at pps.jussieu.fr | |) --- Comment #2 from Richard W.M. Jones 2009-10-26 13:02:29 EDT --- Hang about, ignore comment 1, that was me being very confused :-) So we have cduce 0.5.3 in Fedora 12 and above. See: http://cocan.org/fedora Our policy is that we wouldn't normally backport packages to older versions of cduce, unless someone specifically requested it. If that is your request, then please let me know by making a comment to that effect here. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:04:07 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:04:07 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261704.n9QH47iL025159@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #3 from Richard W.M. Jones 2009-10-26 13:04:06 EDT --- (In reply to comment #2) > Our policy is that we wouldn't normally backport packages > to older versions of cduce, It's been a long day. That should say "to older versions of Fedora". -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:28:48 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:28:48 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261728.n9QHSmxu032282@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 NOREPLY changed: What |Removed |Added ---------------------------------------------------------------------------- Flag|needinfo?(gc at pps.jussieu.fr | |) | --- Comment #4 from NOREPLY 2009-10-26 13:28:47 EDT --- Hi Richard, did I messed things up once more? Possible since I just discovered this "bug" by hazard, insofar as I always use an home-brewed version of Cduce. So if it is my mistake I apologize: from your soliloquy above I understand you are pretty busy aren't you? :-) That said, yes it is Fedora 11: [beppe at fragola]$ uname -a Linux fragola 2.6.30.8-64.fc11.i586 #1 SMP Fri Sep 25 04:30:19 EDT 2009 i686 i686 i386 GNU/Linux I tried to remove cduce and cduce-devel and reinstall them by yum so as to be sure to have the lastest package of the distribution and I still obtain the same error. [beppe at fragola]$ cduce cduce: error while loading shared libraries: libcurl.so.3: cannot open shared object file: No such file or directory I did the same with curl and libcurl [beppe at fragola]$ sudo rpm -e --nodeps libcurl curl && sudo yum install libcurl curl and obtained the same result. What else can I check? BTW I did not try rawhide since the consequence of yum update --enablerepo=rawhide cduce cduce-devel is to update half of the distribution. But on Fedora 10 everything works fine (version 0.5.2 of cduce) -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:36:31 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:36:31 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261736.n9QHaV1E001561@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #5 from NOREPLY 2009-10-26 13:36:30 EDT --- Specifically, to your request (In reply to comment #2) > Our policy is that we wouldn't normally backport packages > to older versions of cduce, unless someone specifically > requested it. > > If that is your request, then please let me know by > making a comment to that effect here. As long as I know Fedora 11 is not an "old" version of Fedora, but the current one (or did it become "old" as soon as the 12 beta version became available?) :-) No I do not request to have the 0.5.3 in F11, since differences are minor bugfixes: there are much bigger differences soon to come especially in connection with ocsigen. However it would be nice to have a package that actually works (unless it was my mistake) being it the 0.5.2 or 0.5.3. I'll continue to investigate the issue. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 17:46:38 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 13:46:38 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261746.n9QHkcv3031599@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #6 from Richard W.M. Jones 2009-10-26 13:46:37 EDT --- OK ... "old" just means not the development version. I'll fix this in F11 anyway with a rebuild. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 18:09:48 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 14:09:48 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261809.n9QI9m5P010489@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #7 from Richard W.M. Jones 2009-10-26 14:09:47 EDT --- (In reply to comment #4) > [beppe at fragola]$ cduce > cduce: error while loading shared libraries: libcurl.so.3: cannot open shared > object file: No such file or directory This error is somewhat odd, because I don't even see cduce depending at all on libcurl. For me: $ ldd * cduce: linux-gate.so.1 => (0x003e2000) librt.so.1 => /lib/librt.so.1 (0x00f1c000) libpcre.so.0 => /lib/libpcre.so.0 (0x00773000) libm.so.6 => /lib/libm.so.6 (0x005e5000) libdl.so.2 => /lib/libdl.so.2 (0x00c4f000) libc.so.6 => /lib/libc.so.6 (0x00110000) libpthread.so.0 => /lib/libpthread.so.0 (0x00d85000) /lib/ld-linux.so.2 (0x002b7000) cduce_mktop: not a dynamic executable dtd2cduce: linux-gate.so.1 => (0x008fe000) librt.so.1 => /lib/librt.so.1 (0x0031d000) libpcre.so.0 => /lib/libpcre.so.0 (0x006d8000) libm.so.6 => /lib/libm.so.6 (0x0024c000) libdl.so.2 => /lib/libdl.so.2 (0x001e6000) libc.so.6 => /lib/libc.so.6 (0x00951000) libpthread.so.0 => /lib/libpthread.so.0 (0x00fad000) /lib/ld-linux.so.2 (0x00627000) In any case, please try the updated packages (see following comments). -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 18:10:39 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 14:10:39 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261810.n9QIAd02006151@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #8 from Fedora Update System 2009-10-26 14:10:38 EDT --- cduce-0.5.2.1-14.fc11.2 has been submitted as an update for Fedora 11. http://admin.fedoraproject.org/updates/cduce-0.5.2.1-14.fc11.2 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Mon Oct 26 19:41:37 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Mon, 26 Oct 2009 15:41:37 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910261941.n9QJfbSB032015@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 NOREPLY changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |CLOSED Resolution| |NOTABUG --- Comment #9 from NOREPLY 2009-10-26 15:41:36 EDT --- I just tried cduce on a clean install of F11 ... it works. So I deduce that the problem is just local to me. Probably some interference with something I installed to develop CDuce. Sorry for bothering, I should have tried it before posting the bug but wow, it was huge to do it. I closed the bug. Do you want me to try the new package anyway? ---Beppe--- -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 08:42:56 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 04:42:56 -0400 Subject: [Bug 531019] Wrong dependency for cduce In-Reply-To: References: Message-ID: <200910270842.n9R8gupd023416@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531019 --- Comment #10 from Richard W.M. Jones 2009-10-27 04:42:55 EDT --- It's fine, you don't need to try the new package. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 09:58:50 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 05:58:50 -0400 Subject: [Bug 531204] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910270958.n9R9woJf011306@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531204 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|gemi at bluewin.ch |rjones at redhat.com -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 09:58:30 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 05:58:30 -0400 Subject: [Bug 531204] New: ocaml-docs doesn't install info files because using wrong args to install-info Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: ocaml-docs doesn't install info files because using wrong args to install-info https://bugzilla.redhat.com/show_bug.cgi?id=531204 Summary: ocaml-docs doesn't install info files because using wrong args to install-info Product: Fedora Version: rawhide Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: ocaml AssignedTo: gemi at bluewin.ch ReportedBy: rjones at redhat.com QAContact: extras-qa at fedoraproject.org CC: gemi at bluewin.ch, rjones at redhat.com, fedora-ocaml-list at redhat.com Classification: Fedora Target Release: --- Description of problem: Although ocaml-docs comes with info files, these are never installed because we call /sbin/install-info with old-style Debian args, and install-info doesn't really work properly when you use those. Version-Release number of selected component (if applicable): ocaml-docs-3.11.1-4.fc13.x86_64 and all previous versions How reproducible: Always. Steps to Reproduce: 1. Install ocaml. 2. Run 'info' or 'info ocaml' 3. Actual results: When running 'info' you'll see the OCaml page is missing from the info directory. When running 'info ocaml' you'll see the man page which is the info fallback position when it thinks that there is no info file installed. Expected results: Should show real OCaml info page. Should be in directory. Additional info: The correct parameters which install ocaml.info are: /sbin/install-info --entry="* ocaml: (ocaml). The Objective Caml compiler and programming environment" --section="Programming" /usr/share/info/ocaml.info /usr/share/info/dir -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:04:03 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:04:03 -0400 Subject: [Bug 531204] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271004.n9RA43Pl005977@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531204 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |531206 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:06:10 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:06:10 -0400 Subject: [Bug 531204] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271006.n9RA6ATQ006765@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531204 --- Comment #1 from Richard W.M. Jones 2009-10-27 06:06:09 EDT --- Build: http://koji.fedoraproject.org/koji/taskinfo?taskID=1771902 -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:04:02 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:04:02 -0400 Subject: [Bug 531206] New: ocaml-docs doesn't install info files because using wrong args to install-info Message-ID: Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. Summary: ocaml-docs doesn't install info files because using wrong args to install-info https://bugzilla.redhat.com/show_bug.cgi?id=531206 Summary: ocaml-docs doesn't install info files because using wrong args to install-info Product: Red Hat Enterprise Linux 6 Version: 6.0 Platform: All OS/Version: Linux Status: NEW Severity: medium Priority: low Component: ocaml AssignedTo: rjones at redhat.com ReportedBy: rjones at redhat.com CC: gemi at bluewin.ch, rjones at redhat.com, fedora-ocaml-list at redhat.com Depends on: 531204 Classification: Red Hat Target Release: --- Clone Of: 531204 +++ This bug was initially created as a clone of Bug #531204 +++ Description of problem: Although ocaml-docs comes with info files, these are never installed because we call /sbin/install-info with old-style Debian args, and install-info doesn't really work properly when you use those. Version-Release number of selected component (if applicable): ocaml-docs-3.11.1-4.fc13.x86_64 and all previous versions How reproducible: Always. Steps to Reproduce: 1. Install ocaml. 2. Run 'info' or 'info ocaml' 3. Actual results: When running 'info' you'll see the OCaml page is missing from the info directory. When running 'info ocaml' you'll see the man page which is the info fallback position when it thinks that there is no info file installed. Expected results: Should show real OCaml info page. Should be in directory. Additional info: The correct parameters which install ocaml.info are: /sbin/install-info --entry="* ocaml: (ocaml). The Objective Caml compiler and programming environment" --section="Programming" /usr/share/info/ocaml.info /usr/share/info/dir -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:23:33 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:23:33 -0400 Subject: [Bug 531204] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271023.n9RANX1b017286@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531204 Richard W.M. Jones changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |RAWHIDE -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:24:20 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:24:20 -0400 Subject: [Bug 531206] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271024.n9RAOKpu017395@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531206 --- Comment #3 from RHEL Product and Program Management 2009-10-27 06:24:20 EDT --- This request was evaluated by Red Hat Product Management for inclusion in a Red Hat Enterprise Linux major release. Product Management has requested further review of this request by Red Hat Engineering, for potential inclusion in a Red Hat Enterprise Linux Major release. This request is not yet committed for inclusion. -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:23:34 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:23:34 -0400 Subject: [Bug 531206] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271023.n9RANYu3017294@bz-web1.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531206 Bug 531206 depends on bug 531204, which changed state. Bug 531204 Summary: ocaml-docs doesn't install info files because using wrong args to install-info https://bugzilla.redhat.com/show_bug.cgi?id=531204 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |CLOSED Resolution| |RAWHIDE -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From bugzilla at redhat.com Tue Oct 27 10:24:12 2009 From: bugzilla at redhat.com (bugzilla at redhat.com) Date: Tue, 27 Oct 2009 06:24:12 -0400 Subject: [Bug 531206] ocaml-docs doesn't install info files because using wrong args to install-info In-Reply-To: References: Message-ID: <200910271024.n9RAOCMc010205@bz-web2.app.phx.redhat.com> Please do not reply directly to this email. All additional comments should be made in the comments box of this bug. https://bugzilla.redhat.com/show_bug.cgi?id=531206 --- Comment #2 from Richard W.M. Jones 2009-10-27 06:24:12 EDT --- The fix for this is a very trivial change to the spec file, which I've verified correct in Fedora: http://cvs.fedoraproject.org/viewvc/devel/ocaml/ocaml.spec?r1=1.61&r2=1.62 Do I need to get ACKs at this stage before I make changes to RHEL 6 packages? -- Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. From rjones at fedoraproject.org Fri Oct 16 09:30:33 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:30:33 -0000 Subject: rpms/ocaml-camlimages/devel camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 ocaml-camlimages.spec, 1.20, 1.21 Message-ID: <20091016093028.231FA11C0296@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4505 Modified Files: ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-3.0.1.old/src/tiffread.c 2007-01-18 10:29:57.000000000 +0000 +++ camlimages-3.0.1/src/tiffread.c 2009-10-16 10:26:53.841258260 +0100 @@ -21,6 +21,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + /* These are defined in caml/config.h */ #define int16 int16tiff #define uint16 uint16tiff @@ -64,6 +71,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- ocaml-camlimages.spec 29 Sep 2009 15:13:31 -0000 1.20 +++ ocaml-camlimages.spec 16 Oct 2009 09:30:27 -0000 1.21 @@ -4,7 +4,7 @@ Name: ocaml-camlimages Version: 3.0.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -20,6 +20,9 @@ Patch0: camlimages-3.0.1-display # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-x11 @@ -67,6 +70,7 @@ Includes documentation provided by ocaml # the examples/liv directory, so rename it: %patch0 -p1 %patch1 -p1 +%patch2 -p1 aclocal -I . automake autoconf @@ -112,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-13 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Tue Sep 29 2009 Richard W.M. Jones - 3.0.1-12 - Force rebuild against newer lablgtk. From rjones at fedoraproject.org Fri Oct 16 09:31:35 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:31:35 -0000 Subject: rpms/ocaml-camlimages/devel ocaml-camlimages.spec,1.21,1.22 Message-ID: <20091016093131.1E46111C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4858 Modified Files: ocaml-camlimages.spec Log Message: Force rebuild. Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- ocaml-camlimages.spec 16 Oct 2009 09:30:27 -0000 1.21 +++ ocaml-camlimages.spec 16 Oct 2009 09:31:31 -0000 1.22 @@ -4,7 +4,7 @@ Name: ocaml-camlimages Version: 3.0.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -116,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-13 +* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-14 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). From rjones at fedoraproject.org Fri Oct 16 09:33:46 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:33:46 -0000 Subject: rpms/ocaml-camlimages/F-12 camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 ocaml-camlimages.spec, 1.20, 1.21 Message-ID: <20091016093342.6157C11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5530 Modified Files: ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-12.fc12.1 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-3.0.1.old/src/tiffread.c 2007-01-18 10:29:57.000000000 +0000 +++ camlimages-3.0.1/src/tiffread.c 2009-10-16 10:26:53.841258260 +0100 @@ -21,6 +21,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + /* These are defined in caml/config.h */ #define int16 int16tiff #define uint16 uint16tiff @@ -64,6 +71,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-12/ocaml-camlimages.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- ocaml-camlimages.spec 29 Sep 2009 15:12:40 -0000 1.20 +++ ocaml-camlimages.spec 16 Oct 2009 09:33:42 -0000 1.21 @@ -4,7 +4,7 @@ Name: ocaml-camlimages Version: 3.0.1 -Release: 12%{?dist} +Release: 12%{?dist}.1 Summary: OCaml image processing library Group: Development/Libraries @@ -20,6 +20,9 @@ Patch0: camlimages-3.0.1-display # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-x11 @@ -67,6 +70,7 @@ Includes documentation provided by ocaml # the examples/liv directory, so rename it: %patch0 -p1 %patch1 -p1 +%patch2 -p1 aclocal -I . automake autoconf @@ -112,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-12.fc12.1 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Tue Sep 29 2009 Richard W.M. Jones - 3.0.1-12 - Force rebuild against newer lablgtk. From rjones at fedoraproject.org Fri Oct 16 09:36:28 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:36:28 -0000 Subject: rpms/ocaml-camlimages/F-11 camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 ocaml-camlimages.spec, 1.16, 1.17 Message-ID: <20091016093624.3827411C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12043 Modified Files: ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-7.fc11.3 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-3.0.1.old/src/tiffread.c 2007-01-18 10:29:57.000000000 +0000 +++ camlimages-3.0.1/src/tiffread.c 2009-10-16 10:26:53.841258260 +0100 @@ -21,6 +21,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + /* These are defined in caml/config.h */ #define int16 int16tiff #define uint16 uint16tiff @@ -64,6 +71,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-11/ocaml-camlimages.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ocaml-camlimages.spec 3 Jul 2009 18:30:05 -0000 1.16 +++ ocaml-camlimages.spec 16 Oct 2009 09:36:24 -0000 1.17 @@ -4,7 +4,7 @@ Name: ocaml-camlimages Version: 3.0.1 -Release: 7%{?dist}.2 +Release: 7%{?dist}.3 Summary: OCaml image processing library Group: Development/Libraries @@ -19,6 +19,9 @@ Patch0: camlimages-3.0.1-display # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-x11 @@ -66,6 +69,7 @@ Includes documentation provided by ocaml # the examples/liv directory, so rename it: %patch0 -p1 %patch1 -p1 +%patch2 -p1 aclocal -I . automake autoconf @@ -111,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-7.fc11.3 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Fri Jul 3 2009 Richard W.M. Jones - 3.0.1-7.fc11.2 - ocaml-camlimages: PNG reader multiple integer overflows (CVE 2009-2295 / RHBZ#509531). From rjones at fedoraproject.org Fri Oct 16 09:39:30 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:39:30 -0000 Subject: rpms/ocaml-camlimages/F-10 camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 ocaml-camlimages.spec, 1.12, 1.13 Message-ID: <20091016093925.E0DFD11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28679 Modified Files: ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-3.fc10.3 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-3.0.1.old/src/tiffread.c 2007-01-18 10:29:57.000000000 +0000 +++ camlimages-3.0.1/src/tiffread.c 2009-10-16 10:26:53.841258260 +0100 @@ -21,6 +21,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + /* These are defined in caml/config.h */ #define int16 int16tiff #define uint16 uint16tiff @@ -64,6 +71,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/F-10/ocaml-camlimages.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- ocaml-camlimages.spec 3 Jul 2009 18:30:05 -0000 1.12 +++ ocaml-camlimages.spec 16 Oct 2009 09:39:25 -0000 1.13 @@ -4,7 +4,7 @@ Name: ocaml-camlimages Version: 3.0.1 -Release: 3%{?dist}.2 +Release: 3%{?dist}.3 Summary: OCaml image processing library Group: Development/Libraries @@ -19,6 +19,9 @@ Patch0: camlimages-3.0.1-display # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRequires: ocaml >= 3.10.1 BuildRequires: ocaml-lablgtk-devel BuildRequires: ocaml-x11 @@ -66,6 +69,7 @@ Includes documentation provided by ocaml # the examples/liv directory, so rename it: %patch0 -p1 %patch1 -p1 +%patch2 -p1 aclocal -I . automake autoconf @@ -111,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.0.1-3.fc10.3 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Fri Jul 3 2009 Richard W.M. Jones - 3.0.1-3.fc10.2 - ocaml-camlimages: PNG reader multiple integer overflows (CVE 2009-2295 / RHBZ#509531). From rjones at fedoraproject.org Fri Oct 16 09:50:13 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:50:13 -0000 Subject: rpms/ocaml-camlimages/EL-5 camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 camlimages-oversized-png-check-CVE-2009-2295.patch, 1.2, 1.3 ocaml-camlimages.spec, 1.4, 1.5 Message-ID: <20091016094959.B014211C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22975 Modified Files: camlimages-oversized-png-check-CVE-2009-2295.patch ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-11 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-2.2.orig/tiff/tiffread.c 2004-09-21 22:56:44.000000000 +0100 +++ camlimages-2.2.tiff/tiff/tiffread.c 2009-10-16 10:47:32.515257997 +0100 @@ -18,6 +18,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + #if HAVE_TIFF /* These are defined in caml/config.h */ @@ -68,6 +75,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); @@ -156,6 +167,11 @@ TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &runit); TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres); TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); + + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample != 3 || imagebits != 8 ) { failwith("tiff file is not in the 24 bit RGB format"); } camlimages-oversized-png-check-CVE-2009-2295.patch: pngread.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) Index: camlimages-oversized-png-check-CVE-2009-2295.patch =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/camlimages-oversized-png-check-CVE-2009-2295.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- camlimages-oversized-png-check-CVE-2009-2295.patch 3 Jul 2009 18:28:47 -0000 1.2 +++ camlimages-oversized-png-check-CVE-2009-2295.patch 16 Oct 2009 09:49:59 -0000 1.3 @@ -1,28 +1,28 @@ ---- camlimages-3.0.1.orig/src/pngread.c 2007-01-18 10:29:57.000000000 +0000 -+++ camlimages-3.0.1.oversized/src/pngread.c 2009-07-03 15:51:00.000000000 +0100 -@@ -15,6 +15,8 @@ - #include "config.h" - #endif +--- camlimages-2.2.orig/png/pngread.c 2002-03-26 13:15:10.000000000 +0000 ++++ camlimages-2.2.png/png/pngread.c 2009-10-16 10:46:07.759508515 +0100 +@@ -13,6 +13,8 @@ + /***********************************************************************/ + #include +#include + + #if HAVE_PNG #include - - #include -@@ -26,6 +28,12 @@ + #endif +@@ -33,6 +35,12 @@ #define PNG_TAG_INDEX16 2 #define PNG_TAG_INDEX4 3 +/* Test if x or y are negative, or if multiplying x * y would cause an + * arithmetic overflow. + */ -+#define oversized(x, y) \ ++#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + value read_png_file_as_rgb24( name ) value name; { -@@ -81,6 +89,9 @@ +@@ -88,6 +96,9 @@ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); @@ -32,7 +32,7 @@ if ( color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { png_set_gray_to_rgb(png_ptr); -@@ -102,10 +113,16 @@ +@@ -109,10 +120,16 @@ rowbytes = png_get_rowbytes(png_ptr, info_ptr); @@ -49,7 +49,7 @@ row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height); res = alloc_tuple(3); -@@ -235,6 +252,9 @@ +@@ -242,6 +259,9 @@ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); @@ -59,7 +59,7 @@ if ( color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { png_set_gray_to_rgb(png_ptr); -@@ -251,6 +271,9 @@ +@@ -258,6 +278,9 @@ rowbytes = png_get_rowbytes(png_ptr, info_ptr); @@ -69,10 +69,12 @@ /* fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr); */ -@@ -259,6 +282,9 @@ +@@ -265,7 +288,10 @@ + int i; png_bytep *row_pointers; char mesg[256]; - +- ++ + if (oversized (sizeof (png_bytep), height)) + failwith ("png error: image contains oversized or bogus height"); + Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/ocaml-camlimages.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- ocaml-camlimages.spec 3 Jul 2009 14:06:49 -0000 1.4 +++ ocaml-camlimages.spec 16 Oct 2009 09:49:59 -0000 1.5 @@ -1,6 +1,6 @@ Name: ocaml-camlimages Version: 2.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -13,6 +13,9 @@ Patch0: camlimages-2.2.0-stubdes # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml-lablgtk libpng-devel libjpeg-devel ocaml @@ -45,10 +48,8 @@ Includes documentation provided by ocaml %prep %setup -q -n camlimages-2.2 -a 1 %patch0 -p1 - -pushd png -%patch1 -p2 -popd +%patch1 -p1 +%patch2 -p1 sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in @@ -79,6 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-11 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Fri Jul 3 2009 Richard W.M. Jones - 2.2.0-10 - ocaml-camlimages: PNG reader multiple integer overflows (CVE 2009-2295 / RHBZ#509531). From rjones at fedoraproject.org Fri Oct 16 09:52:12 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:52:12 -0000 Subject: rpms/ocaml-camlimages/EL-4 camlimages-oversized-tiff-check-CVE-2009-3296.patch, NONE, 1.1 camlimages-oversized-png-check-CVE-2009-2295.patch, 1.2, 1.3 ocaml-camlimages.spec, 1.3, 1.4 Message-ID: <20091016095158.2CC1C11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3755 Modified Files: camlimages-oversized-png-check-CVE-2009-2295.patch ocaml-camlimages.spec Added Files: camlimages-oversized-tiff-check-CVE-2009-3296.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-9 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). camlimages-oversized-tiff-check-CVE-2009-3296.patch: tiffread.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) --- NEW FILE camlimages-oversized-tiff-check-CVE-2009-3296.patch --- --- camlimages-2.2.orig/tiff/tiffread.c 2004-09-21 22:56:44.000000000 +0100 +++ camlimages-2.2.tiff/tiff/tiffread.c 2009-10-16 10:47:32.515257997 +0100 @@ -18,6 +18,13 @@ #include #include +#include +#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + +#define failwith_oversized(lib) \ + failwith("#lib error: image contains oversized or bogus width and height"); + #if HAVE_TIFF /* These are defined in caml/config.h */ @@ -68,6 +75,10 @@ TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric); + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){ if( imagebits != 8 ){ failwith("Sorry, tiff rgb file must be 24bit-color"); @@ -156,6 +167,11 @@ TIFFGetField(tif, TIFFTAG_RESOLUTIONUNIT, &runit); TIFFGetField(tif, TIFFTAG_XRESOLUTION, &xres); TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres); + + if (oversized (imagewidth, imagelength)) { + failwith_oversized("tiff"); + } + if( imagesample != 3 || imagebits != 8 ) { failwith("tiff file is not in the 24 bit RGB format"); } camlimages-oversized-png-check-CVE-2009-2295.patch: pngread.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) Index: camlimages-oversized-png-check-CVE-2009-2295.patch =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/camlimages-oversized-png-check-CVE-2009-2295.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- camlimages-oversized-png-check-CVE-2009-2295.patch 3 Jul 2009 18:28:47 -0000 1.2 +++ camlimages-oversized-png-check-CVE-2009-2295.patch 16 Oct 2009 09:51:57 -0000 1.3 @@ -1,28 +1,28 @@ ---- camlimages-3.0.1.orig/src/pngread.c 2007-01-18 10:29:57.000000000 +0000 -+++ camlimages-3.0.1.oversized/src/pngread.c 2009-07-03 15:51:00.000000000 +0100 -@@ -15,6 +15,8 @@ - #include "config.h" - #endif +--- camlimages-2.2.orig/png/pngread.c 2002-03-26 13:15:10.000000000 +0000 ++++ camlimages-2.2.png/png/pngread.c 2009-10-16 10:46:07.759508515 +0100 +@@ -13,6 +13,8 @@ + /***********************************************************************/ + #include +#include + + #if HAVE_PNG #include - - #include -@@ -26,6 +28,12 @@ + #endif +@@ -33,6 +35,12 @@ #define PNG_TAG_INDEX16 2 #define PNG_TAG_INDEX4 3 +/* Test if x or y are negative, or if multiplying x * y would cause an + * arithmetic overflow. + */ -+#define oversized(x, y) \ ++#define oversized(x, y) \ + ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y))) + value read_png_file_as_rgb24( name ) value name; { -@@ -81,6 +89,9 @@ +@@ -88,6 +96,9 @@ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); @@ -32,7 +32,7 @@ if ( color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { png_set_gray_to_rgb(png_ptr); -@@ -102,10 +113,16 @@ +@@ -109,10 +120,16 @@ rowbytes = png_get_rowbytes(png_ptr, info_ptr); @@ -49,7 +49,7 @@ row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height); res = alloc_tuple(3); -@@ -235,6 +252,9 @@ +@@ -242,6 +259,9 @@ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); @@ -59,7 +59,7 @@ if ( color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { png_set_gray_to_rgb(png_ptr); -@@ -251,6 +271,9 @@ +@@ -258,6 +278,9 @@ rowbytes = png_get_rowbytes(png_ptr, info_ptr); @@ -69,10 +69,12 @@ /* fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr); */ -@@ -259,6 +282,9 @@ +@@ -265,7 +288,10 @@ + int i; png_bytep *row_pointers; char mesg[256]; - +- ++ + if (oversized (sizeof (png_bytep), height)) + failwith ("png error: image contains oversized or bogus height"); + Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/ocaml-camlimages.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- ocaml-camlimages.spec 3 Jul 2009 13:59:36 -0000 1.3 +++ ocaml-camlimages.spec 16 Oct 2009 09:51:57 -0000 1.4 @@ -13,6 +13,9 @@ Patch0: camlimages-2.2.0-stubdes # https://bugzilla.redhat.com/show_bug.cgi?id=509531#c4 Patch1: camlimages-oversized-png-check-CVE-2009-2295.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=528732 +Patch2: camlimages-oversized-tiff-check-CVE-2009-3296.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Excluding on ppc64 due to missing dependencies (Bug #239518) @@ -48,10 +51,8 @@ Includes documentation provided by ocaml %prep %setup -q -n camlimages-2.2 -a 1 %patch0 -p1 - -pushd png -%patch1 -p2 -popd +%patch1 -p1 +%patch2 -p1 sed -i -e 's|LIBRARYDIRS=ppm bmp xvthumb jpeg tiff gif png xpm ps graphics freetype|LIBRARYDIRS=%buildlibs|' Makefile.build.in @@ -82,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-9 +- ocaml-camlimages: TIFF reader multiple integer overflows + (CVE 2009-3296 / RHBZ#528732). + * Fri Jul 3 2009 Richard W.M. Jones - 2.2.0-8 - ocaml-camlimages: PNG reader multiple integer overflows (CVE 2009-2295 / RHBZ#509531). From rjones at fedoraproject.org Fri Oct 16 09:52:28 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:52:28 -0000 Subject: rpms/ocaml-camlimages/EL-4 ocaml-camlimages.spec,1.4,1.5 Message-ID: <20091016095224.1226411C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-4 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6665 Modified Files: ocaml-camlimages.spec Log Message: Force rebuild. Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-4/ocaml-camlimages.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- ocaml-camlimages.spec 16 Oct 2009 09:51:57 -0000 1.4 +++ ocaml-camlimages.spec 16 Oct 2009 09:52:23 -0000 1.5 @@ -1,6 +1,6 @@ Name: ocaml-camlimages Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-9 +* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-10 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). From rjones at fedoraproject.org Fri Oct 16 09:56:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 09:56:45 -0000 Subject: rpms/ocaml-camlimages/EL-5 ocaml-camlimages.spec,1.5,1.6 Message-ID: <20091016095641.B7A6C11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-camlimages/EL-5 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30231 Modified Files: ocaml-camlimages.spec Log Message: - Changed dep back to 'lablgtk' so this can build. Index: ocaml-camlimages.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-camlimages/EL-5/ocaml-camlimages.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- ocaml-camlimages.spec 16 Oct 2009 09:49:59 -0000 1.5 +++ ocaml-camlimages.spec 16 Oct 2009 09:56:41 -0000 1.6 @@ -1,6 +1,6 @@ Name: ocaml-camlimages Version: 2.2.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: OCaml image processing library Group: Development/Libraries @@ -18,7 +18,7 @@ Patch2: camlimages-oversized-tif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml-lablgtk libpng-devel libjpeg-devel ocaml +BuildRequires: lablgtk libpng-devel libjpeg-devel ocaml BuildRequires: libXpm-devel ghostscript-devel freetype-devel BuildRequires: giflib-devel Requires: ocaml @@ -80,9 +80,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-11 +* Fri Oct 16 2009 Richard W.M. Jones - 2.2.0-12 - ocaml-camlimages: TIFF reader multiple integer overflows (CVE 2009-3296 / RHBZ#528732). +- Changed dep back to 'lablgtk' so this can build. * Fri Jul 3 2009 Richard W.M. Jones - 2.2.0-10 - ocaml-camlimages: PNG reader multiple integer overflows From rjones at fedoraproject.org Fri Oct 16 10:14:30 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:14:30 -0000 Subject: rpms/ocaml-postgresql/devel .cvsignore, 1.7, 1.8 ocaml-postgresql.spec, 1.17, 1.18 sources, 1.7, 1.8 Message-ID: <20091016101419.3E60311C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9553 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: https://bugzilla.redhat.com/show_bug.cgi?id=529325 CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) HOWEVER you are not protected until you change your code to use the new connection#escape_string method. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- .cvsignore 4 Oct 2009 21:03:48 -0000 1.7 +++ .cvsignore 16 Oct 2009 10:14:19 -0000 1.8 @@ -1 +1 @@ -release-1.12.1.tar.bz2 +release-1.12.3.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/ocaml-postgresql.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -p -r1.17 -r1.18 --- ocaml-postgresql.spec 4 Oct 2009 21:03:49 -0000 1.17 +++ ocaml-postgresql.spec 16 Oct 2009 10:14:19 -0000 1.18 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.12.1 -Release: 2%{?dist} +Version: 1.12.3 +Release: 1%{?dist} Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries @@ -92,6 +92,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 +- New upstream version 1.12.3. +- This contains a SECURITY fix for: + https://bugzilla.redhat.com/show_bug.cgi?id=529325 + CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) + HOWEVER you are not protected until you change your code to + use the new connection#escape_string method. + * Sun Oct 4 2009 Richard W.M. Jones - 1.12.1-1 - New upstream version 1.12.1. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- sources 4 Oct 2009 21:03:49 -0000 1.7 +++ sources 16 Oct 2009 10:14:19 -0000 1.8 @@ -1 +1 @@ -e912df9259d74c123660072e12335871 release-1.12.1.tar.bz2 +64d6fdc1a23dc3315c61771f1d28f592 release-1.12.3.tar.bz2 From rjones at fedoraproject.org Fri Oct 16 10:19:02 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:19:02 -0000 Subject: rpms/ocaml-postgresql/F-10 .cvsignore, 1.3, 1.4 ocaml-postgresql.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <20091016101858.6A31611C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11044 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: https://bugzilla.redhat.com/show_bug.cgi?id=529325 CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) HOWEVER you are not protected until you change your code to use the new connection#escape_string method. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- .cvsignore 4 Apr 2008 11:53:16 -0000 1.3 +++ .cvsignore 16 Oct 2009 10:18:58 -0000 1.4 @@ -1 +1 @@ -postgresql-ocaml-1.8.2.tar.bz2 +release-1.12.3.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/ocaml-postgresql.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- ocaml-postgresql.spec 23 Apr 2008 11:10:18 -0000 1.6 +++ ocaml-postgresql.spec 16 Oct 2009 10:18:58 -0000 1.7 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.8.2 -Release: 4%{?dist} +Version: 1.12.3 +Release: 1%{?dist} Summary: OCaml library for accessing PostreSQL databases Group: Development/Libraries @@ -91,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 +- New upstream version 1.12.3. +- This contains a SECURITY fix for: + https://bugzilla.redhat.com/show_bug.cgi?id=529325 + CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) + HOWEVER you are not protected until you change your code to + use the new connection#escape_string method. + * Wed Apr 23 2008 Richard W.M. Jones - 1.8.2-4 - Rebuild for OCaml 3.10.2 Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- sources 4 Apr 2008 11:53:16 -0000 1.3 +++ sources 16 Oct 2009 10:18:58 -0000 1.4 @@ -1 +1 @@ -3ba2746c46e223d82b3ba32835ba6635 postgresql-ocaml-1.8.2.tar.bz2 +64d6fdc1a23dc3315c61771f1d28f592 release-1.12.3.tar.bz2 From rjones at fedoraproject.org Fri Oct 16 10:19:06 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:19:06 -0000 Subject: rpms/ocaml-postgresql/F-11 .cvsignore, 1.5, 1.6 ocaml-postgresql.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <20091016101900.3549A11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11025 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: https://bugzilla.redhat.com/show_bug.cgi?id=529325 CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) HOWEVER you are not protected until you change your code to use the new connection#escape_string method. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- .cvsignore 10 Mar 2009 14:06:41 -0000 1.5 +++ .cvsignore 16 Oct 2009 10:19:00 -0000 1.6 @@ -1 +1 @@ -release-1.10.3.tar.bz2 +release-1.12.3.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/ocaml-postgresql.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ocaml-postgresql.spec 10 Mar 2009 14:06:41 -0000 1.13 +++ ocaml-postgresql.spec 16 Oct 2009 10:19:00 -0000 1.14 @@ -2,7 +2,7 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.10.3 +Version: 1.12.3 Release: 1%{?dist} Summary: OCaml library for accessing PostgreSQL databases @@ -91,6 +91,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 +- New upstream version 1.12.3. +- This contains a SECURITY fix for: + https://bugzilla.redhat.com/show_bug.cgi?id=529325 + CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) + HOWEVER you are not protected until you change your code to + use the new connection#escape_string method. + * Tue Mar 10 2009 Richard W.M. Jones - 1.10.3-1 - New upstream version 1.10.3. - Fix URL. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- sources 10 Mar 2009 14:06:41 -0000 1.5 +++ sources 16 Oct 2009 10:19:00 -0000 1.6 @@ -1 +1 @@ -ebac79d610e5be1cfb39b69be2865e5d release-1.10.3.tar.bz2 +64d6fdc1a23dc3315c61771f1d28f592 release-1.12.3.tar.bz2 From rjones at fedoraproject.org Fri Oct 16 10:19:14 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:19:14 -0000 Subject: rpms/ocaml-postgresql/F-12 .cvsignore, 1.6, 1.7 ocaml-postgresql.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <20091016101901.D1C3511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11004 Modified Files: .cvsignore ocaml-postgresql.spec sources Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: https://bugzilla.redhat.com/show_bug.cgi?id=529325 CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) HOWEVER you are not protected until you change your code to use the new connection#escape_string method. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- .cvsignore 23 May 2009 08:12:43 -0000 1.6 +++ .cvsignore 16 Oct 2009 10:19:01 -0000 1.7 @@ -1 +1 @@ -release-1.11.1.tar.bz2 +release-1.12.3.tar.bz2 Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/ocaml-postgresql.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- ocaml-postgresql.spec 25 Jul 2009 20:03:37 -0000 1.16 +++ ocaml-postgresql.spec 16 Oct 2009 10:19:01 -0000 1.17 @@ -2,8 +2,8 @@ %define debug_package %{nil} Name: ocaml-postgresql -Version: 1.11.1 -Release: 2%{?dist} +Version: 1.12.3 +Release: 1%{?dist} Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries @@ -92,6 +92,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 +- New upstream version 1.12.3. +- This contains a SECURITY fix for: + https://bugzilla.redhat.com/show_bug.cgi?id=529325 + CVE-2009-2943 ocaml-postgresql: Missing escape function (DSA-1909-1) + HOWEVER you are not protected until you change your code to + use the new connection#escape_string method. + * Sat Jul 25 2009 Fedora Release Engineering - 1.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-12/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- sources 23 May 2009 08:12:43 -0000 1.6 +++ sources 16 Oct 2009 10:19:01 -0000 1.7 @@ -1 +1 @@ -d293714bd15824db031a47d1c42c1f36 release-1.11.1.tar.bz2 +64d6fdc1a23dc3315c61771f1d28f592 release-1.12.3.tar.bz2 From rjones at fedoraproject.org Fri Oct 16 10:24:35 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:24:35 -0000 Subject: rpms/ocaml-postgresql/F-10 ocaml-postgresql.spec,1.7,1.8 Message-ID: <20091016102421.EC26A11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12703 Modified Files: ocaml-postgresql.spec Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1.fc10.2 - Fix build process for new upstream tarball layout. Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-10/ocaml-postgresql.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ocaml-postgresql.spec 16 Oct 2009 10:18:58 -0000 1.7 +++ ocaml-postgresql.spec 16 Oct 2009 10:24:21 -0000 1.8 @@ -3,13 +3,13 @@ Name: ocaml-postgresql Version: 1.12.3 -Release: 1%{?dist} +Release: 1%{?dist}.2 Summary: OCaml library for accessing PostreSQL databases Group: Development/Libraries License: LGPLv2+ with exceptions URL: http://www.ocaml.info/home/ocaml_sources.html#toc13 -Source0: http://www.ocaml.info/ocaml_sources/postgresql-ocaml-%{version}.tar.bz2 +Source0: http://hg.ocaml.info/release/postgresql-ocaml/archive/release-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml >= 3.10.0 @@ -44,7 +44,7 @@ developing applications that use %{name} %prep -%setup -q -n postgresql-ocaml-%{version} +%setup -q -n postgresql-ocaml-release-%{version} %build @@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc LICENSE AUTHORS Changes README examples +%doc LICENSE AUTHORS Changelog README.txt examples %if %opt %{_libdir}/ocaml/postgresql/*.a %{_libdir}/ocaml/postgresql/*.cmxa @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1.fc10.2 +- Fix build process for new upstream tarball layout. + * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: From rjones at fedoraproject.org Fri Oct 16 10:25:28 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:25:28 -0000 Subject: rpms/ocaml-postgresql/F-11 ocaml-postgresql.spec,1.14,1.15 Message-ID: <20091016102524.ED9F511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-postgresql/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12935 Modified Files: ocaml-postgresql.spec Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1.fc11.2 - Fix build process for new upstream tarball layout. Index: ocaml-postgresql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-postgresql/F-11/ocaml-postgresql.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ocaml-postgresql.spec 16 Oct 2009 10:19:00 -0000 1.14 +++ ocaml-postgresql.spec 16 Oct 2009 10:25:24 -0000 1.15 @@ -3,7 +3,7 @@ Name: ocaml-postgresql Version: 1.12.3 -Release: 1%{?dist} +Release: 1%{?dist}.2 Summary: OCaml library for accessing PostgreSQL databases Group: Development/Libraries @@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc LICENSE AUTHORS Changes README.txt examples +%doc LICENSE AUTHORS Changelog README.txt examples %if %opt %{_libdir}/ocaml/postgresql/*.a %{_libdir}/ocaml/postgresql/*.cmxa @@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1.fc11.2 +- Fix build process for new upstream tarball layout. + * Fri Oct 16 2009 Richard W.M. Jones - 1.12.3-1 - New upstream version 1.12.3. - This contains a SECURITY fix for: From rjones at fedoraproject.org Fri Oct 16 10:43:42 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:43:42 -0000 Subject: rpms/ocaml-mysql/devel ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE, 1.1 ocaml-mysql.spec, 1.10, 1.11 Message-ID: <20091016104332.3D92A11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17694 Modified Files: ocaml-mysql.spec Added Files: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 1.0.4-11 - Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch: mysql.ml | 18 ++++++++++++------ mysql.mli | 5 +++++ mysql_stubs.c | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) --- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch --- diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml --- ocaml-mysql-1.0.4.orig/mysql.ml 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.ml 2009-10-16 11:42:08.074508283 +0100 @@ -333,6 +333,7 @@ external real_status : dbd -> int = "db_status" external errmsg : dbd -> string option = "db_errmsg" external escape : string -> string = "db_escape" +external real_escape: dbd -> string -> string = "db_real_escape" external fetch : result -> string option array option = "db_fetch" external to_row : result -> int64 -> unit = "db_to_row" external size : result -> int64 = "db_size" @@ -516,7 +517,9 @@ the corresponding type *) let ml2str str = "'" ^ escape str ^ "'" +let ml2rstr conn str = "'" ^ real_escape conn str ^ "'" let ml2blob = ml2str +let ml2rblob = ml2rstr let ml2int x = string_of_int x let ml2decimal x = x let ml322int x = Int32.to_string x @@ -524,12 +527,15 @@ let mlnative2int x = Nativeint.to_string x let ml2float x = string_of_float x let ml2enum x = escape x -let ml2set x = let rec loop arg = match arg with - | [] -> "" - | [x] -> escape x - | x::y::ys -> escape x ^ "," ^ loop (y::ys) - in - loop x +let ml2renum x = real_escape x +let ml2set_filter f x = + let rec loop f = function + | [] -> "" + | [x] -> f x + | x::y::ys -> f x ^ "," ^ loop f (y::ys) + in loop f x +let ml2set x = ml2set_filter escape x +let ml2rset conn x = ml2set_filter (real_escape conn) x let ml2datetimel ~year ~month ~day ~hour ~min ~sec = Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'" diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli --- ocaml-mysql-1.0.4.orig/mysql.mli 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.mli 2009-10-16 11:42:08.075507981 +0100 @@ -230,6 +230,7 @@ (** [escape str] returns the same string as [str] in MySQL syntax with special characters quoted to not confuse the MySQL parser *) val escape : string -> string +val real_escape : dbd -> string -> string (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding OCaml value *) @@ -277,14 +278,18 @@ (** [ml2xxx v] encodes [v] into MySQL syntax. *) val ml2str : string -> string +val ml2rstr : dbd -> string -> string val ml2blob : string -> string +val ml2rblob : dbd -> string -> string val ml2int : int -> string val ml2decimal : string -> string val ml322int : int32 -> string val ml642int : int64 -> string val ml2float : float -> string val ml2enum : string -> string +val ml2renum : dbd -> string -> string val ml2set : string list -> string +val ml2rset : dbd -> string list -> string val ml2datetime : int * int * int * int * int * int -> string val ml2datetimel : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string val ml2date : int * int * int -> string diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c --- ocaml-mysql-1.0.4.orig/mysql_stubs.c 2006-02-23 23:12:36.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql_stubs.c 2009-10-16 11:42:08.076508492 +0100 @@ -472,6 +472,33 @@ CAMLreturn(res); } +EXTERNAL value +db_real_escape(value dbd, value str) +{ + CAMLparam2(dbd, str); + char *s; + char *buf; + int len, esclen; + MYSQL *mysql; + CAMLlocal1(res); + + check_dbd(dbd, "escape"); + mysql = DBDmysql(dbd); + + s = String_val(str); + len = string_length(str); + buf = (char*) stat_alloc(2*len+1); + caml_enter_blocking_section(); + esclen = mysql_real_escape_string(mysql,buf,s,len); + caml_leave_blocking_section(); + + res = alloc_string(esclen); + memcpy(String_val(res), buf, esclen); + stat_free(buf); + + CAMLreturn(res); +} + /* * db_size -- returns the size of the current result (number of rows). */ Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/devel/ocaml-mysql.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ocaml-mysql.spec 25 Jul 2009 20:00:13 -0000 1.10 +++ ocaml-mysql.spec 16 Oct 2009 10:43:31 -0000 1.11 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -13,6 +13,8 @@ Source0: http://raevnos.pennmush. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x +Patch0: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -46,6 +48,7 @@ developing applications that use %{name} %prep %setup -q +%patch0 -p1 ./configure --libdir=%{_libdir} @@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.0.4-11 +- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). + * Sat Jul 25 2009 Fedora Release Engineering - 1.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Fri Oct 16 10:46:52 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:46:52 -0000 Subject: rpms/ocaml-mysql/F-11 ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE, 1.1 ocaml-mysql.spec, 1.7, 1.8 Message-ID: <20091016104640.4353011C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19002 Modified Files: ocaml-mysql.spec Added Files: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch Log Message: Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch: mysql.ml | 18 ++++++++++++------ mysql.mli | 5 +++++ mysql_stubs.c | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) --- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch --- diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml --- ocaml-mysql-1.0.4.orig/mysql.ml 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.ml 2009-10-16 11:42:08.074508283 +0100 @@ -333,6 +333,7 @@ external real_status : dbd -> int = "db_status" external errmsg : dbd -> string option = "db_errmsg" external escape : string -> string = "db_escape" +external real_escape: dbd -> string -> string = "db_real_escape" external fetch : result -> string option array option = "db_fetch" external to_row : result -> int64 -> unit = "db_to_row" external size : result -> int64 = "db_size" @@ -516,7 +517,9 @@ the corresponding type *) let ml2str str = "'" ^ escape str ^ "'" +let ml2rstr conn str = "'" ^ real_escape conn str ^ "'" let ml2blob = ml2str +let ml2rblob = ml2rstr let ml2int x = string_of_int x let ml2decimal x = x let ml322int x = Int32.to_string x @@ -524,12 +527,15 @@ let mlnative2int x = Nativeint.to_string x let ml2float x = string_of_float x let ml2enum x = escape x -let ml2set x = let rec loop arg = match arg with - | [] -> "" - | [x] -> escape x - | x::y::ys -> escape x ^ "," ^ loop (y::ys) - in - loop x +let ml2renum x = real_escape x +let ml2set_filter f x = + let rec loop f = function + | [] -> "" + | [x] -> f x + | x::y::ys -> f x ^ "," ^ loop f (y::ys) + in loop f x +let ml2set x = ml2set_filter escape x +let ml2rset conn x = ml2set_filter (real_escape conn) x let ml2datetimel ~year ~month ~day ~hour ~min ~sec = Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'" diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli --- ocaml-mysql-1.0.4.orig/mysql.mli 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.mli 2009-10-16 11:42:08.075507981 +0100 @@ -230,6 +230,7 @@ (** [escape str] returns the same string as [str] in MySQL syntax with special characters quoted to not confuse the MySQL parser *) val escape : string -> string +val real_escape : dbd -> string -> string (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding OCaml value *) @@ -277,14 +278,18 @@ (** [ml2xxx v] encodes [v] into MySQL syntax. *) val ml2str : string -> string +val ml2rstr : dbd -> string -> string val ml2blob : string -> string +val ml2rblob : dbd -> string -> string val ml2int : int -> string val ml2decimal : string -> string val ml322int : int32 -> string val ml642int : int64 -> string val ml2float : float -> string val ml2enum : string -> string +val ml2renum : dbd -> string -> string val ml2set : string list -> string +val ml2rset : dbd -> string list -> string val ml2datetime : int * int * int * int * int * int -> string val ml2datetimel : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string val ml2date : int * int * int -> string diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c --- ocaml-mysql-1.0.4.orig/mysql_stubs.c 2006-02-23 23:12:36.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql_stubs.c 2009-10-16 11:42:08.076508492 +0100 @@ -472,6 +472,33 @@ CAMLreturn(res); } +EXTERNAL value +db_real_escape(value dbd, value str) +{ + CAMLparam2(dbd, str); + char *s; + char *buf; + int len, esclen; + MYSQL *mysql; + CAMLlocal1(res); + + check_dbd(dbd, "escape"); + mysql = DBDmysql(dbd); + + s = String_val(str); + len = string_length(str); + buf = (char*) stat_alloc(2*len+1); + caml_enter_blocking_section(); + esclen = mysql_real_escape_string(mysql,buf,s,len); + caml_leave_blocking_section(); + + res = alloc_string(esclen); + memcpy(String_val(res), buf, esclen); + stat_free(buf); + + CAMLreturn(res); +} + /* * db_size -- returns the size of the current result (number of rows). */ Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-11/ocaml-mysql.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- ocaml-mysql.spec 26 Feb 2009 07:17:08 -0000 1.7 +++ ocaml-mysql.spec 16 Oct 2009 10:46:40 -0000 1.8 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 8%{?dist} +Release: 8%{?dist}.1 Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -12,6 +12,8 @@ URL: http://raevnos.pennmush. Source0: http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -45,6 +47,7 @@ developing applications that use %{name} %prep %setup -q +%patch0 -p1 ./configure --libdir=%{_libdir} @@ -96,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.0.4-8.fc11.1 +- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). + * Wed Feb 25 2009 Fedora Release Engineering - 1.0.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From rjones at fedoraproject.org Fri Oct 16 10:46:52 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:46:52 -0000 Subject: rpms/ocaml-mysql/F-12 ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE, 1.1 ocaml-mysql.spec, 1.10, 1.11 Message-ID: <20091016104641.146A911C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/F-12 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19017 Modified Files: ocaml-mysql.spec Added Files: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch Log Message: Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch: mysql.ml | 18 ++++++++++++------ mysql.mli | 5 +++++ mysql_stubs.c | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) --- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch --- diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml --- ocaml-mysql-1.0.4.orig/mysql.ml 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.ml 2009-10-16 11:42:08.074508283 +0100 @@ -333,6 +333,7 @@ external real_status : dbd -> int = "db_status" external errmsg : dbd -> string option = "db_errmsg" external escape : string -> string = "db_escape" +external real_escape: dbd -> string -> string = "db_real_escape" external fetch : result -> string option array option = "db_fetch" external to_row : result -> int64 -> unit = "db_to_row" external size : result -> int64 = "db_size" @@ -516,7 +517,9 @@ the corresponding type *) let ml2str str = "'" ^ escape str ^ "'" +let ml2rstr conn str = "'" ^ real_escape conn str ^ "'" let ml2blob = ml2str +let ml2rblob = ml2rstr let ml2int x = string_of_int x let ml2decimal x = x let ml322int x = Int32.to_string x @@ -524,12 +527,15 @@ let mlnative2int x = Nativeint.to_string x let ml2float x = string_of_float x let ml2enum x = escape x -let ml2set x = let rec loop arg = match arg with - | [] -> "" - | [x] -> escape x - | x::y::ys -> escape x ^ "," ^ loop (y::ys) - in - loop x +let ml2renum x = real_escape x +let ml2set_filter f x = + let rec loop f = function + | [] -> "" + | [x] -> f x + | x::y::ys -> f x ^ "," ^ loop f (y::ys) + in loop f x +let ml2set x = ml2set_filter escape x +let ml2rset conn x = ml2set_filter (real_escape conn) x let ml2datetimel ~year ~month ~day ~hour ~min ~sec = Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'" diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli --- ocaml-mysql-1.0.4.orig/mysql.mli 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.mli 2009-10-16 11:42:08.075507981 +0100 @@ -230,6 +230,7 @@ (** [escape str] returns the same string as [str] in MySQL syntax with special characters quoted to not confuse the MySQL parser *) val escape : string -> string +val real_escape : dbd -> string -> string (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding OCaml value *) @@ -277,14 +278,18 @@ (** [ml2xxx v] encodes [v] into MySQL syntax. *) val ml2str : string -> string +val ml2rstr : dbd -> string -> string val ml2blob : string -> string +val ml2rblob : dbd -> string -> string val ml2int : int -> string val ml2decimal : string -> string val ml322int : int32 -> string val ml642int : int64 -> string val ml2float : float -> string val ml2enum : string -> string +val ml2renum : dbd -> string -> string val ml2set : string list -> string +val ml2rset : dbd -> string list -> string val ml2datetime : int * int * int * int * int * int -> string val ml2datetimel : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string val ml2date : int * int * int -> string diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c --- ocaml-mysql-1.0.4.orig/mysql_stubs.c 2006-02-23 23:12:36.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql_stubs.c 2009-10-16 11:42:08.076508492 +0100 @@ -472,6 +472,33 @@ CAMLreturn(res); } +EXTERNAL value +db_real_escape(value dbd, value str) +{ + CAMLparam2(dbd, str); + char *s; + char *buf; + int len, esclen; + MYSQL *mysql; + CAMLlocal1(res); + + check_dbd(dbd, "escape"); + mysql = DBDmysql(dbd); + + s = String_val(str); + len = string_length(str); + buf = (char*) stat_alloc(2*len+1); + caml_enter_blocking_section(); + esclen = mysql_real_escape_string(mysql,buf,s,len); + caml_leave_blocking_section(); + + res = alloc_string(esclen); + memcpy(String_val(res), buf, esclen); + stat_free(buf); + + CAMLreturn(res); +} + /* * db_size -- returns the size of the current result (number of rows). */ Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-12/ocaml-mysql.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ocaml-mysql.spec 25 Jul 2009 20:00:13 -0000 1.10 +++ ocaml-mysql.spec 16 Oct 2009 10:46:40 -0000 1.11 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -13,6 +13,8 @@ Source0: http://raevnos.pennmush. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x +Patch0: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -46,6 +48,7 @@ developing applications that use %{name} %prep %setup -q +%patch0 -p1 ./configure --libdir=%{_libdir} @@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.0.4-11 +- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). + * Sat Jul 25 2009 Fedora Release Engineering - 1.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Fri Oct 16 10:47:03 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 10:47:03 -0000 Subject: rpms/ocaml-mysql/F-10 ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch, NONE, 1.1 ocaml-mysql.spec, 1.2, 1.3 Message-ID: <20091016104642.3DF4511C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-mysql/F-10 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19036 Modified Files: ocaml-mysql.spec Added Files: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch Log Message: Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch: mysql.ml | 18 ++++++++++++------ mysql.mli | 5 +++++ mysql_stubs.c | 27 +++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) --- NEW FILE ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch --- diff -ur ocaml-mysql-1.0.4.orig/mysql.ml ocaml-mysql-1.0.4/mysql.ml --- ocaml-mysql-1.0.4.orig/mysql.ml 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.ml 2009-10-16 11:42:08.074508283 +0100 @@ -333,6 +333,7 @@ external real_status : dbd -> int = "db_status" external errmsg : dbd -> string option = "db_errmsg" external escape : string -> string = "db_escape" +external real_escape: dbd -> string -> string = "db_real_escape" external fetch : result -> string option array option = "db_fetch" external to_row : result -> int64 -> unit = "db_to_row" external size : result -> int64 = "db_size" @@ -516,7 +517,9 @@ the corresponding type *) let ml2str str = "'" ^ escape str ^ "'" +let ml2rstr conn str = "'" ^ real_escape conn str ^ "'" let ml2blob = ml2str +let ml2rblob = ml2rstr let ml2int x = string_of_int x let ml2decimal x = x let ml322int x = Int32.to_string x @@ -524,12 +527,15 @@ let mlnative2int x = Nativeint.to_string x let ml2float x = string_of_float x let ml2enum x = escape x -let ml2set x = let rec loop arg = match arg with - | [] -> "" - | [x] -> escape x - | x::y::ys -> escape x ^ "," ^ loop (y::ys) - in - loop x +let ml2renum x = real_escape x +let ml2set_filter f x = + let rec loop f = function + | [] -> "" + | [x] -> f x + | x::y::ys -> f x ^ "," ^ loop f (y::ys) + in loop f x +let ml2set x = ml2set_filter escape x +let ml2rset conn x = ml2set_filter (real_escape conn) x let ml2datetimel ~year ~month ~day ~hour ~min ~sec = Printf.sprintf "'%04d-%02d-%02d %02d:%02d:%02d'" diff -ur ocaml-mysql-1.0.4.orig/mysql.mli ocaml-mysql-1.0.4/mysql.mli --- ocaml-mysql-1.0.4.orig/mysql.mli 2006-02-23 22:13:22.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql.mli 2009-10-16 11:42:08.075507981 +0100 @@ -230,6 +230,7 @@ (** [escape str] returns the same string as [str] in MySQL syntax with special characters quoted to not confuse the MySQL parser *) val escape : string -> string +val real_escape : dbd -> string -> string (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding OCaml value *) @@ -277,14 +278,18 @@ (** [ml2xxx v] encodes [v] into MySQL syntax. *) val ml2str : string -> string +val ml2rstr : dbd -> string -> string val ml2blob : string -> string +val ml2rblob : dbd -> string -> string val ml2int : int -> string val ml2decimal : string -> string val ml322int : int32 -> string val ml642int : int64 -> string val ml2float : float -> string val ml2enum : string -> string +val ml2renum : dbd -> string -> string val ml2set : string list -> string +val ml2rset : dbd -> string list -> string val ml2datetime : int * int * int * int * int * int -> string val ml2datetimel : year:int -> month:int -> day:int -> hour:int -> min:int -> sec:int -> string val ml2date : int * int * int -> string diff -ur ocaml-mysql-1.0.4.orig/mysql_stubs.c ocaml-mysql-1.0.4/mysql_stubs.c --- ocaml-mysql-1.0.4.orig/mysql_stubs.c 2006-02-23 23:12:36.000000000 +0000 +++ ocaml-mysql-1.0.4/mysql_stubs.c 2009-10-16 11:42:08.076508492 +0100 @@ -472,6 +472,33 @@ CAMLreturn(res); } +EXTERNAL value +db_real_escape(value dbd, value str) +{ + CAMLparam2(dbd, str); + char *s; + char *buf; + int len, esclen; + MYSQL *mysql; + CAMLlocal1(res); + + check_dbd(dbd, "escape"); + mysql = DBDmysql(dbd); + + s = String_val(str); + len = string_length(str); + buf = (char*) stat_alloc(2*len+1); + caml_enter_blocking_section(); + esclen = mysql_real_escape_string(mysql,buf,s,len); + caml_leave_blocking_section(); + + res = alloc_string(esclen); + memcpy(String_val(res), buf, esclen); + stat_free(buf); + + CAMLreturn(res); +} + /* * db_size -- returns the size of the current result (number of rows). */ Index: ocaml-mysql.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-mysql/F-10/ocaml-mysql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- ocaml-mysql.spec 23 Apr 2008 11:10:52 -0000 1.2 +++ ocaml-mysql.spec 16 Oct 2009 10:46:42 -0000 1.3 @@ -3,7 +3,7 @@ Name: ocaml-mysql Version: 1.0.4 -Release: 3%{?dist} +Release: 3%{?dist}.1 Summary: OCaml library for accessing MySQL databases Group: Development/Libraries @@ -12,6 +12,8 @@ URL: http://raevnos.pennmush. Source0: http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: ocaml-mysql-1.0.4-CVE-2009-2942-missing-escape.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc @@ -43,6 +45,7 @@ developing applications that use %{name} %prep %setup -q +%patch0 -p1 ./configure --libdir=%{_libdir} @@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 1.0.4-3.fc10.1 +- Patch for CVE 2009-2942 Missing escape function (RHBZ#529321). + * Wed Apr 23 2008 Richard W.M. Jones - 1.0.4-3 - Rebuild for OCaml 3.10.2 From rjones at fedoraproject.org Fri Oct 16 14:55:45 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 14:55:45 -0000 Subject: rpms/ocaml/devel ocamlbyteinfo.ml, NONE, 1.1 ocamlplugininfo.ml, NONE, 1.1 ocaml.spec, 1.59, 1.60 Message-ID: <20091016145532.8FCAA11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23885 Modified Files: ocaml.spec Added Files: ocamlbyteinfo.ml ocamlplugininfo.ml Log Message: * Fri Oct 16 2009 Richard W.M. Jones - 3.11.1-3 - Add ocamlbyteinfo and ocamlplugininfo programs from Debian. ***** Error reading new file: [Errno 2] No such file or directory: 'ocamlbyteinfo.ml' ***** Error reading new file: [Errno 2] No such file or directory: 'ocamlplugininfo.ml' Index: ocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -p -r1.59 -r1.60 --- ocaml.spec 4 Oct 2009 22:34:51 -0000 1.59 +++ ocaml.spec 16 Oct 2009 14:55:32 -0000 1.60 @@ -2,7 +2,7 @@ Name: ocaml Version: 3.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Objective Caml compiler and programming environment @@ -18,6 +18,11 @@ Source3: http://caml.inria.fr/dis Source4: ocaml-find-requires.sh Source5: ocaml-find-provides.sh +# Useful utilities from Debian, and sent upstream. +# http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git;a=tree;f=debian/ocamlbyteinfo;hb=HEAD +Source6: ocamlbyteinfo.ml +Source7: ocamlplugininfo.ml + Patch0: ocaml-3.11.0-rpath.patch Patch1: ocaml-user-cflags.patch @@ -212,6 +217,13 @@ make -C emacs ocamltags # make -C tools objinfo (cd tools; ../boot/ocamlrun ../ocamlopt -nostdlib -I ../stdlib -I ../utils -I ../parsing -I ../typing -I ../bytecomp -I ../asmcomp -I ../driver -o objinfo config.cmx objinfo.ml) +# Currently these tools are supplied by Debian, but are expected +# to go upstream at some point. +cp %{SOURCE6} %{SOURCE7} . +boot/ocamlrun ./ocamlc -I otherlibs/dynlink dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo +cp otherlibs/dynlink/natdynlink.ml . +boot/ocamlrun ./ocamlopt unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo + %install rm -rf $RPM_BUILD_ROOT @@ -248,6 +260,9 @@ echo %{version} > $RPM_BUILD_ROOT%{_libd # Remove rpaths from stublibs .so files. chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so +install -m 0755 ocamlbyteinfo $RPM_BUILD_ROOT%{_bindir} +install -m 0755 ocamlplugininfo $RPM_BUILD_ROOT%{_bindir} + %clean rm -rf $RPM_BUILD_ROOT @@ -270,6 +285,7 @@ fi %files %defattr(-,root,root,-) %{_bindir}/ocaml +%{_bindir}/ocamlbyteinfo %{_bindir}/ocamlbuild %{_bindir}/ocamlbuild.byte %{_bindir}/ocamlbuild.native @@ -286,6 +302,7 @@ fi %{_bindir}/ocamlobjinfo %{_bindir}/ocamlopt %{_bindir}/ocamlopt.opt +%{_bindir}/ocamlplugininfo %{_bindir}/ocamlprof %{_bindir}/ocamlyacc %{_libdir}/ocaml/addlabels @@ -433,6 +450,9 @@ fi %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.11.1-3 +- Add ocamlbyteinfo and ocamlplugininfo programs from Debian. + * Sun Oct 4 2009 Richard W.M. Jones - 3.11.1-2 - ocaml-find-requires.sh: Calculate runtime version using ocamlrun -version instead of fedora-ocaml-release file. From rjones at fedoraproject.org Fri Oct 16 15:31:58 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 16 Oct 2009 15:31:58 -0000 Subject: rpms/ocaml/devel ocaml.spec,1.60,1.61 Message-ID: <20091016153150.BEE6E11C00E5@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2666 Modified Files: ocaml.spec Log Message: - Set includes so building the *info programs works without having OCaml already installed. Index: ocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -p -r1.60 -r1.61 --- ocaml.spec 16 Oct 2009 14:55:32 -0000 1.60 +++ ocaml.spec 16 Oct 2009 15:31:50 -0000 1.61 @@ -2,7 +2,7 @@ Name: ocaml Version: 3.11.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Objective Caml compiler and programming environment @@ -220,9 +220,10 @@ make -C emacs ocamltags # Currently these tools are supplied by Debian, but are expected # to go upstream at some point. cp %{SOURCE6} %{SOURCE7} . -boot/ocamlrun ./ocamlc -I otherlibs/dynlink dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo +includes="-nostdlib -I stdlib -I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver -I otherlibs/unix -I otherlibs/str -I otherlibs/dynlink" +boot/ocamlrun ./ocamlc $includes dynlinkaux.cmo ocamlbyteinfo.ml -o ocamlbyteinfo cp otherlibs/dynlink/natdynlink.ml . -boot/ocamlrun ./ocamlopt unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo +boot/ocamlrun ./ocamlopt $includes unix.cmxa str.cmxa natdynlink.ml ocamlplugininfo.ml -o ocamlplugininfo %install @@ -450,6 +451,10 @@ fi %changelog +* Fri Oct 16 2009 Richard W.M. Jones - 3.11.1-4 +- Set includes so building the *info programs works without + having OCaml already installed. + * Fri Oct 16 2009 Richard W.M. Jones - 3.11.1-3 - Add ocamlbyteinfo and ocamlplugininfo programs from Debian. From rjones at fedoraproject.org Fri Oct 23 08:23:12 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Fri, 23 Oct 2009 08:23:12 +0000 (UTC) Subject: rpms/ocaml-cil/devel ocaml-cil.spec,1.11,1.12 Message-ID: <20091023082313.2777111C01EA@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml-cil/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8094 Modified Files: ocaml-cil.spec Log Message: Include natively compiled files and *.mli files (RHBZ#521324). Index: ocaml-cil.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml-cil/devel/ocaml-cil.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -p -r1.11 -r1.12 --- ocaml-cil.spec 25 Jul 2009 19:53:25 -0000 1.11 +++ ocaml-cil.spec 23 Oct 2009 08:23:11 -0000 1.12 @@ -6,7 +6,7 @@ Name: ocaml-cil Version: 1.3.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CIL - Infrastructure for C Program Analysis and Transformation Group: Development/Libraries @@ -96,7 +96,7 @@ for gcc. %build -make +make RELEASE=1 make quicktest cat > META < - 1.3.7-3 +- Include natively compiled files and *.mli files (RHBZ#521324). + * Sat Jul 25 2009 Fedora Release Engineering - 1.3.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From rjones at fedoraproject.org Mon Oct 26 17:48:11 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Mon, 26 Oct 2009 17:48:11 +0000 (UTC) Subject: rpms/cduce/F-11 cduce.spec,1.12,1.13 Message-ID: <20091026174812.01FC211C0264@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/cduce/F-11 In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18372 Modified Files: cduce.spec Log Message: Bump to fix broken dependency (RHBZ#531019). Index: cduce.spec =================================================================== RCS file: /cvs/pkgs/rpms/cduce/F-11/cduce.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- cduce.spec 17 Jun 2009 10:44:43 -0000 1.12 +++ cduce.spec 26 Oct 2009 17:48:11 -0000 1.13 @@ -8,7 +8,7 @@ Name: cduce Version: 0.5.2.1 -Release: 14%{?dist}.1 +Release: 14%{?dist}.2 Summary: Modern XML-oriented functional language Group: Development/Libraries @@ -165,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 26 2009 Richard W.M. Jones - 0.5.2.1-14.2 +- Bump to fix broken dependency (RHBZ#531019). + * Wed Jun 17 2009 S390x secondary arch maintainer 0.5.2.1-14.1 - ExcludeArch s390, s390x as we don't have OCaml on those archs From rjones at fedoraproject.org Tue Oct 27 10:02:04 2009 From: rjones at fedoraproject.org (Richard W.M. Jones) Date: Tue, 27 Oct 2009 10:02:04 +0000 (UTC) Subject: rpms/ocaml/devel ocaml.spec,1.61,1.62 Message-ID: <20091027100204.7E64911C00E6@cvs1.fedora.phx.redhat.com> Author: rjones Update of /cvs/pkgs/rpms/ocaml/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5985 Modified Files: ocaml.spec Log Message: Install ocaml.info files correctly (RHBZ#531204). Index: ocaml.spec =================================================================== RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -p -r1.61 -r1.62 --- ocaml.spec 16 Oct 2009 15:31:50 -0000 1.61 +++ ocaml.spec 27 Oct 2009 10:02:04 -0000 1.62 @@ -2,7 +2,7 @@ Name: ocaml Version: 3.11.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Objective Caml compiler and programming environment @@ -271,8 +271,8 @@ rm -rf $RPM_BUILD_ROOT %post docs /sbin/install-info \ - --entry "* ocaml: (ocaml). The Objective Caml compiler and programming environment" \ - --section "Programming Languages" \ + --entry="* ocaml: (ocaml). The Objective Caml compiler and programming environment" \ + --section="Programming Languages" \ %{_infodir}/%{name}.info \ %{_infodir}/dir 2>/dev/null || : @@ -451,6 +451,9 @@ fi %changelog +* Tue Oct 27 2009 Richard W.M. Jones - 3.11.1-5 +- Install ocaml.info files correctly (RHBZ#531204). + * Fri Oct 16 2009 Richard W.M. Jones - 3.11.1-4 - Set includes so building the *info programs works without having OCaml already installed.