CVS commit: pkgsrc/net/ocsync

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jan 13 09:40:40 UTC 2021

Modified Files:
        pkgsrc/net/ocsync: distinfo
Added Files:
        pkgsrc/net/ocsync/patches: patch-cmake_Modules_FindLibSSH.cmake
            patch-src_csync__log.h patch-src_httpbf_src_httpbf.c

Log Message:
ocsync: Fix building with modern compilers and modern libssh.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/ocsync/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/ocsync/patches/patch-cmake_Modules_FindLibSSH.cmake \
    pkgsrc/net/ocsync/patches/patch-src_csync__log.h \
    pkgsrc/net/ocsync/patches/patch-src_httpbf_src_httpbf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/ocsync/distinfo
diff -u pkgsrc/net/ocsync/distinfo:1.4 pkgsrc/net/ocsync/distinfo:1.5
--- pkgsrc/net/ocsync/distinfo:1.4      Thu Oct 24 22:28:46 2019
+++ pkgsrc/net/ocsync/distinfo  Wed Jan 13 09:40:40 2021
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.4 2019/10/24 22:28:46 kamil Exp $
+$NetBSD: distinfo,v 1.5 2021/01/13 09:40:40 nia Exp $
 
 SHA1 (ocsync-0.90.4.tar.bz2) = d53a64177addc9fcdd831a0a78786eca25b2588a
 RMD160 (ocsync-0.90.4.tar.bz2) = b6208a9c0ae452f16f0ced32c1b5635df06d3b99
 SHA512 (ocsync-0.90.4.tar.bz2) = 74bf6b083ae4d4c09e3915d777d916a04ebb19aefb21a5a14a49e2079e02c5c60f1f274aa0cab5c227147883eaf1a5f91b6c0546b818c960cc3575cdcdd93d57
 Size (ocsync-0.90.4.tar.bz2) = 4630698 bytes
 SHA1 (patch-cmake_Modules_DefineInstallationPaths.cmake) = 1ce32ae21fe331d1ebf5bd5a5941e405a7eb4b06
+SHA1 (patch-cmake_Modules_FindLibSSH.cmake) = bf6a8cfaaa559b75636a6e75fa562c6f19a7d411
 SHA1 (patch-config_CMakeLists.txt) = b387f38a79d9f85e3f67060a2cb689bb13dd1c28
+SHA1 (patch-src_csync__log.h) = 734978a27fec23b4d84e196c651601959436f188
+SHA1 (patch-src_httpbf_src_httpbf.c) = 79c9ab6e2fb7855db25f7d50860851a5061c5bea
 SHA1 (patch-src_std_c__string.c) = 4f94ae5559fd0c19b11f3bcd751b5de89ad615a4

Added files:

Index: pkgsrc/net/ocsync/patches/patch-cmake_Modules_FindLibSSH.cmake
diff -u /dev/null pkgsrc/net/ocsync/patches/patch-cmake_Modules_FindLibSSH.cmake:1.1
--- /dev/null   Wed Jan 13 09:40:40 2021
+++ pkgsrc/net/ocsync/patches/patch-cmake_Modules_FindLibSSH.cmake      Wed Jan 13 09:40:40 2021
@@ -0,0 +1,34 @@
+$NetBSD: patch-cmake_Modules_FindLibSSH.cmake,v 1.1 2021/01/13 09:40:40 nia Exp $
+
+Fix detecting the libssh version in newer releases.
+
+--- cmake/Modules/FindLibSSH.cmake.orig        2013-10-18 13:11:09.000000000 +0000
++++ cmake/Modules/FindLibSSH.cmake
+@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+     )
+ 
+     if (LibSSH_FIND_VERSION)
+-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
++      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
+         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
+       if (LIBSSH_VERSION_MAJOR)
+         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
+-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
++      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
+           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+       string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+-      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
++      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
+           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+       string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+ 
+@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
+       include(FindPackageVersionCheck)
+       find_package_version_check(LibSSH DEFAULT_MSG)
+       else (LIBSSH_VERSION_MAJOR)
+-        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
++        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
+         set(LIBSSH_FOUND FALSE)
+       endif (LIBSSH_VERSION_MAJOR)
+     endif (LibSSH_FIND_VERSION)
Index: pkgsrc/net/ocsync/patches/patch-src_csync__log.h
diff -u /dev/null pkgsrc/net/ocsync/patches/patch-src_csync__log.h:1.1
--- /dev/null   Wed Jan 13 09:40:40 2021
+++ pkgsrc/net/ocsync/patches/patch-src_csync__log.h    Wed Jan 13 09:40:40 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_csync__log.h,v 1.1 2021/01/13 09:40:40 nia Exp $
+
+Fix build with gcc>=5, use c99-compliant identifier.
+
+--- src/csync_log.h.orig       2013-10-18 13:11:09.000000000 +0000
++++ src/csync_log.h
+@@ -61,7 +61,7 @@ enum csync_log_priority_e {
+ };
+ 
+ #define CSYNC_LOG(priority, ...) \
+-  csync_log(ctx, priority, __FUNCTION__, __VA_ARGS__)
++  csync_log(ctx, priority, __func__, __VA_ARGS__)
+ 
+ void csync_log(CSYNC *ctx,
+                int verbosity,
Index: pkgsrc/net/ocsync/patches/patch-src_httpbf_src_httpbf.c
diff -u /dev/null pkgsrc/net/ocsync/patches/patch-src_httpbf_src_httpbf.c:1.1
--- /dev/null   Wed Jan 13 09:40:40 2021
+++ pkgsrc/net/ocsync/patches/patch-src_httpbf_src_httpbf.c     Wed Jan 13 09:40:40 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_httpbf_src_httpbf.c,v 1.1 2021/01/13 09:40:40 nia Exp $
+
+Fix build with gcc>=5, use c99-compliant identifier.
+
+--- src/httpbf/src/httpbf.c.orig       2013-10-18 13:11:09.000000000 +0000
++++ src/httpbf/src/httpbf.c
+@@ -42,7 +42,7 @@
+ #define DEBUG_HBF(...) { if(transfer->log_cb) { \
+         char buf[1024];                         \
+         snprintf(buf, 1024, __VA_ARGS__);       \
+-        transfer->log_cb(__FUNCTION__, buf);    \
++        transfer->log_cb(__func__, buf);    \
+   }  }
+ 
+ // #endif