wok rev 23685

sqlite: fix version
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Apr 26 16:28:39 2020 +0000 (2020-04-26)
parents 077406ca833e
children 4963cd31b894
files lemon/receipt libsqlite-tcl/receipt libsqlite/receipt qemu/stuff/cloop.u sqlite-dev/receipt sqlite/receipt
line diff
     1.1 --- a/lemon/receipt	Sun Apr 26 17:15:20 2020 +0100
     1.2 +++ b/lemon/receipt	Sun Apr 26 16:28:39 2020 +0000
     1.3 @@ -2,7 +2,7 @@
     1.4  
     1.5  PACKAGE="lemon"
     1.6  _realver="3310100"
     1.7 -VERSION="${_realver:0:1}.${_realver:1:2}.${_realver:3:1}"
     1.8 +VERSION="$(printf "%d.%d.%d" ${_realver:0:1} ${_realver:1:2} ${_realver:3:1})"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="The LEMON Parser Generator (from the SQLite project)."
    1.11  MAINTAINER="pankso@slitaz.org"
     2.1 --- a/libsqlite-tcl/receipt	Sun Apr 26 17:15:20 2020 +0100
     2.2 +++ b/libsqlite-tcl/receipt	Sun Apr 26 16:28:39 2020 +0000
     2.3 @@ -2,7 +2,7 @@
     2.4  
     2.5  PACKAGE="libsqlite-tcl"
     2.6  _realver="3310100"
     2.7 -VERSION="${_realver:0:1}.${_realver:1:2}.${_realver:3:1}"
     2.8 +VERSION="$(printf "%d.%d.%d" ${_realver:0:1} ${_realver:1:2} ${_realver:3:1})"
     2.9  CATEGORY="office"
    2.10  SHORT_DESC="Small SQL database engine, tcl library."
    2.11  MAINTAINER="erjo@slitaz.org"
     3.1 --- a/libsqlite/receipt	Sun Apr 26 17:15:20 2020 +0100
     3.2 +++ b/libsqlite/receipt	Sun Apr 26 16:28:39 2020 +0000
     3.3 @@ -2,7 +2,7 @@
     3.4  
     3.5  PACKAGE="libsqlite"
     3.6  _realver="3310100"
     3.7 -VERSION="${_realver:0:1}.${_realver:1:2}.${_realver:3:1}"
     3.8 +VERSION="$(printf "%d.%d.%d" ${_realver:0:1} ${_realver:1:2} ${_realver:3:1})"
     3.9  CATEGORY="office"
    3.10  SHORT_DESC="Small SQL database engine."
    3.11  MAINTAINER="erjo@slitaz.org"
     4.1 --- a/qemu/stuff/cloop.u	Sun Apr 26 17:15:20 2020 +0100
     4.2 +++ b/qemu/stuff/cloop.u	Sun Apr 26 16:28:39 2020 +0000
     4.3 @@ -42,11 +42,11 @@
     4.4  +	loff_t    *ofs64 = (loff_t *) offsets;
     4.5  +
     4.6  +	/* v3 64bits bug: v1 assumed */
     4.7 -+	unsigned long	v3_64;
     4.8 ++	unsigned long	v3_64=(n+1)/2;
     4.9  +	loff_t	prev;
    4.10  +
    4.11  +	if (ofs32[0] != 0 && ofs32[1] == 0) {
    4.12 -+		for (v3_64=(n+1)/2, prev=le64_to_cpu(ofs64[v3_64]);
    4.13 ++		for (prev=le64_to_cpu(ofs64[v3_64]);
    4.14  +		     v3_64 > 0 && le64_to_cpu(ofs64[--v3_64]) < prev;
    4.15  +		     prev=le64_to_cpu(ofs64[v3_64]));
    4.16  +	}
    4.17 @@ -55,7 +55,7 @@
    4.18  +		if (ofs32[2]) { /* ACCELERATED KNOPPIX V1.0 */
    4.19  +			while (n--) {
    4.20  +				offsets[n].offset = be64_to_cpu(offsets[n].offset);
    4.21 -+				offsets[n].size = ntohl(offsets[n].size);
    4.22 ++				offsets[n].size = be32_to_cpu(offsets[n].size);
    4.23  +				offsets[n].flags = 0;
    4.24  +        			if (offsets[n].size > 2 * MAX_BLOCK_SIZE)
    4.25  +        				return n+1;
    4.26 @@ -97,11 +97,11 @@
    4.27  +			offsets[n].flags = 0;
    4.28  +		}
    4.29  +	}
    4.30 -+	else if (ntohl(ofs32[0]) == (4*n) + 0x8C) { /* V0.68 */
    4.31 -+		loff_t last = ntohl(ofs32[n]);
    4.32 ++	else if (be32_to_cpu(ofs32[0]) == (4*n) + 0x8C) { /* V0.68 */
    4.33 ++		loff_t last = be32_to_cpu(ofs32[n]);
    4.34  +		while (n--) {
    4.35  +			offsets[n].size = last - 
    4.36 -+				(offsets[n].offset = ntohl(ofs32[n])); 
    4.37 ++				(offsets[n].offset = be32_to_cpu(ofs32[n])); 
    4.38  +        		if (offsets[n].size > 2 * MAX_BLOCK_SIZE)
    4.39  +        			return n+1;
    4.40  +			last = offsets[n].offset;
    4.41 @@ -114,7 +114,7 @@
    4.42  +		
    4.43  +		v3_64 = (ofs32[1] == 0) ? 2 : 1;
    4.44  +		for (i = n; i-- > 0; ) {
    4.45 -+			offsets[i].size = ntohl(ofs32[i*v3_64]); 
    4.46 ++			offsets[i].size = be32_to_cpu(ofs32[i*v3_64]); 
    4.47  +			if ((offsets[i].size & 0x80000000) == 0 &&
    4.48  +        		    offsets[i].size > 2 * MAX_BLOCK_SIZE)
    4.49  +        			return i+1;
    4.50 @@ -162,15 +162,15 @@
    4.51  -    int length = strlen(magic_version_2_0);
    4.52  -    if (length > buf_size) {
    4.53  -        length = buf_size;
    4.54 -+    int i, ret = 0, length = buf_size;
    4.55 -+    uint8_t c;
    4.56 ++    int ret = 0, length = buf_size;
    4.57 ++    int i;
    4.58  +
    4.59  +    if (length > 127) {
    4.60  +        length = 127;
    4.61  +    }
    4.62  +    for (i = 0; i < length - sizeof(magic) + 1; i++) {
    4.63  +	if (buf[i] != magic[0]) continue;
    4.64 -+	if (strncmp(buf + i, magic, sizeof(magic) - 1)) continue;
    4.65 ++	if (memcmp(buf + i, magic, sizeof(magic) - 1)) continue;
    4.66  +	ret = 2;
    4.67  +	break;
    4.68       }
    4.69 @@ -179,7 +179,7 @@
    4.70  +    return ret;
    4.71  +}
    4.72  +
    4.73 -+static uint32_t cloop_upack(BDRVCloopState *s, int flag)
    4.74 ++static uint32_t cloop_unpack(BDRVCloopState *s, int flag)
    4.75  +{
    4.76  +    int ret;
    4.77  +    size_t src_pos;
     5.1 --- a/sqlite-dev/receipt	Sun Apr 26 17:15:20 2020 +0100
     5.2 +++ b/sqlite-dev/receipt	Sun Apr 26 16:28:39 2020 +0000
     5.3 @@ -2,7 +2,7 @@
     5.4  
     5.5  PACKAGE="sqlite-dev"
     5.6  _realver="3310100"
     5.7 -VERSION="${_realver:0:1}.${_realver:1:2}.${_realver:3:1}"
     5.8 +VERSION="$(printf "%d.%d.%d" ${_realver:0:1} ${_realver:1:2} ${_realver:3:1})"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="Small SQL database engine - development files."
    5.11  MAINTAINER="pankso@slitaz.org"
     6.1 --- a/sqlite/receipt	Sun Apr 26 17:15:20 2020 +0100
     6.2 +++ b/sqlite/receipt	Sun Apr 26 16:28:39 2020 +0000
     6.3 @@ -2,7 +2,7 @@
     6.4  
     6.5  PACKAGE="sqlite"
     6.6  _realver="3310100"
     6.7 -VERSION="${_realver:0:1}.${_realver:1:2}.${_realver:3:1}"
     6.8 +VERSION="$(printf "%d.%d.%d" ${_realver:0:1} ${_realver:1:2} ${_realver:3:1})"
     6.9  CATEGORY="office"
    6.10  SHORT_DESC="Small SQL database engine."
    6.11  MAINTAINER="pankso@slitaz.org"