[gentoo-commits] proj/pax-utils:master commit in: /
commit: 80a83a8f6aebd4c5f0d2a21bfbfe5d7cffd1fc9b Author: Mike Frysinger gentoo org> AuthorDate: Thu Jan 25 06:51:49 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 25 06:51:49 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=80a83a8f sanitizer: fix feature tests under clang While gcc defines __SANITIZE_ADDRESS__, clang requires more verbose tests. Add them to make the cleanup/security logic work correctly. Signed-off-by: Mike Frysinger gentoo.org> porting.h | 7 +++ 1 file changed, 7 insertions(+) diff --git a/porting.h b/porting.h index 103d268..6c0da01 100644 --- a/porting.h +++ b/porting.h @@ -74,6 +74,13 @@ #endif #undef PAX_UTILS_CLEANUP +#ifndef __SANITIZE_ADDRESS__ +# ifdef __has_feature +# if __has_feature (address_sanitizer) +# define __SANITIZE_ADDRESS__ 1 +# endif +# endif +#endif /* LSAN (Leak Sanitizer) will complain about things we leak. */ #ifdef __SANITIZE_ADDRESS__ # define PAX_UTILS_CLEANUP 1
[gentoo-commits] proj/pax-utils:master commit in: /
commit: af9a4e8e1695fcbaaeb379bec14ccc03b00341fa Author: Mike Frysinger gentoo org> AuthorDate: Thu Jan 25 05:53:39 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 25 05:53:39 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=af9a4e8e dumpelf: free elf after fuzzing it to avoid leaking Signed-off-by: Mike Frysinger gentoo.org> dumpelf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dumpelf.c b/dumpelf.c index 5b18326..0afb6c7 100644 --- a/dumpelf.c +++ b/dumpelf.c @@ -587,6 +587,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) if (elf == NULL) return 0; dumpelf(elf, 0); + unreadelf(elf); return 0; } #else
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 0b5d5d35b7b745dfff588579cda1245c5a4d19cb
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 05:50:23 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 05:50:23 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=0b5d5d35
paxelf: reject ELFs with incomplete Ehdr structures
There's nothing useful we can parse out of these, so skip them.
Signed-off-by: Mike Frysinger gentoo.org>
paxelf.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/paxelf.c b/paxelf.c
index 9a34ea4..599d54f 100644
--- a/paxelf.c
+++ b/paxelf.c
@@ -620,6 +620,11 @@ free_elf_and_return:
char invalid; \
const Elf ## B ## _Ehdr *ehdr = EHDR ## B (elf->ehdr); \
Elf ## B ## _Off size; \
+ /* Need enough bytes for all of ehdr. */ \
+ if (elf->len < (off_t)sizeof(*ehdr)) { \
+ warn("%s: Incomplete ELF header", filename); \
+ goto free_elf_and_return; \
+ } \
/* verify program header */ \
invalid = 0; \
if (EGET(ehdr->e_phnum) <= 0) \
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 0c6f0ca36748ae97d413aff232ad4fcc6829a582 Author: Mike Frysinger gentoo org> AuthorDate: Thu Jan 25 05:36:05 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 25 05:36:05 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=0c6f0ca3 README: update macOS name Signed-off-by: Mike Frysinger gentoo.org> README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec4bfe6..845c8de 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ pax-utils is a small set of utilities for performing Q/A (mostly security) checks on systems (most notably, `scanelf`). It is focused on the ELF -format, but does include a Mach-O helper too for OS X systems. +format, but does include a Mach-O helper too for macOS systems. While heavily integrated into Gentoo's build system, it can be used on any distro as it is a generic toolset.
[gentoo-commits] proj/pax-utils:master commit in: /
commit: c1759f9bf28edb910208a7c7fbb4b373fe8b1297
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 05:19:50 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 05:19:50 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c1759f9b
scanelf: fix hashtable overflow checks
Make sure we use the right offset, and make sure the numbers to check
don't overflow themselves -- if nbuckets & nchains are 32-bit, and if
we multiply them by 4, we can easily overflow before we get a chance
to see if they will fit within the memory range.
Bug: https://bugs.gentoo.org/890028
Signed-off-by: Mike Frysinger gentoo.org>
scanelf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scanelf.c b/scanelf.c
index 140208b..0ee1bad 100644
--- a/scanelf.c
+++ b/scanelf.c
@@ -315,9 +315,9 @@ static void scanelf_file_get_symtabs(elfobj *elf, const
void **sym, const void *
Elf32_Word sym_idx; \
Elf32_Word chained; \
\
- if (!VALID_RANGE(elf, offset, nbuckets * 4)) \
+ if (!VALID_RANGE(elf, hash_offset, nbuckets *
(uint64_t)4)) \
goto corrupt_hash; \
- if (!VALID_RANGE(elf, offset, nchains * 4)) \
+ if (!VALID_RANGE(elf, hash_offset, nchains *
(uint64_t)4)) \
goto corrupt_hash; \
\
for (b = 0; b < nbuckets; ++b) { \
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 77bf161b55dbf340f4498ad26eef3fd7a0dfbcdc
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 05:02:51 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 05:02:51 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=77bf161b
ar: switch from alloca to malloc
If alloca allocates too much stack space, program behavior is undefined,
and basically we segfault. There is no way to check whether this will
happen ahead of time, so our only choice is to switch to malloc. If we
try to allocate too much memory from the heap, we'll get a NULL pointer,
and we can diagnose & exit ourselves. Kind of sucks as alloca was a
perfect fit here, but since the size is coming directly from user input,
we can't trust it is always "reasonable".
Bug: https://bugs.gentoo.org/890579
Signed-off-by: Mike Frysinger gentoo.org>
meson.build | 1 -
paxinc.c| 5 -
porting.h | 3 ---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index e891d98..319e3de 100644
--- a/meson.build
+++ b/meson.build
@@ -44,7 +44,6 @@ foreach x : [
'linux/seccomp.h',
'linux/securebits.h',
'sys/prctl.h',
- 'alloca.h',
'elf-hints.h',
'glob.h',
]
diff --git a/paxinc.c b/paxinc.c
index 21844d8..644c0d6 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -89,11 +89,13 @@ static uint64_t ar_read_ascii_number(const char *numstr,
size_t ndigits, int bas
archive_member *ar_next(archive_handle *ar)
{
char *s;
+ char *heap_s = NULL;
ssize_t len = 0;
static archive_member ret;
if (ar->skip && lseek(ar->fd, ar->skip, SEEK_CUR) == -1) {
close_and_ret:
+ free(heap_s);
free(ar->extfn);
close(ar->fd);
ar->extfn = NULL;
@@ -146,7 +148,7 @@ close_and_ret:
if (read(ar->fd, ret.buf.formatted.name, len) != len)
goto close_and_ret;
} else {
- s = alloca(sizeof(char) * len + 1);
+ s = heap_s = xmalloc(sizeof(char) * (len + 1));
if (read(ar->fd, s, len) != len)
goto close_and_ret;
s[len] = '\0';
@@ -167,6 +169,7 @@ close_and_ret:
}
snprintf(ret.name, sizeof(ret.name), "%s:%s", ar->filename, s);
+ free(heap_s);
ret.name[sizeof(ret.name) - 1] = '\0';
if ((s=strchr(ret.name+strlen(ar->filename), '/')) != NULL)
*s = '\0';
diff --git a/porting.h b/porting.h
index 68e2b6c..103d268 100644
--- a/porting.h
+++ b/porting.h
@@ -40,9 +40,6 @@
#include
#include
#include "elf.h"
-#ifdef HAVE_ALLOCA_H
-# include
-#endif
#ifdef HAVE_SYS_PRCTL_H
# include
# ifdef HAVE_LINUX_SECCOMP_H
[gentoo-commits] proj/pax-utils:master commit in: /
commit: f2af478770a5a4a3f69ab64f1b5e17c8f7a17050
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 04:58:06 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 04:58:06 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=f2af4787
ar: handle invalid extended filename offsets
Check the extended filename offset doesn't exceed the size of the
extended filename section.
Bug: https://bugs.gentoo.org/890579
Signed-off-by: Mike Frysinger gentoo.org>
paxinc.c | 10 --
paxinc.h | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/paxinc.c b/paxinc.c
index 5369697..21844d8 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -126,7 +126,7 @@ close_and_ret:
warn("%s: Duplicate GNU extended filename section",
ar->filename);
goto close_and_ret;
}
- len = read_decimal_number_fixed(ret.buf.formatted.size);
+ len = ar->extfn_len =
read_decimal_number_fixed(ret.buf.formatted.size);
ar->extfn = xmalloc(sizeof(char) * (len + 1));
if (read(ar->fd, ar->extfn, len) != len)
goto close_and_ret;
@@ -157,7 +157,13 @@ close_and_ret:
warn("%s: GNU extended filename without special data
section", ar->filename);
goto close_and_ret;
}
- s = ar->extfn + read_decimal_number(s + 1,
sizeof(ret.buf.formatted.name) - 1);
+ /* NB: We NUL terminated extfn above when reading it. */
+ int64_t off = read_decimal_number(s + 1,
sizeof(ret.buf.formatted.name) - 1);
+ if (off >= ar->extfn_len) {
+ warn("%s: GNU extended filename has invalid offset",
ar->filename);
+ goto close_and_ret;
+ }
+ s = ar->extfn + off;
}
snprintf(ret.name, sizeof(ret.name), "%s:%s", ar->filename, s);
diff --git a/paxinc.h b/paxinc.h
index c8fcf71..b2d2b50 100644
--- a/paxinc.h
+++ b/paxinc.h
@@ -48,6 +48,7 @@ typedef struct {
const char *filename;
size_t skip;
char *extfn;
+ off_t extfn_len;
bool verbose;
} archive_handle;
#else
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 5b5556d12b96dd2d420e0d66456f1935668b3984
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 04:33:40 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 04:33:40 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=5b5556d1
ar: handle invalid ascii numbers better
The atoi helper handles signed 32-bit integers, and expects the input
strings to be NUL terminated. Some of the fields are larger than what
signed 32-bit can handle, and none of them are NUL terminated. The
code currently works because it stops processing once it reaches text
that is not numeric, and the content that follows each field is always
non-numeric (e.g. a space).
Add a helper function that leverages strtoll as all of the fields can
fit into a signed 64-bit number. If the number is invalid, flag it as
such, and normalize it to 0 so the rest of the code can continue on.
Bug: https://bugs.gentoo.org/890577
Signed-off-by: Mike Frysinger gentoo.org>
paxinc.c | 53 +
1 file changed, 45 insertions(+), 8 deletions(-)
diff --git a/paxinc.c b/paxinc.c
index ff4ab85..5369697 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -50,6 +50,42 @@ archive_handle *ar_open(const char *filename, bool verbose)
return ret;
}
+static uint64_t ar_read_ascii_number(const char *numstr, size_t ndigits, int
base)
+{
+ /* Largest field ar headers have is 16 bytes. */
+ char buf[17];
+ char *endp;
+ long long ret;
+
+ memcpy(buf, numstr, ndigits);
+ buf[ndigits] = '\0';
+
+ ret = strtoll(buf, , base);
+ /* Numbers are padded with whitespace. */
+ if (*endp != '\0' && *endp != ' ') {
+ warn("ar: invalid number: %s", buf);
+ ret = 0;
+ }
+
+ /*
+* Unsigned 64-bit numbers use up to 20 digits, and signed 64-bit
numbers use
+* up to 19 digits, but ndigits is always less than that. So we'd
never handle
+* a number that requires all 64-bits. If it's negative, it's because
the input
+* was negative e.g. "-1", and none of these fields should ever be
negative.
+*/
+ if (ret < 0) {
+ warn("ar: invalid number: %s", buf);
+ ret = 0;
+ }
+
+ return ret;
+}
+#define read_octal_number(s, n) ar_read_ascii_number(s, n, 8)
+#define read_decimal_number(s, n) ar_read_ascii_number(s, n, 10)
+/* For char[] arrays rather than dynamic pointers. */
+#define read_octal_number_fixed(s) read_octal_number(s, sizeof(s))
+#define read_decimal_number_fixed(s) read_decimal_number(s, sizeof(s))
+
archive_member *ar_next(archive_handle *ar)
{
char *s;
@@ -84,12 +120,13 @@ close_and_ret:
goto close_and_ret;
}
+ /* System V extended filename section. */
if (ret.buf.formatted.name[0] == '/' && ret.buf.formatted.name[1] ==
'/') {
if (ar->extfn != NULL) {
warn("%s: Duplicate GNU extended filename section",
ar->filename);
goto close_and_ret;
}
- len = atoi(ret.buf.formatted.size);
+ len = read_decimal_number_fixed(ret.buf.formatted.size);
ar->extfn = xmalloc(sizeof(char) * (len + 1));
if (read(ar->fd, ar->extfn, len) != len)
goto close_and_ret;
@@ -104,7 +141,7 @@ close_and_ret:
s = ret.buf.formatted.name;
if (s[0] == '#' && s[1] == '1' && s[2] == '/') {
/* BSD extended filename, always in use on Darwin */
- len = atoi(s + 3);
+ len = read_decimal_number(s + 3, sizeof(ret.buf.formatted.name)
- 3);
if (len <= (ssize_t)sizeof(ret.buf.formatted.name)) {
if (read(ar->fd, ret.buf.formatted.name, len) != len)
goto close_and_ret;
@@ -120,18 +157,18 @@ close_and_ret:
warn("%s: GNU extended filename without special data
section", ar->filename);
goto close_and_ret;
}
- s = ar->extfn + atoi(s + 1);
+ s = ar->extfn + read_decimal_number(s + 1,
sizeof(ret.buf.formatted.name) - 1);
}
snprintf(ret.name, sizeof(ret.name), "%s:%s", ar->filename, s);
ret.name[sizeof(ret.name) - 1] = '\0';
if ((s=strchr(ret.name+strlen(ar->filename), '/')) != NULL)
*s = '\0';
- ret.date = atoi(ret.buf.formatted.date);
- ret.uid = atoi(ret.buf.formatted.uid);
- ret.gid = atoi(ret.buf.formatted.gid);
- ret.mode = strtol(ret.buf.formatted.mode, NULL, 8);
- ret.size = atoi(ret.buf.formatted.size);
+ ret.date = read_decimal_number_fixed(ret.buf.formatted.date);
+ ret.
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 5243cb017a7847f53caaa7c89b8e7f3abf1e5e40
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 02:52:41 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 02:52:41 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=5243cb01
unify usage() output across all the tools
The scanelf --help output is the best & most flexible, so move that
to common code so the rest of the tools can benefit from it.
Signed-off-by: Mike Frysinger gentoo.org>
dumpelf.c | 20 +++-
paxinc.c| 50 ++
paxinc.h| 11 +++
pspax.c | 21 +++--
scanelf.c | 45 +++--
scanmacho.c | 24
6 files changed, 90 insertions(+), 81 deletions(-)
diff --git a/dumpelf.c b/dumpelf.c
index c8f27e4..5b18326 100644
--- a/dumpelf.c
+++ b/dumpelf.c
@@ -507,7 +507,6 @@ static void dump_dyn(const elfobj *elf, const void
*dyn_void, size_t dyn_cnt)
/* usage / invocation handling functions */
#define PARSE_FLAGS "vhV"
-#define a_argument required_argument
static struct option const long_opts[] = {
{"verbose", no_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
@@ -524,18 +523,13 @@ static const char * const opts_help[] = {
/* display usage and exit */
static void usage(int status)
{
- size_t i;
- printf("* Dump internal ELF structure\n\n"
- "Usage: %s [file2 fileN ...]\n\n", argv0);
- printf("Options:\n");
- for (i = 0; long_opts[i].name; ++i)
- if (long_opts[i].has_arg == no_argument)
- printf(" -%c, --%-13s* %s\n", long_opts[i].val,
- long_opts[i].name, opts_help[i]);
- else
- printf(" -%c, --%-6s * %s\n", long_opts[i].val,
- long_opts[i].name, opts_help[i]);
- exit(status);
+ pax_usage(
+ "Dump internal ELF structure",
+ " [file2 fileN ...]",
+ PARSE_FLAGS,
+ long_opts,
+ opts_help,
+ status);
}
/* parse command line arguments and perform needed actions */
diff --git a/paxinc.c b/paxinc.c
index 589d7ae..ff4ab85 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -198,3 +198,53 @@ const char *root_rel_path(const char *path)
return path;
}
+
+void pax_usage(
+ const char *header,
+ const char *args,
+ const char *parse_flags,
+ const struct option long_opts[],
+ const char * const opts_help[],
+ int status)
+{
+ const char a_arg[] = "";
+ size_t a_arg_len = strlen(a_arg) + 2;
+ size_t i;
+ int optlen;
+
+ printf("* %s\n\n"
+ "Usage: %s [options] %s\n\n", header, argv0, args);
+ printf("Options: -[%s]\n", parse_flags);
+
+ /* Prescan the --long opt length to auto-align. */
+ optlen = 0;
+ for (i = 0; long_opts[i].name; ++i) {
+ int l = strlen(long_opts[i].name);
+ if (long_opts[i].has_arg == a_argument)
+ l += a_arg_len;
+ optlen = max(l, optlen);
+ }
+ /* Use some reasonable min width. */
+ optlen = max(20, optlen);
+
+ for (i = 0; long_opts[i].name; ++i) {
+ /* First output the short flag if it has one. */
+ if (long_opts[i].val > '~')
+ printf(" ");
+ else
+ printf(" -%c, ", long_opts[i].val);
+
+ /* Then the long flag. */
+ if (long_opts[i].has_arg == no_argument)
+ printf("--%-*s", optlen, long_opts[i].name);
+ else
+ printf("--%s %s %*s", long_opts[i].name, a_arg,
+ (int)(optlen - strlen(long_opts[i].name) -
a_arg_len), "");
+
+ /* Finally the help text. */
+ printf("* %s\n", opts_help[i]);
+ }
+
+ printf("\nFor more information, see the %s(1) manpage.\n", argv0);
+ exit(status);
+}
diff --git a/paxinc.h b/paxinc.h
index d25cf57..c8fcf71 100644
--- a/paxinc.h
+++ b/paxinc.h
@@ -124,6 +124,17 @@ void color_init(bool disable);
/* constant pointer to a constant buffer ... each program needs to set this */
extern const char argv0[];
+/* Display usage and exit. */
+extern void pax_usage(
+ const char *header,
+ const char *args,
+ const char *parse_flags,
+ const struct option long_opts[],
+ const char * const opts_help[],
+ int status);
+
+#define a_argument required_argument
+
/* we need the space before the last
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 76055a7dd0ab434e00df33b3577542bb69172aa8
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 02:25:39 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 02:25:39 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=76055a7d
pspax: switch from fgets to getline
This avoids limiting buffers to BUFSIZ which is a stdio.h define for
stdio buffers, not for random files, and is not a guaranteed size.
Signed-off-by: Mike Frysinger gentoo.org>
pspax.c | 35 ---
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/pspax.c b/pspax.c
index 04cae79..1cfd72f 100644
--- a/pspax.c
+++ b/pspax.c
@@ -119,12 +119,13 @@ static const char *get_proc_name(int pfd)
static int get_proc_maps(int pfd)
{
FILE *fp;
- static char str[BUFSIZ];
+ static char *str = NULL;
+ static size_t len = 0;
if ((fp = fopenat_r(pfd, "maps")) == NULL)
return -1;
- while (fgets(str, sizeof(str), fp)) {
+ while (getline(, , fp) != -1) {
char *p;
if ((p = strchr(str, ' ')) != NULL) {
if (strlen(p) < 6)
@@ -155,12 +156,13 @@ static int get_proc_maps(int pfd)
static int print_executable_mappings(int pfd)
{
FILE *fp;
- static char str[BUFSIZ];
+ static char *str = NULL;
+ static size_t len = 0;
if ((fp = fopenat_r(pfd, "maps")) == NULL)
return -1;
- while (fgets(str, sizeof(str), fp)) {
+ while (getline(, , fp) != -1) {
char *p;
if ((p = strchr(str, ' ')) != NULL) {
if (strlen(p) < 6)
@@ -200,20 +202,21 @@ static const struct passwd *get_proc_passwd(int pfd)
static const char *get_proc_status(int pfd, const char *name)
{
FILE *fp;
- size_t len;
- static char str[BUFSIZ];
+ size_t name_len;
+ static char *str = NULL;
+ static size_t len = 0;
if ((fp = fopenat_r(pfd, "status")) == NULL)
return NULL;
- len = strlen(name);
- while (fgets(str, sizeof(str), fp)) {
- if (strncasecmp(str, name, len) != 0)
+ name_len = strlen(name);
+ while (getline(, , fp) != -1) {
+ if (strncasecmp(str, name, name_len) != 0)
continue;
- if (str[len] == ':') {
+ if (str[name_len] == ':') {
fclose(fp);
str[strlen(str) - 1] = 0;
- return (str + len + 2);
+ return (str + name_len + 2);
}
}
fclose(fp);
@@ -225,12 +228,13 @@ static const char *get_pid_attr(int pfd)
{
FILE *fp;
char *p;
- static char buf[BUFSIZ];
+ static char *buf = NULL;
+ static size_t len = 0;
if ((fp = fopenat_r(pfd, "attr/current")) == NULL)
return NULL;
- if (fgets(buf, sizeof(buf), fp) == NULL) {
+ if (getline(, , fp) == -1) {
fclose(fp);
return NULL;
}
@@ -247,12 +251,13 @@ static const char *get_pid_addr(int pfd)
{
FILE *fp;
char *p;
- static char buf[BUFSIZ];
+ static char *buf = NULL;
+ static size_t len = 0;
if ((fp = fopenat_r(pfd, "ipaddr")) == NULL)
return NULL;
- if (fgets(buf, sizeof(buf), fp) == NULL) {
+ if (getline(, , fp) == -1) {
fclose(fp);
return NULL;
}
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 6be48eb30663e52678a26e303a29842ca15dadca
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 02:19:37 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 02:19:37 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=6be48eb3
pspax: fix error handling when reading attr or ipaddr fail
If these functions weren't able to read data from the files, they'd
return the previous buffer contents which would be pretty confusing.
Fix it to return NULL instead like other get helpers in here.
Signed-off-by: Mike Frysinger gentoo.org>
pspax.c | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/pspax.c b/pspax.c
index f1644a3..04cae79 100644
--- a/pspax.c
+++ b/pspax.c
@@ -230,9 +230,14 @@ static const char *get_pid_attr(int pfd)
if ((fp = fopenat_r(pfd, "attr/current")) == NULL)
return NULL;
- if (fgets(buf, sizeof(buf), fp) != NULL)
- if ((p = strchr(buf, '\n')) != NULL)
- *p = 0;
+ if (fgets(buf, sizeof(buf), fp) == NULL) {
+ fclose(fp);
+ return NULL;
+ }
+
+ if ((p = strchr(buf, '\n')) != NULL)
+ *p = 0;
+
fclose(fp);
return buf;
@@ -247,9 +252,14 @@ static const char *get_pid_addr(int pfd)
if ((fp = fopenat_r(pfd, "ipaddr")) == NULL)
return NULL;
- if (fgets(buf, sizeof(buf), fp) != NULL)
- if ((p = strchr(buf, '\n')) != NULL)
- *p = 0;
+ if (fgets(buf, sizeof(buf), fp) == NULL) {
+ fclose(fp);
+ return NULL;
+ }
+
+ if ((p = strchr(buf, '\n')) != NULL)
+ *p = 0;
+
fclose(fp);
return buf;
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b5d34e577acb271cdc616b47b77569cb5577b9ef
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Jan 25 01:55:49 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 25 01:55:49 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b5d34e57
pspax: fix buffer limiting in cmdline reading
The current scanf format tries to use "%s.1023" to limit reading to 1023
bytes, but that doesn't actually work -- the maximum field width is between
the "%" and the "s", so it should have been "%1023s". This ends up working
anyways because the %s stops reading when it hits NUL or a space. Normally
cmdline is NUL delimited which means argv[0] would have to be 1024+ bytes
inorder to overflow this. Or the process rewrote its cmdline settings such
that argv[0] was that long. Certainly possible, but extremely unlikely.
Fix the scanf string to properly limit to 1023 bytes (+1 for the NUL).
Signed-off-by: Mike Frysinger gentoo.org>
pspax.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pspax.c b/pspax.c
index 81392b1..f1644a3 100644
--- a/pspax.c
+++ b/pspax.c
@@ -63,7 +63,7 @@ static const char *get_proc_name_cmdline(int pfd)
if (fp == NULL)
return NULL;
- if (fscanf(fp, "%s.1023", str) != 1) {
+ if (fscanf(fp, "%1023s", str) != 1) {
fclose(fp);
return NULL;
}
[gentoo-commits] proj/pax-utils:master commit in: /
commit: a8a823e6acf88625fd482e15b2ba69c5f165fe46
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jan 24 22:51:40 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 24 22:51:40 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a8a823e6
pspax: replace proc_fopen with fopenat_r
Switch to the common helper we have in paxinc already that does
exactly the same thing as this proc_fopen.
Signed-off-by: Mike Frysinger gentoo.org>
pspax.c | 37 -
1 file changed, 8 insertions(+), 29 deletions(-)
diff --git a/pspax.c b/pspax.c
index 97d51c6..81392b1 100644
--- a/pspax.c
+++ b/pspax.c
@@ -40,33 +40,12 @@ static pid_t show_pid = 0;
static uid_t show_uid = (uid_t)-1;
static gid_t show_gid = (gid_t)-1;
-static int proc_open(int pfd, const char *file)
-{
- return openat(pfd, file, O_RDONLY|O_CLOEXEC);
-}
-
-static FILE *proc_fopen(int pfd, const char *file)
-{
- int fd;
- FILE *fp;
-
- fd = proc_open(pfd, file);
- if (fd == -1)
- return NULL;
-
- fp = fdopen(fd, "re");
- if (fp == NULL)
- close(fd);
-
- return fp;
-}
-
static elfobj *proc_readelf(int pfd)
{
int fd;
elfobj *elf;
- fd = proc_open(pfd, "exe");
+ fd = openat(pfd, "exe", O_RDONLY|O_CLOEXEC);
if (fd == -1)
return NULL;
@@ -80,7 +59,7 @@ static const char *get_proc_name_cmdline(int pfd)
FILE *fp;
static char str[1024];
- fp = proc_fopen(pfd, "cmdline");
+ fp = fopenat_r(pfd, "cmdline");
if (fp == NULL)
return NULL;
@@ -107,7 +86,7 @@ static const char *get_proc_name(int pfd)
if (wide_output)
return get_proc_name_cmdline(pfd);
- fp = proc_fopen(pfd, "stat");
+ fp = fopenat_r(pfd, "stat");
if (fp == NULL)
return NULL;
@@ -142,7 +121,7 @@ static int get_proc_maps(int pfd)
FILE *fp;
static char str[BUFSIZ];
- if ((fp = proc_fopen(pfd, "maps")) == NULL)
+ if ((fp = fopenat_r(pfd, "maps")) == NULL)
return -1;
while (fgets(str, sizeof(str), fp)) {
@@ -178,7 +157,7 @@ static int print_executable_mappings(int pfd)
FILE *fp;
static char str[BUFSIZ];
- if ((fp = proc_fopen(pfd, "maps")) == NULL)
+ if ((fp = fopenat_r(pfd, "maps")) == NULL)
return -1;
while (fgets(str, sizeof(str), fp)) {
@@ -224,7 +203,7 @@ static const char *get_proc_status(int pfd, const char
*name)
size_t len;
static char str[BUFSIZ];
- if ((fp = proc_fopen(pfd, "status")) == NULL)
+ if ((fp = fopenat_r(pfd, "status")) == NULL)
return NULL;
len = strlen(name);
@@ -248,7 +227,7 @@ static const char *get_pid_attr(int pfd)
char *p;
static char buf[BUFSIZ];
- if ((fp = proc_fopen(pfd, "attr/current")) == NULL)
+ if ((fp = fopenat_r(pfd, "attr/current")) == NULL)
return NULL;
if (fgets(buf, sizeof(buf), fp) != NULL)
@@ -265,7 +244,7 @@ static const char *get_pid_addr(int pfd)
char *p;
static char buf[BUFSIZ];
- if ((fp = proc_fopen(pfd, "ipaddr")) == NULL)
+ if ((fp = fopenat_r(pfd, "ipaddr")) == NULL)
return NULL;
if (fgets(buf, sizeof(buf), fp) != NULL)
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 1cf21243deebbfe3a5655f0ac18cd25e9ba53c48
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jan 24 22:06:41 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 24 22:06:41 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=1cf21243
pspax: rework & document get_proc_name
The current scanf format tries to use "%s.16" to limit reading to 16
bytes, but that doesn't actually work -- the maximum field width is
between the "%" and the "s", so it should have been "%16s". This ends
up working anyways because the %s consumes the entire string before it
stops, and then scanf stops processing after it can't match ".16". If
the size of the field were BUFSIZE or larger, then it'd overflow. In
practice, BUFSIZ tends to be "large" (i.e. O(KiB)), and the kernel will
truncate this field to 16 bytes for userspace programs. Kernel threads
can have longer names, but not that big. At least, on Linux.
Fix the scanf string to properly limit to 15 bytes, and change the local
buffer to be exactly 16 bytes rather than the unrelated BUFSIZ (which is
a stdio.h buffer size, and nothing related to kernel processes). Then
add some more comments to explain what the code is actually doing, and
simplify the final NUL logic to avoid redundant work.
Signed-off-by: Mike Frysinger gentoo.org>
pspax.c | 28 +++-
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/pspax.c b/pspax.c
index 1e3562d..97d51c6 100644
--- a/pspax.c
+++ b/pspax.c
@@ -96,7 +96,13 @@ static const char *get_proc_name_cmdline(int pfd)
static const char *get_proc_name(int pfd)
{
FILE *fp;
- static char str[BUFSIZ];
+ /*
+* The stat file says process names are truncated to TASK_COMM_LEN (16)
bytes.
+* That includes the trailing NUL (\0) byte. This is true for
userspace, but
+* kernel processes seem to be unlimited. We don't care about those in
this
+* program though, so truncating them all the time is fine.
+*/
+ static char str[16];
if (wide_output)
return get_proc_name_cmdline(pfd);
@@ -105,18 +111,30 @@ static const char *get_proc_name(int pfd)
if (fp == NULL)
return NULL;
- if (fscanf(fp, "%*d %s.16", str) != 1) {
+ /*
+* The format is:
+*() ...more fields...
+* For example:
+* 1234 (bash) R ...
+*
+* Match the leading (, then read 15 bytes (since scanf writes, but
doesn't count,
+* NUL bytes, so it will write up to 16 bytes to str). Ignore the rest
rather than
+* look for closing ) since kernel processes can be longer.
+*/
+ if (fscanf(fp, "%*d (%15s", str) != 1) {
fclose(fp);
return NULL;
}
if (*str) {
- str[strlen(str) - 1] = '\0';
- str[16] = 0;
+ /* Discard trailing ) if it exists. */
+ size_t len = strlen(str);
+ if (str[len - 1] == ')')
+ str[len - 1] = '\0';
}
fclose(fp);
- return (str+1);
+ return str;
}
static int get_proc_maps(int pfd)
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 063a90661c0423172e23405c2548e649a1631796
Author: Mike Frysinger chromium org>
AuthorDate: Wed Jan 24 15:35:52 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 24 15:35:52 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=063a9066
build: use standard HAVE_xxx define style
Use the more standard HAVE_xxx convention, and only define when
available. This avoids further confusion with code that is using
"#ifdef" already.
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
meson.build | 4 +---
porting.h | 20 ++--
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index c91bb64..e891d98 100644
--- a/meson.build
+++ b/meson.build
@@ -48,11 +48,9 @@ foreach x : [
'elf-hints.h',
'glob.h',
]
- x_exists = 0
if cc.has_header(x)
-x_exists = 1
+probe_results.set('HAVE_' + x.to_upper().underscorify(), 1)
endif
- probe_results.set('HAS_' + x.to_upper().underscorify(), x_exists)
endforeach
configure_file(
diff --git a/porting.h b/porting.h
index 1ace55e..68e2b6c 100644
--- a/porting.h
+++ b/porting.h
@@ -40,36 +40,36 @@
#include
#include
#include "elf.h"
-#if HAS_ALLOCA_H
+#ifdef HAVE_ALLOCA_H
# include
#endif
-#if HAS_SYS_PRCTL_H
+#ifdef HAVE_SYS_PRCTL_H
# include
-# if HAS_LINUX_SECCOMP_H
+# ifdef HAVE_LINUX_SECCOMP_H
# include
# endif
-# if HAS_LINUX_SECUREBITS_H
+# ifdef HAVE_LINUX_SECUREBITS_H
# include
# endif
#endif
-#if HAS_ENDIAN_H && HAS_BYTESWAP_H
+#if defined(HAVE_ENDIAN_H) && defined(HAVE_BYTESWAP_H)
# include
# include
-#elif HAS_SYS_ENDIAN_H
+#elif defined(HAVE_SYS_ENDIAN_H)
# include
-#elif HAS_ISA_DEFS_H
+#elif defined(HAVE_ISA_DEFS_H)
# include
-#elif HAS_MACHINE_ENDIAN_H
+#elif defined(HAVE_MACHINE_ENDIAN_H)
# include
#endif
-#ifdef HAS_GLOB_H
+#ifdef HAVE_GLOB_H
# include
#endif
#if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__NetBSD__)
# define __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG "/etc/ld.so.conf"
-#elif HAS_ELF_HINTS_H
+#elif defined(HAVE_ELF_HINTS_H)
# include
# define __PAX_UTILS_DEFAULT_LD_CACHE_CONFIG _PATH_ELF_HINTS
#else
[gentoo-commits] proj/pax-utils:master commit in: tests/source/, /
commit: e679f9bd82197f0f1831a0a4a282851994aa172c
Author: Mike Frysinger chromium org>
AuthorDate: Wed Jan 24 15:32:52 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 24 15:32:52 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=e679f9bd
build: use standard config.h naming
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
meson.build | 2 +-
porting.h | 2 +-
tests/source/dotest | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 255107b..c91bb64 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,7 @@ foreach x : [
endforeach
configure_file(
- output : 'probes.h',
+ output : 'config.h',
configuration : probe_results,
)
diff --git a/porting.h b/porting.h
index 61018fb..1ace55e 100644
--- a/porting.h
+++ b/porting.h
@@ -11,7 +11,7 @@
#ifndef _PORTING_H
#define _PORTING_H
-#include "probes.h"
+#include "config.h"
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr))
diff --git a/tests/source/dotest b/tests/source/dotest
index cc278a5..c97e8cb 100755
--- a/tests/source/dotest
+++ b/tests/source/dotest
@@ -5,7 +5,7 @@
findfiles() {
find "${top_srcdir}" \
'(' -type d -a '(' -name .git -o -name autotools ')' -prune ')'
\
- -o '(' '(' -name '*.[ch]' -a ! -name 'probes.h' ')' -print0 ')'
+ -o '(' '(' -name '*.[ch]' -a ! -name 'config.h' ')' -print0 ')'
}
#
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libltdl/
commit: db593f669bc1067c7c02801de7e795018022e860
Author: Mike Frysinger chromium org>
AuthorDate: Wed Jan 17 23:15:50 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 18 01:52:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db593f66
dev-libs/libltdl: drop old 2.4.7 version
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
dev-libs/libltdl/libltdl-2.4.7.ebuild | 37 ---
1 file changed, 37 deletions(-)
diff --git a/dev-libs/libltdl/libltdl-2.4.7.ebuild
b/dev-libs/libltdl/libltdl-2.4.7.ebuild
deleted file mode 100644
index a8b83f0e1428..
--- a/dev-libs/libltdl/libltdl-2.4.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with dev-build/libtool.
-
-inherit multilib-minimal
-
-MY_P="libtool-${PV}"
-
-DESCRIPTION="A shared library tool for developers"
-HOMEPAGE="https://www.gnu.org/software/libtool/;
-SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
-S="${WORKDIR}"/${MY_P}/libltdl
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-IUSE="static-libs"
-# libltdl doesn't have a testsuite.
-
-BDEPEND="app-arch/xz-utils"
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --enable-ltdl-install \
- $(use_enable static-libs static)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- # While the libltdl.la file is not used directly, the m4 ltdl logic
- # keys off of its existence when searching for ltdl support. # bug
#293921
- #use static-libs || find "${D}" -name libltdl.la -delete
-}
[gentoo-commits] repo/gentoo:master commit in: dev-build/libtool/
commit: cd7f047fe43fb631c4ca6979c6efb5038c616f41
Author: Mike Frysinger chromium org>
AuthorDate: Thu Jan 18 01:51:48 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Jan 18 01:52:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7f047f
dev-build/libtool: run tests in parallel
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
dev-build/libtool/libtool-2.4.7-r2.ebuild | 6 +-
dev-build/libtool/libtool-.ebuild | 6 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dev-build/libtool/libtool-2.4.7-r2.ebuild
b/dev-build/libtool/libtool-2.4.7-r2.ebuild
index ec3be9b992e0..16ed5d62e18f 100644
--- a/dev-build/libtool/libtool-2.4.7-r2.ebuild
+++ b/dev-build/libtool/libtool-2.4.7-r2.ebuild
@@ -8,7 +8,7 @@ EAPI=7
# bug #225559
LIBTOOLIZE="true"
WANT_LIBTOOL="none"
-inherit autotools prefix
+inherit autotools prefix multiprocessing
if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git;
@@ -109,6 +109,10 @@ src_configure() {
ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
}
+src_test() {
+ emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+}
+
src_install() {
default
diff --git a/dev-build/libtool/libtool-.ebuild
b/dev-build/libtool/libtool-.ebuild
index 5a5d4b118ef9..e5ecf26e0972 100644
--- a/dev-build/libtool/libtool-.ebuild
+++ b/dev-build/libtool/libtool-.ebuild
@@ -8,7 +8,7 @@ EAPI=7
# bug #225559
LIBTOOLIZE="true"
WANT_LIBTOOL="none"
-inherit autotools prefix
+inherit autotools prefix multiprocessing
if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git;
@@ -107,6 +107,10 @@ src_configure() {
ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
}
+src_test() {
+ emake check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)"
+}
+
src_install() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libltdl/
commit: 0958563a4a1a43a0d800db35ece528e85f37cb39 Author: Mike Frysinger chromium org> AuthorDate: Wed Jan 17 23:17:29 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Jan 18 01:52:00 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0958563a dev-libs/libltdl: add RESTRICT=test No point in trying to run `make check` when there are no tests. Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> dev-libs/libltdl/libltdl-2.4.7-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild index 3e4ebeaf7604..8cca8705cd0f 100644 --- a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild +++ b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild @@ -18,7 +18,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="static-libs" -# libltdl doesn't have a testsuite. +# libltdl doesn't have a testsuite. Don't bother trying. +RESTRICT="test" BDEPEND="app-arch/xz-utils"
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 857eaddab407db1577076a09206386bc62bfa4eb
Author: Mike Frysinger gentoo org>
AuthorDate: Tue Jan 16 04:59:57 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 16 04:59:57 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=857eadda
fix various typos found w/codespell
Signed-off-by: Mike Frysinger gentoo.org>
README.md | 2 +-
dumpelf.c | 4 ++--
lddtree.sh | 8
macho.h| 4 ++--
paxelf.c | 2 +-
paxldso.c | 2 +-
porting.h | 2 +-
pspax.c| 2 +-
pyproject.toml | 10 ++
scanelf.c | 6 +++---
scanmacho.c| 2 +-
11 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 99bbc3f..ec4bfe6 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ PaX helpers for people interested in that.
pax-utils uses a bog-standard meson-based build system. See `meson_options.txt`
for configuration options.
-You don't need PaX to use the pax-utils. Infact the only thing they
+You don't need PaX to use the pax-utils. In fact the only thing they
really have in common is that pax-utils was initially written to aid in
deploying PaX systems so it includes support for PT_PAX_FLAGS and the
deprecated but still in use EI_PAX flags. For more information about PaX
diff --git a/dumpelf.c b/dumpelf.c
index 1a469ea..c8f27e4 100644
--- a/dumpelf.c
+++ b/dumpelf.c
@@ -114,7 +114,7 @@ static void dumpelf(const elfobj *elf, size_t file_cnt)
break_out_shdr:
printf("},\n");
- /* finish the namespace struct and start the abitrary ones */
+ /* finish the namespace struct and start the arbitrary ones */
printf("\n.dyns = dumpedelf_dyn_%zu,\n", file_cnt);
printf("};\n");
@@ -538,7 +538,7 @@ static void usage(int status)
exit(status);
}
-/* parse command line arguments and preform needed actions */
+/* parse command line arguments and perform needed actions */
static void parseargs(int argc, char *argv[])
{
int flag;
diff --git a/lddtree.sh b/lddtree.sh
index dfa8d06..e0185f4 100755
--- a/lddtree.sh
+++ b/lddtree.sh
@@ -96,8 +96,8 @@ find_elf() {
read_ldso_conf() {
local line p
for p ; do
- # if the glob didnt match
anything #360041,
- # or the files arent readable,
skip it
+ # If the glob didn't match
anything #360041,
+ # or the files aren't readable,
skip it.
[[ -r ${p} ]] || continue
while read line ; do
case ${line} in
@@ -179,12 +179,12 @@ show_elf() {
# No need for leading comma w/my_allhits as we guarantee it
always
# starts with one due to the way we append the value above.
[[ ${my_allhits}, == *,${lib},* ]] && continue
- # If the interp is being linked against directly, re-use the
existing
+ # If the interp is being linked against directly, reuse the
existing
# full path rather than perform a search for it. When systems
symlink
# the interp to a diff location, we might locate a different
path, and
# displaying both doesn't make sense as it doesn't match the
runtime --
# the ldso won't load another copy of ldso into memory from the
search
- # path, it'll re-use the existing copy that was loaded from the
full
+ # path, it'll reuse the existing copy that was loaded from the
full
# hardcoded path.
if [[ ${lib} == "${interp}" ]] ; then
rlib=${full_interp}
diff --git a/macho.h b/macho.h
index 76f3697..4a99e8f 100644
--- a/macho.h
+++ b/macho.h
@@ -73,7 +73,7 @@ struct mach_header
incremental link
against a base file and
cannot be link
edited again */
#define MH_DYLDLINK 0x4 /* the object file is input for the dynamic
- linker and cannot be
staticly link edited
+ linker and cannot be
statically link edited
again */
#define MH_TWOLEVEL 0x80/* the image is using two-level namespace
bindings */
@@ -107,7 +107,7 @@ struct mach_header
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: 16db5db01027f058dcc2315f06f912fa480664f2 Author: Mike Frysinger gentoo org> AuthorDate: Tue Jan 16 05:01:48 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 16 05:01:48 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=16db5db0 github: add codespell checker Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/codespell.yml | 13 + 1 file changed, 13 insertions(+) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml new file mode 100644 index 000..605d2bb --- /dev/null +++ b/.github/workflows/codespell.yml @@ -0,0 +1,13 @@ +# GitHub actions workflow. +# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions + +name: Codespell + +on: [push, pull_request] + +jobs: + codespell: +runs-on: ubuntu-latest +steps: +- uses: actions/checkout@v4 +- uses: codespell-project/actions-codespell@v2
[gentoo-commits] proj/pax-utils:master commit in: /
commit: a285f1f17dccd79968a63e5acc35b5230c236389
Author: Mike Frysinger gentoo org>
AuthorDate: Tue Jan 16 04:56:53 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 16 04:56:53 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a285f1f1
drop old __BOUNDS_CHECKING_ON support
The out-of-tree patches for -fbounds-checking in GCC were great, but
they haven't been updated since the gcc-4.0 days, and the sanitizer
options have made it obsolete, so it's unlikely we'll ever use this
code again.
Signed-off-by: Mike Frysinger gentoo.org>
porting.h | 7 ---
pspax.c | 10 --
2 files changed, 17 deletions(-)
diff --git a/porting.h b/porting.h
index 42c9ba3..3a544fa 100644
--- a/porting.h
+++ b/porting.h
@@ -77,13 +77,6 @@
#endif
#undef PAX_UTILS_CLEANUP
-/* bounds checking code will fart on free(NULL) even though that
- * is valid usage. So let's wrap it if need be.
- */
-#ifdef __BOUNDS_CHECKING_ON
-# define free(ptr) do { if (ptr) free(ptr); } while (0)
-# define PAX_UTILS_CLEANUP 1
-#endif
/* LSAN (Leak Sanitizer) will complain about things we leak. */
#ifdef __SANITIZE_ADDRESS__
# define PAX_UTILS_CLEANUP 1
diff --git a/pspax.c b/pspax.c
index 6094882..e79469d 100644
--- a/pspax.c
+++ b/pspax.c
@@ -189,15 +189,6 @@ static int print_executable_mappings(int pfd)
return 0;
}
-#ifdef __BOUNDS_CHECKING_ON
-# define NOTE_TO_SELF warn( \
- "This is bullshit but getpwuid() is leaking memory and I wasted a few
hrs 1 day tracking it down in pspax\n" \
- "Later on I forgot I tracked it down before and saw pspax leaking
memory so I tracked it down all over again (silly me)\n" \
- "Hopefully the getpwuid()/nis/nss/pam or whatever wont suck later on in
the future.")
-#else
-# define NOTE_TO_SELF
-#endif
-
static const struct passwd *get_proc_passwd(int pfd)
{
struct stat st;
@@ -577,6 +568,5 @@ int main(int argc, char *argv[])
pspax(name);
- NOTE_TO_SELF;
return EXIT_SUCCESS;
}
[gentoo-commits] proj/pax-utils: Branch deleted: main
commit: Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:05:42 2024 + Branch deleted: main
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 153e0f60ee6b04492b9b6d3cfc69809b0f29d65c Author: Mike Frysinger gentoo org> AuthorDate: Wed Jan 10 08:05:13 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:05:13 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=153e0f60 requirements: pin(ish) Python deps that we use to check things Signed-off-by: Mike Frysinger gentoo.org> requirements-dev.txt | 12 requirements.txt | 9 + 2 files changed, 21 insertions(+) diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 000..9f4869c --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,12 @@ +# Copyright 2024 Gentoo Foundation +# Copyright 2024 Mike Frysinger +# Copyright 2024 The ChromiumOS Authors +# Distributed under the terms of the GNU General Public License v2 + +# Deps needed to run tests/linters/etc... +# https://pip.pypa.io/en/stable/reference/requirements-file-format/ + +black==23.* +isort==5.* +mypy==1.* +pylint==3.0.* diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..540976b --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +# Copyright 2024 Gentoo Foundation +# Copyright 2024 Mike Frysinger +# Copyright 2024 The ChromiumOS Authors +# Distributed under the terms of the GNU General Public License v2 + +# Deps needed to run Python scripts after installed. +# https://pip.pypa.io/en/stable/reference/requirements-file-format/ + +pyelftools
[gentoo-commits] proj/pax-utils: New branch: main
commit: Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:05:28 2024 + New branch: main
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 756eda7dbce4261e2d5cd6e38bab49aa457e99c1 Author: Mike Frysinger gentoo org> AuthorDate: Wed Jan 10 07:43:19 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 07:43:19 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=756eda7d pylintrc: merge into pyproject.toml The same settings, but we have a single file for all our configs now. Signed-off-by: Mike Frysinger gentoo.org> .pylintrc | 58 pylint | 2 +- pyproject.toml | 69 ++ 3 files changed, 70 insertions(+), 59 deletions(-) diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index 7bee576..000 --- a/.pylintrc +++ /dev/null @@ -1,58 +0,0 @@ -[MASTER] -# List of plugins (as comma separated values of python modules names) to load, -# usually to register additional checkers. -load-plugins= - pylint.extensions.bad_builtin, - pylint.extensions.check_elif, - pylint.extensions.docstyle, - pylint.extensions.overlapping_exceptions, - pylint.extensions.redefined_variable_type, - -jobs=0 - -[MESSAGES CONTROL] -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifier separated by comma (,) or put this option -# multiple times (only on the command line, not in the configuration file where -# it should appear only once). -disable= - too-many-lines, - too-many-branches, - too-many-statements, - too-few-public-methods, - too-many-instance-attributes, - too-many-public-methods, - too-many-locals, - too-many-arguments, - fixme, - invalid-name, - -[REPORTS] -reports=no -score=no - -[FORMAT] -max-line-length = 100 -indent-string = '' - -[BASIC] -bad-functions= - exit, - filter, - input, - map, - quit, - -[SIMILARITIES] -min-similarity-lines=20 - -[VARIABLES] -dummy-variables-rgx=_ - -[DESIGN] -max-parents=10 - -[IMPORTS] -deprecated-modules= - mox, - optparse, diff --git a/pylint b/pylint index 512511e..29e8b5e 100755 --- a/pylint +++ b/pylint @@ -37,7 +37,7 @@ def main(argv): pythonpath = pympath + ":" + pythonpath os.environ["PYTHONPATH"] = pythonpath -pylintrc = os.path.join(source_root, ".pylintrc") +pylintrc = os.path.join(source_root, "pyproject.toml") cmd = ["pylint", "--rcfile", pylintrc] os.execvp(cmd[0], cmd + argv) diff --git a/pyproject.toml b/pyproject.toml index ab0fde0..e633a0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,3 +40,72 @@ single_line_exclusions = [ # https://mypy.readthedocs.io/en/stable/config_file.html [tool.mypy] python_version = "3.8" + + +# https://pylint.pycqa.org/en/latest/user_guide/usage/run.html +[tool.pylint."MASTER"] +py-version = "3.8" + +# List of plugins (as comma separated values of python modules names) to load, +# usually to register additional checkers. +load-plugins = [ + "pylint.extensions.bad_builtin", + "pylint.extensions.check_elif", + "pylint.extensions.docstyle", + "pylint.extensions.overlapping_exceptions", + "pylint.extensions.redefined_variable_type", +] + +# Run everything in parallel. +jobs = 0 + +# https://pylint.pycqa.org/en/latest/user_guide/messages/index.html +[tool.pylint."MESSAGES CONTROL"] +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifier separated by comma (,) or put this option +# multiple times (only on the command line, not in the configuration file where +# it should appear only once). +disable = [ + "too-many-lines", + "too-many-branches", + "too-many-statements", + "too-few-public-methods", + "too-many-instance-attributes", + "too-many-public-methods", + "too-many-locals", + "too-many-arguments", + "fixme", + "invalid-name", +] + +[tool.pylint."REPORTS"] +reports = false +score = false + +[tool.pylint."FORMAT"] +max-line-length = 100 +indent-string = "" + +[tool.pylint."BASIC"] +bad-functions = [ + "exit", + "filter", + "input", + "map", + "quit", +] + +[tool.pylint."SIMILARITIES"] +min-similarity-lines = 20 + +[tool.pylint."VARIABLES"] +dummy-variables-rgx = "_" + +[tool.pylint."DESIGN"] +max-parents = 10 + +[tool.pylint."IMPORTS"] +deprecated-modules = [ + "mox", + "optparse", +]
[gentoo-commits] proj/pax-utils:master commit in: /
commit: a172acf0b81a9a1027f1b28cfae5b2ba4f5a32c6
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jan 10 07:42:23 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 10 07:42:23 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a172acf0
pyproject.toml: add black & isort & mypy settings
This should help stabilize the tool behavior for different developers.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 4 +++-
pyproject.toml | 42 ++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index b1fef16..3a41886 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -49,7 +49,8 @@ import os
import re
import shutil
import sys
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Union, cast
+from typing import Any, cast, Dict, Iterable, List, Optional, Tuple, Union
+
assert sys.version_info >= (3, 8), f"Python 3.8+ required, but found
{sys.version}"
@@ -63,6 +64,7 @@ except ImportError:
from elftools.common import exceptions # type: ignore
from elftools.elf.elffile import ELFFile # type: ignore
+
# pylint: enable=import-error
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000..ab0fde0
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,42 @@
+# Copyright 2024 Gentoo Foundation
+# Copyright 2024 Mike Frysinger
+# Copyright 2024 The ChromiumOS Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
+
+
+#
https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html
+[tool.black]
+line-length = 88
+target-version = ["py38"]
+
+
+# https://pycqa.github.io/isort/docs/configuration/options
+[tool.isort]
+py_version = "38"
+
+# Be compatible with `black` since it also matches what we want.
+profile = "black"
+
+line_length = 88
+length_sort = false
+force_single_line = true
+lines_after_imports = 2
+from_first = false
+case_sensitive = false
+force_sort_within_sections = true
+order_by_type = false
+
+# Allow importing multiple classes on a single line from these modules.
+# https://google.github.io/styleguide/pyguide#s2.2-imports
+single_line_exclusions = [
+ "abc",
+ "collections.abc",
+ "typing",
+]
+
+
+# https://mypy.readthedocs.io/en/stable/config_file.html
+[tool.mypy]
+python_version = "3.8"
[gentoo-commits] proj/pax-utils: Branch deleted: v
commit: Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:01:59 2024 + Branch deleted: v
[gentoo-commits] proj/pax-utils: New branch: v
commit: Commit: Mike Frysinger gentoo org> CommitDate: Wed Jan 10 08:01:42 2024 + New branch: v
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 81e0200c6068d8c00c2d1f569f8b7b0ea7c1b0d5
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jan 10 07:38:36 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jan 10 07:38:36 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=81e0200c
lddtree: raise min version to Python 3.8
We aren't using Python 3.6 anywhere anymore that I care about, so
raise the min version to 3.8. Tools are dropping support for it
too which makes it difficult to reasonably support.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index 8ccd855..b1fef16 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -51,7 +51,7 @@ import shutil
import sys
from typing import Any, Dict, Iterable, List, Optional, Tuple, Union, cast
-assert sys.version_info >= (3, 6), f"Python 3.6+ required, but found
{sys.version}"
+assert sys.version_info >= (3, 8), f"Python 3.8+ required, but found
{sys.version}"
# Disable import errors for all 3rd party modules.
# pylint: disable=import-error
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: b71d01d6054e270ab87e42df2d4d704e41281724 Author: Mike Frysinger chromium org> AuthorDate: Tue Jan 2 17:39:34 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 2 18:03:25 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b71d01d6 github: add python checkers Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/python.yml | 28 1 file changed, 28 insertions(+) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml new file mode 100644 index 000..7b7dcaf --- /dev/null +++ b/.github/workflows/python.yml @@ -0,0 +1,28 @@ +# GitHub actions workflow. +# https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions + +name: Python + +on: [push, pull_request] + +jobs: + python: +runs-on: ubuntu-latest +steps: +- uses: actions/checkout@v4 +# NB: v1.4.0 covers Python 3.8. +- uses: ricardochaves/python-lint@v1.4.0 + with: +python-root-list: lddtree.py pylint +use-pylint: true +use-pycodestyle: false +use-flake8: false +use-black: true +use-mypy: true +use-isort: true +extra-pylint-options: "" +extra-pycodestyle-options: "" +extra-flake8-options: "" +extra-black-options: "" +extra-mypy-options: "" +extra-isort-options: ""
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 259a52c16c02d2cbb041ad33ea66a735652c66cf
Author: Mike Frysinger chromium org>
AuthorDate: Tue Jan 2 17:56:56 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 2 17:56:56 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=259a52c1
lddtree: disable mypy import errors
We don't have types for these imports, so ignore errors on them.
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 70d755c..8a42627 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -56,12 +56,12 @@ assert sys.version_info >= (3, 6), f"Python 3.6+ required,
but found {sys.versio
# Disable import errors for all 3rd party modules.
# pylint: disable=import-error
try:
-import argcomplete
+import argcomplete # type: ignore
except ImportError:
argcomplete = cast(Any, None)
-from elftools.common import exceptions
-from elftools.elf.elffile import ELFFile
+from elftools.common import exceptions # type: ignore
+from elftools.elf.elffile import ELFFile # type: ignore
# pylint: enable=import-error
[gentoo-commits] proj/pax-utils:master commit in: /
commit: c899a5a007c28c8b9005d142f8c7b539e097d5b3
Author: Mike Frysinger chromium org>
AuthorDate: Tue Jan 2 17:49:06 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 2 17:49:06 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c899a5a0
lddtree: disable pyelftools pylint import errors
Since pyelftools isn't commonly installed, disable the pylint check
by default.
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 4
1 file changed, 4 insertions(+)
diff --git a/lddtree.py b/lddtree.py
index 247e9db..70d755c 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -53,6 +53,8 @@ from typing import Any, Dict, Iterable, List, Optional,
Tuple, Union, cast
assert sys.version_info >= (3, 6), f"Python 3.6+ required, but found
{sys.version}"
+# Disable import errors for all 3rd party modules.
+# pylint: disable=import-error
try:
import argcomplete
except ImportError:
@@ -61,6 +63,8 @@ except ImportError:
from elftools.common import exceptions
from elftools.elf.elffile import ELFFile
+# pylint: enable=import-error
+
def warn(msg: Any, prefix: Optional[str] = "warning") -> None:
"""Write |msg| to stderr with a |prefix| before it"""
[gentoo-commits] proj/pax-utils:master commit in: /
commit: cf84a6c35151b790ec104892883e85010ca252ac
Author: Mike Frysinger chromium org>
AuthorDate: Tue Jan 2 17:46:55 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 2 17:46:55 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=cf84a6c3
lddtree: use older Python typing style
Support for list[...] is new to Python 3.9. We still support Python
3.6 (or at least, 3.8) so we need to use List[...] instead.
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 89733be..247e9db 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -49,7 +49,7 @@ import os
import re
import shutil
import sys
-from typing import Any, cast, Iterable, Optional, Union
+from typing import Any, Dict, Iterable, List, Optional, Tuple, Union, cast
assert sys.version_info >= (3, 6), f"Python 3.6+ required, but found
{sys.version}"
@@ -126,9 +126,9 @@ def readlink(path: str, root: str, prefixed: Optional[bool]
= False) -> str:
return normpath((root + path) if prefixed else path)
-def dedupe(items: list[str]) -> list[str]:
+def dedupe(items: List[str]) -> List[str]:
"""Remove all duplicates from |items| (keeping order)"""
-seen: dict[str, str] = {}
+seen: Dict[str, str] = {}
return [seen.setdefault(x, x) for x in items if x not in seen]
@@ -229,7 +229,7 @@ def ParseLdPaths(
root: str = "",
cwd: Optional[str] = None,
path: str = "",
-) -> list[str]:
+) -> List[str]:
"""Parse the colon-delimited list of paths and apply ldso rules to each
Note the special handling as dictated by the ldso:
@@ -276,7 +276,7 @@ def ParseLdSoConf(
root: str = "/",
debug: bool = False,
_first: bool = True,
-) -> list[str]:
+) -> List[str]:
"""Load all the paths from a given ldso config file
This should handle comments, whitespace, and "include" statements.
@@ -334,7 +334,7 @@ def LoadLdpaths(
cwd: Optional[str] = None,
prefix: str = "",
debug: bool = False,
-) -> dict[str, list[str]]:
+) -> Dict[str, List[str]]:
"""Load linker paths from common locations
This parses the ld.so.conf and LD_LIBRARY_PATH env var.
@@ -348,7 +348,7 @@ def LoadLdpaths(
Returns:
dict containing library paths to search
"""
-ldpaths: dict[str, list[str]] = {
+ldpaths: Dict[str, List[str]] = {
"conf": [],
"env": [],
"interp": [],
@@ -401,10 +401,10 @@ def CompatibleELFs(elf1: ELFFile, elf2: ELFFile) -> bool:
def FindLib(
elf: ELFFile,
lib: str,
-ldpaths: list[str],
+ldpaths: List[str],
root: str = "/",
debug: bool = False,
-) -> tuple[Optional[str], Optional[str]]:
+) -> Tuple[Optional[str], Optional[str]]:
"""Try to locate a |lib| that is compatible to |elf| in the given |ldpaths|
Args:
@@ -451,7 +451,7 @@ def ParseELF(
debug: bool = False,
_first: bool = True,
_all_libs={},
-) -> dict[str, Any]:
+) -> Dict[str, Any]:
"""Parse the ELF dependency tree of the specified file
Args:
@@ -658,7 +658,7 @@ def _ActionShow(options: argparse.Namespace, elf: dict):
shown_libs = set(elf["needed"])
new_libs = elf["needed"][:]
-chain_libs: list[str] = []
+chain_libs: List[str] = []
interp = elf["interp"]
if interp:
lib = os.path.basename(interp)
@@ -916,7 +916,7 @@ def GetParser() -> argparse.ArgumentParser:
return parser
-def main(argv: list[str]) -> Optional[int]:
+def main(argv: List[str]) -> Optional[int]:
"""The main entry point!"""
parser = GetParser()
options = parser.parse_args(argv)
[gentoo-commits] proj/pax-utils:master commit in: /
commit: cb88e6fce4386ba30d378edfb59964fa2a4cc9c3
Author: Mike Frysinger chromium org>
AuthorDate: Tue Jan 2 18:00:15 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 2 18:00:15 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=cb88e6fc
lddtree: add some more typing info for mypy
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index 8a42627..8ccd855 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -491,7 +491,7 @@ def ParseELF(
if _first:
_all_libs = {}
ldpaths = ldpaths.copy()
-ret = {
+ret: Dict[str, Any] = {
"interp": None,
"path": path if display is None else display,
"realpath": path,
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: 26945e75a7802a987ec81d1578aef4629258dc32 Author: Mike Frysinger chromium org> AuthorDate: Tue Jan 2 16:35:49 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 2 16:35:49 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=26945e75 github: disable fuzzing on macOS The builder doesn't work with errors like: ld: file not found: /Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.0/lib/darwin/libclang_rt.fuzzer_osx.a Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/build-test-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml index e82f5f9..44aa5c9 100644 --- a/.github/workflows/build-test-ci.yml +++ b/.github/workflows/build-test-ci.yml @@ -72,7 +72,7 @@ jobs: -Duse_seccomp=false \ -Dbuild_manpages=disabled \ -Dtests=true \ - -Duse_fuzzing=true \ + -Duse_fuzzing=false \ build ninja -C build # The unittests generally assume a Linux ELF host, so don't bother making
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: 81b85a0bf3a6e6988ada582f653449a3217b71be Author: Mike Frysinger chromium org> AuthorDate: Tue Jan 2 16:46:23 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 2 16:46:23 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=81b85a0b github: update to checkout@v4 Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/build-test-ci.yml | 4 ++-- .github/workflows/ci-alpine-linux.yml | 2 +- .github/workflows/coverity.yml| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml index 44aa5c9..3d170e3 100644 --- a/.github/workflows/build-test-ci.yml +++ b/.github/workflows/build-test-ci.yml @@ -36,7 +36,7 @@ jobs: sudo install -Dm755 muon /usr/local/bin/muon ;; esac -- uses: actions/checkout@v3 +- uses: actions/checkout@v4 - run: | export PKG_CONFIG_PATH="/usr/lib/$(uname -m)-linux-gnu/pkgconfig/" case "$BB" in @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: brew install meson ninja -- uses: actions/checkout@v3 +- uses: actions/checkout@v4 - run: | meson -Duse_libcap=disabled \ -Duse_seccomp=false \ diff --git a/.github/workflows/ci-alpine-linux.yml b/.github/workflows/ci-alpine-linux.yml index a87fdfb..575e959 100644 --- a/.github/workflows/ci-alpine-linux.yml +++ b/.github/workflows/ci-alpine-linux.yml @@ -28,7 +28,7 @@ jobs: libcap-dev \ libseccomp \ libseccomp-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: meson setup -Dtests=false -Duse_fuzzing=false builddir/ - run: meson compile -C builddir - run: meson test --verbose -C builddir diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 20a47e5..1cd6c55 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -12,7 +12,7 @@ jobs: coverity: runs-on: ubuntu-latest steps: -- uses: actions/checkout@v3 +- uses: actions/checkout@v4 - uses: vapier/coverity-scan-action@v1 with: email: vap...@gentoo.org
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: da4aab84a127ce5e201b53b08cff42b3181315cc Author: Mike Frysinger chromium org> AuthorDate: Tue Jan 2 16:35:49 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 2 16:35:49 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=da4aab84 github: disable fuzzing on macOS The builder doesn't work with errors like: ld: file not found: /Applications/Xcode_14.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/14.0.0/lib/darwin/libclang_rt.fuzzer_osx.a Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/build-test-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml index e82f5f9..5c43a9c 100644 --- a/.github/workflows/build-test-ci.yml +++ b/.github/workflows/build-test-ci.yml @@ -72,7 +72,7 @@ jobs: -Duse_seccomp=false \ -Dbuild_manpages=disabled \ -Dtests=true \ - -Duse_fuzzing=true \ + -Duse_fuzzing=disabled \ build ninja -C build # The unittests generally assume a Linux ELF host, so don't bother making
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b49fe5088ca8f1fa0191a85e933ec213928449bc Author: Mike Frysinger chromium org> AuthorDate: Tue Jan 2 16:27:50 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Jan 2 16:27:50 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b49fe508 dumpelf: use explicit 64-bit to display off_t There's no guarantee that %j (uintmax_t) is large enough to handle off_t. Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> dumpelf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dumpelf.c b/dumpelf.c index de9a563..1a469ea 100644 --- a/dumpelf.c +++ b/dumpelf.c @@ -40,9 +40,9 @@ static void dumpelf(const elfobj *elf, size_t file_cnt) "\n" "/*\n" " * ELF dump of '%s'\n" - " * %ji (0x%jX) bytes\n" + " * %" PRIi64 " (0x%" PRIX64 ") bytes\n" " */\n\n", - elf->filename, elf->len, elf->len); + elf->filename, (int64_t)elf->len, (uint64_t)elf->len); /* setup the struct to namespace this elf */ #define MAKE_STRUCT(B) \
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b3994055a70d2f87e49c8a9053ae0b1745af3f5c
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Jan 1 15:42:35 2024 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Jan 1 15:42:35 2024 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b3994055
update copyright headers
Signed-off-by: Mike Frysinger gentoo.org>
dumpelf.c | 4 ++--
lddtree.py| 6 +++---
lddtree.sh| 4 ++--
macho.h | 2 +-
paxelf.c | 4 ++--
paxelf.h | 4 ++--
paxinc.c | 4 ++--
paxinc.h | 4 ++--
paxldso.c | 4 ++--
paxldso.h | 4 ++--
paxmacho.c| 4 ++--
paxmacho.h| 4 ++--
porting.h | 4 ++--
pylint| 2 +-
scanelf.c | 4 ++--
scanmacho.c | 4 ++--
seccomp-bpf.c | 4 ++--
security.c| 4 ++--
security.h| 4 ++--
xfuncs.c | 4 ++--
xfuncs.h | 4 ++--
21 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/dumpelf.c b/dumpelf.c
index 4742a50..de9a563 100644
--- a/dumpelf.c
+++ b/dumpelf.c
@@ -1,9 +1,9 @@
/*
- * Copyright 2005-2012 Gentoo Foundation
+ * Copyright 2005-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2012 Ned Ludd-
- * Copyright 2005-2012 Mike Frysinger -
+ * Copyright 2005-2024 Mike Frysinger -
*/
const char argv0[] = "dumpelf";
diff --git a/lddtree.py b/lddtree.py
index b26afcf..89733be 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -1,8 +1,8 @@
#!/usr/bin/env python
# PYTHON_ARGCOMPLETE_OK
-# Copyright 2012-2014 Gentoo Foundation
-# Copyright 2012-2014 Mike Frysinger
-# Copyright 2012-2014 The ChromiumOS Authors
+# Copyright 2012-2024 Gentoo Foundation
+# Copyright 2012-2024 Mike Frysinger
+# Copyright 2012-2024 The ChromiumOS Authors
# Use of this source code is governed by a BSD-style license (BSD-3)
"""Read the ELF dependency tree and show it
diff --git a/lddtree.sh b/lddtree.sh
index c964ed6..dfa8d06 100755
--- a/lddtree.sh
+++ b/lddtree.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2007-2013 Gentoo Foundation
-# Copyright 2007-2013 Mike Frysinger
+# Copyright 2007-2024 Gentoo Foundation
+# Copyright 2007-2024 Mike Frysinger
# Distributed under the terms of the GNU General Public License v2
argv0=${0##*/}
diff --git a/macho.h b/macho.h
index c4929c8..76f3697 100644
--- a/macho.h
+++ b/macho.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2021 Gentoo Foundation
+ * Copyright 2008-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*/
diff --git a/paxelf.c b/paxelf.c
index 331f1b4..fb4160c 100644
--- a/paxelf.c
+++ b/paxelf.c
@@ -1,9 +1,9 @@
/*
- * Copyright 2003-2012 Gentoo Foundation
+ * Copyright 2003-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2012 Ned Ludd -
- * Copyright 2005-2012 Mike Frysinger -
+ * Copyright 2005-2024 Mike Frysinger -
*/
#include "paxinc.h"
diff --git a/paxelf.h b/paxelf.h
index f252969..0c163d5 100644
--- a/paxelf.h
+++ b/paxelf.h
@@ -1,9 +1,9 @@
/*
- * Copyright 2005-2012 Gentoo Foundation
+ * Copyright 2005-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2012 Ned Ludd -
- * Copyright 2005-2012 Mike Frysinger -
+ * Copyright 2005-2024 Mike Frysinger -
*
* Make sure all of the common elf stuff is setup as we expect
*/
diff --git a/paxinc.c b/paxinc.c
index 64a3069..589d7ae 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -1,9 +1,9 @@
/*
- * Copyright 2003-2012 Gentoo Foundation
+ * Copyright 2003-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2012 Ned Ludd -
- * Copyright 2005-2012 Mike Frysinger -
+ * Copyright 2005-2024 Mike Frysinger -
*/
/* stick common symbols here that are needed by paxinc.h */
diff --git a/paxinc.h b/paxinc.h
index 3dd163a..d25cf57 100644
--- a/paxinc.h
+++ b/paxinc.h
@@ -1,9 +1,9 @@
/*
- * Copyright 2005-2012 Gentoo Foundation
+ * Copyright 2005-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2005-2012 Ned Ludd -
- * Copyright 2005-2012 Mike Frysinger -
+ * Copyright 2005-2024 Mike Frysinger -
*
* Make sure all of the common stuff is setup as we expect
*/
diff --git a/paxldso.c b/paxldso.c
index ce7facd..a9bef1e 100644
--- a/paxldso.c
+++ b/paxldso.c
@@ -1,9 +1,9 @@
/*
- * Copyright 2003-2016 Gentoo Foundation
+ * Copyright 2003-2024 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
*
* Copyright 2003-2012 Ned Ludd -
- * Copyright 2004-2016 Mike Frysinger -
+ * Copyright 2004-2024 Mike Frysinger -
*/
#include "paxinc.h"
diff --git a/paxldso.h b/paxldso.h
index 91c7eed..aba58fa 100644
--- a/paxldso.h
+++ b/paxldso.h
@@ -1,9 +1,9 @@
/*
- * Co
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 511617ac43a13e6173f1dcbbd3feaf3be51ada6c Author: Mike Frysinger gentoo org> AuthorDate: Mon Jan 1 15:37:28 2024 + Commit: Mike Frysinger gentoo org> CommitDate: Mon Jan 1 15:37:28 2024 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=511617ac elf.h: pull from latest glibc Signed-off-by: Mike Frysinger gentoo.org> elf.h | 1160 ++--- 1 file changed, 1038 insertions(+), 122 deletions(-) diff --git a/elf.h b/elf.h index e6c8b20..5c1c197 100644 --- a/elf.h +++ b/elf.h @@ -1,5 +1,5 @@ /* This file defines standard ELF types, structures, and macros. - Copyright (C) 1995-2015 Free Software Foundation, Inc. + Copyright (C) 1995-2023 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -168,109 +168,204 @@ typedef struct /* Legal values for e_machine (architecture). */ -#define EM_NONE 0 /* No machine */ -#define EM_M32 1 /* AT WE 32100 */ -#define EM_SPARC2 /* SUN SPARC */ -#define EM_386 3 /* Intel 80386 */ -#define EM_68K 4 /* Motorola m68k family */ -#define EM_88K 5 /* Motorola m88k family */ -#define EM_860 7 /* Intel 80860 */ -#define EM_MIPS 8 /* MIPS R3000 big-endian */ -#define EM_S370 9 /* IBM System/370 */ -#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */ - -#define EM_PARISC 15 /* HPPA */ -#define EM_VPP500 17 /* Fujitsu VPP500 */ -#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ -#define EM_960 19 /* Intel 80960 */ -#define EM_PPC 20 /* PowerPC */ -#define EM_PPC64 21 /* PowerPC 64-bit */ -#define EM_S39022 /* IBM S390 */ - -#define EM_V80036 /* NEC V800 series */ -#define EM_FR2037 /* Fujitsu FR20 */ -#define EM_RH3238 /* TRW RH-32 */ -#define EM_RCE 39 /* Motorola RCE */ -#define EM_ARM 40 /* ARM */ -#define EM_FAKE_ALPHA 41 /* Digital Alpha */ -#define EM_SH 42 /* Hitachi SH */ -#define EM_SPARCV9 43 /* SPARC v9 64-bit */ -#define EM_TRICORE 44 /* Siemens Tricore */ -#define EM_ARC 45 /* Argonaut RISC Core */ -#define EM_H8_300 46 /* Hitachi H8/300 */ -#define EM_H8_300H 47 /* Hitachi H8/300H */ -#define EM_H8S 48 /* Hitachi H8S */ -#define EM_H8_500 49 /* Hitachi H8/500 */ -#define EM_IA_64 50 /* Intel Merced */ -#define EM_MIPS_X 51 /* Stanford MIPS-X */ -#define EM_COLDFIRE52 /* Motorola Coldfire */ -#define EM_68HC12 53 /* Motorola M68HC12 */ -#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/ -#define EM_PCP 55 /* Siemens PCP */ -#define EM_NCPU56 /* Sony nCPU embeeded RISC */ -#define EM_NDR157 /* Denso NDR1 microprocessor */ -#define EM_STARCORE58 /* Motorola Start*Core processor */ -#define EM_ME1659 /* Toyota ME16 processor */ -#define EM_ST100 60 /* STMicroelectronic ST100 processor */ -#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/ -#define EM_X86_64 62 /* AMD x86-64 architecture */ -#define EM_PDSP63 /* Sony DSP Processor */ - -#define EM_FX6666 /* Siemens FX66 microcontroller */ -#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */ -#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */ -#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */ -#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */ -#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */ -#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */ -#define EM_SVX 73 /* Silicon Graphics SVx */ -#define EM_ST1974 /* STMicroelectronics ST19 8 bit mc */ -#define EM_VAX 75 /* Digital VAX */ -#define EM_CRIS76 /* Axis Communications 32-bit embedded processor */ -#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */ -#define EM_FIREPATH78 /* Element 14 64-bit DSP Processor */ -#defin
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 00c695d6152bb8f2e7a288a5c019986ed3ee9495
Author: Daniel Verkamp chromium org>
AuthorDate: Fri Sep 7 23:28:32 2018 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 22 05:31:16 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=00c695d6
lddtree: use readlink -f for absolute links
Commit b97eba7fb2c0a3c5ad9e3831c6f87dca1fde59c5 causes problems when
using lddtree with symlinks containing absolute paths, such as the
crosvm guest tools, which install these links:
/usr/bin/sommelier -> /etc/alternatives/sommelier ->
/opt/google/cros-containers/bin/sommelier
(where the final sommelier is the lddtree-generated script).
In this case, $base resolved by the lddtree script would be
'/usr/bin//etc/alternatives/sommelier', which is incorrect.
Replace the dirname/readlink combination with readlink -f when the
symlink is absolute in order to fully resolve the symlink, while keeping
the relative path when the script is invoked through a relative path.
Bug: https://crbug.com/882055
Signed-off-by: Daniel Verkamp chromium.org>
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index bbf9df9..8184e8f 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -187,7 +187,13 @@ def GenerateLdsoWrapper(
# remove absolute paths from build outputs and enables directory
independent
# cache sharing in distributed build systems.
wrapper = """#!/bin/sh
-if ! base=$(dirname "$0")/$(readlink "$0" 2>/dev/null); then
+if base=$(readlink "$0" 2>/dev/null); then
+ # If $0 is an abspath symlink, fully resolve the target.
+ case ${base} in
+ /*) base=$(readlink -f "$0" 2>/dev/null);;
+ *) base=$(dirname "$0")/${base};;
+ esac
+else
case $0 in
/*) base=$0;;
*) base=${PWD:-`pwd`}/$0;;
[gentoo-commits] proj/pax-utils:master commit in: /
commit: aadadb863a89af460726163703278b14750591ae
Author: George Burgess IV google com>
AuthorDate: Tue Sep 22 15:09:47 2020 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 22 05:31:31 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=aadadb86
lddtree: add LD_ARGV0_REL
Some binaries use `/proc/self/exe` to get a link to the
currently-executing binary. Unfortunately, when `ld.so` is invoked
directly, `/proc/self/exe` alawys points to `ld.so`.
`LD_ARGV0` can only be used to determine the current executable in
programs which haven't changed their working directory from their
starting one, so that's difficult to generally use.
To solve this, this embeds the path of the current binary _relative to
ld.so_ in an env var.
Bug: https://crbug.com/1003841
Bug: https://issuetracker.google.com/187793259
Signed-off-by: George Burgess chromium.org>
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 6 ++
1 file changed, 6 insertions(+)
diff --git a/lddtree.py b/lddtree.py
index 8184e8f..b26afcf 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -176,6 +176,7 @@ def GenerateLdsoWrapper(
replacements = {
"interp": os.path.join(os.path.relpath(interp_dir, basedir),
interp_name),
+"interp_rel": os.path.relpath(path, interp_dir),
"libpaths": ":".join(
"${basedir}/" + os.path.relpath(p, basedir) for p in libpaths
),
@@ -186,6 +187,10 @@ def GenerateLdsoWrapper(
# Keep path relativeness of argv0 (in ${base}.elf). This allows tools to
# remove absolute paths from build outputs and enables directory
independent
# cache sharing in distributed build systems.
+#
+# NB: LD_ARGV0_REL below is unrelated & non-standard. It's to let tools
see
+# the original path if they need it and when they know they'll be wrapped
up
+# by this script.
wrapper = """#!/bin/sh
if base=$(readlink "$0" 2>/dev/null); then
# If $0 is an abspath symlink, fully resolve the target.
@@ -200,6 +205,7 @@ else
esac
fi
basedir=${base%%/*}
+LD_ARGV0_REL="%(interp_rel)s" \\
exec \\
"${basedir}/%(interp)s" \\
%(argv0_arg)s \\
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 8f404c038705389cefd86e8a1fba1b50074a01ae
Author: Takuto Ikuta chromium org>
AuthorDate: Wed Aug 29 06:07:30 2018 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 22 05:31:14 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=8f404c03
lddtree: keep relativeness of invoked program in elf wrapper
This makes clang's resource dir relative when we pass
-no-canonical-prefixes flag like below.
$
chromium/.cros_cache/chrome-sdk/tarballs/$BOARD+$VERSION+target_toolchain/usr/bin/clang
-no-canonical-prefixes -###
Chromium OS 7.0_pre328903_p20180425-r5 clang version 7.0.0
(/var/cache/chromeos-cache/distfiles/host/egit-src/clang.git
e7408fe366bb18923fa360b069b4e4566203f34f)
(/var/cache/chromeos-cache/distfiles/host/egit-src/llvm.git
95561668f063fbcb8195bde05ecede721ece4ba4) (based on LLVM 7.0.0svn)
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:
chromium/.cros_cache/chrome-sdk/tarballs/kevin+10750.0.0+target_toolchain/usr/bin
Without this patch, -no-canonical-prefixes has no meaning.
$
chromium/.cros_cache/chrome-sdk/tarballs/$BOARD+$VERSION+target_toolchain/usr/bin/clang
-no-canonical-prefixes -###
Chromium OS 7.0_pre328903_p20180425-r5 clang version 7.0.0
(/var/cache/chromeos-cache/distfiles/host/egit-src/clang.git
e7408fe366bb18923fa360b069b4e4566203f34f)
(/var/cache/chromeos-cache/distfiles/host/egit-src/llvm.git
95561668f063fbcb8195bde05ecede721ece4ba4) (based on LLVM 7.0.0svn)
Target: x86_64-pc-linux-gnu
Thread model: posix
InstalledDir:
$HOME/chromium/.cros_cache/chrome-sdk/tarballs/kevin+10750.0.0+target_toolchain/usr/bin
This is a part of effort for build cache sharing when using goma by
removing absolute path from compile result.
Instead of enforcing relative path, I keep relativeness of compiler
path.
I confirmed this works as following with a debug line to show ${base}.elf.
(sdk daisy R70-11005.0.0) tikuta tikuta ~/chromium/src $ ln -s
build/cros_cache/chrome-sdk/tarballs/daisy+11005.0.0+target_toolchain/usr/bin/clang-7
clang
(sdk daisy R70-11005.0.0) tikuta tikuta ~/chromium/src $ ./clang
${base}.elf:
'./build/cros_cache/chrome-sdk/tarballs/daisy+11005.0.0+target_toolchain/usr/bin/clang-7.elf'
clang-7: error: no input files
In previous versions of this change, it ran like below:
(sdk daisy R70-11005.0.0) tikuta tikuta ~/chromium/src $ ./clang
${base}.elf:
'/usr/local/google/home/tikuta/chromium/src/build/cros_cache/chrome-sdk/tarballs/daisy+11005.0.0+target_toolchain/usr/bin/clang-7.elf'
clang-7: error: no input files
I confirmed this can build base_unittests on daisy and amd64-generic
after creating a new CrOS SDK with chromiumos-sdk-tryjob.
Bug: https://crbug.com/846610
Bug: https://crbug.com/876604
Signed-off-by: Takuto Ikuta chromium.org>
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index 80808fc..bbf9df9 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -182,8 +182,12 @@ def GenerateLdsoWrapper(
"argv0_arg": '--argv0 "$0"' if interp_supports_argv0(root + interp)
else "",
"preload_arg": f'--preload "{preload}"' if preload else "",
}
+
+# Keep path relativeness of argv0 (in ${base}.elf). This allows tools to
+# remove absolute paths from build outputs and enables directory
independent
+# cache sharing in distributed build systems.
wrapper = """#!/bin/sh
-if ! base=$(realpath "$0" 2>/dev/null); then
+if ! base=$(dirname "$0")/$(readlink "$0" 2>/dev/null); then
case $0 in
/*) base=$0;;
*) base=${PWD:-`pwd`}/$0;;
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 9ca3f108762c27b557825f5392499498e8a00202
Author: Mike Frysinger chromium org>
AuthorDate: Fri Dec 15 20:53:20 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 15 20:53:59 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=9ca3f108
lddtree: fix argcomplete typing
mypy wants a cast here to avoid warning:
lddtree.py:59: error: Incompatible types in assignment (expression has type
"None", variable has type Module) [assignment]
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 576d3d3..80808fc 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -49,14 +49,14 @@ import os
import re
import shutil
import sys
-from typing import Any, Iterable, Optional, Union
+from typing import Any, cast, Iterable, Optional, Union
assert sys.version_info >= (3, 6), f"Python 3.6+ required, but found
{sys.version}"
try:
import argcomplete
except ImportError:
-argcomplete = None
+argcomplete = cast(Any, None)
from elftools.common import exceptions
from elftools.elf.elffile import ELFFile
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 5f8628d611c03f77bbcf245c025b85cf60b88431
Author: Mike Frysinger chromium org>
AuthorDate: Fri Dec 15 20:41:31 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 15 20:53:59 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=5f8628d6
lddtree: use f-string in warn message
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index 2b8b9c4..576d3d3 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -64,7 +64,7 @@ from elftools.elf.elffile import ELFFile
def warn(msg: Any, prefix: Optional[str] = "warning") -> None:
"""Write |msg| to stderr with a |prefix| before it"""
-print("%s: %s: %s" % (os.path.basename(sys.argv[0]), prefix, msg),
file=sys.stderr)
+print(f"{os.path.basename(sys.argv[0])}: {prefix}: {msg}", file=sys.stderr)
def err(msg: Any, status: Optional[int] = 1) -> None:
[gentoo-commits] proj/pax-utils:master commit in: /
commit: c3205676f2bc6cc0ffd01098ce007ba7b5b7d159
Author: David Riley chromium org>
AuthorDate: Wed Sep 28 17:16:42 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 15 20:53:59 2023 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c3205676
lddtree: Add --wrapper-preload
--wrapper-preload allows the wrapper to be generated always specifying
an LD_PRELOAD via the --preload option of the loader.
Signed-off-by: David Riley chromium.org>
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 60f3a7c..2b8b9c4 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -46,6 +46,7 @@ import functools
import glob
import mmap
import os
+import re
import shutil
import sys
from typing import Any, Iterable, Optional, Union
@@ -147,6 +148,7 @@ def GenerateLdsoWrapper(
path: str,
interp: str,
libpaths: Iterable[str] = (),
+preload: Optional[str] = None,
) -> None:
"""Generate a shell script wrapper which uses local ldso to run the ELF
@@ -164,12 +166,21 @@ def GenerateLdsoWrapper(
interp_dir, interp_name = os.path.split(interp)
# Add ldso interpreter dir to end of libpaths as a fallback library path.
libpaths = dedupe(list(libpaths) + [interp_dir])
+if preload:
+# If preload is an absolute path, calculate it from basedir.
+preload_prefix = f'${{basedir}}/{os.path.relpath("/", basedir)}'
+preload = ":".join(
+f"{preload_prefix}{x}" if os.path.isabs(x) else x
+for x in re.split(r"[ :]", preload)
+)
+
replacements = {
"interp": os.path.join(os.path.relpath(interp_dir, basedir),
interp_name),
"libpaths": ":".join(
"${basedir}/" + os.path.relpath(p, basedir) for p in libpaths
),
"argv0_arg": '--argv0 "$0"' if interp_supports_argv0(root + interp)
else "",
+"preload_arg": f'--preload "{preload}"' if preload else "",
}
wrapper = """#!/bin/sh
if ! base=$(realpath "$0" 2>/dev/null); then
@@ -182,6 +193,7 @@ basedir=${base%%/*}
exec \\
"${basedir}/%(interp)s" \\
%(argv0_arg)s \\
+ %(preload_arg)s \\
--library-path "%(libpaths)s" \\
--inhibit-cache \\
--inhibit-rpath '' \\
@@ -658,7 +670,15 @@ def _ActionCopy(options: argparse.Namespace, elf: dict):
def _StripRoot(path: str) -> str:
return path[len(options.root) - 1 :]
-def _copy(realsrc, src, striproot=True, wrapit=False, libpaths=(),
outdir=None):
+def _copy(
+realsrc,
+src,
+striproot=True,
+wrapit=False,
+libpaths=(),
+outdir=None,
+preload=None,
+):
if realsrc is None:
return
@@ -712,7 +732,7 @@ def _ActionCopy(options: argparse.Namespace, elf: dict):
interp = os.path.join(options.libdir,
os.path.basename(elf["interp"]))
else:
interp = _StripRoot(elf["interp"])
-GenerateLdsoWrapper(options.dest, subdst, interp, libpaths)
+GenerateLdsoWrapper(options.dest, subdst, interp, libpaths,
preload)
# XXX: We should automatically import libgcc_s.so whenever libpthread.so
# is copied over (since we know it can be dlopen-ed by NPTL at runtime).
@@ -750,6 +770,7 @@ def _ActionCopy(options: argparse.Namespace, elf: dict):
wrapit=options.generate_wrappers,
libpaths=libpaths,
outdir=options.bindir,
+preload=options.wrapper_preload,
)
@@ -867,6 +888,12 @@ def GetParser() -> argparse.ArgumentParser:
default=False,
help="Copy over plain (non-ELF) files instead of warn+ignore",
)
+group.add_argument(
+"--wrapper-preload",
+default=None,
+type=str,
+help="Have wrapper add --preload to the ldso invocation",
+)
if argcomplete is not None:
argcomplete.autocomplete(parser)
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 23d47fe0ead50e4a98eb4b1a02f68d350f53a166
Author: Brian Norris chromium org>
AuthorDate: Tue Dec 5 23:19:50 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Dec 20 21:30:56 2023 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=23d47fe0
qmerge: Send ewarn, etc., to stderr
The PMS specifically calls out that ewarn should not display its message
to stdout. Portage sends all e{log,info,warn,...} to stderr. Imitate
that.
This discrepancy causes problems for ghc-package.eclass users, for one,
as there are instances where that class purposely dumps a warning and
then expects its callers to still use its stdout as a result.
Signed-off-by: Brian Norris chromium.org>
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
qmerge.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/qmerge.c b/qmerge.c
index 246a733..cbf94e6 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -794,8 +794,8 @@ pkg_run_func_at(
"has() { hasq \"$@\"; }\n"
"hasq() { local h=$1; shift; case \" $* \" in *\" $h \"*)
return 0;; *) return 1;; esac; }\n"
"hasv() { hasq \"$@\" && echo \"$1\"; }\n"
- "elog() { printf ' * %%b\\n' \"$*\"; }\n"
- "einfon() { printf ' * %%b' \"$*\"; }\n"
+ "elog() { printf ' * %%b\\n' \"$*\" >&2; }\n"
+ "einfon() { printf ' * %%b' \"$*\" >&2; }\n"
"einfo() { elog \"$@\"; }\n"
"ewarn() { elog \"$@\"; }\n"
"eqawarn() { elog \"QA: \"\"$@\"; }\n"
@@ -805,8 +805,8 @@ pkg_run_func_at(
"fperms() { local f a=$1; shift; for f in \"$@\"; do chmod $a
\"${ED}/${f}\"; done; }\n"
/* TODO: This should suppress `die` */
"nonfatal() { \"$@\"; }\n"
- "ebegin() { printf ' * %%b ...' \"$*\"; }\n"
- "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ]
&& echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; }\n"
+ "ebegin() { printf ' * %%b ...' \"$*\" >&2; }\n"
+ "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ]
&& echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; } >&2\n"
"dodir() { mkdir -p \"$@\"; }\n"
"keepdir() { dodir \"$@\" && touch
\"$@\"/.keep_${CATEGORY}_${PN}-${SLOT%%/*}; }\n"
/* TODO: This should be fatal upon error */
[gentoo-commits] proj/pax-utils:master commit in: /
commit: d51fa4ec5812e38af23ec773b0376d33e2b228ae Author: Mike Frysinger gentoo org> AuthorDate: Thu Mar 26 17:13:07 2020 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 14 20:20:06 2023 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=d51fa4ec lddtree: add docstring for all classes Signed-off-by: Mike Frysinger gentoo.org> lddtree.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lddtree.py b/lddtree.py index e851ac1..60f3a7c 100755 --- a/lddtree.py +++ b/lddtree.py @@ -596,6 +596,8 @@ def ParseELF( class _NormalizePathAction(argparse.Action): +"""Argparse action to normalize paths.""" + def __call__(self, parser, namespace, values, option_string=None): setattr(namespace, self.dest, normpath(values))
[gentoo-commits] proj/pax-utils:master commit in: /
commit: c9f62fd60b3d92726bca1e0c56be7aa1eeef83d8 Author: Mike Frysinger chromium org> AuthorDate: Thu Dec 14 21:25:01 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 14 21:27:05 2023 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c9f62fd6 pylintrc: remove old entries Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .pylintrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/.pylintrc b/.pylintrc index b86319b..7bee576 100644 --- a/.pylintrc +++ b/.pylintrc @@ -5,7 +5,6 @@ load-plugins= pylint.extensions.bad_builtin, pylint.extensions.check_elif, pylint.extensions.docstyle, - pylint.extensions.emptystring, pylint.extensions.overlapping_exceptions, pylint.extensions.redefined_variable_type, @@ -25,8 +24,6 @@ disable= too-many-public-methods, too-many-locals, too-many-arguments, - locally-enabled, - locally-disabled, fixme, invalid-name,
[gentoo-commits] proj/pax-utils:master commit in: .github/workflows/
commit: 6bf7ac1211f9d15a0a359e605ddc0ac8bdb39fa7 Author: Mike Frysinger gentoo org> AuthorDate: Thu Dec 14 21:27:37 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 14 21:27:37 2023 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=6bf7ac12 github: update to checkout@v3 Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> .github/workflows/build-test-ci.yml | 4 ++-- .github/workflows/ci-alpine-linux.yml | 2 +- .github/workflows/coverity.yml| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml index 18c13f0..e82f5f9 100644 --- a/.github/workflows/build-test-ci.yml +++ b/.github/workflows/build-test-ci.yml @@ -36,7 +36,7 @@ jobs: sudo install -Dm755 muon /usr/local/bin/muon ;; esac -- uses: actions/checkout@v2 +- uses: actions/checkout@v3 - run: | export PKG_CONFIG_PATH="/usr/lib/$(uname -m)-linux-gnu/pkgconfig/" case "$BB" in @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: brew install meson ninja -- uses: actions/checkout@v2 +- uses: actions/checkout@v3 - run: | meson -Duse_libcap=disabled \ -Duse_seccomp=false \ diff --git a/.github/workflows/ci-alpine-linux.yml b/.github/workflows/ci-alpine-linux.yml index de7157c..a87fdfb 100644 --- a/.github/workflows/ci-alpine-linux.yml +++ b/.github/workflows/ci-alpine-linux.yml @@ -28,7 +28,7 @@ jobs: libcap-dev \ libseccomp \ libseccomp-dev - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: meson setup -Dtests=false -Duse_fuzzing=false builddir/ - run: meson compile -C builddir - run: meson test --verbose -C builddir diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 7e729c4..20a47e5 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -12,7 +12,7 @@ jobs: coverity: runs-on: ubuntu-latest steps: -- uses: actions/checkout@v2 +- uses: actions/checkout@v3 - uses: vapier/coverity-scan-action@v1 with: email: vap...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 1139dec76291bedd66d2675884f031a2e0b09261
Author: Mike Frysinger chromium org>
AuthorDate: Thu Dec 14 20:04:35 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 14 20:04:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1139dec7
dev-vcs/repo: version bump to 2.40
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 1 +
dev-vcs/repo/repo-2.40.ebuild | 34 ++
2 files changed, 35 insertions(+)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index a5c6cb208177..72b8ad2f0830 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1 +1,2 @@
DIST repo-2.37.tar.gz 273445 BLAKE2B
7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249
SHA512
6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa
+DIST repo-2.40.tar.gz 277118 BLAKE2B
57ebd20e323a4c3d02885c71f599bf57d23e68b8199b136095ce77a479a815439c51844b11744e0c9555091e91821ba49715c57d985a3a30579497b4617b6361
SHA512
0cd9df29edf14acdaeb0e4d07dea13f6e3bfa77ac36ffe7c4042d050c5d3fb36a7ff9a249e521aef7d7e5fbff9fe1c4b94df02c0d435353e0c169a94254f78ba
diff --git a/dev-vcs/repo/repo-2.40.ebuild b/dev-vcs/repo/repo-2.40.ebuild
new file mode 100644
index ..3203603bb0c4
--- /dev/null
+++ b/dev-vcs/repo/repo-2.40.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
+# of the repo project. The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo;
+SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !app-admin/radmind
+"
+
+S="${WORKDIR}/git-${P}"
+
+src_install() {
+ python_foreach_impl python_doscript ${PN}
+ newbashcomp completion.bash ${PN}
+ doman man/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 5baf917c5825d89c40a40787c53fca9e7832bdc8
Author: Mike Frysinger chromium org>
AuthorDate: Thu Dec 14 20:03:21 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 14 20:03:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5baf917c
dev-vcs/repo: drop old 2.23
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 2 --
dev-vcs/repo/repo-2.32.ebuild | 35 ---
2 files changed, 37 deletions(-)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 34b610255db6..a5c6cb208177 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,3 +1 @@
-DIST repo-2.32 45787 BLAKE2B
658b9b343a5c5dc9a850cde62e24c942c72bab807dc94ccf55f92d51e9ff8d5a3d57ca818dca7512a3a7b073fc1fac9f22c533dcc71a9dbd918fdd63bc42fda3
SHA512
1ded71a8e5e052c012a131b914f9ce0f92a3846b29f76c167583196a5efb6fda913c944a8bcf40d41dc206cc529e780df0c6da7f3d4c21302105885dc3061093
-DIST repo-2.32.tar.gz 255696 BLAKE2B
b63fa70b2fdcd02460216d3b4c5f04a7c334f3f52ceddc69ece5f3f9c239c3f5f6eaf2617d96d60ec838766ce1b6170e8906c5ddc787c90918d5e38fd90a8a23
SHA512
4ac7be6ecd865d3823d21baa8b96d76194ed648139088bc53685463b4a3d62696005881f53e9cc5f34d8457a0bb8b8cb1a0dd2e2e547d0432f21a5aee9bba9a0
DIST repo-2.37.tar.gz 273445 BLAKE2B
7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249
SHA512
6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa
diff --git a/dev-vcs/repo/repo-2.32.ebuild b/dev-vcs/repo/repo-2.32.ebuild
deleted file mode 100644
index f073dc245de5..
--- a/dev-vcs/repo/repo-2.32.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project. The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo;
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
-
https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !app-admin/radmind
-"
-
-S="${WORKDIR}/git-${P}"
-
-src_install() {
- python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
- newbashcomp completion.bash ${PN}
- doman man/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: cd954e10c04f864b269f0d4e0d98f3876ff7ff63
Author: Mike Frysinger chromium org>
AuthorDate: Thu Dec 14 20:00:46 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 14 20:01:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd954e10
dev-vcs/repo: stabilize 2.37
Signed-off-by: Mike Frysinger chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/repo-2.37.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/repo/repo-2.37.ebuild b/dev-vcs/repo/repo-2.37.ebuild
index 3203603bb0c4..c51d27d5ee94 100644
--- a/dev-vcs/repo/repo-2.37.ebuild
+++ b/dev-vcs/repo/repo-2.37.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.t
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 43dc19d632741e9e80f02842684ca57d1277a070 Author: Mike Frysinger chromium org> AuthorDate: Thu Dec 14 19:52:20 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Thu Dec 14 19:53:27 2023 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=43dc19d6 Revert "paxinc: include for alloca" This reverts commit 781a3856ae53df051563645b45d8ff7033aea113. The header is already included in porting.h. We want to keep all system headers centralized in porting.h and not sprinkle across the other modules. Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> paxinc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/paxinc.c b/paxinc.c index c6eab87..64a3069 100644 --- a/paxinc.c +++ b/paxinc.c @@ -9,7 +9,6 @@ /* stick common symbols here that are needed by paxinc.h */ #define IN_paxinc -#include #include "paxinc.h" char do_reverse_endian;
[gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/
commit: da8495b42a9b6e1e144790cb2f2d6319e9b5f765 Author: Mike Frysinger gentoo org> AuthorDate: Tue Dec 12 18:38:12 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Dec 12 18:38:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8495b4 dev-lang/yasm: add CPE tag Signed-off-by: Mike Frysinger gentoo.org> Signed-off-by: Mike Frysinger chromium.org> dev-lang/yasm/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml index d73a43c85370..ea7db489d69f 100644 --- a/dev-lang/yasm/metadata.xml +++ b/dev-lang/yasm/metadata.xml @@ -7,5 +7,6 @@ yasm/yasm + cpe:/a:yasm_project:yasm
[gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/
commit: 02d88c6e61ff9fab0fdf897ccddf4bdaa6f094e9
Author: Mike Frysinger gentoo org>
AuthorDate: Tue Dec 12 18:32:11 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Dec 12 18:32:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d88c6e
dev-lang/yasm: add riscv keyword #905872
Fixes: https://bugs.gentoo.org/905872
Signed-off-by: Mike Frysinger gentoo.org>
Signed-off-by: Mike Frysinger chromium.org>
dev-lang/yasm/yasm-1.3.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/yasm/yasm-1.3.0-r1.ebuild
b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
index c26af826fff1..4d76cccfeeb9 100644
--- a/dev-lang/yasm/yasm-1.3.0-r1.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == * ]] ; then
inherit autotools git-r3
else
SRC_URI="https://www.tortall.net/projects/yasm/releases/${P}.tar.gz;
- KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~arm64-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
~arm64-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
commit: c0d6cc0dc513dfbf88aebca45faaa488c1d07107
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Dec 7 18:01:46 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 7 18:01:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0d6cc0d
sys-devel/automake: add upstream status info
Signed-off-by: Mike Frysinger gentoo.org>
Signed-off-by: Mike Frysinger chromium.org>
sys-devel/automake/automake-1.16.5-r1.ebuild| 1 -
sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch | 2 ++
.../automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch | 2 ++
sys-devel/automake/files/automake-1.16.5-py3-compile.patch | 2 ++
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild
b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 029332afd7db..63a8ed1a1c80 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -56,7 +56,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16.5-py3-compile.patch
"${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
- # upstreamed
"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
)
diff --git a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
index 866284dfd185..2c1c99d57367 100644
--- a/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
+++ b/sys-devel/automake/files/automake-1.16.5-apostrophe-in-tests.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ed1368e8803e8934a8bbab52a38753484dba2a37
+
From ed1368e8803e8934a8bbab52a38753484dba2a37 Mon Sep 17 00:00:00 2001
From: Karl Berry
Date: Mon, 12 Dec 2022 14:50:33 -0800
diff --git
a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
index f49dd253c2d6..85273d6aaf03 100644
---
a/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
+++
b/sys-devel/automake/files/automake-1.16.5-fix-py-compile-basedir.sh-test.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=ae8fb00111ba0c4922609cd9beb552fb41b66cc6
+
From e3db5b8038a902501a354b6921dcebcb4180f50a Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann
Date: Fri, 20 Nov 2020 02:13:56 +0100
diff --git a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
index 5333520b5db1..003b391b04ac 100644
--- a/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
+++ b/sys-devel/automake/files/automake-1.16.5-py3-compile.patch
@@ -1,3 +1,5 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=bde43d0481ff540418271ac37012a574a4fcf097
+
From aa449bd4c836abf0320033c5077259fc760b622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
Date: Sun, 3 Nov 2019 11:51:19 +0100
[gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/files/, sys-devel/automake/
commit: f001546b5b91fa9b192aa02cff75fcdbc3d9f34c
Author: Mike Frysinger gentoo org>
AuthorDate: Thu Dec 7 18:05:04 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Dec 7 18:05:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f001546b
sys-devel/automake: fix parallel builds
Fix from upstream for building automake in parallel.
Signed-off-by: Mike Frysinger gentoo.org>
Signed-off-by: Mike Frysinger chromium.org>
sys-devel/automake/automake-1.16.5-r1.ebuild | 1 +
.../files/automake-1.16.5-parallel-build.patch | 54 ++
2 files changed, 55 insertions(+)
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild
b/sys-devel/automake/automake-1.16.5-r1.ebuild
index 63a8ed1a1c80..0e6ed8d0b1dc 100644
--- a/sys-devel/automake/automake-1.16.5-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.16.5-fix-instmany-python.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
+ "${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
)
pkg_setup() {
diff --git a/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
new file mode 100644
index ..985e86aeb32c
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.16.5-parallel-build.patch
@@ -0,0 +1,54 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?h=5d02285845acfc20a4900a471c0e7c5e2ff390a0
+
+From 5d02285845acfc20a4900a471c0e7c5e2ff390a0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger
+Date: Tue, 18 Jan 2022 04:47:09 -0500
+Subject: [PATCH] build: fix race in parallel builds
+
+As reported by Hongxu Jia:
+> The automake-$(APIVERSION) is a hardlink of automake, if it is
+> created later than update_mans executing, there is a failure
+> [snip]
+> |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl
../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16
+> |help2man: can't get `--help' info from aclocal-1.16
+> |Try `--no-discard-stderr' if option outputs to stderr
+> Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
+> [snip]
+>
+> The automake_script is required by update_mans and update_mans
+> invokes automake-$(APIVERSION) rather than automake to generate
+> doc, so we should assign `automake-$(APIVERSION)' to automake_script.
+>
+> The same reason to tweak aclocal_script.
+
+However, rather than update the _script variables to point to the
+hardlinked copies of the programs, we can have the help2man steps
+run the existing scripts directly. This makes the relationship a
+bit more explicit and avoids implicit dependencies on names.
+
+* doc/local.mk: Pass $(aclocal_script) and $(automake_script) to
$(update_mans).
+* THANKS: Add Hongxu Jia.
+---
+ THANKS | 1 +
+ doc/local.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/doc/local.mk b/doc/local.mk
+index a29363d2d71b..06c78823a574 100644
+--- a/doc/local.mk
b/doc/local.mk
+@@ -46,9 +46,9 @@ update_mans = \
+ && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+ %D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
+- $(update_mans) aclocal-$(APIVERSION)
++ $(update_mans) $(aclocal_script)
+ %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
+- $(update_mans) automake-$(APIVERSION)
++ $(update_mans) $(automake_script)
+
+ ## This target is not invoked as a dependency of anything. It exists
+ ## merely to make checking the links in automake.texi (that is,
+--
+2.43.0
+
[gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/
commit: 66838e3f9b6f2748ec6000df60ca91244bad9e51 Author: Ben Reich chromium org> AuthorDate: Wed Sep 20 02:52:32 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Dec 5 16:42:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66838e3f sys-libs/ldb: Remove samba CPE from metadata.xml Closes: https://bugs.gentoo.org/902905 Signed-off-by: Ben Reich chromium.org> Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> sys-libs/ldb/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-libs/ldb/metadata.xml b/sys-libs/ldb/metadata.xml index a47d418951f0..02e87ace94c2 100644 --- a/sys-libs/ldb/metadata.xml +++ b/sys-libs/ldb/metadata.xml @@ -5,9 +5,6 @@ sa...@gentoo.org Samba - - cpe:/a:samba:samba - Builds documentation Enable LDAP support
[gentoo-commits] repo/gentoo:master commit in: app-containers/lxc/, sys-fs/fuse-exfat/, media-gfx/zbar/, media-gfx/pngcrush/, ...
commit: 23d377b24fb52e31275b9af7304eebdbc6f11939 Author: Allen Webb google com> AuthorDate: Mon Oct 23 17:33:26 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Dec 5 16:41:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23d377b2 Add more CPE strings for easier CVE tracking Signed-off-by: Allen Webb google.com> Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> app-containers/docker-cli/metadata.xml | 1 + app-containers/docker/metadata.xml | 1 + app-containers/lxc/metadata.xml | 1 + app-containers/lxd/metadata.xml | 1 + dev-embedded/openocd/metadata.xml | 1 + dev-lang/mono/metadata.xml | 1 + dev-libs/flatbuffers/metadata.xml | 1 + dev-libs/libusb/metadata.xml| 1 + dev-libs/protobuf-c/metadata.xml| 1 + dev-python/cherrypy/metadata.xml| 1 + dev-util/pkgconf/metadata.xml | 1 + dev-util/rt-tests/metadata.xml | 3 +++ dev-util/strace/metadata.xml| 1 + dev-util/valgrind/metadata.xml | 3 +++ media-gfx/pngcrush/metadata.xml | 1 + media-gfx/potrace/metadata.xml | 1 + media-gfx/qrencode/metadata.xml | 3 +++ media-gfx/zbar/metadata.xml | 1 + media-libs/dav1d/metadata.xml | 1 + media-libs/leptonica/metadata.xml | 1 + media-libs/libsamplerate/metadata.xml | 1 + media-libs/libsndfile/metadata.xml | 1 + media-libs/openh264/metadata.xml| 1 + media-libs/openjpeg/metadata.xml| 1 + media-plugins/live/metadata.xml | 3 +++ media-sound/alsa-utils/metadata.xml | 1 + media-video/ffmpeg/metadata.xml | 1 + net-analyzer/net-snmp/metadata.xml | 1 + net-analyzer/netdata/metadata.xml | 1 + net-analyzer/traceroute/metadata.xml| 1 + net-analyzer/wireshark/metadata.xml | 1 + net-dialup/lrzsz/metadata.xml | 3 +++ net-dialup/picocom/metadata.xml | 1 + net-dns/bind-tools/metadata.xml | 3 +++ net-libs/glib-networking/metadata.xml | 1 + net-libs/libnftnl/metadata.xml | 3 +++ net-libs/libslirp/metadata.xml | 1 + net-libs/libsoup/metadata.xml | 1 + net-libs/libssh2/metadata.xml | 1 + net-libs/libvncserver/metadata.xml | 1 + net-libs/nodejs/metadata.xml| 1 + net-misc/linuxptp/metadata.xml | 1 + net-misc/sslh/metadata.xml | 1 + net-print/cups-filters/metadata.xml | 1 + net-proxy/tinyproxy/metadata.xml| 1 + sci-libs/gsl/metadata.xml | 1 + sci-libs/tensorflow/metadata.xml| 1 + sys-apps/fwupd/metadata.xml | 1 + sys-apps/i2c-tools/metadata.xml | 3 +++ sys-apps/man-db/metadata.xml| 1 + sys-apps/memtester/metadata.xml | 1 + sys-apps/smartmontools/metadata.xml | 1 + sys-apps/systemd-utils/metadata.xml | 1 + sys-apps/toybox/metadata.xml| 1 + sys-apps/usbguard/metadata.xml | 1 + sys-block/blktrace/metadata.xml | 3 +++ sys-block/parted/metadata.xml | 1 + sys-cluster/libqb/metadata.xml | 1 + sys-devel/llvm/metadata.xml | 1 + sys-firmware/edk2-ovmf-bin/metadata.xml | 3 +++ sys-firmware/edk2-ovmf/metadata.xml | 1 + sys-fs/f2fs-tools/metadata.xml | 1 + sys-fs/fuse-common/metadata.xml | 1 + sys-fs/fuse-exfat/metadata.xml | 1 + sys-fs/lxcfs/metadata.xml | 1 + sys-libs/libsemanage/metadata.xml | 1 + sys-libs/newlib/metadata.xml| 3 +++ sys-process/audit/metadata.xml | 1 + www-apps/novnc/metadata.xml | 1 + www-servers/nginx/metadata.xml | 1 + 70 files changed, 92 insertions(+) diff --git a/app-containers/docker-cli/metadata.xml b/app-containers/docker-cli/metadata.xml index 46eed1b411a8..bf7820a5374d 100644 --- a/app-containers/docker-cli/metadata.xml +++ b/app-containers/docker-cli/metadata.xml @@ -11,5 +11,6 @@ docker/cli + cpe:/a:docker:command_line_interface diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml index d58b9b295fb1..41b39202d85a 100644 --- a/app-containers/docker/metadata.xml +++ b/app-containers/docker/metadata.xml @@ -36,5 +36,6 @@ moby/moby + cpe:/a:docker:docker diff --git a/app-containers/lxc/metadata.xml b/app-containers/lxc/metadata.xml index 7656e64b5884..a2d77654dbe8 100644 --- a/app-containers/lxc/metadata.xml +++ b/app-containers/lxc/metadata.xml @@ -16,5 +16,6 @@ lxc/lxc +cpe:/a:linuxcontainers:lxc diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml index b2f6ed72c3df..ee1b9a718c31 100644 --- a/app-containers/lxd/metadata.xml +++ b/app-containers/lxd/metadata.xml @@ -30,5 +30,6 @@
[gentoo-commits] repo/gentoo:master commit in: sys-apps/net-tools/
commit: e12605ed3be60d24ff08df5c493ef5014124c6f5 Author: Mike Frysinger gentoo org> AuthorDate: Sat Dec 2 01:33:11 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Dec 2 01:33:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e12605ed sys-apps/net-tools: update HOMEPAGE to https Signed-off-by: Mike Frysinger gentoo.org> sys-apps/net-tools/net-tools-2.10.ebuild | 2 +- sys-apps/net-tools/net-tools-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/net-tools/net-tools-2.10.ebuild b/sys-apps/net-tools/net-tools-2.10.ebuild index fca68bc4c63d..8301318d36e7 100644 --- a/sys-apps/net-tools/net-tools-2.10.ebuild +++ b/sys-apps/net-tools/net-tools-2.10.ebuild @@ -14,7 +14,7 @@ else fi DESCRIPTION="Standard Linux networking tools" -HOMEPAGE="http://net-tools.sourceforge.net/; +HOMEPAGE="https://net-tools.sourceforge.io/; LICENSE="GPL-2" SLOT="0" diff --git a/sys-apps/net-tools/net-tools-.ebuild b/sys-apps/net-tools/net-tools-.ebuild index 66cdcd23d4c1..da236abef59a 100644 --- a/sys-apps/net-tools/net-tools-.ebuild +++ b/sys-apps/net-tools/net-tools-.ebuild @@ -14,7 +14,7 @@ else fi DESCRIPTION="Standard Linux networking tools" -HOMEPAGE="http://net-tools.sourceforge.net/; +HOMEPAGE="https://net-tools.sourceforge.io/; LICENSE="GPL-2" SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/
commit: 08eba8565709719f041022c35b828a9b7d5d1b70
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Dec 1 11:18:46 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Dec 1 11:22:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eba856
net-nntp/tin: fix build when $CPPFLAGS is set
The configure script defaults BUILD_CPPFLAGS to $CPPFLAGS, and if
that is set, omits a required -I$srcdir/include flag from the build
causing it to not find local tin.h headers. Append it ourselves.
Signed-off-by: Mike Frysinger gentoo.org>
net-nntp/tin/tin-2.6.2-r1.ebuild | 5 +
1 file changed, 5 insertions(+)
diff --git a/net-nntp/tin/tin-2.6.2-r1.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
index c550f29e48bd..631a6ec8091d 100644
--- a/net-nntp/tin/tin-2.6.2-r1.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r1.ebuild
@@ -52,6 +52,11 @@ src_configure() {
tc-export AR CC RANLIB
tc-export_build_env
+ # The build incorrectly discards its local -I if $CPPFLAGS is set.
+ if [[ -n ${BUILD_CPPFLAGS} ]]; then
+ BUILD_CPPFLAGS+=' -I$(INCDIR)'
+ fi
+
local myeconfargs=(
$(use_enable cancel-locks)
$(use_with cancel-locks canlock)
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrome-remote-desktop/
commit: 234419c7dd85a8ae72676520d3b0f6f2654a1488
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Oct 16 09:13:02 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Oct 16 09:13:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=234419c7
net-misc/chrome-remote-desktop: drop py3.12 until all deps update
Signed-off-by: Mike Frysinger gentoo.org>
.../chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
index c92389dc335a..98867942b1eb 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
@@ -15,7 +15,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..11} )
PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
sw ta te th tr uk vi zh_CN zh_TW"
inherit unpacker python-single-r1 optfeature plocale
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 50ffcb02adc98342e87676d7c1d16c14f600a2ff
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Oct 16 09:04:33 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Oct 16 09:04:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ffcb02
dev-vcs/repo: version bump to 2.37
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 1 +
dev-vcs/repo/repo-2.37.ebuild | 34 ++
2 files changed, 35 insertions(+)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index dc0f6cfa0f56..34b610255db6 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,2 +1,3 @@
DIST repo-2.32 45787 BLAKE2B
658b9b343a5c5dc9a850cde62e24c942c72bab807dc94ccf55f92d51e9ff8d5a3d57ca818dca7512a3a7b073fc1fac9f22c533dcc71a9dbd918fdd63bc42fda3
SHA512
1ded71a8e5e052c012a131b914f9ce0f92a3846b29f76c167583196a5efb6fda913c944a8bcf40d41dc206cc529e780df0c6da7f3d4c21302105885dc3061093
DIST repo-2.32.tar.gz 255696 BLAKE2B
b63fa70b2fdcd02460216d3b4c5f04a7c334f3f52ceddc69ece5f3f9c239c3f5f6eaf2617d96d60ec838766ce1b6170e8906c5ddc787c90918d5e38fd90a8a23
SHA512
4ac7be6ecd865d3823d21baa8b96d76194ed648139088bc53685463b4a3d62696005881f53e9cc5f34d8457a0bb8b8cb1a0dd2e2e547d0432f21a5aee9bba9a0
+DIST repo-2.37.tar.gz 273445 BLAKE2B
7934581c5c55896d8ba58f5841a028f4676062197498ef601fa005f4e19428eee552e66d057a1e0d033eff8691df2de8e130ff96aec0e4537a462be81796e249
SHA512
6aa11e9fc9d899866dd89788c94ef188ea89dc6757a4e4fe0f1284898315723f72b3b97b60d39194f34e56332057545eb9c99b6483bc3e0513f747410226b9fa
diff --git a/dev-vcs/repo/repo-2.37.ebuild b/dev-vcs/repo/repo-2.37.ebuild
new file mode 100644
index ..3203603bb0c4
--- /dev/null
+++ b/dev-vcs/repo/repo-2.37.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
+# of the repo project. The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo;
+SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !app-admin/radmind
+"
+
+S="${WORKDIR}/git-${P}"
+
+src_install() {
+ python_foreach_impl python_doscript ${PN}
+ newbashcomp completion.bash ${PN}
+ doman man/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 7cbfd408327a853811d527da773ec28158f53a90
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Oct 16 09:00:51 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Oct 16 09:00:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbfd408
dev-vcs/repo: drop old 2.30
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 2 --
dev-vcs/repo/repo-2.30.ebuild | 35 ---
2 files changed, 37 deletions(-)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 63773d7369bd..dc0f6cfa0f56 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,4 +1,2 @@
-DIST repo-2.30 45769 BLAKE2B
46e8f37b138f1ebfa3109962f2690cc3bc6c38a2dd4333cd5be6fc1168476945cbd73f142486141a00552b8a998d4a765e54fce605d1872a670a3043fb213b05
SHA512
e8ad4e35417992f15bfa081ce282e1e518dcb885c04176f18ff2859ccb1dd397087224980f441020be12083c9847fcce661370119fe08f17be04718eff4a7a96
-DIST repo-2.30.tar.gz 252945 BLAKE2B
ebaadc1f624941139c14417e86e1a4960fbba9da7b9053bab8f2cb1647c40a6f1f63951bcbb6d9162803066f9b05d1fb469e82b7d3b2bea31215b97b1bddf84f
SHA512
7d184605e8d8e30bc48a4d3f2345c7ee9a8075711729108b5d487242c9311dc1cf22595f9ba09192a28460d6127e8cbe96a70fcdaf7c6baeb1e26a8ac15a7cae
DIST repo-2.32 45787 BLAKE2B
658b9b343a5c5dc9a850cde62e24c942c72bab807dc94ccf55f92d51e9ff8d5a3d57ca818dca7512a3a7b073fc1fac9f22c533dcc71a9dbd918fdd63bc42fda3
SHA512
1ded71a8e5e052c012a131b914f9ce0f92a3846b29f76c167583196a5efb6fda913c944a8bcf40d41dc206cc529e780df0c6da7f3d4c21302105885dc3061093
DIST repo-2.32.tar.gz 255696 BLAKE2B
b63fa70b2fdcd02460216d3b4c5f04a7c334f3f52ceddc69ece5f3f9c239c3f5f6eaf2617d96d60ec838766ce1b6170e8906c5ddc787c90918d5e38fd90a8a23
SHA512
4ac7be6ecd865d3823d21baa8b96d76194ed648139088bc53685463b4a3d62696005881f53e9cc5f34d8457a0bb8b8cb1a0dd2e2e547d0432f21a5aee9bba9a0
diff --git a/dev-vcs/repo/repo-2.30.ebuild b/dev-vcs/repo/repo-2.30.ebuild
deleted file mode 100644
index 25394f1e60c7..
--- a/dev-vcs/repo/repo-2.30.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project. The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo;
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
-
https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !app-admin/radmind
- !dev-util/repo"
-
-S="${WORKDIR}/git-${P}"
-
-src_install() {
- python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
- newbashcomp completion.bash ${PN}
- doman man/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 1b1cc632444034ee4226f15755ad75d7c54b26b0
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Oct 16 09:00:31 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Oct 16 09:00:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b1cc632
dev-vcs/repo: stabilize 2.32 for all
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/repo-2.32.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/repo/repo-2.32.ebuild b/dev-vcs/repo/repo-2.32.ebuild
index c008c0bbe33c..f073dc245de5 100644
--- a/dev-vcs/repo/repo-2.32.ebuild
+++ b/dev-vcs/repo/repo-2.32.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrome-remote-desktop/
commit: 1682e74bace2e26a72eb662b800d33104ecdbbfe
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Oct 13 09:51:06 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Oct 16 08:56:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1682e74b
net-misc/chrome-remote-desktop: version bump to 118.0.5993.9 #903642
Also update Python deps.
Fixes: https://bugs.gentoo.org/897116
Fixes: https://bugs.gentoo.org/903642
Signed-off-by: Mike Frysinger gentoo.org>
net-misc/chrome-remote-desktop/Manifest| 2 +-
0.5481.14.ebuild => chrome-remote-desktop-118.0.5993.9.ebuild} | 7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/net-misc/chrome-remote-desktop/Manifest
b/net-misc/chrome-remote-desktop/Manifest
index 0b93518fa795..85898ad78bcb 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1 +1 @@
-DIST chrome-remote-desktop_110.0.5481.14_amd64.deb 17742536 BLAKE2B
3a010b73f786e013aa4bf358811ab306e87681860c1db12b5e915c80b653da0a7e190ff36c78c91fa7a68a8873c7f66a23bb6bdb98630fd881b30c33f12559f7
SHA512
66a374f04664c26e15c5c42b2dbd942dd9cdbc23127733f2f1c136deff868509db80c17028b5f9cae48a460b22443f39af337313dfd865705134737d72372600
+DIST chrome-remote-desktop_118.0.5993.9_amd64.deb 17677480 BLAKE2B
1f29d8a8d90f12515afbea857e5f4b7ec0ca56a3051e14e7f67c38c906d743c74ca274a00342a8a9745effeb0023a7e88615c886dcbdcbe68bbcafe317b8902d
SHA512
ffa0fb28cb7842a13df3228b5ca6e83c2e9d3967c5013b3613cefec7f86f56e6df069f33e65c3a979ce15d971906cb4488b90a4dffc4b95cd5d65346b4a08f87
diff --git
a/net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild
b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
similarity index 97%
rename from
net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild
rename to
net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
index b2cfe976dea1..c92389dc335a 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-118.0.5993.9.ebuild
@@ -15,7 +15,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..12} )
PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
sw ta te th tr uk vi zh_CN zh_TW"
inherit unpacker python-single-r1 optfeature plocale
@@ -43,7 +43,10 @@ RDEPEND+="
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
- $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+ $(python_gen_cond_dep '
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ ')
media-libs/fontconfig
media-libs/freetype:2
sys-apps/dbus
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libltdl/
commit: a1a498b77d74a9904808cdf9a3943f995ebeae00
Author: Mike Frysinger chromium org>
AuthorDate: Sat Jan 28 00:02:37 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sat Jan 28 00:03:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1a498b7
dev-libs/libltdl: add LFS support
Signed-off-by: Mike Frysinger gentoo.org>
dev-libs/libltdl/libltdl-2.4.7-r1.ebuild | 39
1 file changed, 39 insertions(+)
diff --git a/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
new file mode 100644
index ..f5c82fdbc28a
--- /dev/null
+++ b/dev-libs/libltdl/libltdl-2.4.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Please bump with sys-devel/libtool.
+
+inherit multilib-minimal flag-o-matic
+
+MY_P="libtool-${PV}"
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/;
+SRC_URI="mirror://gnu/libtool/${MY_P}.tar.xz"
+S="${WORKDIR}"/${MY_P}/libltdl
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+# libltdl doesn't have a testsuite.
+
+BDEPEND="app-arch/xz-utils"
+
+multilib_src_configure() {
+ append-lfs-flags
+ ECONF_SOURCE="${S}" \
+ econf \
+ --enable-ltdl-install \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ # While the libltdl.la file is not used directly, the m4 ltdl logic
+ # keys off of its existence when searching for ltdl support. # bug
#293921
+ #use static-libs || find "${D}" -name libltdl.la -delete
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrome-remote-desktop/
commit: 64a62ffe3e0837d542b8a5a26a41c66672be2b93 Author: Mike Frysinger gentoo org> AuthorDate: Sat Jan 21 23:14:28 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 21 23:14:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a62ffe net-misc/chrome-remote-desktop: version bump to 110.0.5481.14 #891613 Closes: https://bugs.gentoo.org/891613 Signed-off-by: Mike Frysinger gentoo.org> net-misc/chrome-remote-desktop/Manifest | 2 +- ...-108.0.5359.33.ebuild => chrome-remote-desktop-110.0.5481.14.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest index 78c10b8578c8..0b93518fa795 100644 --- a/net-misc/chrome-remote-desktop/Manifest +++ b/net-misc/chrome-remote-desktop/Manifest @@ -1 +1 @@ -DIST chrome-remote-desktop_108.0.5359.33_amd64.deb 17521372 BLAKE2B 3cfe63dca71407926ddd522f752c2745c3a3380568d8b207b39b667f53e983c7f7003e4d9e72946007a3eaed59c6cf5d870f586dc571c7ac68c37e7594649609 SHA512 6167f1c8539453c7552727e1b75c1c2ba12c3d189ccf412605942c2e0b1af7e30d11e6ed8f76820af7731a16c46c77c1444540540b86d4053e3aa7f5ec55df2c +DIST chrome-remote-desktop_110.0.5481.14_amd64.deb 17742536 BLAKE2B 3a010b73f786e013aa4bf358811ab306e87681860c1db12b5e915c80b653da0a7e190ff36c78c91fa7a68a8873c7f66a23bb6bdb98630fd881b30c33f12559f7 SHA512 66a374f04664c26e15c5c42b2dbd942dd9cdbc23127733f2f1c136deff868509db80c17028b5f9cae48a460b22443f39af337313dfd865705134737d72372600 diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-108.0.5359.33.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild similarity index 100% rename from net-misc/chrome-remote-desktop/chrome-remote-desktop-108.0.5359.33.ebuild rename to net-misc/chrome-remote-desktop/chrome-remote-desktop-110.0.5481.14.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-libs/newlib/
commit: b9f590f6d4b7c2fdba372fc5d2586042c565087d
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Jan 20 23:53:01 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Jan 20 23:53:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f590f6
sys-libs/newlib: allow parallel install again
The upstream build system has been heavily rewritten and shouldn't have
any parallel install bugs in it anymore. If there are any left, they
should get fixed, so let's re enable parallel install.
Signed-off-by: Mike Frysinger gentoo.org>
sys-libs/newlib/newlib-4.3.0.20230120.ebuild | 4 ++--
sys-libs/newlib/newlib-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
b/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
index 83237271fd55..5b16a3bf6787 100644
--- a/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
+++ b/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
@@ -128,11 +128,11 @@ src_compile() {
src_install() {
cd "${NEWLIBBUILD}" || die
- emake -j1 DESTDIR="${D}" install
+ emake DESTDIR="${D}" install
if use nano ; then
cd "${NEWLIBNANOBUILD}" || die
- emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+ emake DESTDIR="${NEWLIBNANOTMPINSTALL}" install
# Rename nano lib* files to lib*_nano and move to the real ${D}
local nanolibfiles=""
nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex
".*/lib\(c\|g\|m\|rdimon\|gloss\)\.a" -print)
diff --git a/sys-libs/newlib/newlib-.ebuild
b/sys-libs/newlib/newlib-.ebuild
index 83237271fd55..5b16a3bf6787 100644
--- a/sys-libs/newlib/newlib-.ebuild
+++ b/sys-libs/newlib/newlib-.ebuild
@@ -128,11 +128,11 @@ src_compile() {
src_install() {
cd "${NEWLIBBUILD}" || die
- emake -j1 DESTDIR="${D}" install
+ emake DESTDIR="${D}" install
if use nano ; then
cd "${NEWLIBNANOBUILD}" || die
- emake -j1 DESTDIR="${NEWLIBNANOTMPINSTALL}" install
+ emake DESTDIR="${NEWLIBNANOTMPINSTALL}" install
# Rename nano lib* files to lib*_nano and move to the real ${D}
local nanolibfiles=""
nanolibfiles=$(find "${NEWLIBNANOTMPINSTALL}" -regex
".*/lib\(c\|g\|m\|rdimon\|gloss\)\.a" -print)
[gentoo-commits] repo/gentoo:master commit in: sys-libs/newlib/
commit: f14210c9169c7faac3497a000cb3a238e4422797
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Jan 20 22:29:15 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Jan 20 22:29:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14210c9
sys-libs/newlib: version bump to 4.3.0
Signed-off-by: Mike Frysinger gentoo.org>
sys-libs/newlib/Manifest | 1 +
sys-libs/newlib/newlib-4.3.0.20230120.ebuild | 153 +++
2 files changed, 154 insertions(+)
diff --git a/sys-libs/newlib/Manifest b/sys-libs/newlib/Manifest
index 70c92629aba4..ecab6584c5f8 100644
--- a/sys-libs/newlib/Manifest
+++ b/sys-libs/newlib/Manifest
@@ -1,2 +1,3 @@
DIST newlib-4.1.0.tar.gz 18648429 BLAKE2B
c4d4d734bceeacf05b75d450d4316392d266812f98f99cd3f9f0926ac9848e1dc145361827d1d6951edfe5f109923c982d9f284f927ffc5fd5e5edaf8be6
SHA512
6a24b64bb8136e4cd9d21b8720a36f87a34397fd952520af66903e183455c5cf19bb0ee4607c12a05d139c6c59382263383cb62c461a839f969d23d3bc4b1d34
DIST newlib-4.2.0.20211231.tar.gz 18921589 BLAKE2B
fb85a368d082e2b9005d5d295d6854eb7d0e351cfade6516e6a06b18656d9139d7629f55a6d5f63337c6bce511a2373e797bed96847f19941b26cacfb1c8d3bc
SHA512
0c3efd7b74a6b8457a717cbb6aa6c5ff268eeaba375535465c6bd6502c3d32b54a9bc3ba7f2c6990f78e29152eee2f62acb39b674d24f9ddf440374a1ec9d2e8
+DIST newlib-4.3.0.20230120.tar.gz 8832922 BLAKE2B
b5493f25e44049f4e1222698894e7e67756928062e05f5d16bcd52b2221e5c04a80a9e0cbc3fc6e92d67fe6b3813e06b6d3a6d39e8742e02b8f13ff84d809de1
SHA512
4a06309d36c2255fef8fc8f2d133cafa850f1ed2eddfb27b5d45f5d16af69e0fca829a0b4c9b34af4ed3a28c6fcc929761e0ee823a4229f35c2853d432b5e7ef
diff --git a/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
b/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
new file mode 100644
index ..83237271fd55
--- /dev/null
+++ b/sys-libs/newlib/newlib-4.3.0.20230120.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "" ]] ; then
+ EGIT_REPO_URI="https://sourceware.org/git/newlib-cygwin.git;
+ inherit git-r3
+else
+ SRC_URI="ftp://sourceware.org/pub/newlib/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+DESCRIPTION="Newlib is a C library intended for use on embedded systems"
+HOMEPAGE="https://sourceware.org/newlib/;
+
+LICENSE="NEWLIB LIBGLOSS GPL-2"
+SLOT="0"
+IUSE="nls threads unicode headers-only nano"
+RESTRICT="strip"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.0-no-nano-cxx.patch
+)
+
+NEWLIBBUILD="${WORKDIR}/build"
+NEWLIBNANOBUILD="${WORKDIR}/build.nano"
+NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
+
+CFLAGS_FULL="-ffunction-sections -fdata-sections"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections"
+
+pkg_setup() {
+ # Reject newlib-on-glibc type installs
+ if [[ ${CTARGET} == ${CHOST} ]] ; then
+ case ${CHOST} in
+ *-newlib|*-elf) ;;
+ *) die "Use sys-devel/crossdev to build a newlib
toolchain" ;;
+ esac
+ fi
+
+ case ${CTARGET} in
+ msp430*)
+ if ver_test $(gcc-version ${CTARGET}) -lt 10.1; then
+ # bug #717610
+ die "gcc for ${CTARGET} has to be 10.1 or above"
+ fi
+ ;;
+ esac
+}
+
+src_configure() {
+ # TODO: we should fix this
+ unset LDFLAGS
+ CHOST=${CTARGET} strip-unsupported-flags
+ CCASFLAGS_ORIG="${CCASFLAGS}"
+ CFLAGS_ORIG="${CFLAGS}"
+
+ local myconf=(
+ # The top-level configure doesn't utilize this flag, but
subdirs do,
+ # so autodetection for econf doesn't work. Add ourselves.
+ --disable-silent-rules
+ # Disable legacy syscall stub code in newlib. These have been
+ # moved to libgloss for a long time now, so the code in newlib
+ # itself just gets in the way.
+ --disable-newlib-supplied-syscalls
+ )
+ [[ ${CTARGET} == "spu" ]] \
+ && myconf+=( --disable-newlib-multithread ) \
+ || myconf+=( $(use_enable threads newlib-multithread) )
+
+ mkdir -p "${NEWLIBBUILD}"
+ cd "${NEWLIBBUILD}"
+
+ export "CFLAGS_FOR_TARGET=${CFLAGS_ORIG} ${CFLAG
[gentoo-commits] repo/gentoo:master commit in: sys-libs/newlib/
commit: 745e649426e2a012146ec5058817d02c30730937
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Jan 20 22:28:01 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Jan 20 22:29:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745e6494
sys-libs/newlib: drop -U_FORTIFY_SOURCE workaround
The latest versions of newlib seem to build fine with this turned on,
so drop the hack to see if there are any latent issues to fix upstream.
Bug: https://bugs.gentoo.org/656018
Signed-off-by: Mike Frysinger gentoo.org>
sys-libs/newlib/newlib-.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys-libs/newlib/newlib-.ebuild
b/sys-libs/newlib/newlib-.ebuild
index 3b956c480a08..83237271fd55 100644
--- a/sys-libs/newlib/newlib-.ebuild
+++ b/sys-libs/newlib/newlib-.ebuild
@@ -37,12 +37,8 @@ NEWLIBBUILD="${WORKDIR}/build"
NEWLIBNANOBUILD="${WORKDIR}/build.nano"
NEWLIBNANOTMPINSTALL="${WORKDIR}/nano_tmp_install"
-# Adding -U_FORTIFY_SOURCE to counter the effect of Gentoo's
-# auto-addition of _FORTIFY_SOURCE at gcc site: bug #656018#c4
-# Currently newlib can't be built itself when _FORTIFY_SOURCE
-# is set.
-CFLAGS_FULL="-ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
-CFLAGS_NANO="-Os -ffunction-sections -fdata-sections -U_FORTIFY_SOURCE"
+CFLAGS_FULL="-ffunction-sections -fdata-sections"
+CFLAGS_NANO="-Os -ffunction-sections -fdata-sections"
pkg_setup() {
# Reject newlib-on-glibc type installs
[gentoo-commits] repo/gentoo:master commit in: sys-libs/newlib/
commit: 11ea6d1a440837222b22767b912b459aeb554901
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Jan 20 22:26:18 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Jan 20 22:29:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ea6d1a
sys-libs/newlib: disable verbose builds
The automatic probing of --disable-silent-rules doesn't work, so add
the flag manually.
Signed-off-by: Mike Frysinger gentoo.org>
sys-libs/newlib/newlib-.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sys-libs/newlib/newlib-.ebuild
b/sys-libs/newlib/newlib-.ebuild
index 39e03d098e4d..3b956c480a08 100644
--- a/sys-libs/newlib/newlib-.ebuild
+++ b/sys-libs/newlib/newlib-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -71,6 +71,9 @@ src_configure() {
CFLAGS_ORIG="${CFLAGS}"
local myconf=(
+ # The top-level configure doesn't utilize this flag, but
subdirs do,
+ # so autodetection for econf doesn't work. Add ourselves.
+ --disable-silent-rules
# Disable legacy syscall stub code in newlib. These have been
# moved to libgloss for a long time now, so the code in newlib
# itself just gets in the way.
[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/
commit: a237f9e56bc6421e374c38cbd821067bf4ff0042
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Jan 20 00:03:35 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Jan 20 00:03:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a237f9e5
dev-libs/capstone: use https:// for HOMEPAGE
Signed-off-by: Mike Frysinger gentoo.org>
dev-libs/capstone/capstone-4.0.2-r2.ebuild | 2 +-
dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 2 +-
dev-libs/capstone/capstone-.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index af978b9b5397..579ef58d9929 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
inherit cmake distutils-r1 toolchain-funcs
DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 145967865032..fe79e806cfad 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
inherit cmake distutils-r1 toolchain-funcs
DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
-> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-libs/capstone/capstone-.ebuild
b/dev-libs/capstone/capstone-.ebuild
index 4adc4be2a941..259fa40dbb50 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
inherit cmake distutils-r1 toolchain-funcs
DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
if [[ ${PV} == ]]; then
inherit git-r3
[gentoo-commits] repo/gentoo:master commit in: dev-libs/confuse/
commit: ba94f60952a5743f4ff2a3029c42fb7fdf8fd27f
Author: Mike Frysinger chromium org>
AuthorDate: Tue Jan 10 19:16:48 2023 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Jan 10 19:16:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba94f609
dev-libs/confuse: enable LFS
Enable automatic LFS support for 32-bit ABIs. This should be safe
as the library ABI doesn't use any FS-types (e.g. off_t or struct
stat), and internally the code doesn't interact with the FS much.
Upstream: https://github.com/libconfuse/libconfuse/pull/167
Signed-off-by: Mike Frysinger gentoo.org>
dev-libs/confuse/confuse-3.3-r1.ebuild | 56 ++
1 file changed, 56 insertions(+)
diff --git a/dev-libs/confuse/confuse-3.3-r1.ebuild
b/dev-libs/confuse/confuse-3.3-r1.ebuild
new file mode 100644
index ..b248bf5d34f6
--- /dev/null
+++ b/dev-libs/confuse/confuse-3.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal flag-o-matic
+
+DESCRIPTION="a configuration file parser library"
+HOMEPAGE="https://github.com/martinh/libconfuse;
+SRC_URI="https://github.com/martinh/libconfuse/releases/download/v${PV}/${P}.tar.xz;
+
+LICENSE="ISC"
+SLOT="0/2.1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="nls static-libs"
+
+BDEPEND="
+ sys-devel/flex
+ sys-devel/libtool
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
+"
+
+DOCS=( AUTHORS )
+
+src_prepare() {
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ # https://github.com/libconfuse/libconfuse/pull/167
+ append-lfs-flags
+
+ # examples are normally compiled but not installed. They
+ # fail during a mingw crosscompile.
+ local ECONF_SOURCE=${BUILD_DIR}
+ econf \
+ --enable-shared \
+ --disable-examples \
+ $(use_enable nls) \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ doman doc/man/man3/*.3
+ dodoc -r doc/html
+
+ docinto examples
+ dodoc examples/*.{c,conf}
+
+ find "${D}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/mupdf/
commit: 7f7e9b0b38aaad6c79427600f6d9579056f46c0c Author: Mike Frysinger gentoo org> AuthorDate: Sat Jan 7 06:20:50 2023 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 7 06:53:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7e9b0b app-text/mupdf: require newer mujs version The code relies on defines that don't exist in mujs-1.1 (JS_VERSION defines), so require mujs-1.2 to fix. Signed-off-by: Mike Frysinger gentoo.org> app-text/mupdf/mupdf-1.20.0.ebuild | 2 +- app-text/mupdf/mupdf-1.20.3.ebuild | 2 +- app-text/mupdf/mupdf-1.21.0.ebuild | 2 +- app-text/mupdf/mupdf-1.21.1.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-text/mupdf/mupdf-1.20.0.ebuild b/app-text/mupdf/mupdf-1.20.0.ebuild index c541f96f9cd6..a8b45265f9c4 100644 --- a/app-text/mupdf/mupdf-1.20.0.ebuild +++ b/app-text/mupdf/mupdf-1.20.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0 - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) X? ( diff --git a/app-text/mupdf/mupdf-1.20.3.ebuild b/app-text/mupdf/mupdf-1.20.3.ebuild index 578687ddd9de..bd19f33ee9aa 100644 --- a/app-text/mupdf/mupdf-1.20.3.ebuild +++ b/app-text/mupdf/mupdf-1.20.3.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib diff --git a/app-text/mupdf/mupdf-1.21.0.ebuild b/app-text/mupdf/mupdf-1.21.0.ebuild index c2d55d2bd989..f1b964d3e2cb 100644 --- a/app-text/mupdf/mupdf-1.21.0.ebuild +++ b/app-text/mupdf/mupdf-1.21.0.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib diff --git a/app-text/mupdf/mupdf-1.21.1.ebuild b/app-text/mupdf/mupdf-1.21.1.ebuild index 718ebd6ed15a..5eb70637cf2a 100644 --- a/app-text/mupdf/mupdf-1.21.1.ebuild +++ b/app-text/mupdf/mupdf-1.21.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" media-libs/libpng:0= >=media-libs/openjpeg-2.1:2= >=media-libs/libjpeg-turbo-1.5.3-r2:0= - javascript? ( >=dev-lang/mujs-1.0.7:= ) + javascript? ( >=dev-lang/mujs-1.2.0:= ) opengl? ( >=media-libs/freeglut-3.0.0 ) ssl? ( >=dev-libs/openssl-1.1:0= ) sys-libs/zlib
[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/
commit: d13cccf7b996f4aed8b20e3bec8d4d3d45af7e6f
Author: Mike Frysinger gentoo org>
AuthorDate: Sun Dec 11 12:22:59 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sun Dec 11 12:24:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13cccf7
sys-apps/attr: drop obsolete LFS flags #760857
The upstream 2.5.0 release includes LFS support by default via a
configure option, so there's no need to force compiler flags.
Bug: https://bugs.gentoo.org/760857
Signed-off-by: Mike Frysinger gentoo.org>
sys-apps/attr/attr-2.5.1-r2.ebuild | 9 +
sys-apps/attr/attr-.ebuild | 9 +
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/sys-apps/attr/attr-2.5.1-r2.ebuild
b/sys-apps/attr/attr-2.5.1-r2.ebuild
index 16d9c6ba5ee6..fd70c8e82c9e 100644
--- a/sys-apps/attr/attr-2.5.1-r2.ebuild
+++ b/sys-apps/attr/attr-2.5.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+inherit toolchain-funcs multilib-minimal usr-ldscript
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git;
@@ -41,13 +41,6 @@ src_prepare() {
fi
}
-src_configure() {
- # bug #760857
- append-lfs-flags
-
- multilib-minimal_src_configure
-}
-
multilib_src_configure() {
local myeconfargs=(
--bindir="${EPREFIX}"/bin
diff --git a/sys-apps/attr/attr-.ebuild b/sys-apps/attr/attr-.ebuild
index 2046677daddd..f5ee0bed082e 100644
--- a/sys-apps/attr/attr-.ebuild
+++ b/sys-apps/attr/attr-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+inherit toolchain-funcs multilib-minimal usr-ldscript
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git;
@@ -41,13 +41,6 @@ src_prepare() {
fi
}
-src_configure() {
- # bug #760857
- append-lfs-flags
-
- multilib-minimal_src_configure
-}
-
multilib_src_configure() {
local myeconfargs=(
--bindir="${EPREFIX}"/bin
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 87658817c275bb8b2ceab0668ecd1cacb89d16ae
Author: Mike Frysinger chromium org>
AuthorDate: Thu Nov 24 06:18:00 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Nov 24 06:18:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87658817
dev-vcs/repo: version bump to 2.30
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 2 ++
dev-vcs/repo/repo-2.30.ebuild | 35 +++
2 files changed, 37 insertions(+)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index dff3c2c6a541..70a20a984897 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1 +1,3 @@
DIST repo-2.29.tar.gz 248253 BLAKE2B
6b51a0416634eab52f44410fe156c736a6c69234345b4cf5115692a9b56d479c0bce780583fb2ee6b9ca206e5163adbf6ded85ff5d7f2b174a7e7cd6dc37dd57
SHA512
7323b52709164999a80172bc39398ad9989c3eb97bcfda66a675c3f94792cdd742068d47bbcc66dc8fffbe3b661c2fb19332a72a7f889a249f73fa448fcb32d1
+DIST repo-2.30 45769 BLAKE2B
46e8f37b138f1ebfa3109962f2690cc3bc6c38a2dd4333cd5be6fc1168476945cbd73f142486141a00552b8a998d4a765e54fce605d1872a670a3043fb213b05
SHA512
e8ad4e35417992f15bfa081ce282e1e518dcb885c04176f18ff2859ccb1dd397087224980f441020be12083c9847fcce661370119fe08f17be04718eff4a7a96
+DIST repo-2.30.tar.gz 252945 BLAKE2B
ebaadc1f624941139c14417e86e1a4960fbba9da7b9053bab8f2cb1647c40a6f1f63951bcbb6d9162803066f9b05d1fb469e82b7d3b2bea31215b97b1bddf84f
SHA512
7d184605e8d8e30bc48a4d3f2345c7ee9a8075711729108b5d487242c9311dc1cf22595f9ba09192a28460d6127e8cbe96a70fcdaf7c6baeb1e26a8ac15a7cae
diff --git a/dev-vcs/repo/repo-2.30.ebuild b/dev-vcs/repo/repo-2.30.ebuild
new file mode 100644
index ..1eaf21021d74
--- /dev/null
+++ b/dev-vcs/repo/repo-2.30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
+# of the repo project. The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo;
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
+
https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !app-admin/radmind
+ !dev-util/repo"
+
+S="${WORKDIR}/git-${P}"
+
+src_install() {
+ python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+ newbashcomp completion.bash ${PN}
+ doman man/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: f248105030c295a2354e6fdff64f3ee6bf58f3bd
Author: Mike Frysinger chromium org>
AuthorDate: Thu Nov 24 06:09:45 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Nov 24 06:18:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2481050
dev-vcs/repo: drop old 2.21 version
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 1 -
dev-vcs/repo/repo-2.21.ebuild | 34 --
2 files changed, 35 deletions(-)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 11f2abce51d2..dff3c2c6a541 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,2 +1 @@
-DIST repo-2.21.tar.gz 232514 BLAKE2B
e77555164e754f9d2c2392965512127593ae8073d3f317e483187f06f67df784127511e36c4c32bef05db98ddb333e9fa72804ec89761cafa86529174e902677
SHA512
08b49b450eef087ac00e603bf0f394442998a076034418b7af60b9a5b293df4f1fc340844dfd2dfff1fcc61eb99885ec02f331d4fb2b0ba1e347af0674fa063a
DIST repo-2.29.tar.gz 248253 BLAKE2B
6b51a0416634eab52f44410fe156c736a6c69234345b4cf5115692a9b56d479c0bce780583fb2ee6b9ca206e5163adbf6ded85ff5d7f2b174a7e7cd6dc37dd57
SHA512
7323b52709164999a80172bc39398ad9989c3eb97bcfda66a675c3f94792cdd742068d47bbcc66dc8fffbe3b661c2fb19332a72a7f889a249f73fa448fcb32d1
diff --git a/dev-vcs/repo/repo-2.21.ebuild b/dev-vcs/repo/repo-2.21.ebuild
deleted file mode 100644
index ab4e0a6a02d3..
--- a/dev-vcs/repo/repo-2.21.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project. The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit bash-completion-r1 python-r1
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo;
-SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !app-admin/radmind
- !dev-util/repo"
-
-S="${WORKDIR}/git-${P}"
-
-src_install() {
- python_foreach_impl python_doscript ${PN}
- newbashcomp completion.bash ${PN}
- doman man/*.[0-9]
-}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: feabe4130ac469dba502d1a057742858affec364
Author: Mike Frysinger chromium org>
AuthorDate: Thu Nov 24 06:06:35 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Thu Nov 24 06:18:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feabe413
dev-vcs/repo: mark 2.29 stable for all
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/repo-2.29.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/repo/repo-2.29.ebuild b/dev-vcs/repo/repo-2.29.ebuild
index f65cdd0c6678..ecc487887842 100644
--- a/dev-vcs/repo/repo-2.29.ebuild
+++ b/dev-vcs/repo/repo-2.29.ebuild
@@ -17,7 +17,7 @@
SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.t
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b07b25dcc8ad0e518d801bc23d01fb59cc6de442
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 06:03:01 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b07b25dc
lddtree: add typing info to more places
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 87 +++---
1 file changed, 61 insertions(+), 26 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index ecb353d..6939bb6 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -48,6 +48,7 @@ import mmap
import os
import shutil
import sys
+from typing import Any, Iterable, Optional, Union
assert sys.version_info >= (3, 6), f'Python 3.6+ required, but found
{sys.version}'
@@ -60,31 +61,31 @@ from elftools.common import exceptions
from elftools.elf.elffile import ELFFile
-def warn(msg, prefix='warning'):
+def warn(msg: Any, prefix: Optional[str] = "warning") -> None:
"""Write |msg| to stderr with a |prefix| before it"""
print('%s: %s: %s' % (os.path.basename(sys.argv[0]), prefix, msg),
file=sys.stderr)
-def err(msg, status=1):
+def err(msg: Any, status: Optional[int] = 1) -> None:
"""Write |msg| to stderr and exit with |status|"""
warn(msg, prefix='error')
sys.exit(status)
-def dbg(debug, *args, **kwargs):
+def dbg(debug: bool, *args, **kwargs) -> None:
"""Pass |args| and |kwargs| to print() when |debug| is True"""
if debug:
print(*args, **kwargs)
-def bstr(buf):
+def bstr(buf: Union[bytes, str]) -> str:
"""Decode the byte string into a string"""
if isinstance(buf, str):
return buf
return buf.decode('utf-8')
-def normpath(path):
+def normpath(path: str) -> str:
"""Normalize a path
Python's os.path.normpath() doesn't handle some cases:
@@ -96,7 +97,7 @@ def normpath(path):
@functools.lru_cache(maxsize=None)
-def readlink(path, root, prefixed=False):
+def readlink(path: str, root: str, prefixed: Optional[bool] = False) -> str:
"""Like os.readlink(), but relative to a |root|
This does not currently handle the pathological case:
@@ -124,14 +125,14 @@ def readlink(path, root, prefixed=False):
return normpath((root + path) if prefixed else path)
-def dedupe(items):
+def dedupe(items: list[str]) -> list[str]:
"""Remove all duplicates from |items| (keeping order)"""
-seen = {}
+seen: dict[str, str] = {}
return [seen.setdefault(x, x) for x in items if x not in seen]
@functools.lru_cache(maxsize=None)
-def interp_supports_argv0(interp) -> bool:
+def interp_supports_argv0(interp: str) -> bool:
"""See whether |interp| supports the --argv0 option.
Starting with glibc-2.33, the ldso supports --argv0 to override argv[0].
@@ -141,7 +142,12 @@ def interp_supports_argv0(interp) -> bool:
return mm.find(b'--argv0') >= 0
-def GenerateLdsoWrapper(root, path, interp, libpaths=()):
+def GenerateLdsoWrapper(
+root: str,
+path: str,
+interp: str,
+libpaths: Iterable[str] = (),
+) -> None:
"""Generate a shell script wrapper which uses local ldso to run the ELF
Since we cannot rely on the host glibc (or other libraries), we need to
@@ -190,7 +196,12 @@ exec \\
@functools.lru_cache(maxsize=None)
-def ParseLdPaths(str_ldpaths, root='', cwd=None, path=None):
+def ParseLdPaths(
+str_ldpaths: str,
+root: str = "",
+cwd: Optional[str] = None,
+path: str = "",
+) -> list[str]:
"""Parse the colon-delimited list of paths and apply ldso rules to each
Note the special handling as dictated by the ldso:
@@ -232,7 +243,12 @@ def ParseLdPaths(str_ldpaths, root='', cwd=None,
path=None):
return dedupe(ldpaths)
-def ParseLdSoConf(ldso_conf, root='/', debug=False, _first=True):
+def ParseLdSoConf(
+ldso_conf: str,
+root: str = "/",
+debug: bool = False,
+_first: bool = True,
+) -> list[str]:
"""Load all the paths from a given ldso config file
This should handle comments, whitespace, and "include" statements.
@@ -283,7 +299,12 @@ def ParseLdSoConf(ldso_conf, root='/', debug=False,
_first=True):
return paths
-def LoadLdpaths(root='/', cwd=None, prefix='', debug=False):
+def LoadLdpaths(
+root: str = "/",
+cwd: Optional[str] = None,
+prefix: str = "",
+debug: bool = False,
+) -> dict[str, list[str]]:
"""Load linker paths from common locations
This parses the ld.so.conf and LD_LIBRARY_PATH env var.
@@ -297,7 +318,7 @@ def
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 1ddedd87363c65d6b910fe32da0f1764ba1329a9
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 07:39:56 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=1ddedd87
lddtree: reformat with black
Largely this is just single quotes -> double quotes.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 503 -
1 file changed, 294 insertions(+), 209 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index d894505..e851ac1 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -50,7 +50,7 @@ import shutil
import sys
from typing import Any, Iterable, Optional, Union
-assert sys.version_info >= (3, 6), f'Python 3.6+ required, but found
{sys.version}'
+assert sys.version_info >= (3, 6), f"Python 3.6+ required, but found
{sys.version}"
try:
import argcomplete
@@ -63,12 +63,12 @@ from elftools.elf.elffile import ELFFile
def warn(msg: Any, prefix: Optional[str] = "warning") -> None:
"""Write |msg| to stderr with a |prefix| before it"""
-print('%s: %s: %s' % (os.path.basename(sys.argv[0]), prefix, msg),
file=sys.stderr)
+print("%s: %s: %s" % (os.path.basename(sys.argv[0]), prefix, msg),
file=sys.stderr)
def err(msg: Any, status: Optional[int] = 1) -> None:
"""Write |msg| to stderr and exit with |status|"""
-warn(msg, prefix='error')
+warn(msg, prefix="error")
sys.exit(status)
@@ -82,7 +82,7 @@ def bstr(buf: Union[bytes, str]) -> str:
"""Decode the byte string into a string"""
if isinstance(buf, str):
return buf
-return buf.decode('utf-8')
+return buf.decode("utf-8")
def normpath(path: str) -> str:
@@ -93,7 +93,7 @@ def normpath(path: str) -> str:
//..// -> //
//..//..// -> ///
"""
-return os.path.normpath(path).replace('//', '/')
+return os.path.normpath(path).replace("//", "/")
@functools.lru_cache(maxsize=None)
@@ -115,9 +115,9 @@ def readlink(path: str, root: str, prefixed: Optional[bool]
= False) -> str:
Returns:
A fully resolved symlink path
"""
-root = root.rstrip('/')
+root = root.rstrip("/")
if prefixed:
-path = path[len(root):]
+path = path[len(root) :]
while os.path.islink(root + path):
path = os.path.join(os.path.dirname(path), os.readlink(root + path))
@@ -137,9 +137,9 @@ def interp_supports_argv0(interp: str) -> bool:
Starting with glibc-2.33, the ldso supports --argv0 to override argv[0].
"""
-with open(interp, 'rb') as fp:
+with open(interp, "rb") as fp:
with mmap.mmap(fp.fileno(), 0, prot=mmap.PROT_READ) as mm:
-return mm.find(b'--argv0') >= 0
+return mm.find(b"--argv0") >= 0
def GenerateLdsoWrapper(
@@ -165,12 +165,11 @@ def GenerateLdsoWrapper(
# Add ldso interpreter dir to end of libpaths as a fallback library path.
libpaths = dedupe(list(libpaths) + [interp_dir])
replacements = {
-'interp': os.path.join(os.path.relpath(interp_dir, basedir),
- interp_name),
+"interp": os.path.join(os.path.relpath(interp_dir, basedir),
interp_name),
"libpaths": ":".join(
"${basedir}/" + os.path.relpath(p, basedir) for p in libpaths
),
-'argv0_arg': '--argv0 "$0"' if interp_supports_argv0(root + interp)
else '',
+"argv0_arg": '--argv0 "$0"' if interp_supports_argv0(root + interp)
else "",
}
wrapper = """#!/bin/sh
if ! base=$(realpath "$0" 2>/dev/null); then
@@ -190,8 +189,8 @@ exec \\
"$@"
"""
wrappath = root + path
-os.rename(wrappath, wrappath + '.elf')
-with open(wrappath, 'w', encoding='utf-8') as f:
+os.rename(wrappath, wrappath + ".elf")
+with open(wrappath, "w", encoding="utf-8") as f:
f.write(wrapper % replacements)
os.chmod(wrappath, 0o0755)
@@ -223,17 +222,17 @@ def ParseLdPaths(
cwd = os.getcwd()
ldpaths = []
-for ldpath in str_ldpaths.split(':'):
+for ldpath in str_ldpaths.split(":"):
# Expand placeholders first.
-if '$ORIGIN' in ldpath:
-ldpath = ldpath.replace('$ORIGIN', os.path.dirname(path))
-elif '${ORIGIN}' in ldpath:
-ldpath = ldpath.replace('${ORIGIN}', os.path.dirname(path))
+if "$ORIGIN" in ldpath:
+ldpath = ldpath.replace("$ORIGIN&qu
[gentoo-commits] proj/pax-utils:master commit in: /
commit: c8f5de35cfa59ce7620ed646cce9c9715b0ed72e
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 05:46:01 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=c8f5de35
lddtree: switch to f-strings in most places
These are a bit more readable than % formatting.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 349bace..ecb353d 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -250,7 +250,7 @@ def ParseLdSoConf(ldso_conf, root='/', debug=False,
_first=True):
dbg_pfx = '' if _first else ' '
try:
-dbg(debug, '%sParseLdSoConf(%s)' % (dbg_pfx, ldso_conf))
+dbg(debug, f"{dbg_pfx}ParseLdSoConf({ldso_conf})")
with open(ldso_conf, encoding='utf-8') as f:
for line in f.readlines():
line = line.split('#', 1)[0].strip()
@@ -262,7 +262,7 @@ def ParseLdSoConf(ldso_conf, root='/', debug=False,
_first=True):
line = root + line.lstrip('/')
else:
line = os.path.dirname(ldso_conf) + '/' + line
-dbg(debug, '%s glob: %s' % (dbg_pfx, line))
+dbg(debug, dbg_pfx, "glob:", line)
# ldconfig in glibc uses glob() which returns entries
sorted according
# to LC_COLLATE. Further, ldconfig does not reset that
but respects
# the active env settings (which might be a mistake).
Python does not
@@ -336,7 +336,7 @@ def CompatibleELFs(elf1, elf2):
"""
osabis = frozenset([e.header['e_ident']['EI_OSABI'] for e in (elf1, elf2)])
compat_sets = (
-frozenset('ELFOSABI_%s' % x for x in ('NONE', 'SYSV', 'GNU',
'LINUX',)),
+frozenset(f"ELFOSABI_{x}" for x in ("NONE", "SYSV", "GNU", "LINUX")),
)
return ((len(osabis) == 1 or any(osabis.issubset(x) for x in compat_sets))
and
elf1.elfclass == elf2.elfclass and
@@ -357,13 +357,13 @@ def FindLib(elf, lib, ldpaths, root='/', debug=False):
Returns:
Tuple of the full path to the desired library and the real path to it
"""
-dbg(debug, ' FindLib(%s)' % lib)
+dbg(debug, f" FindLib({lib})")
for ldpath in ldpaths:
path = os.path.join(ldpath, lib)
target = readlink(path, root, prefixed=True)
if path != target:
-dbg(debug, 'checking: %s -> %s' % (path, target))
+dbg(debug, "checking:", path, "->", target)
else:
dbg(debug, 'checking:', path)
@@ -374,7 +374,7 @@ def FindLib(elf, lib, ldpaths, root='/', debug=False):
if CompatibleELFs(elf, libelf):
return (target, path)
except exceptions.ELFError as e:
-warn('%s: %s' % (target, e))
+warn(f"{target}: {e}")
return (None, None)
@@ -429,7 +429,7 @@ def ParseELF(path, root='/', cwd=None, prefix='',
'libs': _all_libs,
}
-dbg(debug, 'ParseELF(%s)' % path)
+dbg(debug, f"ParseELF({path})")
with open(path, 'rb') as f:
try:
@@ -527,7 +527,7 @@ def ParseELF(path, root='/', cwd=None, prefix='',
lret = ParseELF(realpath, root, cwd, prefix, ldpaths,
display=fullpath,
debug=debug, _first=False,
_all_libs=_all_libs)
except exceptions.ELFError as e:
-warn('%s: %s' % (realpath, e))
+warn(f"{realpath}: {e}")
_all_libs[lib]['needed'] = lret['needed']
del elf
@@ -549,13 +549,14 @@ def _ActionShow(options, elf):
if options.list:
print(fullpath or lib)
else:
-print('%s%s => %s' % ('' * depth, lib, fullpath))
+indent = "" * depth
+print(f"{indent}{lib}", "=>", fullpath)
new_libs = []
for lib in elf['libs'][lib]['needed']:
if lib in chain_libs:
if not options.list:
-print('%s%s => !!! circular loop !!!' % ('' * depth,
lib))
+print(f"{indent}{lib} => !!! circular loop !!!")
continue
if options.all or not lib in shown_libs:
shown_libs.add(lib)
@@ -584,7 +585,7 @@ def _ActionShow(options, elf):
if not interp is None:
print(interp)
else:
-print('%s (interpreter => %s)' % (elf['path'], interp))
+print(elf["path"], f"(inte
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 30d1f02c1482ea5371ee4e0a36276ae03b186208
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 07:40:48 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=30d1f02c
pylint: reformat with black
Also drop a few Python 2 specific things.
Signed-off-by: Mike Frysinger gentoo.org>
pylint | 19 ---
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/pylint b/pylint
index 38d77a2..463dc03 100755
--- a/pylint
+++ b/pylint
@@ -1,12 +1,9 @@
#!/usr/bin/env python
-# -*- coding: utf-8 -*-
# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
"""Run pylint with the right settings."""
-from __future__ import print_function
-
import os
import sys
@@ -17,10 +14,10 @@ def find_all_modules(source_root):
for root, _dirs, files in os.walk(source_root, topdown=False):
# Add all of the .py modules in the tree.
-ret += [os.path.join(root, x) for x in files if x.endswith('.py')]
+ret += [os.path.join(root, x) for x in files if x.endswith(".py")]
# Add the main scripts that don't end in .py.
-ret += [os.path.join(source_root, x) for x in ('pylint',)]
+ret += [os.path.join(source_root, x) for x in ("pylint",)]
return ret
@@ -33,17 +30,17 @@ def main(argv):
argv = find_all_modules(source_root)
pympath = source_root
-pythonpath = os.environ.get('PYTHONPATH')
+pythonpath = os.environ.get("PYTHONPATH")
if pythonpath is None:
pythonpath = pympath
else:
-pythonpath = pympath + ':' + pythonpath
-os.environ['PYTHONPATH'] = pythonpath
+pythonpath = pympath + ":" + pythonpath
+os.environ["PYTHONPATH"] = pythonpath
-pylintrc = os.path.join(source_root, '.pylintrc')
-cmd = ['pylint', '--rcfile', pylintrc]
+pylintrc = os.path.join(source_root, ".pylintrc")
+cmd = ["pylint", "--rcfile", pylintrc]
os.execvp(cmd[0], cmd + argv)
-if __name__ == '__main__':
+if __name__ == "__main__":
sys.exit(main(sys.argv[1:]))
[gentoo-commits] proj/pax-utils:master commit in: /
commit: b74963dd2346fb526382635b7d6317653417256a
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 06:57:56 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=b74963dd
lddtree: simplify join logic
No need to create a list to past to join when we can pass a generator.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 6939bb6..85dd91f 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -167,8 +167,9 @@ def GenerateLdsoWrapper(
replacements = {
'interp': os.path.join(os.path.relpath(interp_dir, basedir),
interp_name),
-'libpaths': ':'.join(['${basedir}/' + os.path.relpath(p, basedir)
- for p in libpaths]),
+"libpaths": ":".join(
+"${basedir}/" + os.path.relpath(p, basedir) for p in libpaths
+),
'argv0_arg': '--argv0 "$0"' if interp_supports_argv0(root + interp)
else '',
}
wrapper = """#!/bin/sh
[gentoo-commits] proj/pax-utils:master commit in: /
commit: bbb4e5d73ee1f3df12a1cd467beca3a476c5f054
Author: Mike Frysinger chromium org>
AuthorDate: Wed Sep 28 07:03:11 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:17 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=bbb4e5d7
lddtree: avoid shadowing function args
pylint warns about redefining |lib| here, and it's right -- the code
is a little hard to follow because of it. So give it a diff name.
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 85dd91f..d894505 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -589,17 +589,17 @@ def _ActionShow(options: argparse.Namespace, elf: dict):
print(f"{indent}{lib}", "=>", fullpath)
new_libs = []
-for lib in elf['libs'][lib]['needed']:
-if lib in chain_libs:
+for nlib in elf["libs"][lib]["needed"]:
+if nlib in chain_libs:
if not options.list:
-print(f"{indent}{lib} => !!! circular loop !!!")
+print(f"{indent}{nlib} => !!! circular loop !!!")
continue
-if options.all or not lib in shown_libs:
-shown_libs.add(lib)
-new_libs.append(lib)
+if options.all or not nlib in shown_libs:
+shown_libs.add(nlib)
+new_libs.append(nlib)
-for lib in new_libs:
-_show(lib, depth + 1)
+for nlib in new_libs:
+_show(nlib, depth + 1)
chain_libs.pop()
shown_libs = set(elf['needed'])
[gentoo-commits] proj/pax-utils:master commit in: /
commit: 413a60a31daafe60a539fc113dafb1760abb1d20
Author: Manoj Gupta chromium org>
AuthorDate: Mon Nov 1 18:23:22 2021 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 28 07:42:14 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=413a60a3
lddtree: Add logging for ELFParseError
Add logging inside parseELF to print the bad file if the parser
fails with ELFParseError.
Bug: https://issuetracker.google.com/issues/203821449
Signed-off-by: Manoj Gupta chromium.org>
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lddtree.py b/lddtree.py
index 3c9d66f..349bace 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -432,7 +432,11 @@ def ParseELF(path, root='/', cwd=None, prefix='',
dbg(debug, 'ParseELF(%s)' % path)
with open(path, 'rb') as f:
-elf = ELFFile(f)
+try:
+elf = ELFFile(f)
+except exceptions.ELFParseError:
+warn("ELFParser failed to parse", path)
+raise
# If this is the first ELF, extract the interpreter.
if _first:
[gentoo-commits] proj/pax-utils:master commit in: /
commit: a94b2f664714a33eeeb492efe87525fa9947a644
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Sep 21 08:28:55 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Sep 21 08:28:55 2022 +
URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=a94b2f66
lddtree: specify utf-8 encoding with text files
Signed-off-by: Mike Frysinger gentoo.org>
lddtree.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lddtree.py b/lddtree.py
index 1f66b4d..3c9d66f 100755
--- a/lddtree.py
+++ b/lddtree.py
@@ -184,7 +184,7 @@ exec \\
"""
wrappath = root + path
os.rename(wrappath, wrappath + '.elf')
-with open(wrappath, 'w') as f:
+with open(wrappath, 'w', encoding='utf-8') as f:
f.write(wrapper % replacements)
os.chmod(wrappath, 0o0755)
@@ -251,7 +251,7 @@ def ParseLdSoConf(ldso_conf, root='/', debug=False,
_first=True):
dbg_pfx = '' if _first else ' '
try:
dbg(debug, '%sParseLdSoConf(%s)' % (dbg_pfx, ldso_conf))
-with open(ldso_conf) as f:
+with open(ldso_conf, encoding='utf-8') as f:
for line in f.readlines():
line = line.split('#', 1)[0].strip()
if not line:
[gentoo-commits] proj/pax-utils:master commit in: /
commit: e165b0bc20911f4727a9a736560ee321fe0c1712 Author: Mike Frysinger chromium org> AuthorDate: Wed Sep 21 08:26:01 2022 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Sep 21 08:26:22 2022 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=e165b0bc lddtree: sort imports Should be no functional change. Signed-off-by: Mike Frysinger gentoo.org> lddtree.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lddtree.py b/lddtree.py index 7cb4348..1f66b4d 100755 --- a/lddtree.py +++ b/lddtree.py @@ -41,9 +41,9 @@ they need will be placed into /foo/lib/ only. """ import argparse +import errno import functools import glob -import errno import mmap import os import shutil @@ -56,8 +56,8 @@ try: except ImportError: argcomplete = None -from elftools.elf.elffile import ELFFile from elftools.common import exceptions +from elftools.elf.elffile import ELFFile def warn(msg, prefix='warning'):
[gentoo-commits] proj/pax-utils:master commit in: /
commit: ec9220bb190671152703a837da56148d42f1ff8d Author: Mike Frysinger chromium org> AuthorDate: Wed Sep 21 08:19:18 2022 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Sep 21 08:21:04 2022 + URL:https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=ec9220bb lddtree: update CrOS copyright line Signed-off-by: Mike Frysinger gentoo.org> lddtree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lddtree.py b/lddtree.py index 3afcfac..7cb4348 100755 --- a/lddtree.py +++ b/lddtree.py @@ -2,7 +2,7 @@ # PYTHON_ARGCOMPLETE_OK # Copyright 2012-2014 Gentoo Foundation # Copyright 2012-2014 Mike Frysinger -# Copyright 2012-2014 The Chromium OS Authors +# Copyright 2012-2014 The ChromiumOS Authors # Use of this source code is governed by a BSD-style license (BSD-3) """Read the ELF dependency tree and show it
[gentoo-commits] repo/gentoo:master commit in: sys-devel/bc/
commit: 07aad3b2c6a3a12be810c8e510a9acbddb34dc14
Author: Mike Frysinger chromium org>
AuthorDate: Fri Sep 9 08:23:31 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Sep 9 08:23:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07aad3b2
sys-devel/bc: fix building with USE=libedit #738602
Closes: https://bugs.gentoo.org/738602
Signed-off-by: Mike Frysinger gentoo.org>
sys-devel/bc/bc-1.07.1-r5.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sys-devel/bc/bc-1.07.1-r5.ebuild b/sys-devel/bc/bc-1.07.1-r5.ebuild
index f9c1a2daa3e5..259b7a108902 100644
--- a/sys-devel/bc/bc-1.07.1-r5.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r5.ebuild
@@ -45,6 +45,9 @@ src_configure() {
fi
use static && append-ldflags -static
+ # The libedit code isn't compatible currently. #830101
+ use libedit && append-flags -fcommon
+
# AC_SYS_LARGEFILE in configure.ac would handle this, but we don't patch
# autotools otherwise currently. This change has been sent upstream,
but
# who knows when they'll make another release.
[gentoo-commits] repo/gentoo:master commit in: sys-devel/bc/
commit: d5211fff3db25183146af1d0ccadd89f5ef3f52c
Author: Mike Frysinger chromium org>
AuthorDate: Fri Sep 9 08:10:48 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Sep 9 08:13:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5211fff
sys-devel/bc: enable LFS flags #471102
Minor change for a minor tool, but easy enough to fill out short of
upstream ever updating the autotool usage directly.
Signed-off-by: Mike Frysinger gentoo.org>
sys-devel/bc/bc-1.07.1-r5.ebuild | 62
1 file changed, 62 insertions(+)
diff --git a/sys-devel/bc/bc-1.07.1-r5.ebuild b/sys-devel/bc/bc-1.07.1-r5.ebuild
new file mode 100644
index ..f9c1a2daa3e5
--- /dev/null
+++ b/sys-devel/bc/bc-1.07.1-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Handy console-based calculator utility"
+HOMEPAGE="https://www.gnu.org/software/bc/bc.html;
+SRC_URI="mirror://gnu/bc/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit readline static"
+
+RDEPEND="
+ !readline? ( libedit? ( dev-libs/libedit:= ) )
+ readline? (
+ sys-libs/readline:=
+ sys-libs/ncurses:=
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/flex
+ virtual/yacc"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.07.1-no-ed-its-sed.patch )
+
+src_prepare() {
+ default
+
+ # Avoid bad build tool usage when cross-compiling. Bug #627126
+ tc-is-cross-compiler && eapply
"${FILESDIR}"/${PN}-1.07.1-use-system-bc.patch
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with readline)
+ )
+ if use readline ; then
+ myconf+=( --without-libedit )
+ else
+ myconf+=( $(use_with libedit) )
+ fi
+ use static && append-ldflags -static
+
+ # AC_SYS_LARGEFILE in configure.ac would handle this, but we don't patch
+ # autotools otherwise currently. This change has been sent upstream,
but
+ # who knows when they'll make another release.
+ append-lfs-flags
+
+ econf "${myconf[@]}"
+
+ # Do not regen docs -- configure produces a small fragment that includes
+ # the version info which causes all pages to regen (newer file). Bug
#554774
+ touch -r doc doc/* || die
+}
+
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: 4283dbfebf6e8a84509268a3b5acb6d6be7b8a43
Author: Mike Frysinger chromium org>
AuthorDate: Tue Aug 23 15:56:11 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Aug 23 15:58:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4283dbfe
dev-vcs/repo: version bump to 2.29
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 1 +
dev-vcs/repo/repo-2.29.ebuild | 34 ++
2 files changed, 35 insertions(+)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index c70161526a6d..11f2abce51d2 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1 +1,2 @@
DIST repo-2.21.tar.gz 232514 BLAKE2B
e77555164e754f9d2c2392965512127593ae8073d3f317e483187f06f67df784127511e36c4c32bef05db98ddb333e9fa72804ec89761cafa86529174e902677
SHA512
08b49b450eef087ac00e603bf0f394442998a076034418b7af60b9a5b293df4f1fc340844dfd2dfff1fcc61eb99885ec02f331d4fb2b0ba1e347af0674fa063a
+DIST repo-2.29.tar.gz 248253 BLAKE2B
6b51a0416634eab52f44410fe156c736a6c69234345b4cf5115692a9b56d479c0bce780583fb2ee6b9ca206e5163adbf6ded85ff5d7f2b174a7e7cd6dc37dd57
SHA512
7323b52709164999a80172bc39398ad9989c3eb97bcfda66a675c3f94792cdd742068d47bbcc66dc8fffbe3b661c2fb19332a72a7f889a249f73fa448fcb32d1
diff --git a/dev-vcs/repo/repo-2.29.ebuild b/dev-vcs/repo/repo-2.29.ebuild
new file mode 100644
index ..f65cdd0c6678
--- /dev/null
+++ b/dev-vcs/repo/repo-2.29.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
+# of the repo project. The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo;
+SRC_URI="https://github.com/GerritCodeReview/git-repo/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !app-admin/radmind
+ !dev-util/repo"
+
+S="${WORKDIR}/git-${P}"
+
+src_install() {
+ python_foreach_impl python_doscript ${PN}
+ newbashcomp completion.bash ${PN}
+ doman man/*.[0-9]
+}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/repo/
commit: de7038a57924b97679ffe3540fe567be9c21a1bb
Author: Mike Frysinger chromium org>
AuthorDate: Tue Aug 23 15:27:02 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Tue Aug 23 15:58:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de7038a5
dev-vcs/repo: drop old <2.21 versions
Signed-off-by: Mike Frysinger gentoo.org>
dev-vcs/repo/Manifest | 4
dev-vcs/repo/repo-2.15.ebuild | 42 --
dev-vcs/repo/repo-2.17.ebuild | 42 --
3 files changed, 88 deletions(-)
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index 9b838f35cfa4..c70161526a6d 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,5 +1 @@
-DIST repo-2.15 44704 BLAKE2B
6d90cecb4d748f7fb3febec95e16ed1638112a945aa36f7d7cc12232cdf4bcd66d286aa1054fd23de5ae7e896ac52c05465778aaec759e5d0251227deb220d18
SHA512
e6aad90f6058f4e5750ce44f8951ac4df39dd39c1615d7f68670a0b8ac5007f52e3bb6219d6ca0842908ef6c87843c6fd655b3b2a47fcf410e2a74d47a334d34
-DIST repo-2.17 44944 BLAKE2B
8f5db36d6acedd9c79fca1c9fe5a29e4da9b483d4f356d8ad88d6510f13ec7ff8200723c836ff7ac17419e571c2c4970182385a248b8005aaae1cbd4d93d3423
SHA512
b8d459c619f537d8afce00c78594027ef983e31f1bf47341d3388e39da4505270fa07f8c93b1ab5110795c1b6b952f01f48f0e18ce15e8126a484c98fd73e8c8
DIST repo-2.21.tar.gz 232514 BLAKE2B
e77555164e754f9d2c2392965512127593ae8073d3f317e483187f06f67df784127511e36c4c32bef05db98ddb333e9fa72804ec89761cafa86529174e902677
SHA512
08b49b450eef087ac00e603bf0f394442998a076034418b7af60b9a5b293df4f1fc340844dfd2dfff1fcc61eb99885ec02f331d4fb2b0ba1e347af0674fa063a
-DIST repo-511a0e54f5801a3f36c00fac478a596d83867d10-bash-completion.sh.base64
4280 BLAKE2B
6c369d36176d5bd4d3f4ed4df39bbd6542022dd186375bd05a978889c574819e3328d19c7dac2982233614786078f73bfd1f0c80aa7c0c6c79bdfab776ed6e39
SHA512
f484bee79c3724a6daf8a69b3df80feef3c6aaad3bfb49443caabc52735dd7f3b0fcb3ad4b7480bc020c9b4cac2f3b044693ef761df6fc9d34e854289baf1f3d
-DIST repo-v2.17-bash-completion.sh.base64 5736 BLAKE2B
59c357d76feb176b7c64791ffb838ab522179c7e05d1a1cca6e121c9c908cdbccc49f177951986470806302b881b39ab44710b66b0a6a8c9643d4a647841eddf
SHA512
9bc4f57d5897f53e6dcbed1b895e8d0a90558be58a423243c886cb5cfad11c32e7c599b2e237e3f53b2857f8441ddb476484189135b71f52ca7250dfaf62
diff --git a/dev-vcs/repo/repo-2.15.ebuild b/dev-vcs/repo/repo-2.15.ebuild
deleted file mode 100644
index 583e55b6f0eb..
--- a/dev-vcs/repo/repo-2.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project. The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 python-r1
-
-# This file rarely changes, so track it independently.
-COMP_VER="511a0e54f5801a3f36c00fac478a596d83867d10"
-COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo;
-SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}
-
https://gerrit.googlesource.com/git-repo/+/${COMP_VER}/completion.bash?format=TEXT
-> ${COMP_NAME}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 ~sparc x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- !app-admin/radmind
- !dev-util/repo"
-
-S=${WORKDIR}
-
-src_unpack() {
- base64 -d <"${DISTDIR}/${COMP_NAME}" >completion.bash || die
-}
-
-src_install() {
- python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
- newbashcomp completion.bash ${PN}
-}
diff --git a/dev-vcs/repo/repo-2.17.ebuild b/dev-vcs/repo/repo-2.17.ebuild
deleted file mode 100644
index 413247ecffe0..
--- a/dev-vcs/repo/repo-2.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: The ${PV} tracks the *repo launcher version*, not the last signed release
-# of the repo project. The launcher only gets a new update when changes are
-# made in it.
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 python-r1
-
-# This file rarely changes, so track it independently.
-COMP_VER="v2.17"
-COMP_NAME="${PN}-${COMP_VER}-bash-completion.sh.base64"
-
-DESCRIPTION="Google tool for managing git, particularly multiple repos"
-HOMEPAGE="https://gerrit.googlesource.com/git-repo;
-SRC_URI="https://storage.googleapis.com/git-repo-down
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrome-remote-desktop/
commit: 4d52b38d0832ab6d45cf0bd8815f1b80ba2e258d
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jun 22 14:18:12 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jun 22 14:30:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d52b38d
net-misc/chrome-remote-desktop: drop old 96 version
Signed-off-by: Mike Frysinger gentoo.org>
net-misc/chrome-remote-desktop/Manifest| 1 -
.../chrome-remote-desktop-96.0.4664.9.ebuild | 144 -
2 files changed, 145 deletions(-)
diff --git a/net-misc/chrome-remote-desktop/Manifest
b/net-misc/chrome-remote-desktop/Manifest
index 1afddd1eabab..d7024ac1184f 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,2 +1 @@
-DIST chrome-remote-desktop_96.0.4664.9_amd64.deb 62383372 BLAKE2B
b7ac12e2f1c16781225b9c74e558e51d817aad5de2d953d94a06d5d3fa0d937dd317f7157c770e01a91c249f0192542da67911899014360c6fadd252bf0908ae
SHA512
86d4ac9b15da2b29f7245866dbc78a131c6aad8efb8ac4f150935afdd5ad95e8f2bc4a59cda52849c96aadaa869b05f9eb7a5cdfda711358e5055e08cf9fbd79
DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B
4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb
SHA512
71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65
diff --git
a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
b/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
deleted file mode 100644
index 65b1951d7a70..
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-96.0.4664.9.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
-# Fetch the Release file:
-# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
-# Which gives you the Packages file:
-#
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
-#
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
-# And finally gives you the file name:
-#
pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
-#
-# Use curl to find the answer:
-# curl -q
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
| grep ^Filename
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit unpacker python-single-r1 optfeature plocale
-
-DESCRIPTION="access remote computers via Chrome!"
-PLUGIN_URL="https://chrome.google.com/remotedesktop;
-HOMEPAGE="https://support.google.com/chrome/answer/1649523
- https://chrome.google.com/remotedesktop;
-BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV};
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="bindist mirror"
-
-# Packages we execute, but don't link.
-RDEPEND="app-admin/sudo
- ${PYTHON_DEPS}"
-# All the libs this package links against.
-RDEPEND+="
- >=dev-libs/expat-2
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
- gnome-base/gconf:2
- media-libs/fontconfig
- media-libs/freetype:2
- sys-apps/dbus
- sys-devel/gcc
- sys-libs/glibc
- sys-libs/pam
- x11-apps/xdpyinfo
- x11-apps/setxkbmap
- x11-libs/cairo
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libxkbcommon
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/pango"
-# Settings we just need at runtime.
-# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of
xvfb.
-# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before
being checked.
-# - The Xorg invocation uses absolute paths with -logfile & -config which are
rejected.
-# - The config takes over the active display in addition to starting up a
virtual one.
-RDEPEND+="
- x11-base/xorg-server[xvfb]"
-DEPEND="$(unpacker_src_uri_depends)"
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
-
-PATCHES=(
- "
[gentoo-commits] repo/gentoo:master commit in: net-misc/chrome-remote-desktop/
commit: 8959dcb179202320432306ace748dc828a6f8f2f
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jun 22 14:23:56 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jun 22 14:29:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8959dcb1
net-misc/chrome-remote-desktop: version bump to 103.0.5060.46 #845345
Closes: https://bugs.gentoo.org/845345
Signed-off-by: Mike Frysinger gentoo.org>
net-misc/chrome-remote-desktop/Manifest| 1 +
.../chrome-remote-desktop-103.0.5060.46.ebuild | 144 +
2 files changed, 145 insertions(+)
diff --git a/net-misc/chrome-remote-desktop/Manifest
b/net-misc/chrome-remote-desktop/Manifest
index d7024ac1184f..1231114de2f9 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1 +1,2 @@
+DIST chrome-remote-desktop_103.0.5060.46_amd64.deb 18955612 BLAKE2B
048bd46e19f61a15f9c114608677c1ba41aa256be471d8f6925c98e806fc362ae2833dcf843b271ec6409f2cd2be6182be7d82c2f3170f866c3f6aecc29323b7
SHA512
a78aa8cb50c1aaa5db2393a5cc1de09b98d5edae16a257f3f654e488f0383844c9eeeb6a2fc8d645e32f07a0dc3b05ec45143a4cc792576743b4a2db2cb6bd0f
DIST chrome-remote-desktop_99.0.4844.11_amd64.deb 16817980 BLAKE2B
4784fb597722ee8abe3d073c7c2a0c1d1e9796e5c6df9935a2b5d2c4d6ee3629738c0bbfd6528a45b85b95ee192b5760b5137b7d89bd543d5c43d56fd9a030bb
SHA512
71c621d1484f80b07b04637b1472baa1072b726109f9786ceabb1393bc1ebd3fe90c546d695871924a3a243840c87e35de78ff07598fbe6f3fe9fcb22b335b65
diff --git
a/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
new file mode 100644
index ..489accba4990
--- /dev/null
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-103.0.5060.46.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
+# Fetch the Release file:
+# https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/Release
+# Which gives you the Packages file:
+#
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages
+#
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
+# And finally gives you the file name:
+#
pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
+#
+# Use curl to find the answer:
+# curl -q
https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages
| grep ^Filename
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he
hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
sw ta te th tr uk vi zh_CN zh_TW"
+
+inherit unpacker python-single-r1 optfeature plocale
+
+DESCRIPTION="access remote computers via Chrome!"
+PLUGIN_URL="https://chrome.google.com/remotedesktop;
+HOMEPAGE="https://support.google.com/chrome/answer/1649523
+ https://chrome.google.com/remotedesktop;
+BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV};
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="bindist mirror"
+
+# Packages we execute, but don't link.
+RDEPEND="app-admin/sudo
+ ${PYTHON_DEPS}"
+# All the libs this package links against.
+RDEPEND+="
+ >=dev-libs/expat-2
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ $(python_gen_cond_dep 'dev-python/psutil[${PYTHON_USEDEP}]')
+ gnome-base/gconf:2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ sys-apps/dbus
+ sys-devel/gcc
+ sys-libs/glibc
+ sys-libs/pam
+ x11-apps/xdpyinfo
+ x11-apps/setxkbmap
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libxkbcommon
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/pango"
+# Settings we just need at runtime.
+# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of
xvfb.
+# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before
being checked.
+# - The Xorg invocation uses absolute paths with -logfile & -config which are
rejected.
+# - The config takes over the active display in addition to starting up a
virtual one.
+RDEPEND+="
+ x11-base/xorg-server[xvfb]"
+DEPEND="$(unpacker_src_uri_depends)"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/google/chrome-remo
[gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/
commit: 30db806ab5e70d168ef232ec64eb4b86dc3c5f03
Author: Mike Frysinger gentoo org>
AuthorDate: Sun Mar 20 02:49:18 2022 +
Commit: Mike Frysinger gentoo org>
CommitDate: Sun Mar 20 02:49:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30db806a
sys-libs/timezone-data: bump to 2022a
Signed-off-by: Mike Frysinger gentoo.org>
sys-libs/timezone-data/Manifest | 2 +
sys-libs/timezone-data/timezone-data-2022a.ebuild | 196 ++
2 files changed, 198 insertions(+)
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 628049e5ff6c..ad9ae9926fab 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,4 +1,6 @@
DIST tzcode2021a.tar.gz 262204 BLAKE2B
4072685f2344602ffcfe32a7bf92d3b0d93e38ffca842f1c07a60db5e26f1f18ab32fc7b5f155b0bdab49f8d0bfcd5b58f4a192b4d06d7d9639893e5cb596328
SHA512
bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
DIST tzcode2021e.tar.gz 273644 BLAKE2B
3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680
SHA512
87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
+DIST tzcode2022a.tar.gz 275632 BLAKE2B
f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070
SHA512
3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
DIST tzdata2021a.tar.gz 411892 BLAKE2B
b8d177e90e22bd8a3fd23c9a9c19896cb245efd8e768b59ab8c63e56ab141e67331f3231e3a7c802f844375049cfd902e14e912ce677b3aea38fc0d968905e87
SHA512
7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
DIST tzdata2021e.tar.gz 422509 BLAKE2B
e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75
SHA512
c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
+DIST tzdata2022a.tar.gz 425833 BLAKE2B
0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0
SHA512
542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
diff --git a/sys-libs/timezone-data/timezone-data-2022a.ebuild
b/sys-libs/timezone-data/timezone-data-2022a.ebuild
new file mode 100644
index ..656c7f532b86
--- /dev/null
+++ b/sys-libs/timezone-data/timezone-data-2022a.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs flag-o-matic
+
+code_ver=${PV}
+data_ver=${PV}
+DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities
(tzselect/zic/zdump)"
+HOMEPAGE="https://www.iana.org/time-zones;
+SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
+
https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz;
+
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls leaps-timezone zic-slim"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}
+ !sys-libs/glibc[vanilla(+)]"
+
+src_unpack() {
+ mkdir -p "${S}" && cd "${S}" || die
+ default
+}
+
+src_prepare() {
+ default
+
+ # check_web contacts validator.w3.org
+ sed -i -e 's/check_tables check_web/check_tables/g' \
+ Makefile || die "Failed to disable check_web"
+
+ tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
+}
+
+src_configure() {
+ tc-export CC
+
+ append-lfs-flags #471102
+
+ if use elibc_Darwin ; then
+ append-cppflags -DSTD_INSPIRED #138251
+ fi
+
+ append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
+
+ # Upstream default is 'slim', but it breaks quite a few programs
+ # that parse /etc/localtime directly: bug# 747538.
+ append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
+
+ LDLIBS=""
+ if use nls ; then
+ # See if an external libintl is available. #154181 #578424
+ local c="${T}/test"
+ echo 'main(){}' > "${c}.c&
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-tools/
commit: 47733f81d004a097a468b2aca1b8b0a7ddd8b7bc Author: Mike Frysinger chromium org> AuthorDate: Tue Mar 15 22:26:01 2022 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Mar 15 22:26:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47733f81 dev-util/android-tools: update old site links Signed-off-by: Mike Frysinger gentoo.org> dev-util/android-tools/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/android-tools/metadata.xml b/dev-util/android-tools/metadata.xml index 602daeb0b395..3eaea76d509f 100644 --- a/dev-util/android-tools/metadata.xml +++ b/dev-util/android-tools/metadata.xml @@ -2,9 +2,9 @@ https://www.gentoo.org/dtd/metadata.dtd;> - https://code.google.com/p/android/issues/list - https://android.googlesource.com/platform/system/core.git/+log/HEAD - https://android.googlesource.com/platform/system/core.git/+/master/adb/OVERVIEW.TXT + https://source.android.com/setup/contribute/report-bugs + https://android.googlesource.com/platform/packages/modules/adb/+log + https://android.googlesource.com/platform/packages/modules/adb/+/HEAD/OVERVIEW.TXT cpe:/a:google:android_debug_bridge android/platform_system_core ubuntu
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/gtest/
commit: 36f80c8d6fd4e78ec8359e82942b33663c250bf8 Author: Mike Frysinger chromium org> AuthorDate: Tue Mar 15 22:21:01 2022 + Commit: Mike Frysinger gentoo org> CommitDate: Tue Mar 15 22:21:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f80c8d dev-cpp/gtest: update old docs link Signed-off-by: Mike Frysinger gentoo.org> dev-cpp/gtest/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-cpp/gtest/metadata.xml b/dev-cpp/gtest/metadata.xml index c870874aadca..2a73b6d6508d 100644 --- a/dev-cpp/gtest/metadata.xml +++ b/dev-cpp/gtest/metadata.xml @@ -10,7 +10,7 @@ Proxy Maintainers - https://github.com/google/googletest/tree/master/googletest/docs + https://github.com/google/googletest/tree/HEAD/docs google/googletest
