Import protobuf-c source since to avoid an external dependency.

The files generated with protoc-c are not standalone.
We need to include protobuf-c.c and protobuf-c.h from the protobuf-c
distribution too.  Building protoc-c requires a relative recent
version of gcc which limits its portability.

MANIFEST

@@ -236,6 +236,8 @@ logsrvd/log_server.proto
 logsrvd/iolog_writer.c
 logsrvd/logsrvd.c
 logsrvd/logsrvd.h
+logsrvd/protobuf-c/protobuf-c.c
+logsrvd/protobuf-c/protobuf-c.h
 logsrvd/sendlog.c
 logsrvd/sendlog.h
 ltmain.sh

doc/LICENSE

@@ -234,3 +234,32 @@ The embedded copy of zlib bears the following license:
 
   Jean-loup Gailly        Mark Adler
   jloup@gzip.org          madler@alumni.caltech.edu
+
+The embedded copy of protobuf-c bears the following license:
+
+   Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors.
+   All rights reserved.
+  
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+  
+       * Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+  
+       * Redistributions in binary form must reproduce the above
+         copyright notice, this list of conditions and the following
+         disclaimer in the documentation and/or other materials
+         provided with the distribution.
+  
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

logsrvd/Makefile.in

@@ -41,7 +41,7 @@ INSTALL_BACKUP = @INSTALL_BACKUP@
 
 # Libraries
 LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
-LIBS = -lprotobuf-c $(LT_LIBS)
+LIBS = $(LT_LIBS)
 
 # C preprocessor defines
 CPPDEFS = -D_PATH_SUDO_LOGSRVD_CONF=\"$(sysconfdir)/sudo_logsrvd.conf\" \
@@ -108,9 +108,9 @@ SHELL = @SHELL@
 
 PROGS = logsrvd sendlog
 
-LOGSRVD_OBJS = iolog_writer.o logsrvd.o log_server.pb-c.o
+LOGSRVD_OBJS = iolog_writer.o logsrvd.o log_server.pb-c.o protobuf-c.o
 
-SENDLOG_OBJS = sendlog.o iolog_util.o log_server.pb-c.o
+SENDLOG_OBJS = sendlog.o iolog_util.o log_server.pb-c.o protobuf-c.o
 
 IOBJS = $(LOGSRVD_OBJS:.o=.i) $(SENDLOG_OBJS:.o=.i)
 
@@ -149,7 +149,8 @@ GENERATED = log_server.pb-c.h log_server.pb-c.c
 
 $(devdir)/log_server.pb-c.c $(devdir)/log_server.pb-c.h: $(srcdir)/log_server.proto
 	@if [ -n "$(DEVEL)" ]; then \
-	    protoc-c --c_out=$(devdir) --proto_path=$(srcdir) $(srcdir)/log_server.proto; \
+	    cmd='protoc-c --c_out=$(devdir) --proto_path=$(srcdir) $(srcdir)/log_server.proto'; \
+	    echo "$$cmd"; eval $$cmd; \
 	fi
 
 pre-install:
@@ -230,21 +231,23 @@ iolog_writer.o: $(srcdir)/iolog_writer.c $(devdir)/log_server.pb-c.h \
                 $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
                 $(incdir)/sudo_debug.h $(incdir)/sudo_fatal.h \
                 $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
-                $(srcdir)/logsrvd.h $(sudoers_srcdir)/iolog.h \
+                $(srcdir)/logsrvd.h $(srcdir)/protobuf-c/protobuf-c.h \
-                $(top_builddir)/config.h
+                $(sudoers_srcdir)/iolog.h $(top_builddir)/config.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/iolog_writer.c
 iolog_writer.i: $(srcdir)/iolog_writer.c $(devdir)/log_server.pb-c.h \
                 $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
                 $(incdir)/sudo_debug.h $(incdir)/sudo_fatal.h \
                 $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
-                $(srcdir)/logsrvd.h $(sudoers_srcdir)/iolog.h \
+                $(srcdir)/logsrvd.h $(srcdir)/protobuf-c/protobuf-c.h \
-                $(top_builddir)/config.h
+                $(sudoers_srcdir)/iolog.h $(top_builddir)/config.h
 	$(CC) -E -o $@ $(CPPFLAGS) $<
 iolog_writer.plog: iolog_writer.i
 	rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/iolog_writer.c --i-file $< --output-file $@
-log_server.pb-c.o: $(srcdir)/log_server.pb-c.c $(devdir)/log_server.pb-c.h
+log_server.pb-c.o: $(srcdir)/log_server.pb-c.c $(devdir)/log_server.pb-c.h \
+                   $(srcdir)/protobuf-c/protobuf-c.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/log_server.pb-c.c
-log_server.pb-c.i: $(srcdir)/log_server.pb-c.c $(devdir)/log_server.pb-c.h
+log_server.pb-c.i: $(srcdir)/log_server.pb-c.c $(devdir)/log_server.pb-c.h \
+                   $(srcdir)/protobuf-c/protobuf-c.h
 	$(CC) -E -o $@ $(CPPFLAGS) $<
 log_server.pb-c.plog: log_server.pb-c.i
 	rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/log_server.pb-c.c --i-file $< --output-file $@
@@ -253,23 +256,30 @@ logsrvd.o: $(srcdir)/logsrvd.c $(devdir)/log_server.pb-c.h \
            $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h $(incdir)/sudo_event.h \
            $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
            $(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/logsrvd.h \
-           $(top_builddir)/config.h
+           $(srcdir)/protobuf-c/protobuf-c.h $(top_builddir)/config.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/logsrvd.c
 logsrvd.i: $(srcdir)/logsrvd.c $(devdir)/log_server.pb-c.h \
            $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
            $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h $(incdir)/sudo_event.h \
            $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
            $(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/logsrvd.h \
-           $(top_builddir)/config.h
+           $(srcdir)/protobuf-c/protobuf-c.h $(top_builddir)/config.h
 	$(CC) -E -o $@ $(CPPFLAGS) $<
 logsrvd.plog: logsrvd.i
 	rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/logsrvd.c --i-file $< --output-file $@
+protobuf-c.o: $(srcdir)/protobuf-c/protobuf-c.c 
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/protobuf-c/protobuf-c.c
+protobuf-c.i: $(srcdir)/protobuf-c/protobuf-c.c 
+	$(CC) -E -o $@ $(CPPFLAGS) $<
+protobuf-c.plog: protobuf-c.i
+	rm -f $@; pvs-studio --cfg $(PVS_CFG) --sourcetree-root $(top_srcdir) --skip-cl-exe yes --source-file $(srcdir)/protobuf-c/protobuf-c.c --i-file $< --output-file $@
 sendlog.o: $(srcdir)/sendlog.c $(devdir)/log_server.pb-c.h \
            $(incdir)/compat/getaddrinfo.h $(incdir)/compat/stdbool.h \
            $(incdir)/sudo_compat.h $(incdir)/sudo_conf.h \
            $(incdir)/sudo_debug.h $(incdir)/sudo_event.h \
            $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
-           $(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/sendlog.h \
+           $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
+           $(srcdir)/protobuf-c/protobuf-c.h $(srcdir)/sendlog.h \
            $(sudoers_srcdir)/iolog.h $(sudoers_srcdir)/iolog_util.h \
            $(top_builddir)/config.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/sendlog.c
@@ -278,7 +288,8 @@ sendlog.i: $(srcdir)/sendlog.c $(devdir)/log_server.pb-c.h \
            $(incdir)/sudo_compat.h $(incdir)/sudo_conf.h \
            $(incdir)/sudo_debug.h $(incdir)/sudo_event.h \
            $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
-           $(incdir)/sudo_queue.h $(incdir)/sudo_util.h $(srcdir)/sendlog.h \
+           $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
+           $(srcdir)/protobuf-c/protobuf-c.h $(srcdir)/sendlog.h \
            $(sudoers_srcdir)/iolog.h $(sudoers_srcdir)/iolog_util.h \
            $(top_builddir)/config.h
 	$(CC) -E -o $@ $(CPPFLAGS) $<