[SCM] Resolv Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Mon Mar 23 15:35:44 UTC 2020
The branch, master has been updated
via 12a7093 Bump version to 1.1.6
via a15b2fd cpack: Set the full version not only major
via 69f638b Rename CHANGELOG
via eb8938a tests: Check for valid fd in torture_setup_resolv_conf()
via 690a97b tests: Check for valid fd in test_res_init
from fef7aa9 gitlab-ci: Whitelist metze to use the FreeBSD runner
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 12a70935ba07ce8e17417a4363d204fe89fccfb3
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 23 08:49:14 2020 +0100
Bump version to 1.1.6
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit a15b2fdcc0e25c5ec5c86b85adca7988d52c1803
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 23 10:21:26 2020 +0100
cpack: Set the full version not only major
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 69f638be23842d01b52a088a1e424242595471c0
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 23 08:43:26 2020 +0100
Rename CHANGELOG
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit eb8938a9020129a0ff898d3ba402a275640f6fc8
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 23 08:41:53 2020 +0100
tests: Check for valid fd in torture_setup_resolv_conf()
CID #68262
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 690a97b3c011faa7d90bd4e8b176092bb43791b8
Author: Andreas Schneider <asn at samba.org>
Date: Mon Mar 23 08:40:45 2020 +0100
tests: Check for valid fd in test_res_init
CID #68268
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog => CHANGELOG | 12 ++++++++++--
CMakeLists.txt | 17 ++++++++++-------
CPackConfig.cmake | 3 +--
tests/test_res_init.c | 2 ++
tests/torture.c | 1 +
5 files changed, 24 insertions(+), 11 deletions(-)
rename ChangeLog => CHANGELOG (76%)
Changeset truncated at 500 lines:
diff --git a/ChangeLog b/CHANGELOG
similarity index 76%
rename from ChangeLog
rename to CHANGELOG
index e8dc418..9df9b6e 100644
--- a/ChangeLog
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
-ChangeLog
-==========
+CHANGELOG
+=========
+
+version 1.1.6 (released 2020-03-23)
+ * Added support for running with Sanitizers
+ * Added fake resolving of TXT records
+ * Improved logging support
+ * Fixed resolv.conf support on FreeBSD
+ * Fixed alignment issues on FreeBSD
+ * Fixed using IPv6 address with old glibc versions
version 1.1.5 (released 2016-09-08)
* Added support for faking PTR entries
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f569101..1275076 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,20 +11,23 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
include(DefineCMakeDefaults)
include(DefineCompilerFlags)
-project(resolv_wrapper VERSION 1.1.5 LANGUAGES C)
+project(resolv_wrapper VERSION 1.1.6 LANGUAGES C)
# global needed variables
set(APPLICATION_NAME ${PROJECT_NAME})
-# SOVERSION scheme: CURRENT.AGE.REVISION
+# SOVERSION scheme: MAJOR.MINOR.PATCH
# If there was an incompatible interface change:
-# Increment CURRENT. Set AGE and REVISION to 0
+# Increment MAJOR. Set MINOR and PATCH to 0
# If there was a compatible interface change:
-# Increment AGE. Set REVISION to 0
+# Increment MINOR. Set PATCH to 0
# If the source code was changed, but there were no interface changes:
-# Increment REVISION.
-set(LIBRARY_VERSION "0.0.5")
-set(LIBRARY_SOVERSION "0")
+# Increment PATCH.
+set(LIBRARY_VERSION_MAJOR 0)
+set(LIBRARY_VERSION_MINOR 0)
+set(LIBRARY_VERSION_PATCH 6)
+set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
+set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index b19eabf..b70734a 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -11,8 +11,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
### versions
-set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION_MAJOR}")
-
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
### source generator
set(CPACK_SOURCE_GENERATOR "TGZ")
diff --git a/tests/test_res_init.c b/tests/test_res_init.c
index b79e28c..3daa1cb 100644
--- a/tests/test_res_init.c
+++ b/tests/test_res_init.c
@@ -5,6 +5,7 @@
#include <setjmp.h>
#include <cmocka.h>
+#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
@@ -35,6 +36,7 @@ static int setup(void **state)
test_state->resolv_conf_path = strdup(RWRAP_RESOLV_CONF_TMPL);
assert_non_null(test_state->resolv_conf_path);
test_state->rc_fd = mkstemp(test_state->resolv_conf_path);
+ assert_return_code(test_state->rc_fd, errno);
assert_non_null(test_state->resolv_conf_path);
test_state->resolv_conf = fdopen(test_state->rc_fd, "a");
assert_non_null(test_state->resolv_conf);
diff --git a/tests/torture.c b/tests/torture.c
index f6de6d9..5bb9f0c 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -163,6 +163,7 @@ static char *torture_setup_resolv_conf(const char **nameservers, size_t num_ns)
path = strdup(RWRAP_RESOLV_CONF_TMPL);
assert_non_null(path);
rc_fd = mkstemp(path);
+ assert_return_code(rc_fd, errno);
assert_non_null(path);
resolv_conf = fdopen(rc_fd, "a");
assert_non_null(resolv_conf);
--
Resolv Wrapper Repository
More information about the samba-cvs
mailing list