diff --git a/.gitignore b/.gitignore index 22cc7c1..223e322 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/ed-1.14.2.tar.xz -/ed-1.14.2.tar.xz +ed-1.20.tar.lz +ed-1.20.tar.lz.sig diff --git a/antoniodiazdiaz-keyring.asc b/antoniodiazdiaz-keyring.asc new file mode 100644 index 0000000..805d4b9 --- /dev/null +++ b/antoniodiazdiaz-keyring.asc @@ -0,0 +1,56 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: Hostname: +Version: Hockeypuck ~unreleased + +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 +=d3KY +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ed-1.14.2-fix-resource-leaks.patch b/ed-1.14.2-fix-resource-leaks.patch deleted file mode 100644 index 310ab1e..0000000 --- a/ed-1.14.2-fix-resource-leaks.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -urN ed-1.14.2/carg_parser.c ed-1.14.2_patched/carg_parser.c ---- ed-1.14.2/carg_parser.c 2017-01-12 23:05:08.000000000 +0100 -+++ ed-1.14.2_patched/carg_parser.c 2018-10-04 11:12:59.857570021 +0200 -@@ -204,6 +204,8 @@ - int non_options_size = 0; /* number of skipped non-options */ - int argind = 1; /* index in argv */ - int i; -+ int Status = 0; -+ void * tmp = NULL; - - ap->data = 0; - ap->error = 0; -@@ -223,9 +225,15 @@ - if( ch2 == '-' ) - { - if( !argv[argind][2] ) { ++argind; break; } /* we found "--" */ -- else if( !parse_long_option( ap, opt, arg, options, &argind ) ) return 0; -+ else if( !parse_long_option( ap, opt, arg, options, &argind ) ) { -+ Status = 0; -+ goto Exit; -+ } - } -- else if( !parse_short_option( ap, opt, arg, options, &argind ) ) return 0; -+ else if( !parse_short_option( ap, opt, arg, options, &argind ) ) { -+ Status = 0; -+ goto Exit; -+ } - if( ap->error ) break; - } - else -@@ -234,7 +242,7 @@ - { if( !push_back_record( ap, 0, argv[argind++] ) ) return 0; } - else - { -- void * tmp = ap_resize_buffer( non_options, -+ tmp = ap_resize_buffer( non_options, - ( non_options_size + 1 ) * sizeof *non_options ); - if( !tmp ) return 0; - non_options = (const char **)tmp; -@@ -246,12 +254,21 @@ - else - { - for( i = 0; i < non_options_size; ++i ) -- if( !push_back_record( ap, 0, non_options[i] ) ) return 0; -+ if( !push_back_record( ap, 0, non_options[i] ) ) { -+ Status = 0; -+ goto Exit; -+ } - while( argind < argc ) -- if( !push_back_record( ap, 0, argv[argind++] ) ) return 0; -+ if( !push_back_record( ap, 0, argv[argind++] ) ) { -+ Status = 0; -+ goto Exit; -+ } - } -+ Status = 1; -+ goto Exit; -+Exit: - if( non_options ) free( non_options ); -- return 1; -+ return(Status); - } - - -diff -urN ed-1.14.2/main_loop.c ed-1.14.2_patched/main_loop.c ---- ed-1.14.2/main_loop.c 2017-02-22 17:25:34.000000000 +0100 -+++ ed-1.14.2_patched/main_loop.c 2018-10-01 17:19:46.555004735 +0200 -@@ -614,7 +614,7 @@ - !print_lines( second_addr, second_addr, 0 ) ) - return ERR; - break; -- case '#': while( *(*ibufpp)++ != '\n' ) ; -+ case '#': while( *(*ibufpp)++ != '\n' ) {} ; - break; - default : set_error_msg( "Unknown command" ); return ERR; - } diff --git a/ed.spec b/ed.spec index 89613cc..77a06e5 100644 --- a/ed.spec +++ b/ed.spec @@ -1,50 +1,78 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 5; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + Summary: The GNU line editor Name: ed -Version: 1.14.2 -Release: 4%{?dist} -License: GPLv3+ and GFDL -# Note: Upstream provides only lzip compressed tarballs which -# koji can't handle. Repackaging required: -#Source: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz -Source: %{name}-%{version}.tar.xz -Patch0: %{name}-%{version}-fix-resource-leaks.patch -URL: http://www.gnu.org/software/ed/ -Requires(post): info -Requires(preun): info +Version: 1.20 +Release: %autorelease + +# The entire source is GPLv2 except doc/ed.info and doc/ed.texi, which are GFDL +License: GPL-2.0-only AND GFDL-1.3-no-invariants-or-later +URL: https://www.gnu.org/software/ed/ +Source0: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz +Source1: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz.sig +Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8FE99503132D7742#./antoniodiazdiaz-keyring.asc + +BuildRequires: gcc +BuildRequires: make +%if 0%{?rhel} +BuildRequires: bsdtar +%else +BuildRequires: lzip +%endif +# for gpg verification +BuildRequires: gnupg2 %description -Ed is a line-oriented text editor, used to create, display, and modify -text files (both interactively and via shell scripts). For most -purposes, ed has been replaced in normal usage by full-screen editors -(emacs and vi, for example). - -Ed was the original UNIX editor, and may be used by some programs. In -general, however, you probably don't need to install it and you probably -won't use it. +ed is a line-oriented text editor, used to create, display, and modify text +files (both interactively and via shell scripts). For most purposes, ed has been +replaced in normal usage by full-screen editors (emacs and vi, for example). %prep -%setup -q -%patch0 -p1 +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' + +%if 0%{?rhel} +# no lzip in RHEL; bsdtar can handle it but not from within %%setup. +%setup -q -c -T +bsdtar -xf %{SOURCE0} -C %{_builddir} +%else +%autosetup +%endif %build -%configure -%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" +%set_build_flags +# Custom configure script; not Autoconf, so we do not use %%configure macro +./configure \ + --prefix=%{_prefix} \ + --exec-prefix=%{_exec_prefix} \ + --bindir=%{_bindir} \ + --datarootdir=%{_datadir} \ + --infodir=%{_infodir} \ + --mandir=%{_mandir} \ + --program-prefix=%{?_program_prefix} \ + CC="${CC-gcc}" \ + CPPFLAGS="${CPPFLAGS}" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" +%make_build %install %make_install rm -vrf %{buildroot}%{_infodir}/dir -%post -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun -if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi +%check +%make_build check %files -%license COPYING -%doc ChangeLog NEWS README TODO AUTHORS +%license COPYING doc/fdl.texi +%doc ChangeLog NEWS README AUTHORS %{_bindir}/ed %{_bindir}/red %{_mandir}/man1/ed.1* @@ -52,11 +80,81 @@ fi %{_infodir}/ed.info* %changelog -* Tue Oct 09 2018 Karsten Hopp - 1.14.2-4 +## START: Generated by rpmautospec +* Tue Oct 29 2024 Troy Dawson - 1.20-5 +- Bump release for October 2024 mass rebuild: + +* Thu Oct 24 2024 Frantisek Sumsal - 1.20-4 +- Add gating configuration for C10S/RHEL10 + +* Mon Jun 24 2024 Troy Dawson - 1.20-3 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 1.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Mikel Olasagasti Uranga - 1.20-1 +- Update to 1.20 - Closes rhbz#2259352 + +* Fri Jan 19 2024 Fedora Release Engineering - 1.19-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 22 2023 Yaakov Selkowitz - 1.19-5 +- Avoid lzip dependency in RHEL builds + +* Wed Jul 19 2023 Fedora Release Engineering - 1.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Apr 24 2023 Lukáš Zaoral - 1.19-3 +- migrate to SPDX license format + +* Thu Jan 19 2023 Fedora Release Engineering - 1.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 12 2023 Mikel Olasagasti Uranga - 1.19-1 +- Update to 1.19 - Closes rhbz#2160522 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu May 05 2022 Mikel Olasagasti Uranga - 1.18-1 +- Update to 1.18 - Closes rhbz#1805337 +- Swich homepage to https +- Use upstream lzip file, koji can handle it with the correct BuildRequire +- Check gpg signature +- Add check section +- Convert to rpmautospec +- Change from GPLv3+ to GPLv2 + +* Thu Jan 20 2022 Fedora Release Engineering - 1.14.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.14.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.14.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.14.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.14.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.14.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1.14.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Oct 9 2018 Karsten Hopp - 1.14.2-5 - fix license tag -* Mon Oct 01 2018 Karsten Hopp - 1.14.2-3 -- fix resource leaks +* Thu Jul 12 2018 Fedora Release Engineering - 1.14.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 21 2018 Karsten Hopp - 1.14.2-3 +- buildrequire gcc * Wed Feb 07 2018 Fedora Release Engineering - 1.14.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -240,10 +338,10 @@ fi - Fix build with current toolchain * Wed Apr 03 2002 Karsten Hopp -- don't use gcc -s +- don't use gcc -s * Fri Feb 22 2002 Karsten Hopp -- bump version +- bump version * Wed Jan 09 2002 Tim Powers - automated rebuild @@ -284,7 +382,7 @@ fi * Tue Mar 23 1999 Jeff Johnson - fix %%post syntax error (#1689). -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 11) * Wed Feb 24 1999 Preston Brown @@ -303,3 +401,5 @@ fi * Mon Jun 02 1997 Erik Troan - built against glibc + +## END: Generated by rpmautospec diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index eb7c84f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/sources b/sources index 7585202..b9cd1ef 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (ed-1.14.2.tar.xz) = de838a6df785c7dc80f4b5ba84330bbe743983fd81218321d4ab84c4c3688fdafb4c005502f3228f0bfa2b6bcf342d64d9523ab73ee440b4f305a033f567cbc2 +SHA512 (ed-1.20.tar.lz) = 90c0f24b1d0b7abd18d34345bc37de0e67a0bb96375a4531a742a89b53d4858c30781911c22d81aa0387d0cf4d2153e0b4286fd3483b05e4c35d5e02c0991c53 +SHA512 (ed-1.20.tar.lz.sig) = d1360a08cc430301ba2baf8be112b08f48545815d3090ae7da8e448f3e13806eba286d9ec13cd00f3e289e6e82b861fa7dabd63b48c75bee1e0ab59b72dc239d