SecBSD's official ports repository

textproc/swish-e/patches/patch-src_search_c

@@ -0,0 +1,32 @@
+Fix namespace collision with libz
+
+Index: src/search.c
+--- src/search.c.orig
++++ src/search.c
+@@ -1736,14 +1736,14 @@ static RESULT_LIST *getfileinfo(DB_RESULTS *db_results
+         // buffer structure = <tfreq><metaID><delta to next meta>
+ 
+         /* Get the data of the word */
+-        tfrequency = uncompress2(&s); /* tfrequency - number of files with this word */
++        tfrequency = swish_uncompress2(&s); /* tfrequency - number of files with this word */
+ 
+         /* Now look for a correct Metaname */
+-        curmetaID = uncompress2(&s);
++        curmetaID = swish_uncompress2(&s);
+ 
+         while (curmetaID)
+         {
+-            metadata_length = uncompress2(&s);
++            metadata_length = swish_uncompress2(&s);
+             
+             if (curmetaID >= metaID)
+                 break;
+@@ -1755,7 +1755,7 @@ static RESULT_LIST *getfileinfo(DB_RESULTS *db_results
+             if(s == (buffer + sz_buffer))
+                 break; /* exit if no more meta data */
+ 
+-            curmetaID = uncompress2(&s);
++            curmetaID = swish_uncompress2(&s);
+         }
+ 
+         if (curmetaID == metaID) /* found a matching meta value */