Hi ports@ While looking at the state of luaposix I found the only port that depends on it, sysutils/lsyncd. Started to run `make test` and all hell broke loose. The test expects to ssh in without password to localhost without marking itself as TEST_IS_INTERACTIVE and on top of that breaks the terminal with lovely color output.
Since I was already there, I started looking at updating this port and did just that. So I'm attaching a diff and grabbing MAINTAINER but please note. I am not using this software, I can keep it up to date but would love anyone using it to grab MAINTAINER or at least test it when I post updates to the port. Port changes: - patches/patch-cmake_FindLua_cmake is upstreamed so remove it - re apply other patches manually when needed & re-generate - patch the tests to not do color output - grab MAINTAINER - TEST_IS_INTERACTIVE set to yes Upstream changes: https://github.com/axkibe/lsyncd/blob/master/ChangeLog Feedback? OK's? Regards, Adam
Index: Makefile =================================================================== RCS file: /cvs/ports/sysutils/lsyncd/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 23 Jan 2016 19:30:38 -0000 1.2 +++ Makefile 26 Dec 2017 19:12:08 -0000 @@ -3,10 +3,12 @@ COMMENT = synchronizes directories with remote targets upon changes GH_PROJECT = lsyncd GH_ACCOUNT = axkibe -GH_COMMIT = cce7db5ebd352690917792848c2aea92c08efdd5 -DISTNAME = lsyncd-2.1.6 +GH_TAGNAME = release-2.2.2 +DISTNAME = lsyncd-2.2.2 CATEGORIES = sysutils +MAINTAINER = Adam Wolk <[email protected]> + # GPLv2 PERMIT_PACKAGE_CDROM = Yes @@ -26,6 +28,9 @@ TEST_DEPENDS = ${RUN_DEPENDS} \ TESTS = churn-direct churn-rsyncssh exclude-rsyncssh schedule \ churn-rsync exclude-rsync l4rsyncdata + +# expects to ssh without password to localhost +TEST_IS_INTERACTIVE = Yes WANTLIB += ${MODLUA_WANTLIB} lib/inotify/inotify c m pthread Index: distinfo =================================================================== RCS file: /cvs/ports/sysutils/lsyncd/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 6 May 2017 15:10:18 -0000 1.2 +++ distinfo 26 Dec 2017 19:12:08 -0000 @@ -1,2 +1,2 @@ -SHA256 (lsyncd-2.1.6-cce7db5e.tar.gz) = dBQeW6kH0mJOO/WJVV3V9Yd/gOfAkxeg7njD0G3jzQU= -SIZE (lsyncd-2.1.6-cce7db5e.tar.gz) = 78989 +SHA256 (lsyncd-2.2.2.tar.gz) = C9sS9A8aUu0tjmy0ckLSlmY6QrMPONK478tmtDEp4Ak= +SIZE (lsyncd-2.2.2.tar.gz) = 82231 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/sysutils/lsyncd/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 23 Jan 2016 19:15:13 -0000 1.1.1.1 +++ patches/patch-CMakeLists_txt 26 Dec 2017 19:12:08 -0000 @@ -2,47 +2,53 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 No need to regen the manpage ---- CMakeLists.txt.orig Thu Oct 15 08:29:47 2015 -+++ CMakeLists.txt Sat Jan 23 19:41:46 2016 +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt @@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_S # finding Lua --find_package(Lua REQUIRED) -+find_package(Lua ${MODLUA_VERSION}) +-find_package( Lua REQUIRED ) ++find_package( Lua ${MODLUA_VERSION} ) include_directories ( ${LUA_INCLUDE_DIR} ) -@@ -54,7 +54,7 @@ add_custom_command( OUTPUT runner.c - # this supposes the Lua compiler 'luac' is sitting right next to the Lua interpreter 'lua' - add_custom_command( OUTPUT runner.out - COMMAND ${CMAKE_COMMAND} -E echo "Compiling built-in runner" -- COMMAND ${LUA_EXECUTABLE}c -o runner.out ${PROJECT_SOURCE_DIR}/lsyncd.lua -+ COMMAND ${LUA_COMPILER} -o runner.out ${PROJECT_SOURCE_DIR}/lsyncd.lua - DEPENDS ${PROJECT_SOURCE_DIR}/lsyncd.lua - ) - -@@ -75,21 +75,13 @@ set( DEFAULT_CONFIGS - - add_custom_command( OUTPUT defaults.out - COMMAND ${CMAKE_COMMAND} -E echo "Compiling built-in default configs" -- COMMAND ${LUA_EXECUTABLE}c -o defaults.out ${DEFAULT_CONFIGS} -+ COMMAND ${LUA_COMPILER} -o defaults.out ${DEFAULT_CONFIGS} - DEPENDS ${DEFAULT_CONFIGS} - ) +@@ -47,7 +47,7 @@ include_directories("${PROJECT_BINARY_DIR}") + # also called "runner" + add_custom_command( OUTPUT runner.c + COMMAND ${CMAKE_COMMAND} -E echo "Generating built-in runner linkable" +- COMMAND ${LUA_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin2carray.lua runner.out runner runner.c ++ COMMAND ${LUA_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin2carray.lua runner.out runner runner.c + DEPENDS runner.out + ) + +@@ -62,7 +62,7 @@ add_custom_command( OUTPUT runner.out + # rsync rysnc-ssh and direct + add_custom_command( OUTPUT defaults.c + COMMAND ${CMAKE_COMMAND} -E echo "Generating built-in default configs" +- COMMAND ${LUA_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin2carray.lua defaults.out defaults defaults.c ++ COMMAND ${LUA_EXECUTABLE} ${PROJECT_SOURCE_DIR}/bin2carray.lua defaults.out defaults defaults.c + DEPENDS defaults.out + ) + +@@ -79,13 +79,6 @@ add_custom_command( OUTPUT defaults.out + DEPENDS ${DEFAULT_CONFIGS} + ) -# the manpage --add_custom_command( OUTPUT doc/lsyncd.1 -- COMMAND ${CMAKE_COMMAND} -E echo "Updating the manpage" -- COMMAND a2x --format=manpage doc/lsyncd.1.txt -- DEPENDS doc/lsyncd.1.txt +-add_custom_target( manpage +- COMMAND ${CMAKE_COMMAND} -E echo "Updating the manpage" +- COMMAND a2x --format=manpage doc/manpage/lsyncd.1.txt +- DEPENDS doc/manpage/lsyncd.1.txt -) --add_custom_target( manpage ALL DEPENDS doc/lsyncd.1 ) - - # compiling and linking it all together - add_executable( lsyncd ${LSYNCD_SRC} ) + add_custom_target( tests + COMMAND echo "Running the tests" + COMMAND echo "Note you are expected to:" +@@ -106,4 +99,4 @@ add_executable( lsyncd ${LSYNCD_SRC} ) target_link_libraries( lsyncd ${LUA_LIBRARIES} ) install( TARGETS lsyncd RUNTIME DESTINATION bin ) --install( FILES doc/lsyncd.1 DESTINATION man) -+install( FILES doc/lsyncd.1 DESTINATION man/man1) +-install( FILES doc/manpage/lsyncd.1 DESTINATION man ) ++install( FILES doc/manpage/lsyncd.1 DESTINATION man/man1 ) Index: patches/patch-cmake_FindLua_cmake =================================================================== RCS file: patches/patch-cmake_FindLua_cmake diff -N patches/patch-cmake_FindLua_cmake --- patches/patch-cmake_FindLua_cmake 23 Jan 2016 19:15:13 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,42 +0,0 @@ -$OpenBSD: patch-cmake_FindLua_cmake,v 1.1.1.1 2016/01/23 19:15:13 landry Exp $ - -Also detect the lua compiler: on openbsd, its not luac -nor lua5Xc but luac5X - ---- cmake/FindLua.cmake.orig Sat Jan 23 17:24:05 2016 -+++ cmake/FindLua.cmake Sat Jan 23 17:28:06 2016 -@@ -34,6 +34,7 @@ - # Always search for non-versioned lua first (recommended) - SET(_POSSIBLE_LUA_INCLUDE include include/lua) - SET(_POSSIBLE_LUA_EXECUTABLE lua) -+SET(_POSSIBLE_LUA_COMPILER luac) - SET(_POSSIBLE_LUA_LIBRARY lua) - - # Determine possible naming suffixes (there is no standard for this) -@@ -47,6 +48,7 @@ ENDIF(Lua_FIND_VERSION_MAJOR AND Lua_FIND_VERSION_MINO - FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES}) - LIST(APPEND _POSSIBLE_LUA_INCLUDE "include/lua${_SUFFIX}") - LIST(APPEND _POSSIBLE_LUA_EXECUTABLE "lua${_SUFFIX}") -+ LIST(APPEND _POSSIBLE_LUA_COMPILER "luac${_SUFFIX}") - LIST(APPEND _POSSIBLE_LUA_LIBRARY "lua${_SUFFIX}") - ENDFOREACH(_SUFFIX) - -@@ -55,6 +57,11 @@ FIND_PROGRAM(LUA_EXECUTABLE - NAMES ${_POSSIBLE_LUA_EXECUTABLE} - ) - -+# Find the lua compiler -+FIND_PROGRAM(LUA_COMPILER -+ NAMES ${_POSSIBLE_LUA_COMPILER} -+) -+ - # Find the lua header - FIND_PATH(LUA_INCLUDE_DIR lua.h - HINTS -@@ -114,5 +121,5 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua - REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR - VERSION_VAR LUA_VERSION_STRING) - --MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE) -+MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY LUA_EXECUTABLE LUA_COMPILER) - Index: patches/patch-default-rsync_lua =================================================================== RCS file: /cvs/ports/sysutils/lsyncd/patches/patch-default-rsync_lua,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-default-rsync_lua --- patches/patch-default-rsync_lua 23 Jan 2016 19:15:13 -0000 1.1.1.1 +++ patches/patch-default-rsync_lua 26 Dec 2017 19:12:08 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-default-rsync_lua,v 1.1.1.1 2016/01/23 19:15:13 landry Exp $ ---- default-rsync.lua.orig Thu Oct 15 08:29:47 2015 -+++ default-rsync.lua Sat Jan 23 19:41:49 2016 -@@ -551,7 +551,7 @@ rsync.exitcodes = default.rsyncExitCodes +Index: default-rsync.lua +--- default-rsync.lua.orig ++++ default-rsync.lua +@@ -671,7 +671,7 @@ rsync.exitcodes = default.rsyncExitCodes rsync.rsync = { -- The rsync binary to be called. Index: patches/patch-tests_testlib_lua =================================================================== RCS file: /cvs/ports/sysutils/lsyncd/patches/patch-tests_testlib_lua,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-tests_testlib_lua --- patches/patch-tests_testlib_lua 23 Jan 2016 19:15:13 -0000 1.1.1.1 +++ patches/patch-tests_testlib_lua 26 Dec 2017 19:12:08 -0000 @@ -1,12 +1,28 @@ $OpenBSD: patch-tests_testlib_lua,v 1.1.1.1 2016/01/23 19:15:13 landry Exp $ ---- tests/testlib.lua.orig Sat Jan 23 18:42:55 2016 -+++ tests/testlib.lua Sat Jan 23 18:43:08 2016 -@@ -26,7 +26,7 @@ cwriteln('random seed: ', seed) - -- @returns the name of the directory + +Do not color test output as it messes up the terminal + +Index: tests/testlib.lua +--- tests/testlib.lua.orig ++++ tests/testlib.lua +@@ -2,9 +2,9 @@ + posix = require( 'posix' ) + + -- escape codes to colorize output on terminal +-local c1='\027[47;34m' ++local c1='' + +-local c0='\027[0m' ++local c0='' + -- - function mktempd() -- local f = io.popen('mktemp -td ltest.XXX', 'r') -+ local f = io.popen('mktemp -td ltest.XXXXXXXX', 'r') - local s = f:read('*a') - f:close() - s = s:gsub('[\n\r]+', ' ') + -- Writes colorized. +@@ -34,7 +34,7 @@ cwriteln( 'random seed: ', seed ) + -- + function mktempd + ( ) +- local f = io.popen( 'mktemp -td ltest.XXX', 'r' ) ++ local f = io.popen( 'mktemp -td ltest.XXXXXXXX', 'r' ) + + local s = f:read( '*a' ) +
