Don't conflict with uncompress2 from zlib.

12 files changed, 589 insertions, 1 deletions

diff --git a/www/swish-e/distinfo b/www/swish-e/distinfo
index 6a8664c4f9d..612972ebc93 100644
--- a/www/swish-e/distinfo
+++ b/www/swish-e/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 02:47:39 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/02/09 00:18:01 joerg Exp $
 
 SHA1 (swish-e-2.4.5.tar.gz) = 9e93580ef75c372eb232bc0a4940ce76f41a87f6
 RMD160 (swish-e-2.4.5.tar.gz) = b89d8cc8d8f850d2ddf0b52b583a1cb1c0f3c1b3
@@ -9,3 +9,14 @@ SHA1 (patch-ac) = 48d4828baf70ea1f387e93973419329ee08ffe9c
 SHA1 (patch-ad) = 52e5061b9fb54d6f68b833dcbaa13c24b1138927
 SHA1 (patch-ae) = 216aaac5d791ec537f00c73d4e77033e90e15147
 SHA1 (patch-af) = a15bd7a6d6c6077b657a7b4b7c29e08a31f18a76
+SHA1 (patch-src_btree.c) = 5c5fde012c52b187649dc5d05618ccc718a963c4
+SHA1 (patch-src_compress.c) = 33adc08cb02adf24c87a4ca3e6ea81eee33f18ad
+SHA1 (patch-src_compress.h) = 5946b3c2d8c40491269d5a46b5ade09ba0315fec
+SHA1 (patch-src_db__native.c) = f845c49a2d5fd6d1436a5b6a52350e6333bb5e74
+SHA1 (patch-src_db__read.c) = f95833b15ee4e797613d7bfd9cd1705eaa4b60c5
+SHA1 (patch-src_db__write.c) = aef2f748675c459086d75f2bf7e3c50963f8a9ec
+SHA1 (patch-src_dump.c) = 4f8a2242cea218aa18b9c8519df54aa7a485630a
+SHA1 (patch-src_index.c) = e9abd6b2c8be0a1aa53166413d1ab37762b5edb6
+SHA1 (patch-src_merge.c) = ab2fe40304697635d01657bdcab6faeb245a4c75
+SHA1 (patch-src_result__sort.c) = 438293733093084926f7e310ef77421055f09ae1
+SHA1 (patch-src_search.c) = c8a1a9bd5676245ce5576b31049b6eca071f2581
diff --git a/www/swish-e/patches/patch-src_btree.c b/www/swish-e/patches/patch-src_btree.c
new file mode 100644
index 00000000000..61fe26f9201
--- /dev/null
+++ b/www/swish-e/patches/patch-src_btree.c
@@ -0,0 +1,116 @@
+$NetBSD: patch-src_btree.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/btree.c.orig	2017-02-08 21:49:08.790805235 +0000
++++ src/btree.c
+@@ -321,7 +321,7 @@ unsigned char *key_k;
+     {
+         k = j + (i - j) / 2;
+         key_k = BTREE_KeyData(pg,k);
+-        key_len_k = uncompress2(&key_k);
++        key_len_k = swish_uncompress2(&key_k);
+         isbigger = BTREE_CompareKeys(key,key_len,key_k,key_len_k);
+         if (!isbigger)
+             break;
+@@ -358,7 +358,7 @@ sw_off_t data_pointer;
+         return 0;
+ 
+     *found = BTREE_KeyData(pg,k);
+-    *found_len = uncompress2(found);
++    *found_len = swish_uncompress2(found);
+ 
+     /* Solaris do not like this. Use memcpy instead
+     data_pointer = *(sw_off_t *) (*found + *found_len);
+@@ -483,7 +483,7 @@ int j, k = pos;
+ 
+     /* Compute length of deleted key */
+     del_key_start = q = BTREE_KeyData(pg,k);
+-    q += uncompress2(&q);
++    q += swish_uncompress2(&q);
+     q += sizeof(sw_off_t);
+     del_key_end = q;
+     del_entry_len = del_key_end - del_key_start;
+@@ -610,7 +610,7 @@ int tmp;
+     for(i = 0; i < n; i++)
+     {
+         key_data = start = BTREE_KeyData(pg, pg->n - n + i);
+-        key_len = uncompress2(&key_data);
++        key_len = swish_uncompress2(&key_data);
+ 
+         memcpy(p, start, (key_data - start) + key_len + sizeof(sw_off_t));
+         tmp = p - new_pg->data;
+@@ -628,7 +628,7 @@ int tmp;
+     for(i = 0; i < (int)pg->n ; i++)
+     {
+         key_data = start = BTREE_KeyData(pg,i);
+-        key_len = uncompress2(&key_data);
++        key_len = swish_uncompress2(&key_data);
+ 
+         memmove(p, start, (key_data - start) + key_len + sizeof(sw_off_t));
+         tmp = p - pg->data;
+@@ -687,7 +687,7 @@ int comp;
+             if(!(pg->flags & BTREE_ROOT_NODE))
+             {
+                 key_data0 = BTREE_KeyData(pg,0);
+-                key_len0 = uncompress2(&key_data0);
++                key_len0 = swish_uncompress2(&key_data0);
+                 father_pg = BTREE_ReadPage(b,b->tree[level]);
+                 BTREE_InsertInPage(b,father_pg, key_data0, key_len0, pg->page_number, level - 1, 1);
+             }
+@@ -711,7 +711,7 @@ int comp;
+     pg->next = new_pg->page_number;
+ 
+     key_data0 = BTREE_KeyData(new_pg,0);
+-    key_len0 = uncompress2(&key_data0);
++    key_len0 = swish_uncompress2(&key_data0);
+ 
+             /* Let's see where to put the key */
+     if(BTREE_CompareKeys(key, key_len, key_data0, key_len0) > 0)
+@@ -740,10 +740,10 @@ int comp;
+         root_page = BTREE_NewPage(b,b->page_size, BTREE_ROOT_NODE);
+ 
+         key_data0 = BTREE_KeyData(pg,0);
+-        key_len0 = uncompress2(&key_data0);
++        key_len0 = swish_uncompress2(&key_data0);
+         BTREE_AddKeyToPage(root_page, 0, key_data0, key_len0 , pg->page_number);
+         key_data0 = BTREE_KeyData(new_pg,0);
+-        key_len0 = uncompress2(&key_data0);
++        key_len0 = swish_uncompress2(&key_data0);
+         BTREE_AddKeyToPage(root_page, 1, key_data0, key_len0, new_pg->page_number);
+ 
+         b->root_page = root_page->page_number;
+@@ -769,7 +769,7 @@ int comp;
+         BTREE_FreePage(b, pg);
+ 
+         key_data0 = BTREE_KeyData(new_pg,0);
+-        key_len0 = uncompress2(&key_data0);
++        key_len0 = swish_uncompress2(&key_data0);
+         BTREE_FreePage(b, BTREE_Walk(b,key_data0,key_len0));
+     }
+     else
+@@ -778,7 +778,7 @@ int comp;
+         BTREE_FreePage(b, pg);
+ 
+         key_data0 = BTREE_KeyData(new_pg,0);
+-        key_len0 = uncompress2(&key_data0);
++        key_len0 = swish_uncompress2(&key_data0);
+     }
+ 
+     if(!(new_pg->flags & BTREE_ROOT_NODE))
+@@ -827,7 +827,7 @@ BTREE_Page *pg = BTREE_Walk(b,key,key_le
+ 
+     key_k = BTREE_KeyData(pg,k);
+ 
+-    key_len_k = uncompress2(&key_k);
++    key_len_k = swish_uncompress2(&key_k);
+ 
+     if ( key_len_k != key_len)
+         return -1;   /* Error - Should never happen */
+@@ -903,7 +903,7 @@ int key_len_k;
+         b->current_position = 0;
+     }
+     key_k = BTREE_KeyData(pg,b->current_position);
+-    *found_len = key_len_k = uncompress2(&key_k);
++    *found_len = key_len_k = swish_uncompress2(&key_k);
+     *found = emalloc(key_len_k);
+     memcpy(*found,key_k,key_len_k);
+     data_pointer = UNPACKFILEOFFSET(*(unsigned long *) (key_k + key_len_k));
diff --git a/www/swish-e/patches/patch-src_compress.c b/www/swish-e/patches/patch-src_compress.c
new file mode 100644
index 00000000000..ca04e10fe07
--- /dev/null
+++ b/www/swish-e/patches/patch-src_compress.c
@@ -0,0 +1,64 @@
+$NetBSD: patch-src_compress.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/compress.c.orig	2017-02-08 21:54:48.736189312 +0000
++++ src/compress.c
+@@ -194,7 +194,7 @@ int     uncompress1(FILE * fp, int (*f_g
+ 
+ /* same routine but this works with a memory forward buffer instead of file */
+ /* it also increases the buffer pointer */
+-int     uncompress2(unsigned char **buffer)
++int     swish_uncompress2(unsigned char **buffer)
+ {
+     int     _c;
+     int     num = 0;
+@@ -604,10 +604,10 @@ void uncompress_location_values(unsigned
+     else
+         (*frequency) |= (*flag) & 15;   /* Binary 00001111 */
+ 
+-    *filenum = uncompress2(&p);
++    *filenum = swish_uncompress2(&p);
+ 
+     if(! (*frequency))
+-        *frequency = uncompress2(&p);
++        *frequency = swish_uncompress2(&p);
+ 
+     *buf = p;
+ }
+@@ -656,7 +656,7 @@ void uncompress_location_positions(unsig
+         }
+ 
+         /* First position is always "as is" */
+-        posdata[0] = (unsigned int)uncompress2(&p);
++        posdata[0] = (unsigned int)swish_uncompress2(&p);
+ 
+         /* Check if positions where stored as two values per byte or the old "compress" style */
+         if(flag & POS_4_BIT)
+@@ -674,7 +674,7 @@ void uncompress_location_positions(unsig
+         {
+             for (i = 1; i < frequency; i++)
+             {
+-                tmp = uncompress2(&p);
++                tmp = swish_uncompress2(&p);
+                 posdata[i] = (unsigned int)tmp;
+             }
+         }
+@@ -974,8 +974,8 @@ void    remove_worddata_longs(unsigned c
+     src = worddata;
+ 
+     /* Jump over tfrequency and get first metaID */
+-    tfrequency = uncompress2(&src);     /* tfrequency */
+-    metaID = uncompress2(&src);     /* metaID */
++    tfrequency = swish_uncompress2(&src);     /* tfrequency */
++    metaID = swish_uncompress2(&src);     /* metaID */
+     dst = src;
+ 
+     while(1)
+@@ -1006,7 +1006,7 @@ void    remove_worddata_longs(unsigned c
+             break;   /* End of worddata */
+ 
+         /* Get next metaID */
+-        metaID = uncompress2(&src);
++        metaID = swish_uncompress2(&src);
+         dst = compress3(metaID,dst);
+     }
+     /* Adjust to new size */
diff --git a/www/swish-e/patches/patch-src_compress.h b/www/swish-e/patches/patch-src_compress.h
new file mode 100644
index 00000000000..8aaea4fc491
--- /dev/null
+++ b/www/swish-e/patches/patch-src_compress.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_compress.h,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/compress.h.orig	2017-02-08 21:48:02.207439712 +0000
++++ src/compress.h
+@@ -36,7 +36,7 @@ void compress1(int num, FILE *fp, int (*
+ unsigned char *compress3(int num, unsigned char *buffer);
+ 
+ int uncompress1(FILE *fp, int (*f_getc)(FILE *fp));
+-int uncompress2(unsigned char **buffer);
++int swish_uncompress2(unsigned char **buffer);
+ 
+ 
+ unsigned long PACKLONG(unsigned long num);
diff --git a/www/swish-e/patches/patch-src_db__native.c b/www/swish-e/patches/patch-src_db__native.c
new file mode 100644
index 00000000000..0022f3e663e
--- /dev/null
+++ b/www/swish-e/patches/patch-src_db__native.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_db__native.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/db_native.c.orig	2017-02-08 21:49:04.614639531 +0000
++++ src/db_native.c
+@@ -1595,7 +1595,7 @@ long    DB_ReadWordData_Native(sw_off_t 
+ 
+     *worddata = buf = WORDDATA_Get(DB->worddata,wordID,data_size);
+     /* Get saved_bytes and adjust data_size */
+-    *saved_bytes = uncompress2(&buf);
++    *saved_bytes = swish_uncompress2(&buf);
+     *data_size -= (buf - (*worddata));
+     /* Remove saved_bytes from buffer
+     ** We need to use memmove because data overlaps */
diff --git a/www/swish-e/patches/patch-src_db__read.c b/www/swish-e/patches/patch-src_db__read.c
new file mode 100644
index 00000000000..fd415b3cbd3
--- /dev/null
+++ b/www/swish-e/patches/patch-src_db__read.c
@@ -0,0 +1,63 @@
+$NetBSD: patch-src_db__read.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/db_read.c.orig	2017-02-08 21:49:36.517681427 +0000
++++ src/db_read.c
+@@ -308,24 +308,24 @@ void    parse_MetaNames_from_buffer(INDE
+     /* First clear out the default metanames */
+     freeMetaEntries( header );
+ 
+-    num_metanames = uncompress2(&s);
++    num_metanames = swish_uncompress2(&s);
+ 
+     for (i = 0; i < num_metanames; i++)
+     {
+-        len = uncompress2(&s);
++        len = swish_uncompress2(&s);
+         word = emalloc(len +1);
+         memcpy(word,s,len); s += len;
+         word[len] = '\0';
+         /* Read metaID */
+-        metaID = uncompress2(&s);
++        metaID = swish_uncompress2(&s);
+         /* metaType was saved as metaType+1 */
+-        metaType = uncompress2(&s);
++        metaType = swish_uncompress2(&s);
+ 
+-        alias = uncompress2(&s) - 1;
++        alias = swish_uncompress2(&s) - 1;
+ 
+-        sort_len = uncompress2(&s);
++        sort_len = swish_uncompress2(&s);
+ 
+-        bias = uncompress2(&s) - RANK_BIAS_RANGE - 1;
++        bias = swish_uncompress2(&s) - RANK_BIAS_RANGE - 1;
+ 
+ 
+         /* add the meta tag */
+@@ -350,11 +350,11 @@ static void load_word_hash_from_buffer(W
+ 
+     unsigned char   *s = (unsigned char *)buffer;
+ 
+-    num_words = uncompress2(&s);
++    num_words = swish_uncompress2(&s);
+     
+     for (i=0; i < num_words ; i++)   
+     {
+-        len = uncompress2(&s);
++        len = swish_uncompress2(&s);
+         word = emalloc(len+1);
+         memcpy(word,s,len); s += len;
+         word[len] = '\0';
+@@ -373,10 +373,10 @@ void parse_integer_table_from_buffer(int
+     int     tmp,i;
+     unsigned char    *s = (unsigned char *)buffer;
+ 
+-    tmp = uncompress2(&s);   /* Jump the number of elements */
++    tmp = swish_uncompress2(&s);   /* Jump the number of elements */
+     for (i = 0; i < table_size; i++)
+     {
+-        tmp = uncompress2(&s); /* Gut all the elements */
++        tmp = swish_uncompress2(&s); /* Gut all the elements */
+         table[i] = tmp - 1;
+     }
+ }
diff --git a/www/swish-e/patches/patch-src_db__write.c b/www/swish-e/patches/patch-src_db__write.c
new file mode 100644
index 00000000000..f27169651e8
--- /dev/null
+++ b/www/swish-e/patches/patch-src_db__write.c
@@ -0,0 +1,112 @@
+$NetBSD: patch-src_db__write.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/db_write.c.orig	2017-02-08 21:49:38.714903409 +0000
++++ src/db_write.c
+@@ -239,7 +239,7 @@ void build_worddata(SWISH * sw, ENTRY * 
+         /* Jump pointer to next element */
+         p = compressed_data + sizeof(LOCATION *);
+ 
+-        metaID = uncompress2(&p);
++        metaID = swish_uncompress2(&p);
+ 
+         memcpy((char *)&chunk_size,(char *)p,sizeof(chunk_size));
+         p += sizeof(chunk_size);
+@@ -386,12 +386,12 @@ unsigned char *q;
+     ** are presents to calculate a safe size for olddata with packedlongs */
+     p1=olddata;
+     num_metaids1=0;
+-    uncompress2(&p1);   /* Jump tfreq */
++    swish_uncompress2(&p1);   /* Jump tfreq */
+     do
+     {
+         num_metaids1++;
+-        uncompress2(&p1);   /* Jump metaid */
+-        metadata_length_1 = uncompress2(&p1);
++        swish_uncompress2(&p1);   /* Jump metaid */
++        metadata_length_1 = swish_uncompress2(&p1);
+         p1 += metadata_length_1;
+     } while ((p1 - olddata) != sz_olddata);
+     maxtotsize = sw->Index->sz_worddata_buffer + (sz_olddata + num_metaids1 * sizeof(long));
+@@ -417,17 +417,17 @@ unsigned char *q;
+     q = p = sw->Index->worddata_buffer;
+ 
+     /* Now read tfrequency */
+-    tfreq1 = uncompress2(&p1); /* tfrequency - number of files with this word */
+-    tfreq2 = uncompress2(&p2); /* tfrequency - number of files with this word */
++    tfreq1 = swish_uncompress2(&p1); /* tfrequency - number of files with this word */
++    tfreq2 = swish_uncompress2(&p2); /* tfrequency - number of files with this word */
+     /* Write tfrequency */
+     p = compress3(tfreq1 + tfreq2, p);
+ 
+     /* Now look for MetaIDs */
+-    curmetaID_1 = uncompress2(&p1);
+-    curmetaID_2 = uncompress2(&p2);
++    curmetaID_1 = swish_uncompress2(&p1);
++    curmetaID_2 = swish_uncompress2(&p2);
+ 
+     /* Old data is compressed in a different more optimized schema */
+-    metadata_length_1 = uncompress2(&p1);
++    metadata_length_1 = swish_uncompress2(&p1);
+     nextposmetaname_1 = p1 - olddata + metadata_length_1;
+ 
+     curmetanamepos_1 = p1 - olddata;
+@@ -485,8 +485,8 @@ unsigned char *q;
+             /* Values for next metaID if exists */
+             if(curmetaID_1)
+             {
+-                curmetaID_1 = uncompress2(&p1);  /* Next metaID */
+-                metadata_length_1 = uncompress2(&p1);
++                curmetaID_1 = swish_uncompress2(&p1);  /* Next metaID */
++                metadata_length_1 = swish_uncompress2(&p1);
+                 nextposmetaname_1 = p1 - olddata + metadata_length_1;
+                 curmetanamepos_1 = p1 - olddata;
+             }
+@@ -522,7 +522,7 @@ unsigned char *q;
+             /* Values for next metaID if exists */
+             if(curmetaID_2)
+             {
+-                curmetaID_2 = uncompress2(&p2);  /* Next metaID */
++                curmetaID_2 = swish_uncompress2(&p2);  /* Next metaID */
+                 nextposmetaname_2 = UNPACKLONG2(p2);
+                 p2 += sizeof(long);
+                 curmetanamepos_2 = p2 - newdata;
+@@ -539,8 +539,8 @@ unsigned char *q;
+             }
+             else
+             {
+-                curmetaID_1 = uncompress2(&p1);  /* Next metaID */
+-                metadata_length_1 = uncompress2(&p1);
++                curmetaID_1 = swish_uncompress2(&p1);  /* Next metaID */
++                metadata_length_1 = swish_uncompress2(&p1);
+                 nextposmetaname_1 = p1 - olddata + metadata_length_1;
+                 curmetanamepos_1 = p1 - olddata;
+             }
+@@ -556,7 +556,7 @@ unsigned char *q;
+             }
+             else
+             {
+-                curmetaID_2 = uncompress2(&p2);  /* Next metaID */
++                curmetaID_2 = swish_uncompress2(&p2);  /* Next metaID */
+                 nextposmetaname_2 = UNPACKLONG2(p2);
+                 p2 += sizeof(long);
+                 curmetanamepos_2 = p2 - newdata;
+@@ -587,8 +587,8 @@ unsigned char *q;
+         }
+         else
+         {
+-            curmetaID_1 = uncompress2(&p1);  /* Next metaID */
+-            metadata_length_1 = uncompress2(&p1);
++            curmetaID_1 = swish_uncompress2(&p1);  /* Next metaID */
++            metadata_length_1 = swish_uncompress2(&p1);
+             nextposmetaname_1 = p1 - olddata + metadata_length_1;
+             curmetanamepos_1 = p1 - olddata;
+         }
+@@ -615,7 +615,7 @@ unsigned char *q;
+         }
+         else
+         {
+-            curmetaID_2 = uncompress2(&p2);  /* Next metaID */
++            curmetaID_2 = swish_uncompress2(&p2);  /* Next metaID */
+             nextposmetaname_2 = UNPACKLONG2(p2);
+             p2+= sizeof(long);
+             curmetanamepos_2= p2 - newdata;
diff --git a/www/swish-e/patches/patch-src_dump.c b/www/swish-e/patches/patch-src_dump.c
new file mode 100644
index 00000000000..f67999f41b0
--- /dev/null
+++ b/www/swish-e/patches/patch-src_dump.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-src_dump.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/dump.c.orig	2017-02-08 21:49:02.064016668 +0000
++++ src/dump.c
+@@ -249,9 +249,9 @@ void    DB_decompress(SWISH * sw, IndexF
+                 /* parse and print word's data */
+                 s = worddata;
+ 
+-                tmpval = uncompress2(&s);     /* tfrequency */
+-                metaID = uncompress2(&s);     /* metaID */
+-                metadata_length = uncompress2(&s);
++                tmpval = swish_uncompress2(&s);     /* tfrequency */
++                metaID = swish_uncompress2(&s);     /* metaID */
++                metadata_length = swish_uncompress2(&s);
+ 
+                 filenum = 0;
+                 start = s;
+@@ -276,8 +276,8 @@ void    DB_decompress(SWISH * sw, IndexF
+                     if ( metadata_length == (s - start))
+                     {
+                         filenum = 0;
+-                        metaID = uncompress2(&s);
+-                        metadata_length = uncompress2(&s);
++                        metaID = swish_uncompress2(&s);
++                        metadata_length = swish_uncompress2(&s);
+                         start = s;
+                     }
+ 
+@@ -337,9 +337,9 @@ void    DB_decompress(SWISH * sw, IndexF
+                 /* parse and print word's data */
+                 s = worddata;
+ 
+-                tmpval = uncompress2(&s);     /* tfrequency */
+-                metaID = uncompress2(&s);     /* metaID */
+-                metadata_length = uncompress2(&s);
++                tmpval = swish_uncompress2(&s);     /* tfrequency */
++                metaID = swish_uncompress2(&s);     /* metaID */
++                metadata_length = swish_uncompress2(&s);
+ 
+                 filenum = 0;
+                 start = s;
+@@ -437,8 +437,8 @@ void    DB_decompress(SWISH * sw, IndexF
+                     if ( metadata_length == (s - start))
+                     {
+                         filenum = 0;
+-                        metaID = uncompress2(&s);
+-                        metadata_length = uncompress2(&s);
++                        metaID = swish_uncompress2(&s);
++                        metadata_length = swish_uncompress2(&s);
+                         start = s;
+                     }
+                 }
diff --git a/www/swish-e/patches/patch-src_index.c b/www/swish-e/patches/patch-src_index.c
new file mode 100644
index 00000000000..26964a0d1b9
--- /dev/null
+++ b/www/swish-e/patches/patch-src_index.c
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_index.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/index.c.orig	2017-02-08 21:48:59.967412529 +0000
++++ src/index.c
+@@ -1748,7 +1748,7 @@ void getPositionsFromIgnoreLimitWords(SW
+                  /* Jump pointer to next element */
+                  p = compressed_data + sizeof(LOCATION *);
+ 
+-                 metaID = uncompress2(&p);
++                 metaID = swish_uncompress2(&p);
+ 
+                  memcpy((char *)&chunk_size,(char *)p,sizeof(chunk_size));
+                  p += sizeof(chunk_size);
+@@ -1842,8 +1842,8 @@ void adjustWordPositions(unsigned char *
+ 
+     p = worddata;
+ 
+-    tmpval = uncompress2(&p);     /* tfrequency */
+-    metaID = uncompress2(&p);     /* metaID */
++    tmpval = swish_uncompress2(&p);     /* tfrequency */
++    metaID = swish_uncompress2(&p);     /* metaID */
+     r_nextposmeta =  UNPACKLONG2(p); 
+     w_nextposmeta = p;
+     p += sizeof(long);
+@@ -1907,7 +1907,7 @@ void adjustWordPositions(unsigned char *
+             if(q != p)
+                 PACKLONG2(q - worddata, w_nextposmeta);
+ 
+-            metaID = uncompress2(&p);
++            metaID = swish_uncompress2(&p);
+             q = compress3(metaID,q);
+ 
+             r_nextposmeta = UNPACKLONG2(p); 
+@@ -2035,7 +2035,7 @@ static void    sortChunkLocations(ENTRY 
+         /* Jump next offset */
+         compressed_data += sizeof(LOCATION *);
+ 
+-        metaID = uncompress2(&compressed_data);
++        metaID = swish_uncompress2(&compressed_data);
+         uncompress_location_values(&compressed_data,&flag,&filenum,&frequency);
+         pi[0] = metaID;
+         pi[1] = filenum;
+@@ -2784,7 +2784,7 @@ void add_coalesced(SWISH *sw, ENTRY *e, 
+     for(tprev =NULL, tloc = e->allLocationList; tloc; )
+     {
+         tp = (unsigned char *)tloc + sizeof(void *);
+-        tmp = uncompress2(&tp); /* Read metaID */
++        tmp = swish_uncompress2(&tp); /* Read metaID */
+         if(tmp > metaID)
+              break;
+         tprev = tloc;
+@@ -2854,7 +2854,7 @@ void    coalesce_word_locations(SWISH * 
+         p += sizeof(LOCATION *);
+ 
+         /* get metaID of LOCATION */
+-        metaID = uncompress2(&p);
++        metaID = swish_uncompress2(&p);
+ 
+         /* Check for new metaID */
+         if(metaID != curmetaID)
+@@ -3149,7 +3149,7 @@ static void sortSwapLocData(ENTRY *e)
+         /* Jump fileoffset */
+         compressed_data += sizeof(LOCATION *);
+ 
+-        metaID = uncompress2(&compressed_data);
++        metaID = swish_uncompress2(&compressed_data);
+         pi[0] = metaID;
+         pi[1] = i-k;
+         ptmp2 += 2 * sizeof(int);
diff --git a/www/swish-e/patches/patch-src_merge.c b/www/swish-e/patches/patch-src_merge.c
new file mode 100644
index 00000000000..fa31cd43647
--- /dev/null
+++ b/www/swish-e/patches/patch-src_merge.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_merge.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/merge.c.orig	2017-02-08 21:48:57.570631072 +0000
++++ src/merge.c
+@@ -221,12 +221,12 @@ void merge_indexes( SWISH *sw_input, SWI
+ 
+                         /* Now, parse word's data */
+                         s = worddata;
+-                        tmpval = uncompress2(&s);     /* tfrequency */
+-                        metaID = uncompress2(&s);     /* metaID */
++                        tmpval = swish_uncompress2(&s);     /* tfrequency */
++                        metaID = swish_uncompress2(&s);     /* metaID */
+ 
+                         if (metaID)
+                         {
+-                            metadata_length = uncompress2(&s);
++                            metadata_length = swish_uncompress2(&s);
+                         }
+ 
+                         filenum = 0;
+@@ -274,8 +274,8 @@ void merge_indexes( SWISH *sw_input, SWI
+                             if ( metadata_length == (s - start))
+                             {
+                                 filenum = 0;
+-                                metaID = uncompress2(&s);
+-                                metadata_length = uncompress2(&s);
++                                metaID = swish_uncompress2(&s);
++                                metadata_length = swish_uncompress2(&s);
+                                 start = s;
+                             }
+                         }
diff --git a/www/swish-e/patches/patch-src_result__sort.c b/www/swish-e/patches/patch-src_result__sort.c
new file mode 100644
index 00000000000..62db89227a7
--- /dev/null
+++ b/www/swish-e/patches/patch-src_result__sort.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_result__sort.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/result_sort.c.orig	2017-02-08 21:48:55.316749633 +0000
++++ src/result_sort.c
+@@ -262,7 +262,7 @@ int    *LoadSortedProps(IndexFILE * inde
+ 
+         /* Unpack / decompress the numbers */
+         for (j = 0; j < indexf->header.totalfiles; j++)
+-            m->sorted_data[j] = uncompress2(&s);
++            m->sorted_data[j] = swish_uncompress2(&s);
+ 
+         efree(buffer);
+     }
diff --git a/www/swish-e/patches/patch-src_search.c b/www/swish-e/patches/patch-src_search.c
new file mode 100644
index 00000000000..2e5899b5018
--- /dev/null
+++ b/www/swish-e/patches/patch-src_search.c
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_search.c,v 1.1 2017/02/09 00:18:01 joerg Exp $
+
+--- src/search.c.orig	2017-02-08 21:48:51.513187901 +0000
++++ src/search.c
+@@ -1719,14 +1719,14 @@ static RESULT_LIST *getfileinfo(DB_RESUL
+         // 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;
+@@ -1738,7 +1738,7 @@ static RESULT_LIST *getfileinfo(DB_RESUL
+             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 */