diff --git a/Makefile b/Makefile index d4762db..9c79d5a 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/main/rawhide/' -e 's/^\* //p') +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 @@ -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)) @@ -106,9 +106,9 @@ world gnome: done .PHONY:: world -usable useful: init - $(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 +usable: init + $(MOCK) install vi less automake-docs strace +.PHONY:: usable clog prep: fedpkg $@ diff --git a/README b/README index d31ebf6..fbae01b 100644 --- a/README +++ b/README @@ -1,36 +1,21 @@ -This week's URLs: +For KOJI, see: - 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 +https://fedoraproject.org/wiki/Infrastructure/Kerberos?rd=Infrastructure_kerberos_authentication - 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: +Fixing Fedora: - install fedora-packager -For a local native build: +For a local build: $ fedpkg compile -To do a scratch build in the build system: +To do a scratch build: $ 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')] @@ -39,11 +24,9 @@ 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-0.4-49-elf-newehdr-null.patch b/frysk-0.4-49-elf-newehdr-null.patch deleted file mode 100644 index 37e0eba..0000000 --- a/frysk-0.4-49-elf-newehdr-null.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-0.4-50-autoconf-2-70-fixes.patch b/frysk-0.4-50-autoconf-2-70-fixes.patch deleted file mode 100644 index a9ed3f0..0000000 --- a/frysk-0.4-50-autoconf-2-70-fixes.patch +++ /dev/null @@ -1,119 +0,0 @@ -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.69]) - - 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.69]) - - 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.69]) - - 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.69]) - - 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.69]) - - 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.69]) - - 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-0.4-51-debugedit-path.patch b/frysk-0.4-51-debugedit-path.patch deleted file mode 100644 index 08833c6..0000000 --- a/frysk-0.4-51-debugedit-path.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-0.4-52-libunwind-tests.patch b/frysk-0.4-52-libunwind-tests.patch deleted file mode 100644 index 5adf6d2..0000000 --- a/frysk-0.4-52-libunwind-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -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-0.4-53-no-new-integer.patch b/frysk-0.4-53-no-new-integer.patch deleted file mode 100644 index 480d58d..0000000 --- a/frysk-0.4-53-no-new-integer.patch +++ /dev/null @@ -1,1622 +0,0 @@ -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-0.4-disable-arch32-tests.patch b/frysk-0.4-disable-arch32-tests.patch deleted file mode 100644 index dd0b9c6..0000000 --- a/frysk-0.4-disable-arch32-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -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-gcc-fcommon.patch b/frysk-0.4-gcc-fcommon.patch deleted file mode 100644 index 7591fdf..0000000 --- a/frysk-0.4-gcc-fcommon.patch +++ /dev/null @@ -1,132 +0,0 @@ -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-0.4-javac.patch b/frysk-0.4-javac.patch deleted file mode 100644 index d9a7bac..0000000 --- a/frysk-0.4-javac.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-0.4-jline1-to-jline.patch b/frysk-0.4-jline1-to-jline.patch deleted file mode 100644 index c0bd293..0000000 --- a/frysk-0.4-jline1-to-jline.patch +++ /dev/null @@ -1,259 +0,0 @@ -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/jline2], 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-jnixx-dont-emit-nested-classes.patch b/frysk-0.4-jnixx-dont-emit-nested-classes.patch deleted file mode 100644 index f9ca3a3..0000000 --- a/frysk-0.4-jnixx-dont-emit-nested-classes.patch +++ /dev/null @@ -1,353 +0,0 @@ -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 deleted file mode 100644 index 3398b1e..0000000 --- a/frysk-0.4-jnixx-union-as-reserved-word.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-0.4-python3.patch b/frysk-0.4-python3.patch deleted file mode 100644 index 66d51c4..0000000 --- a/frysk-0.4-python3.patch +++ /dev/null @@ -1,99 +0,0 @@ -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-0.4-steptester-indentation.patch b/frysk-0.4-steptester-indentation.patch deleted file mode 100644 index 59620d4..0000000 --- a/frysk-0.4-steptester-indentation.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 b169d51..2667f37 100644 --- a/frysk.spec +++ b/frysk.spec @@ -1,23 +1,18 @@ Summary: Execution analysis and debugging tool-suite Name: frysk Version: 0.4 -Release: 99%{?dist} +Release: 59%{?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 398-exception -> GPL-2.0 WITH ???redhat??? exception -# libunwind: MIT Modern Style with sublicense -> MIT - -License: GPL-2.0-only WITH 389-exception AND GPL-2.0-or-later WITH Classpath-exception-2.0 AND MIT +# 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 +Group: Development/System URL: http://sourceware.org/frysk Source: ftp://sourceware.org/pub/frysk/%{name}-%{version}.tar.bz2 @@ -65,20 +60,6 @@ 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 -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 -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 -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 @@ -89,25 +70,19 @@ Patch1003: frysk-0.4-nogtkwerror.patch # Use installed elfutils Patch666: frysk-0.4-sodwfl.patch -BuildRequires: gcc-c++ -BuildRequires: java-25-devel + +BuildRequires: java-devel BuildRequires: junit >= 3.8.1 -BuildRequires: antlr-tool >= 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 +# Some generation scripts are being written in python +BuildRequires: python BuildRequires: elfutils-devel >= 0.151 -BuildRequires: jline2 -BuildRequires: debugedit - -# it seems java requires explict runtime requires!?!? -Requires: junit -Requires: antlr-tool -Requires: jline2 +BuildRequires: jline1 %if %{enable_gnome} BuildRequires: jdom >= 1.0 @@ -122,7 +97,6 @@ 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 @@ -130,8 +104,7 @@ 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. -# Bug #2104040: native frysk depends on to be removed i686 java-openjdk packages -ExclusiveArch: x86_64 ppc64 +ExclusiveArch: %{ix86} 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 @@ -152,13 +125,14 @@ system. %if %{enable_devel} %package devel Summary: The development part of Frysk +Group: Development/System Requires: %{name} = %{version}-%{release} %endif %if %{enable_gnome} -Requires: python2-dogtail >= 0.5.2 +Requires: dogtail >= 0.5.2 # Needed by "dogtail-run-headless -n": Requires: metacity -Requires: python2 +Requires: python %endif %if %{enable_devel} @@ -178,6 +152,7 @@ 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 @@ -199,97 +174,83 @@ This package contains the GNOME front end for Frysk. %setup -q -n %{name}-%{version} pwd -%patch -P0 -p1 -z .head +%patch0 -p1 -z .head -%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 +%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 mv frysk-core/frysk/pkglibdir/FunitSimpleInterfaceTest.java frysk-core/frysk/pkglibdir/FunitSimpleInterfaceMain.java -%patch -P7 -p1 -z .mvtesttomain -F 1 +%patch7 -p1 -z .mvtesttomain -F 1 mv frysk-core/frysk/util/ProcStopUtil.java frysk-core/frysk/util/TaskStopUtil.java -%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 +%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 %if %{fedora}0 >= 130 -%patch -P100 -p1 -z .aclocaljavac +%patch100 -p1 -z .aclocaljavac %endif %if %{enable_gnome} # don't apply - leaves default as build gnome %else -%patch -P101 -p1 -z .configure-enable-gnome +%patch101 -p1 -z .configure-enable-gnome %endif %if %{enable_devel} # don't apply - leaves devel package installed %else -%patch -P21 -p1 -z .nopkglibdir +%patch21 -p1 -z .nopkglibdir %endif -%patch -P1003 -p1 -z .nogtkwerror +%patch1003 -p1 -z .nogtkwerror -%patch -P666 -p1 -z .sodwfl +%patch666 -p1 -z .sodwfl rm -rf frysk-imports/elfutils %if %{enable_gnome} # don't apply, leave jdom around %else -%patch -P22 -p1 -z .no-jdom +%patch22 -p1 -z .no-jdom rm -rf frysk-core/frysk/dom rm -rf frysk-core/frysk/rt/LineXXX.java %endif -%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 +%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 rm -rf frysk-imports/antlr -%patch -P30 -p1 -z .use-installed-junit +%patch30 -p1 -z .use-installed-junit rm -rf frysk-imports/junit -%patch -P31 -p1 -z .jni-issameobject -%patch -P32 -p1 -z .switch-ecj-to-javac -%patch -P33 -p1 -z .use-installed-jline +%patch31 -p1 -z .jni-issameobject +%patch32 -p1 -z .switch-ecj-to-javac +%patch33 -p1 -z .use-installed-jline rm -rf frysk-imports/jline # automake doesn't like old names mv frysk-imports/libunwind/configure.{in,ac} -%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 -%patch -P53 -p1 -z .53-no-new-integer.patch -%patch -P54 -p1 -z .54-c-warnings.patch +%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 echo "%{version}-%{release}" > frysk-common/version.in @@ -315,9 +276,13 @@ 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" + CXXFLAGS="$RPM_OPT_FLAGS" \ + --disable-arch32-tests make %{?_smp_mflags} @@ -371,6 +336,9 @@ 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) @@ -469,132 +437,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Mon Apr 3 2023 Andrew Cagney - 0.4-89 -- update frysk licence - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 -- 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 - -* 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 - -* 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 - -* 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) - * Wed Feb 07 2018 Fedora Release Engineering - 0.4-59 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild