forked from pool/netcontrol
- version 0.2.6
- Merged spec file changes from openSUSE:Factory - Fixed libnl-devel build requires to build on 12.1 - Updated FSF address in copyright/license statements - version 0.2.5 - Fixed several bugs reported in bnc#760500, bnc#763388, bnc#765040, bnc#754001: - Fetch ip addresses and routes in system refresh via netlink, adds libnl-1 dependency to libnetcontrol. - Do not use -o rc for ifup or it fails when startmode is set to manual. - Always call ifstatus in ncf_if_status and not check interface operstate to better match ifstatus results - Check type while creating topology tree as well, not only if the interface specific data exists. - Do not report error in ncf_if_xml_state when interface does not exists any more [has been stopped/removed]. - Improved error handling, report several errors once - Expose a lot of error details to the caller - Fixed to parse and configure complete interface trees and fixed a senseless type check that caused SEGV. - Fetch mac address from system when not in the config - Fixed arp ip target bonding option handling and expose errors while trying to add not unique slave interface. - Refresh config handle earlier in ncf_define, fixed a double free in regression test it does. - Automatically start port/slave/base interfeces when stating a bridge/bond/vlan. - Lowered bad_reference (bridge config references an unknown interface) log level to warning (bnc#735187). OBS-URL: https://build.opensuse.org/package/show/network:utilities/netcontrol?expand=0&rev=8
This commit is contained in:
parent
53e5300edf
commit
9d0d907fa2
580
config_h.patch
580
config_h.patch
@ -1,580 +0,0 @@
|
|||||||
From d161f8e0b5e1729d644bf44367996bef5227e7ef Mon Sep 17 00:00:00 2001
|
|
||||||
From: Marius Tomaschewski <mt@suse.com>
|
|
||||||
Date: Thu, 8 Sep 2011 19:06:34 +0200
|
|
||||||
Subject: [PATCH] Include config.h to have _GNU_SOURCE defined
|
|
||||||
|
|
||||||
|
|
||||||
Signed-off-by: Marius Tomaschewski <mt@suse.com>
|
|
||||||
---
|
|
||||||
src/backend-suse.c | 3 +++
|
|
||||||
src/bonding.c | 3 +++
|
|
||||||
src/bonding.h | 3 +++
|
|
||||||
src/bridge.c | 9 +++------
|
|
||||||
src/bridge.h | 3 +++
|
|
||||||
src/cmd_pipe.c | 3 +++
|
|
||||||
src/cmd_pipe.h | 3 +++
|
|
||||||
src/futils.c | 3 +++
|
|
||||||
src/futils.h | 3 +++
|
|
||||||
src/handle.c | 3 +++
|
|
||||||
src/handle.h | 3 +++
|
|
||||||
src/logging.c | 3 ++-
|
|
||||||
src/logging.h | 3 +++
|
|
||||||
src/nctest.c | 3 +++
|
|
||||||
src/netcf-xml.c | 3 +++
|
|
||||||
src/netcf.c | 3 +++
|
|
||||||
src/ntypes.h | 3 +++
|
|
||||||
src/nutils.c | 4 +++-
|
|
||||||
src/nutils.h | 3 +++
|
|
||||||
src/sutils.c | 3 +++
|
|
||||||
src/sutils.h | 3 +++
|
|
||||||
src/syntax.c | 3 +++
|
|
||||||
src/syntax.h | 3 +++
|
|
||||||
src/sysconfig.c | 3 +++
|
|
||||||
src/sysconfig.h | 3 +++
|
|
||||||
src/sysctl.c | 3 +++
|
|
||||||
src/sysctl.h | 3 +++
|
|
||||||
src/sysfs.c | 3 +++
|
|
||||||
src/sysfs.h | 3 +++
|
|
||||||
src/udev_utils.c | 3 +++
|
|
||||||
src/udev_utils.h | 3 +++
|
|
||||||
src/vlan.c | 3 +++
|
|
||||||
src/vlan.h | 3 +++
|
|
||||||
src/xml-reader.c | 3 +++
|
|
||||||
src/xml-writer.c | 3 +++
|
|
||||||
src/xml.c | 3 +++
|
|
||||||
src/xml.h | 3 +++
|
|
||||||
37 files changed, 110 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/backend-suse.c b/src/backend-suse.c
|
|
||||||
index bd98fcb..b6a3644 100644
|
|
||||||
--- a/src/backend-suse.c
|
|
||||||
+++ b/src/backend-suse.c
|
|
||||||
@@ -27,6 +27,9 @@
|
|
||||||
* wicked under the LGPL-2.1+ in libnetcontrol.
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
diff --git a/src/bonding.c b/src/bonding.c
|
|
||||||
index 39c6b39..671edb6 100644
|
|
||||||
--- a/src/bonding.c
|
|
||||||
+++ b/src/bonding.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
diff --git a/src/bonding.h b/src/bonding.h
|
|
||||||
index d6fd3eb..7421a5b 100644
|
|
||||||
--- a/src/bonding.h
|
|
||||||
+++ b/src/bonding.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_BONDING_H
|
|
||||||
#define __NETCONTROL_BONDING_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
#include <ntypes.h>
|
|
||||||
diff --git a/src/bridge.c b/src/bridge.c
|
|
||||||
index f915f9e..d08a2f0 100644
|
|
||||||
--- a/src/bridge.c
|
|
||||||
+++ b/src/bridge.c
|
|
||||||
@@ -28,16 +28,13 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
- /*
|
|
||||||
-#include <ctype.h>
|
|
||||||
-#include <net/if_arp.h>
|
|
||||||
-#include <arpa/inet.h>
|
|
||||||
-*/
|
|
||||||
-
|
|
||||||
#include <logging.h>
|
|
||||||
#include <bridge.h>
|
|
||||||
#include <handle.h>
|
|
||||||
diff --git a/src/bridge.h b/src/bridge.h
|
|
||||||
index 9882574..b155999 100644
|
|
||||||
--- a/src/bridge.h
|
|
||||||
+++ b/src/bridge.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_BRIDGE_H
|
|
||||||
#define __NETCONTROL_BRIDGE_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
#include <ntypes.h>
|
|
||||||
diff --git a/src/cmd_pipe.c b/src/cmd_pipe.c
|
|
||||||
index bc5cee0..9c100aa 100644
|
|
||||||
--- a/src/cmd_pipe.c
|
|
||||||
+++ b/src/cmd_pipe.c
|
|
||||||
@@ -27,6 +27,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
diff --git a/src/cmd_pipe.h b/src/cmd_pipe.h
|
|
||||||
index 99fc849..e139b7a 100644
|
|
||||||
--- a/src/cmd_pipe.h
|
|
||||||
+++ b/src/cmd_pipe.h
|
|
||||||
@@ -29,6 +29,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_CMD_PIPE_H
|
|
||||||
#define __NETCONTROL_CMD_PIPE_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
diff --git a/src/futils.c b/src/futils.c
|
|
||||||
index ae642e0..a0a6b6d 100644
|
|
||||||
--- a/src/futils.c
|
|
||||||
+++ b/src/futils.c
|
|
||||||
@@ -27,6 +27,9 @@
|
|
||||||
* wicked under the LGPL-2.1+ in libnetcontrol.
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
diff --git a/src/futils.h b/src/futils.h
|
|
||||||
index 52aee94..913c640 100644
|
|
||||||
--- a/src/futils.h
|
|
||||||
+++ b/src/futils.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_FUTILS_H
|
|
||||||
#define __NETCONTROL_FUTILS_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
|
|
||||||
diff --git a/src/handle.c b/src/handle.c
|
|
||||||
index 98ce983..9c98c0d 100644
|
|
||||||
--- a/src/handle.c
|
|
||||||
+++ b/src/handle.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
diff --git a/src/handle.h b/src/handle.h
|
|
||||||
index 484d54c..9447ad7 100644
|
|
||||||
--- a/src/handle.h
|
|
||||||
+++ b/src/handle.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_HANDLE_H
|
|
||||||
#define __NETCONTROL_HANDLE_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <ntypes.h>
|
|
||||||
|
|
||||||
diff --git a/src/logging.c b/src/logging.c
|
|
||||||
index 837a313..bb93610 100644
|
|
||||||
--- a/src/logging.c
|
|
||||||
+++ b/src/logging.c
|
|
||||||
@@ -28,8 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
#include <config.h>
|
|
||||||
-
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
diff --git a/src/logging.h b/src/logging.h
|
|
||||||
index e9b3976..d00c9dc 100644
|
|
||||||
--- a/src/logging.h
|
|
||||||
+++ b/src/logging.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_LOGGING_H
|
|
||||||
#define __NETCONTROL_LOGGING_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifdef __GNUC__
|
|
||||||
# define __fmtattr(f,a) __attribute__ ((format (printf, f, a)))
|
|
||||||
diff --git a/src/nctest.c b/src/nctest.c
|
|
||||||
index d906df2..816b941 100644
|
|
||||||
--- a/src/nctest.c
|
|
||||||
+++ b/src/nctest.c
|
|
||||||
@@ -26,6 +26,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
diff --git a/src/netcf-xml.c b/src/netcf-xml.c
|
|
||||||
index 0dcd198..5b5738a 100644
|
|
||||||
--- a/src/netcf-xml.c
|
|
||||||
+++ b/src/netcf-xml.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <assert.h>
|
|
||||||
diff --git a/src/netcf.c b/src/netcf.c
|
|
||||||
index 57c16af..7ceb336 100644
|
|
||||||
--- a/src/netcf.c
|
|
||||||
+++ b/src/netcf.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
diff --git a/src/ntypes.h b/src/ntypes.h
|
|
||||||
index 8865dc7..bc5531c 100644
|
|
||||||
--- a/src/ntypes.h
|
|
||||||
+++ b/src/ntypes.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_NTYPES_H
|
|
||||||
#define __NETCONTROL_NTYPES_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
diff --git a/src/nutils.c b/src/nutils.c
|
|
||||||
index 8956581..7dada29 100644
|
|
||||||
--- a/src/nutils.c
|
|
||||||
+++ b/src/nutils.c
|
|
||||||
@@ -28,7 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
-
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
diff --git a/src/nutils.h b/src/nutils.h
|
|
||||||
index 17961af..cf84f3e 100644
|
|
||||||
--- a/src/nutils.h
|
|
||||||
+++ b/src/nutils.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_NUTILS_H
|
|
||||||
#define __NETCONTROL_NUTILS_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <ntypes.h>
|
|
||||||
#include <sutils.h>
|
|
||||||
diff --git a/src/sutils.c b/src/sutils.c
|
|
||||||
index dd6188b..f3684ed 100644
|
|
||||||
--- a/src/sutils.c
|
|
||||||
+++ b/src/sutils.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
diff --git a/src/sutils.h b/src/sutils.h
|
|
||||||
index c5862d8..3f05680 100644
|
|
||||||
--- a/src/sutils.h
|
|
||||||
+++ b/src/sutils.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_SUTILS_H
|
|
||||||
#define __NETCONTROL_SUTILS_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
diff --git a/src/syntax.c b/src/syntax.c
|
|
||||||
index 4343a8d..78ef526 100644
|
|
||||||
--- a/src/syntax.c
|
|
||||||
+++ b/src/syntax.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
diff --git a/src/syntax.h b/src/syntax.h
|
|
||||||
index 7ca60ac..25c69a4 100644
|
|
||||||
--- a/src/syntax.h
|
|
||||||
+++ b/src/syntax.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_SYNTAX_H
|
|
||||||
#define __NETCONTROL_SYNTAX_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <handle.h>
|
|
||||||
#include <xml.h>
|
|
||||||
diff --git a/src/sysconfig.c b/src/sysconfig.c
|
|
||||||
index bb90075..7faa96c 100644
|
|
||||||
--- a/src/sysconfig.c
|
|
||||||
+++ b/src/sysconfig.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
diff --git a/src/sysconfig.h b/src/sysconfig.h
|
|
||||||
index 13a1507..2902746 100644
|
|
||||||
--- a/src/sysconfig.h
|
|
||||||
+++ b/src/sysconfig.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_UTILS_SYSCONFIG_H
|
|
||||||
#define __NETCONTROL_UTILS_SYSCONFIG_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
|
|
||||||
diff --git a/src/sysctl.c b/src/sysctl.c
|
|
||||||
index 5100d8b..07e54c4 100644
|
|
||||||
--- a/src/sysctl.c
|
|
||||||
+++ b/src/sysctl.c
|
|
||||||
@@ -26,6 +26,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <sutils.h>
|
|
||||||
#include <sysctl.h>
|
|
||||||
#include <logging.h>
|
|
||||||
diff --git a/src/sysctl.h b/src/sysctl.h
|
|
||||||
index 87f0de1..9746790 100644
|
|
||||||
--- a/src/sysctl.h
|
|
||||||
+++ b/src/sysctl.h
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_SYSCTL_H
|
|
||||||
#define __NETCONTROL_SYSCTL_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
|
|
||||||
diff --git a/src/sysfs.c b/src/sysfs.c
|
|
||||||
index fe3427a..a482be7 100644
|
|
||||||
--- a/src/sysfs.c
|
|
||||||
+++ b/src/sysfs.c
|
|
||||||
@@ -27,6 +27,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <limits.h>
|
|
||||||
diff --git a/src/sysfs.h b/src/sysfs.h
|
|
||||||
index 58d246c..c841e4c 100644
|
|
||||||
--- a/src/sysfs.h
|
|
||||||
+++ b/src/sysfs.h
|
|
||||||
@@ -29,6 +29,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_SYSFS_H
|
|
||||||
#define __NETCONTROL_SYSFS_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
#include <ntypes.h>
|
|
||||||
diff --git a/src/udev_utils.c b/src/udev_utils.c
|
|
||||||
index 8337391..d86f25c 100644
|
|
||||||
--- a/src/udev_utils.c
|
|
||||||
+++ b/src/udev_utils.c
|
|
||||||
@@ -26,6 +26,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
diff --git a/src/udev_utils.h b/src/udev_utils.h
|
|
||||||
index 86bb03a..ac70c0c 100644
|
|
||||||
--- a/src/udev_utils.h
|
|
||||||
+++ b/src/udev_utils.h
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_UDEV_UTILS_H
|
|
||||||
#define __NETCONTROL_UDEV_UTILS_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <sutils.h>
|
|
||||||
|
|
||||||
diff --git a/src/vlan.c b/src/vlan.c
|
|
||||||
index b4d30e7..d5e89d6 100644
|
|
||||||
--- a/src/vlan.c
|
|
||||||
+++ b/src/vlan.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
diff --git a/src/vlan.h b/src/vlan.h
|
|
||||||
index 3cd083d..1b77128 100644
|
|
||||||
--- a/src/vlan.h
|
|
||||||
+++ b/src/vlan.h
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_VLAN_H
|
|
||||||
#define __NETCONTROL_VLAN_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <ntypes.h>
|
|
||||||
#include <handle.h>
|
|
||||||
diff --git a/src/xml-reader.c b/src/xml-reader.c
|
|
||||||
index 328e050..403d117 100644
|
|
||||||
--- a/src/xml-reader.c
|
|
||||||
+++ b/src/xml-reader.c
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
diff --git a/src/xml-writer.c b/src/xml-writer.c
|
|
||||||
index d8d2312..58efbe3 100644
|
|
||||||
--- a/src/xml-writer.c
|
|
||||||
+++ b/src/xml-writer.c
|
|
||||||
@@ -30,6 +30,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
diff --git a/src/xml.c b/src/xml.c
|
|
||||||
index 8a452b5..eb2846a 100644
|
|
||||||
--- a/src/xml.c
|
|
||||||
+++ b/src/xml.c
|
|
||||||
@@ -28,6 +28,9 @@
|
|
||||||
* You can find the wicked project at http://gitorious.org/wicked/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <assert.h>
|
|
||||||
diff --git a/src/xml.h b/src/xml.h
|
|
||||||
index 46013ab..71b1460 100644
|
|
||||||
--- a/src/xml.h
|
|
||||||
+++ b/src/xml.h
|
|
||||||
@@ -32,6 +32,9 @@
|
|
||||||
*/
|
|
||||||
#ifndef __NETCONTROL_XML_H
|
|
||||||
#define __NETCONTROL_XML_H
|
|
||||||
+#if defined(HAVE_CONFIG_H)
|
|
||||||
+#include <config.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
--
|
|
||||||
1.7.3.4
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cbc4eafd2b632086fcdca938b4a166d5ee67cd4243f88cc4df14ed6d067c7cb3
|
|
||||||
size 291680
|
|
3
netcontrol-0.2.6.tar.bz2
Normal file
3
netcontrol-0.2.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:cb0d29fc3a75be2b300c68a20989f7ab92fbccf835809e41464794c90039407e
|
||||||
|
size 351177
|
@ -1,8 +1,60 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jul 3 11:15:47 UTC 2012 - mt@suse.de
|
||||||
|
|
||||||
|
- version 0.2.6
|
||||||
|
- Merged spec file changes from openSUSE:Factory
|
||||||
|
- Fixed libnl-devel build requires to build on 12.1
|
||||||
|
- Updated FSF address in copyright/license statements
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 2 11:00:33 UTC 2012 - mt@suse.de
|
||||||
|
|
||||||
|
- version 0.2.5
|
||||||
|
- Fixed several bugs reported in bnc#760500, bnc#763388,
|
||||||
|
bnc#765040, bnc#754001:
|
||||||
|
- Fetch ip addresses and routes in system refresh via
|
||||||
|
netlink, adds libnl-1 dependency to libnetcontrol.
|
||||||
|
- Do not use -o rc for ifup or it fails when startmode
|
||||||
|
is set to manual.
|
||||||
|
- Always call ifstatus in ncf_if_status and not check
|
||||||
|
interface operstate to better match ifstatus results
|
||||||
|
- Check type while creating topology tree as well, not
|
||||||
|
only if the interface specific data exists.
|
||||||
|
- Do not report error in ncf_if_xml_state when interface
|
||||||
|
does not exists any more [has been stopped/removed].
|
||||||
|
- Improved error handling, report several errors once
|
||||||
|
- Expose a lot of error details to the caller
|
||||||
|
- Fixed to parse and configure complete interface trees
|
||||||
|
and fixed a senseless type check that caused SEGV.
|
||||||
|
- Fetch mac address from system when not in the config
|
||||||
|
- Fixed arp ip target bonding option handling and expose
|
||||||
|
errors while trying to add not unique slave interface.
|
||||||
|
- Refresh config handle earlier in ncf_define, fixed a
|
||||||
|
double free in regression test it does.
|
||||||
|
- Automatically start port/slave/base interfeces when
|
||||||
|
stating a bridge/bond/vlan.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 21 10:31:41 UTC 2011 - coolo@suse.com
|
Wed Dec 21 10:31:41 UTC 2011 - coolo@suse.com
|
||||||
|
|
||||||
- remove call to suse_update_config (very old work around)
|
- remove call to suse_update_config (very old work around)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 7 09:34:43 UTC 2011 - mt@suse.com
|
||||||
|
|
||||||
|
- Lowered bad_reference (bridge config references an unknown
|
||||||
|
interface) log level to warning (bnc#735187).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 27 11:09:35 UTC 2011 - mt@suse.de
|
||||||
|
|
||||||
|
- version 0.2.4
|
||||||
|
- Fixed writing of bonding slaves into ifcfg file
|
||||||
|
- Fixed a memory leak while netcf xml generation error
|
||||||
|
- Generate complete interface chanins, do not generate
|
||||||
|
type attribute in vlan interface reference xml node
|
||||||
|
(bnc#708398).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 9 14:10:39 UTC 2011 - cfarrell@suse.com
|
Fri Sep 9 14:10:39 UTC 2011 - cfarrell@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package netcontrol
|
# spec file for package netcontrol
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,8 +15,9 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: netcontrol
|
Name: netcontrol
|
||||||
Version: 0.2.3
|
Version: 0.2.6
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: A network configuration library
|
Summary: A network configuration library
|
||||||
License: LGPL-2.1+
|
License: LGPL-2.1+
|
||||||
@ -30,10 +31,13 @@ Group: Productivity/Networking/System
|
|||||||
#
|
#
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
Patch1: config_h.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
#BuildRequires: libnl-devel
|
%if 0%{?suse_version} >= 1210
|
||||||
#BuildRequires: pkg-config
|
BuildRequires: libnl-1_1-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: libnl-devel
|
||||||
|
%endif
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A interim network configuration library, currently implementing the
|
A interim network configuration library, currently implementing the
|
||||||
@ -84,13 +88,11 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="-W -Wall $RPM_OPT_FLAGS"
|
export CFLAGS="-W -Wall $RPM_OPT_FLAGS"
|
||||||
%configure \
|
%configure \
|
||||||
--disable-static \
|
--disable-static
|
||||||
--enable-silent-rules
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Loading…
x
Reference in New Issue
Block a user