On Tue, Nov 27, 2018 at 06:03:13PM -0600, Edward Lopez-Acosta wrote: > WANTLIB fixed, it did add an extra entry (c++abi), I am fairly certain I > sorted out the tabs vs spaces in the list. Is there a way to preserve this > when I make the crate list and import it into the Makefile?
copy/paste could replace tab by spaces. usually, I am doing something like: $ make modcargo-gen-crates-licenses > foo and use ":read foo" from vim. > Thank you for the patience and hopefully this diff is clean. First time ever > even looking at anything in Rust on my end. the diff is OK semarie@ . if someone want to take a look and commit it, it is possible. else I will commit it tomorrow. Thanks. -- Sebastien Marie > diff --git Makefile Makefile > index 16d2c678d98..2f06334c405 100644 > --- Makefile > +++ Makefile > @@ -4,16 +4,14 @@ COMMENT = line oriented search tool using Rust's > regex library #' > > GH_ACCOUNT = BurntSushi > GH_PROJECT = ripgrep > -GH_TAGNAME = 0.8.1 > -REVISION = 2 > +GH_TAGNAME = 0.10.0 > > CATEGORIES = textproc sysutils > > # Unlicense/MIT > PERMIT_PACKAGE_CDROM = Yes > > -# uses pledge() > -WANTLIB += c pthread > +WANTLIB += c c++abi pthread > > # as devel/cargo MODULES adds DISTFILES, GH_* didn't > DISTFILES += ${DISTNAME}${EXTRACT_SUFX} > @@ -22,52 +20,83 @@ MODULES = devel/cargo > BUILD_DEPENDS = lang/rust>=1.20 \ > textproc/asciidoc > > -MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT > -MODCARGO_CRATES += ansi_term-0.10.2 # MIT > -MODCARGO_CRATES += atty-0.2.6 # MIT > -MODCARGO_CRATES += bitflags-1.0.1 # MIT/Apache-2.0 > -MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT > -MODCARGO_CRATES += cfg-if-0.1.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += clap-2.30.0 # MIT > -MODCARGO_CRATES += crossbeam-0.3.2 # Apache-2.0/MIT > -MODCARGO_CRATES += encoding_rs-0.7.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += aho-corasick-0.6.8 # Unlicense/MIT > +MODCARGO_CRATES += arrayvec-0.4.7 # MIT/Apache-2.0 > +MODCARGO_CRATES += atty-0.2.11 # MIT > +MODCARGO_CRATES += base64-0.9.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += bitflags-1.0.4 # MIT/Apache-2.0 > +MODCARGO_CRATES += bytecount-0.3.2 # Apache-2.0/MIT > +MODCARGO_CRATES += byteorder-1.2.6 # Unlicense/MIT > +MODCARGO_CRATES += cc-1.0.24 # MIT/Apache-2.0 > +MODCARGO_CRATES += cfg-if-0.1.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += clap-2.32.0 # MIT > +MODCARGO_CRATES += cloudabi-0.0.3 # BSD-2-Clause > +MODCARGO_CRATES += crossbeam-channel-0.2.4 # MIT/Apache-2.0 > +MODCARGO_CRATES += crossbeam-epoch-0.5.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += crossbeam-utils-0.5.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += encoding_rs-0.8.6 # MIT/Apache-2.0 > +MODCARGO_CRATES += encoding_rs_io-0.1.2 # MIT OR Apache-2.0 > MODCARGO_CRATES += fnv-1.0.6 # Apache-2.0 / MIT > MODCARGO_CRATES += fuchsia-zircon-0.3.3 # BSD-3-Clause > -MODCARGO_CRATES += fuchsia-zircon-sys-0.3.3 # BSD-3-Clause > MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0 > -MODCARGO_CRATES += globset-0.3.0 # Unlicense/MIT > -MODCARGO_CRATES += grep-0.1.8 # Unlicense/MIT > -MODCARGO_CRATES += ignore-0.4.0 # Unlicense/MIT > -MODCARGO_CRATES += lazy_static-1.0.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += libc-0.2.36 # MIT/Apache-2.0 > -MODCARGO_CRATES += log-0.4.1 # MIT/Apache-2.0 > -MODCARGO_CRATES += memchr-2.0.1 # Unlicense/MIT > +MODCARGO_CRATES += fuchsia-zircon-sys-0.3.3 # BSD-3-Clause > +MODCARGO_CRATES += itoa-0.4.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += lazy_static-1.1.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += libc-0.2.43 # MIT/Apache-2.0 > +MODCARGO_CRATES += lock_api-0.1.3 # Apache-2.0/MIT > +MODCARGO_CRATES += log-0.4.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += memchr-2.0.2 # Unlicense/MIT > MODCARGO_CRATES += memmap-0.6.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += memoffset-0.2.1 # MIT > +MODCARGO_CRATES += nodrop-0.1.12 # MIT/Apache-2.0 > MODCARGO_CRATES += num_cpus-1.8.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += rand-0.3.22 # MIT/Apache-2.0 > -MODCARGO_CRATES += rand-0.4.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += redox_syscall-0.1.37 # MIT > +MODCARGO_CRATES += owning_ref-0.3.3 # MIT > +MODCARGO_CRATES += parking_lot-0.6.4 # Apache-2.0/MIT > +MODCARGO_CRATES += parking_lot_core-0.3.0 # Apache-2.0/MIT > +MODCARGO_CRATES += pcre2-0.1.0 # Unlicense/MIT > +MODCARGO_CRATES += pcre2-sys-0.1.1 # Unlicense/MIT > +MODCARGO_CRATES += pkg-config-0.3.14 # MIT/Apache-2.0 > +MODCARGO_CRATES += proc-macro2-0.4.18 # MIT/Apache-2.0 > +MODCARGO_CRATES += quote-0.6.8 # MIT/Apache-2.0 > +MODCARGO_CRATES += rand-0.4.3 # MIT/Apache-2.0 > +MODCARGO_CRATES += rand-0.5.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += rand_core-0.2.1 # MIT/Apache-2.0 > +MODCARGO_CRATES += redox_syscall-0.1.40 # MIT > MODCARGO_CRATES += redox_termios-0.1.1 # MIT > -MODCARGO_CRATES += regex-0.2.6 # MIT/Apache-2.0 > -MODCARGO_CRATES += regex-syntax-0.4.2 # MIT/Apache-2.0 > -MODCARGO_CRATES += same-file-1.0.2 # Unlicense/MIT > -MODCARGO_CRATES += simd-0.2.1 # MIT/Apache-2.0 > +MODCARGO_CRATES += regex-1.0.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += regex-syntax-0.6.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += remove_dir_all-0.5.1 # MIT/Apache-2.0 > +MODCARGO_CRATES += ryu-0.2.6 # Apache-2.0 OR BSL-1.0 > +MODCARGO_CRATES += safemem-0.2.0 # MIT OR Apache-2.0 > +MODCARGO_CRATES += same-file-1.0.3 # Unlicense/MIT > +MODCARGO_CRATES += scopeguard-0.3.3 # MIT/Apache-2.0 > +MODCARGO_CRATES += serde-1.0.77 # MIT/Apache-2.0 > +MODCARGO_CRATES += serde_derive-1.0.77 # MIT/Apache-2.0 > +MODCARGO_CRATES += serde_json-1.0.27 # MIT/Apache-2.0 > +MODCARGO_CRATES += simd-0.2.2 # MIT/Apache-2.0 > +MODCARGO_CRATES += smallvec-0.6.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += stable_deref_trait-1.1.1 # MIT/Apache-2.0 > MODCARGO_CRATES += strsim-0.7.0 # MIT > -MODCARGO_CRATES += tempdir-0.3.5 # MIT/Apache-2.0 > -MODCARGO_CRATES += termcolor-0.3.4 # Unlicense/MIT > +MODCARGO_CRATES += syn-0.15.1 # MIT/Apache-2.0 > +MODCARGO_CRATES += tempdir-0.3.7 # MIT/Apache-2.0 > +MODCARGO_CRATES += termcolor-1.0.3 # Unlicense OR MIT > MODCARGO_CRATES += termion-1.5.1 # MIT > -MODCARGO_CRATES += textwrap-0.9.0 # MIT > -MODCARGO_CRATES += thread_local-0.3.5 # Apache-2.0/MIT > -MODCARGO_CRATES += unicode-width-0.1.4 # MIT/Apache-2.0 > +MODCARGO_CRATES += textwrap-0.10.0 # MIT > +MODCARGO_CRATES += thread_local-0.3.6 # Apache-2.0/MIT > +MODCARGO_CRATES += ucd-util-0.1.1 # MIT/Apache-2.0 > +MODCARGO_CRATES += unicode-width-0.1.5 # MIT/Apache-2.0 > +MODCARGO_CRATES += unicode-xid-0.1.0 # MIT/Apache-2.0 > MODCARGO_CRATES += unreachable-1.0.0 # MIT / Apache-2.0 > -MODCARGO_CRATES += utf8-ranges-1.0.0 # Unlicense/MIT > -MODCARGO_CRATES += vec_map-0.8.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += utf8-ranges-1.0.1 # Unlicense/MIT > +MODCARGO_CRATES += version_check-0.1.4 # MIT/Apache-2.0 > MODCARGO_CRATES += void-1.0.2 # MIT > -MODCARGO_CRATES += walkdir-2.1.4 # Unlicense/MIT > -MODCARGO_CRATES += winapi-0.3.4 # MIT/Apache-2.0 > +MODCARGO_CRATES += walkdir-2.2.5 # Unlicense/MIT > +MODCARGO_CRATES += winapi-0.3.5 # MIT/Apache-2.0 > MODCARGO_CRATES += winapi-i686-pc-windows-gnu-0.4.0 # MIT/Apache-2.0 > +MODCARGO_CRATES += winapi-util-0.1.1 # Unlicense/MIT > MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu-0.4.0 # MIT/Apache-2.0 > -MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT > +MODCARGO_CRATES += wincolor-1.0.1 # Unlicense/MIT > + > CONFIGURE_STYLE = cargo > > PATCHORIG = .openbsd.orig > diff --git distinfo distinfo > index 515845561c1..99accb78015 100644 > --- distinfo > +++ distinfo > @@ -1,94 +1,154 @@ > -SHA256 (cargo/aho-corasick-0.6.4.tar.gz) = > 1lMdRN5yOCWqgTmKZBUoMilyWgD6MHE4EquTI/qoL8Q= > -SHA256 (cargo/ansi_term-0.10.2.tar.gz) = > azVotIt876a4zhJfm7SYnlL7zCnr6ojfBMx8XxL3BFU= > -SHA256 (cargo/atty-0.2.6.tar.gz) = > g1Jlb9QsMKDDyJ0m3qAeO3fAqyrxgjCDXBXi4TzVGFk= > -SHA256 (cargo/bitflags-1.0.1.tar.gz) = > s8MNOALftygWgNYoXyzNqowtj+5B+TgF26XEz1DcI88= > -SHA256 (cargo/bytecount-0.3.1.tar.gz) = > iCWFzX7ITpAkct80peAYkSAts79iYU4fCv5FnBr890Q= > -SHA256 (cargo/cfg-if-0.1.2.tar.gz) = > 1MgZoSh+thjfR8xkcXPFxMZroZ2Iim5Q1gVnKu0xQN4= > -SHA256 (cargo/clap-2.30.0.tar.gz) = > HAe5JXoA8/yTt/PEF/wVYH7HpWgjvCw37HROJmOH3ls= > -SHA256 (cargo/crossbeam-0.3.2.tar.gz) = > JM6XgtTVxTZ0ZGpqTBhjohqPwMtkmzyU38FuRQcd6hk= > -SHA256 (cargo/encoding_rs-0.7.2.tar.gz) = > mP0PJNH7caSmuTMMjKBMvU58xdhGtUynT/N2vHyfeY0= > +SHA256 (cargo/aho-corasick-0.6.8.tar.gz) = > aPVsc1PlqVR8vXbtkPe7X/w7oJ1Oqb0djAbIsRQu61o= > +SHA256 (cargo/arrayvec-0.4.7.tar.gz) = > oelk+eJNWIGD/LQ1A6vaQNKIyGV9/CcxFRbOLwVnWu8= > +SHA256 (cargo/atty-0.2.11.tar.gz) = > mn1bhyOVCVFBHuNNJx2Z3dzCA1oWqyUxDqLIz9Q2llI= > +SHA256 (cargo/base64-0.9.2.tar.gz) = > hUFdJZR2czinSjDB03Cy8yYuwbTtLXu6Wz+vTeQEZ9k= > +SHA256 (cargo/bitflags-1.0.4.tar.gz) = > IoBHp29GhifKcXduzevXMqNCMIH89RJVhbzXxJiGzhI= > +SHA256 (cargo/bytecount-0.3.2.tar.gz) = > +GHZzjWfVtvLbgwqHLhOUq1zLK21e4Bq3rPHZoysy9g= > +SHA256 (cargo/byteorder-1.2.6.tar.gz) = > kEksWFjdfS54aRz7ifkNJzooAPwR2Y9geG5dh+L4N4E= > +SHA256 (cargo/cc-1.0.24.tar.gz) = > cPKojC5pzu6RwgnY7yW4H8GmX0LH8U39WdH+0YnlFNE= > +SHA256 (cargo/cfg-if-0.1.5.tar.gz) = > DE57tkqOuw2FZIPh5oLqNCL4g8X1YVqQ1Rosgv6H/dM= > +SHA256 (cargo/clap-2.32.0.tar.gz) = > uVfYj0tqY7nXDV9FSsgBGBnG76dyeFj0WKtxx1bOLT4= > +SHA256 (cargo/cloudabi-0.0.3.tar.gz) = > 3fxbmqXUUHrK+HLecQUd/Q4wmGDoiWbhBR5GKgd6rE8= > +SHA256 (cargo/crossbeam-channel-0.2.4.tar.gz) = > bAqUJQsCeNf8WolMPSdrEeoWTtyL+P6xDKHqUXtEpkk= > +SHA256 (cargo/crossbeam-epoch-0.5.2.tar.gz) = > MP7Pysar/vh3EVH4vkq8nk7cESwryyMzFMr94mgFNuk= > +SHA256 (cargo/crossbeam-utils-0.5.0.tar.gz) = > Z31FOhfovSuRP6OOi5zwS827W+eQqilPI4lmHXIDYBU= > +SHA256 (cargo/encoding_rs-0.8.6.tar.gz) = > KpGRLW83xqj++KIxaoYlQtA28TySOtUYtaynvKrHVEw= > +SHA256 (cargo/encoding_rs_io-0.1.2.tar.gz) = > 8iL/VU1uFy81aaLX0P2AYdVCFZhO9nskzgMcH8vyybM= > SHA256 (cargo/fnv-1.0.6.tar.gz) = > L62FVT4JpviB9znCnwsAsPATV8dDJm1Hi2iVHOIyhfM= > SHA256 (cargo/fuchsia-zircon-0.3.3.tar.gz) = > Lpdjxp66rmMLo190iI20ZeSeJZuhvA7afQb0oGdhXYI= > SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = > Pcqprncl0SzbhbOtmaQ023C0aMCd7RfgEthrXBAQ96c= > SHA256 (cargo/glob-0.2.11.tar.gz) = > i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s= > -SHA256 (cargo/globset-0.3.0.tar.gz) = > HparkjYsBoETha6aNNJpjooRYHReDHj7tDSkTI3j+rw= > -SHA256 (cargo/grep-0.1.8.tar.gz) = > /X/9lNtJJKj4x7AxMV3nj6pndyx3NN/ZLo6PI6Cn44E= > -SHA256 (cargo/ignore-0.4.0.tar.gz) = > TzoJna8JAGsn43+oubu0ndxYZ//i1mO7VrG41nJ3SqY= > -SHA256 (cargo/lazy_static-1.0.0.tar.gz) = > yPMQR9qjZfGb4UtHwp3098O1gYMkB9qr5q53OXYZI30= > -SHA256 (cargo/libc-0.2.36.tar.gz) = > Hl2X1nCO2qQHQp+qZxuULcDycnIi+2tlOb8duTbksSE= > -SHA256 (cargo/log-0.4.1.tar.gz) = > ifAQ6EPysaMdvTFrO41EN1i8Y0vtN6q63lnGhtZE4KI= > -SHA256 (cargo/memchr-2.0.1.tar.gz) = > eW+6cOdmElie0s5/RSgvWvhp4P3XzGGZ+hqh8dWRup0= > +SHA256 (cargo/itoa-0.4.2.tar.gz) = > WttYVY3NHXhrXwvRXzIm7iNIbiS3tYMEtg9k3GjmJgY= > +SHA256 (cargo/lazy_static-1.1.0.tar.gz) = > ykiLiaVlewouzUW5Vgmz6EjPF1XaMyoNpG4rKxyzcac= > +SHA256 (cargo/libc-0.2.43.tar.gz) = > duOj7xcvGguan/DdFJGuXmyUi5RHmjAhgZun2GDIZF0= > +SHA256 (cargo/lock_api-0.1.3.tar.gz) = > lJgmpczxjBs6fD1XaSd40hdot55G653Qe/xMIWADbFQ= > +SHA256 (cargo/log-0.4.5.tar.gz) = > 1PzOX6ScxpPDEgAdrx0TQRxKUoN5a6wQhCmeo+VnET8= > +SHA256 (cargo/memchr-2.0.2.tar.gz) = > o7QUKrhzinjFGJb3BPg8Ed8Ef/G9qakqZhqmNhVS2T0= > SHA256 (cargo/memmap-0.6.2.tar.gz) = > 4v+iyYbeEanfeGIMAe6q8n2U0/8Cv4G/zKlTEC3Qxv8= > +SHA256 (cargo/memoffset-0.2.1.tar.gz) = > D53CYeK2LXpiK/QW6jxSRc3V2af8xCjA0GgE384XdbM= > +SHA256 (cargo/nodrop-0.1.12.tar.gz) = > miIo3KVxCAaaUmLy7YvS6CSW0uB0oG0czHzhaHtq4KI= > SHA256 (cargo/num_cpus-1.8.0.tar.gz) = > xRozIuS8qdISrZoVigKrxpNNAFSQwFSid433OnCqCjA= > -SHA256 (cargo/rand-0.3.22.tar.gz) = > Facyq/nSDwrY7rb5Cb9oaHItmgbh5QgCtqcDUfQLTrE= > -SHA256 (cargo/rand-0.4.2.tar.gz) = > 66X4y1nMUO1WvoiApce0lr/ZvSY5ThdrxniECUFFwsU= > -SHA256 (cargo/redox_syscall-0.1.37.tar.gz) = > DZLuzrrSK3Z5FeTVKfifKO6W279aSBDSuEQ3PxNkF/0= > +SHA256 (cargo/owning_ref-0.3.3.tar.gz) = > zfhPQWOeA3tIT5NDOqOJeGO1Ye1lxuWccHPXxWFxDzc= > +SHA256 (cargo/parking_lot-0.6.4.tar.gz) = > 8IAr/wkAOykbp1bcfnkxPlHMMWZ+lK++hH3vSQQkzeU= > +SHA256 (cargo/parking_lot_core-0.3.0.tar.gz) = > BqK2quBSMJwv0hYe9Y9QZ7wXu3WDd6DenUsnnWA/3Yo= > +SHA256 (cargo/pcre2-0.1.0.tar.gz) = > DBbsDjDBf5OKLaj/lwrZpBABZtBTiJjcwDW1XDk8q1Q= > +SHA256 (cargo/pcre2-sys-0.1.1.tar.gz) = > qQJ/lHTk4T07llU4qvyuvkjIA0iK12s8l+8GGoMkaV8= > +SHA256 (cargo/pkg-config-0.3.14.tar.gz) = > Z26OsrG0yQQ1Eam3vqCRUyDX5QKwoHn7A/ljWlJSsYw= > +SHA256 (cargo/proc-macro2-0.4.18.tar.gz) = > r6TTdwZ8wC614LSR0/fPvhRa1Np3hTW/sTxERBPdNbk= > +SHA256 (cargo/quote-0.6.8.tar.gz) = > 3WNkJZZ8M6+JAELEg2MtM/p6GPGa0dfqcuiZjG743qU= > +SHA256 (cargo/rand-0.4.3.tar.gz) = > g1b0ezJiT+9bMwHBvpfllE7N1ZVAnMXaEdBfIR22z70= > +SHA256 (cargo/rand-0.5.5.tar.gz) = > 5GTNiH6GnN3K6HkqTuMdI8ft1RZwBpVgj1uYxn7gExw= > +SHA256 (cargo/rand_core-0.2.1.tar.gz) = > 7ezw+U2lVR/JtJIJPjCwQaiRZX23lA7iIfnS9m6C7vI= > +SHA256 (cargo/redox_syscall-0.1.40.tar.gz) = > whTpHT7PQ+mk5B5XiXOt6xS0dPK+6Fh0LRJ691oBErE= > SHA256 (cargo/redox_termios-0.1.1.tar.gz) = > fokc/kjpEApwo7brZS/vKJIMEX02Yzloe9VXYWDbD3Y= > -SHA256 (cargo/regex-0.2.6.tar.gz) = > W+U0e94MSM/Yw/3Admzf6dinVe+E1iDWeUx3jJHeiys= > -SHA256 (cargo/regex-syntax-0.4.2.tar.gz) = > jpMcWLk9hvCAxzS/0rzn3QB5riMxI1gYEzyL5/Qi4g4= > -SHA256 (cargo/same-file-1.0.2.tar.gz) = > z7bt7QsGoLUSyN288ECJE4ybQ2LC9pbzw9dgOdaPNjc= > -SHA256 (cargo/simd-0.2.1.tar.gz) = > PdCAXHNjq1GoKaFRGtJLbtA0n+qnVsS8L5d/n0luZnM= > +SHA256 (cargo/regex-1.0.5.tar.gz) = > IGl0kDLqPsIAylHkox30F1kZCojtyg0thu6L7fcHM0E= > +SHA256 (cargo/regex-syntax-0.6.2.tar.gz) = > dHujsjVlH24vZ9+ovNzQc923wkPLIcRC/BI5XfysIS0= > +SHA256 (cargo/remove_dir_all-0.5.1.tar.gz) = > NIi6G5oghNOGRcTAgnahdS3L8scTDXTxVpaBrV0nmcU= > +SHA256 (cargo/ryu-0.2.6.tar.gz) = > cVPdltreh0q5c+CYy2L827iaA2guRrFE/QlVCZjUpKc= > +SHA256 (cargo/safemem-0.2.0.tar.gz) = > 4nqLGbg1966pCIGOhx9cw6WhhlUMMHc76YfhVegWPY8= > +SHA256 (cargo/same-file-1.0.3.tar.gz) = > EPd5Ti/af1lIZoQOlfXFli6IbiKOaLZQWIWBGpTdcow= > +SHA256 (cargo/scopeguard-0.3.3.tar.gz) = > lCWPU2Aa8R5qSfciQi9uNCXFKwYkWlz5vAmQixdPXic= > +SHA256 (cargo/serde-1.0.77.tar.gz) = > xuZ5d9dSPOTZKE7ViRivmTkt6O22GSxEr+/PY0ZUq38= > +SHA256 (cargo/serde_derive-1.0.77.tar.gz) = > VWnFL6rj4huauuLMXPu1btAIv8rEgK1ivCQbgo8LCu4= > +SHA256 (cargo/serde_json-1.0.27.tar.gz) = > WXkJkMURXRYCfwCRPi5m3iOlH3BCLlSdKtaMjF8mjxw= > +SHA256 (cargo/simd-0.2.2.tar.gz) = > 7TaG3ZQY68w6JqDArlbeqwaB5T/oma+R9bvO5mfr/7E= > +SHA256 (cargo/smallvec-0.6.5.tar.gz) = > FT/6Mv0XDplE9+CDjt+CSnVOxMH8ZHRvzJ/h+PpgLl0= > +SHA256 (cargo/stable_deref_trait-1.1.1.tar.gz) = > 26GifT765DUcgFEHLWGeOt4oIGNcOVjYJr/qOdWbVMg= > SHA256 (cargo/strsim-0.7.0.tar.gz) = > u084ASWSapnlK8J5JBU5wBgyP6sFrWNotW+T2Taf9VA= > -SHA256 (cargo/tempdir-0.3.5.tar.gz) = > h5dKb1wd+zRNczBVYBZQBZozY94qYQSBkpO6/2YhMtY= > -SHA256 (cargo/termcolor-0.3.4.tar.gz) = > c+g4ltp0CkVBpvIWBrNfKqS62ltl2J3GERS/nW/y3H4= > +SHA256 (cargo/syn-0.15.1.tar.gz) = > hfsvf5t6TI3yyROoUt5XDv20Dw0u3TnIJFrVc/XH+8w= > +SHA256 (cargo/tempdir-0.3.7.tar.gz) = > FfK1+wDM32ieAUnRsbPAP+rYHCs3c12BL6i9279Bttg= > +SHA256 (cargo/termcolor-1.0.3.tar.gz) = > /zusDkZbWfGU5wN+1ASwMm5W/yNNdn7cTFzJzUnnosc= > SHA256 (cargo/termion-1.5.1.tar.gz) = > aJo736q0Of2SvIffXEx4QX08vlN0hydOmwstznbpIJY= > -SHA256 (cargo/textwrap-0.9.0.tar.gz) = > wLWba0tE2GfxNw7xvZG/smK/B78K5lwgLqL7wWFTtpM= > -SHA256 (cargo/thread_local-0.3.5.tar.gz) = > J57zHBnt7fV3v9Et+ucoBAoh9jWwaiTNZw/1EO3TiWM= > -SHA256 (cargo/unicode-width-0.1.4.tar.gz) = > vzoRN3VxSiLct3TY6jZVxToy3rrmOgY6zACpHMWGJF8= > +SHA256 (cargo/textwrap-0.10.0.tar.gz) = > MHaGhpyT5x+U2mQob5qVJMDzCKnhyHpYPejpyQOa0/Y= > +SHA256 (cargo/thread_local-0.3.6.tar.gz) = > xrU+MpAA7cKzTb6FRf0g5VozM2LQoyGQloWhm9KMPxs= > +SHA256 (cargo/ucd-util-0.1.1.tar.gz) = > /Svi1mOdD4/mzdopGtRW4jYpVY1GbieJ0sPpiSvaKF0= > +SHA256 (cargo/unicode-width-0.1.5.tar.gz) = > iCOGIxxF30cAsnXH/1W282mHgKZQAmOA5y2r52+kZSY= > +SHA256 (cargo/unicode-xid-0.1.0.tar.gz) = > /HIwR5bQgY41fq1OAA0ZycF0qyPcEQk6yRkFTSCmp/w= > SHA256 (cargo/unreachable-1.0.0.tar.gz) = > OCgQh3/kSJkd/H8N1uOuXVgIj9DqXjUYllX4TmgU+lY= > -SHA256 (cargo/utf8-ranges-1.0.0.tar.gz) = > Zi+rZSWpi+/ykh1/YaOefVngtCXrx9DZ5m0xblUSQSI= > -SHA256 (cargo/vec_map-0.8.0.tar.gz) = > iHtbYxwq0BYou7qn3UyGn4DTGGaI+NC29Yd0++MkmIw= > +SHA256 (cargo/utf8-ranges-1.0.1.tar.gz) = > /XD0Z99oEAlJaOL84O4b0OhxV6zrAmqMCDvPXiW57+Q= > +SHA256 (cargo/version_check-0.1.4.tar.gz) = > dxbCQpaO6H5VQvgCEXgkjyZ/KVpcSAO+rouLf9m8YFE= > SHA256 (cargo/void-1.0.2.tar.gz) = > agLkiF7TvA8t6Q6m3UXry7ZtrP/gNUf627DuridwiH0= > -SHA256 (cargo/walkdir-2.1.4.tar.gz) = > Y2Nr0Os9AMy4uQNjgbUm76xTyvESt3g7cwqz+ORNo2k= > -SHA256 (cargo/winapi-0.3.4.tar.gz) = > BOO9Ih/L6KJxNZwE8hp2230MYCiGLRu1US2F4eLrW7M= > +SHA256 (cargo/walkdir-2.2.5.tar.gz) = > r0ZLx757eFx6xy4mamtnxMkHAVVgb1FlWmUKZoYgTjU= > +SHA256 (cargo/winapi-0.3.5.tar.gz) = > dz753MXyS32FDQ/xAeVC/yTDsJCpdo4D/4if3vQfAP0= > SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = > rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y= > +SHA256 (cargo/winapi-util-0.1.1.tar.gz) = > r8VQh1nFv0KF5h/rhitgg8hICuyGT6F6gf3sb2m0Yas= > SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = > cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8= > -SHA256 (cargo/wincolor-0.1.6.tar.gz) = > 7rBkmaOk1EMCeRBS3wBdUjK5J+0allgUbYQhZcTed2c= > -SHA256 (ripgrep-0.8.1.tar.gz) = cDU3n84MHjJVLo7lKLksPQG405Neox0mxRpzKHvnS7M= > -SIZE (cargo/aho-corasick-0.6.4.tar.gz) = 25443 > -SIZE (cargo/ansi_term-0.10.2.tar.gz) = 16642 > -SIZE (cargo/atty-0.2.6.tar.gz) = 5617 > -SIZE (cargo/bitflags-1.0.1.tar.gz) = 13451 > -SIZE (cargo/bytecount-0.3.1.tar.gz) = 12347 > -SIZE (cargo/cfg-if-0.1.2.tar.gz) = 6668 > -SIZE (cargo/clap-2.30.0.tar.gz) = 190562 > -SIZE (cargo/crossbeam-0.3.2.tar.gz) = 33440 > -SIZE (cargo/encoding_rs-0.7.2.tar.gz) = 1241345 > +SHA256 (cargo/wincolor-1.0.1.tar.gz) = > Vh7ZAa5GXWGF+nhk1j+9VyDQ73GDZsmk3IPPYXDX6bo= > +SHA256 (ripgrep-0.10.0.tar.gz) = oqbrfTPXXmRhPBWOGuRQiZtDfjfxv71U9xOwEc2Mwx4= > +SIZE (cargo/aho-corasick-0.6.8.tar.gz) = 26786 > +SIZE (cargo/arrayvec-0.4.7.tar.gz) = 22946 > +SIZE (cargo/atty-0.2.11.tar.gz) = 5916 > +SIZE (cargo/base64-0.9.2.tar.gz) = 37967 > +SIZE (cargo/bitflags-1.0.4.tar.gz) = 15282 > +SIZE (cargo/bytecount-0.3.2.tar.gz) = 11026 > +SIZE (cargo/byteorder-1.2.6.tar.gz) = 19985 > +SIZE (cargo/cc-1.0.24.tar.gz) = 43132 > +SIZE (cargo/cfg-if-0.1.5.tar.gz) = 7363 > +SIZE (cargo/clap-2.32.0.tar.gz) = 196073 > +SIZE (cargo/cloudabi-0.0.3.tar.gz) = 22156 > +SIZE (cargo/crossbeam-channel-0.2.4.tar.gz) = 59889 > +SIZE (cargo/crossbeam-epoch-0.5.2.tar.gz) = 34136 > +SIZE (cargo/crossbeam-utils-0.5.0.tar.gz) = 12162 > +SIZE (cargo/encoding_rs-0.8.6.tar.gz) = 1242813 > +SIZE (cargo/encoding_rs_io-0.1.2.tar.gz) = 15356 > SIZE (cargo/fnv-1.0.6.tar.gz) = 11131 > SIZE (cargo/fuchsia-zircon-0.3.3.tar.gz) = 22565 > SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 > SIZE (cargo/glob-0.2.11.tar.gz) = 18065 > -SIZE (cargo/globset-0.3.0.tar.gz) = 21315 > -SIZE (cargo/grep-0.1.8.tar.gz) = 236744 > -SIZE (cargo/ignore-0.4.0.tar.gz) = 41412 > -SIZE (cargo/lazy_static-1.0.0.tar.gz) = 12611 > -SIZE (cargo/libc-0.2.36.tar.gz) = 310575 > -SIZE (cargo/log-0.4.1.tar.gz) = 20731 > -SIZE (cargo/memchr-2.0.1.tar.gz) = 9858 > +SIZE (cargo/itoa-0.4.2.tar.gz) = 10581 > +SIZE (cargo/lazy_static-1.1.0.tar.gz) = 12317 > +SIZE (cargo/libc-0.2.43.tar.gz) = 353810 > +SIZE (cargo/lock_api-0.1.3.tar.gz) = 12167 > +SIZE (cargo/log-0.4.5.tar.gz) = 22221 > +SIZE (cargo/memchr-2.0.2.tar.gz) = 10092 > SIZE (cargo/memmap-0.6.2.tar.gz) = 15015 > +SIZE (cargo/memoffset-0.2.1.tar.gz) = 4618 > +SIZE (cargo/nodrop-0.1.12.tar.gz) = 3033 > SIZE (cargo/num_cpus-1.8.0.tar.gz) = 10539 > -SIZE (cargo/rand-0.3.22.tar.gz) = 11318 > -SIZE (cargo/rand-0.4.2.tar.gz) = 76170 > -SIZE (cargo/redox_syscall-0.1.37.tar.gz) = 13980 > +SIZE (cargo/owning_ref-0.3.3.tar.gz) = 11710 > +SIZE (cargo/parking_lot-0.6.4.tar.gz) = 31890 > +SIZE (cargo/parking_lot_core-0.3.0.tar.gz) = 21965 > +SIZE (cargo/pcre2-0.1.0.tar.gz) = 17574 > +SIZE (cargo/pcre2-sys-0.1.1.tar.gz) = 2136686 > +SIZE (cargo/pkg-config-0.3.14.tar.gz) = 13565 > +SIZE (cargo/proc-macro2-0.4.18.tar.gz) = 29919 > +SIZE (cargo/quote-0.6.8.tar.gz) = 15530 > +SIZE (cargo/rand-0.4.3.tar.gz) = 76094 > +SIZE (cargo/rand-0.5.5.tar.gz) = 137359 > +SIZE (cargo/rand_core-0.2.1.tar.gz) = 19262 > +SIZE (cargo/redox_syscall-0.1.40.tar.gz) = 14745 > SIZE (cargo/redox_termios-0.1.1.tar.gz) = 3227 > -SIZE (cargo/regex-0.2.6.tar.gz) = 197800 > -SIZE (cargo/regex-syntax-0.4.2.tar.gz) = 126234 > -SIZE (cargo/same-file-1.0.2.tar.gz) = 8870 > -SIZE (cargo/simd-0.2.1.tar.gz) = 35716 > +SIZE (cargo/regex-1.0.5.tar.gz) = 245770 > +SIZE (cargo/regex-syntax-0.6.2.tar.gz) = 238572 > +SIZE (cargo/remove_dir_all-0.5.1.tar.gz) = 8726 > +SIZE (cargo/ryu-0.2.6.tar.gz) = 39911 > +SIZE (cargo/safemem-0.2.0.tar.gz) = 6450 > +SIZE (cargo/same-file-1.0.3.tar.gz) = 8995 > +SIZE (cargo/scopeguard-0.3.3.tar.gz) = 9605 > +SIZE (cargo/serde-1.0.77.tar.gz) = 72861 > +SIZE (cargo/serde_derive-1.0.77.tar.gz) = 46352 > +SIZE (cargo/serde_json-1.0.27.tar.gz) = 65402 > +SIZE (cargo/simd-0.2.2.tar.gz) = 37477 > +SIZE (cargo/smallvec-0.6.5.tar.gz) = 20238 > +SIZE (cargo/stable_deref_trait-1.1.1.tar.gz) = 8007 > SIZE (cargo/strsim-0.7.0.tar.gz) = 8435 > -SIZE (cargo/tempdir-0.3.5.tar.gz) = 10605 > -SIZE (cargo/termcolor-0.3.4.tar.gz) = 13385 > +SIZE (cargo/syn-0.15.1.tar.gz) = 142480 > +SIZE (cargo/tempdir-0.3.7.tar.gz) = 11468 > +SIZE (cargo/termcolor-1.0.3.tar.gz) = 14410 > SIZE (cargo/termion-1.5.1.tar.gz) = 20659 > -SIZE (cargo/textwrap-0.9.0.tar.gz) = 15795 > -SIZE (cargo/thread_local-0.3.5.tar.gz) = 11794 > -SIZE (cargo/unicode-width-0.1.4.tar.gz) = 15283 > +SIZE (cargo/textwrap-0.10.0.tar.gz) = 15986 > +SIZE (cargo/thread_local-0.3.6.tar.gz) = 12388 > +SIZE (cargo/ucd-util-0.1.1.tar.gz) = 24221 > +SIZE (cargo/unicode-width-0.1.5.tar.gz) = 15761 > +SIZE (cargo/unicode-xid-0.1.0.tar.gz) = 16000 > SIZE (cargo/unreachable-1.0.0.tar.gz) = 6355 > -SIZE (cargo/utf8-ranges-1.0.0.tar.gz) = 8599 > -SIZE (cargo/vec_map-0.8.0.tar.gz) = 13742 > +SIZE (cargo/utf8-ranges-1.0.1.tar.gz) = 9247 > +SIZE (cargo/version_check-0.1.4.tar.gz) = 7946 > SIZE (cargo/void-1.0.2.tar.gz) = 2356 > -SIZE (cargo/walkdir-2.1.4.tar.gz) = 22695 > -SIZE (cargo/winapi-0.3.4.tar.gz) = 905247 > +SIZE (cargo/walkdir-2.2.5.tar.gz) = 23985 > +SIZE (cargo/winapi-0.3.5.tar.gz) = 997942 > SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 > +SIZE (cargo/winapi-util-0.1.1.tar.gz) = 7635 > SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 > -SIZE (cargo/wincolor-0.1.6.tar.gz) = 4799 > -SIZE (ripgrep-0.8.1.tar.gz) = 521088 > +SIZE (cargo/wincolor-1.0.1.tar.gz) = 4737 > +SIZE (ripgrep-0.10.0.tar.gz) = 428779 > diff --git patches/patch-src_args_rs patches/patch-src_args_rs > deleted file mode 100644 > index b66eabd8458..00000000000 > --- patches/patch-src_args_rs > +++ /dev/null > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-src_args_rs,v 1.1 2018/04/26 14:17:04 landry Exp $ > -Declare search_zip_files to be public for pledge(2) > -Index: src/args.rs > ---- src/args.rs.orig > -+++ src/args.rs > -@@ -77,7 +77,7 @@ pub struct Args { > - type_list: bool, > - types: Types, > - with_filename: bool, > -- search_zip_files: bool > -+ pub search_zip_files: bool > - } > - > - impl Args { > diff --git patches/patch-src_main_rs patches/patch-src_main_rs > deleted file mode 100644 > index 43f044eb49d..00000000000 > --- patches/patch-src_main_rs > +++ /dev/null > @@ -1,38 +0,0 @@ > -$OpenBSD: patch-src_main_rs,v 1.1 2018/04/26 14:17:04 landry Exp $ > -Add pledge(2) call: > -- "stdio rpath" for common usage > -- "stdio rpath proc exec" for -z (--search-zip) as it is spawning external > commands for decompress files. > -Index: src/main.rs > ---- src/main.rs.orig > -+++ src/main.rs > -@@ -28,6 +28,13 @@ use std::sync::atomic::{AtomicUsize, Ordering}; > - use std::sync::mpsc; > - use std::thread; > - > -+use std::ffi::CString; > -+use std::io; > -+use std::ptr; > -+extern "C" { > -+ fn pledge(promises: *const libc::c_char, execpromises: *const > libc::c_char) -> libc::c_int; > -+} > -+ > - use args::Args; > - use worker::Work; > - > -@@ -65,6 +72,16 @@ fn main() { > - } > - > - fn run(args: Arc<Args>) -> Result<u64> { > -+ let promises = if args.search_zip_files { > -+ CString::new("stdio rpath proc exec").unwrap() > -+ } else { > -+ CString::new("stdio rpath").unwrap() > -+ }; > -+ let execpromises = ptr::null() as *const libc::c_char; > -+ if unsafe { pledge(promises.as_ptr(), execpromises) } == -1 { > -+ eprintln!("error: pledge: {:?}", io::Error::last_os_error()); > -+ process::exit(1); > -+ } > - if args.never_match() { > - return Ok(0); > - } > diff --git patches/patch-tests_tests_rs patches/patch-tests_tests_rs > deleted file mode 100644 > index d10c2cca842..00000000000 > --- patches/patch-tests_tests_rs > +++ /dev/null > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-tests_tests_rs,v 1.1 2018/03/20 10:40:23 kn Exp $ > - > -Index: tests/tests.rs > ---- tests/tests.rs.orig > -+++ tests/tests.rs > -@@ -1765,7 +1765,7 @@ fn compressed_failing_gzip() { > - > - let output = cmd.output().unwrap(); > - let err = String::from_utf8_lossy(&output.stderr); > -- assert_eq!(err.contains("not in gzip format"), true); > -+ assert_eq!(err.contains("unrecognized file format"), true); > - } > - > - sherlock!(feature_196_persistent_config, "sherlock",