SOURCES: rpm-php-deps.patch - updated for 4.4.2

[qboosh]

Author: qboosh                       Date: Sat Jul 23 11:42:01 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.4.2

---- Files affected:
SOURCES:
   rpm-php-deps.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/rpm-php-deps.patch
diff -u SOURCES/rpm-php-deps.patch:1.3 SOURCES/rpm-php-deps.patch:1.4
--- SOURCES/rpm-php-deps.patch:1.3	Fri Feb 18 22:55:52 2005
+++ SOURCES/rpm-php-deps.patch	Sat Jul 23 13:41:56 2005
@@ -1,15 +1,15 @@
---- rpm-4.2/build/rpmfc.c.wiget	Mon Jan 20 23:16:09 2003
-+++ rpm-4.2/build/rpmfc.c	Tue Apr  1 09:56:51 2003
-@@ -450,6 +450,8 @@
+--- rpm-4.4.2/build/rpmfc.c.orig	2005-07-21 03:04:55.000000000 +0200
++++ rpm-4.4.2/build/rpmfc.c	2005-07-23 13:48:23.419129800 +0200
+@@ -451,6 +451,8 @@
  
    { "perl script text",		RPMFC_PERL|RPMFC_INCLUDE },
    { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
 +  
 +  { "PHP script text",		RPMFC_PHP|RPMFC_INCLUDE },
  
-   { "current ar archive",	RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
+   { " /usr/bin/python",		RPMFC_PYTHON|RPMFC_INCLUDE },
  
-@@ -618,6 +621,7 @@
+@@ -624,6 +626,7 @@
  
  	fc->sb_java = freeStringBuf(fc->sb_java);
  	fc->sb_perl = freeStringBuf(fc->sb_perl);
@@ -17,17 +17,17 @@
  	fc->sb_python = freeStringBuf(fc->sb_python);
  
      }
-@@ -705,6 +709,8 @@
+@@ -711,6 +714,8 @@
  	    fc->fcolor->vals[fc->ix] |= RPMFC_PERL;
- 	else if (!strcmp(bn, "python"))
+ 	else if (!strncmp(bn, "python", sizeof("python")-1))
  	    fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
 +	else if (!strcmp(bn, "php"))
 +	    fc->fcolor->vals[fc->ix] |= RPMFC_PHP;
  
  	break;
      }
-@@ -723,6 +729,10 @@
- 	if (is_executable)
+@@ -731,6 +736,10 @@
+ #endif
  	    xx = rpmfcHelper(fc, 'R', "python");
      }
 +    if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
@@ -37,7 +37,7 @@
  
      return 0;
  }
-@@ -1068,6 +1068,7 @@
+@@ -1059,6 +1068,7 @@
      { rpmfcELF,		RPMFC_ELF },
      { rpmfcSCRIPT,	(RPMFC_SCRIPT|RPMFC_PERL) },
      { rpmfcSCRIPT,	(RPMFC_SCRIPT|RPMFC_PYTHON) },
@@ -45,16 +45,16 @@
      { NULL, 0 }
  };
  
-@@ -1227,6 +1227,9 @@
+@@ -1228,6 +1238,9 @@
  /*@-branchstate@*/
- 	if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
- 	    ftype = "Perl5 module source text";
-+	/* 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 = "";
+ 	    if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
+ 		ftype = "Perl5 module source text";
++	    /* 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 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-php-deps.patch?r1=1.3&r2=1.4&f=u