import jansi-2.3.3-5.el9

2021-11-02 09:33:52 -04:00 · 2021-11-02 09:33:52 -04:00 · 805e8952b6
commit 805e8952b6
6 changed files with 309 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+SOURCES/jansi-2.3.3.tar.gz
--- a/.jansi.metadata
+++ b/.jansi.metadata
@ -0,0 +1 @@
+8f825fc9e4eafb656d1e0f01c68be9b41a750a1c SOURCES/jansi-2.3.3.tar.gz
--- a/SOURCES/0001-Avoid-NPE.patch
+++ b/SOURCES/0001-Avoid-NPE.patch
@ -0,0 +1,26 @@
+From d94c5832e14504d44abeba47866dfa7dac5992b5 Mon Sep 17 00:00:00 2001
+From: Guillaume Nodet <gnodet@gmail.com>
+Date: Fri, 23 Jul 2021 09:22:19 +0200
+Subject: [PATCH] Avoid possible NPE, fixes #214
+
+---
+ src/main/java/org/fusesource/jansi/AnsiPrintStream.java | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+index e153c43..df6e5a6 100644
+--- a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+++ b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+@@ -76,7 +76,11 @@ public void install() throws IOException {
+     }
+ 
+     public void uninstall() throws IOException {
+-        getOut().uninstall();
+        // If the system output stream has been closed, out should be null, so avoid a NPE
+        AnsiOutputStream out = getOut();
+        if (out != null) {
+            out.uninstall();
+        }
+     }
+ 
+     @Override
--- a/SOURCES/generate-tarball.sh
+++ b/SOURCES/generate-tarball.sh
@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+name=jansi
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+wget "https://github.com/fusesource/jansi/archive/jansi-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar xf "../${name}-${version}.orig.tar.gz"
+
+# CLEAN TARBALL
+rm -r */src/main/native/inc_{mac,win}/
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"
--- a/SOURCES/jansi-jni.patch
+++ b/SOURCES/jansi-jni.patch
@ -0,0 +1,14 @@
+--- a/src/main/java/org/fusesource/jansi/internal/JansiLoader.java	2020-12-15 03:03:00.000000000 -0700
+++ b/src/main/java/org/fusesource/jansi/internal/JansiLoader.java	2020-12-15 07:57:30.238720226 -0700
+@@ -295,6 +295,11 @@ public class JansiLoader {
+             } else {
+                 triedPaths.add(jansiNativeLibraryPath);
+             }
+        } else {
+            if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) {
+                extracted = true;
+                return;
+            }
+         }
+ 
+         // Load the os-dependent library from the jar file
--- a/SPECS/jansi.spec
+++ b/SPECS/jansi.spec
@ -0,0 +1,247 @@
+%bcond_with bootstrap
+
+Name:             jansi
+Version:          2.3.3
+Release:          5%{?dist}
+Summary:          Generate and interpret ANSI escape sequences in Java
+License:          ASL 2.0
+URL:              http://fusesource.github.io/jansi/
+
+# ./generate-tarball.sh
+Source0:          %{name}-%{version}.tar.gz
+# Remove bundled binaries which cannot be easily verified for licensing
+Source1:          generate-tarball.sh
+
+# Change the location of the native artifact to where Fedora wants it
+Patch0:           %{name}-jni.patch
+
+Patch1:           0001-Avoid-NPE.patch
+
+BuildRequires:    gcc
+BuildRequires:    maven-local
+%if %{with bootstrap}
+BuildRequires:    javapackages-bootstrap
+%else
+BuildRequires:    mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:    mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:    mvn(org.apache.maven.surefire:surefire-junit-platform)
+BuildRequires:    mvn(org.fusesource:fusesource-pom:pom:)
+BuildRequires:    mvn(org.junit.jupiter:junit-jupiter-engine)
+%endif
+
+%description
+Jansi is a small java library that allows you to use ANSI escape sequences
+in your Java console applications. It implements ANSI support on platforms
+which don't support it like Windows and provides graceful degradation for
+when output is being sent to output devices which cannot support ANSI sequences.
+
+%package javadoc
+Summary:          Javadocs for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%autosetup -n jansi-jansi-%{version} -p1
+
+# We don't need the Fuse JXR skin
+%pom_xpath_remove "pom:build/pom:extensions"
+
+# Plugins not needed for an RPM build
+%pom_remove_plugin :maven-gpg-plugin
+%pom_remove_plugin :maven-javadoc-plugin
+%pom_remove_plugin :nexus-staging-maven-plugin
+
+# We don't want GraalVM support in Fedora
+%pom_remove_plugin :exec-maven-plugin
+%pom_remove_dep :picocli-codegen
+
+# Build for JDK 1.8 at a minimum
+%pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8
+
+# Remove prebuilt shared objects
+rm -fr src/main/resources/org/fusesource/jansi/internal
+
+# Unbundle the JNI headers
+rm src/main/native/inc_linux/*.h
+ln -s %{java_home}/include/jni.h src/main/native/inc_linux
+ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux
+
+# Set the JNI path
+sed -i 's,@LIBDIR@,%{_prefix}/lib,' \
+    src/main/java/org/fusesource/jansi/internal/JansiLoader.java
+
+%build
+%set_build_flags
+# Build the native artifact
+CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
+cd src/main/native
+$CC $CFLAGS -c jansi.c
+$CC $CFLAGS -c jansi_isatty.c
+$CC $CFLAGS -c jansi_structs.c
+$CC $CFLAGS -c jansi_ttyname.c
+$CC $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil
+cd -
+
+# Build the Java artifacts
+%mvn_build -- -Dlibrary.jansi.path=$PWD/src/main/native
+
+%install
+# Install the native artifact
+mkdir -p %{buildroot}%{_prefix}/lib/%{name}
+cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name}
+
+# Install the Java artifacts
+%mvn_install
+
+%files -f .mfiles
+%license license.txt
+%doc readme.md changelog.md
+%{_prefix}/lib/%{name}/
+
+%files javadoc -f .mfiles-javadoc
+%license license.txt
+
+%changelog
+* Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-5
+- Install native artifact into a fixed location
+- Related: rhbz#1994935
+
+* Wed Aug 18 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-4
+- Avoid possible NullPointerException
+- Resolves: rhbz#1993889
+- Load native library from the correct location
+- Resolves: rhbz#1994935
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.3-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 23 2021 Jerry James <loganjerry@gmail.com> - 2.3.3-1
+- Version 2.3.3
+
+* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-7
+- Clean tarball from content with questionable licensing
+- Resolves: rhbz#1973750
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-6
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-4
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Jan 14 2021 Timm Bäder <tbaeder@redhat.com> - 2.1.1-2
+- Use standard variables when compiling native artifact
+
+* Tue Dec 15 2020 Jerry James <loganjerry@gmail.com> - 2.1.1-1
+- Version 2.1.1
+- Remove package name from Summary
+- Add patch to change the location of the JNI shared object
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.18-4
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-1
+- Update to version 1.18.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 1.17.1-1
+- Update to upstream version 1.17.1
+
+* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 1.17-1
+- Update to upstream version 1.17
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Jun 14 2017 Michael Simacek <msimacek@redhat.com> - 1.16-1
+- Update to upstream version 1.16
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 1.11-11
+- Remove BR on maven-site-plugin
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-8
+- Remove maven-javadoc-plugin execution
+
+* Tue Jan 27 2015 Mat Booth <mat.booth@redhat.com> - 1.11-7
+- Add/remove BRs to fix FTBFS bug
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
+- Migrate BuildRequires from junit4 to junit
+
+* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-4
+- Remove BuildRequires on maven-surefire-provider-junit4
+
+* Wed Sep 11 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-3
+- Using xmvn
+- Remove the jboss-native deps with classifiers
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue May 21 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-1
+- Upstream release 1.11 RHBZ#962761
+- CVE-2013-2035 HawtJNI: predictable temporary file name leading to local arbitrary code execution RHBZ#962614
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.9-2
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Tue Oct 09 2012 Marek Goldmann <mgoldman@redhat.com> - 1.9-1
+- Upstream release 1.9, RHBZ#864490
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri May 04 2012 Tomas Radej <tradej@redhat.com> - 1.6-3
+- Removed maven-license-plugin BR
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Aug 25 2011 Marek Goldmann <mgoldman@redhat.com> 1.6-1
+- Upstream release 1.6
+- Spec file cleanup
+
+* Fri May 27 2011 Marek Goldmann <mgoldman@redhat.com> 1.5-1
+- Initial packaging
+
				`@ -0,0 +1 @@`
				`8f825fc9e4eafb656d1e0f01c68be9b41a750a1c SOURCES/jansi-2.3.3.tar.gz`