From 1cd31f169fab4ab0ce45617c161da3fec9f7359d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 May 2009 17:53:55 +0200 Subject: fix regressions from ipkg rework - remove old glib1 lib - rename glib2 -> glib - rename libgdbm -> gdbm - remove obsoleted wireless-tools, use iw - remove upstream unmaintained slurm make allmodconfig runs through on Debian/lenny amd64 for alix1c target --- package/file/patches/patch-magic_Magdir_audio | 11 +++++++ package/file/patches/patch-magic_Magdir_compress | 15 ++++++++++ package/file/patches/patch-magic_Magdir_images | 11 +++++++ package/file/patches/patch-magic_Magdir_jpeg | 15 ++++++++++ package/file/patches/patch-magic_Magdir_macintosh | 27 +++++++++++++++++ .../file/patches/patch-magic_Magdir_macintosh.orig | 21 +++++++++++++ package/file/patches/patch-magic_Magdir_printer | 34 ++++++++++++++++++++++ 7 files changed, 134 insertions(+) create mode 100644 package/file/patches/patch-magic_Magdir_audio create mode 100644 package/file/patches/patch-magic_Magdir_compress create mode 100644 package/file/patches/patch-magic_Magdir_images create mode 100644 package/file/patches/patch-magic_Magdir_jpeg create mode 100644 package/file/patches/patch-magic_Magdir_macintosh create mode 100644 package/file/patches/patch-magic_Magdir_macintosh.orig create mode 100644 package/file/patches/patch-magic_Magdir_printer (limited to 'package/file') diff --git a/package/file/patches/patch-magic_Magdir_audio b/package/file/patches/patch-magic_Magdir_audio new file mode 100644 index 000000000..e5e0c9849 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_audio @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/audio 2008-11-07 16:44:13.000000000 +0100 ++++ file-5.03/magic/Magdir/audio 2009-05-31 03:53:54.000000000 +0200 +@@ -293,7 +293,6 @@ + >>5 byte &0x40 \b, extended header + >>5 byte &0x20 \b, experimental + >>5 byte &0x10 \b, footer present +->(6.I) indirect x \b, contains: + + # NSF (NES sound file) magic + 0 string NESM\x1a NES Sound File diff --git a/package/file/patches/patch-magic_Magdir_compress b/package/file/patches/patch-magic_Magdir_compress new file mode 100644 index 000000000..cee99739b --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_compress @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/compress 2009-04-22 15:07:35.000000000 +0200 ++++ file-5.03/magic/Magdir/compress 2009-05-31 04:09:09.000000000 +0200 +@@ -9,11 +9,6 @@ + # because it tries to uncompress it to figure out what's inside. + + # standard unix compress +-0 string \037\235 compress'd data +-!:mime application/x-compress +-!:apple LZIVZIVU +->2 byte&0x80 >0 block compressed +->2 byte&0x1f x %d bits + + # gzip (GNU zip, not to be confused with Info-ZIP or PKWARE zip archiver) + # Edited by Chris Chittleborough , March 2002 diff --git a/package/file/patches/patch-magic_Magdir_images b/package/file/patches/patch-magic_Magdir_images new file mode 100644 index 000000000..f0fe16223 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_images @@ -0,0 +1,11 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/images 2009-02-02 16:55:49.000000000 +0100 ++++ file-5.03/magic/Magdir/images 2009-05-31 03:58:58.000000000 +0200 +@@ -110,7 +110,6 @@ + # GIF + 0 string GIF8 GIF image data + !:mime image/gif +-!:apple 8BIMGIFf + >4 string 7a \b, version 8%s, + >4 string 9a \b, version 8%s, + >6 leshort >0 %hd x diff --git a/package/file/patches/patch-magic_Magdir_jpeg b/package/file/patches/patch-magic_Magdir_jpeg new file mode 100644 index 000000000..6f5ae068d --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_jpeg @@ -0,0 +1,15 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/jpeg 2008-10-20 19:20:03.000000000 +0200 ++++ file-5.03/magic/Magdir/jpeg 2009-05-31 04:10:19.000000000 +0200 +@@ -8,11 +8,6 @@ + # + # both of which turn into "JPEG image data" here. + # +-0 beshort 0xffd8 JPEG image data +-!:mime image/jpeg +-!:apple 8BIMJPEG +-!:strength +1 +->6 string JFIF \b, JFIF standard + # The following added by Erik Rossen 1999-09-06 + # in a vain attempt to add image size reporting for JFIF. Note that these + # tests are not fool-proof since some perfectly valid JPEGs are currently diff --git a/package/file/patches/patch-magic_Magdir_macintosh b/package/file/patches/patch-magic_Magdir_macintosh new file mode 100644 index 000000000..9333a1643 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_macintosh @@ -0,0 +1,27 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200 ++++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:08:05.000000000 +0200 +@@ -8,23 +8,6 @@ + !:mime application/mac-binhex40 + >41 string x \b, version %.3s + +-# Stuffit archives are the de facto standard of compression for Macintosh +-# files obtained from most archives. (franklsm@tuns.ca) +-0 string SIT! StuffIt Archive (data) +-!:mime application/x-stuffit +-!:apple SIT!SIT! +->2 string x : %s +-0 string SITD StuffIt Deluxe (data) +->2 string x : %s +-0 string Seg StuffIt Deluxe Segment (data) +->2 string x : %s +- +-# Newer StuffIt archives (grant@netbsd.org) +-0 string StuffIt StuffIt Archive +-!:mime application/x-stuffit +-!:apple SIT!SIT! +-#>162 string >0 : %s +- + # Macintosh Applications and Installation binaries (franklsm@tuns.ca) + # GRR: Too weak + #0 string APPL Macintosh Application (data) diff --git a/package/file/patches/patch-magic_Magdir_macintosh.orig b/package/file/patches/patch-magic_Magdir_macintosh.orig new file mode 100644 index 000000000..f85819da4 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_macintosh.orig @@ -0,0 +1,21 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/macintosh 2008-10-20 19:20:23.000000000 +0200 ++++ file-5.03/magic/Magdir/macintosh 2009-05-31 04:07:12.000000000 +0200 +@@ -8,17 +8,6 @@ + !:mime application/mac-binhex40 + >41 string x \b, version %.3s + +-# Stuffit archives are the de facto standard of compression for Macintosh +-# files obtained from most archives. (franklsm@tuns.ca) +-0 string SIT! StuffIt Archive (data) +-!:mime application/x-stuffit +-!:apple SIT!SIT! +->2 string x : %s +-0 string SITD StuffIt Deluxe (data) +->2 string x : %s +-0 string Seg StuffIt Deluxe Segment (data) +->2 string x : %s +- + # Newer StuffIt archives (grant@netbsd.org) + 0 string StuffIt StuffIt Archive + !:mime application/x-stuffit diff --git a/package/file/patches/patch-magic_Magdir_printer b/package/file/patches/patch-magic_Magdir_printer new file mode 100644 index 000000000..a7db0e8e7 --- /dev/null +++ b/package/file/patches/patch-magic_Magdir_printer @@ -0,0 +1,34 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- file-5.03.orig/magic/Magdir/printer 2008-10-20 19:20:03.000000000 +0200 ++++ file-5.03/magic/Magdir/printer 2009-05-31 04:05:40.000000000 +0200 +@@ -3,30 +3,6 @@ + # printer: file(1) magic for printer-formatted files + # + +-# PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com) +-0 string %! PostScript document text +-!:mime application/postscript +-!:apple ASPSTEXT +->2 string PS-Adobe- conforming +->>11 string >\0 DSC level %.3s +->>>15 string EPS \b, type %s +->>>15 string Query \b, type %s +->>>15 string ExitServer \b, type %s +->>>15 search/1000 %%LanguageLevel:\ +->>>>&0 string >\0 \b, Level %s +-# Some PCs have the annoying habit of adding a ^D as a document separator +-0 string \004%! PostScript document text +-!:mime application/postscript +-!:apple ASPSTEXT +->3 string PS-Adobe- conforming +->>12 string >\0 DSC level %.3s +->>>16 string EPS \b, type %s +->>>16 string Query \b, type %s +->>>16 string ExitServer \b, type %s +->>>16 search/1000 %%LanguageLevel:\ +->>>>&0 string >\0 \b, Level %s +-0 string \033%-12345X%!PS PostScript document +- + # DOS EPS Binary File Header + # From: Ed Sznyter + 0 belong 0xC5D0D3C6 DOS EPS Binary File -- cgit v1.2.3