Accepting request 986892 from home:adamm:branches:server:monitoring

- Do not build static libraries
- Run unit tests
- Explicit files and directories for includedir, so we can detect
  what we actually install there
- 508.patch: fixes invalid arithmetic shift (bsc#1200908, CVE-2022-33070)

OBS-URL: https://build.opensuse.org/request/show/986892
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=36

508.patch

@@ -0,0 +1,86 @@
+From 6e389ce2c34355d36009a8fb1666bed29fa2d4f4 Mon Sep 17 00:00:00 2001
+From: "Todd C. Miller" <Todd.Miller@sudo.ws>
+Date: Mon, 6 Jun 2022 13:57:38 -0600
+Subject: [PATCH] Only shift unsigned values to avoid implementation-specific
+ behavior. This converts the arithmetic shifts to logical shifts. It is based
+ in part on a stackoverflow answer by John Schultz,
+ https://stackoverflow.com/questions/4533076/google-protocol-buffers-zigzag-encoding
+
+---
+ protobuf-c/protobuf-c.c | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/protobuf-c/protobuf-c.c b/protobuf-c/protobuf-c.c
+index ad1bdb1..98052cd 100644
+--- a/protobuf-c/protobuf-c.c
++++ b/protobuf-c/protobuf-c.c
+@@ -316,9 +316,8 @@ int32_size(int32_t v)
+ static inline uint32_t
+ zigzag32(int32_t v)
+ {
+-	// Note:  the right-shift must be arithmetic
+-	// Note:  left shift must be unsigned because of overflow
+-	return ((uint32_t)(v) << 1) ^ (uint32_t)(v >> 31);
++	// Note:  Using unsigned types prevents undefined behavior
++	return ((uint32_t)v << 1) ^ -((uint32_t)v >> 31);
+ }
+ 
+ /**
+@@ -380,9 +379,8 @@ uint64_size(uint64_t v)
+ static inline uint64_t
+ zigzag64(int64_t v)
+ {
+-	// Note:  the right-shift must be arithmetic
+-	// Note:  left shift must be unsigned because of overflow
+-	return ((uint64_t)(v) << 1) ^ (uint64_t)(v >> 63);
++	// Note:  Using unsigned types prevents undefined behavior
++	return ((uint64_t)v << 1) ^ -((uint64_t)v >> 63);
+ }
+ 
+ /**
+@@ -802,7 +800,8 @@ uint32_pack(uint32_t value, uint8_t *out)
+ }
+ 
+ /**
+- * Pack a signed 32-bit integer and return the number of bytes written.
++ * Pack a signed 32-bit integer and return the number of bytes written,
++ * passed as unsigned to avoid implementation-specific behavior.
+  * Negative numbers are encoded as two's complement 64-bit integers.
+  *
+  * \param value
+@@ -813,14 +812,14 @@ uint32_pack(uint32_t value, uint8_t *out)
+  *      Number of bytes written to `out`.
+  */
+ static inline size_t
+-int32_pack(int32_t value, uint8_t *out)
++int32_pack(uint32_t value, uint8_t *out)
+ {
+-	if (value < 0) {
++	if ((int32_t)value < 0) {
+ 		out[0] = value | 0x80;
+ 		out[1] = (value >> 7) | 0x80;
+ 		out[2] = (value >> 14) | 0x80;
+ 		out[3] = (value >> 21) | 0x80;
+-		out[4] = (value >> 28) | 0x80;
++		out[4] = (value >> 28) | 0xf0;
+ 		out[5] = out[6] = out[7] = out[8] = 0xff;
+ 		out[9] = 0x01;
+ 		return 10;
+@@ -2425,7 +2424,7 @@ static inline int32_t
+ unzigzag32(uint32_t v)
+ {
+ 	// Note:  Using unsigned types prevents undefined behavior
+-	return (int32_t)((v >> 1) ^ (~(v & 1) + 1));
++	return (int32_t)((v >> 1) ^ -(v & 1));
+ }
+ 
+ static inline uint32_t
+@@ -2467,7 +2466,7 @@ static inline int64_t
+ unzigzag64(uint64_t v)
+ {
+ 	// Note:  Using unsigned types prevents undefined behavior
+-	return (int64_t)((v >> 1) ^ (~(v & 1) + 1));
++	return (int64_t)((v >> 1) ^ -(v & 1));
+ }
+ 
+ static inline uint64_t

protobuf-c.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul  5 12:38:17 UTC 2022 - Adam Majer <adam.majer@suse.de>
+
+- Do not build static libraries
+- Run unit tests
+- Explicit files and directories for includedir, so we can detect
+  what we actually install there
+- 508.patch: fixes invalid arithmetic shift (bsc#1200908, CVE-2022-33070)
+
 -------------------------------------------------------------------
 Tue Nov 23 10:10:53 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
 

protobuf-c.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf-c
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2011 Pascal Bleser
 #
 # All modifications and additions to the file contributed by third parties
@@ -26,6 +26,7 @@ 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
+Patch1:         508.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -54,7 +55,7 @@ Summary:        C bindings for Google's Protocol Buffers
 Group:          Development/Libraries/C and C++
 Requires:       libprotobuf-c%sover = %version
 Provides:       %name = %version
-Obsoletes:      %name <= %version
+Obsoletes:      %name <= 1.4.0
 
 %description -n libprotobuf-c-devel
 This package provides a code generator and runtime libraries to use Protocol
@@ -64,14 +65,20 @@ Buffers from pure C (not C++).
 %autosetup -p1
 
 %build
+%{!?make_build:%define make_build make -O %{?_smp_mflags} V=1 VERBOSE=1}
 %define _lto_cflags %nil
 autoreconf -fvi
-%configure
+%configure \
+    --enable-static=no
+
 %make_build
 
 %install
 %make_install
-rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
+rm %buildroot/%_libdir/*.la
+
+%check
+make check
 
 %post   -n libprotobuf-c%sover -p /sbin/ldconfig
 %postun -n libprotobuf-c%sover -p /sbin/ldconfig
@@ -83,9 +90,13 @@ rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
 
 %files -n libprotobuf-c-devel
 %doc ChangeLog TODO
+%dir %_includedir/protobuf-c
+%dir %_includedir/google
+%dir %_includedir/google/protobuf-c
+%_includedir/protobuf-c/*
+%_includedir/google/protobuf-c/protobuf-c.h
 %_bindir/protoc-c
 %_bindir/protoc-gen-c
-%_includedir/*/
 %_libdir/libprotobuf-c.so
 %_libdir/pkgconfig/libprotobuf-c.pc