Merge branch 'master' into f23

Use java ID for local thread
2016-04-19 17:14:39 -04:00 · 2016-04-07 10:08:00 -04:00
20 changed files with 81 additions and 3256 deletions
--- a/10
+++ b/10
@ -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 $@
--- a/32
+++ b/32
@ -1,36 +1,14 @@
-This week's URLs:
-
-   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 <account>@FEDORAPROJECT.ORG
-       klist -A
-
-   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:

-   $ 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 +17,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



--- a/frysk-0.4-49-elf-newehdr-null.patch
+++ b/frysk-0.4-49-elf-newehdr-null.patch
@ -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);
- }
- 
--- a/frysk-0.4-50-autoconf-2-70-fixes.patch
+++ b/frysk-0.4-50-autoconf-2-70-fixes.patch
@ -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],
--- a/frysk-0.4-51-debugedit-path.patch
+++ b/frysk-0.4-51-debugedit-path.patch
@ -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; 
- 
--- a/frysk-0.4-52-libunwind-tests.patch
+++ b/frysk-0.4-52-libunwind-tests.patch
@ -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
--- a/frysk-0.4-53-no-new-integer.patch
+++ b/frysk-0.4-53-no-new-integer.patch
--- a/frysk-0.4-54-c-warnings.patch
+++ b/frysk-0.4-54-c-warnings.patch
@ -1,135 +0,0 @@
-diff --git a/frysk-core/frysk/pkglibdir/funit-2threads.c b/frysk-core/frysk/pkglibdir/funit-2threads.c
-index 970c90c37..e4b969046 100644
--- a/frysk-core/frysk/pkglibdir/funit-2threads.c
-+++ b/frysk-core/frysk/pkglibdir/funit-2threads.c
-@@ -46,7 +46,7 @@
- 
- pthread_t thread;
- 
-void* thread_func ()
-+void* thread_func (void*)
- {
-   int count1 = 0;
- 
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-goto.c b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
-index 928096bd7..f79197509 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-goto.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-goto.c
-@@ -52,7 +52,7 @@ volatile int sig;
- volatile int j = 0;
- 
- void 
-*signal_parent ()
-+*signal_parent (void*)
- {
-   while (lock);
- 
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
-index 3ad4368aa..c65358d27 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-siglongjmp.c
-@@ -54,7 +54,7 @@ volatile int sig;
- static sigjmp_buf *env;
- 
- void 
-*signal_parent ()
-+*signal_parent (void*)
- {
-   while (lock);
- 
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
-index 4270edf07..1f9c26151 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-sigraise.c
-@@ -53,7 +53,7 @@ volatile int sig;
- volatile int j = 0;
- 
- void 
-*signal_parent ()
-+*signal_parent (void*)
- {
-   while (lock);
- 
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
-index 0effca488..2b0392013 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-steptester.c
-@@ -56,7 +56,7 @@ volatile int kill_bool = 1;
- volatile int sig_rec = 0;
- 
- void 
-*signal_parent ()
-+*signal_parent (void*)
- {
-   while (lock);
- 
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threader.c b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
-index 73d0aa427..fe34a5041 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threader.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-threader.c
-@@ -56,7 +56,7 @@ volatile pid_t pid;
- volatile int sig;
- 
- void 
-*signal_parent ()
-+*signal_parent (void*)
- {
-   while (lock_one || lock_two);
-   kill (pid, sig);
-@@ -124,7 +124,7 @@ foo_two ()
- 
- /* tester_thread_one: a = 1 */
- void
-*foo ()
-+*foo (void*)
- {
-   bar ();
-   return NULL;
-diff --git a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
-index b69736ce9..c634dc659 100644
--- a/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
-+++ b/frysk-core/frysk/pkglibdir/funit-rt-threadstepper.c
-@@ -184,7 +184,7 @@ bar ()
- 
- /* tester_thread_two: a = 0 */
- void
-*foo_two ()
-+*foo_two (void*)
- {
-   bar_two (); 
-   return NULL;
-@@ -192,7 +192,7 @@ void
- 
- /* tester_thread_one: a = 1 */
- void
-*foo ()
-+*foo (void*)
- {
-   bar ();
-   return NULL;
-diff --git a/frysk-core/frysk/pkglibdir/funit-threads-looper.c b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
-index bc2931a5d..557be4089 100644
--- a/frysk-core/frysk/pkglibdir/funit-threads-looper.c
-+++ b/frysk-core/frysk/pkglibdir/funit-threads-looper.c
-@@ -64,7 +64,7 @@ pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
- static char * myname;
- 
- void
-*do_it ()
-+*do_it (void*)
- {  
-   int t = 34543;
-   while (t > 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);
- }
--- a/frysk-0.4-check-p-not-status.patch
+++ b/frysk-0.4-check-p-not-status.patch
@ -1,11 +0,0 @@
--- frysk-0.4/frysk-sys/frysk/sys/proc/jni/Status.cxx.dist	2017-02-10 18:49:47.680517267 -0500
-+++ frysk-0.4/frysk-sys/frysk/sys/proc/jni/Status.cxx	2017-02-10 18:49:59.424346177 -0500
-@@ -91,7 +91,7 @@
-       break;
-     }
-   }
-  if (state == '\0')
-+  if (*p == '\0')
-     return Status(env, NULL);
- 
-   // UID
--- a/frysk-0.4-disable-arch32-tests.patch
+++ b/frysk-0.4-disable-arch32-tests.patch
@ -1,29 +0,0 @@
-commit be258fda95c5a89305aa7a1bf2530d307a293115
-Author: Andrew Cagney <cagney@gnu.org>
-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])
- ])
--- a/frysk-0.4-gcc-fcommon.patch
+++ b/frysk-0.4-gcc-fcommon.patch
@ -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 <davidm@hpl.hp.com>
-+
-+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
- 
--- a/frysk-0.4-gelf-newphdr.patch
+++ b/frysk-0.4-gelf-newphdr.patch
@ -1,98 +0,0 @@
-commit cd3f1f8c78b488a30218c8201d4d510e15428965
-Author: Andrew Cagney <cagney@gnu.org>
-Date:   Fri Jan 6 16:09:16 2017 -0500
-
-    Ignore return type of gelf_newphdr()
-    
-    At some point it changes from long int to void *.
-    
-    Patch: frysk-0.4-gelf-newphdr.patch
-
-diff --git a/frysk-sys/lib/dwfl/Elf.java b/frysk-sys/lib/dwfl/Elf.java
-index 5ac8cd5..0c93dd0 100644
--- a/frysk-sys/lib/dwfl/Elf.java
-+++ b/frysk-sys/lib/dwfl/Elf.java
-@@ -1,6 +1,7 @@
- // This file is part of the program FRYSK.
- //
- // Copyright 2005, 2006, 2007, 2008 Red Hat Inc.
-+// Copyright 2017 Andrew Cagney
- //
- // FRYSK is free software; you can redistribute it and/or modify it
- // under the terms of the GNU General Public License as published by
-@@ -213,8 +214,8 @@ public class Elf {
-      * @param count
-      * @return The program header table
-      */
-    public int createNewPHeader (long count) {
-	return elf_newphdr(count);
-+    public void createNewPHeader (long count) {
-+	elf_newphdr(count);
-     }
- 
-     /**
-@@ -426,7 +427,7 @@ public class Elf {
- 
-     protected native int elf_updatephdr(int index, ElfPHeader header);
- 
-    protected native int elf_newphdr (long __cnt);
-+    protected native void elf_newphdr (long __cnt);
- 
-     protected native long elf_offscn (long offset);
- 
-diff --git a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
-index b4071c7..1e6d294 100644
--- a/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
-+++ b/frysk-sys/lib/dwfl/jni/DwarfDie.cxx
-@@ -1,6 +1,7 @@
- // This file is part of the program FRYSK.
- //
- // Copyright 2005, 2007, 2008, Red Hat Inc.
-+// Copyright (C) 2016, Andrew Cagney
- //
- // FRYSK is free software; you can redistribute it and/or modify it
- // under the terms of the GNU General Public License as published by
-@@ -405,7 +406,7 @@ lib::dwfl::DwarfDie::get_framebase(jnixx::env env, jlong var_die,
-   Dwarf_Attribute *fb_attr;
-   size_t fb_len;
-   
-  if (dwarf_attr_integrate (die, DW_AT_location, &loc_attr) >= 0) {
-+  if (dwarf_attr_integrate (die, DW_AT_location, &loc_attr)) {
-     size_t i = 0;
-     code = dwarf_getlocation_addr (&loc_attr,pc, &fb_expr, &fb_len, 5);
- 
-@@ -436,7 +437,7 @@ lib::dwfl::DwarfDie::get_data_member_location(jnixx::env env, jlong var_die) {
-   Dwarf_Op *fb_expr;
-   size_t fb_len;
-   
-  if (dwarf_attr_integrate (die, DW_AT_data_member_location, &loc_attr) >= 0) {
-+  if (dwarf_attr_integrate (die, DW_AT_data_member_location, &loc_attr)) {
-     dwarf_getlocation (&loc_attr, &fb_expr, &fb_len);
-     if (fb_len > 0 && fb_expr[0].atom == DW_OP_plus_uconst)
-       return fb_expr[0].number;
-diff --git a/frysk-sys/lib/dwfl/jni/Elf.cxx b/frysk-sys/lib/dwfl/jni/Elf.cxx
-index da9d2a9..c22fa58 100644
--- a/frysk-sys/lib/dwfl/jni/Elf.cxx
-+++ b/frysk-sys/lib/dwfl/jni/Elf.cxx
-@@ -1,7 +1,7 @@
- // This file is part of the program FRYSK.
- //
- // Copyright 2005, 2007, 2008, Red Hat Inc.
-// Copyright 2016, Andrew Cagney
-+// Copyright 2016-2017, Andrew Cagney
- //
- // FRYSK is free software; you can redistribute it and/or modify it
- // under the terms of the GNU General Public License as published by
-@@ -254,10 +254,9 @@ lib::dwfl::Elf::elf_updatephdr(jnixx::env env, jint index,
-   return ::gelf_update_phdr (elf, index, &header);
- } 
- 
-
-jint
-+void
- lib::dwfl::Elf::elf_newphdr(jnixx::env env, jlong cnt) {
-  return (jint) ::gelf_newphdr(ELF_POINTER, (size_t) cnt);
-+  ::gelf_newphdr(ELF_POINTER, (size_t) cnt);
- }
- 
- jlong
--- a/frysk-0.4-javac.patch
+++ b/frysk-0.4-javac.patch
@ -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 \
--- a/frysk-0.4-jline1-to-jline.patch
+++ b/frysk-0.4-jline1-to-jline.patch
@ -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();
--- a/frysk-0.4-jnixx-dont-emit-nested-classes.patch
+++ b/frysk-0.4-jnixx-dont-emit-nested-classes.patch
@ -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<Class> required;
-+
-+    ClassWalker(Set<Class> 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<Class> 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<Class> 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<Class> getJarClasses(String jarFile)
- 	throws IOException, ClassNotFoundException {
- 	// Generate a list of classes in the jar file.
-	HashSet jarClasses = new HashSet();
-+	HashSet<Class> 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<Class> getNativeClasses(HashSet<Class> classes) {
-+	final HashSet<Class> 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<Class> 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<Class> 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<Class> 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<Class> jarClasses = getJarClasses(jarFile);
- 	visibleClasses.addAll(jarClasses);
- 	visibleClasses.addAll(explicitClasses);
- 
- 	nativeClasses.addAll(getNativeClasses(jarClasses));
- 
-	HashSet requiredClasses = new HashSet();
-+	HashSet<Class> requiredClasses = new HashSet<Class>();
- 	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<Class> 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<Class> 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<Class> 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<Class> required) {
-+	super(required);
- 	this.p = p;
-     }
- 
--- a/frysk-0.4-jnixx-signed-unsigned.patch
+++ b/frysk-0.4-jnixx-signed-unsigned.patch
@ -1,11 +0,0 @@
--- frysk-0.4/frysk-sys/jnixx/Printer.java.dist	2017-02-10 17:14:52.993596017 -0500
-+++ frysk-0.4/frysk-sys/jnixx/Printer.java	2017-02-10 17:15:20.770189841 -0500
-@@ -318,6 +318,8 @@
- 	    || name.equals("xor")
- 	    || name.equals("not")
- 	    || name.equals("register")
-+	    || name.equals("signed")
-+	    || name.equals("unsigned")
- 	    ) {
- 	    return name + "$";
- 	} else {
--- a/frysk-0.4-jnixx-union-as-reserved-word.patch
+++ b/frysk-0.4-jnixx-union-as-reserved-word.patch
@ -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 {
--- a/frysk-0.4-python3.patch
+++ b/frysk-0.4-python3.patch
@ -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 <File>..."
-+    print("Usage " + sys.argv[0] + " <-help> OutputFile File <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.
--- a/frysk-0.4-steptester-indentation.patch
+++ b/frysk-0.4-steptester-indentation.patch
@ -1,23 +0,0 @@
-commit b824c0a3c51aeae40ad07d2601b8b8348a5e32df
-Author: Andrew Cagney <cagney@gnu.org>
-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;
--- 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:	53%{?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

@ -62,23 +57,6 @@ Patch34:	frysk-0.4-libunwind-fstack.patch
 Patch35:	frysk-0.4-clone-cursor.patch
 Patch36:	frysk-0.4-fedpkg-lint-licence.patch
 Patch37:	frysk-0.4-fedpkg-lint-solib.patch
-Patch38:	frysk-0.4-gelf-newphdr.patch
-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 +67,20 @@ Patch1003:	frysk-0.4-nogtkwerror.patch
 # Use installed elfutils
 Patch666:	frysk-0.4-sodwfl.patch

-BuildRequires:	gcc-c++
-BuildRequires:	java-25-devel
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+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 +95,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 +102,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 +123,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 +150,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 +172,80 @@ 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

 echo "%{version}-%{release}" > frysk-common/version.in

@ -315,9 +271,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 +331,12 @@ 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
+
+%clean
+rm -rf %{buildroot}
+
 %files

 %defattr(-,root,root)
@ -469,150 +435,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/funit-*-nodebug
 %endif

 %changelog
-* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 0.4-99
- Rebuilt for java-25-openjdk as preffered jdk
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-98
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Feb 28 2025 Andrew Cagney <cagney@fedoraproject.org> - 0.4-97
- Fix deprecated New Integer() warnings
- Fix unprototyped function
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-96
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-95
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0.4-94
- Rebuilt for java-21-openjdk as system jdk
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-93
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-92
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-91
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon May 15 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-90
- drop hack mangling _FORTIFY_SOURCE; fix 2161322
-
-* Mon Apr 3 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-89
- update frysk licence
-
-* Thu Mar 9 2023 Andrew Cagney <cagney@fedoraproject.org> - 0.4-88
- update getopt and libunwind sub licences
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-87
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Sep 29 2022 Andrew Cagney <cagney@fedoraproject.org> - 0.4-86
- don't build libunwind tests; frysk-0.4-52-libunwind-tests.patch
-
-* Thu Jul 21 2022 Andrew Cagney <cagney@fedoraproject.org> - 0.4-85
- ding dong the 32-bit Java is dead; #2104040
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-84
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0.4-83
- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-82
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 4 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-81
- require debugedit; fix hardwired path
-
-* Wed Aug 4 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-80
- Allow autoconf 2.69
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-79
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon Apr 12 2021 Andrew Cagney <cagney@fedoraproject.org> - 0.4-78
- autoconf 2.70
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-77
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 0.4-76
- Depend on jline2, not jline
-
-* Fri Dec 11 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-75
- fix check of elf_newehdr()'s return value
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Andrew Cagney <cagney@fedoraproject.org> - 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 <jvanek@redhat.com> - 0.4-72
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Tue Jun 9 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-71
- drop -source 1.4 -- frysk-0.4-javac.patch
-
-* Tue Jan 28 2020 Andrew Cagney <cagney@fedoraproject.org> - 0.4-70
- pacify gcc -fcommon
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 14 2019 Andrew Cagney <cagney@fedoraproject.org> - 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 <cagney@fedoraproject.org> - 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 <cagney@fedoraproject.org> - 0.4-66
- Depend on jline, not jline1
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-65
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 15 2019 Andrew Cagney <cagney@fedoraproject.org> - 0.4-64
- Update README cribsheet
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-63
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jul 24 2018 Andrew Cagney <cagney@fedoaproject.org> - 0.4-62
- Deal with python 3
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-61
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 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 <releng@fedoraproject.org> - 0.4-59
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-58
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Andrew Cagney <cagney@fedoraproject.org> - 0.4-56
- fix warnings/errors from latest compilers
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-55
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 6 2017 Andrew Cagney <cagney@fedoraproject.org> - 0.4-54
- work around evolving gelf_newphdr() interface
-
 * Tue Apr 19 2016 Andrew Cagney <cagney@fedoraproject.org> - 0.4-53
 - fix some fedpkg lint problems
 - add frysk-0.4-fedpkg-lint-licence.patch
Author	SHA1	Message	Date
Andrew Cagney	a28e880a1e	Merge branch 'master' into f23	2016-04-19 17:14:39 -04:00
Andrew Cagney	f34ab2ba64	Use java ID for local thread	2016-04-07 10:08:00 -04:00