mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-22 10:57:07 -08:00
sys-apps/modutils: Remove last-rited pkg
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -569,7 +569,6 @@ dev-vcs/git-bz
|
||||
# modutils is obsolete and does not build.
|
||||
# No consumers in the tree.
|
||||
# Removal in 30 days.
|
||||
sys-apps/modutils
|
||||
virtual/modutils
|
||||
|
||||
# Hans de Graaff <graaff@gentoo.org> (2020-08-07)
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DIST modutils-2.4.27.tar.bz2 234963 BLAKE2B bc5d91554906d15c258bf27f9b3f28bcc1fdc13413ebcece0f763d28d70f61cc27243fc20eb72e2f28d90cac8f19fccdfd633ea978a0f6c809d10eaea83c24d1 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d
|
||||
@@ -1,37 +0,0 @@
|
||||
Taken from Debian.
|
||||
|
||||
Build with newer flex versions.
|
||||
|
||||
--- modutils-2.4.27.0.orig/genksyms/lex.l
|
||||
+++ modutils-2.4.27.0/genksyms/lex.l
|
||||
@@ -130,6 +130,7 @@
|
||||
|
||||
static int suppress_type_lookup, dont_want_brace_phrase;
|
||||
static struct string_list *next_node;
|
||||
+ static int next_token = 0;
|
||||
|
||||
int token, count = 0;
|
||||
struct string_list *cur_node;
|
||||
@@ -144,7 +145,12 @@
|
||||
}
|
||||
|
||||
repeat:
|
||||
- token = yylex1();
|
||||
+ if (next_token != 0) {
|
||||
+ token = next_token;
|
||||
+ next_token = 0;
|
||||
+ }
|
||||
+ else
|
||||
+ token = yylex1();
|
||||
|
||||
if (token == 0)
|
||||
return 0;
|
||||
@@ -425,7 +431,7 @@
|
||||
{
|
||||
/* Put back the token we just read so's we can find it again
|
||||
after registering the expression. */
|
||||
- unput(token);
|
||||
+ next_token = token;
|
||||
|
||||
lexstate = ST_NORMAL;
|
||||
token = EXPRESSION_PHRASE;
|
||||
@@ -1,280 +0,0 @@
|
||||
Fix building with newer gcc versions.
|
||||
|
||||
Most changes taken from Debian.
|
||||
|
||||
--- a/obj/obj_ia64.c
|
||||
+++ b/obj/obj_ia64.c
|
||||
@@ -127,6 +127,7 @@
|
||||
return (*(bundle + 1) >> 23) & 0x1ffffffffff;
|
||||
|
||||
default:
|
||||
+ ;
|
||||
}
|
||||
return (-1);
|
||||
}
|
||||
--- a/depmod/depmod.c
|
||||
+++ b/depmod/depmod.c
|
||||
@@ -1133,7 +1133,7 @@
|
||||
|
||||
for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
|
||||
if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
|
||||
- ((char *)ksym->name) += 8;
|
||||
+ ksym->name = ((char *)ksym->name) + 8;
|
||||
assert(n_syms < MAX_MAP_SYM);
|
||||
symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
|
||||
}
|
||||
@@ -1265,7 +1265,7 @@
|
||||
* error. Use the error() routine but do not count
|
||||
* any errors. Remove in 2.5.
|
||||
*/
|
||||
- int save_errors = errors;
|
||||
+ int save_errors = error_count;
|
||||
if (!quiet && nberr == 0)
|
||||
error("*** Unresolved symbols in %s",
|
||||
ptmod->name);
|
||||
@@ -1274,7 +1274,7 @@
|
||||
nberr++;
|
||||
if (flag_unresolved_error)
|
||||
ret = 1;
|
||||
- errors = save_errors;
|
||||
+ error_count = save_errors;
|
||||
}
|
||||
}
|
||||
verbose("%s\n", ptmod->name + skipchars);
|
||||
@@ -1675,6 +1675,6 @@
|
||||
#else
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
- return depmod_main(argc, argv) || errors;
|
||||
+ return depmod_main(argc, argv) || error_count;
|
||||
}
|
||||
#endif /* defined(COMMON_3264) && defined(ONLY_32) */
|
||||
--- a/genksyms/genksyms.c
|
||||
+++ b/genksyms/genksyms.c
|
||||
@@ -45,7 +45,7 @@
|
||||
int flag_debug, flag_dump_defs, flag_warnings;
|
||||
int checksum_version = 1, kernel_version = version(2,0,0);
|
||||
|
||||
-static int errors;
|
||||
+static int num_errors;
|
||||
static int nsyms;
|
||||
|
||||
static struct symbol *expansion_trail;
|
||||
@@ -458,7 +458,7 @@
|
||||
va_end(args);
|
||||
putc('\n', stderr);
|
||||
|
||||
- errors++;
|
||||
+ num_errors++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -476,7 +476,7 @@
|
||||
va_end(args);
|
||||
putc('\n', stderr);
|
||||
|
||||
- errors++;
|
||||
+ num_errors++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -597,5 +597,5 @@
|
||||
nsyms, HASH_BUCKETS, (double)nsyms / (double)HASH_BUCKETS);
|
||||
}
|
||||
|
||||
- return errors != 0;
|
||||
+ return num_errors != 0;
|
||||
}
|
||||
--- a/include/util.h
|
||||
+++ b/include/util.h
|
||||
@@ -39,8 +39,8 @@
|
||||
extern int xftw(const char *directory, xftw_func_t);
|
||||
|
||||
/* Error logging */
|
||||
-extern int log;
|
||||
-extern int errors;
|
||||
+extern int logging;
|
||||
+extern int error_count;
|
||||
extern const char *error_file;
|
||||
|
||||
extern int flag_verbose;
|
||||
--- a/insmod/insmod.c
|
||||
+++ b/insmod/insmod.c
|
||||
@@ -275,7 +275,7 @@
|
||||
if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
|
||||
gplonly_seen = 1;
|
||||
if (gpl)
|
||||
- ((char *)s->name) += 8;
|
||||
+ s->name = ((char *)s->name) + 8;
|
||||
else
|
||||
continue;
|
||||
}
|
||||
@@ -1679,7 +1679,7 @@
|
||||
error_file = "insmod";
|
||||
|
||||
/* To handle repeated calls from combined modprobe */
|
||||
- errors = optind = 0;
|
||||
+ error_count = optind = 0;
|
||||
|
||||
/* Process the command line. */
|
||||
while ((o = getopt_long(argc, argv, "fhkLmnpqrsSvVxXyYNe:o:O:P:R:",
|
||||
@@ -2064,7 +2064,7 @@
|
||||
goto out;
|
||||
/**** No symbols or sections to be changed after kallsyms above ***/
|
||||
|
||||
- if (errors)
|
||||
+ if (error_count)
|
||||
goto out;
|
||||
|
||||
/* If we were just checking, we made it. */
|
||||
@@ -2123,10 +2123,10 @@
|
||||
test_read.m.read_start = m_addr + sizeof(struct module);
|
||||
test_read.m.read_end = test_read.m.read_start + sizeof(test_read.data);
|
||||
if (sys_init_module(m_name, (struct module *) &test_read)) {
|
||||
- int old_errors = errors;
|
||||
+ int old_errors = error_count;
|
||||
error("has persistent data but the kernel is too old to support it."
|
||||
" Expect errors during rmmod as well");
|
||||
- errors = old_errors;
|
||||
+ error_count = old_errors;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2152,7 +2152,7 @@
|
||||
#else
|
||||
init_module(m_name, f, m_size, blob_name, noload, flag_load_map);
|
||||
#endif
|
||||
- if (errors) {
|
||||
+ if (error_count) {
|
||||
if (!noload)
|
||||
delete_module(m_name);
|
||||
goto out;
|
||||
--- a/insmod/kallsyms.c
|
||||
+++ b/insmod/kallsyms.c
|
||||
@@ -80,7 +80,7 @@
|
||||
error_file = "kallsyms";
|
||||
|
||||
/* To handle repeated calls from combined modprobe */
|
||||
- errors = optind = 0;
|
||||
+ error_count = optind = 0;
|
||||
|
||||
/* Process the command line. */
|
||||
while ((c = getopt_long(argc, argv, "Vh",
|
||||
--- a/insmod/modprobe.c
|
||||
+++ b/insmod/modprobe.c
|
||||
@@ -1023,7 +1023,7 @@
|
||||
if (quiet)
|
||||
my_argv[my_argc++] = "-q";
|
||||
|
||||
- if (log)
|
||||
+ if (logging)
|
||||
my_argv[my_argc++] = "-s";
|
||||
|
||||
if (insmod_opt) {
|
||||
--- a/insmod/rmmod.c
|
||||
+++ b/insmod/rmmod.c
|
||||
@@ -261,9 +261,9 @@
|
||||
read_parm.m.read_start = mp->sym->value;
|
||||
read_parm.m.read_end = read_parm.m.read_start + datasize;
|
||||
if (sys_init_module(module, (struct module *) &read_parm)) {
|
||||
- int old_errors = errors;
|
||||
+ int old_errors = error_count;
|
||||
error("has persistent data but the kernel is too old to support it.");
|
||||
- errors = old_errors;
|
||||
+ error_count = old_errors;
|
||||
return(0);
|
||||
}
|
||||
|
||||
--- a/util/logger.c
|
||||
+++ b/util/logger.c
|
||||
@@ -31,10 +31,10 @@
|
||||
|
||||
/*======================================================================*/
|
||||
|
||||
-int log;
|
||||
+int logging;
|
||||
static int silent;
|
||||
|
||||
-int errors;
|
||||
+int error_count;
|
||||
const char *error_file;
|
||||
const char *program_name;
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
if (silent)
|
||||
;
|
||||
- else if (log) {
|
||||
+ else if (logging) {
|
||||
char buf[2*PATH_MAX];
|
||||
int n;
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
putc('\n', stderr);
|
||||
}
|
||||
|
||||
- errors++;
|
||||
+ error_count++;
|
||||
}
|
||||
|
||||
void lprintf(const char *fmt,...)
|
||||
@@ -108,7 +108,7 @@
|
||||
va_list args;
|
||||
|
||||
if (silent);
|
||||
- else if (log) {
|
||||
+ else if (logging) {
|
||||
char buf[2*PATH_MAX];
|
||||
va_start(args, fmt);
|
||||
vsnprintf(buf, sizeof(buf), fmt, args);
|
||||
@@ -132,5 +132,5 @@
|
||||
#ifdef STOREMSG
|
||||
atexit(dumpmsg);
|
||||
#endif
|
||||
- log = 1;
|
||||
+ logging = 1;
|
||||
}
|
||||
--- a/obj/obj_kallsyms.c
|
||||
+++ b/obj/obj_kallsyms.c
|
||||
@@ -200,8 +200,8 @@
|
||||
|
||||
/* Initial contents, header + one entry per input section. No strings. */
|
||||
osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
|
||||
- a_hdr = (struct kallsyms_header *) osec->contents =
|
||||
- xmalloc(osec->header.sh_size);
|
||||
+ osec->contents = xmalloc(osec->header.sh_size);
|
||||
+ a_hdr = (struct kallsyms_header *) osec->contents;
|
||||
memset(osec->contents, 0, osec->header.sh_size);
|
||||
a_hdr->size = sizeof(*a_hdr);
|
||||
a_hdr->sections = loaded;
|
||||
@@ -275,8 +275,8 @@
|
||||
a_hdr->symbol_off +
|
||||
a_hdr->symbols*a_hdr->symbol_size +
|
||||
strings_size - strings_left;
|
||||
- a_hdr = (struct kallsyms_header *) osec->contents =
|
||||
- xrealloc(a_hdr, a_hdr->total_size);
|
||||
+ osec->contents = xrealloc(a_hdr, a_hdr->total_size);
|
||||
+ a_hdr = (struct kallsyms_header *) osec->contents;
|
||||
p = (char *)a_hdr + a_hdr->symbol_off;
|
||||
memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
|
||||
free(symbols);
|
||||
--- a/obj/obj_ppc.c
|
||||
+++ b/obj/obj_ppc.c
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <obj.h>
|
||||
#include <util.h>
|
||||
#include <assert.h>
|
||||
+#include <stdlib.h>
|
||||
|
||||
|
||||
/*======================================================================*/
|
||||
@@ -255,7 +256,8 @@
|
||||
archdata_sec->header.sh_size = 0;
|
||||
sec = obj_find_section(f, "__ftr_fixup");
|
||||
if (sec) {
|
||||
- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
|
||||
+ archdata_sec->contents = xmalloc(sizeof(*ad));
|
||||
+ ad = (struct archdata *) (archdata_sec->contents);
|
||||
memset(ad, 0, sizeof(*ad));
|
||||
archdata_sec->header.sh_size = sizeof(*ad);
|
||||
ad->__start___ftr_fixup = sec->header.sh_addr;
|
||||
@@ -1,43 +0,0 @@
|
||||
Patch by the PaX team to get rid of executable stacks.
|
||||
|
||||
--- modutils/insmod/insmod.c
|
||||
+++ modutils/insmod/insmod.c
|
||||
@@ -366,18 +366,21 @@ static void hide_special_symbols(struct
|
||||
sym->info = ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
|
||||
}
|
||||
|
||||
+static struct obj_file *load_map_file;
|
||||
+
|
||||
+static int load_map_cmp(const void *a, const void *b) {
|
||||
+ struct obj_symbol **as = (struct obj_symbol **) a;
|
||||
+ struct obj_symbol **bs = (struct obj_symbol **) b;
|
||||
+ unsigned long aa = obj_symbol_final_value(load_map_file, *as);
|
||||
+ unsigned long ba = obj_symbol_final_value(load_map_file, *bs);
|
||||
+ return aa < ba ? -1 : aa > ba ? 1 : 0;
|
||||
+}
|
||||
+
|
||||
static void print_load_map(struct obj_file *f)
|
||||
{
|
||||
struct obj_symbol *sym;
|
||||
struct obj_symbol **all, **p;
|
||||
struct obj_section *sec;
|
||||
- int load_map_cmp(const void *a, const void *b) {
|
||||
- struct obj_symbol **as = (struct obj_symbol **) a;
|
||||
- struct obj_symbol **bs = (struct obj_symbol **) b;
|
||||
- unsigned long aa = obj_symbol_final_value(f, *as);
|
||||
- unsigned long ba = obj_symbol_final_value(f, *bs);
|
||||
- return aa < ba ? -1 : aa > ba ? 1 : 0;
|
||||
- }
|
||||
int i, nsyms, *loaded;
|
||||
|
||||
/* Report on the section layout. */
|
||||
@@ -425,7 +428,9 @@ static void print_load_map(struct obj_fi
|
||||
*p++ = sym;
|
||||
|
||||
/* Sort them by final value. */
|
||||
+ load_map_file = f;
|
||||
qsort(all, nsyms, sizeof(struct obj_file *), load_map_cmp);
|
||||
+ load_map_file = NULL;
|
||||
|
||||
/* And list them. */
|
||||
lprintf("\nSymbols:");
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@@ -1,35 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Standard kernel module utilities for linux-2.4 and older"
|
||||
HOMEPAGE="https://www.kernel.org/pub/linux/utils/kernel/modutils/"
|
||||
SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
|
||||
|
||||
RDEPEND="!sys-apps/module-init-tools
|
||||
!sys-apps/kmod"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc.patch
|
||||
"${FILESDIR}"/${P}-flex.patch
|
||||
"${FILESDIR}"/${P}-no-nested-function.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--prefix=/ \
|
||||
--disable-strip \
|
||||
--enable-insmod-static \
|
||||
--disable-zlib
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstall prefix="${D}"
|
||||
rm -r "${ED}"/usr/share/man/man2 || die
|
||||
dodoc CREDITS ChangeLog NEWS README TODO
|
||||
}
|
||||
Reference in New Issue
Block a user