From 56ef021c58088c79bc71257eb348ff6decc47607 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Apr 2024 20:14:29 +0100 Subject: gentoo auto-resync : 03:04:2024 - 20:14:28 --- sys-apps/Manifest.gz | Bin 50826 -> 50831 bytes sys-apps/kcheck/Manifest | 2 +- sys-apps/kcheck/metadata.xml | 5 +- sys-apps/the_silver_searcher/Manifest | 8 +- .../files/the_silver_searcher-2.2.0-no_lfs64.patch | 41 ++++++ .../files/the_silver_searcher-fno-common.patch | 164 --------------------- sys-apps/the_silver_searcher/metadata.xml | 14 +- .../the_silver_searcher-2.2.0.ebuild | 54 ------- .../the_silver_searcher-2.2.0_p20201217-r1.ebuild | 3 +- 9 files changed, 55 insertions(+), 236 deletions(-) create mode 100644 sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch delete mode 100644 sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch delete mode 100644 sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 589cb74bfc9c..dd29e94cc25b 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/kcheck/Manifest b/sys-apps/kcheck/Manifest index f8efec4437a9..bc9f92b217a5 100644 --- a/sys-apps/kcheck/Manifest +++ b/sys-apps/kcheck/Manifest @@ -1,4 +1,4 @@ DIST kcheck-0.0.2.tar.gz 8519 BLAKE2B bc1a4355e1d55118386b34d6f5aca0f11cbf519c0f7d3bb0cf143cca4682af782e6728585fa6dd36c21fc6cea73d21d0ab35571f93096b9eba4a9b461808f2b0 SHA512 98e3ad4835f8c1bacf68f98e112c05788394feb00683b7a02aa92cc2b5f8b4edeebe2b962c07a171b06bdfe7324e715d58057f6c8550004acc52cc0d9105ba9e EBUILD kcheck-0.0.2-r2.ebuild 746 BLAKE2B beed905757b511cdd944dfa89f78e99c1da1f136a8fbd23d4602c19431a555d8e4c79359528d852384332371ca48ee2d42aba29b8d10aacfcaedafc21d400fff SHA512 6ec7f5f3797b591a99b2009470218ac41edce110282ec088cbeb3cbc72d93172b0b96b27ca1859728f2b627aefbda1edd39c85ae5fb1d8e10740394e2c8559aa EBUILD kcheck-9999.ebuild 746 BLAKE2B beed905757b511cdd944dfa89f78e99c1da1f136a8fbd23d4602c19431a555d8e4c79359528d852384332371ca48ee2d42aba29b8d10aacfcaedafc21d400fff SHA512 6ec7f5f3797b591a99b2009470218ac41edce110282ec088cbeb3cbc72d93172b0b96b27ca1859728f2b627aefbda1edd39c85ae5fb1d8e10740394e2c8559aa -MISC metadata.xml 455 BLAKE2B 82da8d0a48779a97efa4de3e329622e3d98689668d83084d9a5e1669e915158b6cf67111d0ffcb49eaf2fe489a56b6c64e300aa517c7049e975c1fe14b4ddbc5 SHA512 c71e5dc4d2953f27d1c0d6ca37f625772c4631e1aa0a2362f0ba607ccbcf9462b840a64ad246dcc6dbb9f9656c87e61bfb892e47b911bb9a7726c34b633a6eac +MISC metadata.xml 380 BLAKE2B 7ad3b080ef1ce493caeccb388af605c7e0460a2f4f80ca72bfc1098ff00be6a965cc95364249ddb4172f178a5865dc35af5f3d3af0bcc38b5d38d40f0a565a7e SHA512 2edd54137bf657b73712fadfc3ce5a0768030436f88f38409e78787442ca4885ec90653d498163896d122084961f0703490ffc4c0c397e9ccca264f1a12badf3 diff --git a/sys-apps/kcheck/metadata.xml b/sys-apps/kcheck/metadata.xml index aa8a6dc44f4e..4ca36f494595 100644 --- a/sys-apps/kcheck/metadata.xml +++ b/sys-apps/kcheck/metadata.xml @@ -1,10 +1,7 @@ - - wraeth@gentoo.org - Sam Jorna - + https://github.com/wraeth/kcheck/issues https://github.com/wraeth/kcheck/commits/master diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest index 661d11159a12..bf598052a394 100644 --- a/sys-apps/the_silver_searcher/Manifest +++ b/sys-apps/the_silver_searcher/Manifest @@ -1,7 +1,5 @@ AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052 -AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a574eab5e58d02922634cf778729f70631396e4dbae0ba968d8d7828fefca7dbd618138dab3ad7094727a851ba254a460f216cf13 SHA512 14352a4e44a7a07d832a2192be2f22aa7446984d90dafc8d637610b9a13f79adb91e1489a4439a25ec453b29b18d696e41797bee77f4465e2fe9a864a8f12459 -DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e +AUX the_silver_searcher-2.2.0-no_lfs64.patch 1142 BLAKE2B f42b6b96ddd83a0bd3cf6cb0b030a3c4a628f2fc71bbea30261680f68a7351f25453a0898eb877fc2d7ab3c332bea5aec5b4cbf1ad49297a0741d3a2f9c29807 SHA512 9cb5a28fafd89955c4d65c58e0b4951e2a400e80d5608f47869fc5e5e0ee8626897e978e828c3e0aee7d30f7bfd93e63a0d076b3b754db500edcf804cfd721b2 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126 -EBUILD the_silver_searcher-2.2.0.ebuild 1047 BLAKE2B 546d64df5130376827e3556a4c1ab8487d1c580f21682c4d0e954cff92d186f154d0f156cec508f65e7d77170230ce7cda7ca8128a4c62c8f59c3594d09b9950 SHA512 d0c7ccc383ea8ca8da7a81071106d6d9b2948292b65e3685406b1502fb16d6fec04527fb0887e6d9b97dc824e86358353173dbd06f03ed384794250f18ee89fa -EBUILD the_silver_searcher-2.2.0_p20201217-r1.ebuild 1206 BLAKE2B 05df2ec77b87840cad4618dedd4fdeaba0fcddc1319e2a76bc12c8a2ffd8be5332f26c86890d1cec8d219dd930899927c9da6a8c38f6dd2af1a9a7d46c796e6b SHA512 70112800f87b4a391e62440304e5a8957d77da1efaf619c6897fa887fc5370e5a50f5c5d3979df03a781cccc2f0174bac3e7968895d73921ea0f86d12d7989f9 -MISC metadata.xml 344 BLAKE2B 289f782137d03202a435a332dc1ee6f486bb6cc750b70482cc711f375d5f2e4120baaf93ba9bf545ee0df30b4b99d058409fd2be04af1104ca495e4aa4376235 SHA512 2b02041e81bd7ffff37e279c76a579e515533328b4b6cd6386dda6bfb6ae10cdb6e1a4d1076b2763ff3550e8fb477739356fe68a074c665832c15439bf7ae2e1 +EBUILD the_silver_searcher-2.2.0_p20201217-r1.ebuild 1248 BLAKE2B 9478a97970b5fc43ef375e2ff6d31221d9cd88e01c68cd658d4d5bf933cc93489f87508b018573ebeaf49971fc8cf96fad2d1ff23926982bf56e98ab546b484f SHA512 33110751afa88d6ffa5005dac1c74d0149f589ccd9be55e91978a9e770c40aea964e095b1ddc82c6c148d4b85ff89b93f27c5ef13096dd060e393d9deaebaa17 +MISC metadata.xml 337 BLAKE2B ebc0a9cb5b553e57b6b4fedd0c0838256ed348c1f313576eb58accf4a8a1ab73d8065daaadbf4fed612ee6311b114cfd2330b62840c7238c77832f4122739bdf SHA512 40d62335cc5c9f9857b635f7fd15daadd9f7b3b733ac64c39d7078dec27e742763232316aac45f88967f9b95bf8068e509492fa8c17cf43fde9e46f640065105 diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch new file mode 100644 index 000000000000..62925a7fb1f0 --- /dev/null +++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-2.2.0-no_lfs64.patch @@ -0,0 +1,41 @@ +LFS64 interfaces are now generally considered deprecated, and are no longer +available in MUSL since version 1.2.4. + +--- a/src/zfile.c ++++ b/src/zfile.c +@@ -4,7 +4,7 @@ + #include + + #ifdef __CYGWIN__ +-typedef _off64_t off64_t; ++typedef _off64_t off_t; + #endif + + #include +@@ -331,14 +331,14 @@ + } + + static int +-zfile_seek(void *cookie_, off64_t *offset_, int whence) { ++zfile_seek(void *cookie_, off_t *offset_, int whence) { + struct zfile *cookie = cookie_; +- off64_t new_offset = 0, offset = *offset_; ++ off_t new_offset = 0, offset = *offset_; + + if (whence == SEEK_SET) { + new_offset = offset; + } else if (whence == SEEK_CUR) { +- new_offset = (off64_t)cookie->logic_offset + offset; ++ new_offset = (off_t)cookie->logic_offset + offset; + } else { + /* SEEK_END not ok */ + return -1; +@@ -348,7 +348,7 @@ + return -1; + + /* Backward seeks to anywhere but 0 are not ok */ +- if (new_offset < (off64_t)cookie->logic_offset && new_offset != 0) { ++ if (new_offset < (off_t)cookie->logic_offset && new_offset != 0) { + return -1; + } + diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch deleted file mode 100644 index 49861018e3ad..000000000000 --- a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch +++ /dev/null @@ -1,164 +0,0 @@ ---- a/src/search.h -+++ b/src/search.h -@@ -31,9 +31,9 @@ - #include "uthash.h" - #include "util.h" - --size_t alpha_skip_lookup[256]; --size_t *find_skip_lookup; --uint8_t h_table[H_SIZE] __attribute__((aligned(64))); -+extern size_t alpha_skip_lookup[256]; -+extern size_t *find_skip_lookup; -+extern uint8_t h_table[H_SIZE] __attribute__((aligned(64))); - - struct work_queue_t { - char *path; -@@ -41,12 +41,12 @@ - }; - typedef struct work_queue_t work_queue_t; - --work_queue_t *work_queue; --work_queue_t *work_queue_tail; --int done_adding_files; --pthread_cond_t files_ready; --pthread_mutex_t stats_mtx; --pthread_mutex_t work_queue_mtx; -+extern work_queue_t *work_queue; -+extern work_queue_t *work_queue_tail; -+extern int done_adding_files; -+extern pthread_cond_t files_ready; -+extern pthread_mutex_t stats_mtx; -+extern pthread_mutex_t work_queue_mtx; - - - /* For symlink loop detection */ -@@ -64,7 +64,7 @@ - UT_hash_handle hh; - } symdir_t; - --symdir_t *symhash; -+extern symdir_t *symhash; - - void search_buf(const char *buf, const size_t buf_len, - const char *dir_full_path); ---- a/src/search.c -+++ b/src/search.c -@@ -2,6 +2,19 @@ - #include "print.h" - #include "scandir.h" - -+ size_t alpha_skip_lookup[256]; -+ size_t *find_skip_lookup; -+ uint8_t h_table[H_SIZE] __attribute__((aligned(64))); -+ -+ work_queue_t *work_queue; -+ work_queue_t *work_queue_tail; -+ int done_adding_files; -+ pthread_cond_t files_ready; -+ pthread_mutex_t stats_mtx; -+ pthread_mutex_t work_queue_mtx; -+ -+ symdir_t *symhash; -+ - void search_buf(const char *buf, const size_t buf_len, - const char *dir_full_path) { - int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */ ---- a/src/log.c -+++ b/src/log.c -@@ -4,6 +4,8 @@ - #include "log.h" - #include "util.h" - -+pthread_mutex_t print_mtx; -+ - static enum log_level log_threshold = LOG_LEVEL_ERR; - - void set_log_level(enum log_level threshold) { ---- a/src/log.h -+++ b/src/log.h -@@ -9,7 +9,7 @@ - #include - #endif - --pthread_mutex_t print_mtx; -+extern pthread_mutex_t print_mtx; - - enum log_level { - LOG_LEVEL_DEBUG = 10, ---- a/src/options.h -+++ b/src/options.h -@@ -91,7 +91,7 @@ - } cli_options; - - /* global options. parse_options gives it sane values, everything else reads from it */ --cli_options opts; -+extern cli_options opts; - - typedef struct option option_t; - ---- a/src/options.c -+++ b/src/options.c -@@ -16,6 +16,8 @@ - #include "print.h" - #include "util.h" - -+cli_options opts; -+ - const char *color_line_number = "\033[1;33m"; /* bold yellow */ - const char *color_match = "\033[30;43m"; /* black with yellow background */ - const char *color_path = "\033[1;32m"; /* bold green */ ---- a/src/util.h -+++ b/src/util.h -@@ -12,7 +12,7 @@ - #include "log.h" - #include "options.h" - --FILE *out_fd; -+extern FILE *out_fd; - - #ifndef TRUE - #define TRUE 1 -@@ -51,7 +51,7 @@ - } ag_stats; - - --ag_stats stats; -+extern ag_stats stats; - - /* Union to translate between chars and words without violating strict aliasing */ - typedef union { ---- a/src/util.c -+++ b/src/util.c -@@ -15,6 +15,10 @@ - #define getc_unlocked(x) getc(x) - #endif - -+FILE *out_fd; -+ -+ag_stats stats; -+ - #define CHECK_AND_RETURN(ptr) \ - if (ptr == NULL) { \ - die("Memory allocation failed."); \ ---- a/src/ignore.c -+++ b/src/ignore.c -@@ -22,6 +22,8 @@ - - /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */ - -+ignores *root_ignores; -+ - const char *evil_hardcoded_ignore_files[] = { - ".", - "..", ---- a/src/ignore.h -+++ b/src/ignore.h -@@ -29,7 +29,7 @@ - }; - typedef struct ignores ignores; - --ignores *root_ignores; -+extern ignores *root_ignores; - - extern const char *evil_hardcoded_ignore_files[]; - extern const char *ignore_pattern_files[]; diff --git a/sys-apps/the_silver_searcher/metadata.xml b/sys-apps/the_silver_searcher/metadata.xml index 0c440970de3f..0f71fdbbec56 100644 --- a/sys-apps/the_silver_searcher/metadata.xml +++ b/sys-apps/the_silver_searcher/metadata.xml @@ -1,11 +1,11 @@ - - wraeth@gentoo.org - Sam Jorna - - - ggreer/the_silver_searcher - + + marecki@gentoo.org + Marek Szuba + + + ggreer/the_silver_searcher + diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild deleted file mode 100644 index 5b4b3e89acdc..000000000000 --- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools bash-completion-r1 - -DESCRIPTION="A code-searching tool similar to ack, but faster" -HOMEPAGE="https://github.com/ggreer/the_silver_searcher" -SRC_URI="https://github.com/ggreer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="lzma test zlib" -RESTRICT="!test? ( test )" - -RDEPEND="dev-libs/libpcre - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( - dev-util/cram - dev-vcs/git - )" - -DOCS="README.md" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-lzma.patch - "${FILESDIR}"/${PN}-fno-common.patch -) - -src_prepare() { - sed '/^dist_bashcomp/d' -i Makefile.am || die - - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable lzma) \ - $(use_enable zlib) -} - -src_test() { - cram -v tests/*.t || die "tests failed" -} - -src_install() { - default - newbashcomp ag.bashcomp.sh ag -} diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild index 68675d7bc043..1b9f8c8a60bb 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild +++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -30,6 +30,7 @@ DOCS="README.md" PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch + "${FILESDIR}"/${PN}-2.2.0-no_lfs64.patch ) src_prepare() { -- cgit v1.2.3