generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall

Browse Source 
Fix merge conflicts from GNUInstallDirs merge to master.
This commit is contained in:
d3x0r 2017-07-06 23:11:11 -07:00
commit a4d80ca56a
11 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -6,6 +6,7 @@ include(CheckTypeSize)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
include(cmake_export_symbol)
include(GNUInstallDirs)
project (LibreSSL C)

4
apps/nc/CMakeLists.txt
View File

@ -54,8 +54,8 @@ target_link_libraries(nc tls ${OPENSSL_LIBS})
if(ENABLE_NC)
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS nc DESTINATION bin)
install(FILES nc.1 DESTINATION share/man/man1)
install(TARGETS nc DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES nc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif(ENABLE_LIBRESSL_INSTALL)
endif()

5
apps/ocspcheck/CMakeLists.txt
View File

@ -37,8 +37,9 @@ add_executable(ocspcheck ${OCSPCHECK_SRC})
target_link_libraries(ocspcheck tls ${OPENSSL_LIBS})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS ocspcheck DESTINATION bin)
install(FILES ocspcheck.8 DESTINATION share/man/man8)
install(TARGETS ocspcheck DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ocspcheck.8 DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
endif(ENABLE_LIBRESSL_INSTALL)
endif()

4
apps/openssl/CMakeLists.txt
View File

@ -77,8 +77,8 @@ add_executable(openssl ${OPENSSL_SRC})
target_link_libraries(openssl ${OPENSSL_LIBS})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS openssl DESTINATION bin)
install(FILES openssl.1 DESTINATION share/man/man1)
install(TARGETS openssl DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES openssl.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif(ENABLE_LIBRESSL_INSTALL)
if(NOT "${OPENSSLDIR}" STREQUAL "")

4
crypto/CMakeLists.txt
View File

@ -830,12 +830,12 @@ if (BUILD_SHARED)
set_target_properties(crypto-shared PROPERTIES VERSION
${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS crypto crypto-shared DESTINATION lib)
install(TARGETS crypto crypto-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
else()
add_library(crypto STATIC ${CRYPTO_SRC})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS crypto DESTINATION lib)
install(TARGETS crypto DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
endif()

4
include/CMakeLists.txt
View File

@ -1,7 +1,7 @@
if(ENABLE_LIBRESSL_INSTALL)
install(DIRECTORY .
DESTINATION include
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
PATTERN "CMakeLists.txt" EXCLUDE
PATTERN "compat" EXCLUDE
PATTERN "compat" EXCLUDE
PATTERN "Makefile*" EXCLUDE)
endif(ENABLE_LIBRESSL_INSTALL)

4
man/CMakeLists.txt
View File

@ -1,11 +1,11 @@
if(ENABLE_LIBRESSL_INSTALL)
install(DIRECTORY .
DESTINATION share/man/man3
DESTINATION ${CMAKE_INSTALL_MANDIR}/man3
FILES_MATCHING PATTERN "*.3"
)
install(DIRECTORY .
DESTINATION share/man/man1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
FILES_MATCHING PATTERN "*.1"
)
endif(ENABLE_LIBRESSL_INSTALL)

38
patches/netcat.c.patch
View File

@ -1,16 +1,16 @@
--- apps/nc/netcat.c.orig Sat Jun 3 19:34:23 2017
+++ apps/nc/netcat.c Sat Jun 3 19:51:37 2017
@@ -65,7 +65,9 @@
#define POLL_NETIN 2
#define POLL_STDOUT 3
#define BUFSIZE 16384
--- apps/nc/netcat.c.orig 2017-07-07 00:10:09.009409624 +0900
+++ apps/nc/netcat.c 2017-07-07 00:30:32.380088772 +0900
@@ -66,7 +66,9 @@
#define POLL_NETIN 2
#define POLL_STDOUT 3
#define BUFSIZE 16384
+#ifndef DEFAULT_CA_FILE
#define DEFAULT_CA_FILE "/etc/ssl/cert.pem"
#define DEFAULT_CA_FILE "/etc/ssl/cert.pem"
+#endif
#define TLS_ALL (1 << 1)
#define TLS_NOVERIFY (1 << 2)
@@ -93,9 +95,13 @@
@@ -94,9 +96,13 @@ int zflag; /* Port Scan Flag */
int Dflag; /* sodebug */
int Iflag; /* TCP receive buffer size */
int Oflag; /* TCP send buffer size */
@ -24,7 +24,7 @@
int usetls; /* use TLS */
char *Cflag; /* Public cert file */
@@ -264,12 +270,14 @@
@@ -265,12 +271,14 @@ main(int argc, char *argv[])
case 'u':
uflag = 1;
break;
@ -39,7 +39,7 @@
case 'v':
vflag = 1;
break;
@@ -316,9 +324,11 @@
@@ -317,9 +325,11 @@ main(int argc, char *argv[])
case 'o':
oflag = optarg;
break;
@ -51,7 +51,7 @@
case 'T':
errstr = NULL;
errno = 0;
@@ -342,9 +352,11 @@
@@ -343,9 +353,11 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
@ -63,7 +63,7 @@
if (family == AF_UNIX) {
if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
@@ -889,7 +901,10 @@
@@ -888,7 +900,10 @@ int
remote_connect(const char *host, const char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
@ -75,7 +75,7 @@
if ((error = getaddrinfo(host, port, &hints, &res0)))
errx(1, "getaddrinfo for host \"%s\" port %s: %s", host,
@@ -904,8 +919,10 @@
@@ -903,8 +918,10 @@ remote_connect(const char *host, const c
if (sflag || pflag) {
struct addrinfo ahints, *ares;
@ -86,7 +86,7 @@
memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -976,7 +993,10 @@
@@ -975,7 +992,10 @@ int
local_listen(char *host, char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
@ -98,7 +98,7 @@
int error;
/* Allow nodename to be null. */
@@ -997,9 +1017,11 @@
@@ -996,9 +1016,11 @@ local_listen(char *host, char *port, str
res->ai_protocol)) < 0)
continue;
@ -110,7 +110,7 @@
set_common_sockopts(s, res->ai_family);
@@ -1455,11 +1477,13 @@
@@ -1454,11 +1476,13 @@ set_common_sockopts(int s, int af)
{
int x = 1;
@ -124,7 +124,7 @@
if (Dflag) {
if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
&x, sizeof(x)) == -1)
@@ -1470,9 +1494,16 @@
@@ -1469,9 +1493,16 @@ set_common_sockopts(int s, int af)
IP_TOS, &Tflag, sizeof(Tflag)) == -1)
err(1, "set IP ToS");
@ -141,7 +141,7 @@
}
if (Iflag) {
if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
@@ -1496,13 +1527,17 @@
@@ -1495,13 +1526,17 @@ set_common_sockopts(int s, int af)
}
if (minttl != -1) {
@ -160,7 +160,7 @@
}
}
@@ -1710,14 +1745,22 @@
@@ -1709,14 +1744,22 @@ help(void)
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
\t-R CAfile CA bundle\n\

4
ssl/CMakeLists.txt
View File

@ -61,11 +61,11 @@ if (BUILD_SHARED)
set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION}
SOVERSION ${SSL_MAJOR_VERSION})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS ssl ssl-shared DESTINATION lib)
install(TARGETS ssl ssl-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
else()
add_library(ssl STATIC ${SSL_SRC})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS ssl DESTINATION lib)
install(TARGETS ssl DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
endif()

2
tests/tlstest.bat
View File

@ -9,7 +9,7 @@ if "%srcdir%"=="" (
set srcdir=.
)
%tlstest_bin% %srcdir%\server.pem %srcdir%\server.pem %srcdir%\ca.pem
%tlstest_bin% %srcdir%\ca.pem %srcdir%\server.pem %srcdir%\server.pem
if !errorlevel! neq 0 (
exit /b 1
)

4
tls/CMakeLists.txt
View File

@ -40,12 +40,12 @@ if (BUILD_SHARED)
set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
SOVERSION ${TLS_MAJOR_VERSION})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS tls tls-shared DESTINATION lib)
install(TARGETS tls tls-shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
else()
add_library(tls STATIC ${TLS_SRC})
if(ENABLE_LIBRESSL_INSTALL)
install(TARGETS tls DESTINATION lib)
install(TARGETS tls DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif(ENABLE_LIBRESSL_INSTALL)
endif()