diff options
Diffstat (limited to 'dev-db/sqlite')
15 files changed, 196 insertions, 1181 deletions
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index bb664e64a57a..9b7d37f57927 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -1,35 +1,23 @@ -AUX sqlite-3.21.0-nonfull_archive-build.patch 407 BLAKE2B 38f71008ce9554333668bd1d3a2ff94a95a060e2d920f05f7d7be7e65fb3cbc549d265beaf3bebcf653dc4ab28eccc762fd51e983167c82b899a2d35789ac48a SHA512 1047210c37e638a8bcf80b071e780f28e4260c73c581e0fbf9021d0df5287c5e9a17193e563e8de76b41d3f158ecb8fcccd3df227c1f9360246bc52a70f75651 -AUX sqlite-3.23.0-full_archive-build.patch 13851 BLAKE2B 2de321270247cc436ba5261b75c03534ce43ee415566c896d59ea5e96633887a738e32e15ddaf5fe33c1d594bb60669df8480f210c4bd8c1c4bd0f22e086a18a SHA512 20a1ef769fa9420ebc66941ba6889cdb8e6eca6567662af7462fb5f8618b656e0e57ba86be3abc34e4437fcc979c9b811a117a841ea60a89abf2f2629f7c83b0 -AUX sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 796 BLAKE2B ef4f5a9824f2a5492912f9076b9b9db96552e675264e04b093ed907f8b47175b680cab4a4934763910b5320b3f7c5fc2f230b026ad76af6172325abae7cce2c7 SHA512 81ea6bba9f1b06e77f7a5019eeb3e4abfb542c929b00f8d327f8b47101ad046bee40e49c12df00ce50c35ca2ec1906fd82b3fd75d4e5c97db61fa1cc9997d31c -AUX sqlite-3.23.1-full_archive-tests.patch 6164 BLAKE2B 5aa905e440e49f9863c737e6be3dee070388979f2e2b2e9358725d8ca1de0f52aca51c21f74127b37ae125e96abc8092b4ef9e23eea70b2c7a725aa41fee74b1 SHA512 85dc56b9bc2b3ad904edf4c926d8705a6f5f07d3c21f7c48e22b8702dace3090bf5bbef415486299befd5fac3b49a5776ed2be2d31e7582889e84a79e264a8a9 -AUX sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch 349 BLAKE2B 89bafb8ecc94927eaecd5619a159519a885fad36989ea53ca0a28857182c954d6763088cb1a5b9d0bba026c1fb90f39f7fc64125fd7f71a5c29e897c7ad6e3ce SHA512 d8e6bdea949e0940ad47fbb59c15d90b15125ff456da640b02d5f8ec26432595aacdb0f4b6aca3e427fa407c4c0297bdf27fecf70d8a8883d15e72fa4b71dc92 -AUX sqlite-3.24.0-full_archive-archive_command_paths_handling.patch 431 BLAKE2B f2ed5b15db753821cef0a51c1301bb79c3fabc908c328ac33b21cef594f068b2f19863cbae4a909e19b7370c5a2c20839edffb407ba1f1946b407672f7bb4fd7 SHA512 d8449092d5892398fd827973d18f7eff189562b70fb5ea93e41a0789a573945c7555b602ec0b73df66af597c6ada79c73edeecb3d496ccbd8b29f05a05871089 -AUX sqlite-3.24.0-full_archive-build.patch 13851 BLAKE2B cc40445f0ef248d21fb40500186614a7092abaa174db63710471c8aae2bf435f8ffd62a7b8332785a8ebe29bad39469ab3ea03d9c8287576c83a927df02b9102 SHA512 e6c6d5545ea7578952bbadef324ca8ee988542917ee314e6da69db69fb5727493bd36f55aa9dd0cece21ec8d9235361b12a87ce768849596cee9a5bf98cb0a5d -AUX sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch 419 BLAKE2B 378e99da6cca145c69bb8fd883f69ae7e82964ed67ac4ad16f89e3a80fe863cfe67b3c68e79c6fa48170b222589f7b0bdd0f623ca8c12732d5c4f93b6b235164 SHA512 29aa164628870e4e002f5a5819f808dcd66da2f84e4202303ebd1eebc3ace5cdad19af60879de54ea5ca05b23e68337a3f4ee3401866197ad3046dd17941f263 AUX sqlite-3.25.0-full_archive-build.patch 13864 BLAKE2B e60fba6a84659b658dfb3cbb9f3e2fdab28cf928329f20cdfb1a2aab5ba8162f25f0b0fb3610259c5a8263a0901c9e30dbdd6d7bb4654146deeb0c9fdd44496b SHA512 37416842348a7cae5a61365977eb77e1db86b68be3ead7b69090df56a5a87b856569c224a1bc85cc0ff599c62077c3f8eabdf4071fa0c919bf139e8f579c2dbb AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668 -AUX sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch 1481 BLAKE2B 01c7d129328820c2c0ad8ebd74bf4222eae131f493d6db968312d8b76def9c024b654de5d2a4d0c87119a1d073717879d4610a7819244a72d8894218123347cc SHA512 7ef354b8633d2a6d58e7a99acbd41d353ab83eac6f08a1998763a366a2cbbac3e2fdd6be24903e1fe403180a512d5fa7311db2299001be4e7583ea70069a980a AUX sqlite-3.25.2-full_archive-tests.patch 1549 BLAKE2B e17fa8e556518f6c4d22b225b721e9f2592a111f8960374c4aee326daf7a1bdfcefc7c6415f8d03a0f6c1f69544ea031a067b5c24bc24bbf20e9d20c9a56a0c6 SHA512 f448c8b77f01ede8b6b63a583916bd1ef9d75d6b71340e43a694dd0d888e4de0bd7cd10c1de0ee64903048f86544c9a88de5fb7b9c0aebfa159e62aae6df4f4b -AUX sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch 572 BLAKE2B cc91956ea6d2187c3a3f2f15384173624383958e222b4a6d5f5f16494fa2a602a952054b1d670e043a8eab46c338404101ef6d58f50584999d6d3edf3997ed43 SHA512 e8461af692241475501b291754479e035a38edcdde99c086f069d75b6c2527e74abd606d4fb1551a5d7be4c80d9b21aea10d6dae6fb5b0b7fcbb003ac94b3583 AUX sqlite-3.26.0-full_archive-build.patch 13843 BLAKE2B 4850ddf89e129fe3d71844caf9b7914e9df9fd38452c39f6b19c5a2c5e510ff0e80a376d90688da4bfccb9a460f65db1fc2001ac315336a705d67f52ffefce40 SHA512 01a1ccd3aa3e622c395fcc61810bd658894eec8c20bd004994ab0ed90b9f7c565405a1dbb2395b7b1df241b709a9f730e6453190d8c4a82abfa754d5df0db597 -DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826 -DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cbf91cf4d0cb313fc9202d210ccbad5fca7f9a062ede63387e814d664f0ae38bcfa48db222f466dbcd429fecfb53cfdac155c4 SHA512 eaec866de26003ec36559aab15dd18dc0e6029453002a4eec5e176bb35a712b8b06c235436e6c1a226b67c7eb90d7a26c2b3b3d9a5e6e92a5af485236b77c878 -DIST sqlite-autoconf-3250200.tar.gz 2763876 BLAKE2B 3d97cc60edf8f91855215bd59260362665c8ec7699510f2e07c7ba57e10c400dcc99bb392e216f798bef1ffa7120b48ee62ce144a871741ef57b3aefeab875d6 SHA512 5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9 +AUX sqlite-3.27.0-full_archive-build.patch 15538 BLAKE2B ee4705bd5ef166437deaaee97b406e0e8775ebea0bcb086c88a07e91451a6cc677e95c47f681c55e7e477a4b84ed5f1520935729bf394146a6c177d5af9caaf8 SHA512 91daf2092608732ab5ad31f8b06b64e67988af846b47d9c9430bc15853e9be12f32d6a10b614f3ce7c009649c0baf710c2c4e03e18b3ae847ea0be8c235129dd +AUX sqlite-3.27.2-full_archive-tests.patch 964 BLAKE2B 1206311d20be560fb6b6868099c74bea91c210515afa6d727035041231edac67422f61a158411446e7dc7430b221b9a8f581a1f82cf9bc1af63260a6bfe5ab67 SHA512 126863bbe32aa3ffec21651afdf1cd8057fdd441bb176bca481afa73afceb36992067274bea464dd047bf2df542111170ec29a9bfe6104e197969057eb049c6e DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c6563e937a45d6ef4aae1b941d42c06cb8630210c33583f25e41f3f90b181ce47da650f81845ad88cafbf9c764164cf8b5d92e81 SHA512 5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5e0ba031a6744af89f7659206e28e7de2f0367bdb190b8412e453b43de4ba DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8 -DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471 -DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6 -DIST sqlite-doc-3250200.zip 9229732 BLAKE2B 9bc4499c2934d15428dd30e0522362a2c2e703061c293f1b657f01d3945612760be3b4f145ddf76d9cf87953fae26884646887e53c0c55683ce42bc239dcf952 SHA512 a0b764ca0eea0e9719d46b6e1f92db78578457c8331976d4712c56cd10fc062fd73629686a0e45dfdeb505fbfbe0c53652a5e64507702ff4e12b62a2fc8d8211 +DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4 +DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972 DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade -DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b -DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e -DIST sqlite-src-3250200.zip 11381811 BLAKE2B 6183436f66c862c32d1dfd59ea4ccb5eaf3dd516ffcf9d7edf786e8fbf56eff3cb84d08e291b2e86fae25e537bed452aed693bdb0f0d6bb6581da86641013557 SHA512 7354af2d45c574ba867fab8aabc6ff903279f028aebed50c71019066df78f61a0b941564c572c87b0f3ed3e5783bf325a690a9957d775228fbbb293dd9a5ad37 +DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f +DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65 DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3 -EBUILD sqlite-3.23.1.ebuild 9703 BLAKE2B 4e6cb6336b1bad31d56cdb3a1ea3ca32323b4280caaaa053221e1e405ea2edbd552860ee89934f66d68d19425f0632bea45eea33595cfb6f7e95c5b4bf5eb1d5 SHA512 7fa4f6ab562af73f00338da2e6aaef80751dfd7071c21abf64647cbf68b8e2180e524574c2f0bc38cf138bc8dd3edb7c75f4b3f2a28f788fe0cf108a158ef44f -EBUILD sqlite-3.24.0.ebuild 9524 BLAKE2B dd5bd95346b77d111c1784a69feb6d44170375c82d7734420587d00fcc1f987fdb7676200f988c683606b856008f198b22999a8dd208a275b625702ba0341fae SHA512 0393124beded522a17bdd4f5690d0022f9646069ce735d79c316597743b036a06c0bd5a77635b428a78954920551876e10e55d1498305ec857b5d7eb2d4b05fd -EBUILD sqlite-3.25.2.ebuild 9870 BLAKE2B 235bbb1eec1d35a1babb2bcfd4daa3f34fe69d4e5973b5fda452df9965bd083a64d15c273d89f25eb2168a72efb615606dcc0698e5e35787e070b16e186e491e SHA512 f467e23b508f8a2d7729f6bf02529b151b15d8b90dbf432512a1f2b122f2a3b2ce1135378dc57b7335d20153309e50df950e3150e05b01d9f068fd18a5a25575 +DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945 +DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e EBUILD sqlite-3.25.3.ebuild 9652 BLAKE2B ac7b2a5790b2d40ae6ecf67a653a7a7c393f9f7f80d456a95b0cae3f15ab8e84da7bd6ca7a8af7e7a969e06374b823d21c651d16338148520decd78843526a93 SHA512 0df0004e76afbc9b82d539518bb3a8bd796de6268affeed17cf34e1fd0bd83ec4edc4da159a38179f46df61dd8fe4650735a97940892838478fc0dab694e0493 EBUILD sqlite-3.26.0.ebuild 9793 BLAKE2B 6d6a788f176bd582d6030bc1e814d672c3add3e2d96abc49b4aa1655aed406d8c1dd1dbb83f4d599ffa32a0d833af1d99eb06078962fdce5a4190bfc350ca760 SHA512 6e047df4a21c4aa94e2e9248bb21ed5b3b97537db2b71a80de245b04fc4e017687afb53e336fd086d838253d46a69d28ddfd2babbb8b83d8bb2b92806db13268 +EBUILD sqlite-3.27.1.ebuild 9901 BLAKE2B c51b0d5b73f8fef15d1cd27c837e20fbbd8188f94160f9b515f4505fe5eb0da270afaecbe31ede66879007d0ee51417eb845f3070686ca022493aa02d550bc29 SHA512 ce09ca9cbc1672e040bcabdf6ea860bac6d31ded0255a757f593bebf70fccd9ac4de0034ef57b73966bcb947392221718e5ca71430722f785c2bbab70c0180d1 +EBUILD sqlite-3.27.2.ebuild 9962 BLAKE2B fdccaa97e79f7b6924d48141156582e8e3eb46fb9d417c2759a2e7279afc4c75c6baff66cdb15a580fb18cf6240d1f6a753e00e06c2965346f9b7125c8b35e2d SHA512 9f312eefccfe952b52812149da7548edb7aa4ee764e3c5df0a6b631c58a6a64b9b012ff5c3206bc515dff3234d7f6b8744882e10bd3573b339d8b05d6ba5a033 MISC metadata.xml 723 BLAKE2B 8866fbde770e7b8582de27303c72df047db80e0d70b1a1ceca0951a05b51bb704452071ceb6c29ecf3704d523888351615d1798aaab092e6b7505d4c6e3698ad SHA512 40616710b1d4edd3e24b5ac0797c1c9b606aeacac9f9543722bc9529e7c2c704a0c10b0ca68a5ba6e0a0ee8bc605212e8a49a050c8687afbdd7dbf28d6d4506a diff --git a/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch b/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch deleted file mode 100644 index 06ea8b290536..000000000000 --- a/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix building with dlopen() not available. - ---- /configure.ac -+++ /configure.ac -@@ -102,6 +102,9 @@ - [], [enable_dynamic_extensions=yes]) - if test x"$enable_dynamic_extensions" != "xno"; then - AC_SEARCH_LIBS(dlopen, dl) -+ if test "${ac_cv_search_dlopen}" = "no" ; then -+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 -+ fi - else - DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 - fi diff --git a/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch deleted file mode 100644 index f46df1c15a50..000000000000 --- a/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch +++ /dev/null @@ -1,407 +0,0 @@ -Move some code to libsqlite3.so to avoid duplication. -Link executables against libsqlite3.so. -Increase timeout for fuzzcheck. -Fix building with dlopen() not available. - ---- /Makefile.in -+++ /Makefile.in -@@ -308,6 +308,9 @@ - # Source code for extensions - # - SRC += \ -+ $(TOP)/ext/expert/sqlite3expert.c \ -+ $(TOP)/ext/expert/sqlite3expert.h -+SRC += \ - $(TOP)/ext/fts1/fts1.c \ - $(TOP)/ext/fts1/fts1.h \ - $(TOP)/ext/fts1/fts1_hash.c \ -@@ -356,8 +359,11 @@ - $(TOP)/ext/rbu/sqlite3rbu.h \ - $(TOP)/ext/rbu/sqlite3rbu.c - SRC += \ -+ $(TOP)/ext/misc/appendvfs.c \ - $(TOP)/ext/misc/json1.c \ -- $(TOP)/ext/misc/stmt.c -+ $(TOP)/ext/misc/sqlar.c \ -+ $(TOP)/ext/misc/stmt.c \ -+ $(TOP)/ext/misc/zipfile.c - - # Generated source code files - # -@@ -426,7 +432,6 @@ - # Statically linked extensions - # - TESTSRC += \ -- $(TOP)/ext/expert/sqlite3expert.c \ - $(TOP)/ext/expert/test_expert.c \ - $(TOP)/ext/misc/amatch.c \ - $(TOP)/ext/misc/carray.c \ -@@ -449,8 +454,7 @@ - $(TOP)/ext/misc/spellfix.c \ - $(TOP)/ext/misc/totype.c \ - $(TOP)/ext/misc/unionvtab.c \ -- $(TOP)/ext/misc/wholenumber.c \ -- $(TOP)/ext/misc/zipfile.c -+ $(TOP)/ext/misc/wholenumber.c - - # Source code to the library files needed by the test fixture - # -@@ -613,25 +617,25 @@ - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ -- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ - -rpath "$(TCLLIBDIR)" \ - -version-info "8:6:8" \ - -avoid-version - --sqlite3$(TEXE): shell.c sqlite3.c -- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ -- shell.c sqlite3.c \ -- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" -+sqlite3$(TEXE): shell.c libsqlite3.la -+ $(LTLINK) $(READLINE_FLAGS) -o $@ \ -+ shell.c libsqlite3.la \ -+ $(LIBREADLINE) - --sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h -- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) -+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la -+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la - --dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h -- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) -+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la -+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la - --scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo -+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la - $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ -- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) -+ $(TOP)/ext/misc/scrub.c libsqlite3.la - - srcck1$(BEXE): $(TOP)/tool/srcck1.c - $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -@@ -710,7 +714,7 @@ - # Rule to build the amalgamation - # - sqlite3.lo: sqlite3.c -- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c -+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c - - # Rules to build the LEMON compiler generator - # -@@ -1004,14 +1008,9 @@ - # Source files that go into making shell.c - SHELL_SRC = \ - $(TOP)/src/shell.c.in \ -- $(TOP)/ext/misc/appendvfs.c \ - $(TOP)/ext/misc/shathree.c \ - $(TOP)/ext/misc/fileio.c \ - $(TOP)/ext/misc/completion.c \ -- $(TOP)/ext/misc/sqlar.c \ -- $(TOP)/ext/expert/sqlite3expert.c \ -- $(TOP)/ext/expert/sqlite3expert.h \ -- $(TOP)/ext/misc/zipfile.c \ - $(TOP)/src/test_windirent.c - - shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl -@@ -1170,15 +1169,15 @@ - - # Fuzz testing - fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db -- ./fuzzcheck$(TEXE) $(FUZZDATA) -+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db - - fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db -- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) -+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db - - valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db -- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) -+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) - valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db - - # The veryquick.test TCL tests. -@@ -1209,24 +1208,23 @@ - smoketest: $(TESTPROGS) fuzzcheck$(TEXE) - ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) - --sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in -+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c - --sqlite3_analyzer$(TEXE): sqlite3_analyzer.c -- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) -+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la -+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) - --sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in -+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c - --sqltclsh$(TEXE): sqltclsh.c -- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) -+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la -+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) - --sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) -+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la -+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la - - CHECKER_DEPS =\ - $(TOP)/tool/mkccode.tcl \ -- sqlite3.c \ - $(TOP)/src/tclsqlite.c \ - $(TOP)/ext/repair/sqlite3_checker.tcl \ - $(TOP)/ext/repair/checkindex.c \ -@@ -1237,30 +1235,30 @@ - sqlite3_checker.c: $(CHECKER_DEPS) - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ - --sqlite3_checker$(TEXE): sqlite3_checker.c -- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) -+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la -+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) - --dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo -+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la - $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ -- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) -+ $(TOP)/ext/misc/dbdump.c libsqlite3.la - --showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo -- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) -+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la -+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la - --showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo -- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) -+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la -+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la - --showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo -- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) -+showjournal$(TEXE): $(TOP)/tool/showjournal.c -+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c - --showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo -- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) -+showwal$(TEXE): $(TOP)/tool/showwal.c -+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c - - showshm$(TEXE): $(TOP)/tool/showshm.c - $(LTLINK) -o $@ $(TOP)/tool/showshm.c - --changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo -- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) -+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la -+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la - - rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) -@@ -1279,11 +1277,11 @@ - kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c - $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) - --rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo -- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) -+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la -+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la - --loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la -- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) -+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la -+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ - - # This target will fail if the SQLite amalgamation contains any exported - # symbols that do not begin with "sqlite3_". It is run as part of the ---- /configure.ac -+++ /configure.ac -@@ -590,6 +590,9 @@ - if test "${use_loadextension}" = "yes" ; then - OPT_FEATURE_FLAGS="" - AC_SEARCH_LIBS(dlopen, dl) -+ if test "${ac_cv_search_dlopen}" = "no" ; then -+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" -+ fi - else - OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" - fi ---- /ext/misc/sqlar.c -+++ /ext/misc/sqlar.c -@@ -14,6 +14,8 @@ - ** for working with sqlar archives and used by the shell tool's built-in - ** sqlar support. - */ -+#ifdef SQLITE_HAVE_ZLIB -+ - #include "sqlite3ext.h" - SQLITE_EXTENSION_INIT1 - #include <zlib.h> -@@ -119,3 +121,5 @@ - } - return rc; - } -+ -+#endif /* SQLITE_HAVE_ZLIB */ ---- /ext/misc/zipfile.c -+++ /ext/misc/zipfile.c -@@ -24,6 +24,8 @@ - ** * No support for zip64 extensions - ** * Only the "inflate/deflate" (zlib) compression method is supported - */ -+#ifdef SQLITE_HAVE_ZLIB -+ - #include "sqlite3ext.h" - SQLITE_EXTENSION_INIT1 - #include <stdio.h> -@@ -2175,3 +2177,5 @@ - (void)pzErrMsg; /* Unused parameter */ - return zipfileRegister(db); - } -+ -+#endif /* SQLITE_HAVE_ZLIB */ ---- /ext/repair/sqlite3_checker.c.in -+++ /ext/repair/sqlite3_checker.c.in -@@ -2,6 +2,7 @@ - ** Read an SQLite database file and analyze its space utilization. Generate - ** text on standard output. - */ -+#define SQLITE_CORE 1 - #define TCLSH_INIT_PROC sqlite3_checker_init_proc - #define SQLITE_ENABLE_DBPAGE_VTAB 1 - #define SQLITE_ENABLE_JSON1 1 -@@ -14,7 +15,7 @@ - #define SQLITE_OMIT_SHARED_CACHE 1 - #define SQLITE_DEFAULT_MEMSTATUS 0 - #define SQLITE_MAX_EXPR_DEPTH 0 --INCLUDE sqlite3.c -+#include "sqlite3.h" - INCLUDE $ROOT/src/tclsqlite.c - INCLUDE $ROOT/ext/misc/btreeinfo.c - INCLUDE $ROOT/ext/repair/checkindex.c ---- /src/shell.c.in -+++ /src/shell.c.in -@@ -61,6 +61,7 @@ - #include <stdio.h> - #include <assert.h> - #include "sqlite3.h" -+#include "ext/expert/sqlite3expert.h" - typedef sqlite3_int64 i64; - typedef sqlite3_uint64 u64; - typedef unsigned char u8; -@@ -124,6 +125,10 @@ - # define SHELL_USE_LOCAL_GETLINE 1 - #endif - -+#ifdef SQLITE_HAVE_ZLIB -+#include <zlib.h> -+#endif -+ - - #if defined(_WIN32) || defined(WIN32) - # include <io.h> -@@ -966,13 +971,6 @@ - INCLUDE ../ext/misc/shathree.c - INCLUDE ../ext/misc/fileio.c - INCLUDE ../ext/misc/completion.c --INCLUDE ../ext/misc/appendvfs.c --#ifdef SQLITE_HAVE_ZLIB --INCLUDE ../ext/misc/zipfile.c --INCLUDE ../ext/misc/sqlar.c --#endif --INCLUDE ../ext/expert/sqlite3expert.h --INCLUDE ../ext/expert/sqlite3expert.c - - #if defined(SQLITE_ENABLE_SESSION) - /* -@@ -3522,7 +3520,9 @@ - sqlite3_shathree_init(p->db, 0, 0); - sqlite3_completion_init(p->db, 0, 0); - #ifdef SQLITE_HAVE_ZLIB -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_zipfile_init(p->db, 0, 0); -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_sqlar_init(p->db, 0, 0); - #endif - sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, -@@ -5411,6 +5411,7 @@ - goto end_ar_command; - } - sqlite3_fileio_init(cmd.db, 0, 0); -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_sqlar_init(cmd.db, 0, 0); - sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, - shellPutsFunc, 0, 0); -@@ -8367,6 +8368,7 @@ - #endif - } - data.out = stdout; -+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_appendvfs_init(0,0,0); - - /* Go ahead and open the database file if it already exists. If the ---- /tool/mksqlite3c.tcl -+++ /tool/mksqlite3c.tcl -@@ -116,6 +116,7 @@ - rtree.h - sqlite3session.h - sqlite3.h -+ sqlite3expert.h - sqlite3ext.h - sqlite3rbu.h - sqliteicu.h -@@ -400,6 +401,10 @@ - json1.c - fts5.c - stmt.c -+ appendvfs.c -+ sqlar.c -+ sqlite3expert.c -+ zipfile.c - } { - copy_file tsrc/$file - } ---- /tool/sqlite3_analyzer.c.in -+++ /tool/sqlite3_analyzer.c.in -@@ -14,9 +14,6 @@ - #define SQLITE_DEFAULT_MEMSTATUS 0 - #define SQLITE_MAX_EXPR_DEPTH 0 - #define SQLITE_OMIT_LOAD_EXTENSION 1 --#ifndef USE_EXTERNAL_SQLITE --INCLUDE sqlite3.c --#endif - INCLUDE $ROOT/src/tclsqlite.c - - const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ ---- /tool/sqltclsh.c.in -+++ /tool/sqltclsh.c.in -@@ -27,19 +27,17 @@ - #define SQLITE_OMIT_SHARED_CACHE 1 - #define SQLITE_DEFAULT_MEMSTATUS 0 - #define SQLITE_MAX_EXPR_DEPTH 0 --INCLUDE sqlite3.c --INCLUDE $ROOT/ext/misc/appendvfs.c --#ifdef SQLITE_HAVE_ZLIB --INCLUDE $ROOT/ext/misc/zipfile.c --INCLUDE $ROOT/ext/misc/sqlar.c --#endif -+#include "sqlite3.h" - INCLUDE $ROOT/src/tclsqlite.c - - const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ - (void)interp; -+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); - sqlite3_appendvfs_init(0,0,0); - #ifdef SQLITE_HAVE_ZLIB -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); - sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); - #endif - diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch deleted file mode 100644 index c97679daf7d9..000000000000 --- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://sqlite.org/src/info/b7178209152452e8 - ---- /src/attach.c -+++ /src/attach.c -@@ -502,6 +502,9 @@ - if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; - if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; - #endif -+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ -+ return 1; -+ } - } - return 0; - } ---- /test/triggerE.test -+++ /test/triggerE.test -@@ -57,6 +57,7 @@ - 7 { BEFORE DELETE ON t1 BEGIN SELECT * FROM t2 ORDER BY ?; END; } - 8 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = ?; END; } - 9 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = 1 WHERE d = ?; END; } -+ 10 { AFTER INSERT ON t1 BEGIN SELECT * FROM pragma_stats(?); END; } - } { - catchsql {drop trigger tr1} - do_catchsql_test 1.1.$tn "CREATE TRIGGER tr1 $defn" [list 1 $errmsg] diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch deleted file mode 100644 index ef813f67e743..000000000000 --- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch +++ /dev/null @@ -1,224 +0,0 @@ -https://sqlite.org/src/info/893e6089c875e947 -https://sqlite.org/src/info/576a8f69ae25883f -https://sqlite.org/src/info/de508e831a43f02c - ---- /ext/fts3/fts3.c -+++ /ext/fts3/fts3.c -@@ -3963,7 +3963,7 @@ - - #ifdef SQLITE_TEST - if( rc==SQLITE_OK ){ -- rc = sqlite3Fts3ExprInitTestInterface(db); -+ rc = sqlite3Fts3ExprInitTestInterface(db, pHash); - } - #endif - ---- /ext/fts3/fts3Int.h -+++ /ext/fts3/fts3Int.h -@@ -584,7 +584,7 @@ - ); - void sqlite3Fts3ExprFree(Fts3Expr *); - #ifdef SQLITE_TEST --int sqlite3Fts3ExprInitTestInterface(sqlite3 *db); -+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*); - int sqlite3Fts3InitTerm(sqlite3 *db); - #endif - ---- /ext/fts3/fts3_expr.c -+++ /ext/fts3/fts3_expr.c -@@ -1109,34 +1109,6 @@ - #include <stdio.h> - - /* --** Function to query the hash-table of tokenizers (see README.tokenizers). --*/ --static int queryTestTokenizer( -- sqlite3 *db, -- const char *zName, -- const sqlite3_tokenizer_module **pp --){ -- int rc; -- sqlite3_stmt *pStmt; -- const char zSql[] = "SELECT fts3_tokenizer(?)"; -- -- *pp = 0; -- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); -- if( rc!=SQLITE_OK ){ -- return rc; -- } -- -- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC); -- if( SQLITE_ROW==sqlite3_step(pStmt) ){ -- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){ -- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp)); -- } -- } -- -- return sqlite3_finalize(pStmt); --} -- --/* - ** Return a pointer to a buffer containing a text representation of the - ** expression passed as the first argument. The buffer is obtained from - ** sqlite3_malloc(). It is the responsibility of the caller to use -@@ -1203,12 +1175,12 @@ - ** - ** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2'); - */ --static void fts3ExprTest( -+static void fts3ExprTestCommon( -+ int bRebalance, - sqlite3_context *context, - int argc, - sqlite3_value **argv - ){ -- sqlite3_tokenizer_module const *pModule = 0; - sqlite3_tokenizer *pTokenizer = 0; - int rc; - char **azCol = 0; -@@ -1218,7 +1190,9 @@ - int ii; - Fts3Expr *pExpr; - char *zBuf = 0; -- sqlite3 *db = sqlite3_context_db_handle(context); -+ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context); -+ const char *zTokenizer = 0; -+ char *zErr = 0; - - if( argc<3 ){ - sqlite3_result_error(context, -@@ -1227,23 +1201,17 @@ - return; - } - -- rc = queryTestTokenizer(db, -- (const char *)sqlite3_value_text(argv[0]), &pModule); -- if( rc==SQLITE_NOMEM ){ -- sqlite3_result_error_nomem(context); -- goto exprtest_out; -- }else if( !pModule ){ -- sqlite3_result_error(context, "No such tokenizer module", -1); -- goto exprtest_out; -- } -- -- rc = pModule->xCreate(0, 0, &pTokenizer); -- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); -- if( rc==SQLITE_NOMEM ){ -- sqlite3_result_error_nomem(context); -- goto exprtest_out; -+ zTokenizer = (const char*)sqlite3_value_text(argv[0]); -+ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr); -+ if( rc!=SQLITE_OK ){ -+ if( rc==SQLITE_NOMEM ){ -+ sqlite3_result_error_nomem(context); -+ }else{ -+ sqlite3_result_error(context, zErr, -1); -+ } -+ sqlite3_free(zErr); -+ return; - } -- pTokenizer->pModule = pModule; - - zExpr = (const char *)sqlite3_value_text(argv[1]); - nExpr = sqlite3_value_bytes(argv[1]); -@@ -1257,7 +1225,7 @@ - azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]); - } - -- if( sqlite3_user_data(context) ){ -+ if( bRebalance ){ - char *zDummy = 0; - rc = sqlite3Fts3ExprParse( - pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy -@@ -1283,23 +1251,38 @@ - sqlite3Fts3ExprFree(pExpr); - - exprtest_out: -- if( pModule && pTokenizer ){ -- rc = pModule->xDestroy(pTokenizer); -+ if( pTokenizer ){ -+ rc = pTokenizer->pModule->xDestroy(pTokenizer); - } - sqlite3_free(azCol); - } - -+static void fts3ExprTest( -+ sqlite3_context *context, -+ int argc, -+ sqlite3_value **argv -+){ -+ fts3ExprTestCommon(0, context, argc, argv); -+} -+static void fts3ExprTestRebalance( -+ sqlite3_context *context, -+ int argc, -+ sqlite3_value **argv -+){ -+ fts3ExprTestCommon(1, context, argc, argv); -+} -+ - /* - ** Register the query expression parser test function fts3_exprtest() - ** with database connection db. - */ --int sqlite3Fts3ExprInitTestInterface(sqlite3* db){ -+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){ - int rc = sqlite3_create_function( -- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0 -+ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0 - ); - if( rc==SQLITE_OK ){ - rc = sqlite3_create_function(db, "fts3_exprtest_rebalance", -- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0 -+ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0 - ); - } - return rc; ---- /test/fts3expr.test -+++ /test/fts3expr.test -@@ -409,7 +409,7 @@ - } {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}} - do_test fts3expr-5.2 { - catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') } --} {1 {No such tokenizer module}} -+} {1 {unknown tokenizer: doesnotexist}} - do_test fts3expr-5.3 { - catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') } - } {1 {Error parsing expression}} ---- /test/fts3expr4.test -+++ /test/fts3expr4.test -@@ -29,7 +29,8 @@ - } - - proc do_icu_expr_test {tn expr res} { -- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]] -+ set res2 [list {*}$res] -+ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2] - } - - proc do_simple_expr_test {tn expr res} { ---- /test/zipfile2.test -+++ /test/zipfile2.test -@@ -52,17 +52,15 @@ - CREATE VIRTUAL TABLE fff USING zipfile('test''zip'); - } - --if {$::tcl_platform(platform)=="windows"} { -- set res {1 {cannot open file: testdir}} --} else { -- set res {1 {error in fread()}} --} - do_test 2.0 { - forcedelete testdir - file mkdir testdir - execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') } -- catchsql { SELECT * FROM hhh } --} $res -+ lindex [catchsql { -+ SELECT * FROM hhh; -+ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data'); -+ }] 0 -+} 1 - - - set archive { diff --git a/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch deleted file mode 100644 index c60cd9c90dcb..000000000000 --- a/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://sqlite.org/src/info/b7178209152452e8 - ---- /sqlite3.c -+++ /sqlite3.c -@@ -102780,6 +102780,9 @@ - if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; - if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; - #endif -+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ -+ return 1; -+ } - } - return 0; - } diff --git a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch b/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch deleted file mode 100644 index 5c27aa3465b0..000000000000 --- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://sqlite.org/src/info/27291f2d7fd4dadf - ---- /src/shell.c.in -+++ /src/shell.c.in -@@ -5284,7 +5284,8 @@ - "SELECT " - " ($dir || name)," - " writefile(($dir || name), %s, mode, mtime) " -- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"; -+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)" -+ " AND name NOT GLOB '*..[/\\]*'"; - - const char *azExtraArg[] = { - "sqlar_uncompress(data, sz)", diff --git a/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch b/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch deleted file mode 100644 index 69ab04822709..000000000000 --- a/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://sqlite.org/src/info/27291f2d7fd4dadf - ---- /shell.c -+++ /shell.c -@@ -12786,7 +12786,8 @@ - "SELECT " - " ($dir || name)," - " writefile(($dir || name), %s, mode, mtime) " -- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"; -+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)" -+ " AND name NOT GLOB '*..[/\\]*'"; - - const char *azExtraArg[] = { - "sqlar_uncompress(data, sz)", diff --git a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch deleted file mode 100644 index 6b34e2e4f9d8..000000000000 --- a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://sqlite.org/src/info/e8275b415a2f03bee -https://sqlite.org/src/info/7fc2994434c7d9ed - ---- /src/select.c -+++ /src/select.c -@@ -2318,6 +2318,13 @@ - Expr *pLimit; /* Saved LIMIT and OFFSET */ - int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */ - -+#ifndef SQLITE_OMIT_WINDOWFUNC -+ if( p->pWin ){ -+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries"); -+ return; -+ } -+#endif -+ - /* Obtain authorization to do a recursive query */ - if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return; - ---- /test/with1.test -+++ /test/with1.test -@@ -865,6 +865,27 @@ - SELECT * FROM i; - } {1 {recursive aggregate queries not supported}} - -+# Or window-function recursive queries. Ticket e8275b41. -+# -+ifcapable windowfunc { -+ do_catchsql_test 16.2 { -+ WITH RECURSIVE -+ i(x) AS (VALUES(1) UNION SELECT count(*) OVER () FROM i) -+ SELECT * FROM i; -+ } {1 {cannot use window functions in recursive queries}} -+ do_catchsql_test 16.3 { -+ WITH RECURSIVE -+ t(id, parent) AS (VALUES(1,2)), -+ q(id, parent, rn) AS ( -+ VALUES(1,2,3) -+ UNION ALL -+ SELECT t.*, ROW_NUMBER() OVER (ORDER BY t.id) AS rn -+ FROM q JOIN t ON t.parent = q.id -+ ) -+ SELECT * FROM q; -+ } {1 {cannot use window functions in recursive queries}} -+} -+ - #------------------------------------------------------------------------- - do_execsql_test 17.1 { - WITH x(a) AS ( diff --git a/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch deleted file mode 100644 index 4ee3d477cfc4..000000000000 --- a/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://sqlite.org/src/info/e8275b415a2f03bee -https://sqlite.org/src/info/7fc2994434c7d9ed - ---- /sqlite3.c -+++ /sqlite3.c -@@ -125441,6 +125441,13 @@ - Expr *pLimit; /* Saved LIMIT and OFFSET */ - int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */ - -+#ifndef SQLITE_OMIT_WINDOWFUNC -+ if( p->pWin ){ -+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries"); -+ return; -+ } -+#endif -+ - /* Obtain authorization to do a recursive query */ - if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return; - diff --git a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch index 072b8049c144..18c6d4d7bd30 100644 --- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch +++ b/dev-db/sqlite/files/sqlite-3.27.0-full_archive-build.patch @@ -5,7 +5,7 @@ Fix building with dlopen() not available. --- /Makefile.in +++ /Makefile.in -@@ -309,6 +309,9 @@ +@@ -311,6 +311,9 @@ # Source code for extensions # SRC += \ @@ -15,7 +15,7 @@ Fix building with dlopen() not available. $(TOP)/ext/fts1/fts1.c \ $(TOP)/ext/fts1/fts1.h \ $(TOP)/ext/fts1/fts1_hash.c \ -@@ -357,8 +360,11 @@ +@@ -363,8 +366,11 @@ $(TOP)/ext/rbu/sqlite3rbu.h \ $(TOP)/ext/rbu/sqlite3rbu.c SRC += \ @@ -28,7 +28,7 @@ Fix building with dlopen() not available. # Generated source code files # -@@ -427,7 +433,6 @@ +@@ -434,7 +440,6 @@ # Statically linked extensions # TESTSRC += \ @@ -36,17 +36,15 @@ Fix building with dlopen() not available. $(TOP)/ext/expert/test_expert.c \ $(TOP)/ext/misc/amatch.c \ $(TOP)/ext/misc/carray.c \ -@@ -450,8 +455,7 @@ - $(TOP)/ext/misc/spellfix.c \ +@@ -460,7 +465,6 @@ $(TOP)/ext/misc/totype.c \ $(TOP)/ext/misc/unionvtab.c \ -- $(TOP)/ext/misc/wholenumber.c \ -- $(TOP)/ext/misc/zipfile.c -+ $(TOP)/ext/misc/wholenumber.c + $(TOP)/ext/misc/wholenumber.c \ +- $(TOP)/ext/misc/zipfile.c \ + $(TOP)/ext/userauth/userauth.c # Source code to the library files needed by the test fixture - # -@@ -615,25 +619,25 @@ +@@ -639,25 +643,25 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ @@ -83,7 +81,7 @@ Fix building with dlopen() not available. srcck1$(BEXE): $(TOP)/tool/srcck1.c $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -@@ -712,7 +716,7 @@ +@@ -767,7 +771,7 @@ # Rule to build the amalgamation # sqlite3.lo: sqlite3.c @@ -92,7 +90,7 @@ Fix building with dlopen() not available. # Rules to build the LEMON compiler generator # -@@ -1009,14 +1013,9 @@ +@@ -1067,14 +1071,9 @@ # Source files that go into making shell.c SHELL_SRC = \ $(TOP)/src/shell.c.in \ @@ -104,10 +102,10 @@ Fix building with dlopen() not available. - $(TOP)/ext/expert/sqlite3expert.c \ - $(TOP)/ext/expert/sqlite3expert.h \ - $(TOP)/ext/misc/zipfile.c \ + $(TOP)/ext/misc/memtrace.c \ $(TOP)/src/test_windirent.c - shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl -@@ -1175,15 +1174,15 @@ +@@ -1242,15 +1241,15 @@ # Fuzz testing fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db @@ -126,7 +124,7 @@ Fix building with dlopen() not available. valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db # The veryquick.test TCL tests. -@@ -1214,24 +1213,23 @@ +@@ -1281,24 +1280,23 @@ smoketest: $(TESTPROGS) fuzzcheck$(TEXE) ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) @@ -139,18 +137,18 @@ Fix building with dlopen() not available. +sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la + $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) --sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in -+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in +-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in ++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c -sqltclsh$(TEXE): sqltclsh.c - $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) -+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la ++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la + $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) -sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c - $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) -+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la ++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la + $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la CHECKER_DEPS =\ @@ -159,7 +157,7 @@ Fix building with dlopen() not available. $(TOP)/src/tclsqlite.c \ $(TOP)/ext/repair/sqlite3_checker.tcl \ $(TOP)/ext/repair/checkindex.c \ -@@ -1242,30 +1240,30 @@ +@@ -1309,36 +1307,36 @@ sqlite3_checker.c: $(CHECKER_DEPS) $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ @@ -174,6 +172,11 @@ Fix building with dlopen() not available. - $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) + $(TOP)/ext/misc/dbdump.c libsqlite3.la +-dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c +- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c ++dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c ++ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c + -showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) +showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la @@ -197,18 +200,23 @@ Fix building with dlopen() not available. showshm$(TEXE): $(TOP)/tool/showshm.c $(LTLINK) -o $@ $(TOP)/tool/showshm.c +-index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo +- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS) ++index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la ++ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la + -changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) +changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la + $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la - rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo - $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) -@@ -1284,11 +1282,11 @@ + changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo + $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS) +@@ -1363,11 +1361,11 @@ kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) --rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo +-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo - $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) +rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la + $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la @@ -222,8 +230,8 @@ Fix building with dlopen() not available. # symbols that do not begin with "sqlite3_". It is run as part of the --- /configure.ac +++ /configure.ac -@@ -590,6 +590,9 @@ - if test "${use_loadextension}" = "yes" ; then +@@ -587,6 +587,9 @@ + if test "${enable_load_extension}" = "yes" ; then OPT_FEATURE_FLAGS="" AC_SEARCH_LIBS(dlopen, dl) + if test "${ac_cv_search_dlopen}" = "no" ; then @@ -260,7 +268,7 @@ Fix building with dlopen() not available. #include "sqlite3ext.h" SQLITE_EXTENSION_INIT1 #include <stdio.h> -@@ -2175,3 +2177,5 @@ +@@ -2176,3 +2178,5 @@ (void)pzErrMsg; /* Unused parameter */ return zipfileRegister(db); } @@ -295,7 +303,7 @@ Fix building with dlopen() not available. typedef sqlite3_int64 i64; typedef sqlite3_uint64 u64; typedef unsigned char u8; -@@ -124,6 +125,10 @@ +@@ -127,6 +128,10 @@ # define SHELL_USE_LOCAL_GETLINE 1 #endif @@ -306,11 +314,12 @@ Fix building with dlopen() not available. #if defined(_WIN32) || defined(WIN32) # include <io.h> -@@ -939,13 +944,6 @@ +@@ -939,14 +944,7 @@ INCLUDE ../ext/misc/shathree.c INCLUDE ../ext/misc/fileio.c INCLUDE ../ext/misc/completion.c -INCLUDE ../ext/misc/appendvfs.c + INCLUDE ../ext/misc/memtrace.c -#ifdef SQLITE_HAVE_ZLIB -INCLUDE ../ext/misc/zipfile.c -INCLUDE ../ext/misc/sqlar.c @@ -320,7 +329,7 @@ Fix building with dlopen() not available. #if defined(SQLITE_ENABLE_SESSION) /* -@@ -3632,7 +3630,9 @@ +@@ -3934,7 +3932,9 @@ sqlite3_shathree_init(p->db, 0, 0); sqlite3_completion_init(p->db, 0, 0); #ifdef SQLITE_HAVE_ZLIB @@ -330,7 +339,7 @@ Fix building with dlopen() not available. sqlite3_sqlar_init(p->db, 0, 0); #endif sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, -@@ -5523,6 +5523,7 @@ +@@ -5868,6 +5868,7 @@ goto end_ar_command; } sqlite3_fileio_init(cmd.db, 0, 0); @@ -338,7 +347,7 @@ Fix building with dlopen() not available. sqlite3_sqlar_init(cmd.db, 0, 0); sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, shellPutsFunc, 0, 0); -@@ -8539,6 +8540,7 @@ +@@ -9045,6 +9046,7 @@ #endif } data.out = stdout; @@ -346,9 +355,54 @@ Fix building with dlopen() not available. sqlite3_appendvfs_init(0,0,0); /* Go ahead and open the database file if it already exists. If the +--- /test/sessionfuzz.c ++++ /test/sessionfuzz.c +@@ -700,42 +700,6 @@ + #include <assert.h> + #include "zlib.h" + +-/* +-** Implementation of the "sqlar_uncompress(X,SZ)" SQL function +-** +-** Parameter SZ is interpreted as an integer. If it is less than or +-** equal to zero, then this function returns a copy of X. Or, if +-** SZ is equal to the size of X when interpreted as a blob, also +-** return a copy of X. Otherwise, decompress blob X using zlib +-** utility function uncompress() and return the results (another +-** blob). +-*/ +-static void sqlarUncompressFunc( +- sqlite3_context *context, +- int argc, +- sqlite3_value **argv +-){ +- uLong nData; +- uLongf sz; +- +- assert( argc==2 ); +- sz = sqlite3_value_int(argv[1]); +- +- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){ +- sqlite3_result_value(context, argv[0]); +- }else{ +- const Bytef *pData= sqlite3_value_blob(argv[0]); +- Bytef *pOut = sqlite3_malloc(sz); +- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){ +- sqlite3_result_error(context, "error in uncompress()", -1); +- }else{ +- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT); +- } +- sqlite3_free(pOut); +- } +-} +- +- + /* Run a chunk of SQL. If any errors happen, print an error message + ** and exit. + */ --- /tool/mksqlite3c.tcl +++ /tool/mksqlite3c.tcl -@@ -116,6 +116,7 @@ +@@ -117,6 +117,7 @@ rtree.h sqlite3session.h sqlite3.h @@ -356,8 +410,8 @@ Fix building with dlopen() not available. sqlite3ext.h sqlite3rbu.h sqliteicu.h -@@ -401,6 +402,10 @@ - json1.c +@@ -403,6 +404,10 @@ + sqlite3session.c fts5.c stmt.c + appendvfs.c diff --git a/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch new file mode 100644 index 000000000000..92959579b542 --- /dev/null +++ b/dev-db/sqlite/files/sqlite-3.27.2-full_archive-tests.patch @@ -0,0 +1,36 @@ +https://sqlite.org/src/info/29d02bf2fa9ecacb + +--- /ext/session/sessionB.test ++++ /ext/session/sessionB.test +@@ -258,8 +258,7 @@ + INSERT INTO t2 VALUES('a', 'a', 'a', 'a'); + } { + DELETE FROM t2 WHERE c = 'a'; +-} { +-} ++} {} + + # INSERT + UPDATE + do_patchconcat_test 4.3.4 { +--- /test/fts3expr4.test ++++ /test/fts3expr4.test +@@ -68,7 +68,7 @@ + AND {AND {AND {PHRASE 3 0 *} {PHRASE 3 0 lol+}} {PHRASE 3 0 *}} {PHRASE 3 0 h4h+} + } + +-do_simple_expr_test 3.3 { * } { } ++do_simple_expr_test 3.3 { * } {} + do_simple_expr_test 3.4 { *a } { PHRASE 3 0 a } + do_simple_expr_test 3.5 { a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} } + do_simple_expr_test 3.6 { *a*b } { AND {PHRASE 3 0 a+} {PHRASE 3 0 b} } +--- /test/scanstatus.test ++++ /test/scanstatus.test +@@ -254,7 +254,7 @@ + } + + do_execsql_test 4.1.1 { INSERT INTO t1 VALUES(1, 2, 3); } +-do_scanstatus_test 4.1.2 { } ++do_scanstatus_test 4.1.2 {} + + do_execsql_test 4.2 { + CREATE TABLE p1(x PRIMARY KEY); diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild deleted file mode 100644 index f0cc7198b25d..000000000000 --- a/dev-db/sqlite/sqlite-3.23.1.ebuild +++ /dev/null @@ -1,309 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator - -SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" -DOC_PV="${SRC_PV}" -# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" - -DESCRIPTION="A SQL Database Engine in a C Library" -HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" - -LICENSE="public-domain" -SLOT="3" -KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" - -RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] - icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - tcl? ( app-arch/unzip ) - test? ( - app-arch/unzip - >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] - ) - tools? ( app-arch/unzip )" - -full_archive() { - use tcl || use test || use tools -} - -pkg_setup() { - if full_archive; then - S="${WORKDIR}/${PN}-src-${SRC_PV}" - else - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" - fi -} - -src_prepare() { - if full_archive; then - eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" - eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch" - - eapply_user - - # Fix AC_CHECK_FUNCS. - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" - else - eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" - - eapply_user - - # Fix AC_CHECK_FUNCS. - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html - sed \ - -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ - -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ - -i configure.ac || die "sed failed" - fi - - eautoreconf - - multilib_copy_sources -} - -multilib_src_configure() { - local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() - - options+=( - --enable-$(full_archive && echo load-extension || echo dynamic-extensions) - --enable-threadsafe - ) - if ! full_archive; then - options+=(--disable-static-shell) - fi - - # Support detection of misuse of SQLite API. - # https://sqlite.org/compile.html#enable_api_armor - append-cppflags -DSQLITE_ENABLE_API_ARMOR - - # Support column metadata functions. - # https://sqlite.org/c3ref/column_database_name.html - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA - - # Support sqlite_dbpage virtual table. - # https://sqlite.org/compile.html#enable_dbpage_vtab - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB - - # Support dbstat virtual table. - # https://sqlite.org/dbstat.html - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB - - # Support sqlite3_serialize() and sqlite3_deserialize() functions. - # https://sqlite.org/compile.html#enable_deserialize - # https://sqlite.org/c3ref/serialize.html - # https://sqlite.org/c3ref/deserialize.html - append-cppflags -DSQLITE_ENABLE_DESERIALIZE - - # Support comments in output of EXPLAIN. - # https://sqlite.org/compile.html#enable_explain_comments - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS - - # Support Full-Text Search versions 3, 4 and 5. - # https://sqlite.org/fts3.html - # https://sqlite.org/fts5.html - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 - options+=(--enable-fts5) - - # Support hidden columns. - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS - - # Support JSON1 extension. - # https://sqlite.org/json1.html - append-cppflags -DSQLITE_ENABLE_JSON1 - - # Support memsys5 memory allocator. - # https://sqlite.org/malloc.html#memsys5 - append-cppflags -DSQLITE_ENABLE_MEMSYS5 - - # Support sqlite_offset() function. - # https://sqlite.org/lang_corefunc.html#sqlite_offset - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC - - # Support pre-update hook functions. - # https://sqlite.org/c3ref/preupdate_count.html - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK - - # Support Resumable Bulk Update extension. - # https://sqlite.org/rbu.html - append-cppflags -DSQLITE_ENABLE_RBU - - # Support R*Trees. - # https://sqlite.org/rtree.html - append-cppflags -DSQLITE_ENABLE_RTREE - - # Support scan status functions. - # https://sqlite.org/c3ref/stmt_scanstatus.html - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS - - # Support sqlite_stmt virtual table. - # https://sqlite.org/stmt.html - append-cppflags -DSQLITE_ENABLE_STMTVTAB - - # Support Session extension. - # https://sqlite.org/sessionintro.html - options+=(--enable-session) - - # Support unknown() function. - # https://sqlite.org/compile.html#enable_unknown_sql_function - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION - - # Support unlock notification. - # https://sqlite.org/unlock_notify.html - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY - - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. - # https://sqlite.org/compile.html#enable_update_delete_limit - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - - # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. - # https://sqlite.org/pragma.html#pragma_function_list - # https://sqlite.org/pragma.html#pragma_module_list - # https://sqlite.org/pragma.html#pragma_pragma_list - append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS - - # Support soundex() function. - # https://sqlite.org/lang_corefunc.html#soundex - append-cppflags -DSQLITE_SOUNDEX - - # debug USE flag. - if full_archive; then - options+=($(use_enable debug)) - else - if use debug; then - append-cppflags -DSQLITE_DEBUG - else - append-cppflags -DNDEBUG - fi - fi - - # icu USE flag. - if use icu; then - # Support ICU extension. - # https://sqlite.org/compile.html#enable_icu - append-cppflags -DSQLITE_ENABLE_ICU - if full_archive; then - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - else - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" - fi - fi - - # readline USE flag. - options+=( - --disable-editline - $(use_enable readline) - ) - if full_archive && use readline; then - options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") - fi - - # secure-delete USE flag. - if use secure-delete; then - # Enable secure_delete pragma by default. - # https://sqlite.org/pragma.html#pragma_secure_delete - append-cppflags -DSQLITE_SECURE_DELETE - fi - - # static-libs USE flag. - options+=($(use_enable static-libs static)) - - # tcl, test, tools USE flags. - if full_archive; then - options+=(--enable-tcl) - fi - - if [[ "${CHOST}" == *-mint* ]]; then - append-cppflags -DSQLITE_OMIT_WAL - fi - - if [[ "${ABI}" == "x86" ]]; then - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then - append-cflags -mfpmath=sse - else - append-cflags -ffloat-store - fi - fi - - econf "${options[@]}" -} - -multilib_src_compile() { - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" - - if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh - fi -} - -multilib_src_test() { - if [[ "${EUID}" -eq 0 ]]; then - ewarn "Skipping tests due to root permissions" - return - fi - - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) -} - -multilib_src_install() { - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install - - if use tools && multilib_is_native_abi; then - install_tool() { - if [[ -f ".libs/${1}" ]]; then - newbin ".libs/${1}" "${2}" - else - newbin "${1}" "${2}" - fi - } - - install_tool changeset sqlite3-changeset - install_tool dbdump sqlite3-db-dump - install_tool dbhash sqlite3-db-hash - install_tool rbu sqlite3-rbu - install_tool scrub sqlite3-scrub - install_tool showdb sqlite3-show-db - install_tool showjournal sqlite3-show-journal - install_tool showshm sqlite3-show-shm - install_tool showstat4 sqlite3-show-stat4 - install_tool showwal sqlite3-show-wal - install_tool sqldiff sqlite3-diff - install_tool sqlite3_analyzer sqlite3-analyzer - install_tool sqlite3_checker sqlite3-checker - install_tool sqlite3_expert sqlite3-expert - install_tool sqltclsh sqlite3-tclsh - - unset -f install_tool - fi -} - -multilib_src_install_all() { - prune_libtool_files - - doman sqlite3.1 - - if use doc; then - rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} - ( - docinto html - dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* - ) - fi -} diff --git a/dev-db/sqlite/sqlite-3.25.2.ebuild b/dev-db/sqlite/sqlite-3.27.1.ebuild index 9ca3d39f36c1..570c5a4f74e5 100644 --- a/dev-db/sqlite/sqlite-3.25.2.ebuild +++ b/dev-db/sqlite/sqlite-3.27.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Arfrever Frehtes Taifersar Arahesis and others +# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,11 +11,11 @@ DOC_PV="${SRC_PV}" DESCRIPTION="SQL database engine" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" @@ -58,9 +58,7 @@ pkg_setup() { src_prepare() { if full_archive; then - eapply "${FILESDIR}/${PN}-3.25.0-full_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch" - eapply "${FILESDIR}/${PN}-3.25.2-full_archive-tests.patch" + eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch" eapply_user @@ -69,7 +67,6 @@ src_prepare() { sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" else eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch" eapply_user @@ -140,6 +137,10 @@ multilib_src_configure() { # https://sqlite.org/malloc.html#memsys5 append-cppflags -DSQLITE_ENABLE_MEMSYS5 + # Support sqlite3_normalized_sql() function. + # https://sqlite.org/c3ref/expanded_sql.html + append-cppflags -DSQLITE_ENABLE_NORMALIZE + # Support sqlite_offset() function. # https://sqlite.org/lang_corefunc.html#sqlite_offset append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC @@ -262,7 +263,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh + emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh fi } @@ -272,6 +273,8 @@ multilib_src_test() { return fi + local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" + emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) } @@ -290,6 +293,8 @@ multilib_src_install() { install_tool changeset sqlite3-changeset install_tool dbdump sqlite3-db-dump install_tool dbhash sqlite3-db-hash + install_tool dbtotxt sqlite3-db-to-txt + install_tool index_usage sqlite3-index-usage install_tool rbu sqlite3-rbu install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db diff --git a/dev-db/sqlite/sqlite-3.24.0.ebuild b/dev-db/sqlite/sqlite-3.27.2.ebuild index 40a4b400b2c6..d008a6a8e1b1 100644 --- a/dev-db/sqlite/sqlite-3.24.0.ebuild +++ b/dev-db/sqlite/sqlite-3.27.2.ebuild @@ -1,40 +1,48 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator +inherit autotools flag-o-matic multilib-minimal toolchain-funcs -SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" +SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" DOC_PV="${SRC_PV}" -# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" +# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" DESCRIPTION="SQL database engine" HOMEPAGE="https://sqlite.org/" -SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) - tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) - !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" +SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip ) + tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) + !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" +RESTRICT="!test? ( test )" +BDEPEND="doc? ( app-arch/unzip ) + tcl? ( + app-arch/unzip + >=dev-lang/tcl-8.6:0 + ) + test? ( + app-arch/unzip + >=dev-lang/tcl-8.6:0 + ) + tools? ( + app-arch/unzip + >=dev-lang/tcl-8.6:0 + )" RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - tcl? ( app-arch/unzip ) - test? ( - app-arch/unzip - >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] - ) - tools? ( app-arch/unzip )" + test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" full_archive() { use tcl || use test || use tools @@ -50,8 +58,8 @@ pkg_setup() { src_prepare() { if full_archive; then - eapply "${FILESDIR}/${PN}-3.24.0-full_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.24.0-full_archive-archive_command_paths_handling.patch" + eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch" + eapply "${FILESDIR}/${PN}-3.27.2-full_archive-tests.patch" eapply_user @@ -59,8 +67,7 @@ src_prepare() { # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" else - eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" - eapply "${FILESDIR}/${PN}-3.24.0-nonfull_archive-archive_command_paths_handling.patch" + eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch" eapply_user @@ -131,6 +138,10 @@ multilib_src_configure() { # https://sqlite.org/malloc.html#memsys5 append-cppflags -DSQLITE_ENABLE_MEMSYS5 + # Support sqlite3_normalized_sql() function. + # https://sqlite.org/c3ref/expanded_sql.html + append-cppflags -DSQLITE_ENABLE_NORMALIZE + # Support sqlite_offset() function. # https://sqlite.org/lang_corefunc.html#sqlite_offset append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC @@ -145,7 +156,8 @@ multilib_src_configure() { # Support R*Trees. # https://sqlite.org/rtree.html - append-cppflags -DSQLITE_ENABLE_RTREE + # https://sqlite.org/geopoly.html + append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY # Support scan status functions. # https://sqlite.org/c3ref/stmt_scanstatus.html @@ -182,6 +194,10 @@ multilib_src_configure() { # https://sqlite.org/lang_corefunc.html#soundex append-cppflags -DSQLITE_SOUNDEX + # Support URI filenames. + # https://sqlite.org/uri.html + append-cppflags -DSQLITE_USE_URI + # debug USE flag. if full_archive; then options+=($(use_enable debug)) @@ -248,7 +264,7 @@ multilib_src_compile() { emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" if use tools && multilib_is_native_abi; then - emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh + emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh fi } @@ -258,6 +274,8 @@ multilib_src_test() { return fi + local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" + emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) } @@ -276,6 +294,8 @@ multilib_src_install() { install_tool changeset sqlite3-changeset install_tool dbdump sqlite3-db-dump install_tool dbhash sqlite3-db-hash + install_tool dbtotxt sqlite3-db-to-txt + install_tool index_usage sqlite3-index-usage install_tool rbu sqlite3-rbu install_tool scrub sqlite3-scrub install_tool showdb sqlite3-show-db @@ -294,7 +314,7 @@ multilib_src_install() { } multilib_src_install_all() { - prune_libtool_files + find "${D}" -name "*.la" -delete || die doman sqlite3.1 |