- 4.4.1

Changed files:
    rpm-php-deps.patch -> 1.3

diff --git a/rpm-php-deps.patch b/rpm-php-deps.patch
index 21b113fdb1351a2cfd1cfe84eb876dd4c82bd261..4d4e0febfeacc31fc8d17caa7ffc4079d183ff16 100644 (file)
--- a/rpm-php-deps.patch
+++ b/rpm-php-deps.patch
@@ -37,26 +37,24 @@
  
      return 0;
  }
-@@ -1029,7 +1039,7 @@
- /*@unchecked@*/
- static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
+@@ -1068,6 +1068,7 @@
      { rpmfcELF,               RPMFC_ELF },
--    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL) },
-+    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PHP) },
+     { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL) },
+     { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PYTHON) },
++    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PHP) },
      { NULL, 0 }
  };
  
-@@ -1204,6 +1204,10 @@
+@@ -1227,6 +1227,9 @@
  /*@-branchstate@*/
        if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
            ftype = "Perl5 module source text";
-+      else
-+          /* XXX all files with extension ".php" are PHP modules for now. */
-+          if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
-+              ftype = "PHP script text";
-       else {
-           ftype = magic_file(ms, s);
-           if (ftype == NULL) {
++      /* XXX all files with extension ".php" are PHP modules for now. */
++      else if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
++          ftype = "PHP script text";
+       /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
+       else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
+           ftype = "";
 --- rpm-4.2/build/rpmfc.h.wiget        Tue Apr  1 10:00:23 2003
 +++ rpm-4.2/build/rpmfc.h      Tue Apr  1 10:01:22 2003
 @@ -40,6 +40,7 @@