February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit postgresql for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package postgresql for openSUSE:Factory checked in at Thu Feb 11 19:14:28 CET 2010. -------- --- postgresql/postgresql-pl.changes 2009-09-16 20:09:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/postgresql/postgresql-pl.changes 2010-02-09 14:43:40.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 9 14:11:37 CET 2010 - max(a)suse.de + +- Fix linking against libperl.so (bnc#578053) +- Fix package descriptions. + +------------------------------------------------------------------- --- postgresql/postgresql.changes 2010-01-07 15:51:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/postgresql/postgresql.changes 2010-02-09 14:43:43.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 9 14:42:29 CET 2010 - max(a)suse.de + +- Fix package descriptions. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- postgresql-perl-rpath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql-pl.spec ++++++ --- /var/tmp/diff_new_pack.iM1GcX/_old 2010-02-11 19:13:42.000000000 +0100 +++ /var/tmp/diff_new_pack.iM1GcX/_new 2010-02-11 19:13:42.000000000 +0100 @@ -24,12 +24,13 @@ BuildRequires: python-devel tcl-devel Summary: The PL/Tcl, PL/Perl, and PL/Python Procedural Languages for PostgreSQL Version: 8.4.2 -Release: 2 +Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Servers Source0: postgresql-%version.tar.bz2 NoSource: 0 +Patch0: postgresql-perl-rpath.patch Url: http://www.postgresql.org/ Requires: postgresql-server = %pg_minor_version BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,50 +42,32 @@ transactions, foreign keys, subqueries, triggers, and user-defined types and functions. -This package contains the PL/Tcl, PL/Perl, and PL/Python procedural -languages for PostgreSQL. With these modules one can use Perl, Python, -and Tcl to write stored procedures, functions, and triggers. +This source package builds the PL/Tcl, PL/Perl, and PL/Python +procedural languages from the PostgreSQL source code. With these +modules one can use Perl, Python, and Tcl to write stored procedures, +functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is +PostgreSQL also offers the built-in procedural language PL/pgSQL which is included in the postgresql-server package. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package -n postgresql-plperl License: BSD3c(or similar) Summary: The PL/Tcl, PL/Perl, and PL/Python procedural languages for PostgreSQL Group: Productivity/Databases/Servers -Requires: perl +Requires: perl = %perl_version Obsoletes: postgresql-pl Provides: postgresql-pl:%_libdir/postgresql/plperl.so Requires: postgresql-server = %pg_minor_version %description -n postgresql-plperl -This package contains the the PL/Tcl, PL/Perl, and PL/Python procedural -languages for the back-end. With these modules one can use Perl, -Python, and Tcl to write stored procedures, functions and triggers. - -PostgreSQL also offers the builtin procedural language PL/SQL. - - +PostgreSQL is an advanced object-relational database management system +that supports an extended subset of the SQL standard, including +transactions, foreign keys, subqueries, triggers, and user-defined +types and functions. -Authors: --------- - Andrew Yu <andrew(a)CS.Berkeley.edu> - Jolly Chen <jolly(a)CS.Berkeley.edu> - Bruce Momjian <maillist(a)candle.pha.pa.us> - Thomas G. Lockhart <lockhart(a)alumni.caltech.edu> - Tom Lane <tgl(a)sss.pgh.pa.us> - The Hermit Hacker <scrappy(a)hub.org> - etc. +This package contains the PL/Perl procedural language for PostgreSQL. +With this module one can use Perl to write stored procedures, +functions, and triggers. %package -n postgresql-plpython License: BSD3c(or similar) @@ -105,19 +88,6 @@ With this module one can use Python to write stored procedures, functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is -included in the postgresql-server package. - - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package -n postgresql-pltcl License: BSD3c(or similar) Summary: PL/Tcl Procedural Language for PostgreSQL @@ -137,23 +107,11 @@ With thie module one can use Tcl to write stored procedures, functions, and triggers. -PostgreSQL also offers the built-in procedural language PL/SQL which is -included in the postgresql-server package. - - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %prep # The sources for the postgresql-pl package can be found # in the postgresql source RPM. %setup -q -n postgresql-%{version} +%patch0 %build export CFLAGS="%optflags $SP" ++++++ postgresql.spec ++++++ --- /var/tmp/diff_new_pack.iM1GcX/_old 2010-02-11 19:13:42.000000000 +0100 +++ /var/tmp/diff_new_pack.iM1GcX/_new 2010-02-11 19:13:42.000000000 +0100 @@ -24,7 +24,7 @@ BuildRequires: ncurses-devel Summary: Basic Clients and Utilities for PostgreSQL Version: 8.4.2 -Release: 2 +Release: 3 %define pg_minor_version %(echo %version | cut -f1-2 -d.) License: BSD3c(or similar) Group: Productivity/Databases/Tools @@ -58,16 +58,6 @@ HTML documentation for PostgreSQL can be found in the postgresql-docs package. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package libs License: BSD3c(or similar) Summary: Shared Libraries Required for PostgreSQL Clients @@ -91,16 +81,6 @@ package in order to use any other PostgreSQL package or any clients that need to connect to a PostgreSQL server. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package server License: BSD3c(or similar) Summary: The Programs Needed to Create and Run a PostgreSQL Server @@ -131,16 +111,6 @@ Manual pages for the PostgreSQL SQL statements can be found in the postgresql package. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package contrib License: BSD3c(or similar) Summary: Contributed Extensions and Additions to PostgreSQL @@ -160,16 +130,6 @@ Documentation for the modules contained in this package can be found in /usr/share/doc/packages/postgresql/contrib. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %description server PostgreSQL is an advanced object-relational database management system that supports an extended subset of the SQL standard, including @@ -180,16 +140,6 @@ PostgreSQL server, which will in turn allow you to create and maintain PostgreSQL databases. - - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %package devel License: BSD3c(or similar) Summary: PostgreSQL development header files and libraries @@ -209,15 +159,6 @@ which will interact with a PostgreSQL server. - -Authors: --------- - Marc G. Fournier <scrappy(a)hub.org> - Tom Lane <tgl(a)sss.pgh.pa.us> - Vadim B. Mikheev <vadim4o(a)yahoo.com> - Bruce Momjian <pgman(a)candle.pha.pa.us> - Jan Wieck <JanWieck(a)Yahoo.com> - %prep %setup -q %patch1 ++++++ postgresql-perl-rpath.patch ++++++ We configure Postgres with --disable-rpath because for the most part we want to leave it to ldconfig to determine where libraries are. However, for some reason the Perl package puts libperl.so in a nonstandard place and doesn't add that place to the ldconfig search path. I think this is a Perl packaging bug, myself, but apparently it's not going to change. So work around it by adding an rpath spec to plperl.so (only). Per bug #162198. --- src/pl/plperl/GNUmakefile 2009-06-05 14:29:56.000000000 -0400 +++ src/pl/plperl/GNUmakefile 2009-08-12 23:28:57.000000000 -0400 @@ -38,6 +38,9 @@ SHLIB_LINK = $(perl_embed_ldflags) +# Force rpath to be used even though we disable it everywhere else +SHLIB_LINK += $(rpath) + REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-language=plperl REGRESS = plperl plperl_trigger plperl_shared plperl_elog # where to find psql for running the tests ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pixman for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package pixman for openSUSE:Factory checked in at Thu Feb 11 19:13:35 CET 2010. -------- --- pixman/pixman.changes 2009-12-15 13:07:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/pixman/pixman.changes 2010-01-18 21:20:51.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Jan 18 21:21:46 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.17.4: + + Major performance improvements for ARM NEON + + Test suite improvements [Marvin Schmidt] + + Bug fixes + + See http://cgit.freedesktop.org/pixman/log/?id=pixman-0.17.4 + for full list of changes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pixman-0.17.2.tar.bz2 New: ---- pixman-0.17.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pixman.spec ++++++ --- /var/tmp/diff_new_pack.rDf6dE/_old 2010-02-11 19:13:21.000000000 +0100 +++ /var/tmp/diff_new_pack.rDf6dE/_new 2010-02-11 19:13:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pixman (Version 0.17.2) +# spec file for package pixman (Version 0.17.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,8 @@ Name: pixman -Version: 0.17.2 -Release: 2 +Version: 0.17.4 +Release: 1 License: MIT License (or similar) Summary: Pixel manipulation library Url: http://xorg.freedesktop.org/ ++++++ pixman-0.17.2.tar.bz2 -> pixman-0.17.4.tar.bz2 ++++++ ++++ 2851 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2 for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at Thu Feb 11 19:13:26 CET 2010. -------- --- GNOME/gtk2/gtk2.changes 2010-01-12 11:25:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk2/gtk2.changes 2010-02-10 16:20:34.000000000 +0100 @@ -1,0 +2,82 @@ +Wed Feb 10 16:09:24 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.19.5: + + GSEAL work: + - Add accessors for GtkPaned members + - Add gtk_widget_style_attach + - Seal GtkTextTag + - Deprecate GtkCurveType + - More GtkWidget flags accessors + + Bugs fixed: + - bgo#403485: Move docs from tmpl/* to the source files + - bgo#556263: Deprecate GtkCurve + - bgo#554420: Seal GtkTextTag + - bgo#561816: Optimize gtk_paned_set_position notifications + - bgo#606288: Not using GtkOptionMenu deprecated symbols in + test file + - bgo#607061: GtkPlug socket window is sometimes incorrectly + unref'd + - bgo#607344: GtkCalendar: crash when using tooltips via glade + - bgo#607885: GtkPaned::handle lack accessor + - bgo#608162: gtktoolbutton doesn't create right proxy menu + item... + - bgo#608345: wrong reference on + gdk_keymap_translate_keyboard_state + - bgo#608370: dnd drag-dest signal handlers don't get correctly + disconn... + - bgo#608410: GOK types backwards in text entry fields + - bgo#608615: DnD events sent to wrong window + - bgo#608807: Marks on GtkScale widgets can overlap + - bgo#609188: gdk/directfb: compiler warning in + _gdk_windowing_pointer_grab() + - bgo#609191: gdk/directfb: use G_DEFINE_TYPE in + gdkcolor-directfb + - bgo#609199: gdk/directfb: use G_DEFINE_TYPE in gdkgc-directfb + - bgo#609201: gdk/directfb: max cursor size is artificially + limited + - bgo#591186: GTK Menu Bar is unreadable under Windows 7 + + Updated translations. + +------------------------------------------------------------------- +Wed Jan 27 13:06:30 CET 2010 - vuntz(a)opensuse.org + +- Update to version 2.19.4: + + GSeal: + - New accessors for GtkEntry windows + - New accessors for GtkRange members + + Bugs fixed: + - bgo#607082 - Add accessors for sealed GtkRange members + - bgo#567729 - Add GtkToolPalette + - bgo#591102 - Remove the destination file if trying to save a + pixbuf failed + - bgo#600865 - Avoid drawing implicit paints to destroyed + windows + - bgo#601412 - Fix some issues with action widgets + - bgo#603144 - Correct PRC6 and PRC9 envelope sizes + - bgo#606009 - weirdness with clipping in abiword - csw + - bgo#606698 - Misplaced declaration of + gtk_print_job_set_status + - bgo#606761 - pixops.c: variables are declared at middle of + block + - bgo#607217 - Mixing calls to _set_markup and _set_text + causes... + - bgo#607269 - gtk_label_set_attributes with empty list no + longer... + - bgo#607322 - Double-click doesn't work if the item is + selected... + - bgo#607687 - Avoid integer overflow in + gdk_rectangle_intersect + - bgo#607778 - Add accessors for GtkEntry's windows + - bgo#607770 - Leak in GtkTreeView with HildonPannableArea + - bgo#603245 - Fix a redraw problem with action widgets + + Updated translations. +- Drop gtk2-bad-drawable-errors.patch: fixed upstream. + +------------------------------------------------------------------- +Sat Jan 16 11:40:10 UTC 2010 - andrea(a)opensuse.org + +- Add gtk2-bad-drawable-errors.patch, taken from upstream: + this is needed to fix crashes in various circumstances. + Fix bnc#570941, bgo#600865. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gtk+-2.19.3.tar.bz2 New: ---- gtk+-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.gqXG0M/_old 2010-02-11 19:10:28.000000000 +0100 +++ /var/tmp/diff_new_pack.gqXG0M/_new 2010-02-11 19:10:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gtk2 (Version 2.19.3) +# spec file for package gtk2 (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,9 @@ Name: gtk2 %define _name gtk+ -Version: 2.19.3 +Version: 2.19.5 Release: 1 +# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) License: LGPLv2.1+ Summary: Library for Creation of Graphical User Interfaces (version 2) @@ -180,7 +181,8 @@ %configure \ --enable-man \ --with-xinput=xfree -make %{?jobs:-j%jobs} +#make %{?jobs:-j%jobs} +make %install %makeinstall ++++++ gtk+-2.19.3.tar.bz2 -> gtk+-2.19.5.tar.bz2 ++++++ GNOME/gtk2/gtk+-2.19.3.tar.bz2 /mounts/work_src_done/STABLE/gtk2/gtk+-2.19.5.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bison for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package bison for openSUSE:Factory checked in at Thu Feb 11 19:13:10 CET 2010. -------- --- bison/bison.changes 2008-12-10 13:49:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/bison/bison.changes 2010-02-10 17:27:21.000000000 +0100 @@ -1,0 +2,41 @@ +Wed Feb 10 16:57:10 CET 2010 - rguenther(a)suse.de + +- Update to version 2.4.1. +- Apply fix for GCC 4.5 compliance. +- Apply fix for unsupported output file names. + +------------------------------------------------------------------- +Mon Feb 8 10:59:57 UTC 2010 - coolo(a)novell.com + +- package yacc.1 too + +------------------------------------------------------------------- +Fri Jan 29 12:42:41 UTC 2010 - coolo(a)novell.com + +- fix patch name + +------------------------------------------------------------------- +Tue Jan 26 11:53:49 CET 2010 - mmarek(a)suse.cz + +- updated to 2.4 + * new experimental %language directive to select the used + skeleton and output file name + * experimantal Java parser support + * support for push parsers + * bison now removes unreachable states (this might require + updates to %expect and %expect-rr directives) + * support for per-type and default %destructor's and %printer's + * except for LALR(1) parsers in C with POSIX Yacc emulation enabled + (with `-y', `--yacc', or `%yacc'), Bison no longer generates + #define statements for associating token numbers with token + names + * For a detailed list of fixes and new features, see + /usr/share/doc/packages/bison/NEWS + +------------------------------------------------------------------- +Sat Dec 12 20:36:01 CET 2009 - jengelh(a)medozas.de + +- enable parallel building +- add baselibs.conf as a source + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bison-2.3.tar.bz2 New: ---- bison-2.4.1-28169bab1f6f2fc bison-2.4.1-7439c5c0f949408 bison-2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bison.spec ++++++ --- /var/tmp/diff_new_pack.POYzZF/_old 2010-02-11 19:09:56.000000000 +0100 +++ /var/tmp/diff_new_pack.POYzZF/_new 2010-02-11 19:09:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package bison (Version 2.3) +# spec file for package bison (Version 2.4.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: bison BuildRequires: gcc-c++ -License: GPL v2 or later +License: GPLv2+ Group: Development/Languages/C and C++ PreReq: %install_info_prereq AutoReqProv: on @@ -30,28 +30,25 @@ %endif # Requires: m4 -Version: 2.3 -Release: 127 +Version: 2.4.1 +Release: 1 Summary: The GNU Parser Generator Url: http://www.gnu.org/software/bison/bison.html Source: bison-%{version}.tar.bz2 -Patch1: bison-%{version}-subpipe.diff +Source2: baselibs.conf +Patch1: bison-2.3-subpipe.diff +Patch2: bison-2.4.1-28169bab1f6f2fc +Patch3: bison-2.4.1-7439c5c0f949408 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Bison is a parser generator similar to yacc(1). - - -Authors: --------- - David J. MacKenzie <djm(a)gnu.org> - Noah Friedman <friedman(a)gnu.org> - Richard Stallman <rms(a)gnu.org> - %prep %setup -q %patch1 +%patch2 -p1 +%patch3 -p1 %build # CXXFLAGS is for c++ examples / test cases @@ -62,8 +59,8 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make -make check +make %{_smp_mflags} +make %{_smp_mflags} check %install rm -rf $RPM_BUILD_ROOT @@ -86,6 +83,7 @@ /usr/share/aclocal/bison-i18n.m4 %doc %{_infodir}/bison.info*.gz %doc %{_mandir}/man1/bison.1.gz +%doc %{_mandir}/man1/yacc.1.gz %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz ++++++ bison-2.4.1-28169bab1f6f2fc ++++++ >From 28169bab1f6f2fc9d682118703f6267c63583720 Mon Sep 17 00:00:00 2001 From: Akim Demaille <demaille(a)gostai.com> Date: Wed, 12 Aug 2009 14:18:12 +0000 Subject: tests: GCC 4.5 compliance. * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's messages about #error. --- diff --git a/tests/synclines.at b/tests/synclines.at index 8653b46..56efdac 100644 --- a/tests/synclines.at +++ b/tests/synclines.at @@ -34,7 +34,18 @@ m4_define([AT_SYNCLINES_COMPILE], # => # input.y:4: #error "4" # -AT_CHECK([[sed -e 's/^$[^:]*:[^:.]*$[.:][^:]*:$.*$$/\1:\2/' -e 's/^$[^:]*:[^:]*:$[^@%:@]*$ @%:@error$/\1\2/' stderr]], 0, [stdout]) +# It may also issue more context information: +# +# input.y: In function 'yyparse': +# input.y:8: #error "8" +# => +# input.y:4: #error "8" +# +AT_CHECK([[sed -e 's/^$[^:]*:[^:.]*$[.:][^:]*:$.*$$/\1:\2/' \ + -e 's/^$[^:]*:[^:]*:$[^@%:@]*$ @%:@error$/\1\2/' \ + -e "/^[^:]*: In function '[^\']*':$/d" \ + stderr]], + 0, [stdout]) ]) # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG) -- cgit v0.8.2.1 ++++++ bison-2.4.1-7439c5c0f949408 ++++++ >From 7439c5c0f94940884e998c06b910476c6f6145b5 Mon Sep 17 00:00:00 2001 From: Joel E. Denny <jdenny(a)clemson.edu> Date: Mon, 05 Oct 2009 02:59:18 +0000 Subject: tests: skip tests of file names that platform does not support. Reported by Michael Raskin at <http://lists.gnu.org/archive/html/bug-bison/2009-09/msg00001.html>. * THANKS (Michael Raskin): Add. * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Fix. Cygwin used to fail at least for file names containing ":" or "\". (cherry picked from commit 2ceb8c617cac934b45f101ab44508d72239c894b) Conflicts: THANKS --- diff --git a/tests/output.at b/tests/output.at index 971df1e..31298d7 100644 --- a/tests/output.at +++ b/tests/output.at @@ -175,6 +175,10 @@ AT_CHECK_CONFLICTING_OUTPUT([foo.y], [], [-o foo.y], m4_define([AT_CHECK_OUTPUT_FILE_NAME], [AT_SETUP([Output file name: $1]) +# Skip if platform doesn't support file name. For example, Cygwin +# doesn't support file names containing ":" or "\". +AT_CHECK([[touch "]AS_ESCAPE([$1[.tmp]])[" || exit 77]]) + AT_DATA_GRAMMAR([glr.y], [[%glr-parser %code { -- cgit v0.8.2.1 ++++++ bison-2.3.tar.bz2 -> bison-2.4.1.tar.bz2 ++++++ ++++ 340564 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbus-1-glib for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package dbus-1-glib for openSUSE:Factory checked in at Thu Feb 11 19:10:15 CET 2010. -------- --- dbus-1-glib/dbus-1-glib.changes 2009-12-16 10:48:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/dbus-1-glib/dbus-1-glib.changes 2010-02-11 00:59:07.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Feb 11 00:54:32 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.84: + + Support duplicate object registrations + + Only re-set registration list if it's non-empty + + Copy object registration list when unregistering. + + fdo#19623 - Add dbus_g_bus_get_private + + fdo#25119 - Don't leak DBusGMethodInvocation for no-reply calls + + Import dbus-bus-introspect.xml upstream + + dbus-gvalue: set an error when demarshal_basic doesn't + recognize type + + Man page fixes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- dbus-glib-0.82.tar.bz2 New: ---- dbus-glib-0.84.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-glib.spec ++++++ --- /var/tmp/diff_new_pack.i5zwFf/_old 2010-02-11 19:09:47.000000000 +0100 +++ /var/tmp/diff_new_pack.i5zwFf/_new 2010-02-11 19:09:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package dbus-1-glib (Version 0.82) +# spec file for package dbus-1-glib (Version 0.84) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,8 +24,8 @@ Url: http://dbus.freedesktop.org/ License: GPLv2+ ; Other uncritical OpenSource License Group: Development/Libraries/Other -Version: 0.82 -Release: 2 +Version: 0.84 +Release: 1 # bug437293 %ifarch ppc64 Obsoletes: dbus-1-glib-64bit ++++++ dbus-glib-0.82.tar.bz2 -> dbus-glib-0.84.tar.bz2 ++++++ ++++ 4219 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dejagnu for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package dejagnu for openSUSE:Factory checked in at Thu Feb 11 19:09:43 CET 2010. -------- --- dejagnu/dejagnu.changes 2007-05-16 11:45:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/dejagnu/dejagnu.changes 2009-12-07 12:34:42.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 7 12:34:27 CET 2009 - jengelh(a)medozas.de + +- enable parallel building + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dejagnu.spec ++++++ --- /var/tmp/diff_new_pack.ytbOb3/_old 2010-02-11 19:08:52.000000000 +0100 +++ /var/tmp/diff_new_pack.ytbOb3/_new 2010-02-11 19:08:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dejagnu (Version 1.4.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: dejagnu -License: GPL v2 or later +License: GPLv2+ Group: Development/Tools/Building Requires: tcl expect AutoReqProv: on Version: 1.4.4 -Release: 140 +Release: 141 Summary: Framework for Running Test Suites on Software Tools Url: http://www.gnu.org/software/dejagnu/ Source: %{name}-%{version}.tar.bz2 @@ -82,7 +82,7 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux -make +make %{?_smp_mflags} #cd doc #makeinfo dejagnu.texi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit jpeg for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package jpeg for openSUSE:Factory checked in at Thu Feb 11 19:09:36 CET 2010. -------- --- jpeg/jpeg.changes 2009-12-15 19:37:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg.changes 2010-02-09 08:59:49.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Feb 8 14:22:58 CET 2010 - pgajdos(a)suse.cz + +- updated to version 7.0.0 [bnc#561161]; summary from change.log + file: + * New scaled DCTs implemented. + * cjpeg -quality option has been extended for support of separate + quality settings for luminance and chrominance + * Added -nosmooth option to cjpeg, complementary to djpeg. + * Support arithmetic entropy encoding and decoding. + * jpegtran has a new "lossless" cropping feature. + * Implement -perfect option in jpegtran, new API function + jtransform_perfect_transform() in transupp. + * Add -raw option to rdjpgcom not to mangle the output. +- removed upstreamed/obsoleted patches +- libjpeg package renamed to libjpeg7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- jpeg-6b-cplusplus.patch jpeg-6b-destdir-1.patch jpeg-6b-int32.patch jpeg-6b-jconfig.patch jpeg-6b-jpegtran.patch jpeg-6b-tiff-ojpeg.patch jpeg-6b.dif jpegsrc.v6b.tar.bz2 New: ---- jpeg-7.0.0-int32.patch jpeg-7.0.0-jconfig.patch jpeg-7.0.0-tiff-ojpeg.patch jpegsrc.v7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpeg.spec ++++++ --- /var/tmp/diff_new_pack.iEb635/_old 2010-02-11 19:08:48.000000000 +0100 +++ /var/tmp/diff_new_pack.iEb635/_new 2010-02-11 19:08:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package jpeg (Version 6b) +# spec file for package jpeg (Version 7.0.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,19 +22,16 @@ License: BSD3c(or similar) Group: Productivity/Graphics/Convertors AutoReqProv: on -Version: 6b -Release: 883 +%define major_version 7 +Version: 7.0.0 +Release: 1 Summary: Independent JPEG Group's JPEG Software Url: http://www.ijg.org/ -Source: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.bz2 -Source2: baselibs.conf -Patch: jpeg-6b.dif -Patch1: jpeg-6b-int32.patch -Patch2: jpeg-6b-jconfig.patch -Patch3: jpeg-6b-tiff-ojpeg.patch -Patch4: jpeg-6b-jpegtran.patch -Patch5: jpeg-6b-cplusplus.patch -Patch6: http://svn.cross-lfs.org/svn/repos/patches/jpeg/jpeg-6b-destdir-1.patch +Source0: jpegsrc.v%{major_version}.tar.bz2 +Source1: baselibs.conf +Patch0: %{name}-%{version}-jconfig.patch +Patch1: %{name}-%{version}-tiff-ojpeg.patch +Patch2: %{name}-%{version}-int32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,10 +74,9 @@ Davide Rossi <jpeg-info(a)uunet.uu.net> Ge' Weijers <jpeg-info(a)uunet.uu.net> -%package -n libjpeg +%package -n libjpeg%{major_version} + License: BSD3c(or similar) -Version: 6.2.0 -Release: 883 Summary: JPEG libraries Group: System/Libraries AutoReqProv: on @@ -90,7 +86,7 @@ %endif # -%description -n libjpeg +%description -n libjpeg%{major_version} The libraries (static and dynamic) for the jpeg-graphics format. The sources are contained in the jpeg source package. @@ -103,11 +99,9 @@ %package -n libjpeg-devel License: BSD3c(or similar) -Version: 6.2.0 -Release: 149 Summary: Development Tools for applications which will use the Libjpeg Library Group: Development/Libraries/C and C++ -Requires: libjpeg = 6.2.0 +Requires: libjpeg%{major_version} = %{version} # bug437293 %ifarch ppc64 Obsoletes: libjpeg-devel-64bit @@ -122,20 +116,13 @@ %prep -%setup -q -n jpeg-6b -%patch +%setup -q -n jpeg-%{major_version} +%patch0 %patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -p1 +%patch2 -p1 %build %{?suse_update_config:%{suse_update_config -f}} -sed -e 's/powerpc/flowerpower/' < ltconfig > ltconfig.new -mv ltconfig.new ltconfig -chmod u+x ltconfig %configure --disable-static --enable-shared --with-pic %{__make} %{?jobs:-j%jobs} libdir=%{_libdir} @@ -143,29 +130,27 @@ make test libdir=%{_libdir} %install -#mkdir -p $RPM_BUILD_ROOT{%{_libdir},/usr/{include,bin}} -#mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 %makeinstall libdir=%{_libdir} rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la %clean rm -rf $RPM_BUILD_ROOT -%post -n libjpeg -p /sbin/ldconfig +%post -n libjpeg%{major_version} -p /sbin/ldconfig -%postun -n libjpeg -p /sbin/ldconfig +%postun -n libjpeg%{major_version} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc README coderules.doc install.doc usage.doc -%doc filelist.doc jconfig.doc structure.doc wizard.doc +%doc README change.log coderules.txt filelist.txt libjpeg.txt +%doc jconfig.txt structure.txt usage.txt wizard.txt /usr/bin/* %doc %{_mandir}/man1/* -%files -n libjpeg +%files -n libjpeg%{major_version} %defattr(-,root,root) -%{_libdir}/libjpeg.so.62.0.0 -%{_libdir}/libjpeg.so.62 +%{_libdir}/libjpeg.so.%{version} +%{_libdir}/libjpeg.so.%{major_version} %files -n libjpeg-devel %defattr(-,root,root) ++++++ jpeg-6b-int32.patch -> jpeg-7.0.0-int32.patch ++++++ --- jpeg/jpeg-6b-int32.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-int32.patch 2010-02-09 08:59:48.000000000 +0100 @@ -1,11 +1,13 @@ ---- jmorecfg.h -+++ jmorecfg.h -@@ -158,7 +158,7 @@ - /* INT32 must hold at least signed 32-bit values. */ - +Index: jpeg-7/jmorecfg.h +=================================================================== +--- jpeg-7.orig/jmorecfg.h ++++ jpeg-7/jmorecfg.h +@@ -161,7 +161,7 @@ typedef short INT16; #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ + #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ + #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ -typedef long INT32; +typedef int INT32; #endif - - /* Datatype used for image dimensions. The JPEG standard only supports + #endif + #endif ++++++ jpeg-6b-jconfig.patch -> jpeg-7.0.0-jconfig.patch ++++++ --- jpeg/jpeg-6b-jconfig.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-jconfig.patch 2010-02-08 14:51:25.000000000 +0100 @@ -1,8 +1,10 @@ ---- jconfig.cfg +Index: jconfig.cfg +=================================================================== +--- jconfig.cfg.orig +++ jconfig.cfg -@@ -1,22 +1,25 @@ +@@ -1,12 +1,18 @@ /* jconfig.cfg --- source file edited by configure script */ - /* see jconfig.doc for explanations */ + /* see jconfig.txt for explanations */ +/* Define this if you get warnings about undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN @@ -18,13 +20,14 @@ + #undef HAVE_STDDEF_H #undef HAVE_STDLIB_H - #undef NEED_BSD_STRINGS + #undef HAVE_LOCALE_H +@@ -14,10 +20,6 @@ #undef NEED_SYS_TYPES_H #undef NEED_FAR_POINTERS #undef NEED_SHORT_EXTERNAL_NAMES -/* Define this if you get warnings about undefined structures. */ -#undef INCOMPLETE_TYPES_BROKEN - +- -#ifdef JPEG_INTERNALS #undef RIGHT_SHIFT_IS_UNSIGNED ++++++ jpeg-6b-tiff-ojpeg.patch -> jpeg-7.0.0-tiff-ojpeg.patch ++++++ --- jpeg/jpeg-6b-tiff-ojpeg.patch 2006-12-19 00:16:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/jpeg/jpeg-7.0.0-tiff-ojpeg.patch 2010-02-08 14:51:26.000000000 +0100 @@ -1,7 +1,9 @@ ---- jdhuff.c +Index: jdhuff.c +=================================================================== +--- jdhuff.c.orig +++ jdhuff.c -@@ -649,3 +649,35 @@ - entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; +@@ -1307,3 +1307,35 @@ jinit_huff_decoder (j_decompress_ptr cin + } } } +/* ++++++ jpegsrc.v6b.tar.bz2 -> jpegsrc.v7.tar.bz2 ++++++ ++++ 90198 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit elfutils for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package elfutils for openSUSE:Factory checked in at Thu Feb 11 19:08:35 CET 2010. -------- --- elfutils/elfutils.changes 2009-12-12 18:13:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/elfutils/elfutils.changes 2010-02-10 12:24:01.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 10 12:21:51 CET 2010 - rguenther(a)suse.de + +- Fix uninitialized variable. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- elfutils-uninitialized.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elfutils.spec ++++++ --- /var/tmp/diff_new_pack.6glSHO/_old 2010-02-11 19:05:42.000000000 +0100 +++ /var/tmp/diff_new_pack.6glSHO/_new 2010-02-11 19:05:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package elfutils (Version 0.142) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: elfutils License: GPLv2+ Version: 0.142 -Release: 3 +Release: 4 Summary: Higher-level library to access ELF Group: System/Libraries Url: http://elfutils.fedorahosted.org @@ -38,6 +38,7 @@ Patch12: elfutils-old-scanf-fix.diff Patch13: elfutils-suse-10.3-fixes.diff Patch20: elfutils-0.137-dwarf-header-check-fix.diff +Patch21: elfutils-uninitialized.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -210,6 +211,7 @@ %patch13 %endif %patch20 -p1 +%patch21 %build autoreconf -fi ++++++ elfutils-uninitialized.diff ++++++ --- ./libdwfl/linux-kernel-modules.c.orig 2010-02-10 12:12:03.000000000 +0100 +++ ./libdwfl/linux-kernel-modules.c 2010-02-10 12:14:58.000000000 +0100 @@ -577,8 +577,8 @@ int dwfl_linux_kernel_report_kernel (Dwfl *dwfl) { - Dwarf_Addr start; - Dwarf_Addr end; + Dwarf_Addr start = 0; + Dwarf_Addr end = 0; inline Dwfl_Module *report (void) { return INTUSE(dwfl_report_module) (dwfl, KERNEL_MODNAME, start, end); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-doc-utils for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package gnome-doc-utils for openSUSE:Factory checked in at Thu Feb 11 19:08:30 CET 2010. -------- --- GNOME/gnome-doc-utils/gnome-doc-utils.changes 2010-01-12 01:33:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-doc-utils/gnome-doc-utils.changes 2010-02-10 16:02:32.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Feb 10 16:01:27 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.19.4: + + Bold userinput inside programlisting + + Updated translations. + +------------------------------------------------------------------- +Tue Jan 26 17:30:23 CET 2010 - vuntz(a)opensuse.org + +- Update to version 0.19.3: + + Fixed shading with rowspans, bgo#606986 + + Implemented text titles + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-doc-utils-0.19.2.tar.bz2 New: ---- gnome-doc-utils-0.19.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-doc-utils.spec ++++++ --- /var/tmp/diff_new_pack.7dbyL9/_old 2010-02-11 19:05:16.000000000 +0100 +++ /var/tmp/diff_new_pack.7dbyL9/_new 2010-02-11 19:05:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gnome-doc-utils (Version 0.19.2) +# spec file for package gnome-doc-utils (Version 0.19.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: gnome-doc-utils -Version: 0.19.2 +Version: 0.19.4 Release: 1 License: GPLv2+ ; LGPLv2.1+ Summary: A Collection of Documentation Utilities for GNOME ++++++ gnome-doc-utils-0.19.2.tar.bz2 -> gnome-doc-utils-0.19.4.tar.bz2 ++++++ ++++ 7628 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit file for openSUSE:Factory
by root＠Hilbert.suse.de 11 Feb '10

11 Feb '10

Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at Thu Feb 11 19:05:23 CET 2010. -------- --- file/file.changes 2009-12-12 22:08:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/file/file.changes 2010-02-05 17:16:27.000000000 +0100 @@ -1,0 +2,28 @@ +Fri Feb 5 17:15:51 CET 2010 - werner(a)suse.de + +- Update to file version 5.04 + * print proper mime for crystal reports file + * print the last summary information of a cdf document, not the + first so that nested documents print the right info + * ctime/asctime can return NULL on some OS's although + they should not (Toshit Antani) + * Centralize magic path handling routines and remove the + special-casing from file.c so that the python module for + example comes up with the same magic path (Fixes ~/.magic + handling) (from Gab) + * When magic argument is a directory, read the files in + strcmp-sorted order (fixes Debian bug #488562 and our own FIXME). + * Combine overlapping epoc and psion magic files into one (epoc). + * Add some more EPOC MIME types. + * Fix 3 bugs (From Ian Darwin): + - file_showstr could move one past the end of the array + - parse_apple did not nul terminate the string in the overflow case + - parse_mime truncated the wrong string in the overflow case + * Add the necessary field handling for crystal reports files to work + * Stop "(if" identifying Lisp files, that's plain dumb! + * Add a couple of missing MP3 MIME types. + * Add full range of hash-bang tests for Python and Ruby. + * Add MIME types for Python and Ruby scripts. + * off by one in parsing hw capabilities in elf (Cheng Renquan) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- file-4.24-awk.dif file-5.02-exec.dif file-5.02-zip2.0.dif file-5.03.dif file-5.03.tar.bz2 New: ---- file-5.04-awk.dif file-5.04-exec.dif file-5.04-zip2.0.dif file-5.04.dif file-5.04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package file (Version 5.03) +# spec file for package file (Version 5.04) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,14 +30,14 @@ %endif # # Set Version also in python-magic.spec -Version: 5.03 -Release: 4 +Version: 5.04 +Release: 1 Summary: A Tool to Determine File Types Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.bz2 Source2: baselibs.conf Patch: file-%{version}.dif Patch1: file-5.02-misc.dif -Patch3: file-5.02-exec.dif +Patch3: file-5.04-exec.dif Patch4: file-4.24-autoconf.dif Patch5: file-4.03-tex.dif Patch7: file-4.20-ssd.dif @@ -47,7 +47,7 @@ Patch11: file-4.24-reg_dos.dif Patch12: file-5.02-option.dif Patch13: file-4.21-scribus.dif -Patch14: file-4.24-awk.dif +Patch14: file-5.04-awk.dif Patch15: file-4.21-xcursor.dif Patch16: file-4.21-reiserfs.dif Patch20: file-4.24-mips.dif @@ -56,7 +56,7 @@ Patch24: file-4.24-warn.dif Patch25: file-5.02-javacheck.dif Patch26: file-4.24-solv.dif -Patch27: file-5.02-zip2.0.dif +Patch27: file-5.04-zip2.0.dif Patch28: file-5.03-iso9660.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-magic (Version 5.03) +# spec file for package python-magic (Version 5.04) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,8 +26,8 @@ License: BSD 3 Clause, BSD 4 Clause Group: Development/Languages/Python AutoReqProv: on -Version: 5.03 -Release: 4 +Version: 5.04 +Release: 1 Summary: Python module to use libmagic %py_requires Source99: file.spec ++++++ file-4.03-tex.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,5 @@ -Index: magic/Localstuff -=================================================================== ---- magic/Localstuff.orig -+++ magic/Localstuff +--- magic/Localstuff ++++ magic/Localstuff 2003-07-01 16:58:32.000000000 +0000 @@ -5,3 +5,12 @@ # $File: Localstuff,v 1.4 2003/03/23 04:17:27 christos Exp $ # Add any locally observed files here. Remember: ++++++ file-4.24-autoconf.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -1,7 +1,5 @@ -Index: doc/Makefile.am -=================================================================== ---- doc/Makefile.am.orig -+++ doc/Makefile.am +--- doc/Makefile.am ++++ doc/Makefile.am 2003-12-15 12:04:19.000000000 +0000 @@ -5,7 +5,8 @@ else man_MAGIC = magic.4 endif @@ -22,10 +20,8 @@ @rm -f $@ sed -e s@__CSECTION__@1@g \ -e s@__FSECTION__@${fsect}@g \ -Index: src/readelf.h -=================================================================== ---- src/readelf.h.orig -+++ src/readelf.h +--- src/readelf.h ++++ src/readelf.h 2003-07-01 14:53:55.000000000 +0000 @@ -34,7 +34,10 @@ #ifndef __fake_elf_h__ #define __fake_elf_h__ ++++++ file-5.02-misc.dif ++++++ --- /var/tmp/diff_new_pack.1EObcf/_old 2010-02-11 19:05:17.000000000 +0100 +++ /var/tmp/diff_new_pack.1EObcf/_new 2010-02-11 19:05:17.000000000 +0100 @@ -49,25 +49,25 @@ +++ magic/Magdir/commands 2009-05-05 13:57:30.778196178 +0200 @@ -12,6 +12,8 @@ !:mime text/x-shellscript - 0 string/b #!\ /bin/tcsh Tenex C shell script text executable + 0 string/w #!\ /bin/tcsh Tenex C shell script text executable !:mime text/x-shellscript -+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable ++0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable +!:mime text/x-shellscript - 0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable + 0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable !:mime text/x-shellscript - 0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable + 0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable @@ -54,7 +56,11 @@ - 0 string/b #!\ /bin/rc Plan 9 rc shell script text executable + 0 string/w #!\ /bin/rc Plan 9 rc shell script text executable # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) --0 string/b #!\ /bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /bin/bash Bourne-Again shell script text executable +-0 string/w #!\ /bin/bash Bourne-Again shell script text executable ++0 string/w #!\ /bin/bash Bourne-Again shell script text executable +!:mime text/x-shellscript -+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable ++0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable +!:mime text/x-shellscript -+0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable ++0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable !:mime text/x-shellscript - 0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable + 0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable !:mime text/x-shellscript --- magic/Magdir/mach +++ magic/Magdir/mach 2003-12-08 17:50:03.000000000 +0100 ++++++ file-4.24-awk.dif -> file-5.04-awk.dif ++++++ --- file/file-4.24-awk.dif 2008-04-14 19:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-awk.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,10 +1,10 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2008-04-14 17:05:54.968746122 +0200 -@@ -51,6 +51,7 @@ ++++ magic/Magdir/commands 2010-02-05 14:32:12.093297356 +0000 +@@ -52,6 +52,7 @@ # update to distinguish from *.vcf files # this is broken because postscript has /EBEGIN{ for example. - #0 search/Bb BEGIN { awk script text + #0 search/Ww BEGIN { awk script text +0 regex =^\\s*BEGIN\\s*[{] awk script text # AT&T Bell Labs' Plan 9 shell - 0 string/b #!\ /bin/rc Plan 9 rc shell script text + 0 string/w #!\ /bin/rc Plan 9 rc shell script text ++++++ file-5.02-exec.dif -> file-5.04-exec.dif ++++++ --- file/file-5.02-exec.dif 2009-05-05 14:43:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-exec.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,144 +1,169 @@ --- magic/Magdir/commands -+++ magic/Magdir/commands 2009-05-05 14:01:03.253902298 +0200 -@@ -3,66 +3,66 @@ ++++ magic/Magdir/commands 2010-02-05 14:28:46.657297767 +0000 +@@ -4,73 +4,73 @@ # commands: file(1) magic for various shells and interpreters # #0 string : shell archive or script for antique kernel text --0 string/b #!\ /bin/sh POSIX shell script text executable -+0 string/b #!\ /bin/sh POSIX shell script text +-0 string/w #!\ /bin/sh POSIX shell script text executable ++0 string/w #!\ /bin/sh POSIX shell script text !:mime text/x-shellscript --0 string/b #!\ /bin/csh C shell script text executable -+0 string/b #!\ /bin/csh C shell script text +-0 string/w #!\ /bin/csh C shell script text executable ++0 string/w #!\ /bin/csh C shell script text !:mime text/x-shellscript # korn shell magic, sent by George Wu, gwu(a)clyde.att.com --0 string/b #!\ /bin/ksh Korn shell script text executable -+0 string/b #!\ /bin/ksh Korn shell script text +-0 string/w #!\ /bin/ksh Korn shell script text executable ++0 string/w #!\ /bin/ksh Korn shell script text !:mime text/x-shellscript --0 string/b #!\ /bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /bin/tcsh Tenex C shell script text +-0 string/w #!\ /bin/tcsh Tenex C shell script text executable ++0 string/w #!\ /bin/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/bin/tcsh Tenex C shell script text +-0 string/w #!\ /usr/bin/tcsh Tenex C shell script text executable ++0 string/w #!\ /usr/bin/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/local/tcsh Tenex C shell script text +-0 string/w #!\ /usr/local/tcsh Tenex C shell script text executable ++0 string/w #!\ /usr/local/tcsh Tenex C shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text executable -+0 string/b #!\ /usr/local/bin/tcsh Tenex C shell script text +-0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text executable ++0 string/w #!\ /usr/local/bin/tcsh Tenex C shell script text !:mime text/x-shellscript # # zsh/ash/ae/nawk/gawk magic from cameron(a)cs.unsw.oz.au (Cameron Simpson) --0 string/b #!\ /bin/zsh Paul Falstad's zsh script text executable -+0 string/b #!\ /bin/zsh Paul Falstad's zsh script text +-0 string/w #!\ /bin/zsh Paul Falstad's zsh script text executable ++0 string/w #!\ /bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text executable -+0 string/b #!\ /usr/bin/zsh Paul Falstad's zsh script text +-0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text executable ++0 string/w #!\ /usr/bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable -+0 string/b #!\ /usr/local/bin/zsh Paul Falstad's zsh script text +-0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text executable ++0 string/w #!\ /usr/local/bin/zsh Paul Falstad's zsh script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text executable -+0 string/b #!\ /usr/local/bin/ash Neil Brown's ash script text +-0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text executable ++0 string/w #!\ /usr/local/bin/ash Neil Brown's ash script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text executable -+0 string/b #!\ /usr/local/bin/ae Neil Brown's ae script text +-0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text executable ++0 string/w #!\ /usr/local/bin/ae Neil Brown's ae script text !:mime text/x-shellscript --0 string/b #!\ /bin/nawk new awk script text executable -+0 string/b #!\ /bin/nawk new awk script text +-0 string/w #!\ /bin/nawk new awk script text executable ++0 string/w #!\ /bin/nawk new awk script text !:mime text/x-nawk --0 string/b #!\ /usr/bin/nawk new awk script text executable -+0 string/b #!\ /usr/bin/nawk new awk script text +-0 string/w #!\ /usr/bin/nawk new awk script text executable ++0 string/w #!\ /usr/bin/nawk new awk script text !:mime text/x-nawk --0 string/b #!\ /usr/local/bin/nawk new awk script text executable -+0 string/b #!\ /usr/local/bin/nawk new awk script text +-0 string/w #!\ /usr/local/bin/nawk new awk script text executable ++0 string/w #!\ /usr/local/bin/nawk new awk script text !:mime text/x-nawk --0 string/b #!\ /bin/gawk GNU awk script text executable -+0 string/b #!\ /bin/gawk GNU awk script text +-0 string/w #!\ /bin/gawk GNU awk script text executable ++0 string/w #!\ /bin/gawk GNU awk script text !:mime text/x-gawk --0 string/b #!\ /usr/bin/gawk GNU awk script text executable -+0 string/b #!\ /usr/bin/gawk GNU awk script text +-0 string/w #!\ /usr/bin/gawk GNU awk script text executable ++0 string/w #!\ /usr/bin/gawk GNU awk script text !:mime text/x-gawk --0 string/b #!\ /usr/local/bin/gawk GNU awk script text executable -+0 string/b #!\ /usr/local/bin/gawk GNU awk script text +-0 string/w #!\ /usr/local/bin/gawk GNU awk script text executable ++0 string/w #!\ /usr/local/bin/gawk GNU awk script text !:mime text/x-gawk # --0 string/b #!\ /bin/awk awk script text executable -+0 string/b #!\ /bin/awk awk script text +-0 string/w #!\ /bin/awk awk script text executable ++0 string/w #!\ /bin/awk awk script text !:mime text/x-awk --0 string/b #!\ /usr/bin/awk awk script text executable -+0 string/b #!\ /usr/bin/awk awk script text +-0 string/w #!\ /usr/bin/awk awk script text executable ++0 string/w #!\ /usr/bin/awk awk script text !:mime text/x-awk # update to distinguish from *.vcf files # this is broken because postscript has /EBEGIN{ for example. - #0 search/Bb BEGIN { awk script text + #0 search/Ww BEGIN { awk script text # AT&T Bell Labs' Plan 9 shell --0 string/b #!\ /bin/rc Plan 9 rc shell script text executable -+0 string/b #!\ /bin/rc Plan 9 rc shell script text +-0 string/w #!\ /bin/rc Plan 9 rc shell script text executable ++0 string/w #!\ /bin/rc Plan 9 rc shell script text # bash shell magic, from Peter Tobias (tobias(a)server.et-inf.fho-emden.de) --0 string/b #!\ /bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /bin/bash Bourne-Again shell script text +-0 string/w #!\ /bin/bash Bourne-Again shell script text executable ++0 string/w #!\ /bin/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/bin/bash Bourne-Again shell script text +-0 string/w #!\ /usr/bin/bash Bourne-Again shell script text executable ++0 string/w #!\ /usr/bin/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/local/bash Bourne-Again shell script text +-0 string/w #!\ /usr/local/bash Bourne-Again shell script text executable ++0 string/w #!\ /usr/local/bash Bourne-Again shell script text !:mime text/x-shellscript --0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text executable -+0 string/b #!\ /usr/local/bin/bash Bourne-Again shell script text +-0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text executable ++0 string/w #!\ /usr/local/bin/bash Bourne-Again shell script text !:mime text/x-shellscript # using env -@@ -79,9 +79,9 @@ + 0 string #!/usr/bin/env a +->15 string >\0 %s script text executable ++>15 string >\0 %s script text + 0 string #!\ /usr/bin/env a +->16 string >\0 %s script text executable ++>16 string >\0 %s script text + + # PHP scripts + # Ulf Harnhammar <ulfh(a)update.uu.se> +@@ -80,9 +80,9 @@ !:mime text/x-php 0 search/1 =<?\r PHP script text !:mime text/x-php --0 search/1/b #!\ /usr/local/bin/php PHP script text executable -+0 search/1/b #!\ /usr/local/bin/php PHP script text +-0 search/1/w #!\ /usr/local/bin/php PHP script text executable ++0 search/1/w #!\ /usr/local/bin/php PHP script text !:mime text/x-php --0 search/1/b #!\ /usr/bin/php PHP script text executable -+0 search/1/b #!\ /usr/bin/php PHP script text +-0 search/1/w #!\ /usr/bin/php PHP script text executable ++0 search/1/w #!\ /usr/bin/php PHP script text !:mime text/x-php 0 string Zend\x00 PHP script Zend Optimizer data --- magic/Magdir/perl -+++ magic/Magdir/perl 2009-05-05 14:01:33.658402106 +0200 -@@ -4,15 +4,15 @@ ++++ magic/Magdir/perl 2009-05-05 12:01:34.000000000 +0000 +@@ -6,15 +6,15 @@ # The `eval' lines recognizes an outrageously clever hack. # Keith Waclena <keith(a)cerberus.uchicago.edu> # Send additions to <perl5-porters(a)perl.org> --0 search/1/b #!\ /bin/perl Perl script text executable -+0 search/1/b #!\ /bin/perl Perl script text +-0 search/1/w #!\ /bin/perl Perl script text executable ++0 search/1/w #!\ /bin/perl Perl script text !:mime text/x-perl 0 search/1 eval\ "exec\ /bin/perl Perl script text !:mime text/x-perl --0 search/1/b #!\ /usr/bin/perl Perl script text executable -+0 search/1/b #!\ /usr/bin/perl Perl script text +-0 search/1/w #!\ /usr/bin/perl Perl script text executable ++0 search/1/w #!\ /usr/bin/perl Perl script text !:mime text/x-perl 0 search/1 eval\ "exec\ /usr/bin/perl Perl script text !:mime text/x-perl --0 search/1/b #!\ /usr/local/bin/perl Perl script text executable -+0 search/1/b #!\ /usr/local/bin/perl Perl script text +-0 search/1/w #!\ /usr/local/bin/perl Perl script text executable ++0 search/1/w #!\ /usr/local/bin/perl Perl script text !:mime text/x-perl 0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text !:mime text/x-perl --- magic/Magdir/python -+++ magic/Magdir/python 2006-03-24 14:51:26.000000000 +0100 -@@ -4,7 +4,7 @@ ++++ magic/Magdir/python 2010-02-05 14:29:13.101297655 +0000 +@@ -5,7 +5,7 @@ # # From: David Necas <yeti(a)physics.muni.cz> # often the module starts with a multiline string -0 string """ a python script text executable +0 string """ a python script text - # MAGIC as specified in Python/import.c (1.5 to 2.3.0a) + # MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming + # that Py_UnicodeFlag is off for Python 2) # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" - 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled +@@ -20,11 +20,11 @@ + 0 belong 0x3b0c0d0a python 3.0 byte-compiled + 0 belong 0x4f0c0d0a python 3.1 byte-compiled + +-0 search/1/w #!\ /usr/bin/python Python script text executable ++0 search/1/w #!\ /usr/bin/python Python script text + !:mime text/x-python +-0 search/1/w #!\ /usr/local/bin/python Python script text executable ++0 search/1/w #!\ /usr/local/bin/python Python script text + !:mime text/x-python +-0 search/1 #!/usr/bin/env\ python Python script text executable ++0 search/1 #!/usr/bin/env\ python Python script text + !:mime text/x-python +-0 search/1 #!\ /usr/bin/env\ ruby Python script text executable ++0 search/1 #!\ /usr/bin/env\ ruby Python script text + !:mime text/x-python --- magic/Magdir/varied.script -+++ magic/Magdir/varied.script 2007-03-21 11:22:09.000000000 +0100 -@@ -2,12 +2,12 @@ ++++ magic/Magdir/varied.script 2007-03-21 10:22:09.000000000 +0000 +@@ -4,12 +4,12 @@ # varied.script: file(1) magic for various interpreter scripts 0 string #!\ / a ++++++ file-5.02-zip2.0.dif -> file-5.04-zip2.0.dif ++++++ --- file/file-5.02-zip2.0.dif 2009-05-07 17:46:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04-zip2.0.dif 2010-02-05 17:16:36.000000000 +0100 @@ -1,8 +1,8 @@ --- magic/Magdir/archive -+++ magic/Magdir/archive 2009-05-07 17:43:15.549950181 +0200 -@@ -575,6 +575,10 @@ - >4 byte 0x14 - >>30 ubelong !0x6d696d65 Zip archive data, at least v2.0 to extract ++++ magic/Magdir/archive 2010-02-05 15:43:36.517302304 +0000 +@@ -581,6 +581,10 @@ + !:mime application/zip + >>4 byte 0x14 Zip archive data, at least v2.0 to extract !:mime application/zip +>>30 ubelong 0x6d696d65 Zip archive data, at least v2.0 to extract +>>>34 ubelong 0x74797065 \b, mime type ++++++ file-4.24-awk.dif -> file-5.04.dif ++++++ --- file/file-4.24-awk.dif 2008-04-14 19:32:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/file/file-5.04.dif 2010-02-05 17:16:35.000000000 +0100 @@ -1,10 +1,470 @@ ---- magic/Magdir/commands -+++ magic/Magdir/commands 2008-04-14 17:05:54.968746122 +0200 -@@ -51,6 +51,7 @@ - # update to distinguish from *.vcf files - # this is broken because postscript has /EBEGIN{ for example. - #0 search/Bb BEGIN { awk script text -+0 regex =^\\s*BEGIN\\s*[{] awk script text +--- magic/Header ++++ magic/Header 2006-03-27 13:29:19.000000000 +0200 +@@ -1,5 +1,7 @@ + # Magic + # Magic data for file(1) command. +-# Machine-generated from src/cmd/file/magdir/*; edit there only! +-# Format is described in magic(files), where: +-# files is 5 on V7 and BSD, 4 on SV, and ?? in the SVID. ++# Format is described in magic(5). ++# ++# Note: If you have edited this file you may run `file -C' ++# to make a pre-compiled magic.mgc for faster execution ++# +--- magic/Makefile.am ++++ magic/Makefile.am 2010-02-05 16:37:45.805297766 +0100 +@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir + MAGIC_DIR = $(top_srcdir)/magic + MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) - # AT&T Bell Labs' Plan 9 shell - 0 string/b #!\ /bin/rc Plan 9 rc shell script text +-pkgdata_DATA = magic.mgc ++pkgdata_DATA = magic.mgc magic + + EXTRA_DIST = \ + $(MAGIC_DIR)/Header \ +@@ -20,7 +20,6 @@ $(MAGIC_FRAGMENT_DIR)/amanda \ + $(MAGIC_FRAGMENT_DIR)/amigaos \ + $(MAGIC_FRAGMENT_DIR)/animation \ + $(MAGIC_FRAGMENT_DIR)/apl \ +-$(MAGIC_FRAGMENT_DIR)/apple \ + $(MAGIC_FRAGMENT_DIR)/applix \ + $(MAGIC_FRAGMENT_DIR)/archive \ + $(MAGIC_FRAGMENT_DIR)/asterix \ +@@ -67,7 +66,6 @@ $(MAGIC_FRAGMENT_DIR)/epoc \ + $(MAGIC_FRAGMENT_DIR)/erlang \ + $(MAGIC_FRAGMENT_DIR)/esri \ + $(MAGIC_FRAGMENT_DIR)/fcs \ +-$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/flash \ + $(MAGIC_FRAGMENT_DIR)/fonts \ + $(MAGIC_FRAGMENT_DIR)/fortran \ +@@ -98,19 +96,19 @@ $(MAGIC_FRAGMENT_DIR)/island \ + $(MAGIC_FRAGMENT_DIR)/ispell \ + $(MAGIC_FRAGMENT_DIR)/java \ + $(MAGIC_FRAGMENT_DIR)/jpeg \ ++$(MAGIC_FRAGMENT_DIR)/linux \ ++$(MAGIC_FRAGMENT_DIR)/filesystems \ + $(MAGIC_FRAGMENT_DIR)/karma \ + $(MAGIC_FRAGMENT_DIR)/kde \ + $(MAGIC_FRAGMENT_DIR)/kml \ + $(MAGIC_FRAGMENT_DIR)/lecter \ + $(MAGIC_FRAGMENT_DIR)/lex \ + $(MAGIC_FRAGMENT_DIR)/lif \ +-$(MAGIC_FRAGMENT_DIR)/linux \ + $(MAGIC_FRAGMENT_DIR)/lisp \ + $(MAGIC_FRAGMENT_DIR)/llvm \ + $(MAGIC_FRAGMENT_DIR)/lua \ + $(MAGIC_FRAGMENT_DIR)/luks \ + $(MAGIC_FRAGMENT_DIR)/mach \ +-$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/magic \ + $(MAGIC_FRAGMENT_DIR)/mail.news \ + $(MAGIC_FRAGMENT_DIR)/maple \ +@@ -126,10 +124,10 @@ $(MAGIC_FRAGMENT_DIR)/misctools \ + $(MAGIC_FRAGMENT_DIR)/mkid \ + $(MAGIC_FRAGMENT_DIR)/mlssa \ + $(MAGIC_FRAGMENT_DIR)/mmdf \ +-$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/motorola \ + $(MAGIC_FRAGMENT_DIR)/mozilla \ + $(MAGIC_FRAGMENT_DIR)/msdos \ ++$(MAGIC_FRAGMENT_DIR)/modem \ + $(MAGIC_FRAGMENT_DIR)/msvc \ + $(MAGIC_FRAGMENT_DIR)/mup \ + $(MAGIC_FRAGMENT_DIR)/natinst \ +@@ -165,6 +163,8 @@ $(MAGIC_FRAGMENT_DIR)/pyramid \ + $(MAGIC_FRAGMENT_DIR)/python \ + $(MAGIC_FRAGMENT_DIR)/revision \ + $(MAGIC_FRAGMENT_DIR)/riff \ ++$(MAGIC_FRAGMENT_DIR)/apple \ ++$(MAGIC_FRAGMENT_DIR)/macintosh \ + $(MAGIC_FRAGMENT_DIR)/rpm \ + $(MAGIC_FRAGMENT_DIR)/rtf \ + $(MAGIC_FRAGMENT_DIR)/ruby \ +@@ -223,8 +223,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \ + $(MAGIC_FRAGMENT_DIR)/zilog \ + $(MAGIC_FRAGMENT_DIR)/zyxel + ++RAW = magic + MAGIC = magic.mgc +-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff ++CLEANFILES = ${MAGIC} $(MAGIC_DIR)/Localstuff ${RAW} ++ ++${RAW}: $(MAGIC_DIR)/Header $(MAGIC_DIR)/Localstuff $(EXTRA_DIST) ++ cat /dev/null > $@ ++ for frag in $(EXTRA_DIST); do \ ++ if test -f $(srcdir)/$$frag; then \ ++ f=$(srcdir)/$$frag; \ ++ else \ ++ f=$$frag; \ ++ fi; \ ++ cat $$f; \ ++ done >> $@ + + # FIXME: Build file natively as well so that it can be used to compile + # the target's magic file +@@ -236,7 +248,5 @@ FILE_COMPILE = $(top_builddir)/src/file + FILE_COMPILE_DEP = $(FILE_COMPILE) + endif + +-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) +- @mkdir magic && cp -p $(EXTRA_DIST) magic +- $(FILE_COMPILE) -C -m magic +- @rm -fr magic ++${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW) ++ $(FILE_COMPILE) -C -m $(RAW) +--- magic/Magdir/elf ++++ magic/Magdir/elf 2006-11-22 15:57:15.000000000 +0100 +@@ -101,7 +101,7 @@ + >>18 leshort 47 Renesas H8/300H, + >>18 leshort 48 Renesas H8S, + >>18 leshort 49 Renesas H8/500, +->>18 leshort 50 IA-64, ++>>18 leshort 50 IA-64 (Intel 64 bit architecture), + >>18 leshort 51 Stanford MIPS-X, + >>18 leshort 52 Motorola Coldfire, + >>18 leshort 53 Motorola M68HC12, +@@ -246,7 +246,7 @@ + >>18 beshort 47 Renesas H8/300H, + >>18 beshort 48 Renesas H8S, + >>18 beshort 49 Renesas H8/500, +->>18 beshort 50 IA-64, ++>>18 beshort 50 IA-64 (Intel 64 bit architecture), + >>18 beshort 51 Stanford MIPS-X, + >>18 beshort 52 Motorola Coldfire, + >>18 beshort 53 Motorola M68HC12, +--- magic/Magdir/linux ++++ magic/Magdir/linux 2009-05-05 14:25:20.898401425 +0200 +@@ -81,21 +81,43 @@ + # and Nicol�s Lichtmaier <nick(a)debian.org> + # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29 + # Linux kernel boot images (i386 arch) (Wolfram Kleff) +-514 string HdrS Linux kernel +->510 leshort 0xAA55 x86 boot executable +->>518 leshort >0x1ff +->>>529 byte 0 zImage, +->>>529 byte 1 bzImage, +->>>(526.s+0x200) string >\0 version %s, +->>498 leshort 1 RO-rootFS, +->>498 leshort 0 RW-rootFS, +->>508 leshort >0 root_dev 0x%X, +->>502 leshort >0 swap_dev 0x%X, +->>504 leshort >0 RAMdisksize %u KB, +->>506 leshort 0xFFFF Normal VGA +->>506 leshort 0xFFFE Extended VGA +->>506 leshort 0xFFFD Prompt for Videomode +->>506 leshort >0 Video mode %d ++514 string HdrS Linux ++>510 leshort 0xAA55 \b/x86 Kernel ++>510 leshort <0xAA55 Kernel ++>510 leshort >0xAA55 Kernel ++>518 leshort 0x0105 \b, Setup Version 0x105, zImage ++>518 leshort >0x0105 \b, Setup Version %#hx ++>>529 byte 0 \b, zImage ++>>529 byte 1 \b, bzImage ++>>>(526.s+0x205) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 32 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x205) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %5.5s ++>>>(526.s+0x206) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %6.6s ++>>>(526.s+0x207) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %7.7s ++>>>(526.s+0x208) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %8.8s ++>>>(526.s+0x209) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %9.9s ++>>>(526.s+0x20a) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %10.10s ++>>>(526.s+0x20b) byte 45 ++>>>>(526.s+0x200) string >\0 \b, Version %11.11s ++>>498 leshort 1 \b, RO-rootFS ++>>498 leshort 0 \b, RW-rootFS ++>>508 leshort >0 \b, root_dev 0x%X ++>>502 leshort >0 \b, swap_dev 0x%X ++>>504 leshort >0 \b, RAMdisksize %u KB ++>>506 leshort 0xFFFF \b, Normal VGA ++>>506 leshort 0xFFFE \b, Extended VGA ++>>506 leshort 0xFFFD \b, Prompt for Videomode ++>>506 leshort >0 \b, Video mode %d + # This also matches new kernels, which were caught above by "HdrS". + 0 belong 0xb8c0078e Linux kernel + >0x1e3 string Loading version 1.3.79 or older +--- magic/Magdir/modem ++++ magic/Magdir/modem 2006-03-27 13:29:19.000000000 +0200 +@@ -2,9 +2,9 @@ + # modem: file(1) magic for modem programs + # + # From: Florian La Roche <florian(a)knorke.saar.de> +-4 string Research, Digifax-G3-File +->29 byte 1 , fine resolution +->29 byte 0 , normal resolution ++1 string PC\ Research,\ Inc Digifax-G3-File ++>29 byte 1 \b, fine resolution ++>29 byte 0 \b, normal resolution + + 0 short 0x0100 raw G3 data, byte-padded + 0 short 0x1400 raw G3 data +--- magic/Magdir/msad ++++ magic/Magdir/msad 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++#------------------------------------------------------------------------------ ++# msad: file(1) magic for msad ++# Microsoft visual C ++# This must precede the heuristic for raw G3 data ++4 string Standard\ Jet\ DB Microsoft Access Database +--- magic/Magdir/msdos ++++ magic/Magdir/msdos 2009-05-05 14:29:29.646404153 +0200 +@@ -70,6 +70,7 @@ + >>&0 leshort 0x290 PA-RISC + >>&18 leshort&0x0100 >0 32-bit + >>&18 leshort&0x1000 >0 system file ++>>&228 lelong >0 \b, Mono/.Net assembly + >>&0xf4 search/0x140 \x0\x40\x1\x0 + >>>(&0.l+(4)) string MSCF \b, WinHKI CAB self-extracting archive + >30 string Copyright\ 1989-1990\ PKWARE\ Inc. Self-extracting PKZIP archive +@@ -107,7 +108,7 @@ + >>>(0x3c.l+4) leshort 0x200 Intel Itanium + >>>(0x3c.l+22) leshort&0x0100 >0 32-bit + >>>(0x3c.l+22) leshort&0x1000 >0 system file +->>>(0x3c.l+232) lelong >0 Mono/.Net assembly ++>>>(0x3c.l+232) lelong >0 \b, Mono/.Net assembly + + >>>>(0x3c.l+0xf8) string UPX0 \b, UPX compressed + >>>>(0x3c.l+0xf8) search/0x140 PEC2 \b, PECompact2 compressed +@@ -520,6 +521,13 @@ + # Acroread or something files wrongly identified as G3 .pfm + # these have the form \000 \001 any? \002 \000 \000 + # or \000 \001 any? \022 \000 \000 ++0 belong&0xffff00ff 0x00010012 PFM data ++>4 string \000\000 ++>6 string >\060 - %s ++ ++0 belong&0xffff00ff 0x00010002 PFM data ++>4 string \000\000 ++>6 string >\060 - %s + #0 string \000\001 pfm? + #>3 string \022\000\000Copyright\ yes + #>3 string \002\000\000Copyright\ yes +--- src/Makefile.am ++++ src/Makefile.am 2008-04-14 17:14:56.000000000 +0200 +@@ -1,4 +1,4 @@ +-MAGIC = $(pkgdatadir)/magic ++MAGIC = $(sysconfdir)/magic:$(pkgdatadir)/magic + lib_LTLIBRARIES = libmagic.la + include_HEADERS = magic.h + +--- src/dcore.c ++++ src/dcore.c 2006-03-27 13:29:19.000000000 +0200 +@@ -0,0 +1,207 @@ ++/* ++ * Show goo about ELF core files ++ * Jeremy Fitzhardinge <jeremy(a)zip.com.au> 1996 ++ */ ++#include <unistd.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/types.h> ++#include <string.h> ++#if defined __GLIBC__ && __GLIBC__ >= 2 ++#include <elf.h> ++#include <sys/procfs.h> ++# ifndef NT_PRFPREG ++# define NT_PRFPREG 2 ++# endif ++# ifndef NT_TASKSTRUCT ++# define NT_TASKSTRUCT 4 ++# endif ++#else ++#include <linux/elf.h> ++#include <linux/elfcore.h> ++#endif ++ ++static void fperror(const char *str) ++{ ++ perror(str); ++ exit(1); ++} ++ ++static size_t myread(int fd, void *buf, size_t sz) ++{ ++ size_t ret; ++ ++ if ((ret = read(fd, buf, sz)) != sz) ++ fperror("read failed"); ++ return ret; ++} ++ ++static void print_prstatus(const prstatus_t *pr) ++{ ++ unsigned i; ++ static const char *regs[] = { "ebx", "ecx", "edx", "esi", "edi", "ebp", ++ "eax", "ds", "es", "fs", "gs", ++ "orig_eax", "eip", "cs", ++ "efl", "uesp", "ss"}; ++ ++ printf(" pid=%d ppid=%d pgrp=%d sid=%d\n", ++ pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid); ++ for(i = 0; i < NGREG; i++) ++ { ++ unsigned long val = pr->pr_reg[i]; ++ printf(" %-2u %-5s=%08lx %lu\n", i, regs[i], val, val); ++ } ++} ++ ++static void print_prpsinfo(const prpsinfo_t *ps) ++{ ++ printf(" uid=%d gid=%d\n", ps->pr_uid, ps->pr_gid); ++ printf(" comm=%s\n", ps->pr_fname); ++ printf(" psargs=%s\n", ps->pr_psargs); ++} ++ ++#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) ++ ++static void do_note(int fd, Elf32_Phdr *phdr) ++{ ++ off_t here = lseek(fd, 0, SEEK_CUR); ++ int size = phdr->p_filesz; ++ char *raw = alloca(size), *end; ++ end = raw+size; ++ ++ lseek(fd, phdr->p_offset, SEEK_SET); ++ myread(fd, raw, size); ++ ++ while(raw < end) ++ { ++ Elf32_Nhdr *note = (Elf32_Nhdr *)raw; ++ const char *str; ++ const char *name, *desc; ++ ++ raw += sizeof(*note); ++ name = raw; ++ raw += roundup(note->n_namesz, sizeof(long)); ++ desc = raw; ++ raw += roundup(note->n_descsz, sizeof(long)); ++ ++ printf(" name=%.*s", (int)note->n_namesz, name); ++ ++ if(strncmp(name, "CORE", note->n_namesz) != 0) ++ { ++ printf("\n"); ++ continue; ++ } ++ ++ switch(note->n_type) ++ { ++#define X(x) case x: str = #x; break; ++ X(NT_PRSTATUS); ++ X(NT_PRFPREG); ++ X(NT_PRPSINFO); ++ X(NT_TASKSTRUCT); ++#undef X ++ default: ++ str = "???"; ++ } ++ printf(" n_type=%s n_descsz=%ld\n", ++ str, note->n_descsz); ++ switch(note->n_type) ++ { ++ case NT_PRSTATUS: ++ print_prstatus((prstatus_t *)desc); ++ break; ++ case NT_PRPSINFO: ++ print_prpsinfo((prpsinfo_t *)desc); ++ break; ++ } ++ } ++ lseek(fd, here, SEEK_SET); ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int fd; ++ Elf32_Ehdr elf; ++ int i; ++ ++ if (argc != 2) ++ { ++ fprintf(stderr, "Usage: %s corefile\n", argv[0]); ++ exit(1); ++ } ++ ++ if ((fd = open(argv[1], O_RDONLY)) == -1) ++ fperror("open of core"); ++ ++ myread(fd, &elf, sizeof(elf)); ++ ++ if (memcmp(ELFMAG, elf.e_ident, SELFMAG) != 0) ++ printf("bad magic\n"); ++ ++ if (elf.e_ident[EI_CLASS] != ELFCLASS32) ++ printf("wrong class\n"); ++ ++ if (elf.e_ident[EI_DATA] != ELFDATA2LSB) ++ printf("wrong endianess\n"); ++ ++ if (elf.e_ident[EI_VERSION] != EV_CURRENT) ++ printf("wrong version\n"); ++ ++ { ++ const char *str; ++ switch(elf.e_type) ++ { ++#define C(x) case ET_##x: str = #x; break; ++ C(NONE); ++ C(REL); ++ C(EXEC); ++ C(DYN); ++ C(CORE); ++#undef C ++ default: str = "???"; break; ++ } ++ printf("elf file type ET_%s\n", str); ++ } ++ ++ if (elf.e_machine != EM_386 && elf.e_machine != EM_486) ++ printf("not i386 or i486\n"); ++ ++ if (elf.e_ehsize != sizeof(elf)) ++ printf("wrong header size\n"); ++ ++ if (elf.e_phentsize != sizeof(Elf32_Phdr)) ++ printf("wrong phdr size\n"); ++ ++ if (lseek(fd, elf.e_phoff, SEEK_SET) != (off_t)elf.e_phoff) ++ fperror("lseek to phdr failed\n"); ++ ++ for(i = 0; i < elf.e_phnum; i++) ++ { ++ Elf32_Phdr phdr; ++ const char *str; ++ ++ myread(fd, &phdr, sizeof(phdr)); ++ switch(phdr.p_type) ++ { ++#define C(x) case PT_##x: str = #x; break; ++ C(NULL); ++ C(LOAD); ++ C(DYNAMIC); ++ C(INTERP); ++ C(NOTE); ++ C(SHLIB); ++ C(PHDR); ++#undef C ++ default: ++ str = "???"; break; ++ } ++ printf("type PT_%s off=%ld vaddr=%lx filesz=%ld flags=%lx\n", ++ str, phdr.p_offset, phdr.p_vaddr, phdr.p_filesz, ++ (unsigned long)phdr.p_flags); ++ if (phdr.p_type == PT_NOTE) ++ do_note(fd, &phdr); ++ } ++ exit(0); ++} ++ ++++++ file-5.03.tar.bz2 -> file-5.04.tar.bz2 ++++++ ++++ 5367 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0