poldek-rpm4.2.patch

   1 --- poldek-0.18.1/configure.in  Wed Apr  2 07:55:45 2003
   2 +++ poldek-0.18.1-/configure.in Wed Apr  2 07:55:14 2003
   3 @@ -10,6 +10,7 @@
   4  AH_TEMPLATE([ENABLE_TRACE],[])
   5  AH_TEMPLATE([HAVE_RPM_4_0_4],[])
   6  AH_TEMPLATE([HAVE_RPM_4_1],[])
   7 +AH_TEMPLATE([HAVE_RPM_4_2],[])
   8  AH_TEMPLATE([HAVE_RPM_EXTDEPS],[])
   9  AH_TEMPLATE([HAVE_TM_GMTOFF],[])
  10  AH_TEMPLATE([HAVE_TM___GMTOFF],[])
  11 @@ -240,9 +241,10 @@
  12                 DBLIB="$DBLIB -ldb1"
  13         fi
  14  else
  15 -       AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0"],
  16 +        AC_CHECK_LIB(db-4.1, db_create, [DBLIB="-ldb-4.1"],
  17 +            [AC_CHECK_LIB(db-4.0, db_create, [DBLIB="-ldb-4.0"],
  18                      [AC_CHECK_LIB(db, db_create, [DBLIB="-ldb"],,[$LIBS])],
  19 -                    [$LIBS])
  20 +                    [$LIBS])],, [$LIBS])
  21
  22         if test "${ENABLE_STATIC}." = "yes."; then
  23                 DBLIB="$DBLIB"
  24 @@ -278,6 +280,9 @@
  25  AC_CHECK_FUNCS(rpmMachineScore,,[ AC_MSG_ERROR(["rpmlib not found"])])
  26  AC_CHECK_FUNCS(rpmlog rpmCheckSig rpmVerifySignature)
  27
  28 +dnl rpm 4.2?
  29 +AC_CHECK_FUNCS(rpmtsColor, AC_DEFINE([HAVE_RPM_4_2],1,[]))
  30 +
  31  AC_CHECK_HEADERS(db_185.h,,[
  32         AC_MSG_WARN(["disabled synchronization with db file-dependencies"]) ])
  33  AC_CHECK_FUNCS(__db185_open)
  34 Only in poldek-0.18.1-: configure.in.orig
  35 diff -ur poldek-0.18.1/rpm_signature.c poldek-0.18.1-/rpm_signature.c
  36 --- poldek-0.18.1/rpm_signature.c       Fri Oct 18 12:34:03 2002
  37 +++ poldek-0.18.1-/rpm_signature.c      Wed Apr  2 07:55:14 2003
  38 @@ -56,7 +56,9 @@
  39
  40  static int rpm_read_signature(FD_t fd, Header *sighp, int sig_type)
  41  {
  42 -#ifdef HAVE_RPM_4_1
  43 +#ifdef HAVE_RPM_4_2
  44 +    return rpmReadSignature(fd, sighp, sig_type, NULL) == 0;
  45 +#elif HAVE_RPM_4_1
  46      return rpmReadSignature(fd, sighp, sig_type) == 0;
  47  #elif HAVE_RPM_4_0
  48      return rpmReadSignature(fd, sighp, sig_type, NULL) == 0;
  49 Only in poldek-0.18.1-: rpm_signature.c.orig
  50 diff -ur poldek-0.18.1/rpmadds.c poldek-0.18.1-/rpmadds.c
  51 --- poldek-0.18.1/rpmadds.c   7 Nov 2002 16:43:26 -0000       1.8
  52 +++ poldek-0.18.1-/rpmadds.c   15 Apr 2003 16:56:10 -0000
  53 @@ -34,15 +34,17 @@
  54  #include "misc.h"
  55  #include "log.h"
  56
  57 -
  58  int rpm_headerReadFD(FD_t fdt, Header *hdr, const char *path)
  59  {
  60      int rc = 0;
  61
  62 -#ifdef HAVE_RPM_4_1
  63 +#ifndef HAVE_RPM_4_1
  64 +    rc = rpmReadPackageHeader(fdt, hdr, NULL, NULL, NULL);
  65 +#else
  66      rpmRC rpmrc;
  67      rpmts ts = rpmtsCreate();
  68
  69 +    rpmtsSetVSFlags(ts, RPMVSF_NODSA | RPMVSF_NORSA | RPMVSF_NOMD5);
  70      rpmrc = rpmReadPackageFile(ts, fdt, path, hdr);
  71      switch (rpmrc) {
  72          case RPMRC_NOTTRUSTED:
  73 @@ -54,18 +56,12 @@
  74          default:
  75              rc = 1;
  76      }
  77 -
  78 -#else
  79 -    rc = rpmReadPackageHeader(fdt, hdr, NULL, NULL, NULL);
  80 +    rpmtsFree(ts);
  81  #endif
  82 -
  83 +
  84      if (rc != 0)
  85          logn(LOGERR, _("%s: read header failed"), path);
  86
  87 -#ifdef HAVE_RPM_4_1
  88 -    rpmtsFree(ts);
  89 -#endif
  90 -
  91      return rc == 0;
  92  }
  93
  94