[build] remove libuuid dependency (fixes #1056)

x-ref:
  "libuuid - non-portabile configure.in"
  https://redmine.lighttpd.net/issues/1056

Author: gstrauss

.github/workflows/pr.yml

@@ -29,7 +29,7 @@ jobs:
             libsasl2-dev libkrb5-dev libdbi-dev libpam-dev libldap-dev \
             libmariadb-dev libpq-dev \
             libmaxminddb-dev libunwind-dev liblua5.1-0-dev liblua5.4-dev \
-            libxml2-dev uuid-dev libsqlite3-dev
+            libxml2-dev libsqlite3-dev
       - name: Compile and Test
         run: |
           set -e
@@ -60,7 +60,7 @@ jobs:
             libsasl2-dev libkrb5-dev libdbi-dev libpam-dev libldap-dev \
             libmariadb-dev libpq-dev \
             libmaxminddb-dev libunwind-dev liblua5.1-0-dev liblua5.4-dev \
-            libxml2-dev uuid-dev libsqlite3-dev
+            libxml2-dev libsqlite3-dev
       - name: Compile and Test
         run: |
           set -e
@@ -81,7 +81,7 @@ jobs:
             mariadb-connector-c libpq \
             brotli libdeflate zlib zstd \
             libmaxminddb lua \
-            libxml2 ossp-uuid sqlite
+            libxml2 sqlite
           # autoconf automake libtool m4 cmake scons
       - name: Compile and Test
         run: |
@@ -120,7 +120,7 @@ jobs:
               mariadb1011-client postgresql16-client \
               brotli libdeflate zstd \
               libmaxminddb libunwind lua51 lua54 \
-              e2fsprogs-libuuid libxml2 sqlite3
+              libxml2 sqlite3
           run: |
             set -e
             cd "${{github.workspace}}" && scripts/ci-build.sh meson
@@ -142,7 +142,7 @@ jobs:
               mariadb-client postgresql16-client \
               brotli libdeflate zlib zstd \
               libmaxminddb libunwind lua51 lua54 \
-              libuuid libxml2 sqlite3
+              libxml2 sqlite3
           # autoconf automake gmake libtool m4 meson py311-scons
           run: |
             set -e
@@ -163,7 +163,7 @@ jobs:
               mariadb-client postgresql-client \
               brotli libdeflate zstd \
               libmaxminddb lua--%5.1 lua--%5.4 \
-              e2fsprogs ossp-uuid libxml sqlite3
+              libxml sqlite3
           # autoconf automake cmake gmake libtool m4 scons
           run: |
             set -e
@@ -210,7 +210,7 @@ jobs:
             libsasl2-devel libkrb5-devel libdbi-devel openldap-devel
             libmariadb-devel libpq-devel
             libmaxminddb-devel libunwind-devel lua-devel lua5.1-devel
-            libxml2-devel libuuid-devel libsqlite3-devel
+            libxml2-devel libsqlite3-devel
             libintl-devel
       - name: Update
         shell: powershell
@@ -263,7 +263,7 @@ jobs:
         with:
           msystem: ${{matrix.platform}}
           update: true
-          install: git m4 libuuid-devel
+          install: git m4
           pacboy: >-
             cc:p autotools:p libtool:p make:p pcre2:p pkgconf:p
             nettle:p gnutls:p mbedtls:p nss:p openssl:p
@@ -273,14 +273,13 @@ jobs:
             libmaxminddb:p libunwind:p lua51:p lua:p luajit:p
             libxml2:p sqlite3:p
           # heimdal-devel: available only on platform: msys (?)
-          # libuuid-devel: available only on platform: msys (?) static lib.a
       - name: Compile and Test
         shell: msys2 {0}
         run: |
           set -e
           # NO_GNUTLS=1 gnutls/socket.h can not find <sys/socket.h>
           # NO_MYSQL=1 build not finding mysql_config
-          export NO_DBI=1 NO_GNUTLS=1 NO_KRB5=1 NO_MYSQL=1 NO_PAM=1 NO_UNWIND=1 NO_UUID=1 NO_WOLFSSL=1
+          export NO_DBI=1 NO_GNUTLS=1 NO_KRB5=1 NO_MYSQL=1 NO_PAM=1 NO_UNWIND=1 NO_WOLFSSL=1
           cd "${{github.workspace}}" && scripts/ci-build.sh autobuild
 
   Linux-alpine-x86_64:
@@ -306,7 +305,7 @@ jobs:
             cyrus-sasl-dev krb5-dev libdbi-dev linux-pam-dev openldap-dev
             mariadb-connector-c-dev postgresql16-dev
             libmaxminddb-dev libunwind-dev lua5.1-dev lua5.4-dev
-            libxml2-dev ossp-uuid-dev sqlite-dev
+            libxml2-dev sqlite-dev
             zlib-static openssl-libs-static
       - name: Compile and Test
         shell: alpine.sh {0}

INSTALL

@@ -78,8 +78,6 @@ optional packages for optional features ::
   libpq               # Postgresql ./configure --with-pgsql
   libpq-devel
   libunwind-devel     # libunwind  ./configure --with-libunwind
-  libuuid             # libuuid    ./configure --with-webdav-locks
-  libuuid-devel
   libxml2             # libxml2    ./configure --with-webdav-props
   libxml2-devel
   libxml2-static
@@ -188,7 +186,7 @@ build using CMake and Xcode on Mac OS X with MacPorts
   $ xcodebuild --license
   $ xcode-select --install
   $ sudo port selfupdate
-  $ sudo port install autoconf automake cmake libtool m4 pcre2 pkgconfig zlib zstd brotli openssl libxml sqlite3 openldap libunwind libunwind-headers mysql57 openldap ossp-uuid
+  $ sudo port install autoconf automake cmake libtool m4 pcre2 pkgconfig zlib zstd brotli openssl libxml sqlite3 openldap libunwind libunwind-headers mysql57 openldap
   # Note: some of the above require more fiddling to configure with CMake...
 
   # cmake and build

README.FreeBSD

@@ -23,12 +23,10 @@ FreeBSD dependencies:
   pkg install lua51  (or lua52 or lua53 or lua54)
 - LDAP (mod_auth feature)
   pkg install openldap-client
-- SQLite3 (required for most mod_webdav features)
+- SQLite3 (mod_webdav WebDAV properties and locking)
   pkg install sqlite3
-- XML (mod_webdav properties and locking)
+- XML (mod_webdav WebDAV properties and locking)
   pkg install libxml2
-- UUID library (mod_webdav locking)
-  pkg install e2fsprogs-libuuid
 
 Configure:
 

SConstruct

@@ -264,7 +264,7 @@ vars.AddVariables(
 	PackageVariable('with_pgsql', 'enable pgsql support', 'no'),
 	PackageVariable('with_sasl', 'enable SASL support', 'no'),
 	BoolVariable('with_sqlite3', 'enable sqlite3 support (required for webdav props)', 'no'),
-	BoolVariable('with_uuid', 'enable uuid support (required for webdav locks)', 'no'),
+	BoolVariable('with_uuid', 'enable uuid support (obsolete flag; ignored)', 'no'),
 	# with_valgrind not supported
 	# with_xattr not supported
 	PackageVariable('with_xml', 'enable xml support (required for webdav props)', 'no'),
@@ -355,7 +355,6 @@ if 1:
 		LIBSQLITE3 = '',
 		LIBSSL = '',
 		LIBSSLCRYPTO = '',
-		LIBUUID = '',
 		LIBWOLFSSL = '',
 		LIBX509 = '',
 		LIBXML2 = '',
@@ -698,14 +697,6 @@ if 1:
 			LIBSQLITE3 = 'sqlite3',
 		)
 
-	if env['with_uuid']:
-		if not autoconf.CheckLibWithHeader('uuid', 'uuid/uuid.h', 'C'):
-			fail("Couldn't find uuid")
-		autoconf.env.Append(
-			CPPFLAGS = [ '-DHAVE_UUID_UUID_H', '-DHAVE_LIBUUID' ],
-			LIBUUID = 'uuid',
-		)
-
 	if env['with_xml']:
 		xml2_config = autoconf.checkProgram('xml', 'xml2-config')
 		if not autoconf.CheckParseConfigForLib('LIBXML2', xml2_config + ' --cflags --libs'):

configure.ac

@@ -120,7 +120,6 @@ AC_CHECK_HEADERS([\
   sys/uio.h \
   sys/un.h \
   syslog.h \
-  uuid/uuid.h \
 ])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -1219,7 +1218,7 @@ if test "$WITH_WEBDAV_PROPS" != no; then
 fi
 
 
-dnl webdav locks (uuid)
+dnl webdav locks (uuid) (obsolete flag; ignored in build)
 AC_MSG_NOTICE([----------------------------------------])
 AC_MSG_CHECKING([for locks in mod_webdav])
 AC_ARG_WITH([webdav-locks],
@@ -1231,39 +1230,12 @@ AC_ARG_WITH([webdav-locks],
 )
 AC_MSG_RESULT([$WITH_WEBDAV_LOCKS])
 
-if test "$WITH_WEBDAV_LOCKS" != no; then
-  if test "$WITH_WEBDAV_PROPS" = no; then
+if test "$WITH_WEBDAV_PROPS" = no; then
+  if test "$WITH_WEBDAV_LOCKS" != no; then
     AC_MSG_ERROR([--with-webdav-locks requires --with-webdav-props])
   fi
-
-  AC_MSG_CHECKING([for libuuid])
-  AC_ARG_WITH([uuid],
-    [AS_HELP_STRING([--with-uuid], [uuid for locks in mod_webdav])],
-    [WITH_UUID=$withval],
-    [WITH_UUID=yes]
-  )
-  AC_MSG_RESULT([$WITH_UUID])
-
-  if test "$WITH_UUID" = no; then
-    AC_MSG_ERROR([--with-webdav-locks requires uuid])
-  fi
-
-  if test "$WITH_UUID" != yes; then
-    UUID_LIBS="-L$WITH_UUID -luuid"
-    CPPFLAGS="$CPPFLAGS -I$WITH_UUID"
-  else
-    AC_CHECK_LIB([uuid], [uuid_unparse],
-      [UUID_LIBS=-luuid],
-      [AC_MSG_ERROR([uuid lib not found, install it or build without --with-webdav-locks])]
-    )
-    AC_CHECK_HEADERS([uuid/uuid.h], [],
-      [AC_MSG_ERROR([uuid headers not found, install them or build without --with-webdav-locks])]
-    )
-  fi
-
-  AC_DEFINE([HAVE_LIBUUID], [1], [libuuid])
-  AC_DEFINE([HAVE_UUID_UUID_H], [1], [uuid/uuid.h is available])
-  AC_SUBST([UUID_LIBS])
+else
+  WITH_WEBDAV_LOCKS="yes"
 fi
 
 dnl xxhash

meson_options.txt

@@ -117,7 +117,7 @@ option('with_sasl',
 option('with_webdav_locks',
 	type: 'feature',
 	value: 'disabled',
-	description: 'locks in webdav [default: off]',
+	description: 'locks in webdav (obsolete flag; ignored) [default: off]',
 )
 option('with_webdav_props',
 	type: 'feature',

scripts/ci-build.sh

@@ -40,9 +40,6 @@ ${WITH_SASL:=true}
 ${WITH_UNWIND:=true}
 [ -n "$NO_UNWIND" ] && unset WITH_UNWIND
 
-${WITH_UUID:=true}
-[ -n "$NO_UUID" ] && unset WITH_UUID
-
 sysname="$(uname -s)"
 
 if [ "$sysname" = "FreeBSD" ]; then
@@ -85,7 +82,6 @@ case "${build}" in
 		--with-nss \
 		--with-openssl \
 		${WITH_WOLFSSL:+--with-wolfssl} \
-		${WITH_UUID:+--with-webdav-locks} \
 		--with-webdav-props
 	case "${build}" in
 	"autobuild")
@@ -131,7 +127,6 @@ case "${build}" in
 		-DWITH_NSS=ON \
 		-DWITH_OPENSSL=ON \
 		${WITH_WOLFSSL:+-DWITH_WOLFSSL=ON} \
-		${WITH_UUID:+-DWITH_WEBDAV_LOCKS=ON} \
 		-DWITH_WEBDAV_PROPS=ON \
 		..
 	make -j 4 VERBOSE=1
@@ -159,7 +154,6 @@ case "${build}" in
 	  -Dwith_pcre2=true \
 	  ${WITH_PGSQL:+-Dwith_pgsql=enabled} \
 	  ${WITH_SASL:+-Dwith_sasl=enabled} \
-	  ${WITH_UUID:+-Dwith_webdav_locks=enabled} \
 	  -Dwith_webdav_props=enabled \
 	  ${WITH_WOLFSSL:+-Dwith_wolfssl=true} \
 	  -Dwith_zlib=enabled \

src/CMakeLists.txt

@@ -28,7 +28,7 @@ option(WITH_NETTLE "with Nettle-support [default: off]")
 option(WITH_PCRE2 "with regex support [default: on]" ON)
 option(WITH_PCRE "with regex support [default: off]")
 option(WITH_WEBDAV_PROPS "with property-support for mod_webdav [default: off]")
-option(WITH_WEBDAV_LOCKS "locks in webdav [default: off]")
+option(WITH_WEBDAV_LOCKS "locks in webdav (obsolete flag; ignored) [default: off]")
 option(WITH_BROTLI "with brotli-support for mod_deflate [default: off]")
 option(WITH_BZIP "with bzip2-support for mod_deflate [default: off]")
 option(WITH_ZLIB "with deflate-support for mod_deflate [default: on]" ON)
@@ -99,10 +99,6 @@ if(WITH_WEBDAV_PROPS)
 	set(WITH_SQLITE3 1)
 endif()
 
-if(WITH_WEBDAV_LOCKS)
-	set(WITH_UUID 1)
-endif()
-
 check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
 set(CMAKE_REQUIRED_FLAGS "-include sys/time.h")
 check_include_files(sys/loadavg.h HAVE_SYS_LOADAVG_H)
@@ -679,20 +675,6 @@ else()
 	unset(HAVE_SQLITE3)
 endif()
 
-if(WITH_UUID)
-	check_include_files(uuid/uuid.h HAVE_UUID_UUID_H)
-	check_library_exists(uuid uuid_generate "" NEED_LIBUUID)
-	if(NOT NEED_LIBUUID)
-		check_function_exists(uuid_generate HAVE_LIBUUID)
-	else()
-		set(HAVE_LIBUUID 1)
-	endif()
-else()
-	unset(HAVE_UUID_UUID_H)
-	unset(NEED_LIBUUID)
-	unset(HAVE_LIBUUID)
-endif()
-
 if(WITH_XXHASH)
 	check_include_files(xxhash.h HAVE_XXHASH_H)
 	check_library_exists(xxhash XXH_versionNumber "" HAVE_XXHASH)
@@ -1074,11 +1056,6 @@ endif()
 if(HAVE_LIBXML_H)
 	target_link_libraries(mod_webdav ${XML2_LDFLAGS})
 endif()
-if(HAVE_UUID_UUID_H)
-	if(NEED_LIBUUID)
-		set(L_MOD_WEBDAV ${L_MOD_WEBDAV} uuid)
-	endif()
-endif()
 
 target_link_libraries(mod_webdav ${L_MOD_WEBDAV})
 if(BUILD_STATIC)

src/Makefile.am

@@ -138,7 +138,7 @@ lib_LTLIBRARIES += mod_webdav.la
 mod_webdav_la_SOURCES = mod_webdav.c
 mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS) 
 mod_webdav_la_LDFLAGS = $(common_module_ldflags)
-mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIBS) $(ELFTC_LIB)
+mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(ELFTC_LIB)
 
 if BUILD_WITH_LUA
 lib_LTLIBRARIES += mod_magnet.la
@@ -420,7 +420,7 @@ lighttpd_CPPFLAGS = \
 lighttpd_LDADD = \
   $(common_libadd) \
   $(CRYPT_LIB) $(CRYPTO_LIB) $(XXHASH_LIBS) \
-  $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIBS) $(ELFTC_LIB) \
+  $(XML_LIBS) $(SQLITE_LIBS) $(ELFTC_LIB) \
   $(PCRE_LIB) $(Z_LIB) $(ZSTD_LIB) $(BZ_LIB) $(BROTLI_LIBS) $(DEFLATE_LIBS) \
   $(DL_LIB) $(SENDFILE_LIB) $(ATTR_LIB) \
   $(FAM_LIBS) $(LIBEV_LIBS) $(LIBUNWIND_LIBS)

src/SConscript

@@ -125,7 +125,7 @@ modules = {
 	'mod_status' : { 'src' : [ 'mod_status.c' ] },
 	'mod_userdir' : { 'src' : [ 'mod_userdir.c' ] },
 	'mod_vhostdb' : { 'src' : [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] },
-	'mod_webdav' : { 'src' : [ 'mod_webdav.c' ], 'lib' : [ env['LIBXML2'], env['LIBSQLITE3'], env['LIBUUID'] ] },
+	'mod_webdav' : { 'src' : [ 'mod_webdav.c' ], 'lib' : [ env['LIBXML2'], env['LIBSQLITE3'] ] },
 	'mod_wstunnel' : { 'src' : [ 'mod_wstunnel.c' ], 'lib' : [ env['LIBCRYPTO'] ] },
 }
 

src/config.h.cmake

@@ -131,10 +131,6 @@
 /* sqlite3 */
 #cmakedefine  HAVE_SQLITE3_H
 
-/* UUID */
-#cmakedefine  HAVE_UUID_UUID_H
-#cmakedefine  HAVE_LIBUUID
-
 /* ZLIB */
 #cmakedefine  HAVE_ZLIB_H
 #cmakedefine  HAVE_LIBZ

src/meson.build

@@ -443,16 +443,6 @@ conf_data.set('HAVE_SASL', libsasl.found())
 #if get_option('with_valgrind')
 #endif
 
-uuid = compiler.has_function('uuid_generate', args: defs, prefix: '#include <uuid/uuid.h>')
-if uuid
-  libuuid = dependency('', required: false)
-else
-  libuuid = dependency('uuid', required: get_option('with_webdav_locks'))
-endif
-
-conf_data.set('HAVE_LIBUUID', uuid)
-conf_data.set('HAVE_UUID_UUID_H', uuid)
-
 libxml2 = dependency('libxml-2.0', required: get_option('with_webdav_props'))
 libsqlite3 = dependency('sqlite3', required: get_option('with_webdav_props'))
 conf_data.set('HAVE_LIBXML2', libxml2.found())
@@ -785,7 +775,7 @@ modules = [
 	[ 'mod_status', [ 'mod_status.c' ] ],
 	[ 'mod_userdir', [ 'mod_userdir.c' ] ],
 	[ 'mod_vhostdb', [ 'mod_vhostdb.c', 'mod_vhostdb_api.c' ] ],
-	[ 'mod_webdav', [ 'mod_webdav.c' ], [ libsqlite3, libuuid, libxml2, libelftc ] ],
+	[ 'mod_webdav', [ 'mod_webdav.c' ], [ libsqlite3, libxml2, libelftc ] ],
 	[ 'mod_wstunnel', [ 'mod_wstunnel.c' ], libcrypto ],
 ]
 endif