From 42f507b8dc37ff1517c3ec3869f2b6cbdd5d5dd6dae9fd0691275d20b7845cbf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 18 Aug 2019 16:46:42 +0000
Subject: [PATCH] - Update to new upstream release 1.3.2

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=25
---
 protobuf-c-1.3.1.tar.gz |  3 --
 protobuf-c-1.3.2.tar.gz |  3 ++
 protobuf-c.changes      |  8 +++++
 protobuf-c.spec         | 67 ++++++++++++-----------------------------
 4 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 protobuf-c-1.3.1.tar.gz
 create mode 100644 protobuf-c-1.3.2.tar.gz

diff --git a/protobuf-c-1.3.1.tar.gz b/protobuf-c-1.3.1.tar.gz
deleted file mode 100644
index 02c8e26..0000000
--- a/protobuf-c-1.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
-size 498779
diff --git a/protobuf-c-1.3.2.tar.gz b/protobuf-c-1.3.2.tar.gz
new file mode 100644
index 0000000..6630ad4
--- /dev/null
+++ b/protobuf-c-1.3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53f251f14c597bdb087aecf0b63630f434d73f5a10fc1ac545073597535b9e74
+size 500100
diff --git a/protobuf-c.changes b/protobuf-c.changes
index 834be5d..b795fdd 100644
--- a/protobuf-c.changes
+++ b/protobuf-c.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Aug 18 16:36:38 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 1.3.2
+  * Fix proto3 repeated scalar field default packing behavior
+  * Fix out-of-bounds read in scan_length_prefixed_data()
+- Remove protobuf-c-namespace.patch (merged)
+
 -------------------------------------------------------------------
 Fri Jun  7 13:45:12 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/protobuf-c.spec b/protobuf-c.spec
index 9ca03a7..bb055c4 100644
--- a/protobuf-c.spec
+++ b/protobuf-c.spec
@@ -19,15 +19,14 @@
 
 %define sover 1
 Name:           protobuf-c
-Version:        1.3.1
+Version:        1.3.2
 Release:        0
 Summary:        C bindings for Google's Protocol Buffers
 License:        BSD-3-Clause
 Group:          Development/Tools/Other
 URL:            https://github.com/protobuf-c/protobuf-c
-Source:         https://github.com/protobuf-c/protobuf-c/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source:         https://github.com/protobuf-c/protobuf-c/releases/download/v%version/%name-%version.tar.gz
 Source99:       protobuf-c-rpmlintrc
-Patch0:         protobuf-c-namespace.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -36,7 +35,7 @@ BuildRequires:  libtool
 BuildRequires:  make
 BuildRequires:  pkgconfig
 BuildRequires:  protobuf-devel >= 2.6.0
-Requires:       libprotobuf-c-devel = %{version}
+Requires:       libprotobuf-c-devel = %version
 
 %description
 This package provides a code generator and runtime libraries to use Protocol
@@ -44,80 +43,52 @@ Buffers from pure C (not C++).
 
 It uses a modified version of protoc called protoc-c.
 
-%package -n libprotobuf-c%{sover}
+%package -n libprotobuf-c%sover
 Summary:        C bindings for Google's Protocol Buffers
 Group:          System/Libraries
 
-%description -n libprotobuf-c%{sover}
+%description -n libprotobuf-c%sover
 This package provides a code generator and runtime libraries to use Protocol
 Buffers from pure C (not C++).
 
 %package -n libprotobuf-c-devel
 Summary:        C bindings for Google's Protocol Buffers
 Group:          Development/Libraries/C and C++
-Requires:       libprotobuf-c%{sover} = %{version}
+Requires:       libprotobuf-c%sover = %version
 
 %description -n libprotobuf-c-devel
 This package provides a code generator and runtime libraries to use Protocol
 Buffers from pure C (not C++).
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
-%define _lto_cflags %{nil}
-%if 0
-mkdir build
-pushd build
-export CFLAGS="%{optflags}"
-cmake \
-    -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-    -DCMAKE_INSTALL_PREFIX:PATH="%{_prefix}" \
-    -DCMAKE_SKIP_RPATH=TRUE \
-    -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-    -DCMAKE_STRIP="%{_bindir}/touch" \
-    ..
-make %{?_smp_mflags}
-popd #build
-%else
+%define _lto_cflags %nil
 autoreconf -fvi
 %configure
 make %{?_smp_mflags}
-%endif
 
 %install
-%if 0
-pushd build
 %make_install
-popd #build
-%else
-%make_install
-%endif
-rm "%{buildroot}/%{_libdir}"/*.a
-rm "%{buildroot}/%{_libdir}"/*.la
+rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
 
-%post   -n libprotobuf-c%{sover} -p /sbin/ldconfig
-%postun -n libprotobuf-c%{sover} -p /sbin/ldconfig
+%post   -n libprotobuf-c%sover -p /sbin/ldconfig
+%postun -n libprotobuf-c%sover -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc ChangeLog TODO
-%{_bindir}/protoc-c
-%{_bindir}/protoc-gen-c
+%_bindir/protoc-c
+%_bindir/protoc-gen-c
 
-%files -n libprotobuf-c%{sover}
-%defattr(-,root,root)
+%files -n libprotobuf-c%sover
 %license LICENSE
-%{_libdir}/libprotobuf-c.so.%{sover}
-%{_libdir}/libprotobuf-c.so.%{sover}.*
+%_libdir/libprotobuf-c.so.%sover
+%_libdir/libprotobuf-c.so.%sover.*
 
 %files -n libprotobuf-c-devel
-%defattr(-,root,root)
-%dir %{_includedir}/google
-%{_includedir}/google/protobuf-c
-%{_includedir}/protobuf-c/
-%{_libdir}/libprotobuf-c.so
-%{_libdir}/pkgconfig/libprotobuf-c.pc
+%_includedir/*/
+%_libdir/libprotobuf-c.so
+%_libdir/pkgconfig/libprotobuf-c.pc
 
 %changelog