[lxc-devel] [lxc/master] fix rpm packaging error for static library

[2xsec on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 387 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181010/ee0d3bf8/attachment.bin>
-------------- next part --------------
From 8392708ef3333ad1d7fab6c6bbfc12dadf4ffd08 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Wed, 10 Oct 2018 14:50:32 +0900
Subject: [PATCH 1/3] confile: remove unused variable

Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
 src/lxc/confile.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 052de9b64..af7be1501 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2493,7 +2493,6 @@ static struct new_config_item *parse_new_conf_line(char *buffer)
 
 int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include)
 {
-	int ret;
 	struct parse_line_conf c;
 
 	c.conf = conf;

From af5e7ee11b0b3ac00d44e6d64dbf61fdefc58e8c Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Wed, 10 Oct 2018 15:00:45 +0900
Subject: [PATCH 2/3] parse: fix uninitialized pointer access

Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
 src/lxc/parse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 05764b964..2fdb18ec8 100644
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -81,12 +81,12 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
 	ret = fstat(fd, &st);
 	if (ret < 0) {
 		SYSERROR("Failed to stat config file \"%s\"", file);
-		goto on_error;
+		goto on_error_fstat;
 	}
 
 	ret = 0;
 	if (st.st_size == 0)
-		goto on_error;
+		goto on_error_fstat;
 
 	ret = -1;
 	buf = lxc_strmmap(NULL, st.st_size, PROT_READ | PROT_WRITE,
@@ -117,6 +117,7 @@ int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback, void *da
 			ret = -1;
 	}
 
+on_error_fstat:
 	saved_errno = errno;
 	close(fd);
 	errno = saved_errno;

From 7701a78d8fe54148b45f314bde89e7dc9c7cf7e7 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Wed, 10 Oct 2018 18:21:41 +0900
Subject: [PATCH 3/3] fix rpm packaging error for static library

Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
 lxc.spec.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lxc.spec.in b/lxc.spec.in
index 61cb1456f..0b2ebaaaf 100644
--- a/lxc.spec.in
+++ b/lxc.spec.in
@@ -251,6 +251,7 @@ fi
 %defattr(-,root,root)
 %{_sbindir}/*
 %{_libdir}/*.so.*
+%{_libdir}/*.a
 %{_libdir}/%{name}
 %{_localstatedir}/*
 %{_libexecdir}/%{name}/hooks/unmount-namespace