[SCM] Resolv Wrapper Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Mar 3 16:06:08 UTC 2020
The branch, master has been updated
via 7382070 cmake: Update cmake defaults for out of source build
via 38e9c46 doc: Set author for manpage
via 258335f cmake: Fix path of cmake config files and pkgconfig
via ae57d39 tests: Fix coverity warning that sock could be negative
from b2d2aa6 gitlab-ci: Setup CI for resolv_wrapper
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 73820709d152aff10d8fa0d858ff7070c873f272
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jan 31 13:10:51 2020 +0100
cmake: Update cmake defaults for out of source build
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 38e9c464879d2a451379c18b48c1fd993a8192e3
Author: Andreas Schneider <asn at samba.org>
Date: Fri Jan 31 12:51:51 2020 +0100
doc: Set author for manpage
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 258335fb122022e7ee18101a8aefd59c3a414e29
Author: Andreas Schneider <asn at samba.org>
Date: Fri Nov 15 13:20:02 2019 +0100
cmake: Fix path of cmake config files and pkgconfig
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit ae57d39043a09c2f7cafae5516486b5b460b352b
Author: Andreas Schneider <asn at samba.org>
Date: Mon Oct 21 08:59:57 2019 +0200
tests: Fix coverity warning that sock could be negative
CID 263708
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 4 ----
cmake/Modules/DefineCMakeDefaults.cmake | 4 ++++
cmake/Modules/MacroEnsureOutOfSourceBuild.cmake | 17 -----------------
doc/resolv_wrapper.1 | 13 ++++++++++---
doc/resolv_wrapper.1.txt | 3 ++-
resolv_wrapper-config.cmake.in | 2 +-
resolv_wrapper.pc.cmake | 2 +-
tests/dns_srv.c | 6 ++++--
8 files changed, 22 insertions(+), 29 deletions(-)
delete mode 100644 cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
Changeset truncated at 500 lines:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 004372a..f569101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,10 +38,6 @@ include(DefineOptions.cmake)
include(CPackConfig.cmake)
include(CompilerChecks.cmake)
-# disallow in-source build
-include(MacroEnsureOutOfSourceBuild)
-macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
-
# Find out if we have threading available
set(CMAKE_THREAD_PREFER_PTHREADS ON)
find_package(Threads)
diff --git a/cmake/Modules/DefineCMakeDefaults.cmake b/cmake/Modules/DefineCMakeDefaults.cmake
index ef4fb33..9fb034f 100644
--- a/cmake/Modules/DefineCMakeDefaults.cmake
+++ b/cmake/Modules/DefineCMakeDefaults.cmake
@@ -19,3 +19,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# Always build with -fPIC
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Avoid source tree pollution
+set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
diff --git a/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake b/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
deleted file mode 100644
index a2e9480..0000000
--- a/cmake/Modules/MacroEnsureOutOfSourceBuild.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# - MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
-# MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
-
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-macro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage)
-
- string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" _insource)
- if (_insource)
- message(SEND_ERROR "${_errorMessage}")
- message(FATAL_ERROR "Remove the file CMakeCache.txt in ${CMAKE_SOURCE_DIR} first.")
- endif (_insource)
-
-endmacro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD)
diff --git a/doc/resolv_wrapper.1 b/doc/resolv_wrapper.1
index 842dc97..1def7e8 100644
--- a/doc/resolv_wrapper.1
+++ b/doc/resolv_wrapper.1
@@ -1,13 +1,13 @@
'\" t
.\" Title: resolv_wrapper
-.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
+.\" Author: The Samba Team
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 2019-01-04
+.\" Date: 2020-01-31
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "RESOLV_WRAPPER" "1" "2019\-01\-04" "\ \&" "\ \&"
+.TH "RESOLV_WRAPPER" "1" "2020\-01\-31" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -93,6 +93,7 @@ AAAA dc\&.cwrap\&.org fd00::5357:5f0a
CNAME kerberos\&.cwrap\&.org dc\&.cwrap\&.org
SRV _kerberos\&._tcp\&.cwrap\&.org kerberos\&.cwrap\&.org 88
URI _vpn\&.cwrap\&.org https://vpn\&.cwrap\&.org/VPN
+TXT cwrap\&.org v=spf1 mx
.fi
.if n \{\
.RE
@@ -164,3 +165,9 @@ $ LD_PRELOAD=libresolv_wrapper\&.so RESOLV_WRAPPER_CONF="\&./resolv\&.conf" kini
.if n \{\
.RE
.\}
+.SH "AUTHOR"
+.PP
+\fBThe Samba Team\fR
+.RS 4
+Author.
+.RE
diff --git a/doc/resolv_wrapper.1.txt b/doc/resolv_wrapper.1.txt
index dcd161d..5b23dac 100644
--- a/doc/resolv_wrapper.1.txt
+++ b/doc/resolv_wrapper.1.txt
@@ -1,6 +1,7 @@
resolv_wrapper(1)
=================
-:revdate: 2019-01-04
+:author: The Samba Team
+:revdate: 2020-01-31
NAME
----
diff --git a/resolv_wrapper-config.cmake.in b/resolv_wrapper-config.cmake.in
index 43912f3..09ca2e8 100644
--- a/resolv_wrapper-config.cmake.in
+++ b/resolv_wrapper-config.cmake.in
@@ -1 +1 @@
-set(RESOLV_WRAPPER_LIBRARY @LIB_INSTALL_DIR@/@RESOLV_WRAPPER_LIB@)
+set(RESOLV_WRAPPER_LIBRARY @CMAKE_INSTALL_FULL_LIBDIR@/@RESOLV_WRAPPER_LIB@)
diff --git a/resolv_wrapper.pc.cmake b/resolv_wrapper.pc.cmake
index ea8b785..733abe1 100644
--- a/resolv_wrapper.pc.cmake
+++ b/resolv_wrapper.pc.cmake
@@ -1,4 +1,4 @@
Name: @PROJECT_NAME@
Description: The resolv_wrapper library
Version: @PROJECT_VERSION@
-Libs: @LIB_INSTALL_DIR@/@RESOLV_WRAPPER_LIB@
+Libs: @CMAKE_INSTALL_FULL_LIBDIR@/@RESOLV_WRAPPER_LIB@
diff --git a/tests/dns_srv.c b/tests/dns_srv.c
index 94e5c3d..868dee4 100644
--- a/tests/dns_srv.c
+++ b/tests/dns_srv.c
@@ -633,8 +633,10 @@ int main(int argc, char **argv)
}
}
- dns(sock);
- close(sock);
+ if (sock != -1) {
+ dns(sock);
+ close(sock);
+ }
if (opts.daemon) {
unlink(opts.pidfile);
--
Resolv Wrapper Repository
More information about the samba-cvs
mailing list