Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/protobuf-c-1.3.0.tar.gz
|
||||
/protobuf-c-*.tar.gz
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 289f5c18b195aa43d46a619d1188709abbfa9c82 Mon Sep 17 00:00:00 2001
|
||||
From: 10054172 <hui.zhang@thalesgroup.com>
|
||||
Date: Fri, 18 Mar 2022 12:42:57 -0400
|
||||
Subject: [PATCH 1/2] Fix issue #499: unsigned integer overflow
|
||||
|
||||
Signed-off-by: 10054172 <hui.zhang@thalesgroup.com>
|
||||
---
|
||||
protobuf-c/protobuf-c.c | 11 +++++++----
|
||||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/protobuf-c/protobuf-c.c b/protobuf-c/protobuf-c.c
|
||||
index 98052cdb..ec2d40a1 100644
|
||||
--- a/protobuf-c/protobuf-c.c
|
||||
+++ b/protobuf-c/protobuf-c.c
|
||||
@@ -2603,10 +2603,13 @@ parse_required_member(ScannedMember *scanned_member,
|
||||
return FALSE;
|
||||
|
||||
def_mess = scanned_member->field->default_value;
|
||||
- subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
|
||||
- allocator,
|
||||
- len - pref_len,
|
||||
- data + pref_len);
|
||||
+ if (len > pref_len)
|
||||
+ subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
|
||||
+ allocator,
|
||||
+ len - pref_len,
|
||||
+ data + pref_len);
|
||||
+ else
|
||||
+ subm = NULL;
|
||||
|
||||
if (maybe_clear &&
|
||||
*pmessage != NULL &&
|
||||
|
||||
From 0d1fd124a4e0a07b524989f6e64410ff648fba61 Mon Sep 17 00:00:00 2001
|
||||
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
|
||||
Date: Thu, 9 Jun 2022 07:34:55 -0600
|
||||
Subject: [PATCH 2/2] Fix regression with zero-length messages introduced in
|
||||
protobuf-c PR 500.
|
||||
|
||||
[edmonds: Import bugfix from
|
||||
https://github.com/sudo-project/sudo/commit/b6a6451482a3ff5e30f43ef888159d4b0d39143b.patch.]
|
||||
---
|
||||
protobuf-c/protobuf-c.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/protobuf-c/protobuf-c.c b/protobuf-c/protobuf-c.c
|
||||
index ec2d40a1..448f3e81 100644
|
||||
--- a/protobuf-c/protobuf-c.c
|
||||
+++ b/protobuf-c/protobuf-c.c
|
||||
@@ -2603,7 +2603,7 @@ parse_required_member(ScannedMember *scanned_member,
|
||||
return FALSE;
|
||||
|
||||
def_mess = scanned_member->field->default_value;
|
||||
- if (len > pref_len)
|
||||
+ if (len >= pref_len)
|
||||
subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
|
||||
allocator,
|
||||
len - pref_len,
|
||||
@ -1,185 +0,0 @@
|
||||
Name: protobuf-c
|
||||
Version: 1.3.0
|
||||
Release: 8%{?dist}
|
||||
Summary: C bindings for Google's Protocol Buffers
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/protobuf-c/protobuf-c
|
||||
Source0: https://github.com/protobuf-c/protobuf-c/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: %{url}/commit/ec3d900001a13ccdaa8aef996b34c61159c76217.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkgconfig(protobuf)
|
||||
|
||||
%description
|
||||
Protocol Buffers are a way of encoding structured data in an efficient yet
|
||||
extensible format. This package provides a code generator and run-time
|
||||
libraries to use Protocol Buffers from pure C (not C++).
|
||||
|
||||
It uses a modified version of protoc called protoc-c.
|
||||
|
||||
%package compiler
|
||||
Summary: Protocol Buffers C compiler
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description compiler
|
||||
This package contains a modified version of the Protocol Buffers
|
||||
compiler for the C programming language called protoc-c.
|
||||
|
||||
%package devel
|
||||
Summary: Protocol Buffers C headers and libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-compiler%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains protobuf-c headers and libraries.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P 0 -p 1
|
||||
|
||||
%build
|
||||
autoreconf -ifv
|
||||
%configure --disable-static
|
||||
%make_build
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -vf $RPM_BUILD_ROOT/%{_libdir}/libprotobuf-c.la
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%{_libdir}/libprotobuf-c.so.*
|
||||
%doc TODO LICENSE ChangeLog
|
||||
|
||||
%files compiler
|
||||
%{_bindir}/protoc-c
|
||||
%{_bindir}/protoc-gen-c
|
||||
|
||||
%files devel
|
||||
%dir %{_includedir}/google
|
||||
%{_includedir}/protobuf-c/
|
||||
%{_includedir}/google/protobuf-c/
|
||||
%{_libdir}/libprotobuf-c.so
|
||||
%{_libdir}/pkgconfig/libprotobuf-c.pc
|
||||
|
||||
%changelog
|
||||
* Tue Apr 25 2023 Adrian Reber <areber@redhat.com> - 1.3.0-8
|
||||
- Rebuild for gating test
|
||||
|
||||
* Mon Apr 24 2023 Adrian Reber <areber@redhat.com> - 1.3.0-7
|
||||
- Applied patch for for CVE-2022-48468 (#2186678)
|
||||
|
||||
* Wed Feb 03 2021 Petr Menšík <pemensik@redhat.com> - 1.3.0-6
|
||||
- Rebuild for gating test (#1919904)
|
||||
|
||||
* Tue Feb 02 2021 Petr Menšík <pemensik@redhat.com> - 1.3.0-5
|
||||
- Move devel subpackage to AppStream
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jan 31 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.0-3
|
||||
- Switch to %%ldconfig_scriptlets
|
||||
|
||||
* Wed Nov 29 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.3.0-2
|
||||
- Rebuild for protobuf 3.5
|
||||
|
||||
* Tue Nov 14 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.3.0-1
|
||||
- Update to 1.3.0
|
||||
|
||||
* Mon Nov 13 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.1-8
|
||||
- Rebuild for protobuf 3.4
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jun 13 2017 Orion Poplawski <orion@cora.nwra.com> - 1.2.1-5
|
||||
- Rebuild for protobuf 3.3
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 23 2017 Orion Poplawski <orion@cora.nwra.com> - 1.2.1-3
|
||||
- Rebuild for protobuf 3.2.0
|
||||
|
||||
* Sat Nov 19 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.1-2
|
||||
- Rebuild for protobuf 3.1.0
|
||||
|
||||
* Sun Mar 27 2016 Jan Vcelak <jvcelak@fedoraproject.org> 1.2.1-1
|
||||
- New upstream release:
|
||||
+ fix: negative value packing
|
||||
+ fix: eliminate undefined behavior in zigzag functions
|
||||
+ fix: generate code that uses universal zero initializer for oneof unions
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Nov 25 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-3
|
||||
- Added protobuf-c-compiler subpackage to reduce runtime
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Apr 23 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.1.1-1
|
||||
- new upstream release (#1142988)
|
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.0.1-3
|
||||
- Rebuilt for Fedora 23 Change
|
||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Wed Aug 06 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.0.1-1
|
||||
- new upstream release
|
||||
|
||||
* Mon Aug 04 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.0.0-1
|
||||
- new upstream release (#1126116)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Mon Mar 11 2013 David Robinson <zxvdr.au@gmail.com> - 0.15-7
|
||||
- rebuilt for protobuf-2.5.0
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Sun Jun 12 2011 David Robinson <zxvdr.au@gmail.com> - 0.15-3
|
||||
- rebuilt for protobuf-2.4.1
|
||||
|
||||
* Sun Apr 24 2011 David Robinson <zxvdr.au@gmail.com> - 0.15-2
|
||||
- Spec file cleanup
|
||||
|
||||
* Wed Apr 20 2011 David Robinson <zxvdr.au@gmail.com> - 0.15-1
|
||||
- New upstream release
|
||||
- Spec file cleanup
|
||||
|
||||
* Mon Jan 17 2011 Bobby Powers <bobby@laptop.org> - 0.14-1
|
||||
- New upstream release
|
||||
- Removed -devel dependency on protobuf-devel
|
||||
- Small specfile cleanups
|
||||
|
||||
* Wed May 19 2010 David Robinson <zxvdr.au@gmail.com> - 0.13-2
|
||||
- Spec file cleanup
|
||||
|
||||
* Wed May 19 2010 David Robinson <zxvdr.au@gmail.com> - 0.13-1
|
||||
- Initial packaging
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-8
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
23
packit.yml
Normal file
23
packit.yml
Normal file
@ -0,0 +1,23 @@
|
||||
upstream_package_name: protobuf-c
|
||||
upstream_project_url: https://github.com/protobuf-c/protobuf-c
|
||||
upstream_tag_template: v{version}
|
||||
|
||||
downstream_package_name: protobuf-c
|
||||
|
||||
specfile_path: protobuf-c.spec
|
||||
|
||||
jobs:
|
||||
- job: pull_from_upstream
|
||||
trigger: release
|
||||
dist_git_branches:
|
||||
- rawhide
|
||||
|
||||
- job: koji_build
|
||||
trigger: commit
|
||||
dist_git_branches:
|
||||
- rawhide
|
||||
|
||||
- job: bodhi_update
|
||||
trigger: commit
|
||||
dist_git_branches:
|
||||
- rawhide
|
||||
72
protobuf-c.spec
Normal file
72
protobuf-c.spec
Normal file
@ -0,0 +1,72 @@
|
||||
%global sover 1
|
||||
|
||||
Name: protobuf-c
|
||||
Version: 1.5.0
|
||||
Release: %autorelease
|
||||
Summary: C bindings for Google's Protocol Buffers
|
||||
|
||||
License: BSD-2-Clause
|
||||
URL: https://github.com/protobuf-c/protobuf-c
|
||||
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: make
|
||||
BuildRequires: pkgconfig(protobuf)
|
||||
|
||||
%description
|
||||
Protocol Buffers are a way of encoding structured data in an efficient yet
|
||||
extensible format. This package provides a code generator and run-time
|
||||
libraries to use Protocol Buffers from pure C (not C++).
|
||||
|
||||
It uses a modified version of protoc called protoc-c.
|
||||
|
||||
%package compiler
|
||||
Summary: Protocol Buffers C compiler
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
%description compiler
|
||||
This package contains a modified version of the Protocol Buffers
|
||||
compiler for the C programming language called protoc-c.
|
||||
|
||||
%package devel
|
||||
Summary: Protocol Buffers C headers and libraries
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: %{name}-compiler%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
|
||||
%description devel
|
||||
This package contains protobuf-c headers and libraries.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static
|
||||
%make_build
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
find %{buildroot} -type f -name '*.la' -delete
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md TODO
|
||||
%{_libdir}/lib%{name}.so.%{sover}*
|
||||
|
||||
%files compiler
|
||||
%{_bindir}/protoc-c
|
||||
%{_bindir}/protoc-gen-c
|
||||
|
||||
%files devel
|
||||
%dir %{_includedir}/google
|
||||
%{_includedir}/%{name}/
|
||||
%{_includedir}/google/%{name}/
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_libdir}/pkgconfig/lib%{name}.pc
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
Loading…
Reference in New Issue
Block a user