root
4 years ago
parent
f31bc76ec3
commit
7f0f3fbc37
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 29436 BLAKE2B ee1e1ca35c3aea6e7e194d5bc69b305127c1b2c9bfdaddea39b0c61c605ed6d618c22d9aecfa9c7b1635595b70e9fb035cb5457f109c32e112788805565f476d SHA512 a65757caf5c4c967c4e20f1b1b8b817423fd942cacaa9a605b30d1838be16b33b61d3c389cb40f7b74e863b85c26bd57c6de86af3b843000135d63463c5fe0f6
|
||||
TIMESTAMP 2020-07-29T16:38:23Z
|
||||
MANIFEST Manifest.files.gz 29407 BLAKE2B 2b73466e2b2acd3aef92f7535601a9eaf757c969976cf7e4a0b5cf102fb74d1f29583a7bf6eb76b09e635f6afe41ff2b11dd4202972ec55b7451554cfa54cdea SHA512 39b5dc64f42824f1b2260a8141acaadb0a05cb129e4fd3d634ec467e8eb7a772525fae1e6cc6c3cc2e9438697d8375ceb7fa2a81ff8a2888a8686fd5550c1db9
|
||||
TIMESTAMP 2020-07-30T05:08:27Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8hpf9fFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8iVctfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klBubg//Vv+RgexTJbhb3bZZ0pNmKIvwoJy8IBRj/y9yArFJZn/AtudWhhNZ1UmX
|
||||
iGQvuH0iLJWTtKroAggfXKNSivt4HPsmzwGgfzy6ssEG4aSXEz8tlyWZ4qm5UGZ1
|
||||
JSy81+O67Zn5k3VHt848TEhV+C+uncw9Pi5vLpUbwN6xmgdJP4V2c7/LXAzMu+z5
|
||||
egKLMsPC3bwOkBu15+I7DxTbnJmBF7AFodeS4bSK7nN4Lo8ICQKU8re6iVte1nom
|
||||
+fUqDBEtRca0uAcS6duxuxNYMVhNkKZFnSj4Z+xRAN4s2e/fEEjrmBJo67ywNmUx
|
||||
NcSWY7QCDfxg1sJshmSJ2l3X9CsUgsVGMfgFRnbBJmcQKL6X7TEFIzkIc9VRsYzz
|
||||
iW1QyXjoJkeulr0F8E6Xszm3dB557GgPAsyBNiWaHiUOAkAU5QF8slPmvINL3vDV
|
||||
YEMw7jI5WHeAMkHW6RWC9bqXRf72RoBe38r8tGHrtWf/qRer0Ek0Uh4OIhzdcq5W
|
||||
sM0bap+/FVuE7Ur2x8v2VaoukLQz9WAlGvz09dD85zQxX4N4lDV/Gp9fEQv1uh36
|
||||
JAHsm+9Tr9h/tOZV9b1k94/Y+ndDD1AeEeB5368f7cIMyY5qeICzSMUNSyT7qKcF
|
||||
npGRXpH/ly2QGPpcmOW1bI3UszEUMzNYJLxIYzJoOPYd25h9QjI=
|
||||
=y+Gl
|
||||
klB4tA//f0wChjhc/dVMVAoYfr6mXxR9ugenJg9n34mCI01fik2RHwVcMEzL3S7b
|
||||
GDCiE8Piwrha1ghGiPfSu6WRGHshD7dKhb27IyEM6UBZNLkHtpc9FYL5+sS2Hrne
|
||||
3uun1DjvI3J7mHGi2Z5NzaNfgSAeD/vfGEvm/LWrY6jI4ep0a1Y9vvJ25liNMjU7
|
||||
2O2BM8eKNwlo6CBwEnHz+YQOu1gQ/rxWyn5a6P06WYlLxh9SX7rkICIeX6ZuqNRW
|
||||
xZBUSgi0bCn89Np97MAn+vif/A7zPctmzgYz8VVseOqbBkMto7eLfg+tQM0Lgz5A
|
||||
Hj8DFWJ2xHU4iEbbcUST8/oy/7BZTAWeuOOpg9a5joq+Qke8NIZiAj+shMtji6BS
|
||||
FOZpvAKWpPkZrBNJqbpdhWYRDWWmRpVfdRpQMPMyIi9HDwi0qQxMpglbUZknS+qa
|
||||
tANgb52DM4rRoR3Q3uHHUg1OkMtVpqe9fchZQ87c/W7KjjqOG6MQ0wPYJkZ/AJL7
|
||||
pA+MAGW58uMtpSgzRudeN/EDUHbUE0uL1AtahQHIWRZQTf0guL/nlYXu+cea/t1g
|
||||
FedbE+K5URmoAPQUuGaQ3yJVYNw/+qM/EVuPVC8AZ95MEuzHHvlAPQ2xVoNWBkHp
|
||||
sackypSElQw9Hju18r9XMTvypqKKmeXq8Vv2l9R0B4IlSZ574Zo=
|
||||
=dA9p
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
|
||||
DIST tmuxp-1.5.5.tar.gz 856665 BLAKE2B fa18222840b9c221de48a78291243776a66a7aec3221f23be3218f81eae0d15ce5a4568f7eff679c01793d4ac4d441f6714c37d9ac3c9f705af49214f5dc2570 SHA512 61c14197af7742b48dab95443bb818ede20d26aa46ab2e89b883a34e2bcec910d8210fc1358fc88f96ccc637c47d6432082cd58995b80a43234cebba95240ebc
|
||||
EBUILD tmuxp-1.5.4.ebuild 966 BLAKE2B 0ac59d92dbd7af58f54edf3546393788a8f8c6c406763dd1ed24e7dec9eda9f741cf73521f129e9a6bda1dd007f91884a7c000409f4e94ececa95f67caab030b SHA512 e63a4782a64e22cc6cb060766f397504c97d71f10794db3c8b600fe1b7cb187fb37c744ec98dec773901e7a404241e354758b1e03d464bf5ee4bf7dfe4e4d57b
|
||||
EBUILD tmuxp-1.5.5.ebuild 990 BLAKE2B 875232c3c24c93d378540fbeee71dd5f9bb45c7a146d006af664a6937ab58ccfa3e060dba5e435b7d1c8e855143209a138f310f59fec3242ee1e02dfd238afcb SHA512 4a98dea808ea99b13bb6f8b47d6ccb4953b81b7f872770b6a250862b72a40928a2b508cf731d8451451efc86c2e66c69d9dcf5d77fa67a928a453643fa7bf58d
|
||||
EBUILD tmuxp-1.5.5.ebuild 997 BLAKE2B e381e8e324ea871f20fa6fea7137d3800bc3258f658fca0ef8921f6a33a1c3c947a669acfb9487ce63f88f1b835f585d661a41951d570ef691cc3c0873e26331 SHA512 ebc92e7a7cd660a72f4158f51913b40fe5abc6d5c0dee9cd170a4c8fb5a5bbf6b2aabc9389fc614989fa8f077b27f06c64f660689149f151e95d10b124e9a8ce
|
||||
MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
|
||||
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
|
||||
DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
|
||||
EBUILD xmldiff-1.1.1.ebuild 621 BLAKE2B 7e0be4595a818a7ffa00105ab7bec4554795ab8369ec27fd27520de6c2aa640104804c51cc52a598fa03d919b1a7e9f36d39895011292d0dc47b95ca140cf106 SHA512 1233cd14bd38ecbb28619cf381306f2f40faecfca36a2d9c7cb59453b406f70815bf9b27c3f18f7a2ac5e8c795427ed8004929056f57876c207a6c2f3490c011
|
||||
EBUILD xmldiff-2.3.ebuild 638 BLAKE2B be383dfac79f7e49d01699e62c39d9d4bcd00e9544d9eb062fb5c79138966d2418d0a4dab07d26898ad8abe4dc53774388f71810dac6480d70bdbb19e190d8c6 SHA512 9f3f0aaf05cf7c9f32d9fab65c2a042ecdd647cc31bb55de1d6e24ca4fe27df3e812a4ba6511e516d32c6cadc4be71e4b2db65e3f487475dc9a57623d6485358
|
||||
EBUILD xmldiff-2.3.ebuild 637 BLAKE2B 908df70842ed43f600cfa4e54f17fc2b030625ca658834a68c09394ed333e5ef291995abe987b1708773af32d1f559e42b6a2cfb14946a426cea2b5c8133ea11 SHA512 7dd9509c4d88024bca2b9d5f58a127b2358ac4fc303e4c2af9a455280ae491acee9d371fb991183e5b834ae0170db0c94521e0d4982d97866c548bc0d5c2808d
|
||||
MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
|
||||
|
||||
Binary file not shown.
@ -1,17 +1,11 @@
|
||||
AUX sqlite-3.25.0-nonfull_archive-build.patch 416 BLAKE2B 37faa30235c1b668d3cf510c353730a932a807f650c638ac0d07d3a1c0534dedef233c06cef52b6569eb1d58b5bcd910dd59c8d2e792726945f49f882d4181be SHA512 44db89a32b51713cf59fb3f071cca08648deebf6e2830dd61b033a5160ce6ddcbf54a191be42b3b252ea4bc16614fbcfa569207f34f268f1da5acd5fadcda668
|
||||
AUX sqlite-3.31.0-full_archive-build.patch 15642 BLAKE2B c07992c52f1e67d5d5eae1b0cfc0fe20b26e4405ccd8f6c7ece75ea3908f9699e67520c3d27b614b01d20b5758b2b85a8f3b66aa1675cc8fd248d7742fc55ec9 SHA512 14727ab43911f810a22b3aa2a48ce8074422ad38898d0064b7ec4b9a226b27a781ac342a60f32ae1edbaae155bdf142456f66faf8d5adcd33b902b77c3607f72
|
||||
AUX sqlite-3.31.1-full_archive-architectures.patch 2993 BLAKE2B 252d92ec087482b062e0dae0b223e0c0dee6f5857765c6babb857922eb97183a1c72b4ba196685e6b1e1631990123bc8cd71a4e26eabe317741cdc19ac54c201 SHA512 d65475759e2ae663094803d7c74e62fe233630afcf7bd287e77a613144889efb09d57e9f9fa8dce634872e37f1ae53134793fbcfd3d7bd260fc6d774bf5e8aad
|
||||
AUX sqlite-3.31.1-full_archive-security_fixes.patch 5388 BLAKE2B c2740e47d2aab8b99c9d8ae9f346f51f0dca8cdff7d3b991346aff5e94553af1c523b48d33490abb83ecc77be9ae075580dc095b827b348c657b9d5082ec5fe3 SHA512 53894b3bdf5e4a61c58b23758867a63db73b49b856f696a32c6c6d0224d54359927db635abec770e84b111dbf0fbb48b9742809be05504e12854385c58024819
|
||||
AUX sqlite-3.31.1-nonfull_archive-architectures.patch 826 BLAKE2B a506bc0a44477c7b5ad85ad2144871a4d1311d84e8da7b8958a73762662caf11734a3152984430b2c48120d1bfa1099b8a740f9a5c23ee8de1292d7ac1ffcea6 SHA512 041f0d4e07315c48ddce9d1576329647daa787fdcc76d2590fa2bbfb33a13f1b86707379a73b7db35619731c2df0e094b26879648e4b6a9b40696dbd39c7bffa
|
||||
AUX sqlite-3.31.1-nonfull_archive-security_fixes.patch 4099 BLAKE2B bc07ee47164abeefc8d802741e68d77ce339209bc2d143246287e7d2743a57f13a84c08d048c1e72cee84a3ecc2e323a316f7b231352558f28cbd4259c5f8f8b SHA512 b8f18b4895168036cb5958dade34060b2cfee7aeaf61f20fa741f6d9e61856f643597324313e7e0cd1732346099da78111cf44171e355aa7f13ef8a6350845d6
|
||||
AUX sqlite-3.32.1-full_archive-build_1.patch 18726 BLAKE2B 91906aa09514d6f31a87648d7a12fd7a187cbc328bc1d2e41dcd0d041c1ad1959953823af5b84994d742dfcba46727af5797fe83c576ae483133156abbb00f1c SHA512 b206d2767ac9312165085b623f06cf19d36e4fa85c33bce67db56ae41880374ae4115294f417de67f32f6ea9200b028160cdde3ad3420c5ad342b7ec0928fa87
|
||||
AUX sqlite-3.32.1-full_archive-build_2.patch 20259 BLAKE2B 851918379951943ac02fc5bd5b4807f05e9faf2a7e3d01d945761801beeb25c4083bdb5b48ddb79f9e54b859932fffbb393eadfa3ae16ea400e7490fb730170a SHA512 cf4a74ebb0e7b81b3225bd6d38fde663b981d6e5217996a0c80a4880a3818d7b84c39ed6527573426b2d0deebff74b46775c2ca91b8b6503e2f26758d9eb2ad3
|
||||
AUX sqlite-3.32.3-backports_1.patch 17914 BLAKE2B cca0c1d7e1bcccbf9042725f7df32359c954725e4a13e6956dc642aa082abe85953df98f4d3ba59c11599c3a9595126da78600ad0d4a66dce987be45f17c582e SHA512 44f91b92d6c8086b10cd96a382ea391108bde5a2e48f2b9ae43e97fe9fa9d5f4c64ee500bb8ed4414dd519f85823121265c450e92898d13468297d7bf9d28ddc
|
||||
AUX sqlite-3.32.3-backports_2.patch 18056 BLAKE2B 60be3513c3cc687e8fac5689f096a8e543904dfd8f5e3f01f92245de963cc01b7f02774b0a60b2ca3fe3415d0eb3615f65e8756e174efccc98dc5438dbf2189c SHA512 4bb01074417f3e3af6bdf619c0ccc61fe54f4e926a1dd31a57e1a595cc713e58ee52cac7baa11ffa271ed434a8bb645be7fd25a9fa93cc596707f2e503fe87a1
|
||||
AUX sqlite-3.32.3-backports_3.patch 9059 BLAKE2B 4c36eafca13eab04bfb0ce871458d12925b225f05edce785f7f86650de31808179d8bebeffcc23ca8f68069fa2854b7a042ef91e85705b27e85af1b3c424ced8 SHA512 c897d7ebc9b8b5f29c8ed27e76bdeeb3a0bde62fcd4f5398deca2f97c99cc2ef5556389b0c79dced64982fbde2a6322abd91e134255156b572bca476e2a7c050
|
||||
AUX sqlite-3.32.3-security_fixes.patch 4850 BLAKE2B 0dad99a14909c85f5f8b31d74dd1d63a5be7d3c6499bba788a2ff09dd1d6bb9badce57499c99c9c6fdc5b7177204452a2e14214748931ccf502154c44e3c29a8 SHA512 5845368e63676fb050618ca923b5c8348d17e003e4735f36bef17b185f434348708ce3e05be76e7c661eb5321a199364c9ba06492f71a9921b30c00255b55766
|
||||
DIST sqlite-autoconf-3310100.tar.gz 2887243 BLAKE2B ef5d40b6e6c59a51ae95368eb9f6a938188813f89d5328ea1c1180ef35f124c14b3e83b0832ae5c2fa24cc2df352f1b0ea5f20b64d0762d50a700d9895f9a12e SHA512 d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617
|
||||
DIST sqlite-doc-3310100.zip 9600405 BLAKE2B 324fb7a0a38bc56476e41504c14996e9d5d83ac659403991515413d49f5ee3aad064ccece25f52b6041ef26bf23f320a9be1b6b02c5fbe96c36372107f54fc2e SHA512 5572e2c2dac30c014ef9cd60a620b7a7bb610f91a47e2890c0641540d39b9d5ce0e914ee697583130317633918b7827e2612a7cbc024f5bd6aa22ad28a78b56b
|
||||
DIST sqlite-doc-3320300.zip 9772933 BLAKE2B efd72c18d0398c103e3f9c4cfeb03e7794fd69691b1bcea95b74a0c5d8af22aa13abc84ce8dc5864b5f4cb79be239433933b4daca34d1adfcc6f31ce2cde66bf SHA512 af9dca970b4c03c058d7d1cd55a3d11fa4b112dccac942b8660d82a7e9ba2956963fcb429eedfdc85915637c102e1f904ace98c8e0455c4120422bbd9f2f3cd0
|
||||
DIST sqlite-src-3310100.zip 12510166 BLAKE2B a856695e8552b8b4dcb28452fdbd48305fdb9072f9d6587f4b1f4445daf386e920eb936dcb50fdfe41a49f84b26a7c5fedcffea5acf3ba3fa935c36695d4b8ee SHA512 af92a00877bcd90372d6f83a27fea12b4fe8d1155b223a6bccbccc31bb8e3d2269cd9e68f329bc55f70d1068ccbf220ff5abccea6f593fd7a3a4bdd732d1cdbe
|
||||
DIST sqlite-src-3320300.zip 12461750 BLAKE2B 59cce74d284191cfc69ac09b6014701ddd2b7b3d7ebaad5da4ad71cc200e70285b3b201ff174819aa8dde5f610589d7947f547450334f0f17149014078316185 SHA512 7e027c7163a760fb9b6dbfd2e4ccffb39d4972280583fb0d7f8390017101dfed3b12a36653b3130a548ae4d04c6abb11c0a1921b6f09c54c6ae1e72fbdcb2fd4
|
||||
EBUILD sqlite-3.31.1.ebuild 11937 BLAKE2B 32e22c2f51ca1c7ab5b28e51e5145a466822badbbe0c1e8efb38cee965ee68ca058bbafdab5f783820642a728428a3b051ccf2fe4bbd2aef58d9602a1e98f128 SHA512 1319964321ba94e21ab2de05af22a12777ec2fa6bb835aa67c29618139f144f1a3f0cf848a7cda8c7112a12691dd40dcd8036b73b124d8a2781276ee22efa870
|
||||
EBUILD sqlite-3.32.3-r1.ebuild 10372 BLAKE2B 0e0ee5275d198dc04d7c1f4ec5009d4e767f1ce74dc9bf237f998550260440e4aeb179a0d307af9bf5c3b9a1766d785c16811979d1f71704b558c5ef1e52e9a0 SHA512 dd7c017f094d7b97ed882828fbdceef115945c9bfb5d1f24de769b1c538038da5ef2a877dbaf79d88d3e3064f792faf0db3c7b763297c694ce6eac6cb30bb1ea
|
||||
EBUILD sqlite-3.32.3.ebuild 10424 BLAKE2B abfa3de0889bd3931678ffd3a0c8c8d5814a7a673f922965484a2d3c85c3a7203f17ff53dcb2cf2dd4866b1936920b084c856909803fd7f828efab6c52b1446f SHA512 2f74dbdb11ca5d9ed8989ef86cac2d087b7f5e420031b69dac5bdafdd6887e739adbb88f9159082cd2a787cce9923b33bb1bd497e0f7900eca6af18b1a3b79d1
|
||||
MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
|
||||
|
||||
@ -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
|
||||
+ BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
@ -1,466 +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
|
||||
@@ -311,6 +311,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 \
|
||||
@@ -363,8 +366,12 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
+ $(TOP)/ext/misc/dbdata.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
|
||||
#
|
||||
@@ -435,7 +442,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 \
|
||||
@@ -461,7 +467,6 @@
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.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
|
||||
@@ -639,25 +644,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
|
||||
@@ -767,7 +772,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
|
||||
#
|
||||
@@ -1064,14 +1069,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)/ext/misc/memtrace.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
@@ -1239,11 +1239,11 @@
|
||||
|
||||
# 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
|
||||
|
||||
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.
|
||||
@@ -1274,24 +1274,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 \
|
||||
@@ -1302,36 +1301,36 @@
|
||||
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
|
||||
|
||||
-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
|
||||
+ $(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
|
||||
|
||||
-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
|
||||
|
||||
changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
|
||||
@@ -1356,11 +1355,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
|
||||
@@ -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
|
||||
+ 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>
|
||||
@@ -121,3 +123,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>
|
||||
@@ -2186,3 +2188,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;
|
||||
@@ -127,6 +128,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -939,18 +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
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
-
|
||||
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
|
||||
-INCLUDE ../ext/misc/dbdata.c
|
||||
-#endif
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -4173,10 +4167,13 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
|
||||
+ extern int sqlite3_dbdata_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_dbdata_init(p->db, 0, 0);
|
||||
#endif
|
||||
#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,
|
||||
@@ -6176,6 +6173,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);
|
||||
@@ -10354,6 +10352,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
|
||||
--- /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
|
||||
@@ -117,6 +117,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -403,6 +404,11 @@
|
||||
sqlite3session.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ dbdata.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
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
https://sqlite.org/cgi/src/info/04885763c4cd00cb
|
||||
https://sqlite.org/cgi/src/info/b20503aaf5b6595a
|
||||
|
||||
--- /ext/fts5/test/fts5matchinfo.test
|
||||
+++ /ext/fts5/test/fts5matchinfo.test
|
||||
@@ -500,14 +500,18 @@
|
||||
INSERT INTO t1 VALUES('c', 'd');
|
||||
}
|
||||
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ set res {X'02000000'}
|
||||
+} else {
|
||||
+ set res {X'00000002'}
|
||||
+}
|
||||
do_execsql_test 15.1 {
|
||||
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
|
||||
-} {X'02000000'}
|
||||
-
|
||||
+} $res
|
||||
do_execsql_test 15.2 {
|
||||
DELETE FROM t1_content WHERE rowid=1;
|
||||
SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
|
||||
-} {X'02000000'}
|
||||
+} $res
|
||||
|
||||
fts5_aux_test_functions db
|
||||
do_execsql_test 15.3 {
|
||||
@@ -517,4 +521,3 @@
|
||||
}
|
||||
|
||||
finish_test
|
||||
-
|
||||
--- /src/insert.c
|
||||
+++ /src/insert.c
|
||||
@@ -2170,12 +2170,14 @@
|
||||
x = *sqlite3VdbeGetOp(v, addrConflictCk);
|
||||
if( x.opcode!=OP_IdxRowid ){
|
||||
int p2; /* New P2 value for copied conflict check opcode */
|
||||
+ const char *zP4;
|
||||
if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
|
||||
p2 = lblRecheckOk;
|
||||
}else{
|
||||
p2 = x.p2;
|
||||
}
|
||||
- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
|
||||
+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
|
||||
+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
|
||||
sqlite3VdbeChangeP5(v, x.p5);
|
||||
VdbeCoverageIf(v, p2!=x.p2);
|
||||
}
|
||||
--- /test/fts4aa.test
|
||||
+++ /test/fts4aa.test
|
||||
@@ -229,13 +229,18 @@
|
||||
# 2019-11-18 https://bugs.chromium.org/p/chromium/issues/detail?id=1025467
|
||||
db close
|
||||
sqlite3 db :memory:
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ set res {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
|
||||
+} else {
|
||||
+ set res {X'0000000200000000000000000000000E0000000E00000001000000010000000100000001'}
|
||||
+}
|
||||
do_execsql_test fts4aa-6.10 {
|
||||
CREATE VIRTUAL TABLE f USING fts4();
|
||||
INSERT INTO f_segdir VALUES (77,91,0,0,'255 77',x'0001308000004d5c4ddddddd4d4d7b4d4d4d614d8019ff4d05000001204d4d2e4d6e4d4d4d4b4d6c4d004d4d4d4d4d4d3d000000004d5d4d4d645d4d004d4d4d4d4d4d4d4d4d454d6910004d05ffff054d646c4d004d5d4d4d4d4d3d000000004d4d4d4d4d4d4d4d4d4d4d69624d4d4d04004d4d4d4d4d604d4ce1404d554d45');
|
||||
INSERT INTO f_segdir VALUES (77,108,0,0,'255 77',x'0001310000fa64004d4d4d3c5d4d654d4d4d614d8000ff4d05000001204d4d2e4d6e4d4d4dff4d4d4d4d4d4d00104d4d4d4d000000004d4d4d0400311d4d4d4d4d4d4d4d4d4d684d6910004d05ffff054d4d6c4d004d4d4d4d4d4d3d000000004d4d4d4d644d4d4d4d4d4d69624d4d4d03ed4d4d4d4d4d604d4ce1404d550080');
|
||||
INSERT INTO f_stat VALUES (0,x'80808080100000000064004d4d4d3c4d4d654d4d4d614d8000ff4df6ff1a00204d4d2e4d6e4d4d4d104d4d4d4d4d4d00104d4d4d4d4d4d69574d4d4d000031044d4d4d3e4d4d4c4d05004d6910');
|
||||
SELECT quote(matchinfo(f,'pnax')) from f where f match '0 1';
|
||||
-} {X'0200000000000000000000000E0000000E00000001000000010000000100000001000000'}
|
||||
+} $res
|
||||
|
||||
# 2019-11-18 Detect infinite loop in fts3SelectLeaf()
|
||||
db close
|
||||
@ -1,163 +0,0 @@
|
||||
https://sqlite.org/cgi/src/info/9d0d4ab95dc0c56e
|
||||
https://sqlite.org/cgi/src/info/abc473fb8fb99900
|
||||
https://sqlite.org/cgi/src/info/5aeb5a2d295e10d5
|
||||
https://sqlite.org/cgi/src/info/a67cf5b7d37d5b14
|
||||
https://sqlite.org/cgi/src/info/14d14eb537075c6a
|
||||
https://sqlite.org/cgi/src/info/c431b3fd8fd0f6a6
|
||||
|
||||
--- /src/expr.c
|
||||
+++ /src/expr.c
|
||||
@@ -5463,19 +5463,25 @@
|
||||
case TK_LT:
|
||||
case TK_LE:
|
||||
case TK_GT:
|
||||
- case TK_GE:
|
||||
+ case TK_GE: {
|
||||
+ Expr *pLeft = pExpr->pLeft;
|
||||
+ Expr *pRight = pExpr->pRight;
|
||||
testcase( pExpr->op==TK_EQ );
|
||||
testcase( pExpr->op==TK_NE );
|
||||
testcase( pExpr->op==TK_LT );
|
||||
testcase( pExpr->op==TK_LE );
|
||||
testcase( pExpr->op==TK_GT );
|
||||
testcase( pExpr->op==TK_GE );
|
||||
- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
|
||||
- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
|
||||
+ /* The y.pTab=0 assignment in wherecode.c always happens after the
|
||||
+ ** impliesNotNullRow() test */
|
||||
+ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
|
||||
+ && IsVirtual(pLeft->y.pTab))
|
||||
+ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
|
||||
+ && IsVirtual(pRight->y.pTab))
|
||||
){
|
||||
- return WRC_Prune;
|
||||
+ return WRC_Prune;
|
||||
}
|
||||
-
|
||||
+ }
|
||||
default:
|
||||
return WRC_Continue;
|
||||
}
|
||||
--- /src/resolve.c
|
||||
+++ /src/resolve.c
|
||||
@@ -1051,7 +1051,7 @@
|
||||
assert( !ExprHasProperty(pExpr, EP_Reduced) );
|
||||
/* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
|
||||
** and "x IS NOT FALSE". */
|
||||
- if( pRight->op==TK_ID ){
|
||||
+ if( pRight && pRight->op==TK_ID ){
|
||||
int rc = resolveExprStep(pWalker, pRight);
|
||||
if( rc==WRC_Abort ) return WRC_Abort;
|
||||
if( pRight->op==TK_TRUEFALSE ){
|
||||
--- /src/select.c
|
||||
+++ /src/select.c
|
||||
@@ -2806,6 +2806,7 @@
|
||||
/* Generate code to take the intersection of the two temporary
|
||||
** tables.
|
||||
*/
|
||||
+ if( rc ) break;
|
||||
assert( p->pEList );
|
||||
iBreak = sqlite3VdbeMakeLabel(pParse);
|
||||
iCont = sqlite3VdbeMakeLabel(pParse);
|
||||
@@ -5148,7 +5149,7 @@
|
||||
pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
|
||||
sqlite3TokenInit(&sColname, zColname);
|
||||
sqlite3ExprListSetName(pParse, pNew, &sColname, 0);
|
||||
- if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){
|
||||
+ if( pNew && (p->selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
|
||||
struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
|
||||
sqlite3DbFree(db, pX->zEName);
|
||||
if( pSub ){
|
||||
--- /src/sqliteInt.h
|
||||
+++ /src/sqliteInt.h
|
||||
@@ -2153,8 +2153,11 @@
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
# define IsVirtual(X) ((X)->nModuleArg)
|
||||
+# define ExprIsVtab(X) \
|
||||
+ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
|
||||
#else
|
||||
# define IsVirtual(X) 0
|
||||
+# define ExprIsVtab(X) 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
--- /src/whereexpr.c
|
||||
+++ /src/whereexpr.c
|
||||
@@ -377,7 +377,8 @@
|
||||
** MATCH(expression,vtab_column)
|
||||
*/
|
||||
pCol = pList->a[1].pExpr;
|
||||
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
|
||||
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pCol) ){
|
||||
for(i=0; i<ArraySize(aOp); i++){
|
||||
if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
|
||||
*peOp2 = aOp[i].eOp2;
|
||||
@@ -399,7 +400,8 @@
|
||||
** with function names in an arbitrary case.
|
||||
*/
|
||||
pCol = pList->a[0].pExpr;
|
||||
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
|
||||
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pCol) ){
|
||||
sqlite3_vtab *pVtab;
|
||||
sqlite3_module *pMod;
|
||||
void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
|
||||
@@ -422,10 +424,12 @@
|
||||
int res = 0;
|
||||
Expr *pLeft = pExpr->pLeft;
|
||||
Expr *pRight = pExpr->pRight;
|
||||
- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
|
||||
+ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pLeft) ){
|
||||
res++;
|
||||
}
|
||||
- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
|
||||
+ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
|
||||
+ if( pRight && ExprIsVtab(pRight) ){
|
||||
res++;
|
||||
SWAP(Expr*, pLeft, pRight);
|
||||
}
|
||||
--- /test/altertab.test
|
||||
+++ /test/altertab.test
|
||||
@@ -613,4 +613,21 @@
|
||||
SELECT sql FROM sqlite_master;
|
||||
} {{CREATE TABLE t0 (c1 INTEGER, PRIMARY KEY(c1))}}
|
||||
|
||||
+# 2020-02-23 ticket f50af3e8a565776b
|
||||
+reset_db
|
||||
+do_execsql_test 19.100 {
|
||||
+ CREATE TABLE t1(x);
|
||||
+ CREATE VIEW t2 AS SELECT 1 FROM t1, (t1 AS a0, t1);
|
||||
+ ALTER TABLE t1 RENAME TO t3;
|
||||
+ SELECT sql FROM sqlite_master;
|
||||
+} {{CREATE TABLE "t3"(x)} {CREATE VIEW t2 AS SELECT 1 FROM "t3", ("t3" AS a0, "t3")}}
|
||||
+do_execsql_test 19.110 {
|
||||
+ INSERT INTO t3(x) VALUES(123);
|
||||
+ SELECT * FROM t2;
|
||||
+} {1}
|
||||
+do_execsql_test 19.120 {
|
||||
+ INSERT INTO t3(x) VALUES('xyz');
|
||||
+ SELECT * FROM t2;
|
||||
+} {1 1 1 1 1 1 1 1}
|
||||
+
|
||||
finish_test
|
||||
--- /test/windowfault.test
|
||||
+++ /test/windowfault.test
|
||||
@@ -263,4 +263,15 @@
|
||||
faultsim_test_result {0 {}}
|
||||
}
|
||||
|
||||
+do_faultsim_test 11 -faults oom* -prep {
|
||||
+} -body {
|
||||
+ execsql {
|
||||
+ VALUES(false),(current_date collate binary)
|
||||
+ intersect
|
||||
+ values(count() not like group_concat(cast(cast(0e00 as text) as integer) <= NULL || 0.4e-0 || 0x8 & true ) over () collate rtrim);
|
||||
+ }
|
||||
+} -test {
|
||||
+ faultsim_test_result {0 {}}
|
||||
+}
|
||||
+
|
||||
finish_test
|
||||
@ -1,20 +0,0 @@
|
||||
https://sqlite.org/cgi/src/info/04885763c4cd00cb
|
||||
|
||||
--- /sqlite3.c
|
||||
+++ /sqlite3.c
|
||||
@@ -121302,12 +121302,14 @@
|
||||
x = *sqlite3VdbeGetOp(v, addrConflictCk);
|
||||
if( x.opcode!=OP_IdxRowid ){
|
||||
int p2; /* New P2 value for copied conflict check opcode */
|
||||
+ const char *zP4;
|
||||
if( sqlite3OpcodeProperty[x.opcode]&OPFLG_JUMP ){
|
||||
p2 = lblRecheckOk;
|
||||
}else{
|
||||
p2 = x.p2;
|
||||
}
|
||||
- sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, x.p4.z, x.p4type);
|
||||
+ zP4 = x.p4type==P4_INT32 ? SQLITE_INT_TO_PTR(x.p4.i) : x.p4.z;
|
||||
+ sqlite3VdbeAddOp4(v, x.opcode, x.p1, p2, x.p3, zP4, x.p4type);
|
||||
sqlite3VdbeChangeP5(v, x.p5);
|
||||
VdbeCoverageIf(v, p2!=x.p2);
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
https://sqlite.org/cgi/src/info/9d0d4ab95dc0c56e
|
||||
https://sqlite.org/cgi/src/info/abc473fb8fb99900
|
||||
https://sqlite.org/cgi/src/info/5aeb5a2d295e10d5
|
||||
https://sqlite.org/cgi/src/info/a67cf5b7d37d5b14
|
||||
https://sqlite.org/cgi/src/info/c431b3fd8fd0f6a6
|
||||
|
||||
--- /sqlite3.c
|
||||
+++ /sqlite3.c
|
||||
@@ -17428,8 +17428,11 @@
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
# define IsVirtual(X) ((X)->nModuleArg)
|
||||
+# define ExprIsVtab(X) \
|
||||
+ ((X)->op==TK_COLUMN && (X)->y.pTab!=0 && (X)->y.pTab->nModuleArg)
|
||||
#else
|
||||
# define IsVirtual(X) 0
|
||||
+# define ExprIsVtab(X) 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -97816,7 +97819,7 @@
|
||||
assert( !ExprHasProperty(pExpr, EP_Reduced) );
|
||||
/* Handle special cases of "x IS TRUE", "x IS FALSE", "x IS NOT TRUE",
|
||||
** and "x IS NOT FALSE". */
|
||||
- if( pRight->op==TK_ID ){
|
||||
+ if( pRight && pRight->op==TK_ID ){
|
||||
int rc = resolveExprStep(pWalker, pRight);
|
||||
if( rc==WRC_Abort ) return WRC_Abort;
|
||||
if( pRight->op==TK_TRUEFALSE ){
|
||||
@@ -104133,19 +104136,25 @@
|
||||
case TK_LT:
|
||||
case TK_LE:
|
||||
case TK_GT:
|
||||
- case TK_GE:
|
||||
+ case TK_GE: {
|
||||
+ Expr *pLeft = pExpr->pLeft;
|
||||
+ Expr *pRight = pExpr->pRight;
|
||||
testcase( pExpr->op==TK_EQ );
|
||||
testcase( pExpr->op==TK_NE );
|
||||
testcase( pExpr->op==TK_LT );
|
||||
testcase( pExpr->op==TK_LE );
|
||||
testcase( pExpr->op==TK_GT );
|
||||
testcase( pExpr->op==TK_GE );
|
||||
- if( (pExpr->pLeft->op==TK_COLUMN && IsVirtual(pExpr->pLeft->y.pTab))
|
||||
- || (pExpr->pRight->op==TK_COLUMN && IsVirtual(pExpr->pRight->y.pTab))
|
||||
+ /* The y.pTab=0 assignment in wherecode.c always happens after the
|
||||
+ ** impliesNotNullRow() test */
|
||||
+ if( (pLeft->op==TK_COLUMN && ALWAYS(pLeft->y.pTab!=0)
|
||||
+ && IsVirtual(pLeft->y.pTab))
|
||||
+ || (pRight->op==TK_COLUMN && ALWAYS(pRight->y.pTab!=0)
|
||||
+ && IsVirtual(pRight->y.pTab))
|
||||
){
|
||||
- return WRC_Prune;
|
||||
+ return WRC_Prune;
|
||||
}
|
||||
-
|
||||
+ }
|
||||
default:
|
||||
return WRC_Continue;
|
||||
}
|
||||
@@ -130673,6 +130682,7 @@
|
||||
/* Generate code to take the intersection of the two temporary
|
||||
** tables.
|
||||
*/
|
||||
+ if( rc ) break;
|
||||
assert( p->pEList );
|
||||
iBreak = sqlite3VdbeMakeLabel(pParse);
|
||||
iCont = sqlite3VdbeMakeLabel(pParse);
|
||||
@@ -133015,7 +133025,7 @@
|
||||
pNew = sqlite3ExprListAppend(pParse, pNew, pExpr);
|
||||
sqlite3TokenInit(&sColname, zColname);
|
||||
sqlite3ExprListSetName(pParse, pNew, &sColname, 0);
|
||||
- if( pNew && (p->selFlags & SF_NestedFrom)!=0 ){
|
||||
+ if( pNew && (p->selFlags & SF_NestedFrom)!=0 && !IN_RENAME_OBJECT ){
|
||||
struct ExprList_item *pX = &pNew->a[pNew->nExpr-1];
|
||||
sqlite3DbFree(db, pX->zEName);
|
||||
if( pSub ){
|
||||
@@ -142593,7 +142603,8 @@
|
||||
** MATCH(expression,vtab_column)
|
||||
*/
|
||||
pCol = pList->a[1].pExpr;
|
||||
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
|
||||
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pCol) ){
|
||||
for(i=0; i<ArraySize(aOp); i++){
|
||||
if( sqlite3StrICmp(pExpr->u.zToken, aOp[i].zOp)==0 ){
|
||||
*peOp2 = aOp[i].eOp2;
|
||||
@@ -142615,7 +142626,8 @@
|
||||
** with function names in an arbitrary case.
|
||||
*/
|
||||
pCol = pList->a[0].pExpr;
|
||||
- if( pCol->op==TK_COLUMN && IsVirtual(pCol->y.pTab) ){
|
||||
+ testcase( pCol->op==TK_COLUMN && pCol->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pCol) ){
|
||||
sqlite3_vtab *pVtab;
|
||||
sqlite3_module *pMod;
|
||||
void (*xNotUsed)(sqlite3_context*,int,sqlite3_value**);
|
||||
@@ -142638,10 +142650,12 @@
|
||||
int res = 0;
|
||||
Expr *pLeft = pExpr->pLeft;
|
||||
Expr *pRight = pExpr->pRight;
|
||||
- if( pLeft->op==TK_COLUMN && IsVirtual(pLeft->y.pTab) ){
|
||||
+ testcase( pLeft->op==TK_COLUMN && pLeft->y.pTab==0 );
|
||||
+ if( ExprIsVtab(pLeft) ){
|
||||
res++;
|
||||
}
|
||||
- if( pRight && pRight->op==TK_COLUMN && IsVirtual(pRight->y.pTab) ){
|
||||
+ testcase( pRight && pRight->op==TK_COLUMN && pRight->y.pTab==0 );
|
||||
+ if( pRight && ExprIsVtab(pRight) ){
|
||||
res++;
|
||||
SWAP(Expr*, pLeft, pRight);
|
||||
}
|
||||
@ -0,0 +1,361 @@
|
||||
https://sqlite.org/src/info/d48af4d2cfff3d5f
|
||||
https://sqlite.org/src/info/cc888878ea8d5bc7
|
||||
https://sqlite.org/src/info/be545f85a6ef09cc
|
||||
https://sqlite.org/src/info/6e0ffa2053124168
|
||||
https://sqlite.org/src/info/4d0cfb1236884349
|
||||
https://sqlite.org/src/info/ccff8cb8267d4c56
|
||||
https://sqlite.org/src/info/5124732370fd53c9
|
||||
|
||||
--- /ext/fts3/fts3.c
|
||||
+++ /ext/fts3/fts3.c
|
||||
@@ -2068,7 +2068,7 @@
|
||||
sqlite3_int64 *piPrev, /* IN/OUT: Previous value written to list */
|
||||
sqlite3_int64 iVal /* Write this value to the list */
|
||||
){
|
||||
- assert( iVal-*piPrev > 0 || (*piPrev==0 && iVal==0) );
|
||||
+ assert_fts3_nc( iVal-*piPrev > 0 || (*piPrev==0 && iVal==0) );
|
||||
*pp += sqlite3Fts3PutVarint(*pp, iVal-*piPrev);
|
||||
*piPrev = iVal;
|
||||
}
|
||||
@@ -5208,10 +5208,12 @@
|
||||
);
|
||||
if( res ){
|
||||
nNew = (int)(pOut - pPhrase->doclist.pList) - 1;
|
||||
- assert( pPhrase->doclist.pList[nNew]=='\0' );
|
||||
- assert( nNew<=pPhrase->doclist.nList && nNew>0 );
|
||||
- memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
|
||||
- pPhrase->doclist.nList = nNew;
|
||||
+ if( nNew>=0 ){
|
||||
+ assert( pPhrase->doclist.pList[nNew]=='\0' );
|
||||
+ assert( nNew<=pPhrase->doclist.nList && nNew>0 );
|
||||
+ memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
|
||||
+ pPhrase->doclist.nList = nNew;
|
||||
+ }
|
||||
*paPoslist = pPhrase->doclist.pList;
|
||||
*pnToken = pPhrase->nToken;
|
||||
}
|
||||
@@ -5563,7 +5565,10 @@
|
||||
}else
|
||||
#endif
|
||||
{
|
||||
- bHit = (pExpr->bEof==0 && pExpr->iDocid==pCsr->iPrevId);
|
||||
+ bHit = (
|
||||
+ pExpr->bEof==0 && pExpr->iDocid==pCsr->iPrevId
|
||||
+ && pExpr->pPhrase->doclist.nList>0
|
||||
+ );
|
||||
}
|
||||
break;
|
||||
}
|
||||
--- /ext/fts3/fts3_write.c
|
||||
+++ /ext/fts3/fts3_write.c
|
||||
@@ -341,7 +341,9 @@
|
||||
** created by merging the oldest :2 segments from absolute level :1. See
|
||||
** function sqlite3Fts3Incrmerge() for details. */
|
||||
/* 29 */ "SELECT 2 * total(1 + leaves_end_block - start_block) "
|
||||
- " FROM %Q.'%q_segdir' WHERE level = ? AND idx < ?",
|
||||
+ " FROM (SELECT * FROM %Q.'%q_segdir' "
|
||||
+ " WHERE level = ? ORDER BY idx ASC LIMIT ?"
|
||||
+ " )",
|
||||
|
||||
/* SQL_DELETE_SEGDIR_ENTRY
|
||||
** Delete the %_segdir entry on absolute level :1 with index :2. */
|
||||
@@ -2853,6 +2855,19 @@
|
||||
return SQLITE_OK;
|
||||
}
|
||||
|
||||
+static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, int nReq){
|
||||
+ if( nReq>pCsr->nBuffer ){
|
||||
+ char *aNew;
|
||||
+ pCsr->nBuffer = nReq*2;
|
||||
+ aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
|
||||
+ if( !aNew ){
|
||||
+ return SQLITE_NOMEM;
|
||||
+ }
|
||||
+ pCsr->aBuffer = aNew;
|
||||
+ }
|
||||
+ return SQLITE_OK;
|
||||
+}
|
||||
+
|
||||
|
||||
int sqlite3Fts3SegReaderStep(
|
||||
Fts3Table *p, /* Virtual table handle */
|
||||
@@ -2987,15 +3002,9 @@
|
||||
}
|
||||
|
||||
nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0);
|
||||
- if( nDoclist+nByte>pCsr->nBuffer ){
|
||||
- char *aNew;
|
||||
- pCsr->nBuffer = (nDoclist+nByte)*2;
|
||||
- aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
|
||||
- if( !aNew ){
|
||||
- return SQLITE_NOMEM;
|
||||
- }
|
||||
- pCsr->aBuffer = aNew;
|
||||
- }
|
||||
+
|
||||
+ rc = fts3GrowSegReaderBuffer(pCsr, nByte+nDoclist);
|
||||
+ if( rc ) return rc;
|
||||
|
||||
if( isFirst ){
|
||||
char *a = &pCsr->aBuffer[nDoclist];
|
||||
@@ -3020,6 +3029,9 @@
|
||||
fts3SegReaderSort(apSegment, nMerge, j, xCmp);
|
||||
}
|
||||
if( nDoclist>0 ){
|
||||
+ rc = fts3GrowSegReaderBuffer(pCsr, nDoclist+FTS3_NODE_PADDING);
|
||||
+ if( rc ) return rc;
|
||||
+ memset(&pCsr->aBuffer[nDoclist], 0, FTS3_NODE_PADDING);
|
||||
pCsr->aDoclist = pCsr->aBuffer;
|
||||
pCsr->nDoclist = nDoclist;
|
||||
rc = SQLITE_ROW;
|
||||
@@ -4288,7 +4300,7 @@
|
||||
int i;
|
||||
int nHeight = (int)aRoot[0];
|
||||
NodeWriter *pNode;
|
||||
- if( nHeight<1 || nHeight>FTS_MAX_APPENDABLE_HEIGHT ){
|
||||
+ if( nHeight<1 || nHeight>=FTS_MAX_APPENDABLE_HEIGHT ){
|
||||
sqlite3_reset(pSelect);
|
||||
return FTS_CORRUPT_VTAB;
|
||||
}
|
||||
--- /src/expr.c
|
||||
+++ /src/expr.c
|
||||
@@ -4272,7 +4272,9 @@
|
||||
int nCol;
|
||||
testcase( op==TK_EXISTS );
|
||||
testcase( op==TK_SELECT );
|
||||
- if( op==TK_SELECT && (nCol = pExpr->x.pSelect->pEList->nExpr)!=1 ){
|
||||
+ if( pParse->db->mallocFailed ){
|
||||
+ return 0;
|
||||
+ }else if( op==TK_SELECT && (nCol = pExpr->x.pSelect->pEList->nExpr)!=1 ){
|
||||
sqlite3SubselectError(pParse, nCol, 1);
|
||||
}else{
|
||||
return sqlite3CodeSubselect(pParse, pExpr);
|
||||
--- /test/fts3corrupt4.test
|
||||
+++ /test/fts3corrupt4.test
|
||||
@@ -6123,4 +6123,163 @@
|
||||
SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'rtree ner "json1^enable"';
|
||||
}
|
||||
|
||||
+#-------------------------------------------------------------------------
|
||||
+do_execsql_test 42.1 {
|
||||
+ CREATE VIRTUAL TABLE f USING fts3(a, b);
|
||||
+}
|
||||
+do_execsql_test 42.2 {
|
||||
+ INSERT INTO f_segdir VALUES(0,2,1111,0,0,X'00');
|
||||
+ INSERT INTO f_segdir VALUES(0,3,0 ,0,0,X'00013003010200');
|
||||
+}
|
||||
+do_execsql_test 42.3 {
|
||||
+ INSERT INTO f(f) VALUES ('merge=107,2');
|
||||
+}
|
||||
+
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+set saved $sqlite_fts3_enable_parentheses
|
||||
+set sqlite_fts3_enable_parentheses 1
|
||||
+do_execsql_test 43.1 {
|
||||
+ CREATE VIRTUAL TABLE def USING fts3(xyz);
|
||||
+ INSERT INTO def_segdir VALUES(0,0,0,0,0, X'0001310301c9000103323334050d81');
|
||||
+} {}
|
||||
+
|
||||
+do_execsql_test 43.2 {
|
||||
+ SELECT rowid FROM def WHERE def MATCH '1 NEAR 1'
|
||||
+} {1}
|
||||
+
|
||||
+set sqlite_fts3_enable_parentheses $saved
|
||||
+
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+do_execsql_test 44.1 {
|
||||
+ CREATE VIRTUAL TABLE t0 USING fts3(col0 INTEGER PRIMARY KEY,col1 VARCHAR(8),col2 BINARY,col3 BINARY);
|
||||
+ INSERT INTO t0_content VALUES(0,NULL,NULL,NULL,NULL);
|
||||
+ INSERT INTO t0_segdir VALUES(0,0,0,0,'0 42',X'00013103010200010332333405010201ba00000461616161050101020200000462626262050101030200');
|
||||
+}
|
||||
+
|
||||
+do_execsql_test 44.2 {
|
||||
+ SELECT matchinfo(t0, t0) IS NULL FROM t0 WHERE t0 MATCH '1*'
|
||||
+} {0}
|
||||
+
|
||||
+#-------------------------------------------------------------------------
|
||||
+#
|
||||
+reset_db
|
||||
+do_test 45.0 {
|
||||
+ sqlite3 db {}
|
||||
+ db deserialize [decode_hexdb {
|
||||
+.open --hexdb
|
||||
+| size 24576 pagesize 4096 filename crash-65c98512cc9e49.db
|
||||
+| page 1 offset 0
|
||||
+| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3.
|
||||
+| 16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 06 .....@ ........
|
||||
+| 96: 00 00 00 00 0d 0e fc 00 06 0d bc 00 0f ca 0f 6c ...............l
|
||||
+| 112: 0f 04 0e 13 0e c9 0d bc 00 00 00 00 00 00 00 00 ................
|
||||
+| 3504: 00 00 00 00 00 00 00 00 00 00 00 00 55 06 07 17 ............U...
|
||||
+| 3520: 1b 1b 01 81 01 74 61 62 6c 65 78 31 5f 73 74 61 .....tablex1_sta
|
||||
+| 3536: 74 78 31 5f 73 74 61 74 06 43 52 45 41 54 45 20 tx1_stat.CREATE
|
||||
+| 3552: 54 41 42 4c 45 20 27 78 31 5f 73 74 61 74 27 28 TABLE 'x1_stat'(
|
||||
+| 3568: 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 id INTEGER PRIMA
|
||||
+| 3584: 52 59 20 4b 45 59 2c 20 76 61 6c 75 65 20 42 4c RY KEY, value BL
|
||||
+| 3600: 41 82 29 81 33 04 07 17 1f 1f 01 82 35 74 61 62 A.).3.......5tab
|
||||
+| 3616: 6c 65 78 31 5f 73 65 67 64 69 72 78 31 5f 73 65 lex1_segdirx1_se
|
||||
+| 3632: 67 64 69 72 04 43 52 45 41 54 45 20 54 41 42 4c gdir.CREATE TABL
|
||||
+| 3648: 45 20 27 78 31 5f 73 65 67 64 69 72 27 28 6c 65 E 'x1_segdir'(le
|
||||
+| 3664: 76 65 6c 20 49 4e 54 45 47 45 52 2c 69 64 78 20 vel INTEGER,idx
|
||||
+| 3680: 49 4e 54 45 47 45 52 2c 73 74 61 72 74 5f 62 6c INTEGER,start_bl
|
||||
+| 3696: 6f 63 6b 20 49 4e 54 45 47 45 52 2c 6c 65 61 76 ock INTEGER,leav
|
||||
+| 3712: 65 73 5f 65 6e 64 5f 62 6c 6f 63 6b 20 49 4e 54 es_end_block INT
|
||||
+| 3728: 45 47 45 52 2c 65 6e 64 5f 62 6c 6f 63 6b 20 49 EGER,end_block I
|
||||
+| 3744: 4e 54 45 47 45 52 2c 72 6f 6f 74 20 42 4c 4f 42 NTEGER,root BLOB
|
||||
+| 3760: 2c 50 52 49 4d 41 52 59 20 4b 45 59 28 6c 65 76 ,PRIMARY KEY(lev
|
||||
+| 3776: 65 6c 2c 20 69 64 78 29 29 31 05 06 17 45 1f 01 el, idx))1...E..
|
||||
+| 3792: 00 69 6e 64 65 78 73 71 6c 69 74 65 5f 61 75 74 .indexsqlite_aut
|
||||
+| 3808: 6f 69 6e 64 65 78 5f 78 31 5f 73 65 67 64 69 72 oindex_x1_segdir
|
||||
+| 3824: 5f 31 78 31 5f 73 65 67 64 69 72 05 00 00 00 08 _1x1_segdir.....
|
||||
+| 3840: 60 00 00 00 66 03 07 17 23 23 01 81 13 74 61 62 `...f...##...tab
|
||||
+| 3856: 6c 65 78 31 5f 73 65 67 6d 65 6e 74 73 78 31 5f lex1_segmentsx1_
|
||||
+| 3872: 73 65 67 6d 65 6e 74 73 03 43 52 45 41 54 45 20 segments.CREATE
|
||||
+| 3888: 54 41 42 4c 45 20 27 78 31 5f 73 65 67 6d 65 6e TABLE 'x1_segmen
|
||||
+| 3904: 74 73 27 28 62 6c 6f 63 6b 69 64 20 49 4e 54 45 ts'(blockid INTE
|
||||
+| 3920: 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c GER PRIMARY KEY,
|
||||
+| 3936: 20 62 6c 6f 63 6b 20 42 4c 4f 42 29 5c 02 07 17 block BLOB)....
|
||||
+| 3952: 21 21 01 81 03 74 61 62 6c 65 78 31 5f 63 6f 6e !!...tablex1_con
|
||||
+| 3968: 74 65 6e 74 78 31 5f 63 6f 6e 74 65 6e 74 02 43 tentx1_content.C
|
||||
+| 3984: 52 45 41 54 45 20 54 41 42 4c 45 20 27 78 31 5f REATE TABLE 'x1_
|
||||
+| 4000: 63 6f 6e 74 65 6e 74 27 28 64 6f 63 69 64 20 49 content'(docid I
|
||||
+| 4016: 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b NTEGER PRIMARY K
|
||||
+| 4032: 45 59 2c 20 27 63 30 78 27 29 34 01 06 17 11 11 EY, 'c0x')4.....
|
||||
+| 4048: 08 57 74 61 62 6c 65 78 31 78 31 43 52 45 41 54 .Wtablex1x1CREAT
|
||||
+| 4064: 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45 20 E VIRTUAL TABLE
|
||||
+| 4080: 78 31 20 55 53 49 4e 47 20 66 74 73 33 28 78 29 x1 USING fts3(x)
|
||||
+| page 2 offset 4096
|
||||
+| 0: 0d 00 00 00 11 0f 77 f0 0f f8 0f f0 0f e8 0f e0 ......w.........
|
||||
+| 16: 0f d8 0f d0 0f c8 0f c0 00 00 00 00 00 00 00 00 ................
|
||||
+| 3952: 00 00 00 00 00 00 00 00 06 11 03 00 13 77 78 79 .............wxy
|
||||
+| 3968: 06 10 03 00 13 74 75 76 06 0f 03 00 13 71 33 73 .....tuv.....q3s
|
||||
+| 3984: 06 0e 03 00 13 6e 6f 70 06 0d 03 00 13 6b 6c 6d .....nop.....klm
|
||||
+| 4000: 06 0c 03 04 c3 68 69 6a 06 0b 03 00 13 65 66 67 .....hij.....efg
|
||||
+| 4016: 06 0a 03 00 13 62 63 64 06 09 03 00 13 79 7a 61 .....bcd.....yza
|
||||
+| 4032: 06 08 03 00 13 76 77 78 06 07 03 00 13 73 74 75 .....vwx.....stu
|
||||
+| 4048: 06 06 03 00 13 70 71 72 06 05 03 00 13 6d 6e 6f .....pqr.....mno
|
||||
+| 4064: 06 03 03 00 13 6a 6b 6c 06 03 03 00 13 67 68 69 .....jkl.....ghi
|
||||
+| 4080: 06 02 02 00 03 64 65 66 06 01 03 00 13 61 52 63 .....def.....aRc
|
||||
+| page 3 offset 8192
|
||||
+| 0: 0d 00 00 00 03 0f a7 00 0f b5 0f a7 0f fa 01 00 ................
|
||||
+| 4000: 00 00 00 00 00 00 00 0c 02 03 00 1e 00 03 6b 6c ..............kl
|
||||
+| 4016: 6d 03 0d 02 00 43 01 04 00 81 0a 00 03 61 62 63 m....C.......abc
|
||||
+| 4032: 03 0b 32 00 00 03 62 63 64 03 0a 02 00 00 03 64 ..2...bcd......d
|
||||
+| 4048: 69 26 03 02 02 00 00 03 65 66 67 03 0b 02 00 00 i&......efg.....
|
||||
+| 4064: 03 67 68 69 03 03 02 00 00 03 68 69 6a 03 0c 02 .ghi......hij...
|
||||
+| 4080: 00 00 03 6a 6a 2c 03 04 02 00 03 81 00 03 00 00 ...jj,..........
|
||||
+| page 4 offset 12288
|
||||
+| 0: 0d 0f 3a 00 05 0f 25 00 0f 9e 0f 88 0f 43 0f 25 ..:...%......C.%
|
||||
+| 16: 0f 72 00 00 00 00 00 00 00 00 00 00 00 00 00 00 .r..............
|
||||
+| 3856: 00 00 00 00 00 00 00 00 00 56 01 08 08 13 1e 03 .........V......
|
||||
+| 3872: 30 20 39 00 03 13 05 07 08 08 18 08 13 1e 30 20 0 9...........0
|
||||
+| 3888: 39 00 03 77 78 79 03 11 02 00 0f 6c 00 09 01 08 9..wxy.....l....
|
||||
+| 3904: 08 15 54 27 04 07 09 01 08 08 15 42 02 30 20 33 ..T'.......B.0 3
|
||||
+| 3920: 36 00 03 6e 6f 70 03 0e 02 00 00 03 71 72 73 03 6..nop......qrs.
|
||||
+| 3936: 0f 02 00 00 03 74 75 76 03 10 02 00 0f cf b1 06 .....tuv........
|
||||
+| 3952: 01 08 14 06 07 01 08 09 01 1b 14 02 02 31 32 38 .............128
|
||||
+| 3968: 20 2d 37 32 10 01 01 6b 14 03 07 09 09 08 08 15 -72...k........
|
||||
+| 3984: 1e 30 20 33 36 00 03 79 7a 61 03 09 02 00 2f 02 .0 36..yza..../.
|
||||
+| 4000: 07 09 08 08 08 15 54 30 20 33 36 00 03 6d 6e 6f ......T0 36..mno
|
||||
+| 4016: 03 05 02 00 00 03 70 71 72 03 06 02 00 00 03 73 ......pqr......s
|
||||
+| 4032: 74 75 03 07 02 00 00 03 76 77 78 03 08 02 00 00 tu......vwx.....
|
||||
+| 4048: 00 00 4a 08 08 08 15 54 30 20 33 36 00 03 61 62 ..J....T0 36..ab
|
||||
+| 4064: 63 03 01 02 00 00 03 64 65 66 03 02 02 00 00 03 c......def......
|
||||
+| 4080: 67 68 69 03 03 67 00 00 03 6a 6b 6c 03 04 02 00 ghi..g...jkl....
|
||||
+| page 5 offset 16384
|
||||
+| 0: 0a 0f e7 00 05 0f da 00 0f e1 0f fa 0f f4 0f ed ................
|
||||
+| 16: 0f da 0f 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
|
||||
+| 4048: 00 00 00 00 00 00 00 1a 01 03 06 04 01 08 01 02 ................
|
||||
+| 4064: 06 05 04 08 08 01 05 00 00 00 06 01 03 06 04 09 ................
|
||||
+| 4080: 02 01 02 04 05 04 09 09 01 03 05 04 09 08 01 02 ................
|
||||
+| page 6 offset 20480
|
||||
+| 0: 0d 00 10 00 01 0f f9 00 0f f9 00 00 00 00 00 00 ................
|
||||
+| 4080: 00 00 00 00 00 00 00 00 00 05 01 03 00 10 01 03 ................
|
||||
+| end crash-65c98512cc9e49.db
|
||||
+}]} {}
|
||||
+
|
||||
+do_catchsql_test 45.2 {
|
||||
+ INSERT INTO x1(x1) VALUES( 'merge=1' )
|
||||
+} {1 {database disk image is malformed}}
|
||||
+
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+set saved $sqlite_fts3_enable_parentheses
|
||||
+set sqlite_fts3_enable_parentheses 1
|
||||
+do_execsql_test 46.1 {
|
||||
+ CREATE VIRTUAL TABLE t0 USING fts3(a INTEGER PRIMARY KEY,b,c,d);
|
||||
+ INSERT INTO t0_segdir VALUES(0,0,0,0,'0 42',X'0001310301c9000103323334050d8000f200000461616161050101020200000462626262050101030200');
|
||||
+} {}
|
||||
+
|
||||
+do_catchsql_test 46.2 {
|
||||
+ SELECT * FROM t0
|
||||
+ WHERE t0 MATCH x'2b0a312b0a312a312a2a0b5d0a0b0b0a312a0a0b0b0a312a0b310a392a0b0a27312a2a0b5d0a312a0b310a31315d0b310a312a316d2a0b313b15bceaa50a312a0b0a27312a2a0b5d0a312a0b310a312b0b2a310a312a0b2a0b2a0b2e5d0a0bff313336e34a2a312a0b0a3c310b0a0b4b4b0b4b2a4bec40322b2a0b310a0a312a0a0a0a0a0a0a0a0a0b310a312a2a2a0b5d0a0b0b0a312a0b310a312a0b0a4e4541530b310a5df5ced70a0a0a0a0a4f520a0a0a0a0a0a0a312a0b0a4e4541520b310a5d616161610a0a0a0a4f520a0a0a0a0a0a312b0a312a312a0a0a0a0a0a0a004a0b0a310b220a0b0a310a4a22310a0b0a7e6fe0e0e030e0e0e0e0e01176e02000e0e0e0e0e01131320226310a0b0a310a4a22310a0b0a310a766f8b8b4ee0e0300ae0090909090909090909090909090909090909090909090909090909090909090947aaaa540b09090909090909090909090909090909090909090909090909090909090909fae0e0f2f22164e0e0f273e07fefefef7d6dfafafafa6d6d6d6d';
|
||||
+} {1 {database disk image is malformed}}
|
||||
+
|
||||
+set sqlite_fts3_enable_parentheses $saved
|
||||
+
|
||||
finish_test
|
||||
--- /test/fts3corrupt6.test
|
||||
+++ /test/fts3corrupt6.test
|
||||
@@ -0,0 +1,60 @@
|
||||
+# 2020 June 8
|
||||
+#
|
||||
+# The author disclaims copyright to this source code. In place of
|
||||
+# a legal notice, here is a blessing:
|
||||
+#
|
||||
+# May you do good and not evil.
|
||||
+# May you find forgiveness for yourself and forgive others.
|
||||
+# May you share freely, never taking more than you give.
|
||||
+#
|
||||
+#*************************************************************************
|
||||
+# This file implements regression tests for SQLite library. The
|
||||
+# focus of this script is testing the FTS3 module.
|
||||
+#
|
||||
+# $Id: fts3aa.test,v 1.1 2007/08/20 17:38:42 shess Exp $
|
||||
+#
|
||||
+
|
||||
+set testdir [file dirname $argv0]
|
||||
+source $testdir/tester.tcl
|
||||
+source $testdir/fts3_common.tcl
|
||||
+set testprefix fts3corrupt6
|
||||
+
|
||||
+# If SQLITE_ENABLE_FTS3 is defined, omit this file.
|
||||
+ifcapable !fts3 {
|
||||
+ finish_test
|
||||
+ return
|
||||
+}
|
||||
+
|
||||
+set ::saved_sqlite_fts3_enable_parentheses $::sqlite_fts3_enable_parentheses
|
||||
+set sqlite_fts3_enable_parentheses 1
|
||||
+sqlite3_fts3_may_be_corrupt 1
|
||||
+database_may_be_corrupt
|
||||
+
|
||||
+do_execsql_test 1.0 {
|
||||
+ BEGIN TRANSACTION;
|
||||
+ CREATE TABLE t_content(col0 INTEGER);
|
||||
+ PRAGMA writable_schema=ON;
|
||||
+ CREATE VIRTUAL TABLE t0 USING fts3(col0 INTEGER PRIMARY KEY,col1 VARCHAR(8),col2 BINARY,col3 BINARY);
|
||||
+ INSERT INTO t0_content VALUES(0,NULL,NULL,NULL,NULL);
|
||||
+ INSERT INTO t0_segdir VALUES(0,0,0,0,'0 42',X'000131030102000103323334050101010200000461616161050101020200000462626262050101030200');
|
||||
+ COMMIT;
|
||||
+}
|
||||
+
|
||||
+do_execsql_test 1.1 {
|
||||
+ SELECT 0+matchinfo(t0,'yxyyxy') FROM t0 WHERE t0 MATCH CAST( x'2b0a312b0a312a312a2a0b5d0a0b0b0a312a0a0b0b0a312a0b310a392a0b0a27312a2a0b5d0a312a0b310a31315d0b310a312a316d2a0b313b15bceaa50a312a0b0a27312a2a0b5d0a312a0b310a312b0b2a310a312a0b2a0b2a0b2e5d0a0bff313336e34a2a312a0b0a3c310b0a0b4b4b0b4b2a4bec40322b2a0b310a0a312a0a0a0a0a0a0a0a0a0b310a312a2a2a0b5d0a0b0b0a312a0b310a312a0b0a4e4541530b310a5df5ced70a0a0a0a0a4f520a0a0a0a0a0a0a312a0b0a4e4541520b310a5d616161610a0a0a0a4f520a0a0a0a0a0a312b0a312a312a0a0a0a0a0a0a004a0b0a310b220a0b0a310a4a22310a0b0a7e6fe0e0e030e0e0e0e0e01176e02000e0e0e0e0e01131320226310a0b0a310a4a22310a0b0a310a766f8b8b4ee0e0300ae0090909090909090909090909090909090909090909090909090909090909090947aaaa540b09090909090909090909090909090909090909090909090909090909090909fae0e0f2f22164e0e0f273e07fefefef7d6dfafafafa6d6d6d6d' AS TEXT);
|
||||
+} {0}
|
||||
+
|
||||
+do_execsql_test 1.2 {
|
||||
+ CREATE VIRTUAL TABLE t1 USING fts3(col0 INTEGER PRIMARY KEY,col1 VARCHAR(8),col2 BINARY,col3 BINARY);
|
||||
+ INSERT INTO t1_content VALUES(0,NULL,NULL,NULL,NULL);
|
||||
+ INSERT INTO t1_segdir VALUES(0,0,0,0,'0 42',X'000131030102000103323334050101010200000461616161050101020200000462626262050101030200');
|
||||
+}
|
||||
+
|
||||
+do_execsql_test 1.3 {
|
||||
+ SELECT 42+matchinfo(t1,'yxyyxy') FROM t1 WHERE t1 MATCH x'2b0a312b0a312a312a2a0b5d0a0b0b0a312a0a0b0b0a312a0b310a392a0b0a27312a2a0b5d0a312a0b310a31315d0b310a312a316d2a0b313b15bceaa50a312a0b0a27312a2a0b5d0a312a0b310a312b0b2a310a312a0b2a0b2a0b2e5d0a0bff313336e34a2a312a0b0a3c310b0a0b4b4b0b4b2a4bec40322b2a0b310a0a312a0a0a0a0a0a0a0a0a0b310a312a2a2a0b5d0a0b0b0a312a0b310a312a0b0a4e4541530b310a5df5ced70a0a0a0a0a4f520a0a0a0a0a0a0a312a0b0a4e4541520b310a5d616161610a0a0a0a4f520a0a0a0a0a0a312b0a312a312a0a0a0a0a0a0a004a0b0a310b220a0b0a310a4a22310a0b0a7e6fe0e0e030e0e0e0e0e01176e02000e0e0e0e0e01131320226310a0b0a310a4a22310a0b0a310a766f8b8b4ee0e0300ae0090909090909090909090909090909090909090909090909090909090909090947aaaa540b09090909090909090909090909090909090909090909090909090909090909fae0e0f2f22164e0e0f273e07fefefef7d6dfafafafa6d6d6d6d';
|
||||
+} {42}
|
||||
+
|
||||
+set sqlite_fts3_enable_parentheses $saved_sqlite_fts3_enable_parentheses
|
||||
+finish_test
|
||||
+
|
||||
+
|
||||
@ -0,0 +1,302 @@
|
||||
https://sqlite.org/src/info/30735432bc33cb95
|
||||
https://sqlite.org/src/info/1bd18ca35bdbf303
|
||||
https://sqlite.org/src/info/49da8bdce17ced91
|
||||
https://sqlite.org/src/info/f25a56c26e28abd4
|
||||
|
||||
--- /ext/fts5/fts5_index.c
|
||||
+++ /ext/fts5/fts5_index.c
|
||||
@@ -2321,11 +2321,11 @@
|
||||
}
|
||||
|
||||
search_success:
|
||||
- pIter->iLeafOffset = iOff + nNew;
|
||||
- if( pIter->iLeafOffset>n || nNew<1 ){
|
||||
+ if( (i64)iOff+nNew>n || nNew<1 ){
|
||||
p->rc = FTS5_CORRUPT;
|
||||
return;
|
||||
}
|
||||
+ pIter->iLeafOffset = iOff + nNew;
|
||||
pIter->iTermLeafOffset = pIter->iLeafOffset;
|
||||
pIter->iTermLeafPgno = pIter->iLeafPgno;
|
||||
|
||||
--- /ext/fts5/test/fts5corrupt3.test
|
||||
+++ /ext/fts5/test/fts5corrupt3.test
|
||||
@@ -10108,6 +10108,221 @@
|
||||
INSERT INTO t1(t1) SELECT x FROM t2;
|
||||
} {1 {database disk image is malformed}}
|
||||
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+do_test 69.0 {
|
||||
+ sqlite3 db {}
|
||||
+ db deserialize [decode_hexdb {
|
||||
+.open --hexdb
|
||||
+| size 32768 pagesize 4096 filename crash-31c462b8b665d0.db
|
||||
+| page 1 offset 0
|
||||
+| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3.
|
||||
+| 16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 08 .....@ ........
|
||||
+| 32: 00 00 00 02 00 00 00 00 00 00 00 00 00 00 00 00 ................
|
||||
+| 96: 00 00 00 00 0d 0f c7 00 07 0d 92 00 0f 8d 0f 36 ...............6
|
||||
+| 112: 0e cb 0e 6b 0e 0e 0d b6 0d 92 00 00 00 00 00 00 ...k............
|
||||
+| 3472: 00 00 22 08 06 17 11 11 01 31 74 61 62 6c 65 74 .........1tablet
|
||||
+| 3488: 32 74 32 08 43 52 45 41 54 45 20 54 41 42 4c 45 2t2.CREATE TABLE
|
||||
+| 3504: 20 74 32 28 78 29 56 07 06 17 1f 1f 01 7d 74 61 t2(x)V.......ta
|
||||
+| 3520: 62 6c 65 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63 blet1_configt1_c
|
||||
+| 3536: 6f 6e 66 69 67 07 43 52 45 41 54 45 20 54 41 42 onfig.CREATE TAB
|
||||
+| 3552: 4c 45 20 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b LE 't1_config'(k
|
||||
+| 3568: 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 PRIMARY KEY, v)
|
||||
+| 3584: 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44 5b 06 WITHOUT ROWID[.
|
||||
+| 3600: 07 17 21 21 01 81 01 74 61 62 6c 65 74 31 5f 64 ..!!...tablet1_d
|
||||
+| 3616: 6f 63 73 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 ocsizet1_docsize
|
||||
+| 3632: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 .CREATE TABLE 't
|
||||
+| 3648: 31 5f 64 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 1_docsize'(id IN
|
||||
+| 3664: 54 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45 TEGER PRIMARY KE
|
||||
+| 3680: 59 2c 20 73 7a 20 42 4c 4f 42 29 5e 05 07 17 21 Y, sz BLOB)^...!
|
||||
+| 3696: 21 01 81 07 74 61 62 6c 65 74 31 5f 63 6f 6e 74 !...tablet1_cont
|
||||
+| 3712: 65 6e 74 74 31 5f 63 6f 6e 74 65 6e 74 05 43 52 entt1_content.CR
|
||||
+| 3728: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 63 EATE TABLE 't1_c
|
||||
+| 3744: 6f 6e 74 65 6e 74 27 28 69 64 20 49 4e 54 45 47 ontent'(id INTEG
|
||||
+| 3760: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 ER PRIMARY KEY,
|
||||
+| 3776: 63 39 2c 20 63 31 2c 20 63 32 29 69 04 07 17 19 c9, c1, c2)i....
|
||||
+| 3792: 19 01 81 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 ...-tablet1_idxt
|
||||
+| 3808: 31 5f 69 64 78 04 43 52 45 41 54 45 20 54 41 42 1_idx.CREATE TAB
|
||||
+| 3824: 4c 45 20 27 74 31 5f 69 64 78 27 28 73 65 67 69 LE 't1_idx'(segi
|
||||
+| 3840: 64 2c 20 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50 d, term, pgno, P
|
||||
+| 3856: 52 49 4d 41 52 59 20 4b 45 59 28 73 65 67 69 64 RIMARY KEY(segid
|
||||
+| 3872: 2c 20 74 65 72 6d 29 29 20 57 49 54 48 4f 55 54 , term)) WITHOUT
|
||||
+| 3888: 20 52 4f 57 49 44 55 03 07 17 1b 1b 01 81 01 74 ROWIDU........t
|
||||
+| 3904: 61 62 6c 65 74 31 5f 64 61 74 61 74 31 5f 64 61 ablet1_datat1_da
|
||||
+| 3920: 74 61 03 43 52 45 41 54 45 20 54 41 42 4c 45 20 ta.CREATE TABLE
|
||||
+| 3936: 27 74 31 5f 64 61 74 61 27 28 69 64 20 49 4e 54 't1_data'(id INT
|
||||
+| 3952: 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 EGER PRIMARY KEY
|
||||
+| 3968: 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42 29 38 02 06 , block BLOB)8..
|
||||
+| 3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52 ...._tablet1t1CR
|
||||
+| 4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 EATE VIRTUAL TAB
|
||||
+| 4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 LE t1 USING fts5
|
||||
+| 4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00 (a,b,c).........
|
||||
+| page 3 offset 8192
|
||||
+| 0: 0d 00 00 00 03 0c 94 00 0f e6 0f ef 0c 94 00 00 ................
|
||||
+| 3216: 00 00 00 00 86 4a 84 80 80 80 80 01 04 00 8d 18 .....J..........
|
||||
+| 3232: 00 00 03 2b 02 30 30 01 02 06 01 02 06 01 02 06 ...+.00.........
|
||||
+| 3248: 1f 02 03 01 02 03 01 02 03 01 08 32 30 31 36 30 ...........20160
|
||||
+| 3264: 36 30 39 01 02 07 01 02 07 01 02 07 01 01 34 01 609...........4.
|
||||
+| 3280: 02 05 01 02 05 01 02 05 01 01 35 01 02 04 01 02 ..........5.....
|
||||
+| 3296: 04 01 02 04 02 07 30 30 30 30 30 30 30 1c 02 04 ......0000000...
|
||||
+| 3312: 01 02 04 01 02 04 01 06 62 69 6e 61 72 79 03 06 ........binary..
|
||||
+| 3328: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 ................
|
||||
+| 3344: 02 02 03 06 00 02 02 03 06 01 02 02 03 06 01 02 ................
|
||||
+| 3360: 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 02 ................
|
||||
+| 3376: 03 06 01 02 02 03 06 01 02 02 01 08 63 6f 6d 70 ............comp
|
||||
+| 3392: 69 6c 65 72 01 02 02 01 02 02 01 02 02 01 06 64 iler...........d
|
||||
+| 3408: 62 73 74 61 74 07 02 03 01 02 03 01 02 03 02 04 bstat...........
|
||||
+| 3424: 65 62 75 67 04 02 02 01 02 02 01 02 02 01 06 65 ebug...........e
|
||||
+| 3440: 6e 61 62 6c 65 07 02 02 01 02 02 01 02 02 01 02 nable...........
|
||||
+| 3456: 02 01 02 02 01 02 02 01 02 02 01 02 02 01 02 02 ................
|
||||
+| 3472: 01 02 02 01 02 02 01 02 02 01 02 02 01 02 02 01 ................
|
||||
+| 3488: 01 02 01 02 02 01 02 02 01 02 02 01 02 02 01 02 ................
|
||||
+| 3504: 02 01 02 02 02 08 78 74 65 6e 73 69 6f 6e 1f 02 ......xtension..
|
||||
+| 3520: 04 01 02 04 01 02 04 01 04 66 74 73 34 1a 02 03 .........fts4...
|
||||
+| 3536: 01 02 03 01 02 03 04 01 35 0d 02 03 01 02 03 01 ........5.......
|
||||
+| 3552: 02 03 01 03 67 63 63 01 aa 03 01 02 03 01 02 03 ....gcc.........
|
||||
+| 3568: 02 06 65 6f 70 6f 6c 79 10 02 03 02 02 03 01 02 ..eopoly........
|
||||
+| 3584: 03 01 05 6a 73 6f 6e 31 13 02 03 01 02 03 01 02 ...json1........
|
||||
+| 3600: 03 01 04 6c 6f 61 64 1f 02 03 01 02 03 01 02 03 ...load.........
|
||||
+| 3616: 01 03 6d 61 78 1c 02 02 01 02 02 01 02 02 02 05 ..max...........
|
||||
+| 3632: 65 6d 6f 72 79 1c 02 03 01 02 03 01 02 03 04 04 emory...........
|
||||
+| 3648: 73 79 73 35 16 02 03 01 02 03 01 02 03 01 06 6e sys5...........n
|
||||
+| 3664: 6f 63 61 73 65 02 06 01 02 02 03 06 01 02 02 03 ocase...........
|
||||
+| 3680: 06 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 ................
|
||||
+| 3696: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 ................
|
||||
+| 3712: 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 ................
|
||||
+| 3728: 02 01 04 6f 6d 69 74 1f 02 02 01 02 02 01 02 01 ...omit.........
|
||||
+| 3744: ff ff ff ff ff ff ff ff f0 00 00 00 00 00 01 02 ................
|
||||
+| 3760: 58 81 96 4d 01 06 01 02 02 03 06 01 02 02 03 06 X..M............
|
||||
+| 3776: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 ................
|
||||
+| 3792: 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 ................
|
||||
+| 3808: 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 02 ................
|
||||
+| 3824: 01 0a 74 68 72 65 61 64 73 61 66 65 22 02 02 01 ..threadsafe....
|
||||
+| 3840: 02 02 01 02 02 01 04 76 74 61 62 07 02 04 01 02 .......vtab.....
|
||||
+| 3856: 04 01 02 04 01 01 78 01 06 01 01 02 01 06 01 01 ......x.........
|
||||
+| 3872: 02 01 06 01 1e 02 01 06 01 01 02 01 06 01 01 02 ................
|
||||
+| 3888: 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01 ................
|
||||
+| 3904: 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 ................
|
||||
+| 3920: 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01 ................
|
||||
+| 3936: 00 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01 ................
|
||||
+| 3952: 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02 ................
|
||||
+| 3968: 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01 ................
|
||||
+| 3984: 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 ................
|
||||
+| 4000: 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01 ................
|
||||
+| 4016: 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01 ................
|
||||
+| 4032: 02 01 06 01 01 02 01 06 01 01 02 04 15 13 0c 0c ................
|
||||
+| 4048: 12 44 13 11 0f 47 13 0f 0b 0e 11 10 0f 0e 10 0f .D...G..........
|
||||
+| 4064: 44 0f 10 40 15 0f 07 01 03 00 14 24 5a 24 24 0f D..@.......$Z$$.
|
||||
+| 4080: 0a 03 00 24 00 00 00 00 01 01 01 00 01 01 01 01 ...$............
|
||||
+| page 4 offset 12288
|
||||
+| 0: 0a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
|
||||
+| 4080: 00 00 00 00 00 00 00 00 00 00 05 04 09 0c 01 02 ................
|
||||
+| page 5 offset 16384
|
||||
+| 0: 0d 00 00 00 24 0c 0a 00 0f d8 0f af 0f 86 0f 74 ....$..........t
|
||||
+| 16: 0f 61 0f 4e 0f 2f 0f 0f 0e ef 0e d7 0e be 0e a5 .a.N./..........
|
||||
+| 32: 0e 8d 0e 74 0e 5b 0e 40 0e 24 0e 08 0d ef 0d d5 ...t.[.@.$......
|
||||
+| 48: 0d bb 0d a0 0d 84 0d 68 0d 4f 0d 00 00 00 00 00 .......h.O......
|
||||
+| 3072: 00 00 00 00 00 00 00 00 00 00 18 24 05 00 25 0f ...........$..%.
|
||||
+| 3088: 19 54 48 52 45 41 44 53 41 46 45 3d 30 58 42 49 .THREADSAFE=0XBI
|
||||
+| 3104: 4e 41 52 59 18 23 05 00 25 0f 19 54 48 52 45 41 NARY.#..%..THREA
|
||||
+| 3120: 44 53 41 46 45 3d 30 58 4e 4f 43 41 53 45 17 22 DSAFE=0XNOCASE..
|
||||
+| 3136: 05 00 25 0f 17 54 48 52 45 41 44 53 41 46 45 3d ..%..THREADSAFE=
|
||||
+| 3152: 30 58 52 54 52 49 4d 1f 21 05 00 33 0f 19 4f 4d 0XRTRIM.!..3..OM
|
||||
+| 3168: 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 49 4f IT LOAD EXTENSIO
|
||||
+| 3184: 4e 58 42 49 4e 41 52 59 1f 20 05 00 33 d3 19 4f NXBINARY. ..3..O
|
||||
+| 3200: 4d 49 54 28 2c 4f 41 44 b2 04 55 85 44 54 e5 34 MIT(,OAD..U.DT.4
|
||||
+| 3216: 94 f4 e5 84 e4 f4 34 15 34 51 e1 f0 50 03 30 f1 ......4.4Q..P.0.
|
||||
+| 3232: 74 f4 d4 95 42 04 c4 f4 14 42 04 55 85 44 54 e5 t...B....B.U.DT.
|
||||
+| 3248: 34 94 f4 e5 85 25 45 24 94 d1 f1 e0 50 03 30 f1 4....%E$....P.0.
|
||||
+| 3264: 94 d4 15 82 04 d4 54 d4 f5 25 93 d3 53 03 03 03 ......T..%..S...
|
||||
+| 3280: 03 03 03 05 84 24 94 e4 15 25 91 f1 d0 50 03 30 .....$...%...P.0
|
||||
+| 3296: f1 94 d4 15 82 04 d4 54 d4 f5 25 93 d3 53 03 03 .......T..%..S..
|
||||
+| 3312: 03 03 03 03 05 84 e4 f4 34 15 34 51 e1 c0 50 03 ........4.4Q..P.
|
||||
+| 3328: 30 f1 74 d4 15 82 04 d4 54 d4 f5 25 93 d3 53 03 0.t.....T..%..S.
|
||||
+| 3344: 03 03 03 03 03 05 85 25 45 24 94 d1 81 b0 50 02 .......%E$....P.
|
||||
+| 3360: 50 f1 94 54 e4 14 24 c4 52 05 25 45 24 54 55 84 P..T..$.R.%E$TU.
|
||||
+| 3376: 24 94 e4 15 25 91 81 a0 50 02 50 f1 94 54 e4 14 $...%...P.P..T..
|
||||
+| 3392: 24 c4 52 05 25 45 24 54 55 84 e4 f4 34 15 34 51 $.R.%E$TU...4.4Q
|
||||
+| 3408: 71 90 50 02 50 f1 74 54 e4 14 24 c4 52 05 25 45 q.P.P.tT..$.R.%E
|
||||
+| 3424: 24 54 55 85 25 45 24 94 d1 a1 80 50 02 90 f1 94 $TU.%E$....P....
|
||||
+| 3440: 54 e4 14 24 c4 52 04 d4 54 d5 35 95 33 55 84 24 T..$.R..T.5.3U.$
|
||||
+| 3456: 94 e4 15 25 91 a1 70 50 02 90 f1 94 54 e4 14 24 ...%..pP....T..$
|
||||
+| 3472: c4 52 04 d4 54 d5 35 95 33 55 84 e4 f4 34 15 34 .R..T.5.3U...4.4
|
||||
+| 3488: 51 91 60 50 02 90 f1 74 54 e4 14 24 c4 52 04 d4 Q.`P...tT..$.R..
|
||||
+| 3504: 54 d5 35 95 33 55 85 25 45 24 94 d1 81 50 50 02 T.5.3U.%E$...PP.
|
||||
+| 3520: 50 f1 94 54 e4 14 24 c4 52 04 a5 34 f4 e3 15 84 P..T..$.R..4....
|
||||
+| 3536: 24 94 e4 15 25 91 81 40 50 02 50 f1 94 54 e4 14 $...%..@P.P..T..
|
||||
+| 3552: 24 c4 52 04 a5 34 f4 e3 15 84 e4 f4 34 15 34 51 $.R..4......4.4Q
|
||||
+| 3568: 71 30 50 02 4f f1 74 54 e4 14 24 c4 52 04 a5 34 q0P.O.tT..$.R..4
|
||||
+| 3584: f4 e3 15 85 25 45 24 94 d1 a1 20 50 02 90 f1 94 ....%E$... P....
|
||||
+| 3600: 54 e4 14 24 c4 52 04 74 54 f5 04 f4 c5 95 84 24 T..$.R.tT......$
|
||||
+| 3616: 94 e4 15 25 91 a1 10 50 02 90 f1 94 54 e4 14 24 ...%...P....T..$
|
||||
+| 3632: c4 52 04 74 54 f5 04 f4 c5 95 84 e4 f4 34 15 34 .R.tT........4.4
|
||||
+| 3648: 51 91 00 50 02 90 f1 74 54 e4 14 24 c4 51 f4 74 Q..P...tT..$.Q.t
|
||||
+| 3664: 54 f5 04 f4 c5 95 85 25 45 24 94 d1 70 f0 50 02 T......%E$..p.P.
|
||||
+| 3680: 30 f1 94 54 e4 14 24 c5 20 46 54 53 35 58 42 49 0..T..$. FTS5XBI
|
||||
+| 3696: 4e 41 52 59 17 0e 05 00 23 0f 19 45 4e 41 42 4c NARY....#..ENABL
|
||||
+| 3712: 45 20 46 54 53 35 58 4f 4f 43 41 53 45 16 0d 05 E FTS5XOOCASE...
|
||||
+| 3728: 00 23 0f 17 45 4e 41 42 4c 45 20 46 54 53 35 58 .#..ENABLE FTS5X
|
||||
+| 3744: 52 54 52 49 4d 17 0c 05 00 23 0f 19 45 4e 41 42 RTRIM....#..ENAB
|
||||
+| 3760: 4c 45 20 46 54 53 34 58 42 49 4e 41 52 59 97 0b LE FTS4XBINARY..
|
||||
+| 3776: 05 00 23 0f 19 45 4e 41 42 4c 45 20 46 54 53 34 ..#..ENABLE FTS4
|
||||
+| 3792: 58 4e 4f 43 41 53 45 16 0a 05 00 23 0f 17 45 4e XNOCASE....#..EN
|
||||
+| 3808: 41 42 4c 45 20 46 54 53 34 58 52 54 52 49 4d 1e ABLE FTS4XRTRIM.
|
||||
+| 3824: 09 05 00 3e 5f 19 45 4e 41 42 4c 45 20 44 42 53 ...>_.ENABLE DBS
|
||||
+| 3840: 44 41 54 20 56 54 41 42 58 42 49 4e 41 52 59 1e DAT VTABXBINARY.
|
||||
+| 3856: 08 05 00 31 0f 19 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS
|
||||
+| 3872: 54 41 54 20 56 54 41 42 58 4e 4f 43 4d e3 45 1d TAT VTABXNOCM.E.
|
||||
+| 3888: 07 05 00 31 0f 17 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS
|
||||
+| 3904: 54 41 54 20 56 54 41 42 58 52 54 52 49 4d 11 06 TAT VTABXRTRIM..
|
||||
+| 3920: 05 00 17 0f 19 44 45 42 55 47 58 42 49 4e 41 52 .....DEBUGXBINAR
|
||||
+| 3936: 59 11 05 05 00 17 0f 19 44 45 42 55 47 58 4e 4f Y.......DEBUGXNO
|
||||
+| 3952: 43 41 53 45 10 02 02 50 08 5f 17 44 45 42 55 47 CASE...P._.DEBUG
|
||||
+| 3968: 58 52 54 52 49 4d 27 03 05 00 44 0f 19 43 4f 4d XRTRIM'...D..COM
|
||||
+| 3984: 50 49 4c 45 52 3d 67 63 63 2d 35 2e 34 2e 30 20 PILER=gcc-5.4.0
|
||||
+| 4000: 32 30 31 36 30 36 30 39 58 42 49 4e 41 52 59 27 20160609XBINARY'
|
||||
+| 4016: 02 05 00 43 0f 19 43 4f 4d 50 49 4c 45 52 3d 67 ...C..COMPILER=g
|
||||
+| 4032: 63 63 2d 35 2e 34 2e 30 20 32 30 31 36 30 36 30 cc-5.4.0 2016060
|
||||
+| 4048: 39 58 4e 4f 43 41 53 45 26 01 05 00 43 c9 17 43 9XNOCASE&...C..C
|
||||
+| 4064: 4f 4d 50 49 4c 47 02 3d 67 63 63 2d 35 2e 34 2e OMPILG.=gcc-5.4.
|
||||
+| 4080: 30 20 32 30 31 36 30 36 30 39 58 52 54 52 49 4d 0 20160609XRTRIM
|
||||
+| page 6 offset 20480
|
||||
+| 0: 0d 00 00 00 24 0e e0 00 0f f8 0f f0 0f e8 0f e0 ....$...........
|
||||
+| 16: 0f d8 0f d0 0f c8 0f c0 0f b8 0f b0 0f a8 0f a0 ................
|
||||
+| 32: 0f 98 0f 90 0f 88 0f 80 0f 78 0f 70 0f 68 0f 60 .........x.p.h.`
|
||||
+| 48: 0f 58 0f 50 0f 48 0f 40 0f 38 00 00 00 00 00 00 .X.P.H.@.8......
|
||||
+| 3808: 06 24 03 00 12 02 01 01 06 23 03 00 12 02 01 01 .$.......#......
|
||||
+| 3824: 06 22 03 00 12 02 01 01 06 21 03 00 12 03 01 01 .........!......
|
||||
+| 3840: 06 20 03 00 12 03 01 01 06 1f 03 00 12 03 01 01 . ..............
|
||||
+| 3856: 06 1e 03 00 12 03 01 01 06 1d 03 00 12 03 01 01 ................
|
||||
+| 3872: 06 1c 03 00 12 03 01 01 06 1b 03 00 12 02 01 01 ................
|
||||
+| 3888: 06 1a 03 00 12 02 01 01 06 19 03 00 12 02 01 01 ................
|
||||
+| 3904: 06 18 03 00 12 02 01 01 06 17 03 00 12 02 01 01 ................
|
||||
+| 3920: 06 16 03 00 12 02 01 01 06 15 03 00 12 02 01 01 ................
|
||||
+| 3936: 06 14 03 00 12 02 01 01 06 13 03 00 12 02 01 01 ................
|
||||
+| 3952: 06 12 03 00 12 02 01 01 06 11 03 00 12 02 01 01 ................
|
||||
+| 3968: 06 10 03 00 12 02 01 01 06 1f 03 00 12 02 01 01 ................
|
||||
+| 3984: 06 0e 03 00 12 02 01 01 06 0d 03 00 12 02 01 01 ................
|
||||
+| 4000: 06 0c 03 00 12 02 01 01 06 0b 03 00 12 02 01 01 ................
|
||||
+| 4016: 06 0a 03 00 12 02 01 01 06 09 03 00 12 03 01 01 ................
|
||||
+| 4032: 06 08 03 00 12 03 01 01 06 07 03 00 12 03 01 01 ................
|
||||
+| 4048: 06 06 03 00 12 01 01 01 06 05 03 00 12 01 01 01 ................
|
||||
+| 4064: 06 04 03 00 12 01 01 01 06 03 03 00 12 06 01 01 ................
|
||||
+| 4080: 06 02 03 00 12 06 01 01 06 01 03 00 12 06 01 01 ................
|
||||
+| page 7 offset 24576
|
||||
+| 0: 0a 00 00 00 01 0f f4 00 0f f4 00 00 00 00 00 00 ................
|
||||
+| 4080: 00 00 00 00 0b 03 1b 01 76 65 72 73 69 6f 6e 04 ........version.
|
||||
+| page 8 offset 28672
|
||||
+| 0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
|
||||
+| 4048: 00 00 00 00 00 00 11 03 02 2b 69 6e 74 65 67 72 .........+integr
|
||||
+| 4064: 69 74 79 2d 63 68 65 63 6b 09 00 00 00 00 00 00 ity-check.......
|
||||
+| end crash-31c462b8b665d0.db
|
||||
+}]} {}
|
||||
+
|
||||
+
|
||||
+do_catchsql_test 69.2 {
|
||||
+ SELECT * FROM t1 WHERE a MATCH 'fx*'
|
||||
+} {1 {database disk image is malformed}}
|
||||
|
||||
sqlite3_fts5_may_be_corrupt 0
|
||||
finish_test
|
||||
--- /src/btree.c
|
||||
+++ /src/btree.c
|
||||
@@ -3886,7 +3886,7 @@
|
||||
Pgno nFree = get4byte(&pBt->pPage1->aData[36]);
|
||||
Pgno nFin = finalDbSize(pBt, nOrig, nFree);
|
||||
|
||||
- if( nOrig<nFin ){
|
||||
+ if( nOrig<nFin || nFree>=nOrig ){
|
||||
rc = SQLITE_CORRUPT_BKPT;
|
||||
}else if( nFree>0 ){
|
||||
rc = saveAllCursors(pBt, 0, 0);
|
||||
@@ -8772,7 +8772,11 @@
|
||||
assert( pPage->intKey || pX->nKey>=0 );
|
||||
assert( pPage->leaf || !pPage->intKey );
|
||||
if( pPage->nFree<0 ){
|
||||
- rc = btreeComputeFreeSpace(pPage);
|
||||
+ if( pCur->eState>CURSOR_INVALID ){
|
||||
+ rc = SQLITE_CORRUPT_BKPT;
|
||||
+ }else{
|
||||
+ rc = btreeComputeFreeSpace(pPage);
|
||||
+ }
|
||||
if( rc ) return rc;
|
||||
}
|
||||
|
||||
--- /test/corruptL.test
|
||||
+++ /test/corruptL.test
|
||||
@@ -1266,5 +1266,30 @@
|
||||
do_execsql_test 15.1 {
|
||||
UPDATE c1 SET c= NOT EXISTS(SELECT 1 FROM c1 ORDER BY (SELECT 1 FROM c1 ORDER BY a)) +10 WHERE d BETWEEN 4 AND 7;
|
||||
} {}
|
||||
+
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+do_execsql_test 16.0 {
|
||||
+ CREATE TABLE t1(w, x, y, z, UNIQUE(w, x), UNIQUE(y, z));
|
||||
+ INSERT INTO t1 VALUES(1, 1, 1, 1);
|
||||
+
|
||||
+ CREATE TABLE t1idx(x, y, i INTEGER, PRIMARY KEY(x)) WITHOUT ROWID;
|
||||
+ INSERT INTO t1idx VALUES(10, NULL, 5);
|
||||
+
|
||||
+ PRAGMA writable_schema = 1;
|
||||
+ UPDATE sqlite_master SET rootpage = (
|
||||
+ SELECT rootpage FROM sqlite_master WHERE name='t1idx'
|
||||
+ ) WHERE type = 'index';
|
||||
+}
|
||||
+
|
||||
+db close
|
||||
+sqlite3 db test.db
|
||||
+
|
||||
+do_catchsql_test 16.1 {
|
||||
+ PRAGMA writable_schema = ON;
|
||||
+ INSERT INTO t1(rowid, w, x, y, z) VALUES(5, 10, 11, 10, NULL);
|
||||
+} {1 {database disk image is malformed}}
|
||||
+
|
||||
finish_test
|
||||
|
||||
+
|
||||
@ -0,0 +1,220 @@
|
||||
https://sqlite.org/src/info/14eed318aa9e6e16
|
||||
https://sqlite.org/src/info/9679c0c61131f0e9
|
||||
https://sqlite.org/src/info/28515bbbae4fbc26
|
||||
https://sqlite.org/src/info/892e9191dc8f8056
|
||||
https://sqlite.org/src/info/270ac1a0f232d755
|
||||
|
||||
--- /ext/fts3/fts3.c
|
||||
+++ /ext/fts3/fts3.c
|
||||
@@ -5831,7 +5831,8 @@
|
||||
fts3EvalRestart(pCsr, pRoot, &rc);
|
||||
do {
|
||||
fts3EvalNextRow(pCsr, pRoot, &rc);
|
||||
- assert( pRoot->bEof==0 );
|
||||
+ assert_fts3_nc( pRoot->bEof==0 );
|
||||
+ if( pRoot->bEof ) rc = FTS_CORRUPT_VTAB;
|
||||
}while( pRoot->iDocid!=iDocid && rc==SQLITE_OK );
|
||||
}
|
||||
}
|
||||
--- /ext/misc/appendvfs.c
|
||||
+++ /ext/misc/appendvfs.c
|
||||
@@ -439,7 +439,7 @@
|
||||
p = (ApndFile*)pFile;
|
||||
memset(p, 0, sizeof(*p));
|
||||
pSubFile = ORIGFILE(pFile);
|
||||
- p->base.pMethods = &apnd_io_methods;
|
||||
+ pFile->pMethods = &apnd_io_methods;
|
||||
rc = pSubVfs->xOpen(pSubVfs, zName, pSubFile, flags, pOutFlags);
|
||||
if( rc ) goto apnd_open_done;
|
||||
rc = pSubFile->pMethods->xFileSize(pSubFile, &sz);
|
||||
--- /ext/misc/cksumvfs.c
|
||||
+++ /ext/misc/cksumvfs.c
|
||||
@@ -634,7 +634,7 @@
|
||||
p = (CksmFile*)pFile;
|
||||
memset(p, 0, sizeof(*p));
|
||||
pSubFile = ORIGFILE(pFile);
|
||||
- p->base.pMethods = &cksm_io_methods;
|
||||
+ pFile->pMethods = &cksm_io_methods;
|
||||
rc = pSubVfs->xOpen(pSubVfs, zName, pSubFile, flags, pOutFlags);
|
||||
if( rc ) goto cksm_open_done;
|
||||
if( flags & SQLITE_OPEN_WAL ){
|
||||
--- /src/date.c
|
||||
+++ /src/date.c
|
||||
@@ -1112,8 +1112,8 @@
|
||||
case 'm': sqlite3_snprintf(3, &z[j],"%02d",x.M); j+=2; break;
|
||||
case 'M': sqlite3_snprintf(3, &z[j],"%02d",x.m); j+=2; break;
|
||||
case 's': {
|
||||
- sqlite3_snprintf(30,&z[j],"%lld",
|
||||
- (i64)(x.iJD/1000 - 21086676*(i64)10000));
|
||||
+ i64 iS = (i64)(x.iJD/1000 - 21086676*(i64)10000);
|
||||
+ sqlite3Int64ToText(iS, &z[j]);
|
||||
j += sqlite3Strlen30(&z[j]);
|
||||
break;
|
||||
}
|
||||
--- /src/memdb.c
|
||||
+++ /src/memdb.c
|
||||
@@ -339,7 +339,7 @@
|
||||
p->mFlags = SQLITE_DESERIALIZE_RESIZEABLE | SQLITE_DESERIALIZE_FREEONCLOSE;
|
||||
assert( pOutFlags!=0 ); /* True because flags==SQLITE_OPEN_MAIN_DB */
|
||||
*pOutFlags = flags | SQLITE_OPEN_MEMORY;
|
||||
- p->base.pMethods = &memdb_io_methods;
|
||||
+ pFile->pMethods = &memdb_io_methods;
|
||||
p->szMax = sqlite3GlobalConfig.mxMemdbSize;
|
||||
return SQLITE_OK;
|
||||
}
|
||||
--- /src/memjournal.c
|
||||
+++ /src/memjournal.c
|
||||
@@ -366,7 +366,7 @@
|
||||
assert( MEMJOURNAL_DFLT_FILECHUNKSIZE==fileChunkSize(p->nChunkSize) );
|
||||
}
|
||||
|
||||
- p->pMethod = (const sqlite3_io_methods*)&MemJournalMethods;
|
||||
+ pJfd->pMethods = (const sqlite3_io_methods*)&MemJournalMethods;
|
||||
p->nSpill = nSpill;
|
||||
p->flags = flags;
|
||||
p->zJournal = zName;
|
||||
@@ -392,7 +392,7 @@
|
||||
int sqlite3JournalCreate(sqlite3_file *pJfd){
|
||||
int rc = SQLITE_OK;
|
||||
MemJournal *p = (MemJournal*)pJfd;
|
||||
- if( p->pMethod==&MemJournalMethods && (
|
||||
+ if( pJfd->pMethods==&MemJournalMethods && (
|
||||
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
|
||||
p->nSpill>0
|
||||
#else
|
||||
--- /src/os_unix.c
|
||||
+++ /src/os_unix.c
|
||||
@@ -5689,7 +5689,7 @@
|
||||
if( rc!=SQLITE_OK ){
|
||||
if( h>=0 ) robust_close(pNew, h, __LINE__);
|
||||
}else{
|
||||
- pNew->pMethod = pLockingStyle;
|
||||
+ pId->pMethods = pLockingStyle;
|
||||
OpenCounter(+1);
|
||||
verifyDbFile(pNew);
|
||||
}
|
||||
--- /src/os_win.c
|
||||
+++ /src/os_win.c
|
||||
@@ -5266,7 +5266,7 @@
|
||||
}
|
||||
|
||||
sqlite3_free(zTmpname);
|
||||
- pFile->pMethod = pAppData ? pAppData->pMethod : &winIoMethod;
|
||||
+ id->pMethods = pAppData ? pAppData->pMethod : &winIoMethod;
|
||||
pFile->pVfs = pVfs;
|
||||
pFile->h = h;
|
||||
if( isReadonly ){
|
||||
--- /src/sqliteInt.h
|
||||
+++ /src/sqliteInt.h
|
||||
@@ -4437,6 +4437,7 @@
|
||||
int sqlite3FixExprList(DbFixer*, ExprList*);
|
||||
int sqlite3FixTriggerStep(DbFixer*, TriggerStep*);
|
||||
int sqlite3RealSameAsInt(double,sqlite3_int64);
|
||||
+void sqlite3Int64ToText(i64,char*);
|
||||
int sqlite3AtoF(const char *z, double*, int, u8);
|
||||
int sqlite3GetInt32(const char *, int*);
|
||||
int sqlite3Atoi(const char*);
|
||||
--- /src/test_multiplex.c
|
||||
+++ /src/test_multiplex.c
|
||||
@@ -591,9 +591,9 @@
|
||||
|
||||
if( rc==SQLITE_OK ){
|
||||
if( pSubOpen->pMethods->iVersion==1 ){
|
||||
- pMultiplexOpen->base.pMethods = &gMultiplex.sIoMethodsV1;
|
||||
+ pConn->pMethods = &gMultiplex.sIoMethodsV1;
|
||||
}else{
|
||||
- pMultiplexOpen->base.pMethods = &gMultiplex.sIoMethodsV2;
|
||||
+ pConn->pMethods = &gMultiplex.sIoMethodsV2;
|
||||
}
|
||||
}else{
|
||||
multiplexFreeComponents(pGroup);
|
||||
--- /src/util.c
|
||||
+++ /src/util.c
|
||||
@@ -596,6 +596,30 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
+** Render an signed 64-bit integer as text. Store the result in zOut[].
|
||||
+**
|
||||
+** The caller must ensure that zOut[] is at least 21 bytes in size.
|
||||
+*/
|
||||
+void sqlite3Int64ToText(i64 v, char *zOut){
|
||||
+ int i;
|
||||
+ u64 x;
|
||||
+ char zTemp[22];
|
||||
+ if( v<0 ){
|
||||
+ x = (v==SMALLEST_INT64) ? ((u64)1)<<63 : -v;
|
||||
+ }else{
|
||||
+ x = v;
|
||||
+ }
|
||||
+ i = sizeof(zTemp)-2;
|
||||
+ zTemp[sizeof(zTemp)-1] = 0;
|
||||
+ do{
|
||||
+ zTemp[i--] = (x%10) + '0';
|
||||
+ x = x/10;
|
||||
+ }while( x );
|
||||
+ if( v<0 ) zTemp[i--] = '-';
|
||||
+ memcpy(zOut, &zTemp[i+1], sizeof(zTemp)-1-i);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
** Compare the 19-character string zNum against the text representation
|
||||
** value 2^63: 9223372036854775808. Return negative, zero, or positive
|
||||
** if zNum is less than, equal to, or greater than the string.
|
||||
--- /src/vdbemem.c
|
||||
+++ /src/vdbemem.c
|
||||
@@ -104,16 +104,25 @@
|
||||
static void vdbeMemRenderNum(int sz, char *zBuf, Mem *p){
|
||||
StrAccum acc;
|
||||
assert( p->flags & (MEM_Int|MEM_Real|MEM_IntReal) );
|
||||
- sqlite3StrAccumInit(&acc, 0, zBuf, sz, 0);
|
||||
+ assert( sz>22 );
|
||||
if( p->flags & MEM_Int ){
|
||||
- sqlite3_str_appendf(&acc, "%lld", p->u.i);
|
||||
- }else if( p->flags & MEM_IntReal ){
|
||||
- sqlite3_str_appendf(&acc, "%!.15g", (double)p->u.i);
|
||||
+#if GCC_VERSION>=7000000
|
||||
+ /* Work-around for GCC bug
|
||||
+ ** https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96270 */
|
||||
+ i64 x;
|
||||
+ assert( (p->flags&MEM_Int)*2==sizeof(x) );
|
||||
+ memcpy(&x, (char*)&p->u, (p->flags&MEM_Int)*2);
|
||||
+ sqlite3Int64ToText(x, zBuf);
|
||||
+#else
|
||||
+ sqlite3Int64ToText(p->u.i, zBuf);
|
||||
+#endif
|
||||
}else{
|
||||
- sqlite3_str_appendf(&acc, "%!.15g", p->u.r);
|
||||
+ sqlite3StrAccumInit(&acc, 0, zBuf, sz, 0);
|
||||
+ sqlite3_str_appendf(&acc, "%!.15g",
|
||||
+ (p->flags & MEM_IntReal)!=0 ? (double)p->u.i : p->u.r);
|
||||
+ assert( acc.zText==zBuf && acc.mxAlloc<=0 );
|
||||
+ zBuf[acc.nChar] = 0; /* Fast version of sqlite3StrAccumFinish(&acc) */
|
||||
}
|
||||
- assert( acc.zText==zBuf && acc.mxAlloc<=0 );
|
||||
- zBuf[acc.nChar] = 0; /* Fast version of sqlite3StrAccumFinish(&acc) */
|
||||
}
|
||||
|
||||
#ifdef SQLITE_DEBUG
|
||||
--- /test/fts3corrupt4.test
|
||||
+++ /test/fts3corrupt4.test
|
||||
@@ -6282,4 +6282,19 @@
|
||||
|
||||
set sqlite_fts3_enable_parentheses $saved
|
||||
|
||||
+#-------------------------------------------------------------------------
|
||||
+reset_db
|
||||
+do_execsql_test 47.1 {
|
||||
+ CREATE VIRTUAL TABLE t1 USING fts3(a,b,c);
|
||||
+}
|
||||
+do_execsql_test 47.2 {
|
||||
+ INSERT INTO t1_segdir VALUES(0,0,0,0,0,X'000130120106000106000106001f030001030001030000083230313630363039090107000107000107000001340901050001050001050000013509010400010400010400010730303030303030091c0400010400010400000662696e6172793c0301020200030102020003010202000301020200030102020003010202000301020200030102020003010202000301020200030102020003010202000008636f6d70696c657209010200010200010200000664627374617409070300010300010300010465627567090402000102000102000006656e61626c653f07020001020001020001020001020001020001020001020001020001020001020001020001010001020001020001020001020001020001020001020001020001087874656e73696f6e091f0400010400010400000466747334090a0300010300010300030135090d03000103000103000003676363090103000103000103000106656f706f6c790910030001030001030000056a736f6e310913030001030001030000046c6f6164091f030001030001030000036d6178091c02000102000102000105656d6f7279091c03000103000103000304737973350916030001030001030000066e6f636173653c02010202000301020200030102020003010202000301020200030102020003010202000301020200030102020003010202000301020200030102020000046f6d6974091f020001020001020000057274726565091903000103000103000302696d3c01010202000301020200030102020003010202000301020200030102020003010202000301a202000301020200030102020003010202000301020200000a746872656164736166650922020001020001020000047674616209070400010400010400000178b401010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200010101020001010102000101010200');
|
||||
+ INSERT INTO t1_segdir VALUES(0,1,0,0,0,X'0001300425061b000008323031363036303903250700000134032505000001350325040001073030303030303003251a000008636f6d70696c657203250200000664627374617403250a00010465627567032508000006656e61626c650925090504040404040001087874656e73696f6e03251d0000046674733403250d0003013503250f000003676363032503000106656f706f6c790325110000056a736f6e310325130000046c6f616403251c0000036d6178032518000105656d6f7279032519000304737973350325150000046f6d697403251b000005727472656503251700000a7468726561647361666503251e0000047674616333250b00');
|
||||
+}
|
||||
+
|
||||
+do_catchsql_test 47.3 {
|
||||
+ SELECT matchinfo(t1) FROM t1 WHERE t1 MATCH '"json1 enable"';
|
||||
+} {1 {database disk image is malformed}}
|
||||
+
|
||||
+
|
||||
finish_test
|
||||
Binary file not shown.
@ -1,12 +1,7 @@
|
||||
AUX ispc-1.13.0-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65
|
||||
AUX ispc-1.13.0-llvm-10.patch 4670 BLAKE2B 31fa72f49af116e253b45cd1a5750fcc32cb0b9986582b6501326194903d6c56fc8efcc0b86975eb153c725b5310c613012d670c2b6badf0b4da04204d4df38b SHA512 b8c83e8fd290b2c37e1ca5cec158e4aec4c0c5aa291069b0935851bbd8198a3784ee75a6bf38d1c57ee69f6712d10e292af809d1ac38199514cc45c2f1a82994
|
||||
AUX ispc-1.13.0-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b
|
||||
AUX ispc-9999-cmake-gentoo-release.patch 507 BLAKE2B e67be17f40dce55895ce307bd5383ad3f9dc8ec460c7195e23ce344f3a0324c53f9f69b695b6feb70d18da813d5d855d675a00e8dfd3e651aaaebf510de1138b SHA512 bdfd7d3f023ace4a0209201e05b7528e50cff644794bc48b5160d8051c2d70dad6690e509ca69102b08843ebb5fd7a76241954b22a0bb1f3c4714708df405d65
|
||||
AUX ispc-9999-llvm-10.patch 4670 BLAKE2B 31fa72f49af116e253b45cd1a5750fcc32cb0b9986582b6501326194903d6c56fc8efcc0b86975eb153c725b5310c613012d670c2b6badf0b4da04204d4df38b SHA512 b8c83e8fd290b2c37e1ca5cec158e4aec4c0c5aa291069b0935851bbd8198a3784ee75a6bf38d1c57ee69f6712d10e292af809d1ac38199514cc45c2f1a82994
|
||||
AUX ispc-9999-werror.patch 737 BLAKE2B 13ac7eb6f9db4a7379d5acd1f0fa8f44ddca7290329c1231c1b515b374438f5119d9e129c8b5326cfd084956a4ba005549bd30b67a9f64034e0ade8218b8f50c SHA512 254e0e21db59f2b8768d0953c9b0950bb7d860ea9eab7c4d450b3b006382959ab60eb650df9c1ddd4fda7628d5040f7b4779369cf67a99012d5fc2c4b9ef2f7b
|
||||
DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
|
||||
DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
|
||||
EBUILD ispc-1.13.0.ebuild 1117 BLAKE2B b5ebcac60a1c4adf8753ab5db9721ce69217b3368bf2682c95e1db30e6ccc1e3e1f96574005433cc000d483184161ad1c829dbfee1ace996c389ed90570e8de5 SHA512 1b2389d5c1a2d068240b6e76feff615e56179d08a003a2eca4e8bb756aa351dbd64d08f8cb5353da2868b1407b496a25f22dd34149216006f8340f675e8ec610
|
||||
EBUILD ispc-1.9.2.ebuild 1100 BLAKE2B 4bfdcf2d708ddc9e5c9e84f9a8adbab0111ceda9c5a10d7b11b21ef21cb24e56cca857e9cde0d593b0b1c49f1098a1ab0035d239ccc1b268ce1d5832c5979463 SHA512 5595b9a47e860adbfd6c7c9e3fa94f39f68f3d167cf17f3da964e51e8dfff170cf9ef6dcbee8ea82f1813f9a66d3724721ad2b44269e69703842a80d2aa25129
|
||||
EBUILD ispc-9999.ebuild 1117 BLAKE2B b5ebcac60a1c4adf8753ab5db9721ce69217b3368bf2682c95e1db30e6ccc1e3e1f96574005433cc000d483184161ad1c829dbfee1ace996c389ed90570e8de5 SHA512 1b2389d5c1a2d068240b6e76feff615e56179d08a003a2eca4e8bb756aa351dbd64d08f8cb5353da2868b1407b496a25f22dd34149216006f8340f675e8ec610
|
||||
EBUILD ispc-1.13.0.ebuild 1121 BLAKE2B 4b985cce80e289890738782c49bd13aa17d558e822e6eb7195c7c978eb897aa61ac7041585b858973332942025ed12c0f1d3c6321bc4ff66b8d29c8ba489db2c SHA512 8484cc0dd7ff53ece134283d8da415bf8a1f8693adbfb118df09c766b1d686aaeb2cad893bb509c8d7fdc69a4cf18bce2ec0bf0d0071b172e9d13f6e33dd071a
|
||||
EBUILD ispc-9999.ebuild 1145 BLAKE2B 207e69d834776b8e207e1d8ae4b89e8cfdb20cdd13b3b2744f4bd37e97d50abc7906dcaaff155af0a1b90956d0b65e68b9436d246ace995ca2d5a652ed3b5219 SHA512 282b7164ec52954a9ba6e09c8cd1d8cf355c095a6a0e187b7da3651d26da938eeccc6c99cd082e0b2fa5f39770d55edcc960cadf9705c7c5d669598bf1509287
|
||||
MISC metadata.xml 241 BLAKE2B 26c98e9f68d20d2275e5a9aef2d4c1cf74bd65e331e2e4869297a0a4d2b4dccab2e7709ad9ff844b973a97da0ee6eaae4fe17c6446ca06ed63f46804c8af5a82 SHA512 b9bb777e446879d214fab1adfa4b9dca1d3bd11c4084dfa449fb16d1896da27b85e11b869ed76b7b492814a1899b5fb00dbbeded579a0ed00666d4b204ddee14
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13e66268..27ff8364 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
|
||||
|
||||
if(CMAKE_BUILD_TYPE)
|
||||
# Validate build type
|
||||
- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
|
||||
+ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
|
||||
|
||||
string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
|
||||
if (${MATCHED_CONFIG} EQUAL -1)
|
||||
@ -1,106 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13e66268..27ff8364 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -218,7 +218,7 @@ if (WASM_ENABLED)
|
||||
list(APPEND ISPC_TARGETS wasm-i32x4)
|
||||
endif()
|
||||
|
||||
-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
|
||||
+set(CLANG_LIBRARY_LIST clang clang-cpp)
|
||||
set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option)
|
||||
|
||||
if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
|
||||
@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
|
||||
endif()
|
||||
|
||||
# Link against Clang libraries
|
||||
-foreach(clangLib ${CLANG_LIBRARY_LIST})
|
||||
- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
|
||||
- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
|
||||
-endforeach()
|
||||
-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
|
||||
+find_package(Clang REQUIRED)
|
||||
+target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
|
||||
|
||||
# Link against LLVM libraries
|
||||
target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
|
||||
diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
|
||||
index 06fab989..57a7130f 100644
|
||||
--- a/src/llvmutil.cpp
|
||||
+++ b/src/llvmutil.cpp
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <llvm/IR/BasicBlock.h>
|
||||
#include <llvm/IR/Instructions.h>
|
||||
#include <llvm/IR/Module.h>
|
||||
+#include <llvm/Support/raw_ostream.h>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
@@ -1394,7 +1395,7 @@ static void lDumpValue(llvm::Value *v, std::set<llvm::Value *> &done) {
|
||||
return;
|
||||
|
||||
fprintf(stderr, " ");
|
||||
- v->dump();
|
||||
+ v->print(llvm::outs(), false);
|
||||
done.insert(v);
|
||||
|
||||
if (inst == NULL)
|
||||
diff --git a/src/opt.cpp b/src/opt.cpp
|
||||
index d78ac374..a607594a 100644
|
||||
--- a/src/opt.cpp
|
||||
+++ b/src/opt.cpp
|
||||
@@ -142,7 +142,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
|
||||
getenv("FUNC"), strlen(getenv("FUNC")))))) { \
|
||||
fprintf(stderr, "Start of " NAME "\n"); \
|
||||
fprintf(stderr, "---------------\n"); \
|
||||
- bb.dump(); \
|
||||
+ bb.print(llvm::outs(), false); \
|
||||
fprintf(stderr, "---------------\n\n"); \
|
||||
} else /* eat semicolon */
|
||||
|
||||
@@ -152,7 +152,7 @@ static llvm::Pass *CreateFixBooleanSelectPass();
|
||||
getenv("FUNC"), strlen(getenv("FUNC")))))) { \
|
||||
fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \
|
||||
fprintf(stderr, "---------------\n"); \
|
||||
- bb.dump(); \
|
||||
+ bb.print(llvm::outs(), false); \
|
||||
fprintf(stderr, "---------------\n\n"); \
|
||||
} else /* eat semicolon */
|
||||
#else
|
||||
@@ -453,7 +453,7 @@ void Optimize(llvm::Module *module, int optLevel) {
|
||||
#ifndef ISPC_NO_DUMPS
|
||||
if (g->debugPrint) {
|
||||
printf("*** Code going into optimization ***\n");
|
||||
- module->dump();
|
||||
+ module->print(llvm::outs(), nullptr);
|
||||
}
|
||||
#endif
|
||||
DebugPassManager optPM;
|
||||
@@ -666,7 +666,7 @@ void Optimize(llvm::Module *module, int optLevel) {
|
||||
#ifndef ISPC_NO_DUMPS
|
||||
if (g->debugPrint) {
|
||||
printf("\n*****\nFINAL OUTPUT\n*****\n");
|
||||
- module->dump();
|
||||
+ module->print(llvm::outs(), nullptr);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -4256,7 +4256,7 @@ char DebugPass::ID = 0;
|
||||
bool DebugPass::runOnModule(llvm::Module &module) {
|
||||
fprintf(stderr, "%s", str_output);
|
||||
fflush(stderr);
|
||||
- module.dump();
|
||||
+ module.print(llvm::outs(), nullptr);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -4303,7 +4303,7 @@ void DebugPassFile::run(llvm::Module &module, bool init) {
|
||||
snprintf(fname, sizeof(fname), "%s_%d_%s.ll", init ? "init" : "ir", pnum, sanitize(std::string(pname)).c_str());
|
||||
llvm::raw_fd_ostream OS(fname, EC, llvm::sys::fs::F_None);
|
||||
Assert(!EC && "IR dump file creation failed!");
|
||||
- module.print(OS, 0);
|
||||
+ module.print(OS, nullptr);
|
||||
}
|
||||
|
||||
bool DebugPassFile::runOnModule(llvm::Module &module) {
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 13e66268..27ff8364 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -352,7 +352,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
|
||||
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
|
||||
# Compile options
|
||||
if (UNIX)
|
||||
- target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function -Werror ${LLVM_CPP_FLAGS})
|
||||
+ target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-sign-compare -Wno-unused-function ${LLVM_CPP_FLAGS})
|
||||
# Security options
|
||||
target_compile_options(${PROJECT_NAME} PRIVATE -fstack-protector -fdata-sections -ffunction-sections
|
||||
-Wformat -Wformat-security -fpie -fwrapv)
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit toolchain-funcs python-any-r1
|
||||
|
||||
DESCRIPTION="Intel SPMD Program Compiler"
|
||||
HOMEPAGE="https://ispc.github.com/"
|
||||
|
||||
if [[ ${PV} = *9999 ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/ispc/ispc.git"
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="BSD BSD-2 UoI-NCSA"
|
||||
SLOT="0"
|
||||
IUSE="examples"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-devel/clang-3.0:*
|
||||
>=sys-devel/llvm-3.0:*
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
src_compile() {
|
||||
#make all slient commands ("@") verbose and remove -Werror (ispc/ispc#1295)
|
||||
sed -e '/^\t@/s/@//' -e 's/-Werror//' -i Makefile || die
|
||||
emake LDFLAGS="${LDFLAGS}" OPT="${CXXFLAGS}" CXX="$(tc-getCXX)" CPP="$(tc-getCPP)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin ispc
|
||||
dodoc README.rst
|
||||
|
||||
if use examples; then
|
||||
insinto "/usr/share/doc/${PF}/examples"
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
doins -r examples/*
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_ECLASS=cmake
|
||||
inherit cmake-multilib
|
||||
|
||||
DESCRIPTION="Small, safe and fast formatting library"
|
||||
HOMEPAGE="https://github.com/fmtlib/fmt"
|
||||
|
||||
LICENSE="MIT"
|
||||
IUSE="test"
|
||||
SLOT="0/$(ver_cut 1)"
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
|
||||
S="${WORKDIR}/fmt-${PV}"
|
||||
fi
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
|
||||
-DFMT_LIB_DIR="$(get_libdir)"
|
||||
-DFMT_TEST=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
|
||||
DIST libpqxx-7.1.2.tar.gz 693152 BLAKE2B da28d0041fc345eb7774eadf0a886e2a89692ac47d870120991aa97328a6be7d10e8cb2d6deb9e056dc7e05b04fd317d9d0fe4dcf8eab901114b27cd64bf4ff6 SHA512 a4a76c62f6115f5898e4c4bb1c6f095284bdb7ae6a1efa45add9efd422d2a8280d1698caa2469acbb087168208ae0fd8efa36c8735a8ce30e58853e27acd4161
|
||||
EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 33eead22f70496238c3a6f8b090545558ce421d3d1fb4bf64ffbf7baa316f1788c41d54e59144531d7fd018c45c0ece349086601319105c0d8e422a003a2eba1 SHA512 e9c95b7fa3251f5806c402ae61893bb35f8269f14b1f02f3a89d3da408fddd0825d8ed1166ae1780c3fa5031a2e99743cf554ee81869abf2214c977314e1a08f
|
||||
MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
|
||||
EBUILD libpqxx-7.1.2.ebuild 2029 BLAKE2B ae7b19a14ee982b723075335d4508a67bc2897c4d85445b28669874b555775a866d7666cebf04f01be97978846c387b0450b6e83fddb9635e7a30bd29e130b64 SHA512 aa731379a97c82083a93d22e3b9887544ebd902c0ee9d18df214150040694e72d749ae927a8ce7df821735a078163e29d041a90928281eb5ea88d3de35690351
|
||||
MISC metadata.xml 611 BLAKE2B 1960af3cc6dc4e15de110c38b2ca41ca94355054539cf28169de54c952726e96327ce21c82dcc0e439d997fd52a8deb825a9f6bc921e727636a9edb9a3ce176b SHA512 2cc8f173d0f1e390e212741307420722c6a8fa8b5afe60ff6a706d4cec17086c88e84ce5f3ed265a0d8d8699de8fffa83c10fb7e1e700370f1eef1d6c3ba4bd3
|
||||
|
||||
@ -0,0 +1,78 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6..9} )
|
||||
inherit python-any-r1
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
|
||||
DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
|
||||
SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
HOMEPAGE="http://pqxx.org/development/libpqxx/"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="doc static-libs"
|
||||
|
||||
RDEPEND="dev-db/postgresql:="
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
app-text/xmlto
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-shared \
|
||||
$(use_enable doc documentation) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo "The tests need a running PostgreSQL server and an existing database."
|
||||
einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
|
||||
einfo "set PGPORT and PGHOST. Define them at the command line or in:"
|
||||
einfo " ${EROOT}/etc/libpqxx_test_env"
|
||||
|
||||
if [[ -z $PGDATABASE || -z $PGUSER ]] ; then
|
||||
if [[ -f ${EROOT}/etc/libpqxx_test_env ]] ; then
|
||||
source "${EROOT}/etc/libpqxx_test_env"
|
||||
[[ -n $PGDATABASE ]] && export PGDATABASE
|
||||
[[ -n $PGHOST ]] && export PGHOST
|
||||
[[ -n $PGPORT ]] && export PGPORT
|
||||
[[ -n $PGUSER ]] && export PGUSER
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n $PGDATABASE && -n $PGUSER ]] ; then
|
||||
local server_version
|
||||
server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
|
||||
if [[ $? = 0 ]] ; then
|
||||
cd "${S}/test" || die
|
||||
emake check
|
||||
else
|
||||
eerror "Is the server running?"
|
||||
eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
|
||||
eerror " Role: ${PGUSER}"
|
||||
eerror " Database: ${PGDATABASE}"
|
||||
die "Couldn't connect to server."
|
||||
fi
|
||||
else
|
||||
eerror "PGDATABASE and PGUSER must be set to perform tests."
|
||||
eerror "Skipping tests."
|
||||
fi
|
||||
}
|
||||
|
||||
src_install () {
|
||||
use doc && HTML_DOCS=( doc/html/. )
|
||||
default
|
||||
|
||||
if ! use static-libs; then
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
fi
|
||||
}
|
||||
@ -1,15 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>pgsql-bugs@gentoo.org</email>
|
||||
<name>PostgreSQL and Related Package Development</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
libpqxx is the official C++ client API for PostgreSQL. If you are
|
||||
writing software in C++ that needs to access databases managed by
|
||||
Postgres — on just about any platform — then libpqxx is the
|
||||
library you use. Supersedes the now defunct libpq++ (AKA, libpqpp)
|
||||
API.
|
||||
</longdescription>
|
||||
<maintainer type="project">
|
||||
<email>pgsql-bugs@gentoo.org</email>
|
||||
<name>PostgreSQL and Related Package Development</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
libpqxx is the official C++ client API for PostgreSQL. If you are writing
|
||||
software in C++ that needs to access databases managed by Postgres — on just
|
||||
about any platform — then libpqxx is the library you use. Supersedes the now
|
||||
defunct libpq++ (AKA, libpqpp) API.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,224 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal
|
||||
|
||||
DESCRIPTION="XML C parser and toolkit"
|
||||
HOMEPAGE="http://www.xmlsoft.org/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
|
||||
XSTS_NAME_1="xmlschema2002-01-16"
|
||||
XSTS_NAME_2="xmlschema2004-01-14"
|
||||
XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
|
||||
XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
|
||||
XMLCONF_TARBALL="xmlts20080827.tar.gz"
|
||||
|
||||
SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
|
||||
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patchset.tar.xz
|
||||
test? (
|
||||
${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
|
||||
${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
|
||||
http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
|
||||
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
|
||||
lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
readline? ( sys-libs/readline:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
dev-util/gtk-doc-am
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${PV%_rc*}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/xml2-config
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
|
||||
# as they are needed as tarballs in ${S}/xstc instead and not unpacked
|
||||
unpack ${P/_rc/-rc}.tar.gz
|
||||
unpack ${P}-patchset.tar.xz
|
||||
cd "${S}" || die
|
||||
|
||||
if use test; then
|
||||
cp "${DISTDIR}/${XSTS_TARBALL_1}" \
|
||||
"${DISTDIR}/${XSTS_TARBALL_2}" \
|
||||
"${S}"/xstc/ \
|
||||
|| die "Failed to install test tarballs"
|
||||
unpack ${XMLCONF_TARBALL}
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README* TODO* )
|
||||
|
||||
# Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5)
|
||||
eapply "${WORKDIR}"/patches
|
||||
|
||||
# Patches needed for prefix support
|
||||
eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch
|
||||
|
||||
eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
|
||||
|
||||
# Fix build for Windows platform
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=760456
|
||||
# eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch
|
||||
|
||||
# Fix python detection, bug #567066
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=760458
|
||||
eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
|
||||
|
||||
# Fix python tests when building out of tree #565576
|
||||
eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch
|
||||
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
# Avoid final linking arguments for python modules
|
||||
sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
|
||||
# gcc-apple doesn't grok -Wno-array-bounds
|
||||
sed -i -e 's/-Wno-array-bounds//' configure.ac || die
|
||||
fi
|
||||
|
||||
# Please do not remove, as else we get references to PORTAGE_TMPDIR
|
||||
# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
|
||||
# We now need to run eautoreconf at the end to prevent maintainer mode.
|
||||
# elibtoolize
|
||||
# epunt_cxx # if we don't eautoreconf
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# filter seemingly problematic CFLAGS (#26320)
|
||||
filter-flags -fprefetch-loop-arrays -funroll-loops
|
||||
|
||||
# USE zlib support breaks gnome2
|
||||
# (libgnomeprint for instance fails to compile with
|
||||
# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
|
||||
|
||||
# The meaning of the 'debug' USE flag does not apply to the --with-debug
|
||||
# switch (enabling the libxml2 debug module). See bug #100898.
|
||||
|
||||
# --with-mem-debug causes unusual segmentation faults (bug #105120).
|
||||
|
||||
libxml2_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--with-html-subdir=${PF}/html \
|
||||
$(use_with debug run-debug) \
|
||||
$(use_with icu) \
|
||||
$(use_with lzma) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable static-libs static) \
|
||||
$(multilib_native_use_with readline) \
|
||||
$(multilib_native_use_with readline history) \
|
||||
"$@"
|
||||
}
|
||||
|
||||
libxml2_py_configure() {
|
||||
mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
|
||||
run_in_build_dir libxml2_configure \
|
||||
"--with-python=${EPYTHON}" \
|
||||
"--with-python-install-dir=$(python_get_sitedir)"
|
||||
# odd build system, also see bug #582130
|
||||
}
|
||||
|
||||
libxml2_configure --without-python # build python bindings separately
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl libxml2_py_configure
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
if multilib_is_native_abi && use python; then
|
||||
local native_builddir=${BUILD_DIR}
|
||||
python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
ln -s "${S}"/xmlconf || die
|
||||
emake check
|
||||
multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl libxml2_py_emake \
|
||||
DESTDIR="${D}" \
|
||||
docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
|
||||
exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
|
||||
install
|
||||
python_foreach_impl python_optimize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
# on windows, xmllint is installed by interix libxml2 in parent prefix.
|
||||
# this is the version to use. the native winnt version does not support
|
||||
# symlinks, which makes repoman fail if the portage tree is linked in
|
||||
# from another location (which is my default). -- mduft
|
||||
if [[ ${CHOST} == *-winnt* ]]; then
|
||||
rm -rf "${ED}"/usr/bin/xmllint
|
||||
rm -rf "${ED}"/usr/bin/xmlcatalog
|
||||
fi
|
||||
|
||||
rm -rf "${ED}"/usr/share/doc/${P}
|
||||
einstalldocs
|
||||
|
||||
if ! use examples; then
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/examples
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
|
||||
fi
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
|
||||
# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
|
||||
if [[ "${ROOT}" != "/" ]]; then
|
||||
elog "Skipping XML catalog creation for stage building (bug #208887)."
|
||||
else
|
||||
# need an XML catalog, so no-one writes to a non-existent one
|
||||
CATALOG="${EROOT}/etc/xml/catalog"
|
||||
|
||||
# we dont want to clobber an existing catalog though,
|
||||
# only ensure that one is there
|
||||
# <obz@gentoo.org>
|
||||
if [[ ! -e ${CATALOG} ]]; then
|
||||
[[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
|
||||
"${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
|
||||
einfo "Created XML catalog in ${CATALOG}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
libxml2_py_emake() {
|
||||
pushd "${BUILD_DIR}/python" > /dev/null || die
|
||||
emake "$@"
|
||||
popd > /dev/null
|
||||
}
|
||||
@ -1,6 +1,9 @@
|
||||
AUX 1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8
|
||||
AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
|
||||
AUX libxslt-1.1.32-simplify-python.patch 7487 BLAKE2B 401c691c12cd7aaae4eeef26bbd34ba17346a9bd5801d89989504fff34de65a0afe706d4ff7f4ecd29894ffdfd54958d0c3e9da97946ced540b797ff7c9ddd25 SHA512 7aec9780cd092bea6cf4e443e79da44de22abab18a4c2ff9dbfa3ee44beb193029d9f2474a379812efad452412efdfcef1af5658d0843fb946247f2bbbf8cee8
|
||||
AUX libxslt-1.1.34-simplify-python.patch 7174 BLAKE2B dfccd03cd286b1cedcce23234a7e5e1edceee7d41f86235c9ca55d9f9110a8a5f9314c169a26b8cf65b95e26d03e01d21ea7fd437f8aca70356897c048b76710 SHA512 55028c59048eb218dcff6e719dbd8a4af5874ef8562ca2cb6ebafbe72a123785cd5a08d3ae2c7fd8e49030612d1f7cddb5d525b4e3b07d141aebd775a8a19068
|
||||
DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948
|
||||
DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0
|
||||
EBUILD libxslt-1.1.33-r1.ebuild 3445 BLAKE2B 190be63217e3bc52386bfedfd6696a037edb644b37a3afdc77044034db2b4ae164a634ec9e1799669df0a61d2437deac792c7030a1ad05b05a399d895bd44537 SHA512 bfc75fa72d0f2ca0be73f20444b3f686006df081a8a61c0b6b5e30ee5ea8b3073daa9a532cc0b52e3de8ab03153005e8404384409257cae2be4120f63a5a8c71
|
||||
DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
|
||||
EBUILD libxslt-1.1.33-r1.ebuild 3449 BLAKE2B 545a0d2089725378c28e9ac5771342ccdc835708df2d1b5fe9d5397c05697207b72d0d2f28681cf1d763c51680185d7029e93dca3337cf738d41c4e4d9fda93d SHA512 200548df806770a0f87e2efc105432100b97c8cbd2358732c92d3b907caaad8973fa9df24ee99f1ecb2ecd85ca9d8125725c9801f3d09ef7eeb043b4a0d8a1e3
|
||||
EBUILD libxslt-1.1.34.ebuild 3280 BLAKE2B e9df3856fa786c0c3c40da2f1fa888c59e5ce6dd76d30ecd7e53978febcce951a43185e50f65ffd170b26fdc8f73c2e850f72f2c622afd4a5fd307515c404659 SHA512 9c91abbaf47142b05c4c7ae726531e386b4a52d2a37854c6769c9dbc67b54ca2740c30eab9be6e4ba59b5a04043a1fc5f11fe594fa2c6dde23daed47782acbdb
|
||||
MISC metadata.xml 347 BLAKE2B d45671e9d4d34c0f4583b4f3e83a8d780327d3d15286c9bb007a7061a4dbf2259ac860cd038adc6c0637265fa0c31430a1ebdec12f8dc133822b7f6067e9479f SHA512 f1679d429313fbd932a45bbd07178f82100e5e79c871327b3b510829137476a06a252351d1e58384db1e0c0d97ffecf1f4e37ef771e9e5f92219ee86d67b596b
|
||||
|
||||
@ -0,0 +1,239 @@
|
||||
From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <eva@gentoo.org>
|
||||
Date: Wed, 11 Nov 2015 17:49:07 +0100
|
||||
Subject: [PATCH] Simplify python setup in autoconf
|
||||
|
||||
AM_PATH_PYTHON does most of the job without using pkg-config as expected
|
||||
from the rest of the autoconf script.
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 2c417d0..a65a2b7 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -2,9 +2,14 @@ SUBDIRS = \
|
||||
libxslt \
|
||||
libexslt \
|
||||
xsltproc \
|
||||
- doc \
|
||||
- $(PYTHON_SUBDIR) \
|
||||
- tests
|
||||
+ doc
|
||||
+
|
||||
+
|
||||
+if WITH_PYTHON
|
||||
+ SUBDIRS += python
|
||||
+endif
|
||||
+
|
||||
+SUBDIRS += tests
|
||||
|
||||
DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
|
||||
|
||||
@@ -52,7 +57,9 @@ tests: dummy
|
||||
@echo '## Running the regression test suite'
|
||||
@(cd tests ; $(MAKE) -s tests)
|
||||
@(cd xsltproc ; $(MAKE) -s tests)
|
||||
- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi)
|
||||
+if WITH_PYTHON
|
||||
+ @(cd python ; $(MAKE) -s tests)
|
||||
+endif
|
||||
|
||||
valgrind:
|
||||
@echo '## Running the regression tests under Valgrind'
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 325a7be..ee1eabd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -227,90 +227,37 @@ dnl
|
||||
dnl check for python
|
||||
dnl
|
||||
|
||||
-PYTHON_VERSION=
|
||||
-PYTHON_INCLUDES=
|
||||
-PYTHON_SITE_PACKAGES=
|
||||
-pythondir=
|
||||
-AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found])
|
||||
-if test "$with_python" != "no" ; then
|
||||
- if test -x "$with_python/bin/python"
|
||||
- then
|
||||
- echo Found python in $with_python/bin/python
|
||||
- PYTHON="$with_python/bin/python"
|
||||
- else
|
||||
- if test -x "$with_python"
|
||||
- then
|
||||
- echo Found python in $with_python
|
||||
- PYTHON="$with_python"
|
||||
- else
|
||||
- if test -x "$PYTHON"
|
||||
- then
|
||||
- echo Found python in environment PYTHON=$PYTHON
|
||||
- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
||||
- else
|
||||
- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- if test "$PYTHON" != ""
|
||||
- then
|
||||
- echo "PYTHON is pointing at $PYTHON"
|
||||
- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
|
||||
- echo Found Python version $PYTHON_VERSION
|
||||
- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
|
||||
-except: print 0"`
|
||||
- if test "$LIBXML2_PYTHON" = "1"
|
||||
- then
|
||||
- echo Found libxml2-python module
|
||||
- else
|
||||
- echo Warning: Missing libxml2-python
|
||||
- fi
|
||||
- fi
|
||||
- if test "$PYTHON_VERSION" != ""
|
||||
- then
|
||||
- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
|
||||
- -d $with_python/lib/python$PYTHON_VERSION/site-packages
|
||||
- then
|
||||
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
|
||||
- then
|
||||
- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- if test -r /usr/include/python$PYTHON_VERSION/Python.h
|
||||
- then
|
||||
- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- else
|
||||
- echo could not find python$PYTHON_VERSION/Python.h
|
||||
- fi
|
||||
- fi
|
||||
- if test ! -d "$PYTHON_SITE_PACKAGES"
|
||||
- then
|
||||
- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
|
||||
- fi
|
||||
- fi
|
||||
- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
|
||||
- fi
|
||||
- if test "$with_python" != ""
|
||||
- then
|
||||
- pythondir='$(PYTHON_SITE_PACKAGES)'
|
||||
- else
|
||||
- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
|
||||
- fi
|
||||
-fi
|
||||
-AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
|
||||
-if test "$PYTHON_INCLUDES" != ""
|
||||
-then
|
||||
- PYTHON_SUBDIR=python
|
||||
-else
|
||||
- PYTHON_SUBDIR=
|
||||
-fi
|
||||
-AC_SUBST(pythondir)
|
||||
-AC_SUBST(PYTHON_SUBDIR)
|
||||
-AC_SUBST(PYTHON_LIBS)
|
||||
+AC_ARG_WITH([python],
|
||||
+ AS_HELP_STRING([--with-python], [Build Python bindings if found])
|
||||
+)
|
||||
+
|
||||
+AS_IF([test "$with_python" = "yes"],
|
||||
+ [AM_PATH_PYTHON
|
||||
+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
|
||||
+ AS_IF([test "$PYTHON_CONFIG" = "no"],
|
||||
+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
|
||||
+ AS_IF([test "$PYTHON_CONFIG" != "no"],
|
||||
+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
|
||||
+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
|
||||
+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
|
||||
+ [AC_MSG_ERROR([Missing python development files.])])
|
||||
+ AC_MSG_CHECKING([libxml2 module in $PYTHON])
|
||||
+ LIBXML2_PYTHON=`$PYTHON -c "import sys;
|
||||
+try:
|
||||
+ import libxml2
|
||||
+ sys.stdout.write('1')
|
||||
+except:
|
||||
+ sys.stdout.write('0')"`
|
||||
+ AS_IF([test "$LIBXML2_PYTHON" = "1"],
|
||||
+ [AC_MSG_RESULT([yes])],
|
||||
+ [AC_MSG_RESULT([no])
|
||||
+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
|
||||
+ ])
|
||||
+
|
||||
+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
|
||||
+AC_SUBST([PYTHON_CFLAGS])
|
||||
+AC_SUBST([PYTHON_LDFLAGS])
|
||||
+AC_SUBST([PYTHON_LIBS])
|
||||
|
||||
AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)])
|
||||
WITH_CRYPTO=0
|
||||
@@ -634,10 +581,6 @@ AC_SUBST(PYTHONSODV)
|
||||
AC_SUBST(XML_CONFIG)
|
||||
AC_SUBST(LIBXML_LIBS)
|
||||
AC_SUBST(LIBXML_CFLAGS)
|
||||
-AC_SUBST(PYTHON)
|
||||
-AC_SUBST(PYTHON_VERSION)
|
||||
-AC_SUBST(PYTHON_INCLUDES)
|
||||
-AC_SUBST(PYTHON_SITE_PACKAGES)
|
||||
|
||||
XSLT_LIBDIR='-L${libdir}'
|
||||
XSLT_INCLUDEDIR='-I${includedir}'
|
||||
diff --git a/python/Makefile.am b/python/Makefile.am
|
||||
index 17a0d17..1c57a63 100644
|
||||
--- a/python/Makefile.am
|
||||
+++ b/python/Makefile.am
|
||||
@@ -5,7 +5,7 @@ SUBDIRS= . tests
|
||||
|
||||
AM_CFLAGS = $(LIBXML_CFLAGS)
|
||||
|
||||
-DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
|
||||
+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
|
||||
# libxsltclass.txt is generated
|
||||
DOCS=
|
||||
|
||||
@@ -16,10 +16,7 @@ EXTRA_DIST = \
|
||||
libxml_wrap.h \
|
||||
libxslt_wrap.h \
|
||||
libxsl.py \
|
||||
- libxslt-python-api.xml \
|
||||
- $(DOCS)
|
||||
-
|
||||
-libxsltmod_la_LDFLAGS = -module -avoid-version
|
||||
+ libxslt-python-api.xml
|
||||
|
||||
if WITH_PYTHON
|
||||
mylibs = \
|
||||
@@ -28,31 +25,22 @@ mylibs = \
|
||||
|
||||
all-local: libxslt.py
|
||||
|
||||
-python_LTLIBRARIES = libxsltmod.la
|
||||
+python_PYTHON = libxslt.py
|
||||
+pyexec_LTLIBRARIES = libxsltmod.la
|
||||
|
||||
libxsltmod_la_CPPFLAGS = \
|
||||
- -I$(PYTHON_INCLUDES) \
|
||||
-I$(top_srcdir)/libxslt \
|
||||
-I$(top_srcdir) \
|
||||
- -I../libexslt
|
||||
+ -I$(top_srcdir)/libexslt \
|
||||
+ $(PYTHON_CFLAGS)
|
||||
libxsltmod_la_SOURCES = libxslt.c types.c
|
||||
nodist_libxsltmod_la_SOURCES = libxslt-py.c
|
||||
libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
|
||||
+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
|
||||
|
||||
libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
|
||||
cat $(srcdir)/libxsl.py libxsltclass.py > $@
|
||||
|
||||
-install-data-local:
|
||||
- $(MKDIR_P) $(DESTDIR)$(pythondir)
|
||||
- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
|
||||
- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
|
||||
- @(for doc in $(DOCS) ; \
|
||||
- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
|
||||
-
|
||||
-uninstall-local:
|
||||
- rm -f $(DESTDIR)$(pythondir)/libxslt.py
|
||||
- rm -rf $(DESTDIR)$(DOCS_DIR)
|
||||
-
|
||||
GENERATE = generator.py
|
||||
API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
|
||||
GENERATED= libxsltclass.py \
|
||||
@ -0,0 +1,125 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="xml"
|
||||
|
||||
inherit autotools multilib-minimal python-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="XSLT libraries and tools"
|
||||
HOMEPAGE="http://www.xmlsoft.org/"
|
||||
SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
|
||||
IUSE="crypt debug examples python static-libs elibc_Darwin"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/libxml2-2.9.10:2[${MULTILIB_USEDEP}]
|
||||
crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
|
||||
python? (
|
||||
${PYTHON_DEPS}
|
||||
dev-libs/libxml2:2[python,${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/xslt-config
|
||||
)
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/libxslt/xsltconfig.h
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
|
||||
|
||||
# Simplify python setup
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=758095
|
||||
eapply "${FILESDIR}"/${PN}-1.1.34-simplify-python.patch
|
||||
eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
|
||||
|
||||
eautoreconf
|
||||
# If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
|
||||
# and it is propably otherwise too if upstream generated with new
|
||||
# autoconf
|
||||
# epunt_cxx
|
||||
# But Prefix always needs elibtoolize if not eautoreconf'd.
|
||||
# elibtoolize
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
libxslt_configure() {
|
||||
ECONF_SOURCE="${S}" econf \
|
||||
--with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
--with-html-subdir=html \
|
||||
$(use_with crypt crypto) \
|
||||
$(use_with debug) \
|
||||
$(use_with debug mem-debug) \
|
||||
$(use_enable static-libs static) \
|
||||
"$@"
|
||||
}
|
||||
|
||||
libxslt_py_configure() {
|
||||
mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
|
||||
run_in_build_dir libxslt_configure --with-python
|
||||
}
|
||||
|
||||
libxslt_configure --without-python # build python bindings separately
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
python_foreach_impl libxslt_py_configure
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
multilib_is_native_abi && use python && libxslt_foreach_py_emake all
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
default
|
||||
multilib_is_native_abi && use python && libxslt_foreach_py_emake test
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
# "default" does not work here - docs are installed by multilib_src_install_all
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
if multilib_is_native_abi && use python; then
|
||||
libxslt_foreach_py_emake \
|
||||
DESTDIR="${D}" \
|
||||
docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
|
||||
EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
|
||||
install
|
||||
python_foreach_impl python_optimize
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if ! use examples && use python; then
|
||||
rm -r "${ED}"/usr/share/doc/${PF}/python/examples || die
|
||||
fi
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die
|
||||
}
|
||||
|
||||
libxslt_foreach_py_emake() {
|
||||
libxslt_py_emake() {
|
||||
pushd "${BUILD_DIR}/python" > /dev/null || die
|
||||
emake "$@"
|
||||
popd > /dev/null
|
||||
}
|
||||
local native_builddir=${BUILD_DIR}
|
||||
python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@"
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DIST_AUTHOR=LDS
|
||||
DIST_VERSION=1.12
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Find memory cycles in objects"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Scalar-List-Utils
|
||||
"
|
||||
BDEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( virtual/perl-Test-Simple )
|
||||
"
|
||||
@ -1,3 +1,4 @@
|
||||
DIST Devel-Cycle-1.12.tar.gz 7276 BLAKE2B 618e5474cdfcd524da340717e0522880ee7e3e6c3e59438188b7eef836c804b9874084a60e31d14104d36d07df26d9ccea733fb8ab99dd19f6d6d8b4e624fa8b SHA512 e2c83829905449d13c86233ad5bfce28e7b4eca61a8ac1e2f73e3c906a2d8580f66ae84d865ef876c38c2d25f0a5a8adeb05f6e94594274d8a5fa1739842d08d
|
||||
EBUILD Devel-Cycle-1.120.0-r1.ebuild 579 BLAKE2B 262445e162f00b156440477c845b053dd0e0d8542990ef0f95037b7e3bed377a2a928ab74c62bfb17bde8ff74930a29eafe1d673575a50da116cdc9ed7cfb87d SHA512 c2dcff5ba411816d0923ab4ebb4261a32da60b2d958f7f9debcfbaeeb0ca4be8f4512a8e4913567f536607a8adee3cd2fdf4e98fee8d3bac039a8d559b7d5535
|
||||
EBUILD Devel-Cycle-1.120.0.ebuild 591 BLAKE2B 73c37d8166dfabe7c28000e2fc0e37cdd44c06bba50aff4435e054fce13c20854db3ac3d92829eaae5c17266f0cae8f22893210e3746200294628c6db940587d SHA512 26b05cb707622597d53a7d668a71f525af992cf3ae546d87980491935a3878675dadce268ee3556a49ae48c9028235f27c8af5a130518c12036e425a33c17791
|
||||
MISC metadata.xml 394 BLAKE2B 0d2853bee89864942ae6b94f7779bfd4b5fba5dc1fd6780381c3c00a8b4b2a3ecc631e55add51dde9fd7c54571ef8f7a6e4a52f149cd4cfe2024738ba15b1cac SHA512 bb98439368d68502fe828326ec272c8b17537a40fc15ca8cacc190f471925e77bebb9d1276a832f295d783f821cfe744533f91d731e84ebd918c2b957f173737
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DIST_AUTHOR=ETHER
|
||||
DIST_VERSION=0.006022
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="(DEPRECATED) Adding keywords to perl, in perl"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-perl/B-Hooks-EndOfScope-0.50.0
|
||||
>=dev-perl/B-Hooks-OP-Check-0.190.0
|
||||
>=virtual/perl-Scalar-List-Utils-1.110.0
|
||||
dev-perl/Sub-Name
|
||||
"
|
||||
BDEPEND="${RDEPEND}
|
||||
>=dev-perl/ExtUtils-Depends-0.302.0
|
||||
test? (
|
||||
dev-perl/Test-Requires
|
||||
>=virtual/perl-Test-Simple-0.88
|
||||
)
|
||||
"
|
||||
src_compile() {
|
||||
mymake=(
|
||||
"OPTIMIZE=${CFLAGS}"
|
||||
)
|
||||
perl-module_src_compile
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
DIST Devel-Declare-0.006019.tar.gz 45174 BLAKE2B be5cfe04b778af0be7acd8139f82d7abff64f838d857a8227c3ebdf5422803ed25b0c9b8533a3911b07ad10923d5d60f05810480c9f743cbf905b023e35b0193 SHA512 1f3073597c5b27160a9ccd8019c35563982479a8c6303e138d1260706499732aa6c402e835d8b5f06a02ee55294889735500d8a24c2f6f5df9d5ed3111d08fb0
|
||||
DIST Devel-Declare-0.006022.tar.gz 126698 BLAKE2B 4cf20819a93a862ac8c70561e43f78aa70b73fe791084204f881b527957cafdc272462747abab2dc0a047baf244963ef3a8c51f9a8a831aa0edea38425b2c48b SHA512 05b226fdc18a69e0590087d1daeca111af86c3a6865477cb203701e1c8f4a5a03e919f4c6661252ef0ee4204a71667b36caf061374d67a8508dafe4dce155a1e
|
||||
EBUILD Devel-Declare-0.6.19.ebuild 571 BLAKE2B c372315f9b3d935876fb205279c6654e087074b4a3c63201aaa6532284ed7750410abc31fc6714f9d583da56cf35b05f3f20b1ae70890738f4ba942659fc3f22 SHA512 1a58d27216e640f39a4d308bfb8b05429c67ed036ad8c7b4b6969823e48e6b7bd4b13824815914054d9e30d0a2459ed104143e2c3c75b0fd378c52b85ece3338
|
||||
EBUILD Devel-Declare-0.6.22.ebuild 664 BLAKE2B effcb564b4d1b374026830a6284616499337ebe1ae18b941bbbfb9f9124cc810c849b75672f7802d114703863e0935ff51d8695c00e078aa206b4910c0194571 SHA512 97180415beca4f8acdd9d37415e1b5b4996aeb586f4ba900d52af51de5d2df40b29cefefc78d7bed65760673b0b213109ddc637ee025cbdb4503f93bb5ff9912
|
||||
MISC metadata.xml 562 BLAKE2B 956d563faf2f662b29e0143db36f8de8d5a422ee8c6fd4c27a82d019c531b215a7bc427c0d2519037cbecf7ab99939e09560227edb9fb11dcec6e4117a1c3924 SHA512 658395cbce611de27b562515b5f489a0d432e338eb0564b53c5f5e5a09bdecaa1219e0e6d66f01193baf3cb79c89105262ebd16d081f3ddd1459621ec0f217c2
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DIST_AUTHOR=ADAMK
|
||||
DIST_VERSION=1.06
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Pure-OO reimplementation of dumpvar.pl"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=virtual/perl-Scalar-List-Utils-1.180.0
|
||||
"
|
||||
BDEPEND="${RDEPEND}
|
||||
>=virtual/perl-ExtUtils-MakeMaker-6.420.0
|
||||
test? (
|
||||
>=virtual/perl-File-Spec-0.800.0
|
||||
>=virtual/perl-Test-Simple-0.420.0
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.06-no-dot-inc.patch"
|
||||
)
|
||||
PERL_RM_FILES=(
|
||||
t/97_meta.t
|
||||
t/98_pod.t
|
||||
t/99_pmv.t
|
||||
)
|
||||
@ -1,3 +1,5 @@
|
||||
AUX Devel-Dumpvar-1.06-no-dot-inc.patch 471 BLAKE2B 277b87df18982bff3abf44d6508f16760fc2805b09f4d1aaec9f57d09bdc6f8247f8d39ec0f8a4620447ceb2754bc4e0652c5c64f5ef38e88630c420b0c7c812 SHA512 a1484aaa0fc3a845bd7edd1247eba85d3fae3af6fdb59e4c5284ae4e29eb9847d75e6e837617159d9da497705f0a3c5ec095d6afa0a2a9f307ac795c80a9732d
|
||||
DIST Devel-Dumpvar-1.06.tar.gz 28993 BLAKE2B 6f8794e0b1dab5dee65ea918f804b6cafa9448d51b61f5234b0e0abb2f8a270aa8122d25ed8ccc8e05b230b14485a8ac6116ec48bf34f54431bdf84a8b47f227 SHA512 780e9fbb6a0d84b0bd1f2d58435e4bbbe1876e8b7643fcf01ae7c0f32b6d1c507281bcb7cff21872676c72c332c9b1e8626be3adf001ac93564c7a2d6e208ad5
|
||||
EBUILD Devel-Dumpvar-1.60.0-r1.ebuild 557 BLAKE2B a4046b0966659c686818733d8fc65ba3c2485b9870a20f164f4dfd8a66529242687101d3b10c48ff22f83b5f99fac0c16fdc162855ddf45e1d1b4c3af663a513 SHA512 ca33d3a1f6d1466f60b3608d5ff2a1d198e2a96a1cc8cbfb794d209cb91f1a7fce2ff2f934c96ecde86afc82c50fa66e89a3a929356168b1c129709887f6afc0
|
||||
EBUILD Devel-Dumpvar-1.60.0-r2.ebuild 610 BLAKE2B 1e1d00fd71c55ef33aae4100af86345972b158cecc841ef8a1a10d383e4dbd63020e5d661426fbef348360464e77f6542cfb7cfeb71b37efff3b6f3fa49d07bb SHA512 c496da43a6c22f1c5addc44b9cc0720853ce2f771f5a44fc160e38d3fd2dd257657f61f84f45d22387bef0db75c6c4d5351407101085b04775d1ba4841d419da
|
||||
MISC metadata.xml 398 BLAKE2B 311ce57daf60e4d8bde7242163766944512fa4cfbefb3fa5904ed4ba25dcb840f8313c3e48d0599b3f8f41a978bfa1903ca66860a7703b28cd8da92729ffc05b SHA512 dc2bd9a2d8f8004f9dfbcb22d17faa3b90284989f4aed49280d8b3c4b47650a11dba06523843e4ffb30cf53f05e20e708fd6dbdb09e02bc63fc3998ac188c71b
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
From b74c1c9cb2f8cffcb486580a13a24efcd86a984f Mon Sep 17 00:00:00 2001
|
||||
From: Kent Fredric <kentnl@gentoo.org>
|
||||
Date: Thu, 30 Jul 2020 15:30:11 +1200
|
||||
Subject: Include '.' in @INC for perl 5.26+
|
||||
|
||||
---
|
||||
Makefile.PL | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/Makefile.PL b/Makefile.PL
|
||||
index 0c4ca77..3b377c9 100644
|
||||
--- a/Makefile.PL
|
||||
+++ b/Makefile.PL
|
||||
@@ -1,3 +1,4 @@
|
||||
+use lib '.';
|
||||
use inc::Module::Install::DSL 0.91;
|
||||
|
||||
all_from lib/Devel/Dumpvar.pm
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
DIST_AUTHOR=LEONT
|
||||
DIST_VERSION=0.015
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Find the path to your perl"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test minimal"
|
||||
RESTRICT="!test? ( test )"
|
||||
# r: Cwd -> File-Spec
|
||||
# r: File::Basename -> perl
|
||||
# r: File::Spec::Functions -> perl
|
||||
# r: IPC::Open2 -> perl
|
||||
# r: Scalar::Util -> Scalar-List-Utils
|
||||
# r: strict, warnings -> perl
|
||||
RDEPEND="
|
||||
!minimal? (
|
||||
>=dev-perl/ExtUtils-Config-0.7.0
|
||||
)
|
||||
virtual/perl-Carp
|
||||
>=virtual/perl-Exporter-5.570.0
|
||||
virtual/perl-File-Spec
|
||||
virtual/perl-Scalar-List-Utils
|
||||
"
|
||||
# t: Test::More -> Test-Simple
|
||||
BDEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? (
|
||||
virtual/perl-Test-Simple
|
||||
)
|
||||
"
|
||||
@ -1,3 +1,5 @@
|
||||
DIST Devel-FindPerl-0.014.tar.gz 13815 BLAKE2B 6e9562955153416900ea5b1a0a8cc50583297c5a22dd64c69a5e3872d1fdc89fb4287e5244ba6f4f641c404f6c6ab56a1ffb00709c9720fe2cc1563b63da2b46 SHA512 958044c628ce1d004031f753673ec7cd066bb70387b2ecef6e91dcdb050a1aac0b036b7a78c38f731ec22d8fcf109f9421f640b4e008a44ff9de382cff944cea
|
||||
DIST Devel-FindPerl-0.015.tar.gz 13882 BLAKE2B 46f2de2abbb68fa91ed059ada1edf2416cf7970f378cd8d1c8ab1eb3dd75488660e74675662efd477039d305bb16bee77abb841ad95c8c3d09374043855f64ba SHA512 e6165e9db47eaf966a542822d84a14c4de0a7f6f60630f31873cd96eb71bbe2d9e2a52f52726d2ea98349d36fc1772ce850ba2a375c343eee7af5dd9cec74253
|
||||
EBUILD Devel-FindPerl-0.14.0.ebuild 763 BLAKE2B 0a133f1c97f4c99db0d30f27f51a9e3533ca43e3f4f3fdb4bb015b00648f2ca046046d0cd6fe6c975e66e4e46d6d02ddda8962342a007b822c42028525c540b9 SHA512 d433fde2dbe85bfb941abfbf5a5a480d5abbfce9676340b20e32c0cbe6ffae429a89b8ef23306be1dfab7659f49733a133411b09f0cc35ca485a77e55f6032be
|
||||
EBUILD Devel-FindPerl-0.15.0.ebuild 764 BLAKE2B 02e094d5bed48212a196981abefb699caddc3f07fbf822c1c9f68b88ba3efb0581cda596c21eac79d9eae3db2789ab49e1c7423bf0d162b7dcefabf691b10ad1 SHA512 fd612d279e8aced133049e99cb04670978967af61797841ccc441162ca0e222dc75c027ea8852c8f6d697a27e61990f74b4662b83580844d647841d6807b9e1a
|
||||
MISC metadata.xml 400 BLAKE2B c99f29457947c3b32c616ededfc59d25943b9041d98f34e160c06740e41e036ad1e4df3b8378245de603add018a005bfd4ed05bd42e969330307ee1ac27095fd SHA512 b942f4ceccc26e5c28f3312c47994f1da7e2e326fdea97e798cffe5e1760e1d3a0734b711ff6b5a9ed86038051f1c1463d17e93622800eddcd70fef85f7afae3
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,3 +1,3 @@
|
||||
DIST alagitpull-0.0.23.tar.gz 6692 BLAKE2B 63af3da6e98521487fad233dd648d9217d8e89c0d17e49dd771e934c0808a52c0659661ca8104c53c2d0fddf458650458e676e14b2e9c3820f353ab42044a490 SHA512 1620c0e25299f694f29f6e54105a2f336dee90535370a691a6e23a879a68626ef4aa19ae40ecc835553fe3b0272d48e4f5213c1ada054ad20d47034fc20dea3c
|
||||
EBUILD alagitpull-0.0.23.ebuild 542 BLAKE2B 9b283269a66129ce2a7a43ad4d29c1acedc2d459ccc625be557ff3c633f10d35b9f4e586716fa68624a6875f7282bdecac33ecd8f013bbd65f29c65be82f9b0d SHA512 28cdeb242fa09727aa145446dffa1106cb5ae096db384e5c64f2a1a52b988f53c754b98109700eaa03130af5c52ff77cf23d49dfe1535a8eb2f4768669f0d666
|
||||
EBUILD alagitpull-0.0.23.ebuild 549 BLAKE2B 7021fd54f53f4238f9fd11ab7e2c7d93b0f58f518d0f9527df9c5158447aad084f885882408c0659e12f72d3ba2556ad7b8d459d5eb174ae65f03b0070637423 SHA512 83c077f781ad272789807329beec316066a7d49905889c907aed61e4221f200e988cf4c589c254ffad1b5d6695a1926bb2a83c759c58e4bf25c76c9d82ba1db6
|
||||
MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
|
||||
DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
|
||||
EBUILD cliff-3.1.0.ebuild 1037 BLAKE2B 3e5054afe20265c870cb81136075c0090924fbe18efb41b51575dc646ff5def1d1eb5d4cf2a8d2b54d1df275dce247cb3e3dd551b8375afff6c6ed1087a3b59d SHA512 d11683278ebfefb136dbd9f653b95a771aa88adcb6e6c33906916853bb80530cfc7c4ff3187b5c385a001d10dcc2785c018209c578967ca657bfa6ff1e035d5d
|
||||
EBUILD cliff-3.3.0.ebuild 1036 BLAKE2B 25322c9b43a7cd51f6e5958e3d5b7bf7c17bfb4071af2b32cb15574b3817ddf8403e67f246357dfe340e5b8fe7aa00a4918ec0073cdb89879469a0912d859e5c SHA512 d152bd180d524e7413953309b1f5610c7729c4a8945ac58828ee830e483cf71cfbfb9e98fa63fceb2960a3b4016de7487d00e3607d12f1976297b92d67c2320b
|
||||
EBUILD cliff-3.3.0.ebuild 1031 BLAKE2B 98bfd5e1b5ee9e4e9d4eb5573b0782ca5848e196f7287cb1b12a002ee1c91d4c2aaf1f289fec36996bea3100f332a4c081aa568b87385aa23d55f85a54bc1473 SHA512 1768688ae062bbd0248a11f0728ba97808f7fac02db5703d7a6b205b77d6be2e481cebc62f2cf9be0497288aab858cb950aeb6777dc1712e32537e99363569ab
|
||||
MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
|
||||
DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
|
||||
EBUILD elementpath-1.4.5.ebuild 658 BLAKE2B cadfa4c4f08896d681cd9bb8b45000a178f40275553e9b5c1f35961392efc5beddd277e4a8e00715c1c1626b0bd56f9a4acb66bf41315bb64ca083828003ff31 SHA512 8a632a77e3ae31a2bdc2fd1d4b2529ec34b8c6881f351415f5bb0b62e42b11d3d86b99a6a6d6c81525b973767f837dc1cefc8869f1899c6e5a5b535107018fad
|
||||
EBUILD elementpath-1.4.6.ebuild 671 BLAKE2B 57a36557404e2f6d330ade49fd356414822e526e7fc8bf05befde483858499a2d96ce0548429e811977cba07668f3b15899294b8958defdb0a455bb65fb159de SHA512 5952921215f9d7f648953f87fb3f7b529afc464c26af8a1c5454afb160d3b9086afc6ef42e5a834a73d944c7a03440ef3db35a1633d1154ef3a734903c794171
|
||||
EBUILD elementpath-1.4.6.ebuild 664 BLAKE2B d8d91a1dacd4a0b0000700d6fb35101b969b65529903588462b26570135811e40d76692eda1f7db1b367a0acf5fdae5ab94676bc74e3b632ac3d7ea342b1b9b8 SHA512 d96ec68d52c9910d1c9320538d9347c78ded4c6a47a99d5c12cb53fcc5302dad4dcc8de53bf66fb549d0fb0a71aaace2c6e1121cd3a36c409e03b2e5e3c677f7
|
||||
MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
|
||||
DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
|
||||
EBUILD jmespath-0.10.0.ebuild 555 BLAKE2B c0db1ecd3cc6ba759962a6ffd443680109a3181602bdc34563daef327cb44879dc6a67e66dd75759aa89cbf9299376075586632d48600f9d07fe818d081a84a0 SHA512 150a2037dcd6c8a44b60c03223b8c0e209552805813f9a5e3113f8c3fcf9208887b280b9e788de0851110c067b3a31f73240654c25c6a0462fb25e6f3fdeb2a8
|
||||
EBUILD jmespath-0.10.0.ebuild 552 BLAKE2B a7512e4c0a342a3546225fee091da202cf7f109106a5e8cd02830a9941afe1fafa6d113d3ed3ec70428cc36d05d50098fd59dfd8cffe2261a52d615afe511f32 SHA512 500adc15f87d9a40eb1ca3f1d7e2471fc49247ed47558167307ba0d4c738b6e8a41723696609f1b460f190d524a6dc0fd435a476296e35e4e34ae25d5749d6ac
|
||||
EBUILD jmespath-0.9.3-r1.ebuild 458 BLAKE2B dbe074158e147965fe930d33caf088383bf19ee87ec2da5e1df4c6cdbb7feac7df2a6140b0686500a952c3ae6a664670a13d0fcffac509264aedac82a7ad477c SHA512 071efe7e8fee445b4550d86e7f96827fabaf877d5aabdcc274507ef739d34729fe61df5a50485d10f785b0d5add0c9c53b50099fa5e84aa71abea905dec889d8
|
||||
MISC metadata.xml 408 BLAKE2B 9181b68543881bbf8c74385b007f757debcdf6e6dc8c92524b8f86eb9ad893a1fc8a23f49e37f68e568ea99eb52580b2f7c40d997705d54fb526ff3235bb941b SHA512 f7f732a0e399f618d1b5fd59211c2f8fd88883ba7f94b40745d46342b7c9ac61cbf47ee8b0938151eb5d5e1191341796c4e2cb89010560fc7468fb632ecbbbaf
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST kaptan-0.5.12.tar.gz 10539 BLAKE2B 678e1aae6053a7075218a0fd9ef928685e7ce9ebf385c6953275b06d1bbf67d4c8434838a7a8f0b0ec8b02e7bef434d7f68698060bea2b4232cd5ef7fa83f0b3 SHA512 fccf767749e9473947bd7cb493ddb30f7dc1b2e10ce932ca327ae3423bc023fa9c76910ac249269ee546eb9162e4ce151e2ad0b9685d888854a7185c855ae143
|
||||
EBUILD kaptan-0.5.12-r1.ebuild 520 BLAKE2B a7dc13451a18105e8e6ecccef50f248fbfc33bae9d5c6e8c6d182b615fc44b020ca346e707dfe4fcc6e1bfa12b1365c2b1f812a0ae376f504f78a292a787cc78 SHA512 29f1deadb2fe2fe4d88e108b8c989e1982c83dcfcf17d6562a9ee1a1e01096f9235bea87efafbe26884b27ff66225605b5270d8eec084073e323c2c9046c84a3
|
||||
EBUILD kaptan-0.5.12-r1.ebuild 527 BLAKE2B 84255fadf61ca88b0dfd67f07dd935d1d394f384b0bb07a738e666d5f45c6959f895820dd5226d8e4ddeb6d7af86d1149d3dec9dba57fc1030ba2420d9629e46 SHA512 1d0ccd1e12b8afd82c47d27412b701c318367857a8c6b758162fc059b67f0c28678db152943133521b30301b7ba35584a91b78c7a6219bc9d1da01f04cbacab3
|
||||
MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
DIST lazy-object-proxy-1.4.3.tar.gz 34888 BLAKE2B 43f64fcd6573d4a4cdc2208bcd882714cb21474e4274d53b955664b05525ed5d1305ed4121f6ee319aefb3ab7827bc9b2073d32dc4c67e969adb5367a16d4cc1 SHA512 c2c8ad8286776d61def222b394cab27647b7a1bf4b3915e169b65c6022cb26d5ef286f1041adfddaf8a78a2410c11424983b3580a019561eda5f2e4c3a88620f
|
||||
DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
|
||||
EBUILD lazy-object-proxy-1.4.3.ebuild 991 BLAKE2B acd6892546fa1a958b2985e06a1b4b68caaa6933a064f6dfa7fe05992a1f391a25179487cfcc1b3b32926c498495283051a6b25548f6c99c6a5bc923f4ef0bf5 SHA512 11284bb64221f0c476b26f53e017449c7457fe46a2e9f7e8d856ff0b1d366d2114cd4c3d3f5fab4f2fa1d664d4eeb091b694df4bedb0ef630add6be6b0846cc0
|
||||
EBUILD lazy-object-proxy-1.5.0.ebuild 945 BLAKE2B 1814f0a13cf57a1f1e607d7a3864a99464e7cbef81f04f732de5c2ad6261ca230c3da22df6d760584a998cab3847676b986ab51db529c1735b6fede61fb78b05 SHA512 8028494e20f567d82695b1fea2eaaaedda2fcd349170d029a337db2fc065ede3f6e74193758518a1d866d33dbaa22de8cc552bbbf645bca1611f35bd1b561e61
|
||||
EBUILD lazy-object-proxy-1.5.0.ebuild 938 BLAKE2B 53c77010b260d9afd108ac6ee78303a6153d18da90fd75c24cdaf70eba9bdf4e51f365762165daac5af6a5efdf7b6ed86474caf33fb8dfe57a631986b9d15ceb SHA512 a698baa6f2ec516193349b7215d41af38fa06f9b352885ffd8a911b866fbbac5e81c820d83bceac43a533ea091dc413a707ceda0c87ded4efd8b518c07f9b329
|
||||
MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
AUX libtmux-0.8.2-tests.patch 1677 BLAKE2B e5d3e6717809c36411ab3b5991dc1dec7a38868015529fe867743c31eacd81de13d74e96f3232106d43b68abad7e1b94afdecab44cc2954135ef34afce484a33 SHA512 b5df69fcda982fb7d8b0bc0659994959a5d4d868e46cfda43e8e9d3abb14a1a094c63da25a73250bc8329a93cf9a5747fe4cee51580b3802a4be1dfc8a68d33b
|
||||
DIST libtmux-v0.8.2.tar.gz 117077 BLAKE2B 52e9c7c47911797e9d2446e7fbc836f9482912e255c05d9b329d4a33f5f03d0bfad4df492902eff5605180f90efcd81a7e432174646cb2051b0f9dfa6615a91a SHA512 e5f3768f4ddd746c5380a92899961be05b1b6c567d9333720b0fd9ed124131671bbecf1c04a7c4e658092424b6dc89dd656ba559385b0a6f673f9895dd6c829c
|
||||
EBUILD libtmux-0.8.2-r1.ebuild 944 BLAKE2B a66af9abda03382d2b88f8605c462fb9b85d2fba8cdbf9d00b8182335aff84393bbc2137b63753942b5968a342527bce0e2dd539af838a0e2b346e7ad6793a34 SHA512 4ef6187c51469dab5369de45cc69601eb6fa14d7aef08ac2dd8a1db7d8d8f61d1362a71282fdb74db58284c3d71420bcc79eefe554522d5373f4e0a4f6230304
|
||||
EBUILD libtmux-0.8.2-r2.ebuild 946 BLAKE2B 530ce16d9092ceba33276577ee1a93800da0bf0aa8bd692d27fb5aa4e4e19335a472d78917a57ece88c6b7fc7623278fdd234efc822524aee1b207fb32890dec SHA512 c04f25d26c55684664cfef9063b30451288076eb521c3b6717579f7eae322bd176ca31b575b39180963bf0ecc9ca13d5f6b4efd6412be3f467788498e1e5be00
|
||||
EBUILD libtmux-0.8.2-r2.ebuild 953 BLAKE2B 783d1dfc6aa7f1c0d5a9b32249558ef4679231f70ab7cad4eb05b42a51b4c8bc2a77a2ddf7cf1f2aa5f6987bc8e3f0cadd96a0631d42723a019b8a5feabe69c8 SHA512 cf05d37e489cf0c3ea8aca662e0890cbd766cee38c743625abdd060f5b11ce9db8afaa2cb770756c30f116c053dc692c24e24bbebf05e141c11d0cd6f4fa1bda
|
||||
MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
|
||||
EBUILD pyaes-1.6.1-r2.ebuild 753 BLAKE2B 100dd64972b1f829862824f8648308f7ca089866b5da720a851a959ce1faf64306c4b7922fb13441d05c42e23646a7b3f3d7f2d770f0b3bc588a5df22d1b0ea7 SHA512 5cf946b78153089072eeadc398c5948f867d3a67550fdf460c42600478e8fe210b5f0d44beaffb12f3273c509092caf492fe0412bbb71fd25731d4178b349456
|
||||
EBUILD pyaes-1.6.1-r2.ebuild 751 BLAKE2B ec51320b30099eb2e262dbaa84c5e9c548b72c852d804f0f6e9fe2834205bd7f80fa94f96d3920020f98157aa906e114e8ce7664e087be849e7ebefb644d6bb0 SHA512 3892ef17f16ca33aaaf872614e829fc96c6f8dee96a8521950c8b9e09057da221b0a43aa004fc59ac5715615404fc8b09e6e50de69b3029da3cc2b9893fa7bee
|
||||
MISC metadata.xml 438 BLAKE2B a9ef6e6bcd23ddb73d9a005c520caefb142d8351905f31875100ccc005a77738038aba97a4ca5eec19ca2986a9c52820e40be958053952bbfff174e01f57d846 SHA512 0d1bf03984e248499483ef6248f11baae42b253f231eeaca17077129fe9ca38af69e2d53c7b438c63217d9f5f1ca1f58a18fb1b15c7d161ebc94917fc90e8a5d
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST pytest-rerunfailures-8.0.tar.gz 13207 BLAKE2B 8a086783c5b6dae311aaa943a5c0eb56f5fbce4f687faf97ea0046bbce557cb82f8acd612247d235e249ef1a97157d3c356cf546b3d25a3dc4a4122286fcc04c SHA512 538fe5ca579ec50fc1689c4b7df3a55e0bdb08f87c2dfeb219ee141ef67c6c74a324c64f183f3ff85a5289ecfb54beef0fde2105eb0ae888ed861a15194a9dc5
|
||||
EBUILD pytest-rerunfailures-8.0.ebuild 673 BLAKE2B fd1e78b051549c59532279c060023f6e87d4057ad215e12489150e37e7138bdb25b5d37e4b3569e64ee56240f73f08facdc1062c9485bd2e6755fa7f5fd124c8 SHA512 3d906691a5fe6c6080881b1c2e10108cf00f3d323eba255ac9398639461d47b26811993df071cbaf5aa1404a74895356ecf6e9f280aab7c27b4d4e1b99bf90a0
|
||||
EBUILD pytest-rerunfailures-8.0.ebuild 680 BLAKE2B 55e83fb37dfd9504c28ba3adafa8b01165ced8ad0a0193e51d32c96fdd9ebcafb2ecdf925411249e4865e17d7549e39ddb4d901a648634862539deb8f0dc870f SHA512 6ac1b59f4c70301421b0a34acd5019a52e132763726345614f216f70bf57903ad3e17de262bdd5cfbe30d21ae45f5f7960363b42439fca4d4199552fb9729e8b
|
||||
MISC metadata.xml 333 BLAKE2B 73b35ed1679008982384ced1ded01ba9a61c4b82a6646f7f4a1ad318690d3ffdf3752d438a7ca4064e1a39855a353e3f928329f0759f7f7dfb8ba45b01667a40 SHA512 8b08014dec552b96d1e8d79c44404333b62960b2fce3ce3905077af02d1e3436c2cfbf5b6bbe9844df7d87c5bc5f44ad86f4359079ddb8e2e54f30ecc42369e6
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
DIST requests-unixsocket-0.2.0.tar.gz 13303 BLAKE2B cda02b5d963b00fb06cf86819bcbf552ecc21e30064198da338f502f47547a1f93184fd06052047c6cb8a6181f0a2f7b7a7cc53183b18dc22165a41dc14144b5 SHA512 a670f136ff1d8fb427cd017d92d388fd48a8a853d50aaa6eed685f3b453e28c6dbf5a710d7394face3eec42f8bdd84f798c7c4c82dab7b53d7a8c229ade52405
|
||||
EBUILD requests-unixsocket-0.2.0.ebuild 720 BLAKE2B ed4e6af86c4e0018b0474a6a201266b257cafdd59e28e478877ded715c29390f83da173dac4065d8899bde275ca21b4f3be29671ef6585b34eeb8ea583093251 SHA512 b0e1a6f5f0309777dd33a29787bc5b8d4bc733664bacea48db0377e0e4c075e17ea53332ef6d9a7a4ae2b0f8fb16f5d22cb0bbc27db65cb19a219aa44f74577a
|
||||
EBUILD requests-unixsocket-0.2.0.ebuild 719 BLAKE2B 675856e3f7d16a3a2fefb1064166a6bb089634cbde8841511bb95da90f575686f5450c5c131e0775341908b0d8483f8cf87d1a5792f91ea249adee492d372e4d SHA512 da610653908310171ca7673e17f6a147806a0ced1b5792ba3be1636693990e2c472bef7706bce4edbccd658996e1cd0c3c5195889c9729d87a0b969b7486c057
|
||||
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
|
||||
|
||||
Binary file not shown.
@ -1,4 +1,6 @@
|
||||
DIST ament_cmake-0.9.6.tar.gz 60800 BLAKE2B 71c4e71c50b7715bb8f1b5b737ce23e30f79459a14a5866801bcb810b8fe82d807b6a4eae11de427f52c618e14ef22b7693905f1a0200cc38f0ffab1d70e80cd SHA512 c923260bbd0142ea57bf3e868e94e76020939e8ec49cbf23f14221d0048f21efed00dcdae9978e00f246725ba216c151f5d53b1cd94297b8731f53dc0e45b554
|
||||
DIST ament_cmake-1.0.0.tar.gz 63304 BLAKE2B dd0c4bc5b72d9143cfb8ee9caae236a3608981ee8523e879ea9c168d64fd1d0cb84e54679cfc0cfc58ffff34519bb1032afc956c3130c1da8b4f98d60a9191be SHA512 69236015368df29a128eceeb64dd1c683eb32a44188b52120592238f999be8c8c7c5892a36ddcef48b6686bf97eba77e820ca3b8896c64ec1522661fa3ed4fc7
|
||||
EBUILD ament_cmake_core-0.9.6.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
|
||||
EBUILD ament_cmake_core-1.0.0.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
|
||||
EBUILD ament_cmake_core-9999.ebuild 1073 BLAKE2B d37f5ca1ef5e17edd4465569e91d02eacce49ba591df6aedc86f2d97cc6c03a3c65d58e95c4ff8efd6ec0e87cf914914c64cbc44ed15725432cdb6db0279c073 SHA512 a6002301b67b79499f416d819dc9bbdcbbb486e0de1e01c5afcd8c72ee2ac37cf97c4f60ac8da0ad1b34a10dcd261532f85134b9ab4f90446f5d8c8c23f6d163
|
||||
MISC metadata.xml 331 BLAKE2B 57a4aabab6c138bc97c67d610a56eed290c8da0c1f81fa44ab734d1a932ae0f93e0a826431eaccbd6c512fbcdc4a3b5840e6971e145a92b0c6fc87e0edbb3a92 SHA512 ba55ade8e610e2bcc2c4d54b68422045d0110a3975c6893997a92185ea256edf96d815eaeacfd4193f8dfd8706052142b30b3f546f5806b5809478342a01f394
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue