Permalink
Browse files

Merge branch '1.2.0' into setup-script-default-taskddata

  • Loading branch information...
bradyt committed Jul 1, 2018
2 parents 3671371 + 9608ff0 commit dcce967d6f7663840ea0b194761c83602a0bfdf7
Showing with 5,302 additions and 20,563 deletions.
  1. +3 −0 .gitmodules
  2. +31 −0 AUTHORS
  3. +48 −98 CMakeLists.txt
  4. +1 −1 COPYING
  5. +110 −5 ChangeLog
  6. +7 −25 INSTALL
  7. +2 −2 LICENSE
  8. +24 −40 NEWS
  9. +0 −58 README
  10. +104 −0 README.md
  11. +5 −8 cmake.h.in
  12. +53 −0 cmake/CXXSniffer.cmake
  13. +12 −12 demo/README
  14. +1 −1 demo/client/case1
  15. +1 −1 demo/client/case2
  16. +1 −1 demo/client/case3
  17. +1 −1 demo/client/case4
  18. +1 −1 demo/client/case5
  19. +1 −1 demo/client/case6
  20. +1 −1 demo/client/case7
  21. +24 −0 demo/client/case7a
  22. +4 −4 demo/client/case8
  23. +6 −6 demo/client/malformed1
  24. +3 −1 demo/client/run
  25. +37 −35 demo/client/setup
  26. +1 −1 demo/client/sync.1
  27. +1 −1 demo/server/run
  28. +12 −12 demo/server/setup
  29. +23 −31 doc/man/taskd.1.in
  30. +4 −4 doc/man/taskdctl.1.in
  31. +28 −19 doc/man/taskdrc.5.in
  32. +1 −1 mon/create
  33. +1 −0 pki/.gitignore
  34. +3 −2 pki/README
  35. +7 −0 pki/check_expire
  36. +1 −1 pki/generate
  37. +24 −17 pki/generate.ca
  38. +28 −19 pki/generate.client
  39. +15 −12 pki/generate.crl
  40. +24 −25 pki/generate.server
  41. +0 −195 scripts/l10n
  42. +29 −7 scripts/profile.py
  43. +26 −11 scripts/setup_server.bash
  44. +5 −1 scripts/systemd/taskd.service
  45. +3 −0 src/.gitignore
  46. +38 −35 src/CMakeLists.txt
  47. +0 −638 src/Color.cpp
  48. +0 −82 src/Color.h
  49. +28 −37 src/ConfigFile.cpp
  50. +11 −12 src/ConfigFile.h
  51. +83 −79 src/Database.cpp
  52. +10 −6 src/Database.h
  53. +0 −1,106 src/Date.cpp
  54. +0 −124 src/Date.h
  55. +0 −241 src/Directory.cpp
  56. +0 −60 src/Directory.h
  57. +0 −551 src/Duration.cpp
  58. +0 −73 src/Duration.h
  59. +0 −523 src/File.cpp
  60. +0 −91 src/File.h
  61. +0 −450 src/JSON.cpp
  62. +0 −138 src/JSON.h
  63. +0 −169 src/Log.cpp
  64. +0 −56 src/Log.h
  65. +0 −170 src/Msg.cpp
  66. +0 −62 src/Msg.h
  67. +0 −1,253 src/Nibbler.cpp
  68. +0 −124 src/Nibbler.h
  69. +0 −301 src/Path.cpp
  70. +0 −70 src/Path.h
  71. +0 −168 src/RX.cpp
  72. +0 −59 src/RX.h
  73. +33 −47 src/Server.cpp
  74. +20 −21 src/Server.h
  75. +145 −86 src/TLSClient.cpp
  76. +14 −14 src/TLSClient.h
  77. +177 −100 src/TLSServer.cpp
  78. +23 −21 src/TLSServer.h
  79. +952 −676 src/Task.cpp
  80. +57 −42 src/Task.h
  81. +0 −148 src/Timer.cpp
  82. +0 −76 src/Timer.h
  83. +23 −127 src/admin.cpp
  84. +52 −52 src/api.cpp
  85. +10 −12 src/client.cpp
  86. +34 −41 src/config.cpp
  87. +153 −158 src/daemon.cpp
  88. +61 −87 src/diag.cpp
  89. +78 −98 src/help.cpp
  90. +0 −50 src/i18n.h
  91. +14 −17 src/init.cpp
  92. +0 −159 src/l10n/eng-USA.h
  93. +1 −0 src/libshared
  94. +0 −86 src/status.cpp
  95. +30 −53 src/taskd.cpp
  96. +16 −72 src/taskd.h
  97. +2 −2 src/taskdctl
  98. +0 −761 src/text.cpp
  99. +0 −82 src/text.h
  100. +0 −3 src/tls/.gitignore
  101. +0 −17 src/tls/Makefile
  102. +0 −37 src/tls/README
  103. +0 −502 src/tls/TLSClient.cpp
  104. +0 −72 src/tls/TLSClient.h
  105. +0 −628 src/tls/TLSServer.cpp
  106. +0 −99 src/tls/TLSServer.h
  107. +0 −38 src/tls/c.cpp
  108. +0 −58 src/tls/s.cpp
  109. +0 −694 src/tls/text.cpp
  110. +0 −82 src/tls/text.h
  111. +0 −297 src/utf8.cpp
  112. +0 −45 src/utf8.h
  113. +12 −173 src/util.cpp
  114. +2 −11 src/util.h
  115. +0 −253 src/wcwidth6.cpp
  116. +0 −15 test/.gitignore
  117. +15 −41 test/CMakeLists.txt
  118. +0 −59 test/add_group.t
  119. +0 −61 test/add_org.t
  120. +0 −61 test/add_user.t
  121. +5 −2 test/basetest/README
  122. +1 −1 test/basetest/__init__.py
  123. +9 −0 test/basetest/compat.py
  124. +40 −0 test/basetest/meta.py
  125. +0 −301 test/basetest/task.py
  126. +151 −272 test/basetest/taskd.py
  127. +3 −3 test/basetest/testing.py
  128. +37 −8 test/basetest/utils.py
  129. +0 −51 test/bug.1397.t
  130. +0 −192 test/color.t.cpp
  131. +2 −2 test/config.t.cpp
  132. +75 −55 test/config2.t
  133. +0 −12 test/conversion
  134. +0 −444 test/date.t.cpp
  135. +0 −148 test/directory.t.cpp
  136. +0 −807 test/duration.t.cpp
  137. +0 −93 test/file.t.cpp
  138. +84 −81 test/init.t
  139. +0 −182 test/json.t.cpp
  140. +0 −23 test/json/1.json
  141. +0 −11 test/json/2.json
  142. +0 −26 test/json/3.json
  143. +0 −88 test/json/4.json
  144. +0 −27 test/json/5.json
  145. +0 −2 test/json/6.json
  146. +0 −1 test/json/e1.json
  147. +0 −30 test/json/e2.json
  148. +0 −4 test/json/e3.json
  149. +0 −26 test/json/e4.json
  150. +0 −70 test/json/e5.json
  151. +0 −17 test/json/e6.json
  152. +0 −34 test/json/e7.json
  153. +0 −36 test/json/e8.json
  154. +0 −44 test/json/facebook.json
  155. +0 −21 test/json/flikr.json
  156. +0 −41 test/json/interop.json
  157. +0 −77 test/json/iphone.json
  158. +0 −50 test/json/twitter.json
  159. +0 −53 test/json/youtube.json
  160. +0 −83 test/json_test.cpp
  161. +0 −46 test/json_test.t
  162. +0 −63 test/msg.t.cpp
  163. +0 −780 test/nibbler.t.cpp
  164. +202 −0 test/org.t
  165. +0 −115 test/path.t.cpp
  166. +139 −24 test/problems
  167. +0 −64 test/remove_group.t
  168. +0 −61 test/remove_org.t
  169. +0 −66 test/remove_user.t
  170. +0 −71 test/resume_group.t
  171. +0 −64 test/resume_org.t
  172. +0 −73 test/resume_user.t
  173. +239 −0 test/run_all
  174. +0 −76 test/run_all.in
  175. +0 −118 test/rx.t.cpp
  176. +47 −23 test/simpletap/__init__.py
  177. +0 −65 test/suspend_group.t
  178. +0 −59 test/suspend_org.t
  179. +0 −67 test/suspend_user.t
  180. +50 −21 test/template.t
  181. +106 −51 test/test.cpp
  182. +6 −2 test/test.h
  183. +31 −31 test/test_certs/ca.cert.pem
  184. +209 −218 test/test_certs/ca.key.pem
  185. +31 −31 test/test_certs/client.cert.pem
  186. +210 −219 test/test_certs/client.key.pem
  187. +31 −32 test/test_certs/server.cert.pem
  188. +16 −17 test/test_certs/server.crl.pem
  189. +210 −219 test/test_certs/server.key.pem
  190. +31 −31 test/test_certs/test_client.cert.pem
  191. +210 −219 test/test_certs/test_client.key.pem
  192. +0 −349 test/text.t.cpp
  193. +244 −0 test/user.t
  194. +0 −98 test/utf8.t.cpp
  195. +0 −62 test/util.t.cpp
  196. +72 −37 test/version.t
@@ -0,0 +1,3 @@
[submodule "src/libshared"]
path = src/libshared
url = https://github.com/GothenburgBitFactory/libshared
31 AUTHORS
@@ -35,6 +35,25 @@ The following submitted code, packages or analysis, and deserve special thanks:
viq
Dominik Heidler
Jack
Johannes Wienke
Dafo with the golden Hair
Sebastien Badia
Gordon Ball
Kent R. Spillner
Konstantin Vorobyev
Jelle van der Waa
Sebastian Sonne
aszlig
Pedro Lopes
Tomas Babej
Jörg Krause
Wade Duvall
Jelle van der Waa
Flavio Poletti
Antonio Huete Jimenez
Paul J. Fenwick
Michael Neumann
Dan Weatherill

Thanks to the following, who submitted detailed bug reports and/or excellent
suggestions:
@@ -64,3 +83,15 @@ suggestions:
Felix Martin
Tom Sydney Kerckhove
Alexey Kotlyarov
Michael Eichorn
Jeremy John Reeder
Reg
Markus Beppler
Olaf H B
Robin Green
Slava
Daniel Shahaf
Samathy Barratt
James Duff
Dan Callahan
Alexei
@@ -1,91 +1,18 @@
cmake_minimum_required (VERSION 2.8)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
if(POLICY CMP0037)
cmake_policy(SET CMP0037 OLD)
endif()
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

include (CheckFunctionExists)
include (CheckStructHasMember)

set (HAVE_CMAKE true)

project (taskd)
set (PROJECT_VERSION "1.1.0")
include (CXXSniffer)

OPTION(USE_GNUTLS "Build gnutls support." ON)
set (PROJECT_VERSION "1.2.0")

message ("CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}")

include (CheckCXXCompilerFlag)

# NOTE: If we are to actually use C++11 features, we should either require
# a compiler that supports the -std=c++11 flag or check for the
# features used.
# Relying on -std=c++0x or even -std=gnu++0x is highly volatile.

CHECK_CXX_COMPILER_FLAG("-std=c++11" _HAS_CXX11)
CHECK_CXX_COMPILER_FLAG("-std=c++0x" _HAS_CXX0X)
CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" _HAS_GNU0X)

if (_HAS_CXX11)
set (_CXX11_FLAGS "-std=c++11")
elseif (_HAS_CXX0X)
message (WARNING "Enabling -std=c++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
set (_CXX11_FLAGS "-std=c++0x")
elseif (_HAS_GNU0X)
message (WARNING "Enabling -std=gnu++0x draft compile flag. Your compiler does not support the standard '-std=c++11' option. Consider upgrading.")
set (_CXX11_FLAGS "-std=gnu++0x")
else (_HAS_CXX11)
message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
endif (_HAS_CXX11)

if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set (LINUX true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (DARWIN true)
set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD")
set (KFREEBSD true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
set (FREEBSD true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
set (OPENBSD true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
set (NETBSD true)
elseif (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
set (SOLARIS true)
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
set (GNUHURD true)
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
set (CYGWIN true)
# NOTE: Not setting -std=gnu++0x leads to compile errors even with
# GCC 4.8.3, and debugging those leads to insanity. Adding this
# workaround instead of fixing Cygwin.
set (_CXX11_FLAGS "-std=gnu++0x")
else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set (UNKNOWN true)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

set (CMAKE_CXX_FLAGS "${_CXX11_FLAGS} ${CMAKE_CXX_FLAGS}")

set (CMAKE_CXX_FLAGS "-Wall -Wsign-compare -Wreturn-type ${CMAKE_CXX_FLAGS}")

if (NETBSD)
# Since readline, etc likely to be in /usr/pkg/lib, not standard library
# Otherwise will remove links during install
set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
endif (NETBSD)

if (FREEBSD)
SET (TASKD_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
SET (TASKD_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
else (FREEBSD)
SET (TASKD_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
SET (TASKD_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
endif (FREEBSD)
SET (TASKD_DOCDIR share/doc/taskd CACHE STRING "Installation directory for doc files")
SET (TASKD_EXTDIR libexec/taskd CACHE STRING "Installation directory for the extensions")
SET (TASKD_BINDIR bin CACHE STRING "Installation directory for the program")
OPTION(USE_GNUTLS "Build gnutls support." ON)

message ("-- Looking for SHA1 references")
if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
@@ -100,12 +27,23 @@ endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)

set (PACKAGE "${PROJECT_NAME}")
set (VERSION "${PROJECT_VERSION}")
set (PACKAGE_BUGREPORT "support@taskwarrior.org")
set (PACKAGE_BUGREPORT "support@gothenburgbitfactory.org")
set (PACKAGE_NAME "${PACKAGE}")
set (PACKAGE_TARNAME "${PACKAGE}")
set (PACKAGE_VERSION "${VERSION}")
set (PACKAGE_STRING "${PACKAGE} ${VERSION}")

if (FREEBSD OR DRAGONFLY)
SET (TASKD_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1")
SET (TASKD_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5")
else (FREEBSD OR DRAGONFLY)
SET (TASKD_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1")
SET (TASKD_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5")
endif (FREEBSD OR DRAGONFLY)
SET (TASKD_DOCDIR share/doc/taskd CACHE STRING "Installation directory for doc files")
SET (TASKD_EXTDIR libexec/taskd CACHE STRING "Installation directory for the extensions")
SET (TASKD_BINDIR bin CACHE STRING "Installation directory for the program")

message ("-- Looking for GnuTLS")
find_package (GnuTLS REQUIRED)
if (GNUTLS_FOUND)
@@ -114,11 +52,18 @@ if (GNUTLS_FOUND)
set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${GNUTLS_LIBRARIES})
endif (GNUTLS_FOUND)

check_function_exists (timegm HAVE_TIMEGM)
check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)

check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)


message ("-- Looking for libuuid")
if (DARWIN OR FREEBSD)
if (DARWIN OR FREEBSD OR OPENBSD)
# Apple and FreeBSD include the uuid functions in their libc, rather than libuuid
check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
else (DARWIN OR FREEBSD)
else (DARWIN OR FREEBSD OR OPENBSD)
find_path (UUID_INCLUDE_DIR uuid/uuid.h)
find_library (UUID_LIBRARY NAMES uuid)
if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
@@ -131,28 +76,33 @@ else (DARWIN OR FREEBSD)
else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
message (FATAL_ERROR "-- libuuid not found.")
endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
endif (DARWIN OR FREEBSD)
endif (DARWIN OR FREEBSD OR OPENBSD)

if (HAVE_UUID_UNPARSE_LOWER)
message ("-- Found libuuid")
else (HAVE_UUID_UNPARSE_LOWER)
message ("-- Found libuuid, using internal uuid_unparse_lower")
endif (HAVE_UUID_UNPARSE_LOWER)

check_function_exists (timegm HAVE_TIMEGM)
check_function_exists (get_current_dir_name HAVE_GET_CURRENT_DIR_NAME)

check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h" HAVE_ST_BIRTHTIME)

# Set the package language.
if (LANGUAGE)
set (PACKAGE_LANGUAGE ${LANGUAGE})
else (LANGUAGE)
set (PACKAGE_LANGUAGE 1)
endif (LANGUAGE)

set (LANGUAGE_ENG_USA 1)
if (SOLARIS)
# accept() is in libsocket according to its manpage
message("-- Looking for libsocket")
find_library (SOCKET_LIBRARY NAMES socket)
if (SOCKET_LIBRARY)
set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${SOCKET_LIBRARY})
else (SOCKET_LIBRARY)
message(FATAL_ERROR "-- libsocket not found.")
endif (SOCKET_LIBRARY)

# inet_ntop() is in libnsl according to its manpage
message("-- Looking for libnsl")
find_library (NSL_LIBRARY NAMES nsl)
if (NSL_LIBRARY)
set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${NSL_LIBRARY})
else (NSL_LIBRARY)
message(FATAL_ERROR "-- libnsl not found.")
endif (NSL_LIBRARY)
endif (SOLARIS)

message ("-- Configuring cmake.h")
configure_file (
@@ -161,9 +111,9 @@ configure_file (

add_subdirectory (src)
add_subdirectory (doc)
if (EXISTS test)
if (EXISTS ${CMAKE_SOURCE_DIR}/test)
add_subdirectory (test EXCLUDE_FROM_ALL)
endif (EXISTS test)
endif (EXISTS ${CMAKE_SOURCE_DIR}/test)

set (doc_FILES NEWS ChangeLog INSTALL AUTHORS COPYING)
foreach (doc_FILE ${doc_FILES})
@@ -179,5 +129,5 @@ set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
set (CPACK_SOURCE_IGNORE_FILES "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig"
"_CPack_Packages" "cmake_install" "install_manifest"
"Makefile$" "test" "package-config"
"src/taskd$" "/\\.gitignore" "/\\.git/" "swp$")
"src/taskd$" "src/tls" "/\\\\.gitignore" "/\\\\.git/" "swp$")
include (CPack)
@@ -1,6 +1,6 @@
taskd - Taskserver

Copyright 2012 - 2015, Göteborg Bit Factory.
Copyright 2012 - 2018, Göteborg Bit Factory.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Oops, something went wrong.

0 comments on commit dcce967

Please sign in to comment.