diff --git a/0001-modify-cargo-checksum.patch b/0001-modify-cargo-checksum.patch deleted file mode 100644 index 1303708e4ef3588c893856777d624d94adc352bc..0000000000000000000000000000000000000000 --- a/0001-modify-cargo-checksum.patch +++ /dev/null @@ -1,21 +0,0 @@ -From ab0bec70b747d5fc0cea9a8ccd3f13892b0b6092 Mon Sep 17 00:00:00 2001 -From: zhangwenlong -Date: Wed, 17 Nov 2021 14:41:44 +0000 -Subject: [PATCH] modify cargo-checksum - ---- - vendor/libc/.cargo-checksum.json | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vendor/libc/.cargo-checksum.json b/vendor/libc/.cargo-checksum.json -index 9d27ba2..58fa852 100644 ---- a/vendor/libc/.cargo-checksum.json -+++ b/vendor/libc/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".travis.yml":"88c852e2bb7718702c73107cef9168fdb68722d45e4b2ba28c2f4a9221caa41c","Cargo.toml":"14990e43355b59b8f32126990446662da60e4268f1a71357c4a4e4c8769cb18d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"00fbfd7e989de6ecc270aed1f1c2c20560ac67e6c1564833622b8e34385c6170","appveyor.yml":"216f7ac4561aa5810dc84ce5a9950897a8c0496e0615d0211d62348b1c8dc720","ci/README.md":"b8debdd9044a773dbccc85e574eed21008784117d77c24a15f207d4b2a173a14","ci/android-install-ndk.sh":"725db9025c5905849916bf7c910f98ff0e753484397c2a1f836d48a576d10890","ci/android-install-sdk.sh":"5c3fbe402ac611239ac7715a61f247d1c55fa012f33a5be0b0127dfc196965cf","ci/android-sysimage.sh":"901415631752827454c827e8c51906ba4260612e4021eda98eb7fff771c7d0e8","ci/docker/aarch64-linux-android/Dockerfile":"e17945fba1786dfe766006f50e79baf3f4151ca0c0c14ae96f91483bf345afd7","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"5f430271941e1eecdf9d1a5fb701dd5622e2c4b9da03140fd829bf216e55529d","ci/docker/aarch64-unknown-linux-musl/Dockerfile":"3e1cbf0fa728571b9be9769e5a6281c964fa5b26d586265117ccee017ca4022c","ci/docker/arm-linux-androideabi/Dockerfile":"4e0bdc13254f99bd0db195f91331c634050426e3e4a0fcc63ef25ab795fe2d46","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"dbb025b53b27e406893184290836a50133ecae8295711d5e05b4e41fac9bd262","ci/docker/arm-unknown-linux-musleabihf/Dockerfile":"7cb6e0f8fb91c97f142a9c827687bbbc1a5e7643a3081160025d0365593a596c","ci/docker/asmjs-unknown-emscripten/Dockerfile":"0d9aea5119c2cd136cc2c0a578105d91210e45901ac49b17c5e45f458b1c7551","ci/docker/i686-linux-android/Dockerfile":"4e8377ec0bd9ad2df23bf2c5373200a12750dc9f28c4f10bc83a0150fe1623ee","ci/docker/i686-unknown-linux-gnu/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/i686-unknown-linux-musl/Dockerfile":"4ac86fe9e159d454616396a9f3f07ce0f5d99cc4b49898b8d2486e6bdbfed9e9","ci/docker/mips-unknown-linux-gnu/Dockerfile":"6d2a9daa299003497c1d441d07b69f730ad75ee49f34520f959b5158e60072e0","ci/docker/mips-unknown-linux-musl/Dockerfile":"4773b2656a7dd6a3b106fcb737428436652edf3d1f48181de3f62c16bf5bd49d","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"7c4d26232f1c1553a6612d9b0b3faac9887e139eaffa025f70d34113dcee812f","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"edb4144c07ade1a8bd65272ec1d3672ad794e9e6b7d01197896e159a70175b58","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"0ca9c12b5618c6d2df04ff820d56fb28e05b43e45eaa506480126b03c5072d48","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"4b247dcc399395815ec9153c1247cc03d764896c484eddcb196d0bf8650d6311","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e949717a8ba5e123940729ff47ce1c45989c8b8247c576f1488f698b534e0283","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"018591017f499414a9f79477e1c39baa6a47f71fce6812fb1868fb0fcdfb8cea","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"9860f478c5b2dc3bcf76d2cda7f71922a2a2ef54898cc2ed6ea9b9eff094a5c0","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"2312491343665d2ab36fd669f14766facbf3c7e9820ffb8f0d623830b676f8f0","ci/docker/wasm32-unknown-emscripten/Dockerfile":"bd072d6ae91a9160693e402dd77462d3c9dd0716711e719a62af330ae479eb4e","ci/docker/wasm32-unknown-emscripten/node-wrapper.sh":"0eef37c3c4fb16dbc083148b7e7af45f2ae60bd9a1b3a77e1d43da79efbd30c6","ci/docker/x86_64-linux-android/Dockerfile":"aeeaa540189ca712369c564c9a14cbace63217dadcfaf879a2cb40fbdeb08199","ci/docker/x86_64-rumprun-netbsd/Dockerfile":"e8f9287b267c6058eec42d1bca0007cb9a78a1d244dd8e11088368cb61fb17d6","ci/docker/x86_64-rumprun-netbsd/runtest.rs":"53302e9ed39293c1ec68ab56287593907d4aaf5bac9c1c2857b29f754a71d62b","ci/docker/x86_64-unknown-freebsd/Dockerfile":"dfc00fa7d5dbb24e6864fb62cdbd48536c14c0be2d40fd02de53d1374e4b760a","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"ab3fa45765802b8155996796fcad9fb82096360ac587e38e6faa3ec345268796","ci/docker/x86_64-unknown-linux-gnux32/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"e145784741473150473b1bef7cc3c2cf0c6339d4fc480113ac41b4247a9b38ec","ci/dox.sh":"9ea240a4a607036235fd68c01b5d2a59f365768d103d3be774dcf34aa3ff563e","ci/emscripten-entry.sh":"c97bbec520b57af9b1ae264ca991560e99c3852c99b00a2f673c614d1ba17498","ci/emscripten.sh":"6f66c7b5c3d34a41afc59ceb0a8c3b0880cd6fd9a6344b874ae80bac0639ccb2","ci/ios/deploy_and_run_on_ios_simulator.rs":"3175066fd7f82390f6226d881e1a1dda9767ea2705656870e0d7774e2731800e","ci/landing-page-footer.html":"b70b3112c2147f5c967e7481061ef38bc2d79a28dd55a16fb916d9c9426da2c4","ci/landing-page-head.html":"ad69663fac7924f27d0209bc519d55838e86edfc4133713a6fd08caadac1b142","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"afe325f853481d9e18b0e5a376e4f987de7673066ec336ad56e26d929858b427","ci/run-docker.sh":"be83bc5a8b5ef913a7c9941ffca24734716028650c9a876123c4c160672c18de","ci/run-qemu.sh":"bb859421170871ef23a8940c5e150efec0c01b95e32d2ce2d37b79a45d9d346c","ci/run.sh":"546ce3904f96fe5316fb1342687f5732c26adfc40c6db8f3becb1a67a9892555","ci/runtest-android.rs":"a07ddbdd276aedda7876c7e676774178a60d9aeab95df01275a4ee95f59e3044","ci/style.rs":"60564abc1d5197ed1598426dd0d6ee9939a16d2875b03373538f58843bb616c4","ci/test-runner-linux":"cb3713d9e4fa1d9a7c039dfd077af0939921c1f2bf969c9e680ee66e87dc30a4","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"1c2dc787a1b3438970ccd04153c93538719b1a27445707913b90b6f0cdcdde77","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"c670f160d18c24f34ccea660676723dec5019d64479aac4d99c2bd544f34f4b9","src/fuchsia/aarch64.rs":"8366ac6f51e494aad9266ccab2b3a95c5ed7aa3a9f77ea672413283440919743","src/fuchsia/mod.rs":"78dde4fb654996e842c30f8f7bc4156e11440092292e21fc1e26ee686e2a4095","src/fuchsia/powerpc64.rs":"390e8db54271a1d5f512d54a21b328091a792378bf9b42b49b6c1a72388da4ec","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"5e2b2884da3b6fd9b68133c558cca128b74cff09a501808c5d811fbc30b2cb16","src/macros.rs":"e1b0bf5db89faa8fcb39a3fd46cdb5fdcfabb7f3524eb2192157f0188b8a764b","src/redox/mod.rs":"07ae6652bc6f7fe276255bda210eae7a197d3d64d9dede6dadce0478e8890e2b","src/redox/net.rs":"a1e9d2291e2c12833333ac8706b23f388ce5dbe1718bdd7b38fd68c74559f0b4","src/unix/bsd/apple/b32.rs":"41699d2802327b0a4d4aa50cd20b1e366b442176cbedab27ca888ac0446c9156","src/unix/bsd/apple/b64.rs":"4fe7bf5de252dcd712dee0a7a8acfaa7c737c862eaa3ff669255d3f2076c5fa6","src/unix/bsd/apple/mod.rs":"c305b6c1ac1d66634e971df52640faf5aac1f0f4a9c253665969ea97e8b73be5","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"1950bf56a7ecbfc8994e4b54dc94e752d91dccd8f0e2d1e4c2d3ad2fa8cb5e23","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/freebsd/mod.rs":"5a3156a7a25fdce61abdade87d3b054d885c268db0cd434eb94a7a9005af4431","src/unix/bsd/freebsdlike/freebsd/x86.rs":"54311d3ebf2bb091ab22361e377e6ef9224aec2ecfe459fbfcedde4932db9c58","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/mod.rs":"c983d33bb6f0ac1e38d00a41698485098e8a1fe1cc78e685e057c6a4d7129a56","src/unix/bsd/mod.rs":"a1030452eed4ec52a39e9f39040e8fae4309143c7af145efadd9b425caa39672","src/unix/bsd/netbsdlike/mod.rs":"1a5adcab85fb0051c5458b6ca40aeca4573a802152c7285b637d4e514d78f22a","src/unix/bsd/netbsdlike/netbsd/mod.rs":"92ca8ff8410d64035351b70d9118fe1d85edeec61b92ff6730a77dfba9832d56","src/unix/bsd/netbsdlike/netbsd/other/b32/mod.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/netbsd/other/b64/mod.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/netbsd/other/mod.rs":"4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"6b460d78618fb977c129ed432f19ece03bd8fd47fdd2528b02794c316f59869b","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"3d22ed9ac1ca930f3ab606934d978be240468d7eadaf13772ca91c989901a93d","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"c57f0cfe1be1229c38e8f08ed886fa027fdd150f9559ef40f7bbd9ba231634d9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"7c959cdb3415f68a0f948117b9aa87a17463e57ab97cc3235f2567454b706653","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"1574d3ac239befc2dc7b9b5245d5175e3b7498d6f7b278dab14791f04ba08388","src/unix/mod.rs":"ef4faebfff6f76db542f7818d8577c93c3886d08a04c7e1a9437ea4b6f912976","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"7422845a44de13a2faf15d105670525ed090c6e200c9723178ed735810bbd689","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"e9ec6f08e20ea235cd7095604ea6e37c739c1276e9f40fa31a4db4951fa005af","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"63290adc8122c040f9be369ef4180975bcf1a967a717aa75d30371162d5d5fa9","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"9f233087b989db4a925b79b1c0bc67ff8d237e8069d415c81d3142e8b44a99ed","src/unix/notbsd/emscripten.rs":"f8d8acf5cef1acd1a6bdd41299054120820865d072c4c2e3c740fbd0c6e9b3e7","src/unix/notbsd/linux/mips/mips32.rs":"f769bbe5c48f77e6bc94e37deccd2866e7e52e7eb1b3cd7611dbad95574e82f8","src/unix/notbsd/linux/mips/mips64.rs":"ef678b48b571428d46fef5b2ca9bef7251b5f27fcd2c38d987d1b80f2ad3ece0","src/unix/notbsd/linux/mips/mod.rs":"b4577e9605f5638367be580e9f6ba75ef277a77ba8a875a7d6dd9b16c79baeaa","src/unix/notbsd/linux/mod.rs":"090630438ac5e68fb679287330244c7fd921b212a25b0cee2d9b29607f54157a","src/unix/notbsd/linux/musl/b32/arm.rs":"d2998b13648696304bb34f0793715d821178baf8e88a45b532764a20b5294232","src/unix/notbsd/linux/musl/b32/mips.rs":"340be794362a4532d709ef23542b10762f710f7bfd0c4fafa5166a3fb9a15b4f","src/unix/notbsd/linux/musl/b32/mod.rs":"3cc7979546258a47df6b0fcd7ad64571826623671857633a7acafe87e05e56a1","src/unix/notbsd/linux/musl/b32/x86.rs":"df114102dcf35bc32f891d4a9e09ce02fbe4c096a196c6b98b10ff87b29dbe4d","src/unix/notbsd/linux/musl/b64/aarch64.rs":"12c590fde2a1450c08934234c4f5bcd94ee7b58ca21f8e93bc930148c15fb0b0","src/unix/notbsd/linux/musl/b64/mod.rs":"b1991ef46a00d2db7ce3e36f6596685c1d508786c4dd4e62cbbf65ac3c256cc0","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"790dca3cc6c0a4166992d2c1665e1b1e320fbad5c0b1ba3c454321a6b2d7a103","src/unix/notbsd/linux/musl/b64/x86_64.rs":"bf8fc10a09bf700084db0381c484ddec3add79aa1726954cb14d21802ff7d199","src/unix/notbsd/linux/musl/mod.rs":"04fc2a5385fc36a04d537adac25d47ea0978c2ef9e8b4f875e146d93cebc9566","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"f2ce29ed104daf758cd4f61c190d1b5c12f516a428375891d7839d77ade8cbe6","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"3aa6ab0412857fd788c8831649772bb7fd903d0b2f3ee04914a1b99e00a6e7cb","src/unix/notbsd/linux/other/b64/mod.rs":"63e1a3fdf5f4d1b9820934ab344c91aed5e458e7e05908535d2e942d51a08bf8","src/unix/notbsd/linux/other/b64/not_x32.rs":"e1cf87b9dbe89e9fff667c6fc8eff0166a02565ef65aae3dc9304dc70f7a5624","src/unix/notbsd/linux/other/b64/powerpc64.rs":"5c20bf2bf528d329ed279f7730469b1131565029fae495803cee8809cc8d27e9","src/unix/notbsd/linux/other/b64/sparc64.rs":"884bb89cd5bc49a410ce8eb5c5d75e8db303f90dca174bf702ca541bb4bf0db6","src/unix/notbsd/linux/other/b64/x32.rs":"e521bd43a2d66f09f03a045b2e1f69f2ca91cff37922ac5b7c437d888799cee6","src/unix/notbsd/linux/other/b64/x86_64.rs":"c07dfaca8234bc1291e12a30cb91230f228199024a5aa64e41e350d33b030abb","src/unix/notbsd/linux/other/mod.rs":"50e16e911ec49887fd3e0b5d08e843d680ea50d3aa3726d26cedda8f4498b1de","src/unix/notbsd/linux/s390x.rs":"ddbb07a2f48f6cd45e1bff38e05249940202c43d3abd8cf97a754f49668119af","src/unix/notbsd/mod.rs":"4f0893bf43bda88d84530a0790e3a3f6396c6e26a32aab11851a507f328a0023","src/unix/solaris/mod.rs":"57bc5dedf4d6e41c794aee28a264a601c636508090f5eff8e77b72748e110735","src/unix/uclibc/mips/mips32.rs":"43a91d7ae53413133d1355d3791846f5c55e982ef6a10b9bdccad5b37bee8c4f","src/unix/uclibc/mips/mips64.rs":"e67eec1636a998b047d89a4cda1c99cb6bc3071db017762675179a68201c4438","src/unix/uclibc/mips/mod.rs":"74817a9b1ee3998d8e0b751a555d57225f70fd979c283c94ada344a162a8b856","src/unix/uclibc/mod.rs":"0e2f59647bc0e48c37914a3f788c2c63d67287f051d0176bdbf1a1e6388a9046","src/unix/uclibc/x86_64/l4re.rs":"54b4e58ce5a671348c32bc41c1607dbc5c13fa6818cc3e0e0e2b409c300a305e","src/unix/uclibc/x86_64/mod.rs":"bd569360c45a6f2b585cfb47544d223e92243a2ff4f8429b78fecac6b889f9fd","src/windows.rs":"e41357d610608bad81abf285306ad8b127b6f02d5132f63c4942861980b47d59"},"package":"f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"} -\ No newline at end of file -+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".travis.yml":"88c852e2bb7718702c73107cef9168fdb68722d45e4b2ba28c2f4a9221caa41c","Cargo.toml":"14990e43355b59b8f32126990446662da60e4268f1a71357c4a4e4c8769cb18d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"00fbfd7e989de6ecc270aed1f1c2c20560ac67e6c1564833622b8e34385c6170","appveyor.yml":"216f7ac4561aa5810dc84ce5a9950897a8c0496e0615d0211d62348b1c8dc720","ci/README.md":"b8debdd9044a773dbccc85e574eed21008784117d77c24a15f207d4b2a173a14","ci/android-install-ndk.sh":"725db9025c5905849916bf7c910f98ff0e753484397c2a1f836d48a576d10890","ci/android-install-sdk.sh":"5c3fbe402ac611239ac7715a61f247d1c55fa012f33a5be0b0127dfc196965cf","ci/android-sysimage.sh":"901415631752827454c827e8c51906ba4260612e4021eda98eb7fff771c7d0e8","ci/docker/aarch64-linux-android/Dockerfile":"e17945fba1786dfe766006f50e79baf3f4151ca0c0c14ae96f91483bf345afd7","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"5f430271941e1eecdf9d1a5fb701dd5622e2c4b9da03140fd829bf216e55529d","ci/docker/aarch64-unknown-linux-musl/Dockerfile":"3e1cbf0fa728571b9be9769e5a6281c964fa5b26d586265117ccee017ca4022c","ci/docker/arm-linux-androideabi/Dockerfile":"4e0bdc13254f99bd0db195f91331c634050426e3e4a0fcc63ef25ab795fe2d46","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"dbb025b53b27e406893184290836a50133ecae8295711d5e05b4e41fac9bd262","ci/docker/arm-unknown-linux-musleabihf/Dockerfile":"7cb6e0f8fb91c97f142a9c827687bbbc1a5e7643a3081160025d0365593a596c","ci/docker/asmjs-unknown-emscripten/Dockerfile":"0d9aea5119c2cd136cc2c0a578105d91210e45901ac49b17c5e45f458b1c7551","ci/docker/i686-linux-android/Dockerfile":"4e8377ec0bd9ad2df23bf2c5373200a12750dc9f28c4f10bc83a0150fe1623ee","ci/docker/i686-unknown-linux-gnu/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/i686-unknown-linux-musl/Dockerfile":"4ac86fe9e159d454616396a9f3f07ce0f5d99cc4b49898b8d2486e6bdbfed9e9","ci/docker/mips-unknown-linux-gnu/Dockerfile":"6d2a9daa299003497c1d441d07b69f730ad75ee49f34520f959b5158e60072e0","ci/docker/mips-unknown-linux-musl/Dockerfile":"4773b2656a7dd6a3b106fcb737428436652edf3d1f48181de3f62c16bf5bd49d","ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile":"7c4d26232f1c1553a6612d9b0b3faac9887e139eaffa025f70d34113dcee812f","ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile":"edb4144c07ade1a8bd65272ec1d3672ad794e9e6b7d01197896e159a70175b58","ci/docker/mipsel-unknown-linux-musl/Dockerfile":"0ca9c12b5618c6d2df04ff820d56fb28e05b43e45eaa506480126b03c5072d48","ci/docker/powerpc-unknown-linux-gnu/Dockerfile":"4b247dcc399395815ec9153c1247cc03d764896c484eddcb196d0bf8650d6311","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"e949717a8ba5e123940729ff47ce1c45989c8b8247c576f1488f698b534e0283","ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile":"018591017f499414a9f79477e1c39baa6a47f71fce6812fb1868fb0fcdfb8cea","ci/docker/s390x-unknown-linux-gnu/Dockerfile":"9860f478c5b2dc3bcf76d2cda7f71922a2a2ef54898cc2ed6ea9b9eff094a5c0","ci/docker/sparc64-unknown-linux-gnu/Dockerfile":"2312491343665d2ab36fd669f14766facbf3c7e9820ffb8f0d623830b676f8f0","ci/docker/wasm32-unknown-emscripten/Dockerfile":"bd072d6ae91a9160693e402dd77462d3c9dd0716711e719a62af330ae479eb4e","ci/docker/wasm32-unknown-emscripten/node-wrapper.sh":"0eef37c3c4fb16dbc083148b7e7af45f2ae60bd9a1b3a77e1d43da79efbd30c6","ci/docker/x86_64-linux-android/Dockerfile":"aeeaa540189ca712369c564c9a14cbace63217dadcfaf879a2cb40fbdeb08199","ci/docker/x86_64-rumprun-netbsd/Dockerfile":"e8f9287b267c6058eec42d1bca0007cb9a78a1d244dd8e11088368cb61fb17d6","ci/docker/x86_64-rumprun-netbsd/runtest.rs":"53302e9ed39293c1ec68ab56287593907d4aaf5bac9c1c2857b29f754a71d62b","ci/docker/x86_64-unknown-freebsd/Dockerfile":"dfc00fa7d5dbb24e6864fb62cdbd48536c14c0be2d40fd02de53d1374e4b760a","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"ab3fa45765802b8155996796fcad9fb82096360ac587e38e6faa3ec345268796","ci/docker/x86_64-unknown-linux-gnux32/Dockerfile":"f22ac412525ef15b33ab8ccd8193d97346faf421c17f6ddeffc25b651aba83b7","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"e145784741473150473b1bef7cc3c2cf0c6339d4fc480113ac41b4247a9b38ec","ci/dox.sh":"9ea240a4a607036235fd68c01b5d2a59f365768d103d3be774dcf34aa3ff563e","ci/emscripten-entry.sh":"c97bbec520b57af9b1ae264ca991560e99c3852c99b00a2f673c614d1ba17498","ci/emscripten.sh":"6f66c7b5c3d34a41afc59ceb0a8c3b0880cd6fd9a6344b874ae80bac0639ccb2","ci/ios/deploy_and_run_on_ios_simulator.rs":"3175066fd7f82390f6226d881e1a1dda9767ea2705656870e0d7774e2731800e","ci/landing-page-footer.html":"b70b3112c2147f5c967e7481061ef38bc2d79a28dd55a16fb916d9c9426da2c4","ci/landing-page-head.html":"ad69663fac7924f27d0209bc519d55838e86edfc4133713a6fd08caadac1b142","ci/linux-s390x.sh":"d6b732d7795b4ba131326aff893bca6228a7d2eb0e9402f135705413dbbe0dce","ci/linux-sparc64.sh":"afe325f853481d9e18b0e5a376e4f987de7673066ec336ad56e26d929858b427","ci/run-docker.sh":"be83bc5a8b5ef913a7c9941ffca24734716028650c9a876123c4c160672c18de","ci/run-qemu.sh":"bb859421170871ef23a8940c5e150efec0c01b95e32d2ce2d37b79a45d9d346c","ci/run.sh":"546ce3904f96fe5316fb1342687f5732c26adfc40c6db8f3becb1a67a9892555","ci/runtest-android.rs":"a07ddbdd276aedda7876c7e676774178a60d9aeab95df01275a4ee95f59e3044","ci/style.rs":"60564abc1d5197ed1598426dd0d6ee9939a16d2875b03373538f58843bb616c4","ci/test-runner-linux":"cb3713d9e4fa1d9a7c039dfd077af0939921c1f2bf969c9e680ee66e87dc30a4","src/cloudabi/aarch64.rs":"b8550bf1fd7344972aa4db29441486f39f31482d0327534981dbb75959c29114","src/cloudabi/arm.rs":"c197e2781c2839808bd6fcef219a29705b27b992d3ef920e9cf6ac96e2022bbf","src/cloudabi/mod.rs":"1c2dc787a1b3438970ccd04153c93538719b1a27445707913b90b6f0cdcdde77","src/cloudabi/x86.rs":"33eb97f272d2201f3838ae74d444583c7de8f67856852ca375293b20bbd05636","src/cloudabi/x86_64.rs":"400d85d4fe39e26cf2e6ece9ee31c75fe9e88c4bcf4d836ca9f765c05c9c5be3","src/dox.rs":"c670f160d18c24f34ccea660676723dec5019d64479aac4d99c2bd544f34f4b9","src/fuchsia/aarch64.rs":"8366ac6f51e494aad9266ccab2b3a95c5ed7aa3a9f77ea672413283440919743","src/fuchsia/mod.rs":"78dde4fb654996e842c30f8f7bc4156e11440092292e21fc1e26ee686e2a4095","src/fuchsia/powerpc64.rs":"390e8db54271a1d5f512d54a21b328091a792378bf9b42b49b6c1a72388da4ec","src/fuchsia/x86_64.rs":"b4a3eff94dcf1ffe41e6500468ca2cff0e97ddbcc75fe079b6ac7adb1e493f56","src/lib.rs":"0fb408f1efbe7098f8ed271707c489a9ffe1c3de8dee7d6e8a359757b0914d0b","src/macros.rs":"e1b0bf5db89faa8fcb39a3fd46cdb5fdcfabb7f3524eb2192157f0188b8a764b","src/redox/mod.rs":"07ae6652bc6f7fe276255bda210eae7a197d3d64d9dede6dadce0478e8890e2b","src/redox/net.rs":"a1e9d2291e2c12833333ac8706b23f388ce5dbe1718bdd7b38fd68c74559f0b4","src/unix/bsd/apple/b32.rs":"41699d2802327b0a4d4aa50cd20b1e366b442176cbedab27ca888ac0446c9156","src/unix/bsd/apple/b64.rs":"4fe7bf5de252dcd712dee0a7a8acfaa7c737c862eaa3ff669255d3f2076c5fa6","src/unix/bsd/apple/mod.rs":"c305b6c1ac1d66634e971df52640faf5aac1f0f4a9c253665969ea97e8b73be5","src/unix/bsd/freebsdlike/dragonfly/mod.rs":"1950bf56a7ecbfc8994e4b54dc94e752d91dccd8f0e2d1e4c2d3ad2fa8cb5e23","src/unix/bsd/freebsdlike/freebsd/aarch64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/freebsd/mod.rs":"5a3156a7a25fdce61abdade87d3b054d885c268db0cd434eb94a7a9005af4431","src/unix/bsd/freebsdlike/freebsd/x86.rs":"54311d3ebf2bb091ab22361e377e6ef9224aec2ecfe459fbfcedde4932db9c58","src/unix/bsd/freebsdlike/freebsd/x86_64.rs":"97132e2097411034271b8c927ecc94a208a361564680972a6c82998bd30a9826","src/unix/bsd/freebsdlike/mod.rs":"c983d33bb6f0ac1e38d00a41698485098e8a1fe1cc78e685e057c6a4d7129a56","src/unix/bsd/mod.rs":"a1030452eed4ec52a39e9f39040e8fae4309143c7af145efadd9b425caa39672","src/unix/bsd/netbsdlike/mod.rs":"1a5adcab85fb0051c5458b6ca40aeca4573a802152c7285b637d4e514d78f22a","src/unix/bsd/netbsdlike/netbsd/mod.rs":"92ca8ff8410d64035351b70d9118fe1d85edeec61b92ff6730a77dfba9832d56","src/unix/bsd/netbsdlike/netbsd/other/b32/mod.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/netbsd/other/b64/mod.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/netbsd/other/mod.rs":"4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212","src/unix/bsd/netbsdlike/openbsdlike/bitrig/mod.rs":"6b460d78618fb977c129ed432f19ece03bd8fd47fdd2528b02794c316f59869b","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86.rs":"bd251a102bed65d5cb3459275f6ec3310fe5803ff4c9651212115548f86256d0","src/unix/bsd/netbsdlike/openbsdlike/bitrig/x86_64.rs":"927eeccaf3269d299db4c2a55f8010807bf43dfa894aea6a783215f5d3560baa","src/unix/bsd/netbsdlike/openbsdlike/mod.rs":"3d22ed9ac1ca930f3ab606934d978be240468d7eadaf13772ca91c989901a93d","src/unix/bsd/netbsdlike/openbsdlike/openbsd/aarch64.rs":"820092e397c7ec259cd2de8f2444083a8e57071c02d73d678701dfa7807726e9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/mod.rs":"c57f0cfe1be1229c38e8f08ed886fa027fdd150f9559ef40f7bbd9ba231634d9","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86.rs":"44b7ea81cf363777b29935da175e702cbf45ed78f7498ae57faf44aa32335085","src/unix/bsd/netbsdlike/openbsdlike/openbsd/x86_64.rs":"7c959cdb3415f68a0f948117b9aa87a17463e57ab97cc3235f2567454b706653","src/unix/haiku/b32.rs":"69ae47fc52c6880e85416b4744500d5655c9ec6131cb737f3b649fceaadce15a","src/unix/haiku/b64.rs":"73e64db09275a8da8d50a13cce2cfa2b136036ddf3a930d2939f337fc995900b","src/unix/haiku/mod.rs":"1574d3ac239befc2dc7b9b5245d5175e3b7498d6f7b278dab14791f04ba08388","src/unix/mod.rs":"ef4faebfff6f76db542f7818d8577c93c3886d08a04c7e1a9437ea4b6f912976","src/unix/newlib/aarch64/mod.rs":"c408a990f22fb4292a824f38367e9b517e6e6f8623328397ee631cc88b3d1f7d","src/unix/newlib/arm/mod.rs":"2b6dba2e697ab9b4f4bc4dd5f28057249e9b596d1cb395a9322ec87605c4a5c4","src/unix/newlib/mod.rs":"7422845a44de13a2faf15d105670525ed090c6e200c9723178ed735810bbd689","src/unix/notbsd/android/b32/arm.rs":"3625a32c7e58cfe683a53486fbe3d42d4e28f00bea31e19cb46ed2bb0b6a140b","src/unix/notbsd/android/b32/mod.rs":"e9ec6f08e20ea235cd7095604ea6e37c739c1276e9f40fa31a4db4951fa005af","src/unix/notbsd/android/b32/x86.rs":"ae2b7f1d6278caddc007749bb1d09ca33f7593478a0fd7fe98b457dae86c7814","src/unix/notbsd/android/b64/aarch64.rs":"63d65629d79371814910f691672ef593d20244ee09be26f1ebe07ee6212d0163","src/unix/notbsd/android/b64/mod.rs":"63290adc8122c040f9be369ef4180975bcf1a967a717aa75d30371162d5d5fa9","src/unix/notbsd/android/b64/x86_64.rs":"5547aef8dcbaa5a932559f34606fd8d89f6c9c15173d2b1412c12d39b3c1045f","src/unix/notbsd/android/mod.rs":"9f233087b989db4a925b79b1c0bc67ff8d237e8069d415c81d3142e8b44a99ed","src/unix/notbsd/emscripten.rs":"f8d8acf5cef1acd1a6bdd41299054120820865d072c4c2e3c740fbd0c6e9b3e7","src/unix/notbsd/linux/mips/mips32.rs":"f769bbe5c48f77e6bc94e37deccd2866e7e52e7eb1b3cd7611dbad95574e82f8","src/unix/notbsd/linux/mips/mips64.rs":"ef678b48b571428d46fef5b2ca9bef7251b5f27fcd2c38d987d1b80f2ad3ece0","src/unix/notbsd/linux/mips/mod.rs":"b4577e9605f5638367be580e9f6ba75ef277a77ba8a875a7d6dd9b16c79baeaa","src/unix/notbsd/linux/mod.rs":"5e1004a09f117b4d2595763f9cefe5bccb89b3978f7564db3dbe05755ce37a46","src/unix/notbsd/linux/musl/b32/arm.rs":"d2998b13648696304bb34f0793715d821178baf8e88a45b532764a20b5294232","src/unix/notbsd/linux/musl/b32/mips.rs":"340be794362a4532d709ef23542b10762f710f7bfd0c4fafa5166a3fb9a15b4f","src/unix/notbsd/linux/musl/b32/mod.rs":"3cc7979546258a47df6b0fcd7ad64571826623671857633a7acafe87e05e56a1","src/unix/notbsd/linux/musl/b32/x86.rs":"df114102dcf35bc32f891d4a9e09ce02fbe4c096a196c6b98b10ff87b29dbe4d","src/unix/notbsd/linux/musl/b64/aarch64.rs":"12c590fde2a1450c08934234c4f5bcd94ee7b58ca21f8e93bc930148c15fb0b0","src/unix/notbsd/linux/musl/b64/mod.rs":"b1991ef46a00d2db7ce3e36f6596685c1d508786c4dd4e62cbbf65ac3c256cc0","src/unix/notbsd/linux/musl/b64/powerpc64.rs":"790dca3cc6c0a4166992d2c1665e1b1e320fbad5c0b1ba3c454321a6b2d7a103","src/unix/notbsd/linux/musl/b64/x86_64.rs":"bf8fc10a09bf700084db0381c484ddec3add79aa1726954cb14d21802ff7d199","src/unix/notbsd/linux/musl/mod.rs":"04fc2a5385fc36a04d537adac25d47ea0978c2ef9e8b4f875e146d93cebc9566","src/unix/notbsd/linux/other/b32/arm.rs":"d9892f7350b2978335f734f1cd2d7fed60f0f2e66aa05bee3f69549c031f8b14","src/unix/notbsd/linux/other/b32/mod.rs":"f2ce29ed104daf758cd4f61c190d1b5c12f516a428375891d7839d77ade8cbe6","src/unix/notbsd/linux/other/b32/powerpc.rs":"253fcd2f9978525285be1903cc08f3fec2dc3b12d1660a33e2995b4f6b810d1c","src/unix/notbsd/linux/other/b32/x86.rs":"49376e3ed0f3ff95c230ac20751911fe3c608dfe15c7c118b069fd7a954d8db9","src/unix/notbsd/linux/other/b64/aarch64.rs":"3aa6ab0412857fd788c8831649772bb7fd903d0b2f3ee04914a1b99e00a6e7cb","src/unix/notbsd/linux/other/b64/mod.rs":"cddd877e15648b69e96dcfdeeb34f858e8bba0409b35ec5ee5ad5dd0776bef27","src/unix/notbsd/linux/other/b64/not_x32.rs":"e1cf87b9dbe89e9fff667c6fc8eff0166a02565ef65aae3dc9304dc70f7a5624","src/unix/notbsd/linux/other/b64/powerpc64.rs":"5c20bf2bf528d329ed279f7730469b1131565029fae495803cee8809cc8d27e9","src/unix/notbsd/linux/other/b64/sparc64.rs":"884bb89cd5bc49a410ce8eb5c5d75e8db303f90dca174bf702ca541bb4bf0db6","src/unix/notbsd/linux/other/b64/x32.rs":"e521bd43a2d66f09f03a045b2e1f69f2ca91cff37922ac5b7c437d888799cee6","src/unix/notbsd/linux/other/b64/x86_64.rs":"c07dfaca8234bc1291e12a30cb91230f228199024a5aa64e41e350d33b030abb","src/unix/notbsd/linux/other/mod.rs":"11273766b0be6eda2b668796a726a6791eb16ec321c779c6586dbfacd37d46ae","src/unix/notbsd/linux/s390x.rs":"ddbb07a2f48f6cd45e1bff38e05249940202c43d3abd8cf97a754f49668119af","src/unix/notbsd/mod.rs":"4f0893bf43bda88d84530a0790e3a3f6396c6e26a32aab11851a507f328a0023","src/unix/solaris/mod.rs":"57bc5dedf4d6e41c794aee28a264a601c636508090f5eff8e77b72748e110735","src/unix/uclibc/mips/mips32.rs":"43a91d7ae53413133d1355d3791846f5c55e982ef6a10b9bdccad5b37bee8c4f","src/unix/uclibc/mips/mips64.rs":"e67eec1636a998b047d89a4cda1c99cb6bc3071db017762675179a68201c4438","src/unix/uclibc/mips/mod.rs":"74817a9b1ee3998d8e0b751a555d57225f70fd979c283c94ada344a162a8b856","src/unix/uclibc/mod.rs":"0e2f59647bc0e48c37914a3f788c2c63d67287f051d0176bdbf1a1e6388a9046","src/unix/uclibc/x86_64/l4re.rs":"54b4e58ce5a671348c32bc41c1607dbc5c13fa6818cc3e0e0e2b409c300a305e","src/unix/uclibc/x86_64/mod.rs":"bd569360c45a6f2b585cfb47544d223e92243a2ff4f8429b78fecac6b889f9fd","src/windows.rs":"e41357d610608bad81abf285306ad8b127b6f02d5132f63c4942861980b47d59"},"package":"f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"} -\ No newline at end of file --- -2.27.0 - diff --git a/0001-support-loongarch64-for-librsvg2.patch b/0001-support-loongarch64-for-librsvg2.patch deleted file mode 100644 index acb3fbec2d6ed17233bcd498317b7e775a8fa70b..0000000000000000000000000000000000000000 --- a/0001-support-loongarch64-for-librsvg2.patch +++ /dev/null @@ -1,935 +0,0 @@ -From 522b05162528c6ed09b1355e933a78792a63a5a1 Mon Sep 17 00:00:00 2001 -From: zhangwenlong -Date: Wed, 17 Nov 2021 14:31:38 +0000 -Subject: [PATCH] support loongarch64 for librsvg2 - ---- - vendor/libc/src/lib.rs | 3 + - vendor/libc/src/unix/notbsd/linux/mod.rs | 7 +- - .../notbsd/linux/other/b64/loongarch64.rs | 800 ++++++++++++++++ - .../src/unix/notbsd/linux/other/b64/mod.rs | 3 + - .../libc/src/unix/notbsd/linux/other/mod.rs | 8 + - 6 files changed, 1719 insertions(+), 2 deletions(-) - create mode 100644 vendor/libc/src/unix/notbsd/linux/other/b64/loongarch64.rs - -diff --git a/vendor/libc/src/lib.rs b/vendor/libc/src/lib.rs -index b58a873..f9ac3d1 100644 ---- a/vendor/libc/src/lib.rs -+++ b/vendor/libc/src/lib.rs -@@ -33,6 +33,9 @@ - #![cfg_attr(all(target_os = "linux", target_arch = "aarch64"), doc( - html_root_url = "https://doc.rust-lang.org/libc/aarch64-unknown-linux-gnu" - ))] -+#![cfg_attr(all(target_os = "linux", target_arch = "loongarch64"), doc( -+ html_root_url = "https://rust-lang.github.io/libc/loongarch64-unknown-linux-gnu" -+))] - #![cfg_attr(all(target_os = "linux", target_env = "musl"), doc( - html_root_url = "https://doc.rust-lang.org/libc/x86_64-unknown-linux-musl" - ))] -diff --git a/vendor/libc/src/unix/notbsd/linux/mod.rs b/vendor/libc/src/unix/notbsd/linux/mod.rs -index e495dc2..e31fe5c 100644 ---- a/vendor/libc/src/unix/notbsd/linux/mod.rs -+++ b/vendor/libc/src/unix/notbsd/linux/mod.rs -@@ -101,12 +101,14 @@ s! { - #[cfg(any(target_arch = "mips", - target_arch = "arm", - target_arch = "powerpc", -+ target_arch = "loongarch64", - all(target_arch = "x86_64", - target_pointer_width = "32")))] - __align: [::c_long; 0], - #[cfg(not(any(target_arch = "mips", - target_arch = "arm", - target_arch = "powerpc", -+ target_arch = "loongarch64", - all(target_arch = "x86_64", - target_pointer_width = "32"))))] - __align: [::c_longlong; 0], -@@ -116,11 +118,12 @@ s! { - pub struct pthread_mutexattr_t { - #[cfg(any(target_arch = "x86_64", target_arch = "powerpc64", - target_arch = "mips64", target_arch = "s390x", -- target_arch = "sparc64"))] -+ target_arch = "sparc64", target_arch = "loongarch64"))] - __align: [::c_int; 0], - #[cfg(not(any(target_arch = "x86_64", target_arch = "powerpc64", - target_arch = "mips64", target_arch = "s390x", -- target_arch = "sparc64", target_arch = "aarch64")))] -+ target_arch = "sparc64", target_arch = "aarch64", -+ target_arch = "loongarch64")))] - __align: [::c_long; 0], - #[cfg(all(target_arch = "aarch64", target_env = "gnu"))] - __align: [::c_long; 0], -diff --git a/vendor/libc/src/unix/notbsd/linux/other/b64/loongarch64.rs b/vendor/libc/src/unix/notbsd/linux/other/b64/loongarch64.rs -new file mode 100644 -index 0000000..313da19 ---- /dev/null -+++ b/vendor/libc/src/unix/notbsd/linux/other/b64/loongarch64.rs -@@ -0,0 +1,800 @@ -+//! LoongArch64-specific definitions for 64-bit linux-like values -+ -+pub type c_long = i64; -+pub type c_ulong = u64; -+pub type c_char = u8; -+pub type wchar_t = i32; -+pub type nlink_t = u32; -+pub type blksize_t = i32; -+pub type suseconds_t = i64; -+pub type __u64 = ::c_ulonglong; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ __pad1: ::dev_t, -+ pub st_size: ::off_t, -+ pub st_blksize: ::blksize_t, -+ __pad2: ::c_int, -+ pub st_blocks: ::blkcnt_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ __unused: [::c_int; 2], -+ } -+ -+ pub struct stat64 { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ __pad1: ::dev_t, -+ pub st_size: ::off64_t, -+ pub st_blksize: ::blksize_t, -+ __pad2: ::c_int, -+ pub st_blocks: ::blkcnt64_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ __unused: [::c_int; 2], -+ } -+ -+ pub struct statfs64 { -+ pub f_type: ::__fsword_t, -+ pub f_bsize: ::__fsword_t, -+ pub f_blocks: u64, -+ pub f_bfree: u64, -+ pub f_bavail: u64, -+ pub f_files: u64, -+ pub f_ffree: u64, -+ pub f_fsid: ::fsid_t, -+ pub f_namelen: ::__fsword_t, -+ pub f_frsize: ::__fsword_t, -+ pub f_flags: ::__fsword_t, -+ pub f_spare: [::__fsword_t; 4], -+ } -+ -+ pub struct statvfs { -+ pub f_bsize: ::c_ulong, -+ pub f_frsize: ::c_ulong, -+ pub f_blocks: ::fsblkcnt_t, -+ pub f_bfree: ::fsblkcnt_t, -+ pub f_bavail: ::fsblkcnt_t, -+ pub f_files: ::fsfilcnt_t, -+ pub f_ffree: ::fsfilcnt_t, -+ pub f_favail: ::fsfilcnt_t, -+ pub f_fsid: ::c_ulong, -+ pub f_flag: ::c_ulong, -+ pub f_namemax: ::c_ulong, -+ __f_spare: [::c_int; 6], -+ } -+ -+ pub struct statvfs64 { -+ pub f_bsize: ::c_ulong, -+ pub f_frsize: ::c_ulong, -+ pub f_blocks: u64, -+ pub f_bfree: u64, -+ pub f_bavail: u64, -+ pub f_files: u64, -+ pub f_ffree: u64, -+ pub f_favail: u64, -+ pub f_fsid: ::c_ulong, -+ pub f_flag: ::c_ulong, -+ pub f_namemax: ::c_ulong, -+ __f_spare: [::c_int; 6], -+ } -+ -+ pub struct pthread_attr_t { -+ __size: [u64; 7] -+ } -+ -+ pub struct ipc_perm { -+ pub __key: ::key_t, -+ pub uid: ::uid_t, -+ pub gid: ::gid_t, -+ pub cuid: ::uid_t, -+ pub cgid: ::gid_t, -+ pub mode: ::c_ushort, -+ __pad1: ::c_ushort, -+ pub __seq: ::c_ushort, -+ __unused1: ::c_ulong, -+ __unused2: ::c_ulong -+ } -+ -+ pub struct shmid_ds { -+ pub shm_perm: ::ipc_perm, -+ pub shm_segsz: ::size_t, -+ pub shm_atime: ::time_t, -+ pub shm_dtime: ::time_t, -+ pub shm_ctime: ::time_t, -+ pub shm_cpid: ::pid_t, -+ pub shm_lpid: ::pid_t, -+ pub shm_nattch: ::shmatt_t, -+ __unused4: ::c_ulong, -+ __unused5: ::c_ulong -+ } -+ -+ pub struct termios2 { -+ pub c_iflag: ::tcflag_t, -+ pub c_oflag: ::tcflag_t, -+ pub c_cflag: ::tcflag_t, -+ pub c_lflag: ::tcflag_t, -+ pub c_line: ::cc_t, -+ pub c_cc: [::cc_t; 19], -+ pub c_ispeed: ::speed_t, -+ pub c_ospeed: ::speed_t, -+ } -+} -+ -+pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56; -+ -+pub const TIOCGSOFTCAR: ::c_ulong = 0x5419; -+pub const TIOCSSOFTCAR: ::c_ulong = 0x541A; -+pub const TIOCGRS485: ::c_int = 0x542E; -+pub const TIOCSRS485: ::c_int = 0x542F; -+ -+pub const O_APPEND: ::c_int = 1024; -+pub const O_CREAT: ::c_int = 64; -+pub const O_EXCL: ::c_int = 128; -+pub const O_NOCTTY: ::c_int = 256; -+pub const O_NONBLOCK: ::c_int = 2048; -+pub const O_SYNC: ::c_int = 1052672; -+pub const O_RSYNC: ::c_int = 1052672; -+pub const O_DSYNC: ::c_int = 4096; -+pub const O_FSYNC: ::c_int = 0x101000; -+pub const O_NOATIME: ::c_int = 0o1000000; -+pub const O_PATH: ::c_int = 0o10000000; -+pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY; -+ -+pub const MAP_GROWSDOWN: ::c_int = 0x0100; -+ -+pub const EDEADLK: ::c_int = 35; -+pub const ENAMETOOLONG: ::c_int = 36; -+pub const ENOLCK: ::c_int = 37; -+pub const ENOSYS: ::c_int = 38; -+pub const ENOTEMPTY: ::c_int = 39; -+pub const ELOOP: ::c_int = 40; -+pub const ENOMSG: ::c_int = 42; -+pub const EIDRM: ::c_int = 43; -+pub const ECHRNG: ::c_int = 44; -+pub const EL2NSYNC: ::c_int = 45; -+pub const EL3HLT: ::c_int = 46; -+pub const EL3RST: ::c_int = 47; -+pub const ELNRNG: ::c_int = 48; -+pub const EUNATCH: ::c_int = 49; -+pub const ENOCSI: ::c_int = 50; -+pub const EL2HLT: ::c_int = 51; -+pub const EBADE: ::c_int = 52; -+pub const EBADR: ::c_int = 53; -+pub const EXFULL: ::c_int = 54; -+pub const ENOANO: ::c_int = 55; -+pub const EBADRQC: ::c_int = 56; -+pub const EBADSLT: ::c_int = 57; -+pub const EMULTIHOP: ::c_int = 72; -+pub const EOVERFLOW: ::c_int = 75; -+pub const ENOTUNIQ: ::c_int = 76; -+pub const EBADFD: ::c_int = 77; -+pub const EBADMSG: ::c_int = 74; -+pub const EREMCHG: ::c_int = 78; -+pub const ELIBACC: ::c_int = 79; -+pub const ELIBBAD: ::c_int = 80; -+pub const ELIBSCN: ::c_int = 81; -+pub const ELIBMAX: ::c_int = 82; -+pub const ELIBEXEC: ::c_int = 83; -+pub const EILSEQ: ::c_int = 84; -+pub const ERESTART: ::c_int = 85; -+pub const ESTRPIPE: ::c_int = 86; -+pub const EUSERS: ::c_int = 87; -+pub const ENOTSOCK: ::c_int = 88; -+pub const EDESTADDRREQ: ::c_int = 89; -+pub const EMSGSIZE: ::c_int = 90; -+pub const EPROTOTYPE: ::c_int = 91; -+pub const ENOPROTOOPT: ::c_int = 92; -+pub const EPROTONOSUPPORT: ::c_int = 93; -+pub const ESOCKTNOSUPPORT: ::c_int = 94; -+pub const EOPNOTSUPP: ::c_int = 95; -+pub const EPFNOSUPPORT: ::c_int = 96; -+pub const EAFNOSUPPORT: ::c_int = 97; -+pub const EADDRINUSE: ::c_int = 98; -+pub const EADDRNOTAVAIL: ::c_int = 99; -+pub const ENETDOWN: ::c_int = 100; -+pub const ENETUNREACH: ::c_int = 101; -+pub const ENETRESET: ::c_int = 102; -+pub const ECONNABORTED: ::c_int = 103; -+pub const ECONNRESET: ::c_int = 104; -+pub const ENOBUFS: ::c_int = 105; -+pub const EISCONN: ::c_int = 106; -+pub const ENOTCONN: ::c_int = 107; -+pub const ESHUTDOWN: ::c_int = 108; -+pub const ETOOMANYREFS: ::c_int = 109; -+pub const ETIMEDOUT: ::c_int = 110; -+pub const ECONNREFUSED: ::c_int = 111; -+pub const EHOSTDOWN: ::c_int = 112; -+pub const EHOSTUNREACH: ::c_int = 113; -+pub const EALREADY: ::c_int = 114; -+pub const EINPROGRESS: ::c_int = 115; -+pub const ESTALE: ::c_int = 116; -+pub const EDQUOT: ::c_int = 122; -+pub const ENOMEDIUM: ::c_int = 123; -+pub const EMEDIUMTYPE: ::c_int = 124; -+pub const ECANCELED: ::c_int = 125; -+pub const ENOKEY: ::c_int = 126; -+pub const EKEYEXPIRED: ::c_int = 127; -+pub const EKEYREVOKED: ::c_int = 128; -+pub const EKEYREJECTED: ::c_int = 129; -+pub const EOWNERDEAD: ::c_int = 130; -+pub const ENOTRECOVERABLE: ::c_int = 131; -+pub const EHWPOISON: ::c_int = 133; -+pub const ERFKILL: ::c_int = 132; -+ -+pub const SOL_SOCKET: ::c_int = 1; -+ -+pub const SO_REUSEADDR: ::c_int = 2; -+pub const SO_TYPE: ::c_int = 3; -+pub const SO_ERROR: ::c_int = 4; -+pub const SO_DONTROUTE: ::c_int = 5; -+pub const SO_BROADCAST: ::c_int = 6; -+pub const SO_SNDBUF: ::c_int = 7; -+pub const SO_RCVBUF: ::c_int = 8; -+pub const SO_SNDBUFFORCE: ::c_int = 32; -+pub const SO_RCVBUFFORCE: ::c_int = 33; -+pub const SO_KEEPALIVE: ::c_int = 9; -+pub const SO_OOBINLINE: ::c_int = 10; -+pub const SO_NO_CHECK: ::c_int = 11; -+pub const SO_PRIORITY: ::c_int = 12; -+pub const SO_LINGER: ::c_int = 13; -+pub const SO_BSDCOMPAT: ::c_int = 14; -+pub const SO_REUSEPORT: ::c_int = 15; -+pub const SO_PASSCRED: ::c_int = 16; -+pub const SO_PEERCRED: ::c_int = 17; -+pub const SO_RCVLOWAT: ::c_int = 18; -+pub const SO_SNDLOWAT: ::c_int = 19; -+pub const SO_RCVTIMEO: ::c_int = 20; -+pub const SO_SNDTIMEO: ::c_int = 21; -+pub const SO_SECURITY_AUTHENTICATION: ::c_int = 22; -+pub const SO_SECURITY_ENCRYPTION_TRANSPORT: ::c_int = 23; -+pub const SO_SECURITY_ENCRYPTION_NETWORK: ::c_int = 24; -+pub const SO_BINDTODEVICE: ::c_int = 25; -+pub const SO_ATTACH_FILTER: ::c_int = 26; -+pub const SO_DETACH_FILTER: ::c_int = 27; -+pub const SO_GET_FILTER: ::c_int = SO_ATTACH_FILTER; -+pub const SO_PEERNAME: ::c_int = 28; -+pub const SO_TIMESTAMP: ::c_int = 29; -+pub const SO_ACCEPTCONN: ::c_int = 30; -+pub const SO_PEERSEC: ::c_int = 31; -+pub const SO_PASSSEC: ::c_int = 34; -+pub const SO_TIMESTAMPNS: ::c_int = 35; -+pub const SCM_TIMESTAMPNS: ::c_int = SO_TIMESTAMPNS; -+pub const SO_MARK: ::c_int = 36; -+pub const SO_PROTOCOL: ::c_int = 38; -+pub const SO_DOMAIN: ::c_int = 39; -+pub const SO_RXQ_OVFL: ::c_int = 40; -+pub const SO_WIFI_STATUS: ::c_int = 41; -+pub const SCM_WIFI_STATUS: ::c_int = SO_WIFI_STATUS; -+pub const SO_PEEK_OFF: ::c_int = 42; -+pub const SO_NOFCS: ::c_int = 43; -+pub const SO_LOCK_FILTER: ::c_int = 44; -+pub const SO_SELECT_ERR_QUEUE: ::c_int = 45; -+pub const SO_BUSY_POLL: ::c_int = 46; -+pub const SO_MAX_PACING_RATE: ::c_int = 47; -+pub const SO_BPF_EXTENSIONS: ::c_int = 48; -+pub const SO_INCOMING_CPU: ::c_int = 49; -+pub const SO_ATTACH_BPF: ::c_int = 50; -+pub const SO_DETACH_BPF: ::c_int = SO_DETACH_FILTER; -+ -+pub const SA_ONSTACK: ::c_int = 0x08000000; -+pub const SA_SIGINFO: ::c_int = 0x00000004; -+pub const SA_NOCLDWAIT: ::c_int = 0x00000002; -+ -+pub const SIGCHLD: ::c_int = 17; -+pub const SIGBUS: ::c_int = 7; -+pub const SIGUSR1: ::c_int = 10; -+pub const SIGUSR2: ::c_int = 12; -+pub const SIGCONT: ::c_int = 18; -+pub const SIGSTOP: ::c_int = 19; -+pub const SIGTSTP: ::c_int = 20; -+pub const SIGURG: ::c_int = 23; -+pub const SIGIO: ::c_int = 29; -+pub const SIGSYS: ::c_int = 31; -+pub const SIGSTKFLT: ::c_int = 16; -+pub const SIGUNUSED: ::c_int = 31; -+pub const SIGPOLL: ::c_int = 29; -+pub const SIGPWR: ::c_int = 30; -+pub const SIG_SETMASK: ::c_int = 2; -+pub const SIG_BLOCK: ::c_int = 0x000000; -+pub const SIG_UNBLOCK: ::c_int = 0x01; -+ -+pub const POLLWRNORM: ::c_short = 0x100; -+pub const POLLWRBAND: ::c_short = 0x200; -+ -+pub const O_ASYNC: ::c_int = 0x2000; -+pub const O_NDELAY: ::c_int = 0x800; -+ -+pub const PTRACE_DETACH: ::c_uint = 17; -+ -+pub const EFD_NONBLOCK: ::c_int = 0x800; -+ -+pub const F_GETLK: ::c_int = 5; -+pub const F_GETOWN: ::c_int = 9; -+pub const F_SETOWN: ::c_int = 8; -+pub const F_SETLK: ::c_int = 6; -+pub const F_SETLKW: ::c_int = 7; -+ -+pub const F_RDLCK: ::c_int = 0; -+pub const F_WRLCK: ::c_int = 1; -+pub const F_UNLCK: ::c_int = 2; -+ -+pub const SFD_NONBLOCK: ::c_int = 0x0800; -+ -+pub const TIOCEXCL: ::c_ulong = 0x540C; -+pub const TIOCNXCL: ::c_ulong = 0x540D; -+pub const TIOCSCTTY: ::c_ulong = 0x540E; -+pub const TIOCSTI: ::c_ulong = 0x5412; -+pub const TIOCMGET: ::c_ulong = 0x5415; -+pub const TIOCMBIS: ::c_ulong = 0x5416; -+pub const TIOCMBIC: ::c_ulong = 0x5417; -+pub const TIOCMSET: ::c_ulong = 0x5418; -+pub const TIOCCONS: ::c_ulong = 0x541D; -+ -+pub const SFD_CLOEXEC: ::c_int = 0x080000; -+ -+pub const NCCS: usize = 32; -+ -+pub const O_TRUNC: ::c_int = 512; -+ -+pub const O_CLOEXEC: ::c_int = 0x80000; -+ -+pub const EBFONT: ::c_int = 59; -+pub const ENOSTR: ::c_int = 60; -+pub const ENODATA: ::c_int = 61; -+pub const ETIME: ::c_int = 62; -+pub const ENOSR: ::c_int = 63; -+pub const ENONET: ::c_int = 64; -+pub const ENOPKG: ::c_int = 65; -+pub const EREMOTE: ::c_int = 66; -+pub const ENOLINK: ::c_int = 67; -+pub const EADV: ::c_int = 68; -+pub const ESRMNT: ::c_int = 69; -+pub const ECOMM: ::c_int = 70; -+pub const EPROTO: ::c_int = 71; -+pub const EDOTDOT: ::c_int = 73; -+ -+pub const SA_NODEFER: ::c_int = 0x40000000; -+pub const SA_RESETHAND: ::c_int = 0x80000000; -+pub const SA_RESTART: ::c_int = 0x10000000; -+pub const SA_NOCLDSTOP: ::c_int = 0x00000001; -+ -+pub const EPOLL_CLOEXEC: ::c_int = 0x80000; -+ -+pub const EFD_CLOEXEC: ::c_int = 0x80000; -+ -+pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4; -+pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40; -+pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4; -+ -+pub const O_DIRECT: ::c_int = 0x4000; -+pub const O_DIRECTORY: ::c_int = 0x10000; -+pub const O_NOFOLLOW: ::c_int = 0x20000; -+ -+pub const MAP_LOCKED: ::c_int = 0x02000; -+pub const MAP_NORESERVE: ::c_int = 0x04000; -+ -+pub const EDEADLOCK: ::c_int = 35; -+ -+pub const FIOCLEX: ::c_ulong = 0x5451; -+pub const FIONCLEX: ::c_ulong = 0x5450; -+pub const FIONBIO: ::c_ulong = 0x5421; -+ -+pub const MCL_CURRENT: ::c_int = 0x0001; -+pub const MCL_FUTURE: ::c_int = 0x0002; -+ -+pub const SIGSTKSZ: ::size_t = 8192; -+pub const MINSIGSTKSZ: ::size_t = 2048; -+pub const CBAUD: ::tcflag_t = 0o0010017; -+pub const TAB1: ::tcflag_t = 0x00000800; -+pub const TAB2: ::tcflag_t = 0x00001000; -+pub const TAB3: ::tcflag_t = 0x00001800; -+pub const CR1: ::tcflag_t = 0x00000200; -+pub const CR2: ::tcflag_t = 0x00000400; -+pub const CR3: ::tcflag_t = 0x00000600; -+pub const FF1: ::tcflag_t = 0x00008000; -+pub const BS1: ::tcflag_t = 0x00002000; -+pub const VT1: ::tcflag_t = 0x00004000; -+pub const VWERASE: usize = 14; -+pub const VREPRINT: usize = 12; -+pub const VSUSP: usize = 10; -+pub const VSTART: usize = 8; -+pub const VSTOP: usize = 9; -+pub const VDISCARD: usize = 13; -+pub const VTIME: usize = 5; -+pub const IXON: ::tcflag_t = 0x00000400; -+pub const IXOFF: ::tcflag_t = 0x00001000; -+pub const ONLCR: ::tcflag_t = 0x4; -+pub const CSIZE: ::tcflag_t = 0x00000030; -+pub const CS6: ::tcflag_t = 0x00000010; -+pub const CS7: ::tcflag_t = 0x00000020; -+pub const CS8: ::tcflag_t = 0x00000030; -+pub const CSTOPB: ::tcflag_t = 0x00000040; -+pub const CREAD: ::tcflag_t = 0x00000080; -+pub const PARENB: ::tcflag_t = 0x00000100; -+pub const PARODD: ::tcflag_t = 0x00000200; -+pub const HUPCL: ::tcflag_t = 0x00000400; -+pub const CLOCAL: ::tcflag_t = 0x00000800; -+pub const ECHOKE: ::tcflag_t = 0x00000800; -+pub const ECHOE: ::tcflag_t = 0x00000010; -+pub const ECHOK: ::tcflag_t = 0x00000020; -+pub const ECHONL: ::tcflag_t = 0x00000040; -+pub const ECHOPRT: ::tcflag_t = 0x00000400; -+pub const ECHOCTL: ::tcflag_t = 0x00000200; -+pub const ISIG: ::tcflag_t = 0x00000001; -+pub const ICANON: ::tcflag_t = 0x00000002; -+pub const PENDIN: ::tcflag_t = 0x00004000; -+pub const NOFLSH: ::tcflag_t = 0x00000080; -+pub const CIBAUD: ::tcflag_t = 0o02003600000; -+pub const CBAUDEX: ::tcflag_t = 0o010000; -+pub const VSWTC: usize = 7; -+pub const OLCUC: ::tcflag_t = 0o000002; -+pub const NLDLY: ::tcflag_t = 0o000400; -+pub const CRDLY: ::tcflag_t = 0o003000; -+pub const TABDLY: ::tcflag_t = 0o014000; -+pub const BSDLY: ::tcflag_t = 0o020000; -+pub const FFDLY: ::tcflag_t = 0o100000; -+pub const VTDLY: ::tcflag_t = 0o040000; -+pub const XTABS: ::tcflag_t = 0o014000; -+ -+pub const B0: ::speed_t = 0o000000; -+pub const B50: ::speed_t = 0o000001; -+pub const B75: ::speed_t = 0o000002; -+pub const B110: ::speed_t = 0o000003; -+pub const B134: ::speed_t = 0o000004; -+pub const B150: ::speed_t = 0o000005; -+pub const B200: ::speed_t = 0o000006; -+pub const B300: ::speed_t = 0o000007; -+pub const B600: ::speed_t = 0o000010; -+pub const B1200: ::speed_t = 0o000011; -+pub const B1800: ::speed_t = 0o000012; -+pub const B2400: ::speed_t = 0o000013; -+pub const B4800: ::speed_t = 0o000014; -+pub const B9600: ::speed_t = 0o000015; -+pub const B19200: ::speed_t = 0o000016; -+pub const B38400: ::speed_t = 0o000017; -+pub const EXTA: ::speed_t = B19200; -+pub const EXTB: ::speed_t = B38400; -+pub const BOTHER: ::speed_t = 0o010000; -+pub const B57600: ::speed_t = 0o010001; -+pub const B115200: ::speed_t = 0o010002; -+pub const B230400: ::speed_t = 0o010003; -+pub const B460800: ::speed_t = 0o010004; -+pub const B500000: ::speed_t = 0o010005; -+pub const B576000: ::speed_t = 0o010006; -+pub const B921600: ::speed_t = 0o010007; -+pub const B1000000: ::speed_t = 0o010010; -+pub const B1152000: ::speed_t = 0o010011; -+pub const B1500000: ::speed_t = 0o010012; -+pub const B2000000: ::speed_t = 0o010013; -+pub const B2500000: ::speed_t = 0o010014; -+pub const B3000000: ::speed_t = 0o010015; -+pub const B3500000: ::speed_t = 0o010016; -+pub const B4000000: ::speed_t = 0o010017; -+ -+pub const VEOL: usize = 11; -+pub const VEOL2: usize = 16; -+pub const VMIN: usize = 6; -+pub const IEXTEN: ::tcflag_t = 0x00008000; -+pub const TOSTOP: ::tcflag_t = 0x00000100; -+pub const FLUSHO: ::tcflag_t = 0x00001000; -+pub const EXTPROC: ::tcflag_t = 0x00010000; -+pub const TCGETS: ::c_ulong = 0x5401; -+pub const TCSETS: ::c_ulong = 0x5402; -+pub const TCSETSW: ::c_ulong = 0x5403; -+pub const TCSETSF: ::c_ulong = 0x5404; -+pub const TCGETA: ::c_ulong = 0x5405; -+pub const TCSETA: ::c_ulong = 0x5406; -+pub const TCSETAW: ::c_ulong = 0x5407; -+pub const TCSETAF: ::c_ulong = 0x5408; -+pub const TCSBRK: ::c_ulong = 0x5409; -+pub const TCXONC: ::c_ulong = 0x540A; -+pub const TCFLSH: ::c_ulong = 0x540B; -+pub const TIOCINQ: ::c_ulong = 0x541B; -+pub const TIOCGPGRP: ::c_ulong = 0x540F; -+pub const TIOCSPGRP: ::c_ulong = 0x5410; -+pub const TIOCOUTQ: ::c_ulong = 0x5411; -+pub const TIOCGWINSZ: ::c_ulong = 0x5413; -+pub const TIOCSWINSZ: ::c_ulong = 0x5414; -+pub const FIONREAD: ::c_ulong = 0x541B; -+ -+// Syscall table -+pub const SYS_io_setup: ::c_long = 0; -+pub const SYS_io_destroy: ::c_long = 1; -+pub const SYS_io_submit: ::c_long = 2; -+pub const SYS_io_cancel: ::c_long = 3; -+pub const SYS_io_getevents: ::c_long = 4; -+pub const SYS_setxattr: ::c_long = 5; -+pub const SYS_lsetxattr: ::c_long = 6; -+pub const SYS_fsetxattr: ::c_long = 7; -+pub const SYS_getxattr: ::c_long = 8; -+pub const SYS_lgetxattr: ::c_long = 9; -+pub const SYS_fgetxattr: ::c_long = 10; -+pub const SYS_listxattr: ::c_long = 11; -+pub const SYS_llistxattr: ::c_long = 12; -+pub const SYS_flistxattr: ::c_long = 13; -+pub const SYS_removexattr: ::c_long = 14; -+pub const SYS_lremovexattr: ::c_long = 15; -+pub const SYS_fremovexattr: ::c_long = 16; -+pub const SYS_getcwd: ::c_long = 17; -+pub const SYS_lookup_dcookie: ::c_long = 18; -+pub const SYS_eventfd2: ::c_long = 19; -+pub const SYS_epoll_create1: ::c_long = 20; -+pub const SYS_epoll_ctl: ::c_long = 21; -+pub const SYS_epoll_pwait: ::c_long = 22; -+pub const SYS_dup: ::c_long = 23; -+pub const SYS_dup3: ::c_long = 24; -+pub const SYS_fcntl: ::c_long = 25; -+pub const SYS_inotify_init1: ::c_long = 26; -+pub const SYS_inotify_add_watch: ::c_long = 27; -+pub const SYS_inotify_rm_watch: ::c_long = 28; -+pub const SYS_ioctl: ::c_long = 29; -+pub const SYS_ioprio_set: ::c_long = 30; -+pub const SYS_ioprio_get: ::c_long = 31; -+pub const SYS_flock: ::c_long = 32; -+pub const SYS_mknodat: ::c_long = 33; -+pub const SYS_mkdirat: ::c_long = 34; -+pub const SYS_unlinkat: ::c_long = 35; -+pub const SYS_symlinkat: ::c_long = 36; -+pub const SYS_linkat: ::c_long = 37; -+pub const SYS_umount2: ::c_long = 39; -+pub const SYS_mount: ::c_long = 40; -+pub const SYS_pivot_root: ::c_long = 41; -+pub const SYS_nfsservctl: ::c_long = 42; -+pub const SYS_fallocate: ::c_long = 47; -+pub const SYS_faccessat: ::c_long = 48; -+pub const SYS_chdir: ::c_long = 49; -+pub const SYS_fchdir: ::c_long = 50; -+pub const SYS_chroot: ::c_long = 51; -+pub const SYS_fchmod: ::c_long = 52; -+pub const SYS_fchmodat: ::c_long = 53; -+pub const SYS_fchownat: ::c_long = 54; -+pub const SYS_fchown: ::c_long = 55; -+pub const SYS_openat: ::c_long = 56; -+pub const SYS_close: ::c_long = 57; -+pub const SYS_vhangup: ::c_long = 58; -+pub const SYS_pipe2: ::c_long = 59; -+pub const SYS_quotactl: ::c_long = 60; -+pub const SYS_getdents64: ::c_long = 61; -+pub const SYS_lseek: ::c_long = 62; -+pub const SYS_read: ::c_long = 63; -+pub const SYS_write: ::c_long = 64; -+pub const SYS_readv: ::c_long = 65; -+pub const SYS_writev: ::c_long = 66; -+pub const SYS_pread64: ::c_long = 67; -+pub const SYS_pwrite64: ::c_long = 68; -+pub const SYS_preadv: ::c_long = 69; -+pub const SYS_pwritev: ::c_long = 70; -+pub const SYS_pselect6: ::c_long = 72; -+pub const SYS_ppoll: ::c_long = 73; -+pub const SYS_signalfd4: ::c_long = 74; -+pub const SYS_vmsplice: ::c_long = 75; -+pub const SYS_splice: ::c_long = 76; -+pub const SYS_tee: ::c_long = 77; -+pub const SYS_readlinkat: ::c_long = 78; -+pub const SYS_newfstatat: ::c_long = 79; -+pub const SYS_fstat: ::c_long = 80; -+pub const SYS_sync: ::c_long = 81; -+pub const SYS_fsync: ::c_long = 82; -+pub const SYS_fdatasync: ::c_long = 83; -+pub const SYS_sync_file_range: ::c_long = 84; -+pub const SYS_timerfd_create: ::c_long = 85; -+pub const SYS_timerfd_settime: ::c_long = 86; -+pub const SYS_timerfd_gettime: ::c_long = 87; -+pub const SYS_utimensat: ::c_long = 88; -+pub const SYS_acct: ::c_long = 89; -+pub const SYS_capget: ::c_long = 90; -+pub const SYS_capset: ::c_long = 91; -+pub const SYS_personality: ::c_long = 92; -+pub const SYS_exit: ::c_long = 93; -+pub const SYS_exit_group: ::c_long = 94; -+pub const SYS_waitid: ::c_long = 95; -+pub const SYS_set_tid_address: ::c_long = 96; -+pub const SYS_unshare: ::c_long = 97; -+pub const SYS_futex: ::c_long = 98; -+pub const SYS_set_robust_list: ::c_long = 99; -+pub const SYS_get_robust_list: ::c_long = 100; -+pub const SYS_nanosleep: ::c_long = 101; -+pub const SYS_getitimer: ::c_long = 102; -+pub const SYS_setitimer: ::c_long = 103; -+pub const SYS_kexec_load: ::c_long = 104; -+pub const SYS_init_module: ::c_long = 105; -+pub const SYS_delete_module: ::c_long = 106; -+pub const SYS_timer_create: ::c_long = 107; -+pub const SYS_timer_gettime: ::c_long = 108; -+pub const SYS_timer_getoverrun: ::c_long = 109; -+pub const SYS_timer_settime: ::c_long = 110; -+pub const SYS_timer_delete: ::c_long = 111; -+pub const SYS_clock_settime: ::c_long = 112; -+pub const SYS_clock_gettime: ::c_long = 113; -+pub const SYS_clock_getres: ::c_long = 114; -+pub const SYS_clock_nanosleep: ::c_long = 115; -+pub const SYS_syslog: ::c_long = 116; -+pub const SYS_ptrace: ::c_long = 117; -+pub const SYS_sched_setparam: ::c_long = 118; -+pub const SYS_sched_setscheduler: ::c_long = 119; -+pub const SYS_sched_getscheduler: ::c_long = 120; -+pub const SYS_sched_getparam: ::c_long = 121; -+pub const SYS_sched_setaffinity: ::c_long = 122; -+pub const SYS_sched_getaffinity: ::c_long = 123; -+pub const SYS_sched_yield: ::c_long = 124; -+pub const SYS_sched_get_priority_max: ::c_long = 125; -+pub const SYS_sched_get_priority_min: ::c_long = 126; -+pub const SYS_sched_rr_get_interval: ::c_long = 127; -+pub const SYS_restart_syscall: ::c_long = 128; -+pub const SYS_kill: ::c_long = 129; -+pub const SYS_tkill: ::c_long = 130; -+pub const SYS_tgkill: ::c_long = 131; -+pub const SYS_sigaltstack: ::c_long = 132; -+pub const SYS_rt_sigsuspend: ::c_long = 133; -+pub const SYS_rt_sigaction: ::c_long = 134; -+pub const SYS_rt_sigprocmask: ::c_long = 135; -+pub const SYS_rt_sigpending: ::c_long = 136; -+pub const SYS_rt_sigtimedwait: ::c_long = 137; -+pub const SYS_rt_sigqueueinfo: ::c_long = 138; -+pub const SYS_rt_sigreturn: ::c_long = 139; -+pub const SYS_setpriority: ::c_long = 140; -+pub const SYS_getpriority: ::c_long = 141; -+pub const SYS_reboot: ::c_long = 142; -+pub const SYS_setregid: ::c_long = 143; -+pub const SYS_setgid: ::c_long = 144; -+pub const SYS_setreuid: ::c_long = 145; -+pub const SYS_setuid: ::c_long = 146; -+pub const SYS_setresuid: ::c_long = 147; -+pub const SYS_getresuid: ::c_long = 148; -+pub const SYS_setresgid: ::c_long = 149; -+pub const SYS_getresgid: ::c_long = 150; -+pub const SYS_setfsuid: ::c_long = 151; -+pub const SYS_setfsgid: ::c_long = 152; -+pub const SYS_times: ::c_long = 153; -+pub const SYS_setpgid: ::c_long = 154; -+pub const SYS_getpgid: ::c_long = 155; -+pub const SYS_getsid: ::c_long = 156; -+pub const SYS_setsid: ::c_long = 157; -+pub const SYS_getgroups: ::c_long = 158; -+pub const SYS_setgroups: ::c_long = 159; -+pub const SYS_uname: ::c_long = 160; -+pub const SYS_sethostname: ::c_long = 161; -+pub const SYS_setdomainname: ::c_long = 162; -+pub const SYS_getrlimit: ::c_long = 163; -+pub const SYS_setrlimit: ::c_long = 164; -+pub const SYS_getrusage: ::c_long = 165; -+pub const SYS_umask: ::c_long = 166; -+pub const SYS_prctl: ::c_long = 167; -+pub const SYS_getcpu: ::c_long = 168; -+pub const SYS_gettimeofday: ::c_long = 169; -+pub const SYS_settimeofday: ::c_long = 170; -+pub const SYS_adjtimex: ::c_long = 171; -+pub const SYS_getpid: ::c_long = 172; -+pub const SYS_getppid: ::c_long = 173; -+pub const SYS_getuid: ::c_long = 174; -+pub const SYS_geteuid: ::c_long = 175; -+pub const SYS_getgid: ::c_long = 176; -+pub const SYS_getegid: ::c_long = 177; -+pub const SYS_gettid: ::c_long = 178; -+pub const SYS_sysinfo: ::c_long = 179; -+pub const SYS_mq_open: ::c_long = 180; -+pub const SYS_mq_unlink: ::c_long = 181; -+pub const SYS_mq_timedsend: ::c_long = 182; -+pub const SYS_mq_timedreceive: ::c_long = 183; -+pub const SYS_mq_notify: ::c_long = 184; -+pub const SYS_mq_getsetattr: ::c_long = 185; -+pub const SYS_msgget: ::c_long = 186; -+pub const SYS_msgctl: ::c_long = 187; -+pub const SYS_msgrcv: ::c_long = 188; -+pub const SYS_msgsnd: ::c_long = 189; -+pub const SYS_semget: ::c_long = 190; -+pub const SYS_semctl: ::c_long = 191; -+pub const SYS_semtimedop: ::c_long = 192; -+pub const SYS_semop: ::c_long = 193; -+pub const SYS_shmget: ::c_long = 194; -+pub const SYS_shmctl: ::c_long = 195; -+pub const SYS_shmat: ::c_long = 196; -+pub const SYS_shmdt: ::c_long = 197; -+pub const SYS_socket: ::c_long = 198; -+pub const SYS_socketpair: ::c_long = 199; -+pub const SYS_bind: ::c_long = 200; -+pub const SYS_listen: ::c_long = 201; -+pub const SYS_accept: ::c_long = 202; -+pub const SYS_connect: ::c_long = 203; -+pub const SYS_getsockname: ::c_long = 204; -+pub const SYS_getpeername: ::c_long = 205; -+pub const SYS_sendto: ::c_long = 206; -+pub const SYS_recvfrom: ::c_long = 207; -+pub const SYS_setsockopt: ::c_long = 208; -+pub const SYS_getsockopt: ::c_long = 209; -+pub const SYS_shutdown: ::c_long = 210; -+pub const SYS_sendmsg: ::c_long = 211; -+pub const SYS_recvmsg: ::c_long = 212; -+pub const SYS_readahead: ::c_long = 213; -+pub const SYS_brk: ::c_long = 214; -+pub const SYS_munmap: ::c_long = 215; -+pub const SYS_mremap: ::c_long = 216; -+pub const SYS_add_key: ::c_long = 217; -+pub const SYS_request_key: ::c_long = 218; -+pub const SYS_keyctl: ::c_long = 219; -+pub const SYS_clone: ::c_long = 220; -+pub const SYS_execve: ::c_long = 221; -+pub const SYS_mmap: ::c_long = 222; -+pub const SYS_swapon: ::c_long = 224; -+pub const SYS_swapoff: ::c_long = 225; -+pub const SYS_mprotect: ::c_long = 226; -+pub const SYS_msync: ::c_long = 227; -+pub const SYS_mlock: ::c_long = 228; -+pub const SYS_munlock: ::c_long = 229; -+pub const SYS_mlockall: ::c_long = 230; -+pub const SYS_munlockall: ::c_long = 231; -+pub const SYS_mincore: ::c_long = 232; -+pub const SYS_madvise: ::c_long = 233; -+pub const SYS_remap_file_pages: ::c_long = 234; -+pub const SYS_mbind: ::c_long = 235; -+pub const SYS_get_mempolicy: ::c_long = 236; -+pub const SYS_set_mempolicy: ::c_long = 237; -+pub const SYS_migrate_pages: ::c_long = 238; -+pub const SYS_move_pages: ::c_long = 239; -+pub const SYS_rt_tgsigqueueinfo: ::c_long = 240; -+pub const SYS_perf_event_open: ::c_long = 241; -+pub const SYS_accept4: ::c_long = 242; -+pub const SYS_recvmmsg: ::c_long = 243; -+pub const SYS_wait4: ::c_long = 260; -+pub const SYS_prlimit64: ::c_long = 261; -+pub const SYS_fanotify_init: ::c_long = 262; -+pub const SYS_fanotify_mark: ::c_long = 263; -+pub const SYS_name_to_handle_at: ::c_long = 264; -+pub const SYS_open_by_handle_at: ::c_long = 265; -+pub const SYS_clock_adjtime: ::c_long = 266; -+pub const SYS_syncfs: ::c_long = 267; -+pub const SYS_setns: ::c_long = 268; -+pub const SYS_sendmmsg: ::c_long = 269; -+pub const SYS_process_vm_readv: ::c_long = 270; -+pub const SYS_process_vm_writev: ::c_long = 271; -+pub const SYS_kcmp: ::c_long = 272; -+pub const SYS_finit_module: ::c_long = 273; -+pub const SYS_sched_setattr: ::c_long = 274; -+pub const SYS_sched_getattr: ::c_long = 275; -+pub const SYS_renameat2: ::c_long = 276; -+pub const SYS_seccomp: ::c_long = 277; -+pub const SYS_getrandom: ::c_long = 278; -+pub const SYS_memfd_create: ::c_long = 279; -+pub const SYS_bpf: ::c_long = 280; -+pub const SYS_execveat: ::c_long = 281; -+pub const SYS_userfaultfd: ::c_long = 282; -+pub const SYS_membarrier: ::c_long = 283; -+pub const SYS_mlock2: ::c_long = 284; -+pub const SYS_copy_file_range: ::c_long = 285; -+pub const SYS_preadv2: ::c_long = 286; -+pub const SYS_pwritev2: ::c_long = 287; -+pub const SYS_pkey_mprotect: ::c_long = 288; -+pub const SYS_pkey_alloc: ::c_long = 289; -+pub const SYS_pkey_free: ::c_long = 290; -+ -+#[link(name = "util")] -+extern { -+ pub fn sysctl(name: *mut ::c_int, -+ namelen: ::c_int, -+ oldp: *mut ::c_void, -+ oldlenp: *mut ::size_t, -+ newp: *mut ::c_void, -+ newlen: ::size_t) -+ -> ::c_int; -+} -diff --git a/vendor/libc/src/unix/notbsd/linux/other/b64/mod.rs b/vendor/libc/src/unix/notbsd/linux/other/b64/mod.rs -index 7fcf8ba..01557be 100644 ---- a/vendor/libc/src/unix/notbsd/linux/other/b64/mod.rs -+++ b/vendor/libc/src/unix/notbsd/linux/other/b64/mod.rs -@@ -67,6 +67,9 @@ cfg_if! { - } else if #[cfg(any(target_arch = "sparc64"))] { - mod sparc64; - pub use self::sparc64::*; -+ } else if #[cfg(any(target_arch = "loongarch64"))] { -+ mod loongarch64; -+ pub use self::loongarch64::*; - } else if #[cfg(any(target_arch = "x86_64"))] { - mod x86_64; - pub use self::x86_64::*; -diff --git a/vendor/libc/src/unix/notbsd/linux/other/mod.rs b/vendor/libc/src/unix/notbsd/linux/other/mod.rs -index b566a95..fe0b89a 100644 ---- a/vendor/libc/src/unix/notbsd/linux/other/mod.rs -+++ b/vendor/libc/src/unix/notbsd/linux/other/mod.rs -@@ -40,22 +40,26 @@ s! { - pub ut_exit: __exit_status, - - #[cfg(any(target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "sparc64", - all(target_pointer_width = "32", - not(target_arch = "x86_64"))))] - pub ut_session: ::c_long, - #[cfg(any(target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "sparc64", - all(target_pointer_width = "32", - not(target_arch = "x86_64"))))] - pub ut_tv: ::timeval, - - #[cfg(not(any(target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "sparc64", - all(target_pointer_width = "32", - not(target_arch = "x86_64")))))] - pub ut_session: ::int32_t, - #[cfg(not(any(target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "sparc64", - all(target_pointer_width = "32", - not(target_arch = "x86_64")))))] -@@ -672,7 +676,10 @@ cfg_if! { - pub const NFT_MSG_GETOBJ: ::c_int = 19; - pub const NFT_MSG_DELOBJ: ::c_int = 20; - pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21; -+ #[cfg(not(target_arch = "loongarch64"))] - pub const NFT_MSG_MAX: ::c_int = 22; -+ #[cfg(any(target_arch = "loongarch64"))] -+ pub const NFT_MSG_MAX: ::c_int = 25; - } else { - pub const NFT_MSG_MAX: ::c_int = 18; - } -@@ -890,6 +897,7 @@ cfg_if! { - pub use self::b32::*; - } else if #[cfg(any(target_arch = "x86_64", - target_arch = "aarch64", -+ target_arch = "loongarch64", - target_arch = "powerpc64", - target_arch = "sparc64"))] { - mod b64; --- -2.27.0 - diff --git a/CVE-2019-20446.patch b/CVE-2019-20446.patch deleted file mode 100644 index a1d750020580f557f90770c045866498d41c080e..0000000000000000000000000000000000000000 --- a/CVE-2019-20446.patch +++ /dev/null @@ -1,573 +0,0 @@ -From faec595a1721a2496e9c258917facbb564f85854 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Wed, 13 May 2020 17:53:13 -0500 -Subject: [PATCH] CVE-2019-20446.patch - ---- - librsvg/rsvg-base.c | 90 +++++++++--- - librsvg/rsvg-private.h | 5 +- - rsvg_internals/src/drawing_ctx.rs | 23 ++-- - rsvg_internals/src/structure.rs | 21 ++- - tests/errors.c | 52 ++++++- - .../errors/308-doubly-recursive-use.svg | 13 ++ - tests/fixtures/errors/308-recursive-use.svg | 9 ++ - tests/fixtures/errors/308-use-self-ref.svg | 7 + - .../errors/515-pattern-billion-laughs.svg | 130 ++++++++++++++++++ - .../errors/515-too-many-elements.svgz | Bin 0 -> 40811 bytes - 10 files changed, 310 insertions(+), 40 deletions(-) - create mode 100644 tests/fixtures/errors/308-doubly-recursive-use.svg - create mode 100644 tests/fixtures/errors/308-recursive-use.svg - create mode 100644 tests/fixtures/errors/308-use-self-ref.svg - create mode 100644 tests/fixtures/errors/515-pattern-billion-laughs.svg - create mode 100644 tests/fixtures/errors/515-too-many-elements.svgz - -diff --git a/librsvg/rsvg-base.c b/librsvg/rsvg-base.c -index dbad819..af3d43c 100644 ---- a/librsvg/rsvg-base.c -+++ b/librsvg/rsvg-base.c -@@ -431,12 +431,29 @@ node_set_atts (RsvgNode * node, RsvgHandle *handle, const NodeCreator *creator, - } - } - -+static gboolean -+loading_limits_exceeded (RsvgHandle *handle) -+{ -+ /* This is a mitigation for SVG files which create millions of elements -+ * in an attempt to exhaust memory. We don't allow loading more than -+ * this number of elements during the initial streaming load process. -+ */ -+ return handle->priv->num_loaded_elements > 200000; -+} -+ - static void - rsvg_standard_element_start (RsvgHandle *handle, const char *name, RsvgPropertyBag * atts) - { - const NodeCreator *creator; - RsvgNode *newnode = NULL; - -+ if (loading_limits_exceeded (handle)) { -+ g_set_error (handle->priv->error, RSVG_ERROR, 0, "instancing limit"); -+ -+ xmlStopParser (handle->priv->ctxt); -+ return; -+ } -+ - creator = get_node_creator_for_element_name (name); - g_assert (creator != NULL && creator->create_fn != NULL); - -@@ -456,6 +473,7 @@ rsvg_standard_element_start (RsvgHandle *handle, const char *name, RsvgPropertyB - handle->priv->treebase = rsvg_node_ref (newnode); - } - -+ handle->priv->num_loaded_elements += 1; - handle->priv->currentnode = rsvg_node_ref (newnode); - - node_set_atts (newnode, handle, creator, atts); -@@ -1641,6 +1659,52 @@ rsvg_push_discrete_layer (RsvgDrawingCtx * ctx) - ctx->render->push_discrete_layer (ctx); - } - -+void -+rsvg_drawing_ctx_increase_num_elements_acquired (RsvgDrawingCtx *draw_ctx) -+{ -+ draw_ctx->num_elements_acquired++; -+} -+ -+/* This is a mitigation for the security-related bugs: -+ * https://gitlab.gnome.org/GNOME/librsvg/issues/323 -+ * https://gitlab.gnome.org/GNOME/librsvg/issues/515 -+ * -+ * Imagine the XML [billion laughs attack], but done in SVG's terms: -+ * -+ * - #323 above creates deeply nested groups of `` elements. -+ * The first one references the second one ten times, the second one -+ * references the third one ten times, and so on. In the file given, -+ * this causes 10^17 objects to be rendered. While this does not -+ * exhaust memory, it would take a really long time. -+ * -+ * - #515 has deeply nested references of `` elements. Each -+ * object inside each pattern has an attribute -+ * fill="url(#next_pattern)", so the number of final rendered objects -+ * grows exponentially. -+ * -+ * We deal with both cases by placing a limit on how many references -+ * will be resolved during the SVG rendering process, that is, -+ * how many `url(#foo)` will be resolved. -+ * -+ * [billion laughs attack]: https://bitbucket.org/tiran/defusedxml -+ */ -+static gboolean -+limits_exceeded (RsvgDrawingCtx *draw_ctx) -+{ -+ return draw_ctx->num_elements_acquired > 500000; -+} -+ -+RsvgNode * -+rsvg_drawing_ctx_acquire_node_ref (RsvgDrawingCtx * ctx, RsvgNode *node) -+{ -+ if (g_slist_find (ctx->acquired_nodes, node)) -+ return NULL; -+ -+ ctx->acquired_nodes = g_slist_prepend (ctx->acquired_nodes, node); -+ -+ return node; -+} -+ - /* - * rsvg_drawing_ctx_acquire_node: - * @ctx: The drawing context in use -@@ -1668,16 +1732,15 @@ rsvg_drawing_ctx_acquire_node (RsvgDrawingCtx * ctx, const char *url) - if (url == NULL) - return NULL; - -+ rsvg_drawing_ctx_increase_num_elements_acquired (ctx); -+ if (limits_exceeded (ctx)) -+ return NULL; -+ - node = rsvg_defs_lookup (ctx->defs, url); - if (node == NULL) - return NULL; - -- if (g_slist_find (ctx->acquired_nodes, node)) -- return NULL; -- -- ctx->acquired_nodes = g_slist_prepend (ctx->acquired_nodes, node); -- -- return node; -+ return rsvg_drawing_ctx_acquire_node_ref (ctx, node); - } - - /** -@@ -1734,18 +1797,9 @@ rsvg_drawing_ctx_release_node (RsvgDrawingCtx * ctx, RsvgNode *node) - if (node == NULL) - return; - -- g_return_if_fail (ctx->acquired_nodes != NULL); -- g_return_if_fail (ctx->acquired_nodes->data == node); -- - ctx->acquired_nodes = g_slist_remove (ctx->acquired_nodes, node); - } - --void --rsvg_drawing_ctx_increase_num_elements_rendered_through_use (RsvgDrawingCtx *draw_ctx) --{ -- draw_ctx->num_elements_rendered_through_use++; --} -- - void - rsvg_drawing_ctx_add_node_and_ancestors_to_stack (RsvgDrawingCtx *draw_ctx, RsvgNode *node) - { -@@ -1759,12 +1813,6 @@ rsvg_drawing_ctx_add_node_and_ancestors_to_stack (RsvgDrawingCtx *draw_ctx, Rsvg - } - } - --static gboolean --limits_exceeded (RsvgDrawingCtx *draw_ctx) --{ -- return draw_ctx->num_elements_rendered_through_use > 500000; --} -- - gboolean - rsvg_drawing_ctx_draw_node_from_stack (RsvgDrawingCtx *ctx, RsvgNode *node, int dominate) - { -diff --git a/librsvg/rsvg-private.h b/librsvg/rsvg-private.h -index aeec8d5..06f4c2b 100644 ---- a/librsvg/rsvg-private.h -+++ b/librsvg/rsvg-private.h -@@ -164,6 +164,7 @@ struct RsvgHandlePrivate { - */ - RsvgSaxHandler *handler; - int handler_nest; -+ gsize num_loaded_elements; - - GHashTable *entities; /* g_malloc'd string -> xmlEntityPtr */ - -@@ -200,7 +201,7 @@ struct RsvgDrawingCtx { - RsvgState *state; - GError **error; - RsvgDefs *defs; -- gsize num_elements_rendered_through_use; -+ gsize num_elements_acquired; - PangoContext *pango_context; - double dpi_x, dpi_y; - RsvgViewBox vb; -@@ -502,6 +503,8 @@ RsvgNode *rsvg_drawing_ctx_acquire_node (RsvgDrawingCtx * ctx, const cha - G_GNUC_INTERNAL - RsvgNode *rsvg_drawing_ctx_acquire_node_of_type (RsvgDrawingCtx * ctx, const char *url, RsvgNodeType type); - G_GNUC_INTERNAL -+RsvgNode *rsvg_drawing_ctx_acquire_node_ref (RsvgDrawingCtx * ctx, RsvgNode *node); -+G_GNUC_INTERNAL - void rsvg_drawing_ctx_release_node (RsvgDrawingCtx * ctx, RsvgNode *node); - - G_GNUC_INTERNAL -diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs -index 79f0c9f..631b073 100644 ---- a/rsvg_internals/src/drawing_ctx.rs -+++ b/rsvg_internals/src/drawing_ctx.rs -@@ -32,6 +32,11 @@ extern "C" { - - fn rsvg_drawing_ctx_pop_view_box(draw_ctx: *const RsvgDrawingCtx); - -+ fn rsvg_drawing_ctx_acquire_node_ref( -+ draw_ctx: *const RsvgDrawingCtx, -+ node: *const RsvgNode, -+ ) -> *mut RsvgNode; -+ - fn rsvg_drawing_ctx_acquire_node( - draw_ctx: *const RsvgDrawingCtx, - url: *const libc::c_char, -@@ -45,8 +50,6 @@ extern "C" { - - fn rsvg_drawing_ctx_release_node(draw_ctx: *const RsvgDrawingCtx, node: *mut RsvgNode); - -- fn rsvg_drawing_ctx_increase_num_elements_rendered_through_use(draw_ctx: *const RsvgDrawingCtx); -- - fn rsvg_drawing_ctx_get_current_state_affine(draw_ctx: *const RsvgDrawingCtx) -> cairo::Matrix; - - fn rsvg_drawing_ctx_set_current_state_affine( -@@ -149,6 +152,16 @@ pub fn pop_view_box(draw_ctx: *const RsvgDrawingCtx) { - } - } - -+pub fn acquire_node_ref(draw_ctx: *const RsvgDrawingCtx, node: *const RsvgNode) -> Option { -+ let raw_node = unsafe { rsvg_drawing_ctx_acquire_node_ref(draw_ctx, node) }; -+ -+ if raw_node.is_null() { -+ None -+ } else { -+ Some(AcquiredNode(draw_ctx, raw_node)) -+ } -+} -+ - pub fn get_acquired_node(draw_ctx: *const RsvgDrawingCtx, url: &str) -> Option { - let raw_node = unsafe { rsvg_drawing_ctx_acquire_node(draw_ctx, str::to_glib_none(url).0) }; - -@@ -290,12 +303,6 @@ pub fn state_pop(draw_ctx: *const RsvgDrawingCtx) { - } - } - --pub fn increase_num_elements_rendered_through_use(draw_ctx: *const RsvgDrawingCtx) { -- unsafe { -- rsvg_drawing_ctx_increase_num_elements_rendered_through_use(draw_ctx); -- } --} -- - pub struct AcquiredNode(*const RsvgDrawingCtx, *mut RsvgNode); - - impl Drop for AcquiredNode { -diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs -index 71c9ff0..e4234ae 100644 ---- a/rsvg_internals/src/structure.rs -+++ b/rsvg_internals/src/structure.rs -@@ -278,6 +278,20 @@ impl NodeTrait for NodeUse { - return; - } - -+ // is an element that is used directly, unlike -+ // , which is used through a fill="url(#...)" -+ // reference. However, will always reference another -+ // element, potentially itself or an ancestor of itself (or -+ // another which references the first one, etc.). So, -+ // we acquire the element itself so that circular -+ // references can be caught. -+ let self_box = box_node(node.clone()); -+ let self_acquired = drawing_ctx::acquire_node_ref(draw_ctx, self_box); -+ rsvg_node_unref(self_box); -+ if self_acquired.is_none() { -+ return; -+ } -+ - let child = if let Some(acquired) = - drawing_ctx::get_acquired_node(draw_ctx, link.as_ref().unwrap()) - { -@@ -286,13 +300,6 @@ impl NodeTrait for NodeUse { - return; - }; - -- if Node::is_ancestor(node.clone(), child.clone()) { -- // or, if we're 'ing ourselves -- return; -- } -- -- drawing_ctx::increase_num_elements_rendered_through_use(draw_ctx); -- - let nx = self.x.get().normalize(draw_ctx); - let ny = self.y.get().normalize(draw_ctx); - -diff --git a/tests/errors.c b/tests/errors.c -index f370d60..ab5898a 100644 ---- a/tests/errors.c -+++ b/tests/errors.c -@@ -22,10 +22,29 @@ get_test_filename (const char *basename) { - basename, - NULL); - } -+ -+static void -+test_loading_error (gconstpointer data) -+{ -+ const char *basename = data; -+ char *filename = get_test_filename (basename); -+ RsvgHandle *handle; -+ GError *error = NULL; -+ -+ handle = rsvg_handle_new_from_file (filename, &error); -+ g_free (filename); -+ -+ g_assert (handle == NULL); -+ g_assert (g_error_matches (error, RSVG_ERROR, RSVG_ERROR_FAILED)); -+ -+ g_error_free (error); -+} -+ - static void --test_instancing_limit (void) -+test_instancing_limit (gconstpointer data) - { -- char *filename = get_test_filename ("323-nested-use.svg"); -+ const char *basename = data; -+ char *filename = get_test_filename (basename); - RsvgHandle *handle; - GError *error = NULL; - cairo_surface_t *surf; -@@ -49,7 +68,34 @@ main (int argc, char **argv) - { - g_test_init (&argc, &argv, NULL); - -- g_test_add_func ("/errors/instancing_limit", test_instancing_limit); -+ g_test_add_data_func_full ("/errors/instancing_limit/323-nested-use.svg", -+ "323-nested-use.svg", -+ test_instancing_limit, -+ NULL); -+ -+ g_test_add_data_func_full ("/errors/instancing_limit/515-pattern-billion-laughs.svg", -+ "515-pattern-billion-laughs.svg", -+ test_instancing_limit, -+ NULL); -+ -+ g_test_add_data_func_full ("/errors/instancing_limit/308-use-self-ref.svg", -+ "308-use-self-ref.svg", -+ test_instancing_limit, -+ NULL); -+ g_test_add_data_func_full ("/errors/instancing_limit/308-recursive-use.svg", -+ "308-recursive-use.svg", -+ test_instancing_limit, -+ NULL); -+ g_test_add_data_func_full ("/errors/instancing_limit/308-doubly-recursive-use.svg", -+ "308-doubly-recursive-use.svg", -+ test_instancing_limit, -+ NULL); -+ -+ g_test_add_data_func_full ("/errors/515-too-many-elements.svgz", -+ "515-too-many-elements.svgz", -+ test_loading_error, -+ NULL); -+ - - return g_test_run (); - } -diff --git a/tests/fixtures/errors/308-doubly-recursive-use.svg b/tests/fixtures/errors/308-doubly-recursive-use.svg -new file mode 100644 -index 0000000..9b248a6 ---- /dev/null -+++ b/tests/fixtures/errors/308-doubly-recursive-use.svg -@@ -0,0 +1,13 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/fixtures/errors/308-recursive-use.svg b/tests/fixtures/errors/308-recursive-use.svg -new file mode 100644 -index 0000000..f5d00bf ---- /dev/null -+++ b/tests/fixtures/errors/308-recursive-use.svg -@@ -0,0 +1,9 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/fixtures/errors/308-use-self-ref.svg b/tests/fixtures/errors/308-use-self-ref.svg -new file mode 100644 -index 0000000..dbf14c5 ---- /dev/null -+++ b/tests/fixtures/errors/308-use-self-ref.svg -@@ -0,0 +1,7 @@ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tests/fixtures/errors/515-pattern-billion-laughs.svg b/tests/fixtures/errors/515-pattern-billion-laughs.svg -new file mode 100644 -index 0000000..a306960 ---- /dev/null -+++ b/tests/fixtures/errors/515-pattern-billion-laughs.svg -@@ -0,0 +1,130 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/tests/fixtures/errors/515-too-many-elements.svgz b/tests/fixtures/errors/515-too-many-elements.svgz -new file mode 100644 -index 0000000000000000000000000000000000000000..a7f7cf678ca2f29af6df61078d1c6a86c73c2d1a -GIT binary patch -literal 40811 -zcmeIuO)I1U007{3c1mhf$VD-7q(+J1MDM}L%|UFTsL8?1JBN{yP&im}QQ{&|QhvZj -zljI=9MY%ail5kSH<)g@tkhY%ZCp*LibxH_PE;`Ph^fuo4Xpr-qW6!wVUeOr_1r`p~-)LTcZB@uIs(k -zp^3xx{A%Lt>ENbsBzwPKxl_B*S@%4>{ZPBL{_?u~dmaM@3>YwAz<>b*1`HT5V8DO@ -z0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b*1`HT5V8DO@0|pEjFkrxd0RsjM7%*Vq -ziwEvbqN?)X)ARdf*>V8`1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwAz<>b* -z1`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>YwA;JXJdqN)r0{91`HT5V8DO@0|pEjFkrxd0RsjM7%*VKfB^#r3>f$?1`2;_+E#M0g -Date: Fri, 15 May 2020 14:56:59 -0500 -Subject: [PATCH] cssparser build fix - ---- - vendor/cssparser/.cargo-checksum.json | 2 +- - vendor/cssparser/src/parser.rs | 48 +++++++++++++++------------ - 2 files changed, 28 insertions(+), 22 deletions(-) - -diff --git a/vendor/cssparser/.cargo-checksum.json b/vendor/cssparser/.cargo-checksum.json -index 246bb70..713372d 100644 ---- a/vendor/cssparser/.cargo-checksum.json -+++ b/vendor/cssparser/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",".travis.yml":"f1fb4b65964c81bc1240544267ea334f554ca38ae7a74d57066f4d47d2b5d568","Cargo.toml":"7807f16d417eb1a6ede56cd4ba2da6c5c63e4530289b3f0848f4b154e18eba02","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"b29fc57747f79914d1c2fb541e2bb15a003028bb62751dcb901081ccc174b119","build/match_byte.rs":"2c84b8ca5884347d2007f49aecbd85b4c7582085526e2704399817249996e19b","docs/.nojekyll":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"46c377e0c9a75780d5cb0bcf4dfb960f0fb2a996a13e7349bb111b9082252233","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"be2c4f3f3bb673d866575b6cb6084f1879dff07356d583ca9a3595f63b7f916f","src/serializer.rs":"4ccfc9b4fe994aab3803662bbf31cc25052a6a39531073a867b14b224afe42dd","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"80b02c80ab0fd580dad9206615c918e0db7dff63dfed0feeedb66f317d24b24b","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"c1c4ed2493e09d248c526ce1ef8575a5f8258da3962b64ffc814ef3bdf9780d0"},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"} -\ No newline at end of file -+{"files":{},"package":"8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223"} -diff --git a/vendor/cssparser/src/parser.rs b/vendor/cssparser/src/parser.rs -index 76736a8..8ffa18c 100644 ---- a/vendor/cssparser/src/parser.rs -+++ b/vendor/cssparser/src/parser.rs -@@ -555,28 +555,34 @@ impl<'i: 't, 't> Parser<'i, 't> { - } - - let token_start_position = self.input.tokenizer.position(); -- let token; -- match self.input.cached_token { -- Some(ref cached_token) -- if cached_token.start_position == token_start_position => { -- self.input.tokenizer.reset(&cached_token.end_state); -- match cached_token.token { -- Token::Function(ref name) => self.input.tokenizer.see_function(name), -- _ => {} -- } -- token = &cached_token.token -+ let using_cached_token = self -+ .input -+ .cached_token -+ .as_ref() -+ .map_or(false, |cached_token| { -+ cached_token.start_position == token_start_position -+ }); -+ let token = if using_cached_token { -+ let cached_token = self.input.cached_token.as_ref().unwrap(); -+ self.input.tokenizer.reset(&cached_token.end_state); -+ match cached_token.token { -+ Token::Function(ref name) => self.input.tokenizer.see_function(name), -+ _ => {} - } -- _ => { -- let new_token = self.input.tokenizer.next() -- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -- self.input.cached_token = Some(CachedToken { -- token: new_token, -- start_position: token_start_position, -- end_state: self.input.tokenizer.state(), -- }); -- token = self.input.cached_token_ref() -- } -- } -+ &cached_token.token -+ } else { -+ let new_token = self -+ .input -+ .tokenizer -+ .next() -+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?; -+ self.input.cached_token = Some(CachedToken { -+ token: new_token, -+ start_position: token_start_position, -+ end_state: self.input.tokenizer.state(), -+ }); -+ self.input.cached_token_ref() -+ }; - - if let Some(block_type) = BlockType::opening(token) { - self.at_start_of = Some(block_type); --- -2.26.2 - diff --git a/librsvg-2.42.7.tar.xz b/librsvg-2.42.7.tar.xz deleted file mode 100644 index b2079d6ca5f8e4cc7cab808c04b47031f4bc35df..0000000000000000000000000000000000000000 Binary files a/librsvg-2.42.7.tar.xz and /dev/null differ diff --git a/librsvg2.spec b/librsvg2.spec index ac55626636174a3d2a4de3b7a581f5105c06463f..682492bbd05662079e09f8e75add5626992d9377 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 # https://github.com/rust-lang/rust/issues/47714 %undefine _strict_symbol_defs_build @@ -9,39 +9,33 @@ # required rust libraries %global bundled_rust_deps 1 +%global cairo_version 1.16.0 + Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.42.7 -Release: 4%{anolis_release}%{?dist} +Version: 2.50.7 +Release: 1%{anolis_release}%{?dist} License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg -Source0: https://download.gnome.org/sources/librsvg/2.42/librsvg-%{version}.tar.xz - -# https://bugzilla.redhat.com/show_bug.cgi?id=1804519 -# https://gitlab.gnome.org/GNOME/librsvg/-/issues/515 -Patch0: CVE-2019-20446.patch -# https://github.com/servo/rust-cssparser/pull/245 -Patch1: fix-cssparser-build.patch - -Patch100: 0001-support-loongarch64-for-librsvg2.patch -Patch101: 0001-modify-cargo-checksum.patch +Source0: https://download.gnome.org/sources/librsvg/2.50/librsvg-%{version}.tar.xz BuildRequires: chrpath BuildRequires: gcc +BuildRequires: git-core # autosetup need git BuildRequires: git BuildRequires: gobject-introspection-devel -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(cairo-png) +BuildRequires: make +BuildRequires: pkgconfig(cairo) >= %{cairo_version} +BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version} +BuildRequires: pkgconfig(cairo-png) >= %{cairo_version} BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gthread-2.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pangocairo) BuildRequires: pkgconfig(pangoft2) @@ -51,20 +45,10 @@ BuildRequires: cargo BuildRequires: rust %else BuildRequires: rust-packaging -# [dependencies] -BuildRequires: (crate(cairo-rs) >= 0.3.0 with crate(cairo-rs) < 0.4.0) -BuildRequires: (crate(cairo-sys-rs) >= 0.5.0 with crate(cairo-sys-rs) < 0.6.0) -BuildRequires: (crate(cssparser) >= 0.23.0 with crate(cssparser) < 0.24.0) -BuildRequires: (crate(downcast-rs) >= 1.0.0 with crate(downcast-rs) < 2.0.0) -BuildRequires: (crate(glib) >= 0.4.0 with crate(glib) < 0.5.0) -BuildRequires: (crate(glib-sys) >= 0.5.0 with crate(glib-sys) < 0.6.0) -BuildRequires: (crate(itertools) >= 0.7.4 with crate(itertools) < 0.8.0) -BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(pango) >= 0.3.0 with crate(pango) < 0.4.0) -BuildRequires: (crate(pango-sys) >= 0.5.0 with crate(pango-sys) < 0.6.0) -BuildRequires: (crate(regex) >= 0.2.1 with crate(regex) < 0.3.0) %endif +Requires: cairo%{?_isa} >= %{cairo_version} +Requires: cairo-gobject%{?_isa} >= %{cairo_version} # We install a gdk-pixbuf svg loader Requires: gdk-pixbuf2%{?_isa} @@ -87,38 +71,48 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides extra utilities based on the librsvg library. %prep -%autosetup -n librsvg-%{version} -p1 -S git +%autosetup -n librsvg-%{version} -p1 -Sgit %if 0%{?bundled_rust_deps} -# Use the bundled deps, and enable release debuginfo -sed -i -e '/profile.release/a debug = true' Cargo.toml +# Use the bundled deps %else # No bundled deps -rm -vrf vendor -%cargo_prep +rm -vrf vendor .cargo Cargo.lock +pushd rsvg_internals + %cargo_prep + mv .cargo .. +popd +%endif + +%if ! 0%{?bundled_rust_deps} +%generate_buildrequires +pushd rsvg_internals >/dev/null + %cargo_generate_buildrequires +popd >/dev/null %endif %build %configure --disable-static \ - --disable-gtk-doc \ - --enable-introspection \ - --enable-vala + --disable-gtk-doc \ + --enable-introspection \ + --enable-vala %make_build %install %make_install find %{buildroot} -type f -name '*.la' -print -delete +%find_lang librsvg + # Remove lib64 rpaths chrpath --delete %{buildroot}%{_bindir}/rsvg-convert -chrpath --delete %{buildroot}%{_bindir}/rsvg-view-3 chrpath --delete %{buildroot}%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so # we install own docs rm -vrf %{buildroot}%{_datadir}/doc -%files +%files -f librsvg.lang %doc CONTRIBUTING.md README.md -%license COPYING COPYING.LIB +%license COPYING.LIB %{_libdir}/librsvg-2.so.* %{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so %dir %{_libdir}/girepository-1.0 @@ -141,29 +135,188 @@ rm -vrf %{buildroot}%{_datadir}/doc %files tools %{_bindir}/rsvg-convert -%{_bindir}/rsvg-view-3 %{_mandir}/man1/rsvg-convert.1* %changelog -* Wed Jan 26 2022 zhangwenlong - 2.42.7-4.0.2 -- Support loongarch64 - -* Fri Dec 10 2021 Weitao Zhou 2.42.7-4.0.1 +* Mon Dec 05 2022 Weitao Zhou 2.50.7-1.0.1 - Add git as build requirement for autosetup -* Wed May 13 2020 Michael Catanzaro - 2.42.7-4 -- Resolves: rhbz#1804519 Add patch for CVE-2019-20446 +* Tue Aug 24 2021 Kalev Lember - 2.50.7-1 +- Update to 2.50.7 + +* Mon Aug 09 2021 Mohan Boddu - 2.50.6-2 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Tue May 25 2021 Kalev Lember - 2.50.6-1 +- Update to 2.50.6 + +* Wed May 05 2021 Kalev Lember - 2.50.5-1 +- Update to 2.50.5 + +* Fri Apr 16 2021 Mohan Boddu - 2.50.3-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Thu Jan 28 2021 Kalev Lember - 2.50.3-1 +- Update to 2.50.3 + +* Tue Jan 26 2021 Fedora Release Engineering - 2.50.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Nov 25 2020 Kalev Lember - 2.50.2-1 +- Update to 2.50.2 + +* Mon Oct 5 2020 Kalev Lember - 2.50.1-1 +- Update to 2.50.1 + +* Fri Sep 11 2020 Kalev Lember - 2.50.0-1 +- Update to 2.50.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 2.48.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Kalev Lember - 2.48.8-1 +- Update to 2.48.8 + +* Fri Jun 05 2020 Kalev Lember - 2.48.7-1 +- Update to 2.48.7 + +* Tue Jun 02 2020 Kalev Lember - 2.48.6-1 +- Update to 2.48.6 + +* Mon Jun 01 2020 Kalev Lember - 2.48.5-1 +- Update to 2.48.5 + +* Fri Apr 24 2020 Kalev Lember - 2.48.4-1 +- Update to 2.48.4 + +* Fri Apr 10 2020 Kalev Lember - 2.48.3-1 +- Update to 2.48.3 + +* Tue Mar 31 2020 Kalev Lember - 2.48.2-1 +- Update to 2.48.2 + +* Sat Mar 28 2020 Kalev Lember - 2.48.1-1 +- Update to 2.48.1 + +* Sat Mar 07 2020 Kalev Lember - 2.48.0-1 +- Update to 2.48.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 2.46.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 27 2019 Kalev Lember - 2.46.4-1 +- Update to 2.46.4 + +* Wed Oct 23 2019 Kalev Lember - 2.46.3-1 +- Update to 2.46.3 + +* Mon Oct 14 2019 Kalev Lember - 2.46.2-1 +- Update to 2.46.2 + +* Mon Oct 07 2019 Kalev Lember - 2.46.1-1 +- Update to 2.46.1 -* Thu Dec 06 2018 Josh Stone - 2.42.7-2 -- Rebuild with the current rust-toolset +* Fri Sep 20 2019 Kalev Lember - 2.46.0-2 +- Backport a patch to fix svg rendering in gnome-initial-setup (#1753183) -* Tue Sep 04 2018 Kalev Lember - 2.42.7-1 -- Update to 2.42.7 +* Mon Sep 09 2019 Kalev Lember - 2.46.0-1 +- Update to 2.46.0 -* Wed Aug 08 2018 Kalev Lember - 2.42.6-1 -- Update to 2.42.6 +* Tue Sep 03 2019 Kalev Lember - 2.45.92-1 +- Update to 2.45.92 + +* Mon Aug 19 2019 Kalev Lember - 2.45.91-1 +- Update to 2.45.91 + +* Sun Aug 04 2019 Pete Walter - 2.45.90-1 +- Update to 2.45.90 + +* Fri Jul 26 2019 Pete Walter - 2.45.8-1 +- Update to 2.45.8 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.45.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jul 08 2019 Kalev Lember - 2.45.7-1 +- Update to 2.45.7 + +* Tue May 14 2019 Kalev Lember - 2.45.6-1 +- Update to 2.45.6 + +* Wed Mar 13 2019 Kalev Lember - 2.45.5-4 +- Go back to using bundled rust deps + +* Tue Feb 19 2019 Kalev Lember - 2.45.5-3 +- Rebuilt against fixed atk (#1626575) + +* Tue Feb 19 2019 Igor Gnatenko - 2.45.5-2 +- Unbundle Rust deps + +* Sat Feb 16 2019 Kalev Lember - 2.45.5-1 +- Update to 2.45.5 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.45.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 09 2019 Kalev Lember - 2.45.4-1 +- Update to 2.45.4 + +* Wed Jan 09 2019 Kalev Lember - 2.45.3-2 +- Fix accidental soname bump + +* Wed Jan 09 2019 Kalev Lember - 2.45.3-1 +- Update to 2.45.3 + +* Sat Dec 29 2018 Kalev Lember - 2.44.11-1 +- Update to 2.44.11 + +* Tue Dec 18 2018 Kalev Lember - 2.44.10-1 +- Update to 2.44.10 + +* Wed Nov 14 2018 Kalev Lember - 2.44.9-1 +- Update to 2.44.9 + +* Fri Oct 26 2018 Kalev Lember - 2.44.8-1 +- Update to 2.44.8 + +* Tue Oct 09 2018 Kalev Lember - 2.44.7-1 +- Update to 2.44.7 + +* Fri Sep 28 2018 Kalev Lember - 2.44.6-1 +- Update to 2.44.6 + +* Wed Sep 26 2018 Kalev Lember - 2.44.4-1 +- Update to 2.44.4 + +* Thu Sep 20 2018 Kalev Lember - 2.44.3-1 +- Update to 2.44.3 + +* Fri Sep 07 2018 Kalev Lember - 2.44.2-2 +- Rebuilt against fixed atk (#1626575) + +* Wed Sep 05 2018 Kalev Lember - 2.44.2-1 +- Update to 2.44.2 + +* Wed Aug 08 2018 Kalev Lember - 2.43.4-1 +- Update to 2.43.4 - Use bundled rust deps +* Fri Jul 13 2018 Fedora Release Engineering - 2.43.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jul 01 2018 Igor Gnatenko - 2.43.1-2 +- Bump cssparser to 0.24 + +* Sun Jun 24 2018 Igor Gnatenko - 2.43.1-1 +- Update to 2.43.1 + +* Tue May 08 2018 Igor Gnatenko - 2.42.4-1 +- Update to 2.42.4 + +* Thu May 03 2018 Josh Stone - 2.42.3-2 +- Update rust dependencies. + * Mon Mar 05 2018 Kalev Lember - 2.42.3-1 - Update to 2.42.3