Compare commits
No commits in common. "c8s" and "c9" have entirely different histories.
1
.ed.metadata
Normal file
1
.ed.metadata
Normal file
@ -0,0 +1 @@
|
||||
f02cd93190f5d34dc5f6abd8bc8c1cd2e7b067b8 SOURCES/ed-1.14.2.tar.xz
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1 @@
|
||||
SOURCES/ed-1.14.2.tar.xz
|
||||
/ed-1.14.2.tar.xz
|
||||
|
@ -1,14 +1,15 @@
|
||||
Summary: The GNU line editor
|
||||
Name: ed
|
||||
Version: 1.14.2
|
||||
Release: 4%{?dist}
|
||||
Release: 12%{?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/
|
||||
BuildRequires: gcc
|
||||
BuildRequires: make
|
||||
Requires(post): info
|
||||
Requires(preun): info
|
||||
|
||||
@ -24,7 +25,6 @@ won't use it.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -34,14 +34,6 @@ won't use it.
|
||||
%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
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc ChangeLog NEWS README TODO AUTHORS
|
||||
@ -52,11 +44,36 @@ fi
|
||||
%{_infodir}/ed.info*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 09 2018 Karsten Hopp <karsten@redhat.com> - 1.14.2-4
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.2-12
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.14.2-11
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Oct 9 2018 Karsten Hopp <karsten@redhat.com> - 1.14.2-5
|
||||
- fix license tag
|
||||
|
||||
* Mon Oct 01 2018 Karsten Hopp <karsten@redhat.com> - 1.14.2-3
|
||||
- fix resource leaks
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 21 2018 Karsten Hopp <karsten@redhat.com> - 1.14.2-3
|
||||
- buildrequire gcc
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
@ -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;
|
||||
}
|
@ -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}
|
Loading…
Reference in New Issue
Block a user