From e6997cdebb0e2d29ba5ba51df78005adc06ed4bf Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Tue, 2 Jul 2019 14:15:43 +0200 Subject: [PATCH 1/3] Update to 0.12 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + sources | 2 +- will-crash.spec | 37 ++++++++++++++++++------------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index bbce598..33574ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /will-crash-0.8.tar.gz /will-crash-0.9.tar.gz /will-crash-0.10.tar.gz +/will-crash-v0.12.tar.gz diff --git a/sources b/sources index fdcda19..2cf2b3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -030fdd1cf4efe2beded39a6666d9ea1b will-crash-0.10.tar.gz +SHA512 (will-crash-v0.12.tar.gz) = 13e2eb1cd33e62a70b8d75a11f2d2f65a49d34848e65ab06150e48a0bf7a6786e3b89b0fcfe303debf030cfccbbb421aedcbfdf7b6dd568c573e9a10ff5bb57b diff --git a/will-crash.spec b/will-crash.spec index 10a3aaa..4ef50e7 100644 --- a/will-crash.spec +++ b/will-crash.spec @@ -1,11 +1,15 @@ +# http://fedoraproject.org/wiki/Packaging:Guidelines#PIE +# http://fedoraproject.org/wiki/Hardened_Packages +%global _hardened_build 1 + Name: will-crash -Version: 0.10 -Release: 10%{?dist} +Version: 0.12 +Release: 1%{?dist} Summary: Set of crashing executables written in various languages License: GPLv3 -URL: http://github.com/sorki/will-crash -Source0: http://sources.48.io/will-crash/%{name}-%{version}.tar.gz +URL: https://github.com/abrt/will-crash +Source0: https://github.com/abrt/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake @@ -14,21 +18,10 @@ BuildRequires: libtool BuildRequires: gcc-c++ BuildRequires: ruby-devel Requires: ruby -Requires: python2 -%if 0%{?rhel} && 0%{?rhel} == 6 -Requires: java-1.8.0-openjdk-headless -Requires: jpackage-utils -%else Requires: java-headless >= 1.7.0.0 Requires: javapackages-tools -%endif -# Don't require python3 for el6/el7, exclude ppc64 due to missing java -%if 0%{?rhel} -ExcludeArch: ppc64 -%else Requires: python3 -%endif %description The main purpose of this project is to provide sample @@ -41,6 +34,7 @@ like ABRT. %build ./autogen.sh %configure + make %{?_smp_mflags} %install @@ -55,17 +49,16 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %doc LICENSE %doc AUTHORS %{_bindir}/will_segfault +%{_bindir}/will_segfault_in_new_pid +%{_bindir}/will_segfault_threads %{_bindir}/will_abort -%{_bindir}/will_python_raise -%{_bindir}/will_python_sigsegv +%{_bindir}/will_python3_sigsegv %{_bindir}/will_python3_raise %{_bindir}/will_ruby_raise %{_bindir}/will_java_segfault %{_bindir}/will_java_throw %{_bindir}/will_java_throw_remote -%if 0%{?rhel} && 0%{?rhel} > 6 %{_bindir}/will_java_throw_suppressed -%endif %{_bindir}/will_cpp_segfault %{_bindir}/will_stackoverflow %{_bindir}/will_oops @@ -77,6 +70,12 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %{ruby_vendorlibdir}/will_crash.rb %changelog +* Tue Jul 02 2019 Ernestas Kulik - 0.12-1 +- Update upstream URIs +- Enable PIEs +- Remove RHEL 6/7-specific content +- Update to 0.12 + * Sun Feb 03 2019 Fedora Release Engineering - 0.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From f9379cb8f2552702657660232bad58b718a9f629 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Thu, 20 Feb 2020 10:08:36 +0100 Subject: [PATCH 2/3] [packit] 0.13 upstream release Upstream tag: v0.13 Upstream commit: c6aa3974 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + .packit.yml | 18 ++++++++++++++++++ README.packit | 3 +++ sources | 2 +- will-crash.spec | 44 ++++++++++++++++++++++++-------------------- 5 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 .packit.yml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 33574ea..517be7c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /will-crash-0.9.tar.gz /will-crash-0.10.tar.gz /will-crash-v0.12.tar.gz +/will-crash-0.13.tar.gz diff --git a/.packit.yml b/.packit.yml new file mode 100644 index 0000000..09deb35 --- /dev/null +++ b/.packit.yml @@ -0,0 +1,18 @@ +specfile_path: will-crash.spec +synced_files: + - .packit.yml + - will-crash.spec +upstream_package_name: will-crash +upstream_project_url: https://github.com/abrt/will-crash +downstream_package_name: will-crash +jobs: +- job: propose_downstream + trigger: release + metadata: + dist-git-branch: fedora-all +- job: copr_build + trigger: pull_request + metadata: + targets: + - epel-8 + - fedora-all diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..19936d7 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.8.1. diff --git a/sources b/sources index 2cf2b3c..1c5fb5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (will-crash-v0.12.tar.gz) = 13e2eb1cd33e62a70b8d75a11f2d2f65a49d34848e65ab06150e48a0bf7a6786e3b89b0fcfe303debf030cfccbbb421aedcbfdf7b6dd568c573e9a10ff5bb57b +SHA512 (will-crash-0.13.tar.gz) = 5e14a1782709fc5466bf5e4fbbe508b61717378fffe7184af7e328ee209d0b22a1536eba7d9c97b6c617dd2dde588ba962badb6fc84038107f20b22b79d7215d diff --git a/will-crash.spec b/will-crash.spec index 4ef50e7..896e104 100644 --- a/will-crash.spec +++ b/will-crash.spec @@ -3,25 +3,27 @@ %global _hardened_build 1 Name: will-crash -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: Set of crashing executables written in various languages +Group: Development/Tools License: GPLv3 URL: https://github.com/abrt/will-crash -Source0: https://github.com/abrt/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz +Source0: https://github.com/abrt/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake BuildRequires: java-devel +BuildRequires: javapackages-tools BuildRequires: libtool +BuildRequires: meson BuildRequires: gcc-c++ BuildRequires: ruby-devel -Requires: ruby + Requires: java-headless >= 1.7.0.0 Requires: javapackages-tools - +Requires: perl Requires: python3 +Requires: ruby %description The main purpose of this project is to provide sample @@ -32,26 +34,23 @@ like ABRT. %setup -q %build -./autogen.sh -%configure - -make %{?_smp_mflags} +%meson \ + -Djavadir=%{_javadir} \ + -D_java_home=%{java_home} \ + %{nil} +%meson_build %install -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/java - -make install DESTDIR=%{buildroot} -# no devel package -> no *.so links to versioned libraries needed -find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +%meson_install %files %doc README.rst %doc LICENSE -%doc AUTHORS %{_bindir}/will_segfault %{_bindir}/will_segfault_in_new_pid %{_bindir}/will_segfault_threads %{_bindir}/will_abort +%{_bindir}/will_perl_sigsegv %{_bindir}/will_python3_sigsegv %{_bindir}/will_python3_raise %{_bindir}/will_ruby_raise @@ -62,14 +61,19 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f %{_bindir}/will_cpp_segfault %{_bindir}/will_stackoverflow %{_bindir}/will_oops -%{_datadir}/java/* +%{_datadir}/java/WillRaiseSigSegv.class +%{_datadir}/java/willcrash/willremoteloader.jar +%{_datadir}/java/willcrash/willsuppressed.jar +%{_datadir}/java/willcrash/willuncaught.jar %{_datadir}/will-crash/* -%{_libdir}/libwillcrash.so* -# Java runtime requires unversioned library -%{_libdir}/libwilljavasegfault.so* +%{_libdir}/libwillcrash.so +%{_libdir}/libwilljavasegfault.so %{ruby_vendorlibdir}/will_crash.rb %changelog +* Thu Feb 20 2020 Ernestas Kulik - 0.13-1 +- new upstream release: 0.13 + * Tue Jul 02 2019 Ernestas Kulik - 0.12-1 - Update upstream URIs - Enable PIEs From fe80c9942c1d4ed8a3340a740a97866a8b0e36e7 Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 21 Feb 2020 09:35:22 +0100 Subject: [PATCH 3/3] [packit] 0.13.2 upstream release Upstream tag: v0.13.2 Upstream commit: bda2dc05 Signed-off-by: Ernestas Kulik --- .gitignore | 1 + .packit.yml | 27 ++++++++++++++------------- sources | 2 +- will-crash.spec | 13 ++++++++++--- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 517be7c..bfe18e8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /will-crash-0.10.tar.gz /will-crash-v0.12.tar.gz /will-crash-0.13.tar.gz +/will-crash-0.13.2.tar.gz diff --git a/.packit.yml b/.packit.yml index 09deb35..1ffaeab 100644 --- a/.packit.yml +++ b/.packit.yml @@ -1,18 +1,19 @@ -specfile_path: will-crash.spec +specfile_path: 'will-crash.spec' synced_files: - - .packit.yml - - will-crash.spec -upstream_package_name: will-crash -upstream_project_url: https://github.com/abrt/will-crash -downstream_package_name: will-crash + - '.packit.yml' + - 'will-crash.spec' +upstream_package_name: 'will-crash' +upstream_project_url: 'https://github.com/abrt/will-crash' +upstream_tag_template: 'v{version}' +downstream_package_name: 'will-crash' jobs: -- job: propose_downstream - trigger: release +- job: 'propose_downstream' + trigger: 'release' metadata: - dist-git-branch: fedora-all -- job: copr_build - trigger: pull_request + dist-git-branch: 'fedora-all' +- job: 'copr_build' + trigger: 'pull_request' metadata: targets: - - epel-8 - - fedora-all + - 'epel-8' + - 'fedora-all' diff --git a/sources b/sources index 1c5fb5f..909a528 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (will-crash-0.13.tar.gz) = 5e14a1782709fc5466bf5e4fbbe508b61717378fffe7184af7e328ee209d0b22a1536eba7d9c97b6c617dd2dde588ba962badb6fc84038107f20b22b79d7215d +SHA512 (will-crash-0.13.2.tar.gz) = 804da4c60d760132eb4bf0b15a6715118c7bfd98e5f53d3c1faaa43f7b945079cef40fdd3825c8a41a6e845d404dee80b1de6e98446930b9fabca6197257bfca diff --git a/will-crash.spec b/will-crash.spec index 896e104..44dbfe3 100644 --- a/will-crash.spec +++ b/will-crash.spec @@ -3,7 +3,7 @@ %global _hardened_build 1 Name: will-crash -Version: 0.13 +Version: 0.13.2 Release: 1%{?dist} Summary: Set of crashing executables written in various languages @@ -66,11 +66,18 @@ like ABRT. %{_datadir}/java/willcrash/willsuppressed.jar %{_datadir}/java/willcrash/willuncaught.jar %{_datadir}/will-crash/* -%{_libdir}/libwillcrash.so -%{_libdir}/libwilljavasegfault.so +%{_libdir}/%{name}/libwillcrash.so +# There’s no way to set the rpath in Java, so it will either look in whatever +# path it does or we have to use System.load(), which takes a path to a library, +# but then you need to guess the extension, which is not portable (though doesn’t +# matter here per se, it’s still not desirable to write hacks). +%{_libdir}/libwilljavasegfault.so* %{ruby_vendorlibdir}/will_crash.rb %changelog +* Fri Feb 21 2020 Ernestas Kulik - 0.13.2-1 +- new upstream release: 0.13.2 + * Thu Feb 20 2020 Ernestas Kulik - 0.13-1 - new upstream release: 0.13