CVS commit: pkgsrc/databases/sqlite

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Jun 25 09:17:38 UTC 2022

Modified Files:
        pkgsrc/databases/sqlite: Makefile distinfo
        pkgsrc/databases/sqlite/patches: patch-tool_lemon.c

Log Message:
databases/sqlite: reinstall masking in hash computation.

Suggested by Taylor Campbell.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/databases/sqlite/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/sqlite/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/sqlite/patches/patch-tool_lemon.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/sqlite/Makefile
diff -u pkgsrc/databases/sqlite/Makefile:1.48 pkgsrc/databases/sqlite/Makefile:1.49
--- pkgsrc/databases/sqlite/Makefile:1.48       Fri Jun 24 15:42:10 2022
+++ pkgsrc/databases/sqlite/Makefile    Sat Jun 25 09:17:38 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2022/06/24 15:42:10 he Exp $
+# $NetBSD: Makefile,v 1.49 2022/06/25 09:17:38 he Exp $
 
 DISTNAME=              sqlite-2.8.17
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            databases
 MASTER_SITES=          http://www.hwaci.com/sw/sqlite/
 MASTER_SITES+=         http://www.sqlite.org/

Index: pkgsrc/databases/sqlite/distinfo
diff -u pkgsrc/databases/sqlite/distinfo:1.28 pkgsrc/databases/sqlite/distinfo:1.29
--- pkgsrc/databases/sqlite/distinfo:1.28       Fri Jun 24 15:42:10 2022
+++ pkgsrc/databases/sqlite/distinfo    Sat Jun 25 09:17:38 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2022/06/24 15:42:10 he Exp $
+$NetBSD: distinfo,v 1.29 2022/06/25 09:17:38 he Exp $
 
 BLAKE2s (sqlite-2.8.17.tar.gz) = 2750dd8a0682b2047139de66b6a184b08e7674cb92846c629561604fc130fe37
 SHA512 (sqlite-2.8.17.tar.gz) = 966e0b7f7ebbaaa9e1899864475040946fd7b66363be778d29fadd5184623b1e62644f3c8d4c4ecd001b88044befa7c34d9de9f68590329a1a8301d854b73e3f
@@ -6,4 +6,4 @@ Size (sqlite-2.8.17.tar.gz) = 969805 byt
 SHA1 (patch-Makefile.in) = a7e6d0c15b6bd4c8c0f3a7123e82a145b3848703
 SHA1 (patch-aa) = 4df2eff8c92b3e2bff86c710ef1a803d54201559
 SHA1 (patch-ab) = 00b7de05589fb62d511e26d0d864a8b5545967c8
-SHA1 (patch-tool_lemon.c) = 118f2cf965dd4eaddef7228bdca89f9cae26d7c3
+SHA1 (patch-tool_lemon.c) = c536a2784e9f360fc3d73c2ed0a243fee02358ff

Index: pkgsrc/databases/sqlite/patches/patch-tool_lemon.c
diff -u pkgsrc/databases/sqlite/patches/patch-tool_lemon.c:1.1 pkgsrc/databases/sqlite/patches/patch-tool_lemon.c:1.2
--- pkgsrc/databases/sqlite/patches/patch-tool_lemon.c:1.1      Fri Jun 24 15:42:10 2022
+++ pkgsrc/databases/sqlite/patches/patch-tool_lemon.c  Sat Jun 25 09:17:38 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-tool_lemon.c,v 1.1 2022/06/24 15:42:10 he Exp $
+$NetBSD: patch-tool_lemon.c,v 1.2 2022/06/25 09:17:38 he Exp $
 
 Avoid either undefined or implementation defined behaviour,
 by making the base hash variable unsigned, so that we avoid
@@ -15,12 +15,3 @@ it ever going negative (as it did on pow
    char *name;               /* Name of the parser */
  
    /* Allocate and initialize types[] and allocate stddt[] */
-@@ -3068,7 +3068,7 @@ int mhflag;                 /* True if g
-     for(j=0; stddt[j]; j++){
-       hash = hash*53 + stddt[j];
-     }
--    hash = (hash & 0x7fffffff)%arraysize;
-+    hash = hash % arraysize;
-     while( types[hash] ){
-       if( strcmp(types[hash],stddt)==0 ){
-         sp->dtnum = hash + 1;