Use Find PAckage

.gitea/workflows/source-release.yml

@@ -1,15 +1,18 @@
-# .gitea/workflows/source-release.yml
 name: Source release
 
 on:
   push:
     tags:
       - "v*"
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:
   source-package:
     runs-on: ubuntu-latest
+    env:
+      BUILD_DIR: /tmp/mars-nwe-build
 
     steps:
       - name: Check out source
@@ -18,6 +21,11 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
+      - name: Update submodules explicitly
+        run: |
+          git submodule sync --recursive
+          git submodule update --init --recursive
+
       - name: Install build dependencies
         run: |
           apt-get update
@@ -30,35 +38,58 @@ jobs:
             curl \
             jq \
             libgdbm-dev \
-            libcrypt-dev
+            libcrypt-dev \
+            libpam0g-dev
 
       - name: Configure
-        run: cmake -S . -B build
+        run: cmake -S . -B "$BUILD_DIR"
 
       - name: Build source package
-        run: cmake --build build --target package_source
+        run: cmake --build "$BUILD_DIR" --target package_source
 
       - name: Find source tarball
         id: pkg
         run: |
-          FILE="$(find build -maxdepth 2 -type f -name '*.tar.bz2' | head -n1)"
+          FILE="$(find "$BUILD_DIR" -maxdepth 2 -type f -name '*.tar.bz2' | head -n1)"
           test -n "$FILE"
           echo "file=$FILE" >> "$GITHUB_OUTPUT"
           echo "name=$(basename "$FILE")" >> "$GITHUB_OUTPUT"
 
-      - name: Create release if missing
+      - name: Decide release target
+        id: target
+        env:
+          REF_TYPE: ${{ gitea.ref_type || github.ref_type }}
+          REF_NAME: ${{ gitea.ref_name || github.ref_name }}
+          SHA: ${{ gitea.sha || github.sha }}
+        run: |
+          set -e
+
+          if [ "$REF_TYPE" = "tag" ]; then
+            echo "tag=$REF_NAME" >> "$GITHUB_OUTPUT"
+            echo "name=$REF_NAME" >> "$GITHUB_OUTPUT"
+            echo "prerelease=false" >> "$GITHUB_OUTPUT"
+          else
+            SHORT_SHA="$(printf '%s' "$SHA" | cut -c1-7)"
+            echo "tag=development" >> "$GITHUB_OUTPUT"
+            echo "name=development ($REF_NAME @ $SHORT_SHA)" >> "$GITHUB_OUTPUT"
+            echo "prerelease=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create or update release
         env:
           GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
           GITEA_API: https://gitea.disconnected-by-peer.at/api/v1
           OWNER: mars_nwe
           REPO: mars-nwe
-          TAG: ${{ gitea.ref_name || github.ref_name }}
+          REL_TAG: ${{ steps.target.outputs.tag }}
+          REL_NAME: ${{ steps.target.outputs.name }}
+          REL_PRERELEASE: ${{ steps.target.outputs.prerelease }}
         run: |
           set -e
 
           RELEASE_JSON="$(curl -fsS \
             -H "Authorization: token ${GITEA_TOKEN}" \
-            "${GITEA_API}/repos/${OWNER}/${REPO}/releases/tags/${TAG}" || true)"
+            "${GITEA_API}/repos/${OWNER}/${REPO}/releases/tags/${REL_TAG}" || true)"
 
           if [ -z "$RELEASE_JSON" ]; then
             RELEASE_JSON="$(curl -fsS -X POST \
@@ -66,13 +97,47 @@ jobs:
               -H "Content-Type: application/json" \
               "${GITEA_API}/repos/${OWNER}/${REPO}/releases" \
               -d "$(jq -n \
-                --arg tag "$TAG" \
-                --arg name "$TAG" \
-                '{tag_name:$tag,name:$name,draft:false,prerelease:false}')" )"
+                --arg tag "$REL_TAG" \
+                --arg name "$REL_NAME" \
+                --argjson prerelease "$REL_PRERELEASE" \
+                '{tag_name:$tag,name:$name,draft:false,prerelease:$prerelease}')" )"
+          else
+            RELEASE_ID="$(printf '%s' "$RELEASE_JSON" | jq -r '.id')"
+            RELEASE_JSON="$(curl -fsS -X PATCH \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              -H "Content-Type: application/json" \
+              "${GITEA_API}/repos/${OWNER}/${REPO}/releases/${RELEASE_ID}" \
+              -d "$(jq -n \
+                --arg tag "$REL_TAG" \
+                --arg name "$REL_NAME" \
+                --argjson prerelease "$REL_PRERELEASE" \
+                '{tag_name:$tag,name:$name,draft:false,prerelease:$prerelease}')" )"
           fi
 
           echo "$RELEASE_JSON" > release.json
-          jq . release.json
+
+      - name: Delete old asset with same name if present
+        env:
+          GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITEA_API: https://gitea.disconnected-by-peer.at/api/v1
+          OWNER: mars_nwe
+          REPO: mars-nwe
+          NAME: ${{ steps.pkg.outputs.name }}
+        run: |
+          set -e
+
+          RELEASE_ID="$(jq -r '.id' release.json)"
+          ASSET_ID="$(curl -fsS \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            "${GITEA_API}/repos/${OWNER}/${REPO}/releases/${RELEASE_ID}" \
+            | jq -r --arg NAME "$NAME" '.assets[]? | select(.name==$NAME) | .id' \
+            | head -n1)"
+
+          if [ -n "$ASSET_ID" ]; then
+            curl -fsS -X DELETE \
+              -H "Authorization: token ${GITEA_TOKEN}" \
+              "${GITEA_API}/repos/${OWNER}/${REPO}/releases/${RELEASE_ID}/assets/${ASSET_ID}"
+          fi
 
       - name: Upload tarball to release
         env:
@@ -92,3 +157,4 @@ jobs:
             -H "Content-Type: application/octet-stream" \
             --data-binary @"${FILE}" \
             "${GITEA_API}/repos/${OWNER}/${REPO}/releases/${RELEASE_ID}/assets?name=${NAME}"
+    

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "mail"]
 	path = mail
 	url = git@gitea.disconnected-by-peer.at:mars_nwe/mars-mail.git
+[submodule "smart"]
+	path = smart
+	url = git@gitea.disconnected-by-peer.at:mars_nwe/mars-smart.git

CMakeLists.txt

@@ -48,7 +48,7 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
         )
 
         set(MARS_NWE_VERSION
-            "${MARS_NWE_VERSION_BASE}-dev.${GIT_COMMIT_COUNT}+g${GIT_SHORT_SHA}")
+            "${MARS_NWE_VERSION_BASE}-dev.${GIT_COMMIT_COUNT}-g${GIT_SHORT_SHA}")
 
         if(NOT GIT_DIRTY_RESULT EQUAL 0)
             string(APPEND MARS_NWE_VERSION "-dirty")
@@ -111,6 +111,10 @@ ENDIF (NOT MAX_FILES)
 find_package(Crypt REQUIRED)
 find_package(GDBM REQUIRED)
 
+find_package(OpenSSL REQUIRED)
+find_package(PAM REQUIRED)
+find_package(DL REQUIRED)
+
 message(STATUS "Mars Nwe version: ${MARS_NWE_VERSION}")
 message(STATUS "bin: ${CMAKE_INSTALL_FULL_BINDIR}")
 message(STATUS "sbin: ${CMAKE_INSTALL_FULL_SBINDIR}")
@@ -120,7 +124,7 @@ message(STATUS "libexec: ${CMAKE_INSTALL_FULL_LIBEXECDIR}")
 message(STATUS "doc: ${CMAKE_INSTALL_FULL_DOCDIR}")
 message(STATUS "man: ${CMAKE_INSTALL_FULL_MANDIR}")
 message(STATUS "sysconf: ${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-message(STATUS "Mars Nwe libexec: ${MARS_NWE_INSTALL_FULL_LIBEXEC}")
+message(STATUS "Mars Nwe libexec: ${MARS_NWE_INSTALL_FULL_LIBEXECDIR}")
 message(STATUS "Mars Nwe config: ${MARS_NWE_INSTALL_FULL_CONFDIR}")
 message(STATUS "Mars Nwe data: ${MARS_NWE_DATA_DIR}")
 message(STATUS "Mars Nwe log: ${MARS_NWE_LOG_DIR}")
@@ -143,6 +147,7 @@ add_subdirectory(opt)
 add_subdirectory(sys)
 add_subdirectory(dosutils)
 add_subdirectory(mail)
+add_subdirectory(smart)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MARtin Stovers NetWare-Emulator.")
 SET(CPACK_PACKAGE_VENDOR "http://www.compu-art.de/mars_nwe/")
@@ -153,6 +158,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "pl${VERSION_PATCH}")
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "mars_nwe-${MARS_NWE_VERSION}")
-SET(CPACK_SOURCE_IGNORE_FILES CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o")
+SET(CPACK_SOURCE_IGNORE_FILES "/build/" "/_build/" CMakeCache.txt CMakeFiles progress.make cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake "\\\\.git" "\\\\.svn" "\\\\.swp$" "\\\\.cvs" "\\\\.tar.gz" "\\\\.o")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${MARS_NWE_VERSION}")
 include(CPack)

cmake/modules/FindDL.cmake

@@ -0,0 +1,40 @@
+# - find where dlopen and friends are located.
+# DL_FOUND - system has dynamic linking interface available
+# DL_INCLUDE_DIR - where dlfcn.h is located.
+# DL_LIBRARY - libraries needed to use dlopen
+
+include(CheckFunctionExists)
+
+find_path(DL_INCLUDE_DIR NAMES dlfcn.h)
+find_library(DL_LIBRARY NAMES dl)
+if(DL_LIBRARY)
+  set(DL_FOUND TRUE)
+else(DL_LIBRARY)
+  check_function_exists(dlopen DL_FOUND)
+  # If dlopen can be found without linking in dl then dlopen is part
+  # of libc, so don't need to link extra libs.
+  set(DL_LIBRARY "")
+endif(DL_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(DL
+    FOUND_VAR
+        DL_FOUND
+    REQUIRED_VARS
+        DL_INCLUDE_DIR
+)
+
+mark_as_advanced(DL_INCLUDE_DIR DL_LIBRARY)
+
+if(DL_FOUND AND NOT TARGET DL::DL)
+    if (DL_LIBRARY)
+        add_library(DL::DL UNKNOWN IMPORTED)
+        set_target_properties(DL::DL PROPERTIES
+            IMPORTED_LOCATION "${DL_LIBRARY}")
+    else()
+        add_library(DL::DL INTERFACE IMPORTED )
+    endif()
+    set_target_properties(DL::DL PROPERTIES
+        INTERFACE_INCLUDE_DIRECTORIES "${DL_INCLUDE_DIR}"
+    )
+endif()

cmake/modules/FindPAM.cmake

@@ -0,0 +1,76 @@
+# - Try to find the PAM libraries
+# Once done this will define
+#
+#  PAM_FOUND - system has pam
+#  PAM_INCLUDE_DIR - the pam include directory
+#  PAM_LIBRARIES - libpam library
+#
+# SPDX-License-Identifier: BSD-3-Clause
+
+if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+	# Already in cache, be silent
+	set(PAM_FIND_QUIETLY TRUE)
+endif (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+
+find_path(PAM_INCLUDE_DIR NAMES security/pam_appl.h pam/pam_appl.h)
+find_library(PAM_LIBRARY pam)
+find_library(DL_LIBRARY dl)
+
+if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+	set(PAM_FOUND TRUE)
+	if (DL_LIBRARY)
+		set(PAM_LIBRARIES ${PAM_LIBRARY} ${DL_LIBRARY})
+	else (DL_LIBRARY)
+		set(PAM_LIBRARIES ${PAM_LIBRARY})
+	endif (DL_LIBRARY)
+
+	if (EXISTS ${PAM_INCLUDE_DIR}/pam/pam_appl.h)
+		# darwin claims to be something special
+		set(HAVE_PAM_PAM_APPL_H 1)
+	endif (EXISTS ${PAM_INCLUDE_DIR}/pam/pam_appl.h)
+
+	if (NOT DEFINED PAM_MESSAGE_CONST)
+		include(CheckCXXSourceCompiles)
+		# XXX does this work with plain c?
+		check_cxx_source_compiles("
+#if ${HAVE_PAM_PAM_APPL_H}+0
+# include <pam/pam_appl.h>
+#else
+# include <security/pam_appl.h>
+#endif
+
+static int PAM_conv(
+	int num_msg,
+	const struct pam_message **msg, /* this is the culprit */
+	struct pam_response **resp,
+	void *ctx)
+{
+	return 0;
+}
+
+int main(void)
+{
+	struct pam_conv PAM_conversation = {
+		&PAM_conv, /* this bombs out if the above does not match */
+		0
+	};
+
+	return 0;
+}
+" PAM_MESSAGE_CONST)
+	endif (NOT DEFINED PAM_MESSAGE_CONST)
+	set(PAM_MESSAGE_CONST ${PAM_MESSAGE_CONST} CACHE BOOL "PAM expects a conversation function with const pam_message")
+
+endif (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+
+if (PAM_FOUND)
+	if (NOT PAM_FIND_QUIETLY)
+		message(STATUS "Found PAM: ${PAM_LIBRARIES}")
+	endif (NOT PAM_FIND_QUIETLY)
+else (PAM_FOUND)
+	if (PAM_FIND_REQUIRED)
+		message(FATAL_ERROR "PAM was not found")
+	endif(PAM_FIND_REQUIRED)
+endif (PAM_FOUND)
+
+mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)