[packages/rpm.git] / rpm-pld-autodep.patch

--- rpm-4.4.8/lib/rpmfc.h.orig	2005-11-18 23:08:14.231293000 +0100
+++ rpm-4.4.8/lib/rpmfc.h	2005-11-18 23:55:16.694214392 +0100
@@ -1,6 +1,7 @@
 #ifndef _H_RPMFC_
 #define _H_RPMFC_
 
+#include <regex.h>
 #undef	FILE_RCSID
 #include "magic.h"
 
@@ -44,6 +45,11 @@
     StringBuf sb_python;/*!< concatenated list of python colored files. */
     StringBuf sb_php;   /*!< concatenated list of php colored files. */
 
+    int findprov, findreq;
+    regex_t *noautoprov;
+    int noautoprov_c;
+    regex_t *noautoreq;
+    int noautoreq_c;
 };
 
 /**
--- rpm-4.4.8/lib/rpmfc.c.orig	2007-04-08 18:54:35.134367044 +0200
+++ rpm-4.4.8/lib/rpmfc.c	2007-04-08 19:10:18.196109070 +0200
@@ -11,6 +11,8 @@
 #define	_RPMDS_INTERNAL
 #include <rpmds.h>
 #include <rpmfi.h>
+#include <rpmts.h>
+#include <rpmdb.h>
 
 #include "debug.h"
 
@@ -305,14 +307,83 @@
     return buf;
 };
 
+static regex_t * rpmfcExpandRegexps(const char * str,int *count){
+    int i,j,r;
+    const char *s;
+    ARGV_t patterns=NULL;
+    regex_t *compiled=NULL;
+
+    s=rpmExpand(str,NULL);
+    if (s) {
+    	poptParseArgvString(s,count,(const char ***)&patterns);
+	s = _free(s);
+    }
+    if (patterns==NULL){
+       	*count=0;
+	return NULL;
+    }
+    if (*count==0){
+	_free(patterns);
+	return NULL;
+    }
+
+    compiled=malloc(sizeof(regex_t)*(*count));
+    j=0;
+    for(i=0;i<*count;i++){
+	r=regcomp(&compiled[j],patterns[i],REG_NOSUB);
+	if (r==0) j++;
+	else {
+		rpmMessage(RPMMESS_NORMAL, 
+			_("Compilation of regular expresion '%s'"
+		        " (expanded from '%s') failed. Skipping it.\n"),
+			patterns[i],str);
+	}
+    }
+    patterns=_free(patterns);
+    if (j==0) {
+	compiled=_free(compiled);
+	*count=0;
+	return NULL;
+    }
+    *count=j;
+    return compiled;
+}
+
+static int rpmfcMatchRegexps(regex_t *regexps, int count, const char *str, char deptype)
+{
+    int j;
+    for(j = 0; j < count; j++) {
+	rpmMessage(RPMMESS_DEBUG,
+	    _("Checking %c: '%s' against _noauto expr. #%i\n"), deptype, str, j);
+	if (!regexec(&regexps[j], str, 0, NULL, 0)) {
+	    rpmMessage(RPMMESS_NORMAL,
+		_("Skipping %c: '%s' as it matches _noauto expr. #%i\n"), deptype, str, j);
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+static regex_t * rpmfcFreeRegexps(regex_t *regexps,int count){
+    int i;
+	
+    if (regexps)
+        for(i=0;i<count;i++)
+	    regfree(&regexps[i]);
+    return _free(regexps);
+}
+
 /**
  * Run per-interpreter dependency helper.
  * @param fc		file classifier
  * @param deptype	'P' == Provides:, 'R' == Requires:, helper
  * @param nsdep		class name for interpreter (e.g. "perl")
+ * @param noauto	_noauto* regexps
+ * @param noauto_c	# of _noauto* regexps
  * @return		0 on success
  */
-static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
+static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep,
+    regex_t * noauto, int noauto_c)
 	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
 	/*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/
 {
@@ -398,6 +469,8 @@
 	    }
 /*@=branchstate@*/
 
+	    if(rpmfcMatchRegexps(noauto, noauto_c, N, deptype))
+		continue;
 
 	    /* Add tracking dependency for versioned Provides: */
 	    if (!fc->tracked && deptype == 'P' && *EVR != '\0') {
@@ -710,7 +783,7 @@
 	*se = '\0';
 	se++;
 
-	if (is_executable) {
+	if (is_executable && fc->findreq && !rpmfcMatchRegexps(fc->noautoreq, fc->noautoreq_c, s, 'R')) {
 	    /* Add to package requires. */
 	    ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
 	    xx = rpmdsMerge(&fc->requires, ds);
@@ -738,43 +811,51 @@
     (void) fclose(fp);
 
     if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
-	if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
-	    xx = rpmfcHelper(fc, 'P', "perl");
-	if (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
-	    xx = rpmfcHelper(fc, 'R', "perl");
+	if (fc->findprov && (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
+	    xx = rpmfcHelper(fc, 'P', "perl", fc->noautoprov, fc->noautoprov_c);
+	if (fc->findreq && (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)))
+	    xx = rpmfcHelper(fc, 'R', "perl", fc->noautoreq, fc->noautoreq_c);
     } else
     if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) {
-	xx = rpmfcHelper(fc, 'P', "python");
+	if (fc->findprov)
+	xx = rpmfcHelper(fc, 'P', "python", fc->noautoprov, fc->noautoprov_c);
 #ifdef	NOTYET
 	if (is_executable)
 #endif
-	    xx = rpmfcHelper(fc, 'R', "python");
+	if (fc->findreq)
+	    xx = rpmfcHelper(fc, 'R', "python", fc->noautoreq, fc->noautoreq_c);
     } else
     if (fc->fcolor->vals[fc->ix] & RPMFC_LIBTOOL) {
-	xx = rpmfcHelper(fc, 'P', "libtool");
+	if (fc->findprov)
+	xx = rpmfcHelper(fc, 'P', "libtool", fc->noautoprov, fc->noautoprov_c);
 #ifdef	NOTYET
 	if (is_executable)
 #endif
-	    xx = rpmfcHelper(fc, 'R', "libtool");
+	if (fc->findreq)
+	    xx = rpmfcHelper(fc, 'R', "libtool", fc->noautoreq, fc->noautoreq_c);
     } else
     if (fc->fcolor->vals[fc->ix] & RPMFC_PKGCONFIG) {
-	xx = rpmfcHelper(fc, 'P', "pkgconfig");
+	if (fc->findprov)
+	xx = rpmfcHelper(fc, 'P', "pkgconfig", fc->noautoprov, fc->noautoprov_c);
 #ifdef	NOTYET
 	if (is_executable)
 #endif
-	    xx = rpmfcHelper(fc, 'R', "pkgconfig");
+	if (fc->findreq)
+	    xx = rpmfcHelper(fc, 'R', "pkgconfig", fc->noautoreq, fc->noautoreq_c);
     } else
     if (fc->fcolor->vals[fc->ix] & RPMFC_BOURNE) {
 #ifdef	NOTYET
 	xx = rpmfcHelper(fc, 'P', "executable");
 #endif
-	if (is_executable)
-	    xx = rpmfcHelper(fc, 'R', "executable");
+	if (fc->findreq && is_executable)
+	    xx = rpmfcHelper(fc, 'R', "executable", fc->noautoreq, fc->noautoreq_c);
     } else
     if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
-	xx = rpmfcHelper(fc, 'P', "php");
+	if (fc->findprov)
+	xx = rpmfcHelper(fc, 'P', "php", fc->noautoprov, fc->noautoprov_c);
 	/* not only executable, files run by httpd usually are not */
-	    xx = rpmfcHelper(fc, 'R', "php");
+	if (fc->findreq)
+	    xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
     }
 
     return 0;
@@ -802,20 +883,26 @@
     default:
 	break;
     case RPMTAG_PROVIDENAME:
+	if (fc->findprov && !rpmfcMatchRegexps(fc->noautoprov, fc->noautoprov_c, ds->N[0], 'P')) {
 	/* Add to package provides. */
 	rc = rpmdsMerge(&fc->provides, ds);
 
 	/* Add to file dependencies. */
 	buf[0] = '\0';
 	rc = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, ds));
+	} else
+		rc = 0;
 	break;
     case RPMTAG_REQUIRENAME:
+	if (fc->findreq && !rpmfcMatchRegexps(fc->noautoreq, fc->noautoreq_c, ds->N[0], 'R')) {
 	/* Add to package requires. */
 	rc = rpmdsMerge(&fc->requires, ds);
 
 	/* Add to file dependencies. */
 	buf[0] = '\0';
 	rc = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, ds));
+	} else
+		rc = 0;
 	break;
     }
     return rc;
@@ -856,6 +943,109 @@
     { NULL, 0 }
 };
 
+static int rpmfcFindRequiredPackages(rpmfc fc) 
+{
+    rpmts ts=NULL;
+    const char * s;
+    char * se;
+    rpmds ds;
+    const char * N;
+    const char * EVR;
+    int_32 Flags;
+    unsigned char deptype;
+    int nddict;
+    int previx;
+    int ix;
+    int i;
+    int j;
+    int xx;
+    int r;
+    const char * hname;
+    rpmdbMatchIterator it;
+    Header hdr;
+    regex_t *noautoreqdep;
+    int noautoreqdep_c;
+
+    noautoreqdep=rpmfcExpandRegexps("%{__noautoreqdep}", &noautoreqdep_c);
+    
+    ts = rpmtsCreate(); /* XXX ts created in main() should be used */
+    
+    rpmMessage(RPMMESS_NORMAL, _("Searching for required packages....\n"));
+
+    nddict = argvCount(fc->ddict);
+    previx = -1;
+    for (i = 0; i < nddict; i++) {
+        s = fc->ddict[i];
+
+        /* Parse out (file#,deptype,N,EVR,Flags) */
+        ix = strtol(s, &se, 10);
+        assert(se != NULL);
+        deptype = *se++;
+        se++;
+        N = se;
+        while (*se && *se != ' ')
+            se++;
+        *se++ = '\0';
+        EVR = se;
+        while (*se && *se != ' ')
+            se++;
+        *se++ = '\0';
+        Flags = strtol(se, NULL, 16);
+
+        if (deptype!='R') continue;
+
+        rpmMessage(RPMMESS_DEBUG, _("#%i requires: %s,%s,%i\n"),ix,N,EVR,Flags);
+        if (EVR && EVR[0]) {
+            rpmMessage(RPMMESS_DEBUG, _("skipping #%i require\n"));
+            continue;
+        }
+        for(j=0;j<noautoreqdep_c;j++) 
+            if (!regexec(&noautoreqdep[j],N,0,NULL,0)) {
+                rpmMessage(RPMMESS_NORMAL, 
+                        _("skipping %s requirement processing"
+			" (matches noautoreqdep pattern #%i)\n"),N,j);
+                break;
+            }
+        if (j<noautoreqdep_c) continue;
+        if (N[0]=='/') {
+            rpmMessage(RPMMESS_DEBUG, _("skipping #%i require (is file requirement)\n"));
+            continue;
+        }
+        it=rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, N, 0);
+        if (!it) {
+            rpmMessage(RPMMESS_DEBUG, _("%s -> not found\n"),N);
+            continue;
+        }
+        rpmMessage(RPMMESS_DEBUG, _("Iterator: %p\n"),it);
+        if (rpmdbGetIteratorCount(it)>1) {
+            rpmMessage(RPMMESS_DEBUG, _("%s -> multiple (skipping)\n"),N);
+            rpmdbFreeIterator(it);
+            continue;
+        }
+        hdr=rpmdbNextIterator(it);
+        assert(hdr!=NULL);
+        r=headerGetEntry(hdr,RPMTAG_NAME,NULL,(void **)&hname, NULL);
+        assert(r<2);
+        if (!strcmp(hname,N)) {
+            rpmMessage(RPMMESS_DEBUG, _("%s -> %s (skipping)\n"),N,hname);
+            rpmdbFreeIterator(it);
+            continue;
+        }
+            
+        rpmMessage(RPMMESS_DEBUG, "%s -> %s\n",N,hname);
+        
+       	ds = rpmdsSingle(RPMTAG_REQUIRENAME, hname, "", RPMSENSE_FIND_REQUIRES);
+		xx = rpmdsMerge(&fc->requires, ds);
+		ds = rpmdsFree(ds);
+
+        rpmdbFreeIterator(it);
+    }
+
+    noautoreqdep = rpmfcFreeRegexps(noautoreqdep, noautoreqdep_c);
+    ts = rpmtsFree(ts);
+    return 0;
+}
+
 int rpmfcApply(rpmfc fc)
 {
     rpmfcApplyTbl fcat;
@@ -874,6 +1064,26 @@
     int i;
     int xx;
     int skipping;
+    int j;
+    regex_t *noautoprovfiles = NULL;
+    int noautoprovfiles_c;
+    regex_t *noautoreqfiles = NULL;
+    int noautoreqfiles_c;
+    const char *buildroot;
+    int buildroot_l;
+
+    fc->noautoprov = NULL;
+    fc->noautoreq = NULL;
+
+    buildroot = rpmExpand("%{buildroot}",NULL);
+    buildroot_l = strlen(buildroot);
+    
+    noautoprovfiles = rpmfcExpandRegexps("%{__noautoprovfiles}", &noautoprovfiles_c);
+    noautoreqfiles = rpmfcExpandRegexps("%{__noautoreqfiles}", &noautoreqfiles_c);
+    fc->noautoprov = rpmfcExpandRegexps("%{__noautoprov}", &fc->noautoprov_c);
+    fc->noautoreq = rpmfcExpandRegexps("%{__noautoreq}", &fc->noautoreq_c);
+    rpmMessage(RPMMESS_DEBUG, _("%i _noautoprov patterns.\n"), fc->noautoprov_c);
+    rpmMessage(RPMMESS_DEBUG, _("%i _noautoreq patterns.\n"), fc->noautoreq_c);
 
     /* Generate package and per-file dependencies. */
     for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
@@ -894,9 +1104,43 @@
 	for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
 	    if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
 		/*@innercontinue@*/ continue;
+	    fc->findprov = 1;
+	    fc->findreq = 1;
+	    if (strncmp(fc->fn[fc->ix],buildroot,buildroot_l)==0) {/* sanity check */
+		    for(j = 0; j < noautoprovfiles_c; j++) {
+			    if (!regexec(&noautoprovfiles[j],
+						    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
+				    rpmMessage(RPMMESS_NORMAL,
+						    _("skipping %s provides detection"
+							    " (matches noautoprovfiles pattern #%i)\n"),
+						    fc->fn[fc->ix], j);
+				    fc->findprov = 0;
+				    break;
+			    }
+		    }
+		    for(j = 0; j < noautoreqfiles_c; j++) {
+			    if (!regexec(&noautoreqfiles[j],
+						    fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
+				    rpmMessage(RPMMESS_NORMAL,
+						    _("skipping %s requires detection"
+							    " (matches noautoreqfiles pattern #%i)\n"),
+						    fc->fn[fc->ix], j);
+				    fc->findreq = 0;
+				    break;
+			    }
+		    }
+	    }
+
 	    xx = (*fcat->func) (fc);
 	}
     }
+    noautoprovfiles = rpmfcFreeRegexps(noautoprovfiles, noautoprovfiles_c);
+    noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles, noautoreqfiles_c);
+    fc->noautoprov = rpmfcFreeRegexps(fc->noautoprov, fc->noautoprov_c);
+    fc->noautoreq = rpmfcFreeRegexps(fc->noautoreq, fc->noautoreq_c);
+#ifdef AUTODEP_PKGNAMES /* define to use package names in R */
+    rpmfcFindRequiredPackages(fc);
+#endif
 
 /*@-boundswrite@*/
     /* Generate per-file indices into package dependencies. */
--- rpm-4.3/po/pl.po.orig	2004-02-01 20:53:10.000000000 +0100
+++ rpm-4.3/po/pl.po	2004-02-01 21:20:36.532561576 +0100
@@ -1295,6 +1295,86 @@
 msgid "lookup i18N strings in specfile catalog"
 msgstr "wyszukaj wpisy I18N w katalogu pliku spec"
 
+#: lib/rpmfc.c:334
+#, c-format
+msgid "Compilation of regular expresion '%s' (expanded from '%s') failed. Skipping it.\n"
Commit	Line	Data
0513629a JB	1	--- rpm-4.4.8/lib/rpmfc.h.orig 2005-11-18 23:08:14.231293000 +0100
0513629a JB	2	+++ rpm-4.4.8/lib/rpmfc.h 2005-11-18 23:55:16.694214392 +0100
15bdd1bc JB	3	@@ -1,6 +1,7 @@
	4	#ifndef _H_RPMFC_
	5	#define _H_RPMFC_
	6
	7	+#include <regex.h>
	8	#undef FILE_RCSID
	9	#include "magic.h"
	10
	11	@@ -44,6 +45,11 @@
23e3bf9a JB	12	StringBuf sb_python;/!< concatenated list of python colored files. /
	13	StringBuf sb_php; /!< concatenated list of php colored files. /
	14
	15	+ int findprov, findreq;
	16	+ regex_t *noautoprov;
	17	+ int noautoprov_c;
	18	+ regex_t *noautoreq;
	19	+ int noautoreq_c;
	20	};
	21
	22	/**
0513629a JB	23	--- rpm-4.4.8/lib/rpmfc.c.orig 2007-04-08 18:54:35.134367044 +0200
	24	+++ rpm-4.4.8/lib/rpmfc.c 2007-04-08 19:10:18.196109070 +0200
	25	@@ -11,6 +11,8 @@
5f8c53f0 JK	26	#define _RPMDS_INTERNAL
	27	#include <rpmds.h>
	28	#include <rpmfi.h>
	29	+#include <rpmts.h>
	30	+#include <rpmdb.h>
	31
23e3bf9a JB	32	#include "debug.h"
23e3bf9a JB	33
0513629a	34	@@ -305,14 +307,83 @@
5f8c53f0 JK	35	return buf;
	36	};
	37
4bdd0c9c	38	+static regex_t * rpmfcExpandRegexps(const char * str,int *count){
5f8c53f0 JK	39	+ int i,j,r;
	40	+ const char *s;
	41	+ ARGV_t patterns=NULL;
	42	+ regex_t *compiled=NULL;
	43	+
	44	+ s=rpmExpand(str,NULL);
	45	+ if (s) {
	46	+ poptParseArgvString(s,count,(const char ***)&patterns);
	47	+ s = _free(s);
	48	+ }
	49	+ if (patterns==NULL){
	50	+ *count=0;
	51	+ return NULL;
	52	+ }
	53	+ if (*count==0){
	54	+ _free(patterns);
	55	+ return NULL;
	56	+ }
	57	+
	58	+ compiled=malloc(sizeof(regex_t)(count));
	59	+ j=0;
	60	+ for(i=0;i<*count;i++){
	61	+ r=regcomp(&compiled[j],patterns[i],REG_NOSUB);
	62	+ if (r==0) j++;
	63	+ else {
	64	+ rpmMessage(RPMMESS_NORMAL,
d327d730 JB	65	+ _("Compilation of regular expresion '%s'"
d327d730 JB	66	+ " (expanded from '%s') failed. Skipping it.\n"),
5f8c53f0 JK	67	+ patterns[i],str);
	68	+ }
	69	+ }
	70	+ patterns=_free(patterns);
	71	+ if (j==0) {
	72	+ compiled=_free(compiled);
	73	+ *count=0;
	74	+ return NULL;
	75	+ }
	76	+ *count=j;
	77	+ return compiled;
	78	+}
	79	+
4bdd0c9c JB	80	+static int rpmfcMatchRegexps(regex_t regexps, int count, const char str, char deptype)
	81	+{
	82	+ int j;
	83	+ for(j = 0; j < count; j++) {
	84	+ rpmMessage(RPMMESS_DEBUG,
	85	+ _("Checking %c: '%s' against _noauto expr. #%i\n"), deptype, str, j);
	86	+ if (!regexec(&regexps[j], str, 0, NULL, 0)) {
	87	+ rpmMessage(RPMMESS_NORMAL,
	88	+ _("Skipping %c: '%s' as it matches _noauto expr. #%i\n"), deptype, str, j);
	89	+ return 1;
	90	+ }
	91	+ }
	92	+ return 0;
	93	+}
	94	+
	95	+static regex_t * rpmfcFreeRegexps(regex_t *regexps,int count){
5f8c53f0 JK	96	+ int i;
	97	+
	98	+ if (regexps)
	99	+ for(i=0;i<count;i++)
	100	+ regfree(&regexps[i]);
	101	+ return _free(regexps);
	102	+}
	103	+
	104	/**
	105	* Run per-interpreter dependency helper.
	106	* @param fc file classifier
4bdd0c9c JB	107	* @param deptype 'P' == Provides:, 'R' == Requires:, helper
	108	* @param nsdep class name for interpreter (e.g. "perl")
	109	+ * @param noauto _noauto* regexps
	110	+ * @param noauto_c # of _noauto* regexps
	111	* @return 0 on success
	112	*/
	113	-static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
	114	+static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep,
	115	+ regex_t * noauto, int noauto_c)
	116	/@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @/
	117	/@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @/
	118	{
0513629a	119	@@ -398,6 +469,8 @@
5f8c53f0 JK	120	}
	121	/@=branchstate@/
	122
4bdd0c9c JB	123	+ if(rpmfcMatchRegexps(noauto, noauto_c, N, deptype))
4bdd0c9c JB	124	+ continue;
5f8c53f0 JK	125
	126	/* Add tracking dependency for versioned Provides: */
	127	if (!fc->tracked && deptype == 'P' && *EVR != '\0') {
0513629a	128	@@ -710,7 +783,7 @@
5f8c53f0 JK	129	*se = '\0';
	130	se++;
	131
	132	- if (is_executable) {
23e3bf9a	133	+ if (is_executable && fc->findreq && !rpmfcMatchRegexps(fc->noautoreq, fc->noautoreq_c, s, 'R')) {
5f8c53f0 JK	134	/* Add to package requires. */
	135	ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
	136	xx = rpmdsMerge(&fc->requires, ds);
0513629a	137	@@ -738,43 +811,51 @@
5f8c53f0 JK	138	(void) fclose(fp);
	139
	140	if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
	141	- if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
4bdd0c9c	142	- xx = rpmfcHelper(fc, 'P', "perl");
5f8c53f0	143	- if (is_executable \|\| (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
4bdd0c9c	144	- xx = rpmfcHelper(fc, 'R', "perl");
23e3bf9a JB	145	+ if (fc->findprov && (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
	146	+ xx = rpmfcHelper(fc, 'P', "perl", fc->noautoprov, fc->noautoprov_c);
	147	+ if (fc->findreq && (is_executable \|\| (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)))
	148	+ xx = rpmfcHelper(fc, 'R', "perl", fc->noautoreq, fc->noautoreq_c);
	149	} else
5f8c53f0 JK	150	if (fc->fcolor->vals[fc->ix] & RPMFC_PYTHON) {
5f8c53f0 JK	151	- xx = rpmfcHelper(fc, 'P', "python");
23e3bf9a JB	152	+ if (fc->findprov)
	153	+ xx = rpmfcHelper(fc, 'P', "python", fc->noautoprov, fc->noautoprov_c);
	154	#ifdef NOTYET
	155	if (is_executable)
	156	#endif
4bdd0c9c	157	- xx = rpmfcHelper(fc, 'R', "python");
23e3bf9a JB	158	+ if (fc->findreq)
	159	+ xx = rpmfcHelper(fc, 'R', "python", fc->noautoreq, fc->noautoreq_c);
	160	} else
	161	if (fc->fcolor->vals[fc->ix] & RPMFC_LIBTOOL) {
	162	- xx = rpmfcHelper(fc, 'P', "libtool");
	163	+ if (fc->findprov)
	164	+ xx = rpmfcHelper(fc, 'P', "libtool", fc->noautoprov, fc->noautoprov_c);
	165	#ifdef NOTYET
	166	if (is_executable)
	167	#endif
	168	- xx = rpmfcHelper(fc, 'R', "libtool");
	169	+ if (fc->findreq)
	170	+ xx = rpmfcHelper(fc, 'R', "libtool", fc->noautoreq, fc->noautoreq_c);
	171	} else
	172	if (fc->fcolor->vals[fc->ix] & RPMFC_PKGCONFIG) {
	173	- xx = rpmfcHelper(fc, 'P', "pkgconfig");
	174	+ if (fc->findprov)
	175	+ xx = rpmfcHelper(fc, 'P', "pkgconfig", fc->noautoprov, fc->noautoprov_c);
	176	#ifdef NOTYET
	177	if (is_executable)
	178	#endif
	179	- xx = rpmfcHelper(fc, 'R', "pkgconfig");
	180	+ if (fc->findreq)
	181	+ xx = rpmfcHelper(fc, 'R', "pkgconfig", fc->noautoreq, fc->noautoreq_c);
	182	} else
	183	if (fc->fcolor->vals[fc->ix] & RPMFC_BOURNE) {
	184	#ifdef NOTYET
	185	xx = rpmfcHelper(fc, 'P', "executable");
	186	#endif
	187	- if (is_executable)
	188	- xx = rpmfcHelper(fc, 'R', "executable");
	189	+ if (fc->findreq && is_executable)
	190	+ xx = rpmfcHelper(fc, 'R', "executable", fc->noautoreq, fc->noautoreq_c);
0513629a	191	} else
5f8c53f0	192	if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
0513629a JB	193	- xx = rpmfcHelper(fc, 'P', "php");
	194	+ if (fc->findprov)
	195	+ xx = rpmfcHelper(fc, 'P', "php", fc->noautoprov, fc->noautoprov_c);
	196	/* not only executable, files run by httpd usually are not */
5f8c53f0	197	- xx = rpmfcHelper(fc, 'R', "php");
0513629a	198	+ if (fc->findreq)
52128679	199	+ xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
0513629a	200	}
5f8c53f0 JK	201
5f8c53f0 JK	202	return 0;
0513629a	203	@@ -802,20 +883,26 @@
23e3bf9a JB	204	default:
	205	break;
	206	case RPMTAG_PROVIDENAME:
15bdd1bc	207	+ if (fc->findprov && !rpmfcMatchRegexps(fc->noautoprov, fc->noautoprov_c, ds->N[0], 'P')) {
23e3bf9a JB	208	/* Add to package provides. */
23e3bf9a JB	209	rc = rpmdsMerge(&fc->provides, ds);
4bdd0c9c	210
23e3bf9a JB	211	/* Add to file dependencies. */
	212	buf[0] = '\0';
	213	rc = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, ds));
	214	+ } else
	215	+ rc = 0;
	216	break;
	217	case RPMTAG_REQUIRENAME:
15bdd1bc	218	+ if (fc->findreq && !rpmfcMatchRegexps(fc->noautoreq, fc->noautoreq_c, ds->N[0], 'R')) {
23e3bf9a JB	219	/* Add to package requires. */
23e3bf9a JB	220	rc = rpmdsMerge(&fc->requires, ds);
5f8c53f0	221
15bdd1bc JB	222	/* Add to file dependencies. */
	223	buf[0] = '\0';
	224	rc = rpmfcSaveArg(&fc->ddict, rpmfcFileDep(buf, fc->ix, ds));
	225	+ } else
	226	+ rc = 0;
	227	break;
	228	}
	229	return rc;
0513629a	230	@@ -856,6 +943,109 @@
5f8c53f0 JK	231	{ NULL, 0 }
	232	};
	233
4bdd0c9c	234	+static int rpmfcFindRequiredPackages(rpmfc fc)
5f8c53f0 JK	235	+{
	236	+ rpmts ts=NULL;
	237	+ const char * s;
	238	+ char * se;
	239	+ rpmds ds;
	240	+ const char * N;
	241	+ const char * EVR;
	242	+ int_32 Flags;
	243	+ unsigned char deptype;
	244	+ int nddict;
	245	+ int previx;
	246	+ int ix;
	247	+ int i;
	248	+ int j;
	249	+ int xx;
	250	+ int r;
	251	+ const char * hname;
	252	+ rpmdbMatchIterator it;
	253	+ Header hdr;
	254	+ regex_t *noautoreqdep;
	255	+ int noautoreqdep_c;
	256	+
7ce4c2db	257	+ noautoreqdep=rpmfcExpandRegexps("%{__noautoreqdep}", &noautoreqdep_c);
5f8c53f0 JK	258	+
	259	+ ts = rpmtsCreate(); /* XXX ts created in main() should be used */
	260	+
d327d730	261	+ rpmMessage(RPMMESS_NORMAL, _("Searching for required packages....\n"));
5f8c53f0 JK	262	+
	263	+ nddict = argvCount(fc->ddict);
	264	+ previx = -1;
	265	+ for (i = 0; i < nddict; i++) {
	266	+ s = fc->ddict[i];
	267	+
	268	+ /* Parse out (file#,deptype,N,EVR,Flags) */
	269	+ ix = strtol(s, &se, 10);
	270	+ assert(se != NULL);
	271	+ deptype = *se++;
	272	+ se++;
	273	+ N = se;
	274	+ while (se && se != ' ')
	275	+ se++;
	276	+ *se++ = '\0';
	277	+ EVR = se;
	278	+ while (se && se != ' ')
	279	+ se++;
	280	+ *se++ = '\0';
	281	+ Flags = strtol(se, NULL, 16);
	282	+
	283	+ if (deptype!='R') continue;
	284	+
d327d730	285	+ rpmMessage(RPMMESS_DEBUG, _("#%i requires: %s,%s,%i\n"),ix,N,EVR,Flags);
5f8c53f0	286	+ if (EVR && EVR[0]) {
d327d730	287	+ rpmMessage(RPMMESS_DEBUG, _("skipping #%i require\n"));
5f8c53f0 JK	288	+ continue;
	289	+ }
	290	+ for(j=0;j<noautoreqdep_c;j++)
	291	+ if (!regexec(&noautoreqdep[j],N,0,NULL,0)) {
	292	+ rpmMessage(RPMMESS_NORMAL,
d327d730 JB	293	+ _("skipping %s requirement processing"
d327d730 JB	294	+ " (matches noautoreqdep pattern #%i)\n"),N,j);
5f8c53f0 JK	295	+ break;
	296	+ }
	297	+ if (j<noautoreqdep_c) continue;
	298	+ if (N[0]=='/') {
d327d730	299	+ rpmMessage(RPMMESS_DEBUG, _("skipping #%i require (is file requirement)\n"));
5f8c53f0 JK	300	+ continue;
	301	+ }
	302	+ it=rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, N, 0);
	303	+ if (!it) {
d327d730	304	+ rpmMessage(RPMMESS_DEBUG, _("%s -> not found\n"),N);
5f8c53f0 JK	305	+ continue;
5f8c53f0 JK	306	+ }
d327d730	307	+ rpmMessage(RPMMESS_DEBUG, _("Iterator: %p\n"),it);
5f8c53f0	308	+ if (rpmdbGetIteratorCount(it)>1) {
d327d730	309	+ rpmMessage(RPMMESS_DEBUG, _("%s -> multiple (skipping)\n"),N);
5f8c53f0 JK	310	+ rpmdbFreeIterator(it);
	311	+ continue;
	312	+ }
	313	+ hdr=rpmdbNextIterator(it);
	314	+ assert(hdr!=NULL);
6efed78b	315	+ r=headerGetEntry(hdr,RPMTAG_NAME,NULL,(void **)&hname, NULL);
5f8c53f0 JK	316	+ assert(r<2);
5f8c53f0 JK	317	+ if (!strcmp(hname,N)) {
d327d730	318	+ rpmMessage(RPMMESS_DEBUG, _("%s -> %s (skipping)\n"),N,hname);
5f8c53f0 JK	319	+ rpmdbFreeIterator(it);
	320	+ continue;
	321	+ }
	322	+
	323	+ rpmMessage(RPMMESS_DEBUG, "%s -> %s\n",N,hname);
	324	+
	325	+ ds = rpmdsSingle(RPMTAG_REQUIRENAME, hname, "", RPMSENSE_FIND_REQUIRES);
	326	+ xx = rpmdsMerge(&fc->requires, ds);
	327	+ ds = rpmdsFree(ds);
	328	+
	329	+ rpmdbFreeIterator(it);
	330	+ }
	331	+
23e3bf9a	332	+ noautoreqdep = rpmfcFreeRegexps(noautoreqdep, noautoreqdep_c);
5f8c53f0 JK	333	+ ts = rpmtsFree(ts);
	334	+ return 0;
	335	+}
	336	+
	337	int rpmfcApply(rpmfc fc)
	338	{
	339	rpmfcApplyTbl fcat;
0513629a	340	@@ -874,6 +1064,26 @@
5f8c53f0 JK	341	int i;
5f8c53f0 JK	342	int xx;
505bb97c	343	int skipping;
5f8c53f0	344	+ int j;
4bdd0c9c	345	+ regex_t *noautoprovfiles = NULL;
5f8c53f0	346	+ int noautoprovfiles_c;
4bdd0c9c JB	347	+ regex_t *noautoreqfiles = NULL;
4bdd0c9c JB	348	+ int noautoreqfiles_c;
5f8c53f0 JK	349	+ const char *buildroot;
	350	+ int buildroot_l;
	351	+
23e3bf9a JB	352	+ fc->noautoprov = NULL;
	353	+ fc->noautoreq = NULL;
	354	+
4bdd0c9c JB	355	+ buildroot = rpmExpand("%{buildroot}",NULL);
4bdd0c9c JB	356	+ buildroot_l = strlen(buildroot);
5f8c53f0	357	+
7ce4c2db JB	358	+ noautoprovfiles = rpmfcExpandRegexps("%{__noautoprovfiles}", &noautoprovfiles_c);
7ce4c2db JB	359	+ noautoreqfiles = rpmfcExpandRegexps("%{__noautoreqfiles}", &noautoreqfiles_c);
23e3bf9a JB	360	+ fc->noautoprov = rpmfcExpandRegexps("%{__noautoprov}", &fc->noautoprov_c);
	361	+ fc->noautoreq = rpmfcExpandRegexps("%{__noautoreq}", &fc->noautoreq_c);
	362	+ rpmMessage(RPMMESS_DEBUG, _("%i _noautoprov patterns.\n"), fc->noautoprov_c);
	363	+ rpmMessage(RPMMESS_DEBUG, _("%i _noautoreq patterns.\n"), fc->noautoreq_c);
5f8c53f0 JK	364
	365	/* Generate package and per-file dependencies. */
	366	for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
0513629a	367	@@ -894,9 +1104,43 @@
5f8c53f0 JK	368	for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
	369	if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
	370	/@innercontinue@/ continue;
23e3bf9a JB	371	+ fc->findprov = 1;
23e3bf9a JB	372	+ fc->findreq = 1;
5f8c53f0	373	+ if (strncmp(fc->fn[fc->ix],buildroot,buildroot_l)==0) {/* sanity check */
c7d56820 AM	374	+ for(j = 0; j < noautoprovfiles_c; j++) {
	375	+ if (!regexec(&noautoprovfiles[j],
	376	+ fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
	377	+ rpmMessage(RPMMESS_NORMAL,
	378	+ _("skipping %s provides detection"
	379	+ " (matches noautoprovfiles pattern #%i)\n"),
	380	+ fc->fn[fc->ix], j);
	381	+ fc->findprov = 0;
	382	+ break;
	383	+ }
5f8c53f0	384	+ }
c7d56820 AM	385	+ for(j = 0; j < noautoreqfiles_c; j++) {
	386	+ if (!regexec(&noautoreqfiles[j],
	387	+ fc->fn[fc->ix] + buildroot_l, 0, NULL, 0)) {
	388	+ rpmMessage(RPMMESS_NORMAL,
	389	+ _("skipping %s requires detection"
	390	+ " (matches noautoreqfiles pattern #%i)\n"),
	391	+ fc->fn[fc->ix], j);
	392	+ fc->findreq = 0;
	393	+ break;
	394	+ }
5f8c53f0	395	+ }
5f8c53f0	396	+ }
c7d56820	397	+
23e3bf9a	398	xx = (*fcat->func) (fc);
5f8c53f0 JK	399	}
5f8c53f0 JK	400	}
7ce4c2db JB	401	+ noautoprovfiles = rpmfcFreeRegexps(noautoprovfiles, noautoprovfiles_c);
7ce4c2db JB	402	+ noautoreqfiles = rpmfcFreeRegexps(noautoreqfiles, noautoreqfiles_c);
23e3bf9a JB	403	+ fc->noautoprov = rpmfcFreeRegexps(fc->noautoprov, fc->noautoprov_c);
23e3bf9a JB	404	+ fc->noautoreq = rpmfcFreeRegexps(fc->noautoreq, fc->noautoreq_c);
8e52eb7d	405	+#ifdef AUTODEP_PKGNAMES /* define to use package names in R */
7ce4c2db JB	406	+ rpmfcFindRequiredPackages(fc);
7ce4c2db JB	407	+#endif
c7d56820	408
5f8c53f0 JK	409	/@-boundswrite@/
5f8c53f0 JK	410	/* Generate per-file indices into package dependencies. */
d327d730 JB	411	--- rpm-4.3/po/pl.po.orig 2004-02-01 20:53:10.000000000 +0100
d327d730 JB	412	+++ rpm-4.3/po/pl.po 2004-02-01 21:20:36.532561576 +0100
043ea103	413	@@ -1295,6 +1295,86 @@
d327d730 JB	414	msgid "lookup i18N strings in specfile catalog"
	415	msgstr "wyszukaj wpisy I18N w katalogu pliku spec"
	416
043ea103	417	+#: lib/rpmfc.c:334
d327d730 JB	418	+#, c-format
	419	+msgid "Compilation of regular expresion '%s' (expanded from '%s') failed. Skipping it.\n"
	420