From f34ab2ba641e6e7f81e1a372d62f278e2a58df69 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 6 Apr 2016 20:20:04 -0400 Subject: [PATCH 01/56] Use java ID for local thread --- Makefile | 10 +- frysk-0.4-per-thread-java-id.patch | 201 +++++++++++++++++++++++++++++ frysk.spec | 7 +- 3 files changed, 212 insertions(+), 6 deletions(-) create mode 100644 frysk-0.4-per-thread-java-id.patch diff --git a/Makefile b/Makefile index 68a0acd..b920ecf 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ # Somewhat superseeded by fedpkg -BRANCH := $(shell git branch | sed -e 's/^\* f*//' -e 's/master/rawhide/' ) +BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/master/rawhide/' -e 's/^\* //p') SPEC_FILE = $(shell fedpkg gimmespec) # VERREL is very slow -VERREL = $(shell fedpkg verrel) -VERREL_WORDS = $(shell fedpkg verrel | sed -e 's/^\(.*\)\-\([^-]*\)\.\([^.]*\)$$/\1 \2 \3/') +VERREL := $(shell fedpkg verrel) +VERREL_WORDS := $(shell fedpkg verrel | sed -e 's/^\(.*\)\-\([^-]*\)\.\([^.]*\)$$/\1 \2 \3/') DIST = $(word 1, $(VERREL_WORDS)) SPEC_VERSION = $(word 2, $(VERREL_WORDS)) SPEC_RELEASE = $(word 3, $(VERREL_WORDS)) @@ -29,8 +29,8 @@ ORDER = \ libglade-java \ frysk -MOCKCFG = fedora-$(BRANCH)-i386 -#MOCKCFG = fedora-$(BRANCH)-x86_64 +#MOCKCFG = fedora-$(BRANCH)-i386 +MOCKCFG = fedora-$(BRANCH)-x86_64 MOCK_WORDS := $(subst -, , $(MOCKCFG)) MOCK_OS := $(word 1,$(MOCK_WORDS)) MOCK_RELEASE := $(word 2,$(MOCK_WORDS)) diff --git a/frysk-0.4-per-thread-java-id.patch b/frysk-0.4-per-thread-java-id.patch new file mode 100644 index 0000000..2d7bf49 --- /dev/null +++ b/frysk-0.4-per-thread-java-id.patch @@ -0,0 +1,201 @@ +--- frysk-0.4/frysk-sys/jnixx/PrintHxxDefinitions.java.jmethodid 2016-04-06 16:06:04.482142069 -0400 ++++ frysk-0.4/frysk-sys/jnixx/PrintHxxDefinitions.java 2016-04-06 16:12:30.247740400 -0400 +@@ -1,5 +1,6 @@ + // This file is part of the program FRYSK. + // ++// Copyright 2016, Andrew Cagney + // Copyright 2008, Red Hat Inc. + // + // FRYSK is free software; you can redistribute it and/or modify it +@@ -75,27 +76,20 @@ + if (isStatic) { + p.println("jclass _class = _class_(_env);"); + } else { +- p.print("if (_class == NULL)"); +- while (p.dent(1, "{", "}")) { +- p.println("_class = _class_(_env);"); +- } ++ p.println("jclass _class = _env.GetObjectClass(_object);"); + } +- p.print("if ("); ++ p.print("jfieldID "); + p.printID(field); +- p.print(" == NULL)"); +- while (p.dent(1, "{", "}")) { +- p.printID(field); +- p.print(" = _env.Get"); +- if (isStatic) { +- p.print("Static"); +- } +- p.print("FieldID(_class, \""); +- p.print(field.getName()); +- p.print("\", \""); +- p.printJniSignature(type); +- p.print("\""); +- p.println(");"); ++ p.print(" = _env.Get"); ++ if (isStatic) { ++ p.print("Static"); + } ++ p.print("FieldID(_class, \""); ++ p.print(field.getName()); ++ p.print("\", \""); ++ p.printJniSignature(type); ++ p.print("\""); ++ p.println(");"); + if (get) { + p.printJniType(type); + p.print(" ret = "); +@@ -135,33 +129,22 @@ + p.printFormalCxxParameters(method, true); + p.print(")"); + while (p.dent(0, "{", "}")) { +- p.print("static jmethodID "); +- p.printID(method); +- p.println(";"); + if (isStatic) { + p.println("jclass _class = _class_(_env);"); ++ } else { ++ p.println("jclass _class = _env.GetObjectClass(_object);"); + } +- p.print("if ("); ++ p.print("jmethodID "); + p.printID(method); +- p.print(" == NULL)"); +- while (p.dent(1, "{", "}")) { +- if (!isStatic) { +- p.print("if (_class == NULL)"); +- while (p.dent(2, "{", "}")) { +- p.println("_class = _class_(_env);"); +- } +- } +- p.printID(method); +- p.print(" = _env.Get"); +- if (isStatic) { +- p.print("Static"); +- } +- p.print("MethodID(_class, \""); +- p.print(method.getName()); +- p.print("\", \""); +- p.printJniSignature(method); +- p.println("\");"); ++ p.print(" = _env.Get"); ++ if (isStatic) { ++ p.print("Static"); + } ++ p.print("MethodID(_class, \""); ++ p.print(method.getName()); ++ p.print("\", \""); ++ p.printJniSignature(method); ++ p.println("\");"); + if (returnType != Void.TYPE) { + if (returnType.isPrimitive()) { + p.printJniType(returnType); +@@ -201,18 +184,11 @@ + p.print(")"); + while (p.dent(0, "{", "}")) { + p.println("jclass _class = _class_(_env);"); +- p.print("static jmethodID "); +- p.printID(constructor); +- p.println(";"); +- p.print("if ("); ++ p.print("jmethodID "); + p.printID(constructor); +- p.print(" == NULL)"); +- while (p.dent(1, "{", "}")) { +- p.printID(constructor); +- p.print(" = _env.GetMethodID(_class, \"\", \"("); +- p.printJniSignature(constructor.getParameterTypes()); +- p.println(")V\");"); +- } ++ p.print(" = _env.GetMethodID(_class, \"\", \"("); ++ p.printJniSignature(constructor.getParameterTypes()); ++ p.println(")V\");"); + p.print("jobject object = _env.NewObject("); + p.printActualJniParameters(constructor); + p.println(");"); +--- frysk-0.4/frysk-sys/jnixx/PrintDeclarations.java.jmethodid 2016-04-06 16:22:40.595194032 -0400 ++++ frysk-0.4/frysk-sys/jnixx/PrintDeclarations.java 2016-04-06 16:25:16.964016994 -0400 +@@ -88,9 +88,6 @@ + } + public void acceptField(Field field) { + p.println(); +- p.print("private: static jfieldID "); +- p.printID(field); +- p.println("; public:"); + printCxxFieldAccessorDeclaration(field, true); + if (!Modifier.isFinal(field.getModifiers())) { + printCxxFieldAccessorDeclaration(field, false); +@@ -143,8 +140,6 @@ + p.printGlobalCxxName(parent); + p.println("() { }"); + } +- // cached per-instance copy - a local-ref +- p.println("private: jclass _class = NULL;"); + // Static get-class method - a class knows its own class. + p.println("public: static inline jclass _class_(::jnixx::env _env);"); + JniBindings.printDeclarations(p, klass); +--- frysk-0.4/frysk-sys/jnixx/PrintCxxDefinitions.java.jmethodid 2016-04-06 16:32:15.056208875 -0400 ++++ frysk-0.4/frysk-sys/jnixx/PrintCxxDefinitions.java 2016-04-06 16:33:01.466564144 -0400 +@@ -137,12 +137,6 @@ + void acceptConstructor(Constructor constructor) { + } + void acceptField(Field field) { +- p.println(); +- p.print("jfieldID "); +- p.printGlobalCxxName(field.getDeclaringClass()); +- p.print("::"); +- p.printID(field); +- p.println(";"); + } + void acceptClass(Class klass) { + } +--- frysk-0.4/frysk-sys/lib/unwind/jni/UnwindH.hxx.jmethodid 2016-04-06 17:23:28.883437146 -0400 ++++ frysk-0.4/frysk-sys/lib/unwind/jni/UnwindH.hxx 2016-04-06 17:30:54.360172075 -0400 +@@ -236,7 +236,7 @@ + // XXX: Need to zero out the cursor, as unw_init_remote doesn't seem + // to do it. + memset(UNW_CURSOR, 0, sizeof(*UNW_CURSOR)); +- unw_init_remote(UNW_CURSOR, UNW_ADDRESS_SPACE, addressSpace._object); ++ unw_init_remote(UNW_CURSOR, UNW_ADDRESS_SPACE, env.NewGlobalRef(addressSpace._object)); + logf(FINE, "createCursor at %lx", (long) UNW_CURSOR); + return (jlong) UNW_CURSOR; + } +@@ -244,6 +244,7 @@ + void + TARGET::destroyCursor(jnixx::env env, jlong unwCursor) { + logf(FINE, "destroyCursor at %lx", (long) UNW_CURSOR); ++ env.DeleteGlobalRef((jobject) unw_get_as_arg(UNW_CURSOR)); + ::free(UNW_CURSOR); + } + +--- frysk-0.4/frysk-imports/libunwind/include/libunwind-common.h.in.unw-get-as-arg 2016-04-06 19:35:50.139996162 -0400 ++++ frysk-0.4/frysk-imports/libunwind/include/libunwind-common.h.in 2016-04-06 19:36:43.594234850 -0400 +@@ -213,6 +213,7 @@ + #define unw_init_remote UNW_OBJ(init_remote) + #define unw_step UNW_OBJ(step) + #define unw_resume UNW_OBJ(resume) ++#define unw_get_as_arg UNW_OBJ(get_as_arg) + #define unw_get_proc_info UNW_OBJ(get_proc_info) + #define unw_get_proc_info_by_ip UNW_OBJ(get_proc_info_by_ip) + #define unw_get_reg UNW_OBJ(get_reg) +@@ -239,6 +240,7 @@ + extern int unw_init_remote (unw_cursor_t *, unw_addr_space_t, void *); + extern int unw_step (unw_cursor_t *); + extern int unw_resume (unw_cursor_t *); ++extern void *unw_get_as_arg (unw_cursor_t *); + extern int unw_get_proc_info (unw_cursor_t *, unw_proc_info_t *); + extern int unw_get_proc_info_by_ip (unw_addr_space_t, unw_word_t, + unw_proc_info_t *, void *); +--- frysk-0.4/frysk-imports/libunwind/src/mi/strerror.c.unw-get-as-arg 2016-04-06 19:44:17.529769760 -0400 ++++ frysk-0.4/frysk-imports/libunwind/src/mi/strerror.c 2016-04-06 19:46:09.822170457 -0400 +@@ -49,3 +49,9 @@ + } + return cp; + } ++ ++void * ++unw_get_as_arg(unw_cursor_t *c) ++{ ++ return tdep_get_as_arg((struct cursor*) c); ++} diff --git a/frysk.spec b/frysk.spec index 2e2ebcd..64b87a4 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite. Name: frysk Version: 0.4 -Release: 45%{?dist} +Release: 47%{?dist} # Fedora 17+ doesn't have libvte et.al. %define enable_gnome %{fedora}0 < 170 @@ -50,6 +50,7 @@ Patch23: frysk-0.4-missing-javah-cni-built.patch Patch24: frysk-0.4-jni.patch Patch25: frysk-0.4-awk-gensub.patch Patch26: frysk-0.4-pic-asm.patch +Patch27: frysk-0.4-per-thread-java-id.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -261,6 +262,7 @@ rm -rf frysk-core/frysk/rt/LineXXX.java %patch24 -p1 -z .jni %patch25 -p1 -z .awk-gensub %patch26 -p1 -z .pic-asm +%patch27 -p1 -z .per-thread-java-id echo "%{version}-%{release}" > frysk-common/version.in @@ -458,6 +460,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Apr 06 2016 Andrew Cagney - 0.4-47 +- Use java ID for local thread + * Mon Aug 17 2015 Andrew Cagney - 0.4.45 - Fix AWK gensub parameter 3; new warning about it is being printed to STDOUT instead of STDERR and, hence, ends up in generated Java files From de99fd1377433f9619aa66d9bb33a02a88f9344a Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 6 Jan 2017 16:35:49 -0500 Subject: [PATCH 02/56] work around evolving gelf_newphdr() interface --- README | 4 ++ frysk-0.4-gelf-newphdr.patch | 98 ++++++++++++++++++++++++++++++++++++ frysk.spec | 7 ++- 3 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-gelf-newphdr.patch diff --git a/README b/README index e946b86..b616b53 100644 --- a/README +++ b/README @@ -1,3 +1,7 @@ +For KOJI, see: + +https://fedoraproject.org/wiki/Infrastructure/Kerberos?rd=Infrastructure_kerberos_authentication + Fixing Fedora: - install fedora-packager diff --git a/frysk-0.4-gelf-newphdr.patch b/frysk-0.4-gelf-newphdr.patch new file mode 100644 index 0000000..3830293 --- /dev/null +++ b/frysk-0.4-gelf-newphdr.patch @@ -0,0 +1,98 @@ +commit cd3f1f8c78b488a30218c8201d4d510e15428965 +Author: Andrew Cagney +Date: Fri Jan 6 16:09:16 2017 -0500 + + Ignore return type of gelf_newphdr() + + At some point it changes from long int to void *. + + Patch: frysk-0.4-gelf-newphdr.patch + +diff --git a/frysk-sys/lib/dwfl/Elf.java b/frysk-sys/lib/dwfl/Elf.java +index 5ac8cd5..0c93dd0 100644 +--- a/frysk-sys/lib/dwfl/Elf.java ++++ b/frysk-sys/lib/dwfl/Elf.java +@@ -1,6 +1,7 @@ + // This file is part of the program FRYSK. + // + // Copyright 2005, 2006, 2007, 2008 Red Hat Inc. ++// Copyright 2017 Andrew Cagney + // + // FRYSK is free software; you can redistribute it and/or modify it + // under the terms of the GNU General Public License as published by +@@ -213,8 +214,8 @@ public class Elf { + * @param count + * @return The program header table + */ +- public int createNewPHeader (long count) { +- return elf_newphdr(count); ++ public void createNewPHeader (long count) { ++ elf_newphdr(count); + } + + /** +@@ -426,7 +427,7 @@ public class Elf { + + protected native int elf_updatephdr(int index, ElfPHeader header); + +- protected native int elf_newphdr (long __cnt); ++ protected native void elf_newphdr (long __cnt); + + protected native long elf_offscn (long offset); + +diff --git a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx +index b4071c7..1e6d294 100644 +--- a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx ++++ b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx +@@ -1,6 +1,7 @@ + // This file is part of the program FRYSK. + // + // Copyright 2005, 2007, 2008, Red Hat Inc. ++// Copyright (C) 2016, Andrew Cagney + // + // FRYSK is free software; you can redistribute it and/or modify it + // under the terms of the GNU General Public License as published by +@@ -405,7 +406,7 @@ lib::dwfl::DwarfDie::get_framebase(jnixx::env env, jlong var_die, + Dwarf_Attribute *fb_attr; + size_t fb_len; + +- if (dwarf_attr_integrate (die, DW_AT_location, &loc_attr) >= 0) { ++ if (dwarf_attr_integrate (die, DW_AT_location, &loc_attr)) { + size_t i = 0; + code = dwarf_getlocation_addr (&loc_attr,pc, &fb_expr, &fb_len, 5); + +@@ -436,7 +437,7 @@ lib::dwfl::DwarfDie::get_data_member_location(jnixx::env env, jlong var_die) { + Dwarf_Op *fb_expr; + size_t fb_len; + +- if (dwarf_attr_integrate (die, DW_AT_data_member_location, &loc_attr) >= 0) { ++ if (dwarf_attr_integrate (die, DW_AT_data_member_location, &loc_attr)) { + dwarf_getlocation (&loc_attr, &fb_expr, &fb_len); + if (fb_len > 0 && fb_expr[0].atom == DW_OP_plus_uconst) + return fb_expr[0].number; +diff --git a/frysk-sys/lib/dwfl/jni/Elf.cxx b/frysk-sys/lib/dwfl/jni/Elf.cxx +index da9d2a9..c22fa58 100644 +--- a/frysk-sys/lib/dwfl/jni/Elf.cxx ++++ b/frysk-sys/lib/dwfl/jni/Elf.cxx +@@ -1,7 +1,7 @@ + // This file is part of the program FRYSK. + // + // Copyright 2005, 2007, 2008, Red Hat Inc. +-// Copyright 2016, Andrew Cagney ++// Copyright 2016-2017, Andrew Cagney + // + // FRYSK is free software; you can redistribute it and/or modify it + // under the terms of the GNU General Public License as published by +@@ -254,10 +254,9 @@ lib::dwfl::Elf::elf_updatephdr(jnixx::env env, jint index, + return ::gelf_update_phdr (elf, index, &header); + } + +- +-jint ++void + lib::dwfl::Elf::elf_newphdr(jnixx::env env, jlong cnt) { +- return (jint) ::gelf_newphdr(ELF_POINTER, (size_t) cnt); ++ ::gelf_newphdr(ELF_POINTER, (size_t) cnt); + } + + jlong diff --git a/frysk.spec b/frysk.spec index ecd969a..1b5aa9f 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 53%{?dist} +Release: 54%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -57,6 +57,7 @@ Patch34: frysk-0.4-libunwind-fstack.patch Patch35: frysk-0.4-clone-cursor.patch Patch36: frysk-0.4-fedpkg-lint-licence.patch Patch37: frysk-0.4-fedpkg-lint-solib.patch +Patch38: frysk-0.4-gelf-newphdr.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -246,6 +247,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch35 -p1 -z .clone-cursor %patch36 -p1 -z .fedpkg-lint-licence %patch37 -p1 -z .fedpkg-lint-solib +%patch38 -p1 -z .gelf-newphdr echo "%{version}-%{release}" > frysk-common/version.in @@ -435,6 +437,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri Jan 6 2017 Andrew Cagney - 0.4-54 +- work around evolving gelf_newphdr() interface + * Tue Apr 19 2016 Andrew Cagney - 0.4-53 - fix some fedpkg lint problems - add frysk-0.4-fedpkg-lint-licence.patch From 6aaf2935c367e1609cd8ea20b89f5a734e4386c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 10:03:13 +0000 Subject: [PATCH 03/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 1b5aa9f..43a4cfb 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 54%{?dist} +Release: 55%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -437,6 +437,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.4-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 6 2017 Andrew Cagney - 0.4-54 - work around evolving gelf_newphdr() interface From 9d4d64a7ef7ee84cb5c2499e5bdf0fab19e208dc Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 10 Feb 2017 21:02:55 -0500 Subject: [PATCH 04/56] fix warnings/errors from latest compilers --- README | 3 +++ frysk-0.4-check-p-not-status.patch | 11 +++++++++++ frysk-0.4-jnixx-signed-unsigned.patch | 11 +++++++++++ frysk.spec | 9 ++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-check-p-not-status.patch create mode 100644 frysk-0.4-jnixx-signed-unsigned.patch diff --git a/README b/README index b616b53..fbae01b 100644 --- a/README +++ b/README @@ -6,6 +6,9 @@ Fixing Fedora: - install fedora-packager +For a local build: + + $ fedpkg compile To do a scratch build: diff --git a/frysk-0.4-check-p-not-status.patch b/frysk-0.4-check-p-not-status.patch new file mode 100644 index 0000000..9b52d69 --- /dev/null +++ b/frysk-0.4-check-p-not-status.patch @@ -0,0 +1,11 @@ +--- frysk-0.4/frysk-sys/frysk/sys/proc/jni/Status.cxx.dist 2017-02-10 18:49:47.680517267 -0500 ++++ frysk-0.4/frysk-sys/frysk/sys/proc/jni/Status.cxx 2017-02-10 18:49:59.424346177 -0500 +@@ -91,7 +91,7 @@ + break; + } + } +- if (state == '\0') ++ if (*p == '\0') + return Status(env, NULL); + + // UID diff --git a/frysk-0.4-jnixx-signed-unsigned.patch b/frysk-0.4-jnixx-signed-unsigned.patch new file mode 100644 index 0000000..2a365be --- /dev/null +++ b/frysk-0.4-jnixx-signed-unsigned.patch @@ -0,0 +1,11 @@ +--- frysk-0.4/frysk-sys/jnixx/Printer.java.dist 2017-02-10 17:14:52.993596017 -0500 ++++ frysk-0.4/frysk-sys/jnixx/Printer.java 2017-02-10 17:15:20.770189841 -0500 +@@ -318,6 +318,8 @@ + || name.equals("xor") + || name.equals("not") + || name.equals("register") ++ || name.equals("signed") ++ || name.equals("unsigned") + ) { + return name + "$"; + } else { diff --git a/frysk.spec b/frysk.spec index 43a4cfb..42bbb4c 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 55%{?dist} +Release: 56%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -58,6 +58,8 @@ Patch35: frysk-0.4-clone-cursor.patch Patch36: frysk-0.4-fedpkg-lint-licence.patch Patch37: frysk-0.4-fedpkg-lint-solib.patch Patch38: frysk-0.4-gelf-newphdr.patch +Patch39: frysk-0.4-jnixx-signed-unsigned.patch +Patch40: frysk-0.4-check-p-not-status.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -248,6 +250,8 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch36 -p1 -z .fedpkg-lint-licence %patch37 -p1 -z .fedpkg-lint-solib %patch38 -p1 -z .gelf-newphdr +%patch39 -p1 -z .jnixx-signed-unsigned +%patch40 -p1 -z .check-p-not-status echo "%{version}-%{release}" > frysk-common/version.in @@ -437,6 +441,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri Feb 10 2017 Andrew Cagney - 0.4-56 +- fix warnings/errors from latest compilers + * Fri Feb 10 2017 Fedora Release Engineering - 0.4-55 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 9a289f69874c8c058a2f766ec97bb6ba0de62b91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:49:10 +0000 Subject: [PATCH 05/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 42bbb4c..ff25d8a 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 56%{?dist} +Release: 57%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -441,6 +441,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.4-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Andrew Cagney - 0.4-56 - fix warnings/errors from latest compilers From cb8c28a7f963fe0061c9e5b19ef584b17d014853 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:49:58 +0000 Subject: [PATCH 06/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index ff25d8a..0864732 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 57%{?dist} +Release: 58%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -441,6 +441,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.4-58 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.4-57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a1d22d3d4109b028475b07b167fe65fbe64af49b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 10:14:39 +0000 Subject: [PATCH 07/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 0864732..4d74269 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 58%{?dist} +Release: 59%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -441,6 +441,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.4-59 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.4-58 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From dcff095a362816dea927956fcc33dfa15b42d38a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:23:39 +0100 Subject: [PATCH 08/56] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- frysk.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 4d74269..1be52c0 100644 --- a/frysk.spec +++ b/frysk.spec @@ -70,7 +70,6 @@ Patch1003: frysk-0.4-nogtkwerror.patch # Use installed elfutils Patch666: frysk-0.4-sodwfl.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: java-devel BuildRequires: junit >= 3.8.1 From 3fdaee2308d2b063dc0716feba76a7f6fcb60ef3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:13:15 +0100 Subject: [PATCH 09/56] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- frysk.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/frysk.spec b/frysk.spec index 1be52c0..2667f37 100644 --- a/frysk.spec +++ b/frysk.spec @@ -339,9 +339,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) From 95de955ac4cb15cbfecd0fa5c832b6e42cf9c332 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Thu, 15 Mar 2018 03:10:14 +0100 Subject: [PATCH 10/56] Update Python 2 dependency declarations to new packaging standards --- frysk.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frysk.spec b/frysk.spec index 2667f37..776835c 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 59%{?dist} +Release: 60%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -80,7 +80,7 @@ BuildRequires: transfig >= 3.2.0 BuildRequires: audit-libs-devel BuildRequires: autoconf automake libtool # Some generation scripts are being written in python -BuildRequires: python +BuildRequires: python2 BuildRequires: elfutils-devel >= 0.151 BuildRequires: jline1 @@ -129,10 +129,10 @@ Group: Development/System Requires: %{name} = %{version}-%{release} %endif %if %{enable_gnome} -Requires: dogtail >= 0.5.2 +Requires: python2-dogtail >= 0.5.2 # Needed by "dogtail-run-headless -n": Requires: metacity -Requires: python +Requires: python2 %endif %if %{enable_devel} @@ -437,6 +437,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Mar 15 2018 Iryna Shcherbina - 0.4-60 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 0.4-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 849fda424e6eab409f79ec3486d09cbb3755422a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:53:55 +0000 Subject: [PATCH 11/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 776835c..68752bd 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 60%{?dist} +Release: 61%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -437,6 +437,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.4-61 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 15 2018 Iryna Shcherbina - 0.4-60 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 55f83a1385ac5c0717556be574ac9165d6cb1b7a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:43 +0200 Subject: [PATCH 12/56] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- frysk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/frysk.spec b/frysk.spec index 68752bd..3fb2575 100644 --- a/frysk.spec +++ b/frysk.spec @@ -71,6 +71,7 @@ Patch1003: frysk-0.4-nogtkwerror.patch Patch666: frysk-0.4-sodwfl.patch +BuildRequires: gcc-c++ BuildRequires: java-devel BuildRequires: junit >= 3.8.1 BuildRequires: antlr >= 2.7.4 From 8129214caffa7adad160a6ee40fca68e436c8160 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 24 Jul 2018 21:29:05 -0400 Subject: [PATCH 13/56] Deal with python 3 --- frysk-0.4-python3.patch | 99 +++++++++++++++++++++++++++++++++++++++++ frysk.spec | 14 +++--- 2 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 frysk-0.4-python3.patch diff --git a/frysk-0.4-python3.patch b/frysk-0.4-python3.patch new file mode 100644 index 0000000..66d51c4 --- /dev/null +++ b/frysk-0.4-python3.patch @@ -0,0 +1,99 @@ +diff --git a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh +index 11e51ed5a..38a40ff97 100644 +--- a/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh ++++ b/frysk-core/frysk/debuginfo/TestTypeFactory.java-sh +@@ -38,4 +38,4 @@ + # version and license this file solely under the GPL without + # exception. + +-python $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx ++python3 $(dirname $0)/gen-type-expect-tests.py frysk/pkglibdir/funit-type-entry.c $(dirname $0)/../pkglibdir/funit-type-class.cxx +diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py +index 6163edcce..f0a81617f 100644 +--- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py ++++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + # This file is part of the program FRYSK. + # +@@ -48,7 +48,7 @@ class j: + def open(self): + self.name = "TestTypeFactory" + def write(self,str): +- print str ++ print(str) + def prologue(self,): + print('''// Generated by gen-type-expect-tests.py + +@@ -145,7 +145,7 @@ public class %s extends TestLib { + ######################################################################## + + def usage (): +- print "Usage " + sys.argv[0] + " <-help> OutputFile File ..." ++ print("Usage " + sys.argv[0] + " <-help> OutputFile File ...") + sys.exit(1) + + def open_file (arg): +@@ -154,7 +154,7 @@ def open_file (arg): + try: + file = open(sys.argv[arg], 'r') + except IOError: +- print (sys.argv[arg] + " not found") ++ print(sys.argv[arg] + " not found") + sys.exit(1) + return file + +@@ -162,18 +162,18 @@ if (len (sys.argv) == 1): + usage() + for t in sys.argv: + if (t == "-help"): +- print "Builds TestTypeFactory*.java from input files, using annotations" +- print "in the input files to describe the data type to be tested." +- print "e.g. Given:" +- print "static struct {" +- print " int int_var;" +- print "} arr_struct [2] = {{1},{2}};" +- print "One would use the annotation:" +- print "// Name: arr_struct" +- print "// Value: {{1},{2}}" +- print "// Type: struct {" +- print "// Type: int int_var;" +- print "// Type: } [2]" ++ print("Builds TestTypeFactory*.java from input files, using annotations") ++ print("in the input files to describe the data type to be tested.") ++ print("e.g. Given:") ++ print("static struct {") ++ print(" int int_var;") ++ print("} arr_struct [2] = {{1},{2}};") ++ print("One would use the annotation:") ++ print("// Name: arr_struct") ++ print("// Value: {{1},{2}}") ++ print("// Type: struct {") ++ print("// Type: int int_var;") ++ print("// Type: } [2]") + usage() + elif (t.startswith("-")): + usage() +diff --git a/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh b/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh +index 2e7ca2e98..00270c9c7 100644 +--- a/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh ++++ b/frysk-core/frysk/pkglibdir/funit-type-entry.c-sh +@@ -1,4 +1,4 @@ + #!/bin/sh + + # main() # marker so this is know to have a main. +-python $(dirname $0)/gen-type-funit-tests.py ++python3 $(dirname $0)/gen-type-funit-tests.py +diff --git a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py +index e7e1b7a50..2de6b5e3d 100644 +--- a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py ++++ b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py +@@ -1,4 +1,5 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 ++ + # This file is part of the program FRYSK. + # + # Copyright 2007, 2008, Red Hat Inc. diff --git a/frysk.spec b/frysk.spec index 3fb2575..2e00b60 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 61%{?dist} +Release: 62%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -60,6 +60,7 @@ Patch37: frysk-0.4-fedpkg-lint-solib.patch Patch38: frysk-0.4-gelf-newphdr.patch Patch39: frysk-0.4-jnixx-signed-unsigned.patch Patch40: frysk-0.4-check-p-not-status.patch +Patch41: frysk-0.4-python3.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -80,8 +81,8 @@ BuildRequires: sharutils BuildRequires: transfig >= 3.2.0 BuildRequires: audit-libs-devel BuildRequires: autoconf automake libtool -# Some generation scripts are being written in python -BuildRequires: python2 +# Some scripts run during the build use python +BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 BuildRequires: jline1 @@ -252,6 +253,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch38 -p1 -z .gelf-newphdr %patch39 -p1 -z .jnixx-signed-unsigned %patch40 -p1 -z .check-p-not-status +%patch41 -p1 -z .python3 echo "%{version}-%{release}" > frysk-common/version.in @@ -337,9 +339,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-exec-alias rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) @@ -438,6 +437,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jul 24 2018 Andrew Cagney - 0.4-62 +- Deal with python 3 + * Fri Jul 13 2018 Fedora Release Engineering - 0.4-61 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4b10a45e48ace016d0d8a6d5e2e5defc30172598 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:44 +0100 Subject: [PATCH 14/56] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- frysk.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/frysk.spec b/frysk.spec index 2e00b60..21b7712 100644 --- a/frysk.spec +++ b/frysk.spec @@ -12,7 +12,6 @@ Release: 62%{?dist} # libunwind is MIT Modern Style with sublicense License: GPLv2 with exceptions and MIT -Group: Development/System URL: http://sourceware.org/frysk Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2 @@ -127,7 +126,6 @@ system. %if %{enable_devel} %package devel Summary: The development part of Frysk -Group: Development/System Requires: %{name} = %{version}-%{release} %endif %if %{enable_gnome} @@ -154,7 +152,6 @@ This package contains the development components of Frysk. %package gnome Summary: The GNOME front-end of Frysk Requires: %{name} = %{version}-%{release} -Group: Development/System Requires: libgconf-java Requires: libglade-java >= 2.12.5 Requires: libvte-java >= 0.12.0 From a5bc6747eec525de4d43cbdd017476ca336dc923 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:14:04 +0000 Subject: [PATCH 15/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 21b7712..9675640 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 62%{?dist} +Release: 63%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -434,6 +434,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.4-63 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 24 2018 Andrew Cagney - 0.4-62 - Deal with python 3 From 80e0cc39793e6de1465479ef3880cf99e040769e Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 15 Feb 2019 12:22:21 -0500 Subject: [PATCH 16/56] Update README cribsheet --- README | 31 ++++++++++++++++++++++++------- frysk.spec | 5 ++++- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/README b/README index fbae01b..d31ebf6 100644 --- a/README +++ b/README @@ -1,21 +1,36 @@ -For KOJI, see: +This week's URLs: -https://fedoraproject.org/wiki/Infrastructure/Kerberos?rd=Infrastructure_kerberos_authentication + The build system: + https://koji.fedoraproject.org/koji/packageinfo?packageID=100 + to login see: + https://fedoraproject.org/wiki/Infrastructure/Kerberos?rd=Infrastructure_kerberos_authentication + i.e., + kinit @FEDORAPROJECT.ORG + klist -A -Fixing Fedora: + The account system, login here first? + https://admin.fedoraproject.org + + The FRYSK package and who is maintaining it: + https://src.fedoraproject.org/rpms/frysk + + Pushing updates (seems to have replaced admin.): + https://bodhi.fedoraproject.org/ + +Fixing Fedora so it can do local and remote builds: - install fedora-packager -For a local build: +For a local native build: $ fedpkg compile -To do a scratch build: +To do a scratch build in the build system: $ fedpkg srpm $ fedpkg scratch-build --srpm BLAH.src.rpm -if you get this: +If you get this: $ fedpkg scratch-build ... Could not execute scratch_build: [('SSL routines', 'SSL3_READ_BYTES', 'sslv3 alert certificate expired'), ('SSL routines', 'SSL3_READ_BYTES', 'ssl handshake failure')] @@ -24,9 +39,11 @@ try this: $ fedora-cert Certificate has expired, getting a new one - FAS Password: + FAS Password: +To build in a local chroot aka mock, start with: + gmake help diff --git a/frysk.spec b/frysk.spec index 9675640..959d591 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 63%{?dist} +Release: 64%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -434,6 +434,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Feb 15 2019 Andrew Cagney - 0.4-64 +- Update README cribsheet + * Thu Jan 31 2019 Fedora Release Engineering - 0.4-63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 5faff897d292a8fea32cfe89a9380f61936b51e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:06:35 +0000 Subject: [PATCH 17/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 959d591..486a4e3 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 64%{?dist} +Release: 65%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -434,6 +434,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.4-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 15 2019 Andrew Cagney - 0.4-64 - Update README cribsheet From 55e8052336961d1bdf5e4a2fbfb58ec23219f684 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 5 Sep 2019 20:17:37 -0400 Subject: [PATCH 18/56] Depend on jline, not jline1 --- frysk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frysk.spec b/frysk.spec index 486a4e3..572d1ff 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 65%{?dist} +Release: 66%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -74,16 +74,16 @@ Patch666: frysk-0.4-sodwfl.patch BuildRequires: gcc-c++ BuildRequires: java-devel BuildRequires: junit >= 3.8.1 -BuildRequires: antlr >= 2.7.4 +BuildRequires: antlr >= 2.7.4 BuildRequires: xmlto BuildRequires: sharutils -BuildRequires: transfig >= 3.2.0 +BuildRequires: transfig >= 3.2.0 BuildRequires: audit-libs-devel BuildRequires: autoconf automake libtool # Some scripts run during the build use python BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 -BuildRequires: jline1 +BuildRequires: jline %if %{enable_gnome} BuildRequires: jdom >= 1.0 @@ -434,6 +434,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Sep 5 2019 Andrew Cagney - 0.4-66 +- Depend on jline, not jline1 + * Thu Jul 25 2019 Fedora Release Engineering - 0.4-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e3410604ae4330203e658bdaa9a4b72c7a6c14c7 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 6 Sep 2019 12:43:36 -0400 Subject: [PATCH 19/56] jline updates Updates for jline(2) Pacify GCC - fix some indentation Default to no 32-bit tests (drop config's --disable-arch32-tests) --- frysk-0.4-disable-arch32-tests.patch | 29 +++ frysk-0.4-jline1-to-jline.patch | 259 +++++++++++++++++++++++++ frysk-0.4-steptester-indentation.patch | 23 +++ frysk.spec | 16 +- 4 files changed, 324 insertions(+), 3 deletions(-) create mode 100644 frysk-0.4-disable-arch32-tests.patch create mode 100644 frysk-0.4-jline1-to-jline.patch create mode 100644 frysk-0.4-steptester-indentation.patch diff --git a/frysk-0.4-disable-arch32-tests.patch b/frysk-0.4-disable-arch32-tests.patch new file mode 100644 index 0000000..dd0b9c6 --- /dev/null +++ b/frysk-0.4-disable-arch32-tests.patch @@ -0,0 +1,29 @@ +commit be258fda95c5a89305aa7a1bf2530d307a293115 +Author: Andrew Cagney +Date: Fri Sep 6 12:24:43 2019 -0400 + + disable arch32 tests by default + + frysk-0.4-disable-arch32-tests.patch + +diff --git a/frysk-common/m4/frysk_do_arch32_test.m4 b/frysk-common/m4/frysk_do_arch32_test.m4 +index 6f8c2a13d..d8b3b7b54 100644 +--- a/frysk-common/m4/frysk_do_arch32_test.m4 ++++ b/frysk-common/m4/frysk_do_arch32_test.m4 +@@ -39,13 +39,9 @@ + AC_DEFUN([FRYSK_DO_ARCH32_TEST], [ + AC_REQUIRE([AC_CANONICAL_TARGET]) + AC_ARG_ENABLE([arch32_tests], +- [AS_HELP_STRING([--disable-arch32-tests], +- [Disable the multiarch testing on 64-bit platforms.])], ++ [AS_HELP_STRING([--enable-arch32-tests], ++ [Enable the multiarch testing on 64-bit platforms.])], + [], +- [dnl The default: +- case $target_cpu in #( +- x86_64|powerpc64|ppc64) enable_arch32_tests=yes;; #( +- *) enable_arch32_tests=no;; +- esac]) ++ [enable_arch32_tests=no]) + AM_CONDITIONAL([DO_ARCH32_TEST], [test "$enable_arch32_tests" = yes]) + ]) diff --git a/frysk-0.4-jline1-to-jline.patch b/frysk-0.4-jline1-to-jline.patch new file mode 100644 index 0000000..dfbac0e --- /dev/null +++ b/frysk-0.4-jline1-to-jline.patch @@ -0,0 +1,259 @@ +diff --git a/frysk-core/configure.ac b/frysk-core/configure.ac +index 49bab9acb..69fc220b3 100644 +--- a/frysk-core/configure.ac ++++ b/frysk-core/configure.ac +@@ -47,7 +47,7 @@ m4_include([common/frysk-common.ac]) + AM_INIT_AUTOMAKE([subdir-objects foreign no-installinfo no-exeext no-dist]) + AC_FIND_FILE([antlr.jar], [/usr/share/java], ANTLR_JAR) + AC_FIND_FILE([junit.jar], [/usr/share/java], JUNIT_JAR) +-AC_FIND_FILE([jline-1.0.jar], [/usr/lib/java/jline1], JLINE_JAR) ++AC_FIND_FILE([jline.jar], [/usr/share/java/jline], JLINE_JAR) + + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java +index 3738a2c0c..5b4d69bb7 100644 +--- a/frysk-core/frysk/bindir/fhpd.java ++++ b/frysk-core/frysk/bindir/fhpd.java +@@ -51,8 +51,8 @@ import java.util.Observable; + import java.util.Observer; + + import frysk.hpd.CLI; +-import jline.Completor; +-import jline.ConsoleReader; ++import jline.console.completer.Completer; ++import jline.console.ConsoleReader; + import frysk.util.FlowControlWriter; + import frysk.proc.Manager; + import frysk.util.CommandlineParser; +@@ -67,9 +67,9 @@ public class fhpd { + private static int exitStatus; + private static String[] params; + +- final static class FhpdCompletor implements Completor { ++ final static class FhpdCompleter implements Completer { + CLI cli; +- public FhpdCompletor (CLI cli) { ++ public FhpdCompleter (CLI cli) { + this.cli = cli; + } + public int complete (String buffer, int cursor, List candidates) { +@@ -108,19 +108,16 @@ public class fhpd { + terminal.getObservable() + .addObserver(new TerminalObserver(writer)); + cli = new CLI("(fhpd) ", writer); +- reader = new ConsoleReader +- (new FileInputStream(java.io.FileDescriptor.in), +- printWriter, +- null, +- terminal); ++ reader = new ConsoleReader(new FileInputStream(java.io.FileDescriptor.in), ++ System.out, terminal); + } catch (IOException ioe) { + System.out.println("ERROR: Could not create a command line"); + System.out.print(ioe.getMessage()); + System.exit(1); + return; + } +- Completor fhpdCompletor = new FhpdCompletor(cli); +- reader.addCompletor(fhpdCompletor); ++ Completer fhpdCompleter = new FhpdCompleter(cli); ++ reader.addCompleter(fhpdCompleter); + } + public void execute() { + start(); +diff --git a/frysk-core/frysk/hpd/CompletionFactory.java b/frysk-core/frysk/hpd/CompletionFactory.java +index 3796a5d60..8e75051c7 100644 +--- a/frysk-core/frysk/hpd/CompletionFactory.java ++++ b/frysk-core/frysk/hpd/CompletionFactory.java +@@ -42,7 +42,7 @@ import java.util.List; + import java.util.Iterator; + import frysk.debuginfo.DebugInfoFrame; + import frysk.proc.Task; +-import jline.FileNameCompletor; ++import jline.console.completer.FileNameCompleter; + import frysk.expr.ExprSearchEngine; + import frysk.expr.ExpressionFactory; + +@@ -99,14 +99,14 @@ class CompletionFactory { + // System.out.println("input.size()=" + input.size()); + if (input.size() == 0) { + int newOffset +- = new FileNameCompletor().complete("", 0, candidates); ++ = new FileNameCompleter().complete("", 0, candidates); + if (newOffset < 0) + return -1; + else + return newOffset + cursor; + } else { + Input.Token incomplete = input.incompleteToken(cursor); +- int newOffset = new FileNameCompletor() ++ int newOffset = new FileNameCompleter() + .complete(incomplete.value, incomplete.end - incomplete.start, + candidates); + return incomplete.absolute(newOffset); +diff --git a/frysk-core/frysk/util/ObservingTerminal.java b/frysk-core/frysk/util/ObservingTerminal.java +index 9cd7025ba..ca14f1a28 100644 +--- a/frysk-core/frysk/util/ObservingTerminal.java ++++ b/frysk-core/frysk/util/ObservingTerminal.java +@@ -39,13 +39,14 @@ + package frysk.util; + + import java.io.*; +-import jline.ConsoleReader; ++import jline.console.ConsoleReader; + + import frysk.sys.FileDescriptor; + + + public class ObservingTerminal +- extends PtyTerminal { ++ extends PtyTerminal ++{ + public class Observable extends java.util.Observable { + private final ObservingTerminal terminal; + Observable(ObservingTerminal terminal) { +@@ -82,35 +83,9 @@ public class ObservingTerminal + super(string); + observable = new Observable(this); + } +- +- public void beforeReadLine(ConsoleReader reader, String prompt, +- Character mask) { +- inputEntered = false; +- observable.setChanged(); +- observable.notifyObservers(); +- super.beforeReadLine(reader, prompt, mask); +- } +- +- public int readVirtualKey(InputStream in) +- throws IOException { +- int result = super.readVirtualKey(in); +- inputEntered = true; +- observable.setChanged(); +- observable.notifyObservers(); +- return result; +- } +- +- +- public void afterReadLine(ConsoleReader reader, String prompt, +- Character mask) { +- inputEntered = false; +- observable.setChanged(); +- observable.notifyObservers(); +- super.afterReadLine(reader, prompt, mask); +- } + + public Observable getObservable() { + return observable; + } +- ++ + } +diff --git a/frysk-core/frysk/util/PtyTerminal.java b/frysk-core/frysk/util/PtyTerminal.java +index 517dd50e9..77c10501f 100644 +--- a/frysk-core/frysk/util/PtyTerminal.java ++++ b/frysk-core/frysk/util/PtyTerminal.java +@@ -43,6 +43,7 @@ import java.io.InputStream; + import java.io.IOException; + + import jline.Terminal; ++import jline.TerminalSupport; + import jline.UnixTerminal; + + import frysk.sys.FileDescriptor; +@@ -56,7 +57,8 @@ import frysk.sys.termios.Termios; + * frysk.sys.termios calls. This copies UnixTerminal pretty closely. + */ + public class PtyTerminal +- extends Terminal ++ extends TerminalSupport ++ implements Terminal + { + private final FileDescriptor fd; + +@@ -67,6 +69,7 @@ public class PtyTerminal + + public PtyTerminal(FileDescriptor fd) + { ++ super(true); + this.fd = fd; + + try +@@ -148,64 +151,21 @@ public class PtyTerminal + termios.set(fd); + } + +- public int readVirtualKey (InputStream in) +- throws IOException +- { +- int c = readCharacter (in); +- +- // in Unix terminals, arrow keys are represented by +- // a sequence of 3 characters. E.g., the up arrow +- // key yields 27, 91, 68 +- if (c == UnixTerminal.ARROW_START) +- { +- c = readCharacter (in); +- if (c == UnixTerminal.ARROW_PREFIX) +- { +- c = readCharacter (in); +- if (c == UnixTerminal.ARROW_UP) +- return CTRL_P; +- else if (c == UnixTerminal.ARROW_DOWN) +- return CTRL_N; +- else if (c == UnixTerminal.ARROW_LEFT) +- return CTRL_B; +- else if (c == UnixTerminal.ARROW_RIGHT) +- return CTRL_F; +- } +- } +- return c; +- } +- +- public boolean isSupported () +- { +- return true; +- } +- +- public boolean getEcho () +- { +- return false; +- } +- + public boolean isEchoEnabled() { + final Termios termios = new Termios(fd); + return termios.get(Local.ECHO_INPUT); + } + +- public void disableEcho() { +- final Termios termios = new Termios(fd); +- termios.set(Local.ECHO_INPUT, false); +- termios.set(fd); +- } +- +- public void enableEcho() { ++ public void setEchoEnabled(boolean enabled) { + final Termios termios = new Termios(fd); +- termios.set(Local.ECHO_INPUT, true); ++ termios.set(Local.ECHO_INPUT, enabled); + termios.set(fd); + } + + /** + * Returns the value of "stty size" width param. + */ +- public int getTerminalWidth() ++ public int getWidth() + { + Size size = fd.getSize(); + return size.getRows(); +@@ -214,7 +174,7 @@ public class PtyTerminal + /** + * Returns the value of "stty size" height param. + */ +- public int getTerminalHeight() ++ public int geteight() + { + Size size = fd.getSize(); + return size.getColumns(); diff --git a/frysk-0.4-steptester-indentation.patch b/frysk-0.4-steptester-indentation.patch new file mode 100644 index 0000000..59620d4 --- /dev/null +++ b/frysk-0.4-steptester-indentation.patch @@ -0,0 +1,23 @@ +commit b824c0a3c51aeae40ad07d2601b8b8348a5e32df +Author: Andrew Cagney +Date: Fri Sep 6 12:28:24 2019 -0400 + + fix fsteptester indentation + + make gcc happy + + frysk-0.4-steptester-indentation.patch + +diff --git a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c +index ccb67d892..0effca488 100644 +--- a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c ++++ b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c +@@ -93,7 +93,7 @@ last () + else + --dummy; // _lineStepIfFailFinish_ + +- return; // _lineStepFunctionReturn_ ++ return; // _lineStepFunctionReturn_ + } + + volatile int a; diff --git a/frysk.spec b/frysk.spec index 572d1ff..a804194 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 66%{?dist} +Release: 67%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -60,6 +60,9 @@ Patch38: frysk-0.4-gelf-newphdr.patch Patch39: frysk-0.4-jnixx-signed-unsigned.patch Patch40: frysk-0.4-check-p-not-status.patch Patch41: frysk-0.4-python3.patch +Patch42: frysk-0.4-jline1-to-jline.patch +Patch43: frysk-0.4-disable-arch32-tests.patch +Patch44: frysk-0.4-steptester-indentation.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -251,6 +254,9 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch39 -p1 -z .jnixx-signed-unsigned %patch40 -p1 -z .check-p-not-status %patch41 -p1 -z .python3 +%patch42 -p1 -z .jline1-to-jline +%patch43 -p1 -z .disable-arch32-tests +%patch44 -p1 -z .steptester-indentation echo "%{version}-%{release}" > frysk-common/version.in @@ -281,8 +287,7 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /} %configure \ CFLAGS="$RPM_OPT_FLAGS" \ - CXXFLAGS="$RPM_OPT_FLAGS" \ - --disable-arch32-tests + CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -434,6 +439,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Sep 5 2019 Andrew Cagney - 0.4-67 +- Updates for jline(2) +- Pacify GCC - fix some indentation +- Default to no 32-bit tests (drop config's --disable-arch32-tests) + * Thu Sep 5 2019 Andrew Cagney - 0.4-66 - Depend on jline, not jline1 From 5ee895d71973b4b48cd98100bd4fe9c3f4c198e6 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 14 Nov 2019 14:52:04 -0500 Subject: [PATCH 20/56] make runtime java dependencies explicit - found by Magnus Glantz --- frysk.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frysk.spec b/frysk.spec index a804194..abb5a4e 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 67%{?dist} +Release: 68%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -73,11 +73,10 @@ Patch1003: frysk-0.4-nogtkwerror.patch # Use installed elfutils Patch666: frysk-0.4-sodwfl.patch - -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: java-devel BuildRequires: junit >= 3.8.1 -BuildRequires: antlr >= 2.7.4 +BuildRequires: antlr-tool >= 2.7.4 BuildRequires: xmlto BuildRequires: sharutils BuildRequires: transfig >= 3.2.0 @@ -88,6 +87,11 @@ BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 BuildRequires: jline +# it seems java requires explict runtime requires!?!? +Requires: junit +Requires: antlr-tool +Requires: jline + %if %{enable_gnome} BuildRequires: jdom >= 1.0 BuildRequires: glib-java >= 0.2.6 @@ -439,6 +443,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Nov 14 2019 Andrew Cagney - 0.4-68 +- make runtime java dependencies explicit - found by Magnus Glantz +- depend on antlr-tool instead of antlr + * Thu Sep 5 2019 Andrew Cagney - 0.4-67 - Updates for jline(2) - Pacify GCC - fix some indentation From c261862558624c8c690649be3e2162c208b2a01a Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 5 Sep 2019 20:17:37 -0400 Subject: [PATCH 21/56] Depend on jline, not jline1 --- frysk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frysk.spec b/frysk.spec index 486a4e3..572d1ff 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 65%{?dist} +Release: 66%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -74,16 +74,16 @@ Patch666: frysk-0.4-sodwfl.patch BuildRequires: gcc-c++ BuildRequires: java-devel BuildRequires: junit >= 3.8.1 -BuildRequires: antlr >= 2.7.4 +BuildRequires: antlr >= 2.7.4 BuildRequires: xmlto BuildRequires: sharutils -BuildRequires: transfig >= 3.2.0 +BuildRequires: transfig >= 3.2.0 BuildRequires: audit-libs-devel BuildRequires: autoconf automake libtool # Some scripts run during the build use python BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 -BuildRequires: jline1 +BuildRequires: jline %if %{enable_gnome} BuildRequires: jdom >= 1.0 @@ -434,6 +434,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Sep 5 2019 Andrew Cagney - 0.4-66 +- Depend on jline, not jline1 + * Thu Jul 25 2019 Fedora Release Engineering - 0.4-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 52c690ef0beb3f464214354988ad49e91fee13e0 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 6 Sep 2019 12:43:36 -0400 Subject: [PATCH 22/56] jline updates Updates for jline(2) Pacify GCC - fix some indentation Default to no 32-bit tests (drop config's --disable-arch32-tests) --- frysk-0.4-disable-arch32-tests.patch | 29 +++ frysk-0.4-jline1-to-jline.patch | 259 +++++++++++++++++++++++++ frysk-0.4-steptester-indentation.patch | 23 +++ frysk.spec | 16 +- 4 files changed, 324 insertions(+), 3 deletions(-) create mode 100644 frysk-0.4-disable-arch32-tests.patch create mode 100644 frysk-0.4-jline1-to-jline.patch create mode 100644 frysk-0.4-steptester-indentation.patch diff --git a/frysk-0.4-disable-arch32-tests.patch b/frysk-0.4-disable-arch32-tests.patch new file mode 100644 index 0000000..dd0b9c6 --- /dev/null +++ b/frysk-0.4-disable-arch32-tests.patch @@ -0,0 +1,29 @@ +commit be258fda95c5a89305aa7a1bf2530d307a293115 +Author: Andrew Cagney +Date: Fri Sep 6 12:24:43 2019 -0400 + + disable arch32 tests by default + + frysk-0.4-disable-arch32-tests.patch + +diff --git a/frysk-common/m4/frysk_do_arch32_test.m4 b/frysk-common/m4/frysk_do_arch32_test.m4 +index 6f8c2a13d..d8b3b7b54 100644 +--- a/frysk-common/m4/frysk_do_arch32_test.m4 ++++ b/frysk-common/m4/frysk_do_arch32_test.m4 +@@ -39,13 +39,9 @@ + AC_DEFUN([FRYSK_DO_ARCH32_TEST], [ + AC_REQUIRE([AC_CANONICAL_TARGET]) + AC_ARG_ENABLE([arch32_tests], +- [AS_HELP_STRING([--disable-arch32-tests], +- [Disable the multiarch testing on 64-bit platforms.])], ++ [AS_HELP_STRING([--enable-arch32-tests], ++ [Enable the multiarch testing on 64-bit platforms.])], + [], +- [dnl The default: +- case $target_cpu in #( +- x86_64|powerpc64|ppc64) enable_arch32_tests=yes;; #( +- *) enable_arch32_tests=no;; +- esac]) ++ [enable_arch32_tests=no]) + AM_CONDITIONAL([DO_ARCH32_TEST], [test "$enable_arch32_tests" = yes]) + ]) diff --git a/frysk-0.4-jline1-to-jline.patch b/frysk-0.4-jline1-to-jline.patch new file mode 100644 index 0000000..dfbac0e --- /dev/null +++ b/frysk-0.4-jline1-to-jline.patch @@ -0,0 +1,259 @@ +diff --git a/frysk-core/configure.ac b/frysk-core/configure.ac +index 49bab9acb..69fc220b3 100644 +--- a/frysk-core/configure.ac ++++ b/frysk-core/configure.ac +@@ -47,7 +47,7 @@ m4_include([common/frysk-common.ac]) + AM_INIT_AUTOMAKE([subdir-objects foreign no-installinfo no-exeext no-dist]) + AC_FIND_FILE([antlr.jar], [/usr/share/java], ANTLR_JAR) + AC_FIND_FILE([junit.jar], [/usr/share/java], JUNIT_JAR) +-AC_FIND_FILE([jline-1.0.jar], [/usr/lib/java/jline1], JLINE_JAR) ++AC_FIND_FILE([jline.jar], [/usr/share/java/jline], JLINE_JAR) + + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +diff --git a/frysk-core/frysk/bindir/fhpd.java b/frysk-core/frysk/bindir/fhpd.java +index 3738a2c0c..5b4d69bb7 100644 +--- a/frysk-core/frysk/bindir/fhpd.java ++++ b/frysk-core/frysk/bindir/fhpd.java +@@ -51,8 +51,8 @@ import java.util.Observable; + import java.util.Observer; + + import frysk.hpd.CLI; +-import jline.Completor; +-import jline.ConsoleReader; ++import jline.console.completer.Completer; ++import jline.console.ConsoleReader; + import frysk.util.FlowControlWriter; + import frysk.proc.Manager; + import frysk.util.CommandlineParser; +@@ -67,9 +67,9 @@ public class fhpd { + private static int exitStatus; + private static String[] params; + +- final static class FhpdCompletor implements Completor { ++ final static class FhpdCompleter implements Completer { + CLI cli; +- public FhpdCompletor (CLI cli) { ++ public FhpdCompleter (CLI cli) { + this.cli = cli; + } + public int complete (String buffer, int cursor, List candidates) { +@@ -108,19 +108,16 @@ public class fhpd { + terminal.getObservable() + .addObserver(new TerminalObserver(writer)); + cli = new CLI("(fhpd) ", writer); +- reader = new ConsoleReader +- (new FileInputStream(java.io.FileDescriptor.in), +- printWriter, +- null, +- terminal); ++ reader = new ConsoleReader(new FileInputStream(java.io.FileDescriptor.in), ++ System.out, terminal); + } catch (IOException ioe) { + System.out.println("ERROR: Could not create a command line"); + System.out.print(ioe.getMessage()); + System.exit(1); + return; + } +- Completor fhpdCompletor = new FhpdCompletor(cli); +- reader.addCompletor(fhpdCompletor); ++ Completer fhpdCompleter = new FhpdCompleter(cli); ++ reader.addCompleter(fhpdCompleter); + } + public void execute() { + start(); +diff --git a/frysk-core/frysk/hpd/CompletionFactory.java b/frysk-core/frysk/hpd/CompletionFactory.java +index 3796a5d60..8e75051c7 100644 +--- a/frysk-core/frysk/hpd/CompletionFactory.java ++++ b/frysk-core/frysk/hpd/CompletionFactory.java +@@ -42,7 +42,7 @@ import java.util.List; + import java.util.Iterator; + import frysk.debuginfo.DebugInfoFrame; + import frysk.proc.Task; +-import jline.FileNameCompletor; ++import jline.console.completer.FileNameCompleter; + import frysk.expr.ExprSearchEngine; + import frysk.expr.ExpressionFactory; + +@@ -99,14 +99,14 @@ class CompletionFactory { + // System.out.println("input.size()=" + input.size()); + if (input.size() == 0) { + int newOffset +- = new FileNameCompletor().complete("", 0, candidates); ++ = new FileNameCompleter().complete("", 0, candidates); + if (newOffset < 0) + return -1; + else + return newOffset + cursor; + } else { + Input.Token incomplete = input.incompleteToken(cursor); +- int newOffset = new FileNameCompletor() ++ int newOffset = new FileNameCompleter() + .complete(incomplete.value, incomplete.end - incomplete.start, + candidates); + return incomplete.absolute(newOffset); +diff --git a/frysk-core/frysk/util/ObservingTerminal.java b/frysk-core/frysk/util/ObservingTerminal.java +index 9cd7025ba..ca14f1a28 100644 +--- a/frysk-core/frysk/util/ObservingTerminal.java ++++ b/frysk-core/frysk/util/ObservingTerminal.java +@@ -39,13 +39,14 @@ + package frysk.util; + + import java.io.*; +-import jline.ConsoleReader; ++import jline.console.ConsoleReader; + + import frysk.sys.FileDescriptor; + + + public class ObservingTerminal +- extends PtyTerminal { ++ extends PtyTerminal ++{ + public class Observable extends java.util.Observable { + private final ObservingTerminal terminal; + Observable(ObservingTerminal terminal) { +@@ -82,35 +83,9 @@ public class ObservingTerminal + super(string); + observable = new Observable(this); + } +- +- public void beforeReadLine(ConsoleReader reader, String prompt, +- Character mask) { +- inputEntered = false; +- observable.setChanged(); +- observable.notifyObservers(); +- super.beforeReadLine(reader, prompt, mask); +- } +- +- public int readVirtualKey(InputStream in) +- throws IOException { +- int result = super.readVirtualKey(in); +- inputEntered = true; +- observable.setChanged(); +- observable.notifyObservers(); +- return result; +- } +- +- +- public void afterReadLine(ConsoleReader reader, String prompt, +- Character mask) { +- inputEntered = false; +- observable.setChanged(); +- observable.notifyObservers(); +- super.afterReadLine(reader, prompt, mask); +- } + + public Observable getObservable() { + return observable; + } +- ++ + } +diff --git a/frysk-core/frysk/util/PtyTerminal.java b/frysk-core/frysk/util/PtyTerminal.java +index 517dd50e9..77c10501f 100644 +--- a/frysk-core/frysk/util/PtyTerminal.java ++++ b/frysk-core/frysk/util/PtyTerminal.java +@@ -43,6 +43,7 @@ import java.io.InputStream; + import java.io.IOException; + + import jline.Terminal; ++import jline.TerminalSupport; + import jline.UnixTerminal; + + import frysk.sys.FileDescriptor; +@@ -56,7 +57,8 @@ import frysk.sys.termios.Termios; + * frysk.sys.termios calls. This copies UnixTerminal pretty closely. + */ + public class PtyTerminal +- extends Terminal ++ extends TerminalSupport ++ implements Terminal + { + private final FileDescriptor fd; + +@@ -67,6 +69,7 @@ public class PtyTerminal + + public PtyTerminal(FileDescriptor fd) + { ++ super(true); + this.fd = fd; + + try +@@ -148,64 +151,21 @@ public class PtyTerminal + termios.set(fd); + } + +- public int readVirtualKey (InputStream in) +- throws IOException +- { +- int c = readCharacter (in); +- +- // in Unix terminals, arrow keys are represented by +- // a sequence of 3 characters. E.g., the up arrow +- // key yields 27, 91, 68 +- if (c == UnixTerminal.ARROW_START) +- { +- c = readCharacter (in); +- if (c == UnixTerminal.ARROW_PREFIX) +- { +- c = readCharacter (in); +- if (c == UnixTerminal.ARROW_UP) +- return CTRL_P; +- else if (c == UnixTerminal.ARROW_DOWN) +- return CTRL_N; +- else if (c == UnixTerminal.ARROW_LEFT) +- return CTRL_B; +- else if (c == UnixTerminal.ARROW_RIGHT) +- return CTRL_F; +- } +- } +- return c; +- } +- +- public boolean isSupported () +- { +- return true; +- } +- +- public boolean getEcho () +- { +- return false; +- } +- + public boolean isEchoEnabled() { + final Termios termios = new Termios(fd); + return termios.get(Local.ECHO_INPUT); + } + +- public void disableEcho() { +- final Termios termios = new Termios(fd); +- termios.set(Local.ECHO_INPUT, false); +- termios.set(fd); +- } +- +- public void enableEcho() { ++ public void setEchoEnabled(boolean enabled) { + final Termios termios = new Termios(fd); +- termios.set(Local.ECHO_INPUT, true); ++ termios.set(Local.ECHO_INPUT, enabled); + termios.set(fd); + } + + /** + * Returns the value of "stty size" width param. + */ +- public int getTerminalWidth() ++ public int getWidth() + { + Size size = fd.getSize(); + return size.getRows(); +@@ -214,7 +174,7 @@ public class PtyTerminal + /** + * Returns the value of "stty size" height param. + */ +- public int getTerminalHeight() ++ public int geteight() + { + Size size = fd.getSize(); + return size.getColumns(); diff --git a/frysk-0.4-steptester-indentation.patch b/frysk-0.4-steptester-indentation.patch new file mode 100644 index 0000000..59620d4 --- /dev/null +++ b/frysk-0.4-steptester-indentation.patch @@ -0,0 +1,23 @@ +commit b824c0a3c51aeae40ad07d2601b8b8348a5e32df +Author: Andrew Cagney +Date: Fri Sep 6 12:28:24 2019 -0400 + + fix fsteptester indentation + + make gcc happy + + frysk-0.4-steptester-indentation.patch + +diff --git a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c +index ccb67d892..0effca488 100644 +--- a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c ++++ b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c +@@ -93,7 +93,7 @@ last () + else + --dummy; // _lineStepIfFailFinish_ + +- return; // _lineStepFunctionReturn_ ++ return; // _lineStepFunctionReturn_ + } + + volatile int a; diff --git a/frysk.spec b/frysk.spec index 572d1ff..a804194 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 66%{?dist} +Release: 67%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -60,6 +60,9 @@ Patch38: frysk-0.4-gelf-newphdr.patch Patch39: frysk-0.4-jnixx-signed-unsigned.patch Patch40: frysk-0.4-check-p-not-status.patch Patch41: frysk-0.4-python3.patch +Patch42: frysk-0.4-jline1-to-jline.patch +Patch43: frysk-0.4-disable-arch32-tests.patch +Patch44: frysk-0.4-steptester-indentation.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -251,6 +254,9 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch39 -p1 -z .jnixx-signed-unsigned %patch40 -p1 -z .check-p-not-status %patch41 -p1 -z .python3 +%patch42 -p1 -z .jline1-to-jline +%patch43 -p1 -z .disable-arch32-tests +%patch44 -p1 -z .steptester-indentation echo "%{version}-%{release}" > frysk-common/version.in @@ -281,8 +287,7 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /} %configure \ CFLAGS="$RPM_OPT_FLAGS" \ - CXXFLAGS="$RPM_OPT_FLAGS" \ - --disable-arch32-tests + CXXFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} @@ -434,6 +439,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Sep 5 2019 Andrew Cagney - 0.4-67 +- Updates for jline(2) +- Pacify GCC - fix some indentation +- Default to no 32-bit tests (drop config's --disable-arch32-tests) + * Thu Sep 5 2019 Andrew Cagney - 0.4-66 - Depend on jline, not jline1 From 526415d8aaeec302023d52aaff7fd84b594e11d6 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 14 Nov 2019 14:52:04 -0500 Subject: [PATCH 23/56] make runtime java dependencies explicit - found by Magnus Glantz --- frysk.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frysk.spec b/frysk.spec index a804194..abb5a4e 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 67%{?dist} +Release: 68%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -73,11 +73,10 @@ Patch1003: frysk-0.4-nogtkwerror.patch # Use installed elfutils Patch666: frysk-0.4-sodwfl.patch - -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: java-devel BuildRequires: junit >= 3.8.1 -BuildRequires: antlr >= 2.7.4 +BuildRequires: antlr-tool >= 2.7.4 BuildRequires: xmlto BuildRequires: sharutils BuildRequires: transfig >= 3.2.0 @@ -88,6 +87,11 @@ BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 BuildRequires: jline +# it seems java requires explict runtime requires!?!? +Requires: junit +Requires: antlr-tool +Requires: jline + %if %{enable_gnome} BuildRequires: jdom >= 1.0 BuildRequires: glib-java >= 0.2.6 @@ -439,6 +443,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Nov 14 2019 Andrew Cagney - 0.4-68 +- make runtime java dependencies explicit - found by Magnus Glantz +- depend on antlr-tool instead of antlr + * Thu Sep 5 2019 Andrew Cagney - 0.4-67 - Updates for jline(2) - Pacify GCC - fix some indentation From 3f3210c0a03caac148039cd3192db9529b040346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:04:50 +0000 Subject: [PATCH 24/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index abb5a4e..5887b7f 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 68%{?dist} +Release: 69%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -443,6 +443,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.4-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 14 2019 Andrew Cagney - 0.4-68 - make runtime java dependencies explicit - found by Magnus Glantz - depend on antlr-tool instead of antlr From 17228d90102af406a830b2b3ada520d56490a693 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 28 Jan 2020 21:32:13 -0500 Subject: [PATCH 25/56] pacify gcc -fcommon --- Makefile | 6 +- frysk-0.4-gcc-fcommon.patch | 132 ++++++++++++++++++++++++++++++++++++ frysk.spec | 7 +- 3 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 frysk-0.4-gcc-fcommon.patch diff --git a/Makefile b/Makefile index 9c79d5a..b7ecc4d 100644 --- a/Makefile +++ b/Makefile @@ -106,9 +106,9 @@ world gnome: done .PHONY:: world -usable: init - $(MOCK) install vi less automake-docs strace -.PHONY:: usable +usable useful: init + $(MOCK) install vi less strace emacs +.PHONY:: usable useful clog prep: fedpkg $@ diff --git a/frysk-0.4-gcc-fcommon.patch b/frysk-0.4-gcc-fcommon.patch new file mode 100644 index 0000000..7591fdf --- /dev/null +++ b/frysk-0.4-gcc-fcommon.patch @@ -0,0 +1,132 @@ +diff --git a/frysk-imports/libunwind/src/Makefile.am b/frysk-imports/libunwind/src/Makefile.am +index c187a9a4c..1f551b953 100644 +--- a/frysk-imports/libunwind/src/Makefile.am ++++ b/frysk-imports/libunwind/src/Makefile.am +@@ -110,7 +110,8 @@ libunwind_la_SOURCES_generic = \ + mi/Gget_reg.c mi/Gset_reg.c \ + mi/Gget_fpreg.c mi/Gset_fpreg.c \ + mi/Gget_unwind_table.c \ +- mi/Gset_caching_policy.c ++ mi/Gset_caching_policy.c \ ++ mi/dyn-info-list.c + + if SUPPORT_CXX_EXCEPTIONS + libunwind_la_SOURCES_local_unwind = \ +@@ -131,7 +132,10 @@ endif + libunwind_la_SOURCES_local_nounwind = \ + $(libunwind_la_SOURCES_os_local) \ + mi/backtrace.c \ +- mi/dyn-cancel.c mi/dyn-info-list.c mi/dyn-register.c \ ++ mi/dyn-cancel.c \ ++ mi/dyn-info-list.c \ ++ mi/dyn-info-list-addr.c \ ++ mi/dyn-register.c \ + mi/Ldyn-extract.c mi/Lfind_dynamic_proc_info.c \ + mi/Lget_accessors.c \ + mi/Lget_proc_info_by_ip.c mi/Lget_proc_name.c \ +diff --git a/frysk-imports/libunwind/src/mi/dyn-info-list-addr.c b/frysk-imports/libunwind/src/mi/dyn-info-list-addr.c +new file mode 100644 +index 000000000..2bde9edc8 +--- /dev/null ++++ b/frysk-imports/libunwind/src/mi/dyn-info-list-addr.c +@@ -0,0 +1,32 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2001-2002, 2005 Hewlett-Packard Co ++ Contributed by David Mosberger-Tang ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#include "libunwind_i.h" ++ ++PROTECTED unw_word_t ++_U_dyn_info_list_addr (void) ++{ ++ return (unw_word_t) (uintptr_t) &_U_dyn_info_list; ++} +diff --git a/frysk-imports/libunwind/src/mi/dyn-info-list.c b/frysk-imports/libunwind/src/mi/dyn-info-list.c +index 1a0790d36..69e4998ea 100644 +--- a/frysk-imports/libunwind/src/mi/dyn-info-list.c ++++ b/frysk-imports/libunwind/src/mi/dyn-info-list.c +@@ -27,8 +27,3 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + HIDDEN unw_dyn_info_list_t _U_dyn_info_list; + +-PROTECTED unw_word_t +-_U_dyn_info_list_addr (void) +-{ +- return (unw_word_t) (uintptr_t) &_U_dyn_info_list; +-} +diff --git a/frysk-imports/libunwind/src/x86/Ginit.c b/frysk-imports/libunwind/src/x86/Ginit.c +index b05a08edb..79bd611c0 100644 +--- a/frysk-imports/libunwind/src/x86/Ginit.c ++++ b/frysk-imports/libunwind/src/x86/Ginit.c +@@ -54,8 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- + /* XXX fix me: there is currently no way to locate the dyn-info list + by a remote unwinder. On ia64, this is done via a special + unwind-table entry. Perhaps something similar can be done with +diff --git a/frysk-imports/libunwind/src/x86_64/Ginit.c b/frysk-imports/libunwind/src/x86_64/Ginit.c +index 782757622..36e30af8e 100644 +--- a/frysk-imports/libunwind/src/x86_64/Ginit.c ++++ b/frysk-imports/libunwind/src/x86_64/Ginit.c +@@ -48,8 +48,6 @@ static struct unw_addr_space local_addr_space; + + PROTECTED unw_addr_space_t unw_local_addr_space = &local_addr_space; + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- + /* XXX fix me: there is currently no way to locate the dyn-info list + by a remote unwinder. On ia64, this is done via a special + unwind-table entry. Perhaps something similar can be done with +diff --git a/frysk-sys/Makefile.am b/frysk-sys/Makefile.am +index f69fd01b8..c54cb8a92 100644 +--- a/frysk-sys/Makefile.am ++++ b/frysk-sys/Makefile.am +@@ -1,7 +1,7 @@ + # This file is part of the program FRYSK. + # + # Copyright 2005, 2007, 2008, Red Hat Inc. +-# Copyright 2016, Andrew Cagney ++# Copyright 2016, 2020, Andrew Cagney + # + # FRYSK is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -56,9 +56,12 @@ JNI_LIBRARY_LIST += -lstdc++ + JNI_LIBRARY_LIST += -laudit + JNI_LIBRARY_LIST += -ldw + # Bundle in the local libunwind code. +-JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/dwarf/.libs/*.o +-JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/mi/.libs/G*.o +-JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/mi/.libs/{init,mempool,flush_cache}.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-x86_64/src/dwarf/.libs/*.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-x86_64/src/mi/.libs/G*.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/mi/.libs/init.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/mi/.libs/mempool.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/mi/.libs/flush_cache.o ++JNI_OBJECT_LIST += ../frysk-imports/libunwind-x86_64/src/mi/.libs/dyn-info-list.o + JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/x86/.libs/*.o + JNI_OBJECT_LIST += ../frysk-imports/libunwind-*/src/x86_64/.libs/*.o + diff --git a/frysk.spec b/frysk.spec index 5887b7f..891a3af 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 69%{?dist} +Release: 70%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -63,6 +63,7 @@ Patch41: frysk-0.4-python3.patch Patch42: frysk-0.4-jline1-to-jline.patch Patch43: frysk-0.4-disable-arch32-tests.patch Patch44: frysk-0.4-steptester-indentation.patch +Patch45: frysk-0.4-gcc-fcommon.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -261,6 +262,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch42 -p1 -z .jline1-to-jline %patch43 -p1 -z .disable-arch32-tests %patch44 -p1 -z .steptester-indentation +%patch45 -p1 -z .gcc-fcommon echo "%{version}-%{release}" > frysk-common/version.in @@ -443,6 +445,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jan 28 2020 Andrew Cagney - 0.4-70 +- pacify gcc -fcommon + * Tue Jan 28 2020 Fedora Release Engineering - 0.4-69 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0e977d99b12e5e95bfca95ee1179f93f4b1bb3b7 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 9 Jun 2020 17:46:12 -0400 Subject: [PATCH 26/56] drop -source 1.4 -- frysk-0.4-javac.patch --- frysk-0.4-javac.patch | 31 +++++++++++++++++++++++++++++++ frysk.spec | 7 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-javac.patch diff --git a/frysk-0.4-javac.patch b/frysk-0.4-javac.patch new file mode 100644 index 0000000..d9a7bac --- /dev/null +++ b/frysk-0.4-javac.patch @@ -0,0 +1,31 @@ +diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac +index 8d7f83780..c9a2be863 100644 +--- a/frysk-common/frysk-common.ac ++++ b/frysk-common/frysk-common.ac +@@ -151,10 +151,10 @@ AC_DEFUN([AC_LANG_COMPILER(Java)], []) + AU_DEFUN([AC_LANG_JAVAC], [AC_LANG(Java)]) + AC_LANG(Java) + +-JAVAC='javac -source 1.4' +-AS_IF([test x"$enable_werror" = xyes], +- [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'], +- [WERROR_JAVACFLAGS=]) ++JAVAC='javac' ++# AS_IF([test x"$enable_werror" = xyes], ++# [WERROR_JAVACFLAGS='-Werror -Xlint:all -Xlint:-options -Xlint:-cast'], ++# [WERROR_JAVACFLAGS=]) + AC_SUBST([JAVAC]) + AC_SUBST([JAVACFLAGS]) + AC_SUBST([WERROR_JAVACFLAGS]) +diff --git a/frysk-common/javadocs.sh b/frysk-common/javadocs.sh +index fa9b33fd4..01f4f3e1d 100644 +--- a/frysk-common/javadocs.sh ++++ b/frysk-common/javadocs.sh +@@ -93,7 +93,6 @@ for scope in public private ; do + -link ${jg}/libgconf-java-2.12.5/api/ \ + -link ${jg}/libvte-java-0.12.2/api/ \ + -overview ${overview} \ +- -source 1.4 \ + -d javadoc/$scope \ + -use \ + -linksource \ diff --git a/frysk.spec b/frysk.spec index 891a3af..02b190e 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 70%{?dist} +Release: 71%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -64,6 +64,7 @@ Patch42: frysk-0.4-jline1-to-jline.patch Patch43: frysk-0.4-disable-arch32-tests.patch Patch44: frysk-0.4-steptester-indentation.patch Patch45: frysk-0.4-gcc-fcommon.patch +Patch46: frysk-0.4-javac.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -263,6 +264,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch43 -p1 -z .disable-arch32-tests %patch44 -p1 -z .steptester-indentation %patch45 -p1 -z .gcc-fcommon +%patch46 -p1 -z .javac echo "%{version}-%{release}" > frysk-common/version.in @@ -445,6 +447,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jun 9 2020 Andrew Cagney - 0.4-71 +- drop -source 1.4 -- frysk-0.4-javac.patch + * Tue Jan 28 2020 Andrew Cagney - 0.4-70 - pacify gcc -fcommon From 56a002140162cde8f5876807d4b9d8d879bba3c4 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 19:40:04 +0200 Subject: [PATCH 27/56] Rebuilt for JDK-11 --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 02b190e..43cf965 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 71%{?dist} +Release: 72%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -447,6 +447,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Jul 10 2020 Jiri Vanek - 0.4-72 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Tue Jun 9 2020 Andrew Cagney - 0.4-71 - drop -source 1.4 -- frysk-0.4-javac.patch From 123661c4cf1ecdcf214c8ea859fd20b560037bfb Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 16 Jul 2020 20:26:01 -0400 Subject: [PATCH 28/56] jnixx on java 11 --- Makefile | 2 +- ...k-0.4-jnixx-dont-emit-nested-classes.patch | 353 ++++++++++++++++++ frysk-0.4-jnixx-union-as-reserved-word.patch | 12 + frysk.spec | 10 +- 4 files changed, 375 insertions(+), 2 deletions(-) create mode 100644 frysk-0.4-jnixx-dont-emit-nested-classes.patch create mode 100644 frysk-0.4-jnixx-union-as-reserved-word.patch diff --git a/Makefile b/Makefile index b7ecc4d..6d1a491 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ ORDER = \ libglade-java \ frysk -#MOCKCFG = fedora-$(BRANCH)-i386 MOCKCFG = fedora-$(BRANCH)-x86_64 +#MOCKCFG = jvanek-java11-fedora-rawhide-x86_64 MOCK_WORDS := $(subst -, , $(MOCKCFG)) MOCK_OS := $(word 1,$(MOCK_WORDS)) MOCK_RELEASE := $(word 2,$(MOCK_WORDS)) diff --git a/frysk-0.4-jnixx-dont-emit-nested-classes.patch b/frysk-0.4-jnixx-dont-emit-nested-classes.patch new file mode 100644 index 0000000..f9ca3a3 --- /dev/null +++ b/frysk-0.4-jnixx-dont-emit-nested-classes.patch @@ -0,0 +1,353 @@ +diff --git a/frysk-sys/frysk/junit/Runner.java b/frysk-sys/frysk/junit/Runner.java +index 23e960430..33091729f 100755 +--- a/frysk-sys/frysk/junit/Runner.java ++++ b/frysk-sys/frysk/junit/Runner.java +@@ -126,7 +126,7 @@ public class Runner extends TestRunner { + testMethod = null; + } + fine.log(this, "testClass", testClass, "testMethod", testMethod); +- ++ + for (Iterator c = testClasses.iterator(); c.hasNext (); ) { + Class testKlass = (Class) c.next (); + if (testMethod == null) { +@@ -141,7 +141,7 @@ public class Runner extends TestRunner { + try { + // Probe the class to see if the method + // exists. +- testKlass.getMethod(testMethod, null); ++ testKlass.getMethod(testMethod, (Class[])null); + TestCase test = (TestCase)testKlass.newInstance(); + test.setName(testMethod); + testSuite.addTest(test); +diff --git a/frysk-sys/jnixx/ClassVisitor.java b/frysk-sys/jnixx/ClassVisitor.java +index b2cafaa19..e5c7af90d 100644 +--- a/frysk-sys/jnixx/ClassVisitor.java ++++ b/frysk-sys/jnixx/ClassVisitor.java +@@ -76,6 +76,9 @@ abstract class ClassVisitor { + Class[] classes = klass.getDeclaredClasses(); + for (int i = 0; i < classes.length; i++) { + Class inner = classes[i]; ++ if (inner.isSynthetic()) { ++ continue; ++ } + acceptClass(inner); + } + } +diff --git a/frysk-sys/jnixx/ClassWalker.java b/frysk-sys/jnixx/ClassWalker.java +index 45ed0dd87..6fb78d392 100644 +--- a/frysk-sys/jnixx/ClassWalker.java ++++ b/frysk-sys/jnixx/ClassWalker.java +@@ -45,39 +45,43 @@ import java.util.Set; + import java.util.HashSet; + + abstract class ClassWalker { ++ + private final Set visited = new HashSet(); +- void walk(Class[] klasses) { ++ private final Set required; ++ ++ ClassWalker(Set required) { ++ this.required = required; ++ } ++ ++ void walk() { ++ Class[] classes = new Class[required.size()]; ++ required.toArray(classes); ++ walk(classes, 0); ++ } ++ ++ void walk(Class[] klasses, int level) { + for (int i = 0; i < klasses.length; i++) { +- walk(klasses[i]); ++ Class klass = klasses[i]; ++ walk(klass, level+1); ++ } ++ } ++ void indent(int level) { ++ for (int i = 0; i < level; i++) { ++ System.err.print(" "); + } + } +- private final ClassVisitor visitor = new ClassVisitor() { +- void acceptInterface(Class klass) { +- walk(klass); +- } +- void acceptConstructor(Constructor constructor) { +- walk(constructor.getParameterTypes()); +- } +- void acceptField(Field field) { +- walk(field.getType()); +- } +- void acceptMethod(Method method) { +- walk(method.getReturnType()); +- walk(method.getParameterTypes()); +- } +- void acceptClass(Class klass) { +- walk(klass); +- } +- }; +- void walk(Class klass) { ++ void walk(Class klass, int level) { + if (klass == null) + return; +- walk(klass.getSuperclass()); ++ /* walk down from parent's parent first */ ++ walk(klass.getSuperclass(), level+1); + if (visited.contains(klass)) + return; ++ indent(level); ++ System.err.println(klass); + visited.add(klass); + if (klass.isArray()) { +- walk(klass.getComponentType()); ++ walk(klass.getComponentType(), level+1); + acceptArray(klass); + } else if (klass.isPrimitive()) { + acceptPrimitive(klass); +@@ -86,6 +90,29 @@ abstract class ClassWalker { + } else { + acceptClass(klass); + } ++ ClassVisitor visitor = new ClassVisitor() { ++ void acceptInterface(Class klassInterface) { ++ walk(klassInterface, level+1); ++ } ++ void acceptConstructor(Constructor constructor) { ++ walk(constructor.getParameterTypes(), level+1); ++ } ++ void acceptField(Field field) { ++ walk(field.getType(), level+1); ++ } ++ void acceptMethod(Method method) { ++ walk(method.getReturnType(), level+1); ++ walk(method.getParameterTypes(), level+1); ++ } ++ void acceptClass(Class nestedKlass) { ++ if (required.contains(klass)) { ++ walk(nestedKlass, level+1); ++ } else { ++ indent(level); ++ System.err.println("dropping " + nestedKlass); ++ } ++ } ++ }; + visitor.visit(klass); + } + /** +diff --git a/frysk-sys/jnixx/Main.java b/frysk-sys/jnixx/Main.java +index d68bd1a67..4942f620d 100644 +--- a/frysk-sys/jnixx/Main.java ++++ b/frysk-sys/jnixx/Main.java +@@ -48,6 +48,7 @@ import java.util.jar.JarFile; + import java.util.jar.JarEntry; + import java.util.Collections; + import java.util.List; ++import java.util.Set; + import java.util.HashSet; + import java.util.Iterator; + import java.io.IOException; +@@ -56,13 +57,13 @@ class Main { + /** + * Collection of classes that need native bindings. + */ +- private static final HashSet nativeClasses = new HashSet(); ++ private static final HashSet nativeClasses = new HashSet(); + + /** + * Collection of classes that should be visible (non-visible + * classes don't get their bindings generated). + */ +- private static final HashSet visibleClasses = new HashSet(); ++ private static final HashSet visibleClasses = new HashSet(); + + /** + * Does this method require native bindings? Methods that are not +@@ -87,10 +88,10 @@ class Main { + return Modifier.isPrivate(member.getModifiers()); + } + +- private static HashSet getJarClasses(String jarFile) ++ private static HashSet getJarClasses(String jarFile) + throws IOException, ClassNotFoundException { + // Generate a list of classes in the jar file. +- HashSet jarClasses = new HashSet(); ++ HashSet jarClasses = new HashSet(); + List entries = Collections.list(new JarFile(jarFile).entries()); + for (Iterator i = entries.iterator(); i.hasNext(); ) { + JarEntry entry = (JarEntry) i.next(); +@@ -107,8 +108,8 @@ class Main { + return jarClasses; + } + +- private static HashSet getNativeClasses(HashSet classes) { +- final HashSet natives = new HashSet(); ++ private static HashSet getNativeClasses(HashSet classes) { ++ final HashSet natives = new HashSet(); + // Iterate over just these identifying which are native. + ClassVisitor findNatives = new ClassVisitor() { + void acceptInterface(Class klass) { +@@ -133,7 +134,7 @@ class Main { + } + + private static void printHxxFile(Printer p, String headerFile, +- Class[] classes) { ++ Set classes) { + p.println("#include \"jnixx/jnixx.hxx\""); + p.println(); + p.println("namespace jnixx {"); +@@ -142,17 +143,17 @@ class Main { + p.println(); + p.println("\f"); + System.err.println("Generating namespaces"); +- new PrintNamespaces(p).walk(classes); ++ new PrintNamespaces(p, classes).walk(); + System.err.println("Generating declarations"); +- new PrintDeclarations(p).walk(classes); ++ new PrintDeclarations(p, classes).walk(); + p.println(); + p.println("\f"); + System.err.println("Generating definitions"); +- new PrintHxxDefinitions(p).walk(classes); ++ new PrintHxxDefinitions(p, classes).walk(); + } + + private static void printCxxFile(Printer p, String headerFile, +- Class[] classes) { ++ Set classes) { + p.print("#include \""); + p.print(headerFile); + p.println("\""); +@@ -168,7 +169,7 @@ class Main { + p.println(); + p.println("\f"); + System.err.println("Generating definitions"); +- new PrintCxxDefinitions(p).walk(classes); ++ new PrintCxxDefinitions(p, classes).walk(); + } + + public static void main(String[] args) +@@ -181,33 +182,35 @@ class Main { + boolean generateHeader = args[0].equals("hxx"); + String headerFile = args[1]; + String jarFile = args[2]; +- HashSet explicitClasses = new HashSet(); ++ HashSet explicitClasses = new HashSet(); + for (int i = 3; i < args.length; i++) { + Class klass = Class.forName(args[i], false, + Main.class.getClassLoader()); + explicitClasses.add(klass); + } + +- HashSet jarClasses = getJarClasses(jarFile); ++ HashSet jarClasses = getJarClasses(jarFile); + visibleClasses.addAll(jarClasses); + visibleClasses.addAll(explicitClasses); + + nativeClasses.addAll(getNativeClasses(jarClasses)); + +- HashSet requiredClasses = new HashSet(); ++ HashSet requiredClasses = new HashSet(); + requiredClasses.addAll(nativeClasses); + requiredClasses.addAll(explicitClasses); +- System.err.print("Required " + requiredClasses.size() + " - "); +- System.err.println(requiredClasses); +- +- Class[] classes = new Class[requiredClasses.size()]; +- requiredClasses.toArray(classes); ++ System.err.println("Required classes " + requiredClasses.size() + ":"); ++ for (Class klass : requiredClasses) { ++ System.err.println(" " + klass); ++ } + + Printer p = new Printer(new PrintWriter(System.out)); +- if (generateHeader) +- printHxxFile(p, headerFile, classes); +- else +- printCxxFile(p, headerFile, classes); ++ if (generateHeader) { ++ System.err.println(".hxx classes:"); ++ printHxxFile(p, headerFile, requiredClasses); ++ } else { ++ System.err.println(".cxx classes:"); ++ printCxxFile(p, headerFile, requiredClasses); ++ } + p.flush(); + } + } +diff --git a/frysk-sys/jnixx/PrintCxxDefinitions.java b/frysk-sys/jnixx/PrintCxxDefinitions.java +index 032f10081..2f3072aa1 100644 +--- a/frysk-sys/jnixx/PrintCxxDefinitions.java ++++ b/frysk-sys/jnixx/PrintCxxDefinitions.java +@@ -42,11 +42,13 @@ import java.lang.reflect.Method; + import java.lang.reflect.Field; + import java.lang.reflect.Constructor; + import java.lang.reflect.Modifier; ++import java.util.Set; + + class PrintCxxDefinitions extends ClassWalker { + + private final Printer p; +- PrintCxxDefinitions(Printer p) { ++ PrintCxxDefinitions(Printer p, Set required) { ++ super(required); + this.p = p; + } + +diff --git a/frysk-sys/jnixx/PrintDeclarations.java b/frysk-sys/jnixx/PrintDeclarations.java +index db0117d09..559fd5283 100644 +--- a/frysk-sys/jnixx/PrintDeclarations.java ++++ b/frysk-sys/jnixx/PrintDeclarations.java +@@ -42,11 +42,13 @@ import java.lang.reflect.Field; + import java.lang.reflect.Method; + import java.lang.reflect.Constructor; + import java.lang.reflect.Modifier; ++import java.util.Set; + + class PrintDeclarations extends ClassWalker { + + private final Printer p; +- PrintDeclarations(Printer p) { ++ PrintDeclarations(Printer p, Set required) { ++ super(required); + this.p = p; + } + +diff --git a/frysk-sys/jnixx/PrintHxxDefinitions.java b/frysk-sys/jnixx/PrintHxxDefinitions.java +index 3ac6445b7..342e37f58 100644 +--- a/frysk-sys/jnixx/PrintHxxDefinitions.java ++++ b/frysk-sys/jnixx/PrintHxxDefinitions.java +@@ -43,11 +43,13 @@ import java.lang.reflect.Field; + import java.lang.reflect.Method; + import java.lang.reflect.Constructor; + import java.lang.reflect.Modifier; ++import java.util.Set; + + class PrintHxxDefinitions extends ClassWalker { + + private final Printer p; +- PrintHxxDefinitions(Printer p) { ++ PrintHxxDefinitions(Printer p, Set required) { ++ super(required); + this.p = p; + } + +diff --git a/frysk-sys/jnixx/PrintNamespaces.java b/frysk-sys/jnixx/PrintNamespaces.java +index e566c5fbd..7b44868bf 100644 +--- a/frysk-sys/jnixx/PrintNamespaces.java ++++ b/frysk-sys/jnixx/PrintNamespaces.java +@@ -38,10 +38,13 @@ + + package jnixx; + ++import java.util.Set; ++ + class PrintNamespaces extends ClassWalker { + + private final Printer p; +- PrintNamespaces(Printer p) { ++ PrintNamespaces(Printer p, Set required) { ++ super(required); + this.p = p; + } + diff --git a/frysk-0.4-jnixx-union-as-reserved-word.patch b/frysk-0.4-jnixx-union-as-reserved-word.patch new file mode 100644 index 0000000..3398b1e --- /dev/null +++ b/frysk-0.4-jnixx-union-as-reserved-word.patch @@ -0,0 +1,12 @@ +diff --git a/frysk-sys/jnixx/Printer.java b/frysk-sys/jnixx/Printer.java +index 4469027d0..933bd6b05 100644 +--- a/frysk-sys/jnixx/Printer.java ++++ b/frysk-sys/jnixx/Printer.java +@@ -320,6 +320,7 @@ class Printer { + || name.equals("register") + || name.equals("signed") + || name.equals("unsigned") ++ || name.equals("union") + ) { + return name + "$"; + } else { diff --git a/frysk.spec b/frysk.spec index 43cf965..af198a8 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 72%{?dist} +Release: 73%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -65,6 +65,8 @@ Patch43: frysk-0.4-disable-arch32-tests.patch Patch44: frysk-0.4-steptester-indentation.patch Patch45: frysk-0.4-gcc-fcommon.patch Patch46: frysk-0.4-javac.patch +Patch47: frysk-0.4-jnixx-union-as-reserved-word.patch +Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -265,6 +267,8 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch44 -p1 -z .steptester-indentation %patch45 -p1 -z .gcc-fcommon %patch46 -p1 -z .javac +%patch47 -p1 -z .jnixx-union-as-reserved-word +%patch48 -p1 -z .jnixx-dont-emit-nested-classes echo "%{version}-%{release}" > frysk-common/version.in @@ -447,6 +451,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jul 16 2020 Andrew Cagney - 0.4-73 +- 'union' onto 'union$' - frysk-0.4-jnixx-union-as-reserved-word.patch +- omit nested local classes - frysk-0.4-jnixx-dont-emit-nested-classes.patch + * Fri Jul 10 2020 Jiri Vanek - 0.4-72 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 37ceded0e4f0e7065c4595c972b5ac9de51ed7a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:53:45 +0000 Subject: [PATCH 29/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index af198a8..995c784 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 73%{?dist} +Release: 74%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -451,6 +451,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.4-74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 16 2020 Andrew Cagney - 0.4-73 - 'union' onto 'union$' - frysk-0.4-jnixx-union-as-reserved-word.patch - omit nested local classes - frysk-0.4-jnixx-dont-emit-nested-classes.patch From 47bbd0f953d16638373dedc5319c54a54369d9f3 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 11 Dec 2020 22:23:47 -0500 Subject: [PATCH 30/56] fix check of elf_newehdr()'s return value --- Makefile | 2 +- frysk-0.4-49-elf-newehdr-null.patch | 13 +++++++++++++ frysk.spec | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 frysk-0.4-49-elf-newehdr-null.patch diff --git a/Makefile b/Makefile index 6d1a491..7daa881 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ world gnome: .PHONY:: world usable useful: init - $(MOCK) install vi less strace emacs + $(MOCK) install vi less strace emacs git nss-devel libevent-devel unbound-devel bison libcurl-devel pam-devel libselinux-devel libseccomp-devel systemd-devel libcap-ng-devel ldns-devel .PHONY:: usable useful clog prep: diff --git a/frysk-0.4-49-elf-newehdr-null.patch b/frysk-0.4-49-elf-newehdr-null.patch new file mode 100644 index 0000000..37e0eba --- /dev/null +++ b/frysk-0.4-49-elf-newehdr-null.patch @@ -0,0 +1,13 @@ +diff --git a/frysk-sys/lib/dwfl/jni/Elf.cxx b/frysk-sys/lib/dwfl/jni/Elf.cxx +index c22fa58ee..92f19417b 100644 +--- a/frysk-sys/lib/dwfl/jni/Elf.cxx ++++ b/frysk-sys/lib/dwfl/jni/Elf.cxx +@@ -174,7 +174,7 @@ lib::dwfl::Elf::elf_newehdr(jnixx::env env, jint wordSize) { + runtimeException(env, "Bad parameter to elf_newehdr (word size %d)", + wordSize); + } +- if (::gelf_newehdr(elf, elfClass) < 0) ++ if (::gelf_newehdr(elf, elfClass) == NULL) + throw_last_elf_error(env); + } + diff --git a/frysk.spec b/frysk.spec index 995c784..b64ae94 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 74%{?dist} +Release: 75%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -67,6 +67,7 @@ Patch45: frysk-0.4-gcc-fcommon.patch Patch46: frysk-0.4-javac.patch Patch47: frysk-0.4-jnixx-union-as-reserved-word.patch Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch +Patch49: frysk-0.4-49-elf-newehdr-null.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -269,6 +270,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch46 -p1 -z .javac %patch47 -p1 -z .jnixx-union-as-reserved-word %patch48 -p1 -z .jnixx-dont-emit-nested-classes +%patch49 -p1 -z .49-elf-newehdr-null echo "%{version}-%{release}" > frysk-common/version.in @@ -451,6 +453,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Dec 11 2020 Fedora Release Engineering - 0.4-75 +- fix check of elf_newehdr()'s return value + * Mon Jul 27 2020 Fedora Release Engineering - 0.4-74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 11887f519dc8d368a96e3f161e0275b5275925d7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Dec 2020 12:02:22 -0700 Subject: [PATCH 31/56] Depend on jline2, not jline --- frysk-0.4-jline1-to-jline.patch | 2 +- frysk.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frysk-0.4-jline1-to-jline.patch b/frysk-0.4-jline1-to-jline.patch index dfbac0e..c0bd293 100644 --- a/frysk-0.4-jline1-to-jline.patch +++ b/frysk-0.4-jline1-to-jline.patch @@ -7,7 +7,7 @@ index 49bab9acb..69fc220b3 100644 AC_FIND_FILE([antlr.jar], [/usr/share/java], ANTLR_JAR) AC_FIND_FILE([junit.jar], [/usr/share/java], JUNIT_JAR) -AC_FIND_FILE([jline-1.0.jar], [/usr/lib/java/jline1], JLINE_JAR) -+AC_FIND_FILE([jline.jar], [/usr/share/java/jline], JLINE_JAR) ++AC_FIND_FILE([jline.jar], [/usr/share/java/jline2], JLINE_JAR) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/frysk.spec b/frysk.spec index b64ae94..4568aea 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 75%{?dist} +Release: 76%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -90,12 +90,12 @@ BuildRequires: autoconf automake libtool # Some scripts run during the build use python BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 -BuildRequires: jline +BuildRequires: jline2 # it seems java requires explict runtime requires!?!? Requires: junit Requires: antlr-tool -Requires: jline +Requires: jline2 %if %{enable_gnome} BuildRequires: jdom >= 1.0 @@ -453,6 +453,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Mon Dec 14 2020 Jerry James - 0.4-76 +- Depend on jline2, not jline + * Fri Dec 11 2020 Fedora Release Engineering - 0.4-75 - fix check of elf_newehdr()'s return value From 6a7112fcc575493f12694ff643a3b5761b5f16b3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 00:48:19 +0000 Subject: [PATCH 32/56] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- frysk.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/frysk.spec b/frysk.spec index 4568aea..d22e764 100644 --- a/frysk.spec +++ b/frysk.spec @@ -110,6 +110,7 @@ BuildRequires: libglade2-devel >= 2.5.1 BuildRequires: vte-devel >= 0.12.1 BuildRequires: gnome-python2-gconf %endif +BuildRequires: make # Bug #305611: PPC Build problems with libunwind From b36bdb2abbc2bbb349bf83430e4a1fb71a069a4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:59:07 +0000 Subject: [PATCH 33/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index d22e764..7ae2e6d 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 76%{?dist} +Release: 77%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -454,6 +454,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.4-77 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Jerry James - 0.4-76 - Depend on jline2, not jline From 03baa9b3c369e71e6d7307dbd080e2e85fa8cc52 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 12 Apr 2021 15:23:57 -0400 Subject: [PATCH 34/56] autoconf 2.70 --- Makefile | 2 +- frysk-0.4-50-autoconf-2-70-fixes.patch | 119 +++++++++++++++++++++++++ frysk.spec | 7 +- 3 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 frysk-0.4-50-autoconf-2-70-fixes.patch diff --git a/Makefile b/Makefile index 7daa881..d4762db 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # Somewhat superseeded by fedpkg -BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/master/rawhide/' -e 's/^\* //p') +BRANCH := $(shell fedpkg switch-branch | sed -n -e 's/ f/ /' -e 's/main/rawhide/' -e 's/^\* //p') SPEC_FILE = $(shell fedpkg gimmespec) # VERREL is very slow diff --git a/frysk-0.4-50-autoconf-2-70-fixes.patch b/frysk-0.4-50-autoconf-2-70-fixes.patch new file mode 100644 index 0000000..e00d989 --- /dev/null +++ b/frysk-0.4-50-autoconf-2-70-fixes.patch @@ -0,0 +1,119 @@ +diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac +index c9a2be863..7e0bbb0d0 100644 +--- a/frysk-common/frysk-common.ac ++++ b/frysk-common/frysk-common.ac +@@ -89,13 +89,13 @@ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/$lib/frysk/pkgconfig + + # Check for XMLLINT + AC_CHECK_PROGS([XMLLINT], [xmllint], [no]) +-test $XMLLINT = no && AC_ERROR([no xmllint program found]) ++test $XMLLINT = no && AC_MSG_ERROR([no xmllint program found]) + AC_CHECK_PROGS([XMLCATALOG], [xmlcatalog], [no]) +-test $XMLCATALOG = no && AC_ERROR([no xmlcatalog program found]) ++test $XMLCATALOG = no && AC_MSG_ERROR([no xmlcatalog program found]) + + # Check for uudecode + AC_CHECK_PROGS([UUDECODE], [uudecode], [no]) +-test $UUDECODE = no && AC_ERROR([no uudecode program found, please install sharutils package]) ++test $UUDECODE = no && AC_MSG_ERROR([no uudecode program found, please install sharutils package]) + + FRYSK_USE_LIBUNWIND + +diff --git a/frysk-core/configure.ac b/frysk-core/configure.ac +index 69fc220b3..d0fe07c3a 100644 +--- a/frysk-core/configure.ac ++++ b/frysk-core/configure.ac +@@ -37,7 +37,7 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk, [FRYSK_VERSION]) +diff --git a/frysk-gtk/configure.ac b/frysk-gtk/configure.ac +index aaa123f82..55c592ebf 100644 +--- a/frysk-gtk/configure.ac ++++ b/frysk-gtk/configure.ac +@@ -36,7 +36,7 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk, [FRYSK_VERSION]) +diff --git a/frysk-gui/configure.ac b/frysk-gui/configure.ac +index 9a274c68b..ec5950d2a 100644 +--- a/frysk-gui/configure.ac ++++ b/frysk-gui/configure.ac +@@ -36,7 +36,7 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk, [FRYSK_VERSION]) +diff --git a/frysk-imports/configure.ac b/frysk-imports/configure.ac +index b9a6c32c3..e65f4c433 100644 +--- a/frysk-imports/configure.ac ++++ b/frysk-imports/configure.ac +@@ -37,7 +37,7 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk, [FRYSK_VERSION]) +diff --git a/frysk-imports/libunwind/configure.ac b/frysk-imports/libunwind/configure.ac +index 7fa2e4bcf..37c9072a0 100644 +--- a/frysk-imports/libunwind/configure.ac ++++ b/frysk-imports/libunwind/configure.ac +@@ -57,7 +57,6 @@ esac + CHECK_ATOMIC_OPS + + dnl Checks for header files. +-AC_HEADER_STDC + AC_CHECK_HEADERS(asm/ptrace_offsets.h endian.h sys/endian.h execinfo.h \ + ia64intrin.h sys/uc_access.h unistd.h signal.h sys/types.h \ + sys/procfs.h sys/ptrace.h byteswap.h elf.h sys/elf.h link.h sys/link.h) +diff --git a/frysk-sys/configure.ac b/frysk-sys/configure.ac +index 6a1e0cad8..4f838439d 100644 +--- a/frysk-sys/configure.ac ++++ b/frysk-sys/configure.ac +@@ -36,7 +36,7 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk, [FRYSK_VERSION]) +diff --git a/frysk-top/configure.ac b/frysk-top/configure.ac +index f57136a56..ee68665d3 100644 +--- a/frysk-top/configure.ac ++++ b/frysk-top/configure.ac +@@ -36,14 +36,14 @@ + # version and license this file solely under the GPL without + # exception. + +-AC_PREREQ(2.59) ++AC_PREREQ([2.70]) + + sinclude(common/version.ac) + AC_INIT(frysk,defn([FRYSK_VERSION])) + m4_include([common/frysk-common.ac]) + + AC_ARG_ENABLE(gnome, +-AC_HELP_STRING( ++AS_HELP_STRING( + [--enable-gnome], + [enable gnome user interface (default no)]), + [enable_gnome=$enableval], diff --git a/frysk.spec b/frysk.spec index 7ae2e6d..2d27734 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 77%{?dist} +Release: 78%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -68,6 +68,7 @@ Patch46: frysk-0.4-javac.patch Patch47: frysk-0.4-jnixx-union-as-reserved-word.patch Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch Patch49: frysk-0.4-49-elf-newehdr-null.patch +Patch50: frysk-0.4-50-autoconf-2-70-fixes.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -272,6 +273,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch47 -p1 -z .jnixx-union-as-reserved-word %patch48 -p1 -z .jnixx-dont-emit-nested-classes %patch49 -p1 -z .49-elf-newehdr-null +%patch50 -p1 -z .50-autoconf-2-70-fixes echo "%{version}-%{release}" > frysk-common/version.in @@ -454,6 +456,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Mon Apr 12 2021 Andrew Cagney - 0.4-78 +- autoconf 2.70 + * Tue Jan 26 2021 Fedora Release Engineering - 0.4-77 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 03a7fed2b6e7c573401a52b7e6e20bd99fdff2ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:25:19 +0000 Subject: [PATCH 35/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 2d27734..72d7775 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 78%{?dist} +Release: 79%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -456,6 +456,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.4-79 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 12 2021 Andrew Cagney - 0.4-78 - autoconf 2.70 From 80547c1bbc22f6f6684897f6d8788d0908852ac0 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 4 Aug 2021 19:08:13 -0400 Subject: [PATCH 36/56] Allow autoconf 2.69 --- frysk-0.4-50-autoconf-2-70-fixes.patch | 12 ++++++------ frysk.spec | 5 ++++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/frysk-0.4-50-autoconf-2-70-fixes.patch b/frysk-0.4-50-autoconf-2-70-fixes.patch index e00d989..a9ed3f0 100644 --- a/frysk-0.4-50-autoconf-2-70-fixes.patch +++ b/frysk-0.4-50-autoconf-2-70-fixes.patch @@ -28,7 +28,7 @@ index 69fc220b3..d0fe07c3a 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk, [FRYSK_VERSION]) @@ -41,7 +41,7 @@ index aaa123f82..55c592ebf 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk, [FRYSK_VERSION]) @@ -54,7 +54,7 @@ index 9a274c68b..ec5950d2a 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk, [FRYSK_VERSION]) @@ -67,7 +67,7 @@ index b9a6c32c3..e65f4c433 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk, [FRYSK_VERSION]) @@ -92,7 +92,7 @@ index 6a1e0cad8..4f838439d 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk, [FRYSK_VERSION]) @@ -105,7 +105,7 @@ index f57136a56..ee68665d3 100644 # exception. -AC_PREREQ(2.59) -+AC_PREREQ([2.70]) ++AC_PREREQ([2.69]) sinclude(common/version.ac) AC_INIT(frysk,defn([FRYSK_VERSION])) diff --git a/frysk.spec b/frysk.spec index 72d7775..631d2ce 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 79%{?dist} +Release: 80%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -456,6 +456,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Aug 4 2021 Andrew Cagney - 0.4-80 +- Allow autoconf 2.69 + * Wed Jul 21 2021 Fedora Release Engineering - 0.4-79 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 12df6ac17cd4a430735b163b933140a72099c6f7 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 5 Aug 2021 18:03:17 -0400 Subject: [PATCH 37/56] require debugedit; fix hardwired path --- frysk-0.4-51-debugedit-path.patch | 13 +++++++++++++ frysk.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-51-debugedit-path.patch diff --git a/frysk-0.4-51-debugedit-path.patch b/frysk-0.4-51-debugedit-path.patch new file mode 100644 index 0000000..08833c6 --- /dev/null +++ b/frysk-0.4-51-debugedit-path.patch @@ -0,0 +1,13 @@ +--- frysk-0.4/frysk-core/Makefile.am.orig 2021-08-05 14:51:10.741080868 -0400 ++++ frysk-0.4/frysk-core/Makefile.am 2021-08-05 14:51:29.595873910 -0400 +@@ -225,8 +225,8 @@ + (cd $@/usr/src/debug; \ + $(COMPILE) funit-bubblesort.c -fpic -shared -o ../../lib/libbubble.so -g; \ + $(COMPILE) funit-quicksort.c -L ../../lib -lbubble -g -o ../../bin/funit-quicksort -DNO_MAIN) +- /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort +- /usr/lib/rpm/debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so ++ debugedit -b $(abspath $@) -d / $@/usr/bin/funit-quicksort ++ debugedit -b $(abspath $@) -d / $@/usr/lib/libbubble.so + eu-strip --remove-comment -f $@/usr/lib/debug/usr/bin/funit-quicksort.debug $@/usr/bin/funit-quicksort; \ + eu-strip --remove-comment -f $@/usr/lib/debug/usr/lib/funit-bubblesort.debug $@/usr/lib/libbubble.so; + diff --git a/frysk.spec b/frysk.spec index 631d2ce..39628e1 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 80%{?dist} +Release: 81%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -69,6 +69,7 @@ Patch47: frysk-0.4-jnixx-union-as-reserved-word.patch Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch Patch49: frysk-0.4-49-elf-newehdr-null.patch Patch50: frysk-0.4-50-autoconf-2-70-fixes.patch +Patch51: frysk-0.4-51-debugedit-path.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -92,6 +93,7 @@ BuildRequires: autoconf automake libtool BuildRequires: python3 BuildRequires: elfutils-devel >= 0.151 BuildRequires: jline2 +BuildRequires: debugedit # it seems java requires explict runtime requires!?!? Requires: junit @@ -274,6 +276,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch48 -p1 -z .jnixx-dont-emit-nested-classes %patch49 -p1 -z .49-elf-newehdr-null %patch50 -p1 -z .50-autoconf-2-70-fixes +%patch51 -p1 -z .51-debugedit-path echo "%{version}-%{release}" > frysk-common/version.in @@ -456,6 +459,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Aug 4 2021 Andrew Cagney - 0.4-81 +- require debugedit; fix hardwired path + * Wed Aug 4 2021 Andrew Cagney - 0.4-80 - Allow autoconf 2.69 From 3bccf2d023491f8f08405cfe3c6ab1a6fc7ca1cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:29:11 +0000 Subject: [PATCH 38/56] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 39628e1..4eeddd1 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 81%{?dist} +Release: 82%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -459,6 +459,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.4-82 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 4 2021 Andrew Cagney - 0.4-81 - require debugedit; fix hardwired path From 5802181851c982df7ae6bdaa246e4fe32cf84778 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 20:43:53 +0100 Subject: [PATCH 39/56] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 4eeddd1..b4affae 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 82%{?dist} +Release: 83%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -459,6 +459,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Sat Feb 05 2022 Jiri Vanek - 0.4-83 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 0.4-82 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 06cf29c0c0b7ffbaf0e3b70bab0f5c15bb7a582f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:41:36 +0000 Subject: [PATCH 40/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index b4affae..66949ad 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 83%{?dist} +Release: 84%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -459,6 +459,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.4-84 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 0.4-83 - Rebuilt for java-17-openjdk as system jdk From 038b1f7e9fadac008e451ec78fe354a3ac0de388 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 21 Jul 2022 13:31:05 -0400 Subject: [PATCH 41/56] ding dong the 32-bit Java is dead; #2104040 --- frysk.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frysk.spec b/frysk.spec index 66949ad..96fc61a 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 84%{?dist} +Release: 85%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -121,7 +121,8 @@ BuildRequires: make # Bug #467970: SPARC/SPARC64 not supported by frysk and libunwind. # Bug #467971: ARM not supported by frysk. # Bug #506961: S390(X) not supported by frysk and libunwind. -ExclusiveArch: %{ix86} x86_64 ppc64 +# Bug #2104040: native frysk depends on to be removed i686 java-openjdk packages +ExclusiveArch: x86_64 ppc64 # We do not want to build a ``cross-debugging version'' i686->i386; # libunwind build would get confused by this. Override the cmd-line @@ -459,6 +460,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jul 21 2022 Andrew Cagney - 0.4-85 +- ding dong the 32-bit Java is dead; #2104040 + * Thu Jul 21 2022 Fedora Release Engineering - 0.4-84 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e180ded93b911453814061fb7f3cf05810e7172d Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 29 Sep 2022 13:27:26 -0400 Subject: [PATCH 42/56] don't build libunwind tests; frysk-0.4-52-libunwind-tests.patch --- frysk-0.4-52-libunwind-tests.patch | 13 +++++++++++++ frysk.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-52-libunwind-tests.patch diff --git a/frysk-0.4-52-libunwind-tests.patch b/frysk-0.4-52-libunwind-tests.patch new file mode 100644 index 0000000..5adf6d2 --- /dev/null +++ b/frysk-0.4-52-libunwind-tests.patch @@ -0,0 +1,13 @@ +diff --git a/frysk-imports/libunwind/Makefile.am b/frysk-imports/libunwind/Makefile.am +index 6a3ed9e78..d0a23a569 100644 +--- frysk-0.4/frysk-imports/libunwind/Makefile.am.orig ++++ frysk-0.4/frysk-imports/libunwind/Makefile.am +@@ -42,7 +42,7 @@ endif + + nodist_include_HEADERS = include/libunwind-common.h + +-SUBDIRS = src tests ++SUBDIRS = src + + if CONFIG_DOCS + SUBDIRS += doc diff --git a/frysk.spec b/frysk.spec index 96fc61a..887ba61 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 85%{?dist} +Release: 86%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -70,6 +70,7 @@ Patch48: frysk-0.4-jnixx-dont-emit-nested-classes.patch Patch49: frysk-0.4-49-elf-newehdr-null.patch Patch50: frysk-0.4-50-autoconf-2-70-fixes.patch Patch51: frysk-0.4-51-debugedit-path.patch +Patch52: frysk-0.4-52-libunwind-tests.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -278,6 +279,7 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch49 -p1 -z .49-elf-newehdr-null %patch50 -p1 -z .50-autoconf-2-70-fixes %patch51 -p1 -z .51-debugedit-path +%patch52 -p1 -z .52-libunwind-tests.patch echo "%{version}-%{release}" > frysk-common/version.in @@ -460,6 +462,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Sep 29 2022 Andrew Cagney - 0.4-86 +- don't build libunwind tests; frysk-0.4-52-libunwind-tests.patch + * Thu Jul 21 2022 Andrew Cagney - 0.4-85 - ding dong the 32-bit Java is dead; #2104040 From 8b204e83ac5d6673f147ea1befc67d65e6c41d50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 03:57:40 +0000 Subject: [PATCH 43/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 887ba61..6a64c32 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 86%{?dist} +Release: 87%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -462,6 +462,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.4-87 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 29 2022 Andrew Cagney - 0.4-86 - don't build libunwind tests; frysk-0.4-52-libunwind-tests.patch From d65f29b78c285f112eed01bee6679b0e04c6ff77 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 9 Mar 2023 15:47:03 -0500 Subject: [PATCH 44/56] Update getopt and libunwind sub licences --- frysk.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frysk.spec b/frysk.spec index 6a64c32..8293d8e 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,16 +1,20 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 87%{?dist} +Release: 88%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 %define enable_devel %{fedora}0 < 170 -# getopt licence is GPLv2+ with exception -# frysk licence is GPLv2 with exception -# libunwind is MIT Modern Style with sublicense -License: GPLv2 with exceptions and MIT +# https://docs.fedoraproject.org/en-US/legal/allowed-licenses/ +# origin: Legacy Abbreviation -> SPDX +# +# getopt GPLv2+ with exception -> GPL-2.0-or-later WITH Classpath-exception-2.0 +# frysk: GPLv2 with exception -> GPL-2.0 WITH ???redhat??? exception +# libunwind: MIT Modern Style with sublicense -> MIT + +License: GPLv2 with exception AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT URL: http://sourceware.org/frysk Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2 @@ -462,6 +466,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Mar 9 2023 Andrew Cagney - 0.4-88 +- update getopt and libunwind sub licences + * Thu Jan 19 2023 Fedora Release Engineering - 0.4-87 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6bbb573a83d41570fff7e38d275ff761bee9eea2 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 3 Apr 2023 16:47:49 -0400 Subject: [PATCH 45/56] update frysk licence --- frysk.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frysk.spec b/frysk.spec index 8293d8e..0e0060b 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,20 +1,22 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 88%{?dist} +Release: 89%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 %define enable_devel %{fedora}0 < 170 # https://docs.fedoraproject.org/en-US/legal/allowed-licenses/ +# https://docs.fedoraproject.org/en-US/legal/license-review-process/ +# https://gitlab.com/fedora/legal/fedora-license-data/-/issues/new # origin: Legacy Abbreviation -> SPDX # # getopt GPLv2+ with exception -> GPL-2.0-or-later WITH Classpath-exception-2.0 -# frysk: GPLv2 with exception -> GPL-2.0 WITH ???redhat??? exception +# frysk: GPLv2 with 398-exception -> GPL-2.0 WITH ???redhat??? exception # libunwind: MIT Modern Style with sublicense -> MIT -License: GPLv2 with exception AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT +License: GPL-2.0-only WITH 389-exception AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT URL: http://sourceware.org/frysk Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2 @@ -466,6 +468,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Mon Apr 9 2023 Andrew Cagney - 0.4-89 +- update frysk licence + * Thu Mar 9 2023 Andrew Cagney - 0.4-88 - update getopt and libunwind sub licences From 0413799665470cf18ad8a434069893dd6149f546 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 15 May 2023 11:11:08 -0400 Subject: [PATCH 46/56] drop hack mangling _FORTIFY_SOURCE; fix 2161322 --- frysk.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frysk.spec b/frysk.spec index 0e0060b..732a76c 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 89%{?dist} +Release: 90%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -311,9 +311,6 @@ echo '#!/bin/sh -x' >> configure echo 'exec ../$(basename $0) "$@"' >> configure chmod a+x configure -# FIXME: Warnings should be fixed, not suppressed: -export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-Wp,-D_FORTIFY_SOURCE=2 /} - %configure \ CFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS" @@ -468,7 +465,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog -* Mon Apr 9 2023 Andrew Cagney - 0.4-89 +* Mon May 15 2023 Andrew Cagney - 0.4-90 +- drop hack mangling _FORTIFY_SOURCE; fix 2161322 + +* Mon Apr 3 2023 Andrew Cagney - 0.4-89 - update frysk licence * Thu Mar 9 2023 Andrew Cagney - 0.4-88 From 23596acd398525414a10f3f9a61df73ad49c6f0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:19:42 +0000 Subject: [PATCH 47/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 732a76c..c5e4517 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 90%{?dist} +Release: 91%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.4-91 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon May 15 2023 Andrew Cagney - 0.4-90 - drop hack mangling _FORTIFY_SOURCE; fix 2161322 From 5a100573218fb68a14abadb619332f84ac21cedb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:51:30 +0000 Subject: [PATCH 48/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index c5e4517..ce58fa3 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 91%{?dist} +Release: 92%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.4-92 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.4-91 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d136642936160a52958e6eea39c27d6a08d1834c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:06:24 +0000 Subject: [PATCH 49/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index ce58fa3..981a420 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 92%{?dist} +Release: 93%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.4-93 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.4-92 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 39913091ccb6ad3b2225a682064b52a236a5938d Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 15:33:09 +0100 Subject: [PATCH 50/56] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 981a420..7651766 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 93%{?dist} +Release: 94%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Feb 27 2024 Jiri Vanek - 0.4-94 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 0.4-93 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From df3591df6c9f90f506887c1e78c2e5abee455448 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 51/56] Eliminate use of obsolete %patchN syntax (#2283636) --- frysk.spec | 114 ++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/frysk.spec b/frysk.spec index 7651766..bb672b1 100644 --- a/frysk.spec +++ b/frysk.spec @@ -197,95 +197,95 @@ This package contains the GNOME front end for Frysk. %setup -q -n %{name}-%{version} pwd -%patch0 -p1 -z .head +%patch -P0 -p1 -z .head -%patch1 -p1 -z .bash-dollar-star -%patch2 -p1 -z .strayelsif -%patch3 -p1 -z .fdebugrpm -%patch4 -p1 -z .mktlwidgetdir -%patch5 -p1 -z .gcc-warnings -%patch6 -p1 -z .funitexitman +%patch -P1 -p1 -z .bash-dollar-star +%patch -P2 -p1 -z .strayelsif +%patch -P3 -p1 -z .fdebugrpm +%patch -P4 -p1 -z .mktlwidgetdir +%patch -P5 -p1 -z .gcc-warnings +%patch -P6 -p1 -z .funitexitman mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java -%patch7 -p1 -z .mvtesttomain -F 1 +%patch -P7 -p1 -z .mvtesttomain -F 1 mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.java -%patch8 -p1 -z .taskstoputil -F 3 -%patch9 -p1 -z .publictestbedsymtab -%patch10 -p1 -z .noelfmem -%patch11 -p1 -z .gccjint -%patch12 -p1 -z .taskstoperr -%patch13 -p1 -z .lostfork -%patch14 -p1 -z .nooptimize -%patch15 -p1 -z .skipdecl -%patch16 -p1 -z .flushstat -%patch17 -p1 -z .ftrace -%patch18 -p1 -z .usererrno -%patch19 -p1 -z .configure-enable-gnome -%patch20 -p1 -z .bin-antlr +%patch -P8 -p1 -z .taskstoputil -F 3 +%patch -P9 -p1 -z .publictestbedsymtab +%patch -P10 -p1 -z .noelfmem +%patch -P11 -p1 -z .gccjint +%patch -P12 -p1 -z .taskstoperr +%patch -P13 -p1 -z .lostfork +%patch -P14 -p1 -z .nooptimize +%patch -P15 -p1 -z .skipdecl +%patch -P16 -p1 -z .flushstat +%patch -P17 -p1 -z .ftrace +%patch -P18 -p1 -z .usererrno +%patch -P19 -p1 -z .configure-enable-gnome +%patch -P20 -p1 -z .bin-antlr %if %{fedora}0 >= 130 -%patch100 -p1 -z .aclocaljavac +%patch -P100 -p1 -z .aclocaljavac %endif %if %{enable_gnome} # don't apply - leaves default as build gnome %else -%patch101 -p1 -z .configure-enable-gnome +%patch -P101 -p1 -z .configure-enable-gnome %endif %if %{enable_devel} # don't apply - leaves devel package installed %else -%patch21 -p1 -z .nopkglibdir +%patch -P21 -p1 -z .nopkglibdir %endif -%patch1003 -p1 -z .nogtkwerror +%patch -P1003 -p1 -z .nogtkwerror -%patch666 -p1 -z .sodwfl +%patch -P666 -p1 -z .sodwfl rm -rf frysk-imports/elfutils %if %{enable_gnome} # don't apply, leave jdom around %else -%patch22 -p1 -z .no-jdom +%patch -P22 -p1 -z .no-jdom rm -rf frysk-core/frysk/dom rm -rf frysk-core/frysk/rt/LineXXX.java %endif -%patch23 -p1 -z .missing-javah-cni-built -%patch24 -p1 -z .jni -%patch25 -p1 -z .awk-gensub -%patch26 -p1 -z .pic-asm -%patch27 -p1 -z .per-thread-java-id -%patch28 -p1 -z .unwind-global-id -%patch29 -p1 -z .use-installed-antlr +%patch -P23 -p1 -z .missing-javah-cni-built +%patch -P24 -p1 -z .jni +%patch -P25 -p1 -z .awk-gensub +%patch -P26 -p1 -z .pic-asm +%patch -P27 -p1 -z .per-thread-java-id +%patch -P28 -p1 -z .unwind-global-id +%patch -P29 -p1 -z .use-installed-antlr rm -rf frysk-imports/antlr -%patch30 -p1 -z .use-installed-junit +%patch -P30 -p1 -z .use-installed-junit rm -rf frysk-imports/junit -%patch31 -p1 -z .jni-issameobject -%patch32 -p1 -z .switch-ecj-to-javac -%patch33 -p1 -z .use-installed-jline +%patch -P31 -p1 -z .jni-issameobject +%patch -P32 -p1 -z .switch-ecj-to-javac +%patch -P33 -p1 -z .use-installed-jline rm -rf frysk-imports/jline # automake doesn't like old names mv frysk-imports/libunwind/configure.{in,ac} -%patch34 -p1 -z .libunwind-fstack -%patch35 -p1 -z .clone-cursor -%patch36 -p1 -z .fedpkg-lint-licence -%patch37 -p1 -z .fedpkg-lint-solib -%patch38 -p1 -z .gelf-newphdr -%patch39 -p1 -z .jnixx-signed-unsigned -%patch40 -p1 -z .check-p-not-status -%patch41 -p1 -z .python3 -%patch42 -p1 -z .jline1-to-jline -%patch43 -p1 -z .disable-arch32-tests -%patch44 -p1 -z .steptester-indentation -%patch45 -p1 -z .gcc-fcommon -%patch46 -p1 -z .javac -%patch47 -p1 -z .jnixx-union-as-reserved-word -%patch48 -p1 -z .jnixx-dont-emit-nested-classes -%patch49 -p1 -z .49-elf-newehdr-null -%patch50 -p1 -z .50-autoconf-2-70-fixes -%patch51 -p1 -z .51-debugedit-path -%patch52 -p1 -z .52-libunwind-tests.patch +%patch -P34 -p1 -z .libunwind-fstack +%patch -P35 -p1 -z .clone-cursor +%patch -P36 -p1 -z .fedpkg-lint-licence +%patch -P37 -p1 -z .fedpkg-lint-solib +%patch -P38 -p1 -z .gelf-newphdr +%patch -P39 -p1 -z .jnixx-signed-unsigned +%patch -P40 -p1 -z .check-p-not-status +%patch -P41 -p1 -z .python3 +%patch -P42 -p1 -z .jline1-to-jline +%patch -P43 -p1 -z .disable-arch32-tests +%patch -P44 -p1 -z .steptester-indentation +%patch -P45 -p1 -z .gcc-fcommon +%patch -P46 -p1 -z .javac +%patch -P47 -p1 -z .jnixx-union-as-reserved-word +%patch -P48 -p1 -z .jnixx-dont-emit-nested-classes +%patch -P49 -p1 -z .49-elf-newehdr-null +%patch -P50 -p1 -z .50-autoconf-2-70-fixes +%patch -P51 -p1 -z .51-debugedit-path +%patch -P52 -p1 -z .52-libunwind-tests.patch echo "%{version}-%{release}" > frysk-common/version.in From 3655ee9878bbeb6fc272849f593cdf147d3709f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:42:57 +0000 Subject: [PATCH 52/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index bb672b1..0a7d1fc 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 94%{?dist} +Release: 95%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.4-95 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 0.4-94 - Rebuilt for java-21-openjdk as system jdk From de0a6f43a18135982d44d2eeaa418dc3717f9645 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:54:59 +0000 Subject: [PATCH 53/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index 0a7d1fc..c92ee1c 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 95%{?dist} +Release: 96%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -465,6 +465,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.4-96 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0.4-95 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2b81f52b88aba5ad06bd05361732d19f4aef3723 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 28 Feb 2025 16:00:04 -0500 Subject: [PATCH 54/56] Fix latest java and C errors. --- frysk-0.4-53-no-new-integer.patch | 1622 +++++++++++++++++++++++++++++ frysk-0.4-54-c-warnings.patch | 135 +++ frysk.spec | 10 +- 3 files changed, 1766 insertions(+), 1 deletion(-) create mode 100644 frysk-0.4-53-no-new-integer.patch create mode 100644 frysk-0.4-54-c-warnings.patch diff --git a/frysk-0.4-53-no-new-integer.patch b/frysk-0.4-53-no-new-integer.patch new file mode 100644 index 0000000..480d58d --- /dev/null +++ b/frysk-0.4-53-no-new-integer.patch @@ -0,0 +1,1622 @@ +diff --git a/frysk-common/antlr-warnings.awk b/frysk-common/antlr-warnings.awk +index 6656fb721..fcd01131e 100644 +--- a/frysk-common/antlr-warnings.awk ++++ b/frysk-common/antlr-warnings.awk +@@ -106,6 +106,16 @@ function sed_comment(code) { + return "s," code ",// " code "," + } + ++# warning: [removal] Integer(int) in Integer has been deprecated and marked for removal ++prob ~ /Integer.int. in Integer has been deprecated/ { ++ sed = "s,new Integer(,Integer.valueOf(," ++} ++ ++# warning: [removal] Long(long) in Long has been deprecated and marked for removal ++prob ~ /Long.long. in Long has been deprecated/ { ++ sed = "s,new Long(,Long.valueOf(," ++} ++ + prob ~ /Unnecessary semicolon/ || prob ~ /An empty declaration is a deprecated feature/ { + if (code ~ /};/) { + sed = "s,};,} // ;," +diff --git a/frysk-core/frysk/bindir/fstack.java b/frysk-core/frysk/bindir/fstack.java +index a945fcaa7..18ddad26f 100644 +--- a/frysk-core/frysk/bindir/fstack.java ++++ b/frysk-core/frysk/bindir/fstack.java +@@ -88,7 +88,7 @@ public final class fstack { + + TreeMap sortedTasks = new TreeMap(); + for (int i=0; i>> operand1)); ++ stack.addFirst(Long.valueOf(operand2 >>> operand1)); + break; + + case DwOp.SHRA_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long(operand2 >> operand1)); ++ stack.addFirst(Long.valueOf(operand2 >> operand1)); + break; + + case DwOp.XOR_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long(operand1 ^ operand2)); ++ stack.addFirst(Long.valueOf(operand1 ^ operand2)); + break; + + case DwOp.NEG_: + operand1 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long(0-operand1)); ++ stack.addFirst(Long.valueOf(0-operand1)); + break; + + case DwOp.NOT_: + operand1 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long(~operand1)); ++ stack.addFirst(Long.valueOf(~operand1)); + break; + + // Control flow operations + case DwOp.LE_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 <= operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 <= operand1)? 1:0)); + break; + + case DwOp.GE_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 >= operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 >= operand1)? 1:0)); + break; + + case DwOp.EQ_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 == operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 == operand1)? 1:0)); + break; + + case DwOp.LT_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 < operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 < operand1)? 1:0)); + break; + + case DwOp.GT_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 > operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 > operand1)? 1:0)); + break; + + case DwOp.NE_: + operand1 = ((Long)stack.removeFirst()).longValue(); + operand2 = ((Long)stack.removeFirst()).longValue(); +- stack.addFirst(new Long((operand2 != operand1)? 1:0)); ++ stack.addFirst(Long.valueOf((operand2 != operand1)? 1:0)); + break; + + //Special Operations +diff --git a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java +index c803bdcdd..d705aeb3f 100644 +--- a/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java ++++ b/frysk-core/frysk/debuginfo/TestDebugInfoStackTrace.java +@@ -325,13 +325,13 @@ public class TestDebugInfoStackTrace + DebugInfoFrame frame = DebugInfoStackFactory.createDebugInfoStackTrace(myTask); + + if (frame.getLine() == SourceLocation.UNKNOWN) { +- this.lineMap.put(myTask, new Integer(0)); ++ this.lineMap.put(myTask, Integer.valueOf(0)); + steppingEngine.stepLine(myTask.getProc().getTasks()); + return; + } + + SourceLocation line = frame.getLine(); +- this.lineMap.put(myTask, new Integer(line.getLine())); ++ this.lineMap.put(myTask, Integer.valueOf(line.getLine())); + steppingEngine.stepLine(myTask.getProc().getTasks()); + } + +@@ -514,7 +514,7 @@ public class TestDebugInfoStackTrace + line = sFrame.getLine(); + lineNum = line.getLine(); + } +- this.lineMap.put(myTask, new Integer(lineNum)); ++ this.lineMap.put(myTask, Integer.valueOf(lineNum)); + if (this.testState == PUSH) + this.testState = PUSH_GO; + else if (this.testState == POP) +@@ -529,7 +529,7 @@ public class TestDebugInfoStackTrace + if (this.testState != PUSH_STEPPING && this.testState != POP_STEPPING) + { + int prev = ((Integer) this.lineMap.get(myTask)).intValue(); +- this.lineMap.put(myTask, new Integer(line.getLine())); ++ this.lineMap.put(myTask, Integer.valueOf(line.getLine())); + + if (this.testState == PUSH_GO) + { +diff --git a/frysk-core/frysk/debuginfo/TypeFactory.java b/frysk-core/frysk/debuginfo/TypeFactory.java +index 26bcb3162..5d833cced 100644 +--- a/frysk-core/frysk/debuginfo/TypeFactory.java ++++ b/frysk-core/frysk/debuginfo/TypeFactory.java +@@ -115,7 +115,7 @@ public class TypeFactory { + ArrayList dims = new ArrayList(); + while (subrange != null) { + int arrDim = subrange.getAttrConstant(DwAt.UPPER_BOUND); +- dims.add(new Integer(arrDim)); ++ dims.add(Integer.valueOf(arrDim)); + subrange = subrange.getSibling(); + elementCount *= arrDim + 1; + } +@@ -254,7 +254,7 @@ public class TypeFactory { + else + type = new GccStructOrClassType(name, getByteSize(classDie)); + +- dieHash.put(new Long(classDie.getOffset()), type); ++ dieHash.put(Long.valueOf(classDie.getOffset()), type); + addMembers(classDie, type); + + return type; +@@ -272,7 +272,7 @@ public class TypeFactory { + dumpDie("classDie=", classDie); + + ClassType classType = new ClassType(name, getByteSize(classDie)); +- dieHash.put(new Long(classDie.getOffset()), classType); ++ dieHash.put(Long.valueOf(classDie.getOffset()), classType); + addMembers(classDie, classType); + return classType; + } +@@ -320,7 +320,7 @@ public class TypeFactory { + dumpDie("unionDie=", classDie); + + UnionType classType = new UnionType(name, getByteSize(classDie)); +- dieHash.put(new Long(classDie.getOffset()), classType); ++ dieHash.put(Long.valueOf(classDie.getOffset()), classType); + + for (DwarfDie member = classDie.getChild(); + member != null; +@@ -434,14 +434,14 @@ public class TypeFactory { + } else + type = typeDie; + +- Type mappedType = (Type) dieHash.get(new Long(type.getOffset())); ++ Type mappedType = (Type) dieHash.get(Long.valueOf(type.getOffset())); + if (mappedType != null) + return mappedType; +- else if (dieHash.containsKey(new Long(type.getOffset()))) { ++ else if (dieHash.containsKey(Long.valueOf(type.getOffset()))) { + // This is a self reference +- return (Type)dieHash.get(new Long(type.getOffset())); ++ return (Type)dieHash.get(Long.valueOf(type.getOffset())); + } +- dieHash.put(new Long(type.getOffset()), null); ++ dieHash.put(Long.valueOf(type.getOffset()), null); + Type returnType = null; + + switch (type.getTag().hashCode()) { +@@ -536,7 +536,7 @@ public class TypeFactory { + } + + if (returnType != null) { +- dieHash.put(new Long(type.getOffset()), returnType); ++ dieHash.put(Long.valueOf(type.getOffset()), returnType); + return returnType; + } else + return new UnknownType(typeDie.getName()); +diff --git a/frysk-core/frysk/expr/FQIdentifier.java b/frysk-core/frysk/expr/FQIdentifier.java +index 8a58dd4fc..3611276af 100644 +--- a/frysk-core/frysk/expr/FQIdentifier.java ++++ b/frysk-core/frysk/expr/FQIdentifier.java +@@ -88,14 +88,14 @@ public class FQIdentifier { + if (tok.threadId == null || tok.frameNumber == null) + throw new AssertionError("Either I need a pid, a tid, AND a " + + "frame number, or neither of them."); +- this.processId = new Long(Long.parseLong(tok.processId, 10)); +- this.threadId = new Long(Long.parseLong(tok.threadId, 10)); +- this.frameNumber = new Long(Long.parseLong(tok.frameNumber, 10)); ++ this.processId = Long.valueOf(Long.parseLong(tok.processId, 10)); ++ this.threadId = Long.valueOf(Long.parseLong(tok.threadId, 10)); ++ this.frameNumber = Long.valueOf(Long.parseLong(tok.frameNumber, 10)); + } else + this.processId = this.threadId = this.frameNumber = null; + + if (tok.line != null) +- this.line = new Long(Long.parseLong(tok.line, 10)); ++ this.line = Long.valueOf(Long.parseLong(tok.line, 10)); + else + this.line = null; + +diff --git a/frysk-core/frysk/expr/TestbedSymTab.java b/frysk-core/frysk/expr/TestbedSymTab.java +index b89051d6a..b1747185a 100644 +--- a/frysk-core/frysk/expr/TestbedSymTab.java ++++ b/frysk-core/frysk/expr/TestbedSymTab.java +@@ -78,7 +78,7 @@ public class TestbedSymTab implements ExprSymTab { + + private static ArrayList dims() { + final ArrayList a = new ArrayList(); +- a.add(new Integer(3)); ++ a.add(Integer.valueOf(3)); + return a; + } + private Type arrayType = new ArrayType(StandardTypes.INT32B_T, 12, dims()); +diff --git a/frysk-core/frysk/ftrace/FtraceController.java b/frysk-core/frysk/ftrace/FtraceController.java +index b22655079..31e542baa 100644 +--- a/frysk-core/frysk/ftrace/FtraceController.java ++++ b/frysk-core/frysk/ftrace/FtraceController.java +@@ -227,7 +227,7 @@ public class FtraceController + for (Iterator it = rules.iterator(); it.hasNext(); ) { + final AddrRule rule = (AddrRule)it.next(); + final List candidate = new ArrayList(1); +- candidate.add(new Long(rule.addr)); ++ candidate.add(Long.valueOf(rule.addr)); + + fine.log("Considering addr rule", rule); + +diff --git a/frysk-core/frysk/ftrace/IA32Arch.java b/frysk-core/frysk/ftrace/IA32Arch.java +index 21e4aa0ec..4181a1faa 100644 +--- a/frysk-core/frysk/ftrace/IA32Arch.java ++++ b/frysk-core/frysk/ftrace/IA32Arch.java +@@ -83,7 +83,7 @@ public class IA32Arch implements Arch { + */ + Object[] ret = new Object[6]; + for (int i = 0; i < ret.length; ++i) { +- ret[i] = new Integer(memBuf.getInt(esp)); ++ ret[i] = Integer.valueOf(memBuf.getInt(esp)); + esp += 4; + } + return ret; +@@ -91,6 +91,6 @@ public class IA32Arch implements Arch { + } + + public Object getReturnValue(Task task) { +- return new Long(task.getRegister(IA32Registers.EAX)); ++ return Long.valueOf(task.getRegister(IA32Registers.EAX)); + } + } +diff --git a/frysk-core/frysk/ftrace/MappingGuard.java b/frysk-core/frysk/ftrace/MappingGuard.java +index 1cef4c7cc..12e961adc 100644 +--- a/frysk-core/frysk/ftrace/MappingGuard.java ++++ b/frysk-core/frysk/ftrace/MappingGuard.java +@@ -90,7 +90,7 @@ class MappingGuard + if (v == 0) + observers.remove(observer); + else +- observers.put(observer, new Integer(v)); ++ observers.put(observer, Integer.valueOf(v)); + + // XXX: again, probably too early for the last observer + // which was requestDeleted. +@@ -101,9 +101,9 @@ class MappingGuard + public synchronized void addObserver(MappingObserver observer) { + Integer i = (Integer)observers.get(observer); + if (i == null) +- i = new Integer(1); ++ i = Integer.valueOf(1); + else +- i = new Integer(i.intValue() + 1); ++ i = Integer.valueOf(i.intValue() + 1); + observers.put(observer, i); + + +diff --git a/frysk-core/frysk/ftrace/TaskTracer.java b/frysk-core/frysk/ftrace/TaskTracer.java +index 9a654ec97..139c5d449 100644 +--- a/frysk-core/frysk/ftrace/TaskTracer.java ++++ b/frysk-core/frysk/ftrace/TaskTracer.java +@@ -201,7 +201,7 @@ class TaskTracer + // been hit. + if (symbolList.isEmpty()) { + fine.log("Removing leave breakpoint."); +- functionReturnObservers.remove(new Long(address)); ++ functionReturnObservers.remove(Long.valueOf(address)); + task.requestDeleteCodeObserver(this, address); + + // Take time to retract +@@ -311,7 +311,7 @@ class TaskTracer + ftrace.reporter.eventEntry(task, tracePoint, "call", + eventName, arch.getCallArguments(task)); + +- Long retAddressL = new Long(retAddress); ++ Long retAddressL = Long.valueOf(retAddress); + FunctionReturnObserver retObserver + = (FunctionReturnObserver)functionReturnObservers.get(retAddressL); + if (retObserver == null) { +@@ -368,7 +368,7 @@ class TaskTracer + + private Long getAddress(DwflSymbol sym, PLTEntry entry) { + long addr = entry != null ? entry.getAddress() : sym.getAddress(); +- Long addrL = new Long(addr); ++ Long addrL = Long.valueOf(addr); + return addrL; + } + +diff --git a/frysk-core/frysk/ftrace/X8664Arch.java b/frysk-core/frysk/ftrace/X8664Arch.java +index 05f267caf..da8c69d26 100644 +--- a/frysk-core/frysk/ftrace/X8664Arch.java ++++ b/frysk-core/frysk/ftrace/X8664Arch.java +@@ -72,10 +72,10 @@ public class X8664Arch implements Arch { + case 5: reg = X8664Registers.R9; break; + default: + long address = task.getRegister(X8664Registers.RSP) + 8 * (i - 5); +- return new Long(memBuf.getLong(address)); ++ return Long.valueOf(memBuf.getLong(address)); + } + +- return new Long(task.getRegister(reg)); ++ return Long.valueOf(task.getRegister(reg)); + } + + public Object[] getCallArguments(Task task) { +@@ -86,6 +86,6 @@ public class X8664Arch implements Arch { + } + + public Object getReturnValue(Task task) { +- return new Long(task.getRegister(X8664Registers.RAX)); ++ return Long.valueOf(task.getRegister(X8664Registers.RAX)); + } + } +diff --git a/frysk-core/frysk/hpd/AllPTSet.java b/frysk-core/frysk/hpd/AllPTSet.java +index 5af83567a..ee1e08c64 100644 +--- a/frysk-core/frysk/hpd/AllPTSet.java ++++ b/frysk-core/frysk/hpd/AllPTSet.java +@@ -371,15 +371,15 @@ class AllPTSet implements PTSet + tempSet = (ArrayList)taskSets.get(procP); + } + +- if (!proctasks.containsKey(new Integer(procP))) // if this process hasn't been added yet ++ if (!proctasks.containsKey(Integer.valueOf(procP))) // if this process hasn't been added yet + { + //create a new ProcTasks for this process + tempPT = new ProcTasks(new ProcData( getProc(procP), procP )); +- proctasks.put( new Integer(procP), tempPT); ++ proctasks.put( Integer.valueOf(procP), tempPT); + } + else + { +- tempPT = (ProcTasks) proctasks.get(new Integer(procP)); ++ tempPT = (ProcTasks) proctasks.get(Integer.valueOf(procP)); + } + + tempPT.addTaskData(new TaskData( (Task)tempSet.get(taskP), taskP, procP )); +@@ -435,15 +435,15 @@ class AllPTSet implements PTSet + tempSet = (ArrayList)taskSets.get(procP); + } + +- if (!proctasks.containsKey(new Integer(procP))) // if this process hasn't been added yet ++ if (!proctasks.containsKey(Integer.valueOf(procP))) // if this process hasn't been added yet + { + //create a new ProcTasks for this process + tempPT = new ProcTasks(new ProcData( getProc(procP), procP )); +- proctasks.put( new Integer(procP), tempPT); ++ proctasks.put( Integer.valueOf(procP), tempPT); + } + else + { +- tempPT = (ProcTasks) proctasks.get(new Integer(procP)); ++ tempPT = (ProcTasks) proctasks.get(Integer.valueOf(procP)); + } + + tempPT.addTaskData(new TaskData( (Task)tempSet.get(taskP), taskP, procP )); +diff --git a/frysk-core/frysk/hpd/CoreCommand.java b/frysk-core/frysk/hpd/CoreCommand.java +index 514545984..1123d3b84 100644 +--- a/frysk-core/frysk/hpd/CoreCommand.java ++++ b/frysk-core/frysk/hpd/CoreCommand.java +@@ -138,8 +138,8 @@ public class CoreCommand extends ParameterizedCommand { + } + // Finally, done. + synchronized (cli) { +- cli.coreProcs.put(new Integer(procID), coreProc); +- cli.ptsetParams.put(new Integer(procID), coreProc.getCmdLine()); ++ cli.coreProcs.put(Integer.valueOf(procID), coreProc); ++ cli.ptsetParams.put(Integer.valueOf(procID), coreProc.getCmdLine()); + } + cli.outWriter.println("Attached to core file: " + + coreProc.getHost().getName()); +diff --git a/frysk-core/frysk/hpd/DbgVariables.java b/frysk-core/frysk/hpd/DbgVariables.java +index 4b3dda94e..da4c08625 100644 +--- a/frysk-core/frysk/hpd/DbgVariables.java ++++ b/frysk-core/frysk/hpd/DbgVariables.java +@@ -109,10 +109,10 @@ public class DbgVariables { + vars.put("EVENT_INTERRUPT", new Value(VARTYPE_CUSTOM, "ON", new String[] {"ON", "OFF"})); + vars.put("VERBOSE", new Value(VARTYPE_CUSTOM, "WARN", new String[] {"WARN", "ERR", "ALL"})); + vars.put("ERROR_CHECKS", new Value(VARTYPE_CUSTOM, "NORMAL", new String[] {"NORMAL", "MIN", "MAX"})); +- vars.put("MAX_PROMPT", new Value(VARTYPE_INT, new Integer(40))); +- vars.put("MAX_HISTORY", new Value(VARTYPE_INT, new Integer(20))); +- vars.put("MAX_LEVELS", new Value(VARTYPE_INT, new Integer(20))); +- vars.put("MAX_LIST", new Value(VARTYPE_INT, new Integer(20))); ++ vars.put("MAX_PROMPT", new Value(VARTYPE_INT, Integer.valueOf(40))); ++ vars.put("MAX_HISTORY", new Value(VARTYPE_INT, Integer.valueOf(20))); ++ vars.put("MAX_LEVELS", new Value(VARTYPE_INT, Integer.valueOf(20))); ++ vars.put("MAX_LIST", new Value(VARTYPE_INT, Integer.valueOf(20))); + vars.put("PROMPT", new Value(VARTYPE_STRING, "(frysk) ")); + vars.put("SOURCE_PATH", new Value(VARTYPE_STRING, "")); + vars.put("EXECUTABLE_PATH", new Value(VARTYPE_STRING, "./:" + System.getenv("PATH"))); +diff --git a/frysk-core/frysk/hpd/InfoArgsCommand.java b/frysk-core/frysk/hpd/InfoArgsCommand.java +index 33d99a76c..24fb66fca 100644 +--- a/frysk-core/frysk/hpd/InfoArgsCommand.java ++++ b/frysk-core/frysk/hpd/InfoArgsCommand.java +@@ -57,7 +57,7 @@ class InfoArgsCommand extends ParameterizedCommand { + td.printHeader(cli.outWriter); + int parentID = td.getParentID(); + String[] args = (String[]) cli.ptsetParams +- .get(new Integer(parentID)); ++ .get(Integer.valueOf(parentID)); + cli.outWriter.println("The args list for: " + args[0] + + " is....."); + if (args.length > 1) +diff --git a/frysk-core/frysk/hpd/KillCommand.java b/frysk-core/frysk/hpd/KillCommand.java +index e9debcd81..54c9367ae 100644 +--- a/frysk-core/frysk/hpd/KillCommand.java ++++ b/frysk-core/frysk/hpd/KillCommand.java +@@ -151,7 +151,7 @@ public class KillCommand extends ParameterizedCommand { + + " that was created from " + proc.getExeFile().getSysRootedPath(), + Message.TYPE_NORMAL); + // Save the procs we are killing so we can re-load them later +- saveProcs.put(new Integer(taskData.getParentID()), proc.getExeFile()); ++ saveProcs.put(Integer.valueOf(taskData.getParentID()), proc.getExeFile()); + procPID = proc.getPid(); + // Now, call the Proc object to kill off the executable(s) + proc.requestKill(); +@@ -199,7 +199,7 @@ public class KillCommand extends ParameterizedCommand { + Proc taskProc = taskData.getTask().getProc(); + procId = taskProc.getPid(); + if (taskProc == proc && tempId != procId) { +- saveProcs.put(new Integer(taskData.getParentID()), proc.getExeFile()); ++ saveProcs.put(Integer.valueOf(taskData.getParentID()), proc.getExeFile()); + cli.addMessage("Killing process " + proc.getPid() + + " that was created from " + proc.getExeFile().getSysRootedPath(), + Message.TYPE_NORMAL); +diff --git a/frysk-core/frysk/hpd/LoadCommand.java b/frysk-core/frysk/hpd/LoadCommand.java +index 63535fc6c..ad6a1c1e4 100644 +--- a/frysk-core/frysk/hpd/LoadCommand.java ++++ b/frysk-core/frysk/hpd/LoadCommand.java +@@ -134,7 +134,7 @@ public class LoadCommand extends ParameterizedCommand { + cli.idManager.manageProc(exeProc, procID); + + if (params.length == 1) +- params = (String []) cli.ptsetParams.get(new Integer(procID)); ++ params = (String []) cli.ptsetParams.get(Integer.valueOf(procID)); + + Iterator foo = cli.targetset.getTasks(); + while (foo.hasNext()) { +@@ -148,15 +148,15 @@ public class LoadCommand extends ParameterizedCommand { + } + + synchronized (cli) { +- cli.loadedProcs.put(new Integer(procID), ++ cli.loadedProcs.put(Integer.valueOf(procID), + exeProc.getExeFile().getSysRootedPath()); + if (params != null) { + params[0] = exeProc.getExeFile().getSysRootedPath(); +- cli.ptsetParams.put(new Integer(procID), params); ++ cli.ptsetParams.put(Integer.valueOf(procID), params); + } + else { + String[] command = { exeProc.getExeFile().getSysRootedPath() }; +- cli.ptsetParams.put(new Integer(procID), command); ++ cli.ptsetParams.put(Integer.valueOf(procID), command); + } + } + +diff --git a/frysk-core/frysk/hpd/ProcTasks.java b/frysk-core/frysk/hpd/ProcTasks.java +index f1f73ca23..add151ca4 100644 +--- a/frysk-core/frysk/hpd/ProcTasks.java ++++ b/frysk-core/frysk/hpd/ProcTasks.java +@@ -76,7 +76,7 @@ class ProcTasks + if (temp.getParentID() == proc.getID()) + { + //task id -> task +- tasks.put(new Integer(temp.getID()), temp); ++ tasks.put(Integer.valueOf(temp.getID()), temp); + } + else + throw new IllegalArgumentException("ProcTasks was passed" + +@@ -86,7 +86,7 @@ class ProcTasks + + public boolean containsTask(int taskID) + { +- return tasks.containsKey(new Integer(taskID)); ++ return tasks.containsKey(Integer.valueOf(taskID)); + } + + public ProcData getProcData() +@@ -108,7 +108,7 @@ class ProcTasks + if (task.getParentID() == proc.getID()) + { + //task id -> task +- tasks.put(new Integer(task.getID()), task); ++ tasks.put(Integer.valueOf(task.getID()), task); + } + else + throw new IllegalArgumentException("ProcTasks was passed Task not from this instance's process."); +diff --git a/frysk-core/frysk/hpd/StartRun.java b/frysk-core/frysk/hpd/StartRun.java +index a7b0e4bd7..e7c411d7d 100644 +--- a/frysk-core/frysk/hpd/StartRun.java ++++ b/frysk-core/frysk/hpd/StartRun.java +@@ -143,7 +143,7 @@ abstract class StartRun extends ParameterizedCommand { + while (foo.hasNext()) { + taskData = (TaskData) foo.next(); + int parentID = taskData.getParentID(); +- String command = (String) cli.loadedProcs.get(new Integer(parentID)); ++ String command = (String) cli.loadedProcs.get(Integer.valueOf(parentID)); + run(cli, cmd, command, runToBreak, + taskData.getParentID()); + counter++; +@@ -160,7 +160,7 @@ abstract class StartRun extends ParameterizedCommand { + TaskData taskData = (TaskData) foo.next(); + Task task = taskData.getTask(); + if (!cli.loadedProcs.isEmpty() && +- cli.loadedProcs.containsKey(new Integer(taskData.getParentID()))) { ++ cli.loadedProcs.containsKey(Integer.valueOf(taskData.getParentID()))) { + run(cli, cmd, task.getProc().getExeFile().getSysRootedPath(), + runToBreak, taskData.getParentID()); + synchronized (cli) { +@@ -169,11 +169,11 @@ abstract class StartRun extends ParameterizedCommand { + } + // Take care of core procs + else if (!cli.coreProcs.isEmpty() && +- cli.coreProcs.containsKey(new Integer(taskData.getParentID()))) { ++ cli.coreProcs.containsKey(Integer.valueOf(taskData.getParentID()))) { + run(cli, cmd, task.getProc().getExeFile().getSysRootedPath(), + runToBreak, taskData.getParentID()); + synchronized (cli) { +- cli.coreProcs.remove(new Integer(taskData.getParentID())); ++ cli.coreProcs.remove(Integer.valueOf(taskData.getParentID())); + } + } + } +@@ -210,16 +210,16 @@ abstract class StartRun extends ParameterizedCommand { + int index = cmd.getFullCommand().indexOf("--"); + if (index != -1) { + String[] command = new String[1]; +- String[] oldCommand = (String[]) cli.ptsetParams.get(new Integer(parentID)); ++ String[] oldCommand = (String[]) cli.ptsetParams.get(Integer.valueOf(parentID)); + command[0] = oldCommand[0]; + // Set proc params to null so we won't run with them again +- cli.ptsetParams.put(new Integer(parentID), command); ++ cli.ptsetParams.put(Integer.valueOf(parentID), command); + } + break; + + // Params were passed + default: +- cli.ptsetParams.put(new Integer(parentID), ++ cli.ptsetParams.put(Integer.valueOf(parentID), + makeCommand(cmd.stringArrayValue(), parentID, cli)); + break; + } +@@ -236,7 +236,7 @@ abstract class StartRun extends ParameterizedCommand { + + private String[] makeCommand(String[] params, int parentID, CLI cli) { + String[] newParams = new String[params.length + 1]; +- String[] oldParams = (String[]) cli.ptsetParams.get(new Integer(parentID)); ++ String[] oldParams = (String[]) cli.ptsetParams.get(Integer.valueOf(parentID)); + newParams[0] = oldParams[0]; + for (int i = 1; i < newParams.length; i++) + newParams[i] = params[i-1]; +@@ -267,7 +267,7 @@ abstract class StartRun extends ParameterizedCommand { + // Don't kill loaded procs, don't have a PID assigned yet + task.getProc().getPid() > 0 && + // Don't kill core procs either, they have the old PID number +- cli.coreProcs.get(new Integer(taskData.getParentID())) == null) { ++ cli.coreProcs.get(Integer.valueOf(taskData.getParentID())) == null) { + cli.execCommand("kill " + task.getProc().getPid() + "\n"); + oldPid = task.getProc().getPid(); + } +@@ -301,10 +301,10 @@ abstract class StartRun extends ParameterizedCommand { + + cli.addMessage(startrun + + " with this command: " +- + asString((String[]) cli.ptsetParams.get(new Integer( ++ + asString((String[]) cli.ptsetParams.get(Integer.valueOf( + taskid))), Message.TYPE_NORMAL); + Manager.host.requestCreateAttachedProc((String[]) cli.ptsetParams +- .get(new Integer(taskid)), runner); ++ .get(Integer.valueOf(taskid)), runner); + + while (true) { + try { +diff --git a/frysk-core/frysk/hpd/UnloadCommand.java b/frysk-core/frysk/hpd/UnloadCommand.java +index edbcfce23..0c601e987 100644 +--- a/frysk-core/frysk/hpd/UnloadCommand.java ++++ b/frysk-core/frysk/hpd/UnloadCommand.java +@@ -78,7 +78,7 @@ public class UnloadCommand extends ParameterizedCommand { + throw new InvalidCommandException("Not enough parameters"); + int id = Integer.parseInt(cmd.parameter(1)); + synchronized (cli) { +- if (cli.loadedProcs.remove(new Integer(id)) == null) { ++ if (cli.loadedProcs.remove(Integer.valueOf(id)) == null) { + cli.addMessage( + "Trying to remove a proc that has not been loaded", + Message.TYPE_ERROR); +diff --git a/frysk-core/frysk/hpd/ViewsetCommand.java b/frysk-core/frysk/hpd/ViewsetCommand.java +index 0bd3fbd9e..91c357607 100644 +--- a/frysk-core/frysk/hpd/ViewsetCommand.java ++++ b/frysk-core/frysk/hpd/ViewsetCommand.java +@@ -99,7 +99,7 @@ class ViewsetCommand extends ParameterizedCommand { + cli.outWriter.println("\tpid\tid\tpath-to-executable"); + for (Iterator iter = tempset.getTaskData(); iter.hasNext();) { + temptd = (TaskData) iter.next(); +- if (loadedOnly && cli.loadedProcs.containsValue(new Integer(temptd.getID())) ++ if (loadedOnly && cli.loadedProcs.containsValue(Integer.valueOf(temptd.getID())) + || loadedOnly && cli.loadedProcs.containsKey(temptd.getTask().getProc()) + || !loadedOnly) { + cli.outWriter.print("["); +diff --git a/frysk-core/frysk/isa/ElfMap.java b/frysk-core/frysk/isa/ElfMap.java +index be2abd113..3cb3626a2 100644 +--- a/frysk-core/frysk/isa/ElfMap.java ++++ b/frysk-core/frysk/isa/ElfMap.java +@@ -52,7 +52,7 @@ import java.util.HashMap; + public final class ElfMap { + private static final Map isaToMachine; + private static void add(int m, ISA isa) { +- Integer machine = new Integer(m); ++ Integer machine = Integer.valueOf(m); + isaToMachine.put(isa, machine); + } + static { +diff --git a/frysk-core/frysk/isa/registers/RegisterMap.java b/frysk-core/frysk/isa/registers/RegisterMap.java +index fd5e1a46d..743c0e167 100644 +--- a/frysk-core/frysk/isa/registers/RegisterMap.java ++++ b/frysk-core/frysk/isa/registers/RegisterMap.java +@@ -66,7 +66,7 @@ public class RegisterMap { + public final RegisterMap add(Register register, + Number number) { + registerToNumber.put(register, number); +- integerToRegister.put(new Integer(number.intValue()), register); ++ integerToRegister.put(Integer.valueOf(number.intValue()), register); + numberToRegister.put(number, register); + return this; + } +@@ -90,7 +90,7 @@ public class RegisterMap { + */ + public Register getRegister(int regNum) { + Register register +- = (Register) integerToRegister.get(new Integer(regNum)); ++ = (Register) integerToRegister.get(Integer.valueOf(regNum)); + if (register == null) + throw new NullPointerException("register number <" + regNum + + "> not found in " + what +@@ -127,6 +127,6 @@ public class RegisterMap { + * Return true if REG_NUM (as a Number) is known. + */ + public boolean containsKey(int regNum) { +- return integerToRegister.containsKey(new Integer(regNum)); ++ return integerToRegister.containsKey(Integer.valueOf(regNum)); + } + } +diff --git a/frysk-core/frysk/isa/registers/TestRegisterMap.java b/frysk-core/frysk/isa/registers/TestRegisterMap.java +index 0e8c72744..95d8419c4 100644 +--- a/frysk-core/frysk/isa/registers/TestRegisterMap.java ++++ b/frysk-core/frysk/isa/registers/TestRegisterMap.java +@@ -46,10 +46,10 @@ import frysk.junit.TestCase; + public class TestRegisterMap extends TestCase { + private final RegisterMap map + = new RegisterMap("testing") +- .add(IA32Registers.EAX, new Long(0)) +- .add(IA32Registers.EBX, new Long(1)) +- .add(IA32Registers.ECX, new Long(2)) +- .add(IA32Registers.EDX, new Long(3)); ++ .add(IA32Registers.EAX, Long.valueOf(0)) ++ .add(IA32Registers.EBX, Long.valueOf(1)) ++ .add(IA32Registers.ECX, Long.valueOf(2)) ++ .add(IA32Registers.EDX, Long.valueOf(3)); + + public void testContainsRegister() { + assertEquals("contains EAX", true, +@@ -58,8 +58,8 @@ public class TestRegisterMap extends TestCase { + map.containsKey(IA32Registers.ESP)); + } + public void testContainsNumber() { +- assertEquals("contains 1", true, map.containsKey(new Long(1))); +- assertEquals("contains 5", false, map.containsKey(new Long(4))); ++ assertEquals("contains 1", true, map.containsKey(Long.valueOf(1))); ++ assertEquals("contains 5", false, map.containsKey(Long.valueOf(4))); + } + public void testContainsInt() { + assertEquals("contains 1", true, map.containsKey(1)); +@@ -67,12 +67,12 @@ public class TestRegisterMap extends TestCase { + } + + public void testRegisterToNumber() { +- assertEquals("EAX to 0", new Long(0), ++ assertEquals("EAX to 0", Long.valueOf(0), + map.getRegisterNumber(IA32Registers.EAX)); + } + public void testNumberToRegister() { + assertEquals("1 to EBX", IA32Registers.EBX, +- map.getRegister(new Long(1))); ++ map.getRegister(Long.valueOf(1))); + } + public void testIntToRegister() { + assertEquals("2 to ECX", IA32Registers.ECX, map.getRegister(2)); +@@ -91,7 +91,7 @@ public class TestRegisterMap extends TestCase { + public void testNoSuchNumber() { + boolean npe = false; + try { +- map.getRegister(new Long(4)); ++ map.getRegister(Long.valueOf(4)); + } catch (NullPointerException e) { + npe = true; + } +diff --git a/frysk-core/frysk/isa/syscalls/SyscallTable.java b/frysk-core/frysk/isa/syscalls/SyscallTable.java +index 9e1527aa0..bbc36cb46 100644 +--- a/frysk-core/frysk/isa/syscalls/SyscallTable.java ++++ b/frysk-core/frysk/isa/syscalls/SyscallTable.java +@@ -53,7 +53,7 @@ public abstract class SyscallTable { + */ + Syscall unknownSyscall(long num) { + synchronized (unknownSyscalls) { +- Long key = new Long(num); ++ Long key = Long.valueOf(num); + Syscall syscall = (Syscall)unknownSyscalls.get(key); + if (syscall == null) { + syscall = new Syscall("UNKNOWN SYSCALL " + num, (int)num) { +diff --git a/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java b/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java +index 87c21c4e3..85a683a3e 100644 +--- a/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java ++++ b/frysk-core/frysk/isa/syscalls/TestSyscallsWithAudit.java +@@ -47,10 +47,10 @@ import frysk.testbed.IsaTestbed; + public class TestSyscallsWithAudit extends TestLib { + + private static final ISAMap machines = new ISAMap("syscall machines") +- .put(ISA.IA32, new Integer(AuditLibs.MACH_X86)) +- .put(ISA.PPC32BE, new Integer(AuditLibs.MACH_PPC)) +- .put(ISA.PPC64BE, new Integer(AuditLibs.MACH_PPC64)) +- .put(ISA.X8664, new Integer(AuditLibs.MACH_86_64)) ++ .put(ISA.IA32, Integer.valueOf(AuditLibs.MACH_X86)) ++ .put(ISA.PPC32BE, Integer.valueOf(AuditLibs.MACH_PPC)) ++ .put(ISA.PPC64BE, Integer.valueOf(AuditLibs.MACH_PPC64)) ++ .put(ISA.X8664, Integer.valueOf(AuditLibs.MACH_86_64)) + ; + + private void syscallTest(ISA isa) { +diff --git a/frysk-core/frysk/proc/live/TestTaskObserverCode.java b/frysk-core/frysk/proc/live/TestTaskObserverCode.java +index 5d1571a99..88b0f3c7d 100644 +--- a/frysk-core/frysk/proc/live/TestTaskObserverCode.java ++++ b/frysk-core/frysk/proc/live/TestTaskObserverCode.java +@@ -1060,12 +1060,12 @@ public class TestTaskObserverCode extends TestLib + CountingCodeObserver(Task[] tasks) + { + for (int i = 0; i < tasks.length; ++i) +- hitmap.put(tasks[i], new Integer(0)); ++ hitmap.put(tasks[i], Integer.valueOf(0)); + } + + public Action updateHit (Task task, long addr) + { +- hitmap.put(task, new Integer(hitsFor(task) + 1)); ++ hitmap.put(task, Integer.valueOf(hitsFor(task) + 1)); + Manager.eventLoop.requestStop(); + return Action.BLOCK; + } +diff --git a/frysk-core/frysk/rt/BreakpointManager.java b/frysk-core/frysk/rt/BreakpointManager.java +index c465c99b4..b7458729a 100644 +--- a/frysk-core/frysk/rt/BreakpointManager.java ++++ b/frysk-core/frysk/rt/BreakpointManager.java +@@ -127,7 +127,7 @@ public class BreakpointManager extends Observable { + private HashMap watchers = new HashMap(); + + private synchronized void addBreakpoint(SourceBreakpoint bp) { +- breakpointMap.put(new Integer(bp.getId()), bp); ++ breakpointMap.put(Integer.valueOf(bp.getId()), bp); + setChanged(); + notifyObservers(); + } +@@ -247,7 +247,7 @@ public class BreakpointManager extends Observable { + + public SourceBreakpoint getBreakpoint(int bptId) { + SourceBreakpoint bpt +- = (SourceBreakpoint)breakpointMap.get(new Integer(bptId)); ++ = (SourceBreakpoint)breakpointMap.get(Integer.valueOf(bptId)); + return bpt; + } + +diff --git a/frysk-core/frysk/rt/DisplayManager.java b/frysk-core/frysk/rt/DisplayManager.java +index 67074e6f9..ee804c4f1 100644 +--- a/frysk-core/frysk/rt/DisplayManager.java ++++ b/frysk-core/frysk/rt/DisplayManager.java +@@ -87,7 +87,7 @@ public class DisplayManager { + value = new UpdatingDisplayValue(text, myTask, fIdent, engine, + CountManager.getNextId()); + displays.add(value); +- displaysByNum.put(new Integer(value.getId()), value); ++ displaysByNum.put(Integer.valueOf(value.getId()), value); + } + + return value; +@@ -102,7 +102,7 @@ public class DisplayManager { + */ + public static void deleteDisplay(UpdatingDisplayValue value) { + displays.remove(value); +- displaysByNum.remove(new Integer(value.getId())); ++ displaysByNum.remove(Integer.valueOf(value.getId())); + value.disable(); + } + +@@ -116,7 +116,7 @@ public class DisplayManager { + */ + public static boolean disableDisplay(int num) { + UpdatingDisplayValue val = (UpdatingDisplayValue) displaysByNum +- .get(new Integer(num)); ++ .get(Integer.valueOf(num)); + if (val != null) { + if (val.isEnabled()) + val.disable(); +@@ -135,7 +135,7 @@ public class DisplayManager { + */ + public static boolean enableDisplay(int num) { + UpdatingDisplayValue val = (UpdatingDisplayValue) displaysByNum +- .get(new Integer(num)); ++ .get(Integer.valueOf(num)); + + if (val != null) { + if (!val.isEnabled()) +@@ -156,12 +156,12 @@ public class DisplayManager { + */ + public static boolean deleteDisplay(int num) { + UpdatingDisplayValue val = (UpdatingDisplayValue) displaysByNum +- .get(new Integer(num)); ++ .get(Integer.valueOf(num)); + if (val != null) { + if (val.isEnabled()) + val.disable(); + displays.remove(val); +- displaysByNum.remove(new Integer(val.getId())); ++ displaysByNum.remove(Integer.valueOf(val.getId())); + + return true; + } +@@ -187,7 +187,7 @@ public class DisplayManager { + * exists + */ + public static UpdatingDisplayValue getDisplay(int id) { +- return (UpdatingDisplayValue) displaysByNum.get(new Integer(id)); ++ return (UpdatingDisplayValue) displaysByNum.get(Integer.valueOf(id)); + } + + } +diff --git a/frysk-core/frysk/rt/FunctionBreakpoint.java b/frysk-core/frysk/rt/FunctionBreakpoint.java +index 1e1874a9b..214c6c43b 100644 +--- a/frysk-core/frysk/rt/FunctionBreakpoint.java ++++ b/frysk-core/frysk/rt/FunctionBreakpoint.java +@@ -83,7 +83,7 @@ public class FunctionBreakpoint + if (function instanceof OutOfLineFunction) { + long address = ((OutOfLineFunction) function).getBreakPointAddress(); + LinkedList addrs = new LinkedList(); +- addrs.add(new Long(address)); ++ addrs.add(Long.valueOf(address)); + return addrs; + } + +@@ -93,7 +93,7 @@ public class FunctionBreakpoint + LinkedList addrs = new LinkedList(); + while (iterator.hasNext()) { + ConcreteInlinedFunction concreteInlinedFunction = (ConcreteInlinedFunction) iterator.next(); +- addrs.add(new Long(concreteInlinedFunction.getBreakPointAddress())); ++ addrs.add(Long.valueOf(concreteInlinedFunction.getBreakPointAddress())); + } + return addrs; + } +@@ -118,7 +118,7 @@ public class FunctionBreakpoint + for (ListIterator i = inlineDies.listIterator(); + i.hasNext(); ) { + DwarfDie inlinedSubroutine = (DwarfDie)i.next(); +- addrs.add(new Long(inlinedSubroutine.getLowPC())); ++ addrs.add(Long.valueOf(inlinedSubroutine.getLowPC())); + } + containsInlineInstances = true; + } +@@ -128,7 +128,7 @@ public class FunctionBreakpoint + LinkedList addrs = SymbolFactory.getAddresses(task, name); + + // Filter any null values that have sneaked in. +- Long nullVal = new Long(0); ++ Long nullVal = Long.valueOf(0); + while (addrs.remove(nullVal)) { + } + return addrs; +diff --git a/frysk-core/frysk/rt/LineBreakpoint.java b/frysk-core/frysk/rt/LineBreakpoint.java +index 89c5c173d..50a665326 100644 +--- a/frysk-core/frysk/rt/LineBreakpoint.java ++++ b/frysk-core/frysk/rt/LineBreakpoint.java +@@ -102,7 +102,7 @@ public class LineBreakpoint extends SourceBreakpoint { + LinkedList result = new LinkedList(); + ListIterator iterator = dies.listIterator(); + while (iterator.hasNext()) { +- result.add(new Long(((DwflLine)iterator.next()).getAddress())); ++ result.add(Long.valueOf(((DwflLine)iterator.next()).getAddress())); + } + + fine.log(this, "getBreakpointRawAddresses ... returns", result); +diff --git a/frysk-core/frysk/rt/PLTBreakpoint.java b/frysk-core/frysk/rt/PLTBreakpoint.java +index 7ed9e550b..580963a84 100644 +--- a/frysk-core/frysk/rt/PLTBreakpoint.java ++++ b/frysk-core/frysk/rt/PLTBreakpoint.java +@@ -59,7 +59,7 @@ public class PLTBreakpoint + + public LinkedList getBreakpointRawAddresses(Task task) { + LinkedList addrs = new LinkedList(); +- addrs.add(new Long(entry.getAddress())); ++ addrs.add(Long.valueOf(entry.getAddress())); + return addrs; + } + +diff --git a/frysk-core/frysk/rt/ProcTaskIDManager.java b/frysk-core/frysk/rt/ProcTaskIDManager.java +index da0a5afaf..ddbac668f 100644 +--- a/frysk-core/frysk/rt/ProcTaskIDManager.java ++++ b/frysk-core/frysk/rt/ProcTaskIDManager.java +@@ -70,7 +70,7 @@ public class ProcTaskIDManager + taskMap = new HashMap(); + for (int i = 0; i < tasks.size(); i++) { + Task task = (Task)tasks.get(i); +- taskMap.put(task, new Integer(i)); ++ taskMap.put(task, Integer.valueOf(i)); + addTaskObservers(task); + } + } +@@ -93,7 +93,7 @@ public class ProcTaskIDManager + synchronized (this) { + entry = new ProcEntry(proc, reservedID); + procList.set(reservedID, entry); +- procMap.put(proc, new Integer(reservedID)); ++ procMap.put(proc, Integer.valueOf(reservedID)); + } + } + +@@ -185,7 +185,7 @@ public class ProcTaskIDManager + synchronized (this) { + int taskID = entry.tasks.size(); + entry.tasks.add(offspring); +- entry.taskMap.put(offspring, new Integer(taskID)); ++ entry.taskMap.put(offspring, Integer.valueOf(taskID)); + } + addTaskObservers(offspring); + parent.requestUnblock(this); +diff --git a/frysk-core/frysk/rt/SymbolBreakpoint.java b/frysk-core/frysk/rt/SymbolBreakpoint.java +index f079b2469..a59694f29 100644 +--- a/frysk-core/frysk/rt/SymbolBreakpoint.java ++++ b/frysk-core/frysk/rt/SymbolBreakpoint.java +@@ -71,7 +71,7 @@ public class SymbolBreakpoint + LinkedList addrs = SymbolFactory.getAddresses(task, name, matcher); + + // Filter any null values that have sneaked in. +- Long nullVal = new Long(0); ++ Long nullVal = Long.valueOf(0); + while (addrs.remove(nullVal)) { + } + return addrs; +diff --git a/frysk-core/frysk/stepping/SteppingEngine.java b/frysk-core/frysk/stepping/SteppingEngine.java +index 7fb9b7d0e..3d0eab66c 100644 +--- a/frysk-core/frysk/stepping/SteppingEngine.java ++++ b/frysk-core/frysk/stepping/SteppingEngine.java +@@ -184,7 +184,7 @@ public class SteppingEngine { + this.taskStateMap.put(t, new TaskStepEngine(t, this)); + } + +- this.contextMap.put(proc, new Integer(tasksList.size())); ++ this.contextMap.put(proc, Integer.valueOf(tasksList.size())); + } + + /*********************************************************************** +@@ -207,7 +207,7 @@ public class SteppingEngine { + + tse.setState(new InstructionStepState(task, false)); + this.steppingObserver.notifyNotBlocked(tse); +- this.contextMap.put(task.getProc(), new Integer(1)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(1)); + + continueForStepping(task, true); + return true; +@@ -229,7 +229,7 @@ public class SteppingEngine { + return false; + + Task t = (Task) tasks.getFirst(); +- this.contextMap.put(t.getProc(), new Integer(tasks.size())); ++ this.contextMap.put(t.getProc(), Integer.valueOf(tasks.size())); + + Iterator iter = tasks.iterator(); + while (iter.hasNext()) { +@@ -256,7 +256,7 @@ public class SteppingEngine { + if (isTaskRunning(task)) + return false; + +- this.contextMap.put(task.getProc(), new Integer(1)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(1)); + TaskStepEngine tse = (TaskStepEngine) this.taskStateMap.get(task); + + /* Check to see if either the TaskStepEngine for this Task has not had its +@@ -342,7 +342,7 @@ public class SteppingEngine { + } + + /* Record how many Tasks we're dealing with here */ +- this.contextMap.put(t.getProc(), new Integer(tasks.size())); ++ this.contextMap.put(t.getProc(), Integer.valueOf(tasks.size())); + + i = tasks.iterator(); + while (i.hasNext()) { +@@ -372,7 +372,7 @@ public class SteppingEngine { + this.steppingObserver.notifyNotBlocked(tse); + + int i = ((Integer) this.contextMap.get(task.getProc())).intValue(); +- this.contextMap.put(task.getProc(), new Integer(++i)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(++i)); + + /* + * Set a breakpoint on the current address of the given frame, which is the +@@ -396,7 +396,7 @@ public class SteppingEngine { + this.steppingObserver.notifyNotBlocked(tse); + + int i = ((Integer) this.contextMap.get(task.getProc())).intValue(); +- this.contextMap.put(task.getProc(), new Integer(++i)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(++i)); + continueForStepping(task, true); + } + +@@ -413,7 +413,7 @@ public class SteppingEngine { + + Task t = (Task) tasks.getFirst(); + int i = ((Integer) this.contextMap.get(t.getProc())).intValue(); +- this.contextMap.put(t.getProc(), new Integer(i += tasks.size())); ++ this.contextMap.put(t.getProc(), Integer.valueOf(i += tasks.size())); + + Iterator iter = tasks.iterator(); + while (iter.hasNext()) { +@@ -449,7 +449,7 @@ public class SteppingEngine { + tse.setState(new StepOverTestState(task)); + + int i = ((Integer) this.contextMap.get(task.getProc())).intValue(); +- this.contextMap.put(task.getProc(), new Integer(++i)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(++i)); + + if (continueForStepping(task, true)) { + this.steppingObserver.notifyNotBlocked(tse); +@@ -468,7 +468,7 @@ public class SteppingEngine { + + Task t = (Task) tasks.getFirst(); + int i = ((Integer) this.contextMap.get(t.getProc())).intValue(); +- this.contextMap.put(t.getProc(), new Integer(i += tasks.size())); ++ this.contextMap.put(t.getProc(), Integer.valueOf(i += tasks.size())); + + Iterator iter = tasks.iterator(); + while (iter.hasNext()) { +@@ -503,7 +503,7 @@ public class SteppingEngine { + this.steppingObserver.notifyNotBlocked(tse); + + int i = ((Integer) this.contextMap.get(task.getProc())).intValue(); +- this.contextMap.put(task.getProc(), new Integer(++i)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(++i)); + + this.breakpoint = new SteppingBreakpoint(this, address); + this.breakpointMap.put(task, this.breakpoint); +@@ -519,7 +519,7 @@ public class SteppingEngine { + this.steppingObserver.notifyNotBlocked(tse); + + int i = ((Integer) this.contextMap.get(task.getProc())).intValue(); +- this.contextMap.put(task.getProc(), new Integer(++i)); ++ this.contextMap.put(task.getProc(), Integer.valueOf(++i)); + + this.breakpoint = new SteppingBreakpoint(this, address); + this.breakpointMap.put(task, this.breakpoint); +@@ -539,7 +539,7 @@ public class SteppingEngine { + + Task t = (Task) tasks.getFirst(); + int i = ((Integer) this.contextMap.get(t.getProc())).intValue(); +- this.contextMap.put(t.getProc(), new Integer(i += tasks.size())); ++ this.contextMap.put(t.getProc(), Integer.valueOf(i += tasks.size())); + + Iterator iter = tasks.iterator(); + while (iter.hasNext()) { +@@ -588,7 +588,7 @@ public class SteppingEngine { + */ + public void continueExecution(LinkedList list) { + TaskStepEngine tse = null; +- this.contextMap.put(((Task) list.getFirst()).getProc(), new Integer( ++ this.contextMap.put(((Task) list.getFirst()).getProc(), Integer.valueOf( + list.size())); + + Iterator i = list.iterator(); +@@ -761,7 +761,7 @@ public class SteppingEngine { + } + + this.contextMap.put(((Task) tasks.getFirst()).getProc(), +- new Integer(numRunning)); ++ Integer.valueOf(numRunning)); + this.runningTasks = temp; + } + return; +@@ -816,7 +816,7 @@ public class SteppingEngine { + Task t; + + if (kill) { +- Integer context = new Integer(list.size()); ++ Integer context = Integer.valueOf(list.size()); + this.contextMap.put(proc, context); + this.threadLifeObservable.setExitingTasks(list); + } +@@ -1131,15 +1131,15 @@ public class SteppingEngine { + .intValue(); + if (--i <= 0) { + if (threadsList.size() > 0) { +- SteppingEngine.this.contextMap.put(proc, new Integer( ++ SteppingEngine.this.contextMap.put(proc, Integer.valueOf( + threadsList.size() + i)); + requestAdd(); + } else { + SteppingEngine.this.contextMap.put(proc, +- new Integer(i)); ++ Integer.valueOf(i)); + } + } else { +- SteppingEngine.this.contextMap.put(proc, new Integer(i)); ++ SteppingEngine.this.contextMap.put(proc, Integer.valueOf(i)); + } + this.setChanged(); + this.notifyObservers(tse); +@@ -1226,7 +1226,7 @@ public class SteppingEngine { + public Action updateClonedOffspring(Task parent, Task offspring) { + Integer i = (Integer) SteppingEngine.this.contextMap.get(parent + .getProc()); +- SteppingEngine.this.contextMap.put(parent.getProc(), new Integer(i ++ SteppingEngine.this.contextMap.put(parent.getProc(), Integer.valueOf(i + .intValue() + 1)); + SteppingEngine.this.taskStateMap.put(offspring, new TaskStepEngine( + offspring, SteppingEngine.this)); +@@ -1268,7 +1268,7 @@ public class SteppingEngine { + Proc proc = task.getProc(); + Integer context = (Integer)SteppingEngine.this.contextMap.get(proc); + if (!SteppingEngine.this.contextMap.isEmpty() && context != null) +- SteppingEngine.this.contextMap.put(proc, new Integer( ++ SteppingEngine.this.contextMap.put(proc, Integer.valueOf( + context.intValue() - 1)); + + TaskStepEngine tse +@@ -1323,7 +1323,7 @@ public class SteppingEngine { + int i = ((Integer) SteppingEngine.this.contextMap.get(task + .getProc())).intValue(); + if (--i > 0) { +- contextMap.put(task.getProc(), new Integer(i)); ++ contextMap.put(task.getProc(), Integer.valueOf(i)); + } else { + contextMap.remove(task.getProc()); + ProcessIdentifier pid +diff --git a/frysk-core/frysk/symtab/SymbolFactory.java b/frysk-core/frysk/symtab/SymbolFactory.java +index d19ca2885..60beb451c 100644 +--- a/frysk-core/frysk/symtab/SymbolFactory.java ++++ b/frysk-core/frysk/symtab/SymbolFactory.java +@@ -235,7 +235,7 @@ public class SymbolFactory + lib.dwfl.ElfSymbolVisibility visibility, + boolean defined) + { +- addrs.add(new Long(value)); ++ addrs.add(Long.valueOf(value)); + } + }; + for (int i = 0; i < modules.length; i++) { +diff --git a/frysk-core/frysk/symtab/SymbolObjectDeclaration.java b/frysk-core/frysk/symtab/SymbolObjectDeclaration.java +index 1a581321f..577fed246 100644 +--- a/frysk-core/frysk/symtab/SymbolObjectDeclaration.java ++++ b/frysk-core/frysk/symtab/SymbolObjectDeclaration.java +@@ -92,7 +92,7 @@ public class SymbolObjectDeclaration implements ObjectDeclaration { + // treat all other types as array lists + // if any special handling is needed add an if statement. + ArrayList dims = new ArrayList(); +- dims.add(new Integer((int) (size-1))); ++ dims.add(Integer.valueOf((int) (size-1))); + this.type = new ArrayType(StandardTypes.uint8_t(isa.order()), (int) size, dims); + } + +diff --git a/frysk-core/frysk/util/StacktraceAction.java b/frysk-core/frysk/util/StacktraceAction.java +index ef1a474be..78a6e7315 100644 +--- a/frysk-core/frysk/util/StacktraceAction.java ++++ b/frysk-core/frysk/util/StacktraceAction.java +@@ -116,7 +116,7 @@ public abstract class StacktraceAction implements ProcBlockObserver { + if (sortedTasks == null) + sortedTasks = new TreeMap(); + +- sortedTasks.put(new Integer(task.getTid()), task); ++ sortedTasks.put(Integer.valueOf(task.getTid()), task); + } + + public void taskAddFailed (Object observable, Throwable w) +diff --git a/frysk-core/frysk/value/ArrayType.java b/frysk-core/frysk/value/ArrayType.java +index 4fe9b60ce..22d658b51 100644 +--- a/frysk-core/frysk/value/ArrayType.java ++++ b/frysk-core/frysk/value/ArrayType.java +@@ -148,7 +148,7 @@ public class ArrayType + { + ArrayList dims = new ArrayList(); + // For an n-dimensional array, create (n-1) dimensional array, where n>1 +- dims.add(new Integer(dimension[dimension.length - 1]-1)); ++ dims.add(Integer.valueOf(dimension[dimension.length - 1]-1)); + ArrayType arrayType = new ArrayType(type, dimension[dimension.length - 1] + * type.getSize(), dims); + return new Value(arrayType, v.getLocation().slice(idx.asLong() +@@ -176,9 +176,9 @@ public class ArrayType + ArrayList dims = new ArrayList(); + // Length of elements at 0th dimension changes. + // Rest remain same. +- dims.add(new Integer(len-1)); ++ dims.add(Integer.valueOf(len-1)); + for (int k=1; k 0) +diff --git a/frysk-core/prog/kill/detach.c b/frysk-core/prog/kill/detach.c +index 78f759194..e536f9e9c 100644 +--- a/frysk-core/prog/kill/detach.c ++++ b/frysk-core/prog/kill/detach.c +@@ -53,7 +53,7 @@ + // Simple sleep for roughly SECONDS and then exit. + + static void +-sigalrm () ++sigalrm (int) + { + exit (0); + } diff --git a/frysk.spec b/frysk.spec index c92ee1c..a784f9a 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 96%{?dist} +Release: 97%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -77,6 +77,8 @@ Patch49: frysk-0.4-49-elf-newehdr-null.patch Patch50: frysk-0.4-50-autoconf-2-70-fixes.patch Patch51: frysk-0.4-51-debugedit-path.patch Patch52: frysk-0.4-52-libunwind-tests.patch +Patch53: frysk-0.4-53-no-new-integer.patch +Patch54: frysk-0.4-54-c-warnings.patch Patch100: frysk-0.4-aclocaljavac.patch Patch101: frysk-0.4-cxx-scope.patch @@ -286,6 +288,8 @@ mv frysk-imports/libunwind/configure.{in,ac} %patch -P50 -p1 -z .50-autoconf-2-70-fixes %patch -P51 -p1 -z .51-debugedit-path %patch -P52 -p1 -z .52-libunwind-tests.patch +%patch -P53 -p1 -z .53-no-new-integer.patch +%patch -P54 -p1 -z .54-c-warnings.patch echo "%{version}-%{release}" > frysk-common/version.in @@ -465,6 +469,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Fri Feb 28 2025 Andrew Cagney - 0.4-97 +- Fix deprecated New Integer() warnings +- Fix unprototyped function + * Thu Jan 16 2025 Fedora Release Engineering - 0.4-96 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 93625bcf76f3755a65679c8e97b57f960e2e15af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:50:22 +0000 Subject: [PATCH 55/56] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- frysk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frysk.spec b/frysk.spec index a784f9a..7c8aa86 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 97%{?dist} +Release: 98%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -469,6 +469,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.4-98 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Feb 28 2025 Andrew Cagney - 0.4-97 - Fix deprecated New Integer() warnings - Fix unprototyped function From b1e8523956648e7a961d9d7967a89bff6554a64e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 20:48:00 +0200 Subject: [PATCH 56/56] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- frysk.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frysk.spec b/frysk.spec index 7c8aa86..b169d51 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,7 +1,7 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 98%{?dist} +Release: 99%{?dist} # Fedora 17+ is still waiting for vte et.al. bindings. %define enable_gnome %{fedora}0 < 170 @@ -90,7 +90,7 @@ Patch1003: frysk-0.4-nogtkwerror.patch Patch666: frysk-0.4-sodwfl.patch BuildRequires: gcc-c++ -BuildRequires: java-devel +BuildRequires: java-25-devel BuildRequires: junit >= 3.8.1 BuildRequires: antlr-tool >= 2.7.4 BuildRequires: xmlto @@ -469,6 +469,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug %endif %changelog +* Tue Jul 29 2025 jiri vanek - 0.4-99 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 0.4-98 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild