[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm/ CHANGES VENDOR rpm/rpmio/ macro.c
From:       "Per Øyvind Karlsen" <pkarlsen () rpm5 ! org>
Date:       2008-10-28 14:19:45
Message-ID: 20081028141945.301D58BE1D () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   28-Oct-2008 15:19:45
  Branch: HEAD                             Handle: 2008102814194400

  Modified files:
    rpm                     CHANGES VENDOR
    rpm/rpmio               macro.c

  Log:
    Mandriva: prefer file extension for detecting file compression.
    (extension-based-compression-detection)

  Summary:
    Revision    Changes     Path
    1.2635      +6  -4      rpm/CHANGES
    2.60        +14 -1      rpm/VENDOR
    2.205       +1  -1      rpm/rpmio/macro.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2634 -r1.2635 CHANGES
  --- rpm/CHANGES	28 Oct 2008 13:51:35 -0000	1.2634
  +++ rpm/CHANGES	28 Oct 2008 14:19:44 -0000	1.2635
  @@ -1,9 +1,11 @@
   
   5.2a2 -> 5.2a3:
  -    - proyvind: disable buildrequires checking for building src.rpms on
  -        Mandriva too. (no-deps-on-building-srpms)
  -    - proyvind: disable preservation of file ownership for source rpms on
  -        Mandriva too. (no-owner-group-on-srpm-install)
  +    - proyvind: Mandriva: prefer file extension for detecting file compression.
  +        (extension-based-compression-detection)
  +    - proyvind: Mandriva: disable buildrequires checking for building src.rpms.
  +        (no-deps-on-building-srpms)
  +    - proyvind: Mandriva: disable preservation of file ownership for source rpms.
  +        (no-owner-group-on-srpm-install)
       - rpm.org: Add posix.mkstemp() to Lua posix lib.
       - jbj: fix: apply _dependency_whiteout to erased relations too.
       - jbj: lua: display rudimentary info about lua with --showrc.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/VENDOR
  ============================================================================
  $ cvs diff -u -r2.59 -r2.60 VENDOR
  --- rpm/VENDOR	28 Oct 2008 13:51:35 -0000	2.59
  +++ rpm/VENDOR	28 Oct 2008 14:19:44 -0000	2.60
  @@ -509,7 +509,6 @@
                        in the source RPM (which is the owner/group of the
                        files as staying on the package author system) is
                        not existing on the target system anyway.
  -
        ________________________________________________________________________
   
        Change:         no-deps-on-building-srpms
  @@ -518,6 +517,20 @@
                        been put to use (yet), making this just annoying.
        ________________________________________________________________________
   
  +     Change:         extension-based-compression-detection
  +     Purpose:        Prefer file extension for detecting file compression.
  +     Reason:         RPM tries to detect file compression by inspecting
  +                     "magic" bytes at the front of a file. This works for
  +                     formats with known "magic" bytes just fine, but fails
  +                     horribly for formats like LZMA where no such "magic"
  +                     bytes exist. For Fedora we prefer to first use file
  +                     extension based determination (if someone is mis-names
  +                     his distribution files we have to take action anyway)
  +                     and fall back to "magic" byte based determination only
  +                     if no well known extension is found. Additionally,
  +                     detecting LZMA we want to do via file extension only.
  +     ________________________________________________________________________
  +
     o  Name:           WINDRIVER
        Vendor:         Wind River <http://windriver.com/>
        Representative: Jeff Johnson <jbj@rpm5.org>
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/macro.c
  ============================================================================
  $ cvs diff -u -r2.204 -r2.205 macro.c
  --- rpm/rpmio/macro.c	19 Oct 2008 18:01:28 -0000	2.204
  +++ rpm/rpmio/macro.c	28 Oct 2008 14:19:44 -0000	2.205
  @@ -2483,7 +2483,7 @@
        &&	magic[2] == 'Z' && magic[3] == 'O')	/* lzop */
   	*compressed = COMPRESSED_LZOP;
       else
  -#if !defined(RPM_VENDOR_OPENPKG) && !defined(RPM_VENDOR_FEDORA) /* \
extension-based-compression-detection */  +#if !defined(RPM_VENDOR_OPENPKG) && \
!defined(RPM_VENDOR_FEDORA) && !defined(RPM_VENDOR_MANDRIVA) /* \
                extension-based-compression-detection */
       /* XXX Ick, LZMA has no magic. See http://lkml.org/lkml/2005/6/13/285 */
       if (magic[ 9] == (unsigned char) 0x00 && magic[10] == (unsigned char) 0x00 &&
   	magic[11] == (unsigned char) 0x00 && magic[12] == (unsigned char) 0x00)	/* lzmash \
*/  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org


[prev in list] [next in list] [prev in thread] [next in thread]