Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 net/connman/DETAILS        |    1 
 net/connman/HISTORY        |    4 +++
 net/connman/init.d/connman |    2 +
 net/dnsmasq/BUILD          |   18 ++++++++++++---
 net/dnsmasq/CONFIGURE      |   52 
++++++++++++++++++++++++++++++++++++++-------
 net/dnsmasq/DEPENDS        |   47 +++++++++++++++++++++++++++++++++++-----
 net/dnsmasq/DETAILS        |   13 +++++------
 net/dnsmasq/HISTORY        |    4 +++
 net/dnsmasq/INSTALL        |   10 +++++---
 net/dnsmasq/init.d/dnsmasq |    6 -----
 10 files changed, 122 insertions(+), 35 deletions(-)

New commits:
commit 57f233ccdfab88bc02e82f1f65373a7b38079cf9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    dnsmasq: => 2.90

commit 2ef51a42f3238beff6c708bc4c998ea1ecdc514f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    connman: source sys config for init script

diff --git a/net/connman/DETAILS b/net/connman/DETAILS
index 2af2fa2..891d201 100755
--- a/net/connman/DETAILS
+++ b/net/connman/DETAILS
@@ -12,6 +12,7 @@ if [ "${CONNMAN_BRANCH}" == "scm" ]; then
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
 else
          VERSION=1.41
+      PATCHLEVEL=1
           SOURCE=${SPELL}-${VERSION}.tar.xz
    SOURCE_URL[0]=https://www.kernel.org/pub/linux/network/${SPELL}/${SOURCE}
      
SOURCE_HASH=sha512:b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d
diff --git a/net/connman/HISTORY b/net/connman/HISTORY
index 1488393..a02df702 100644
--- a/net/connman/HISTORY
+++ b/net/connman/HISTORY
@@ -1,3 +1,7 @@
+2024-09-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * init.d/connman: source sys config
+
 2022-08-08 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.41 (stable)
        * DEPENDS: added new dependencies
diff --git a/net/connman/init.d/connman b/net/connman/init.d/connman
index 692a429..d978c85 100755
--- a/net/connman/init.d/connman
+++ b/net/connman/init.d/connman
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. /etc/sysconfig/connman
+
 PROGRAM=/usr/sbin/connmand
 PROGRAM_VPND=/usr/sbin/connman-vpnd
 ARGS="$CONNMAND_ARGS"
diff --git a/net/dnsmasq/BUILD b/net/dnsmasq/BUILD
index 59bb137..79a8884 100755
--- a/net/dnsmasq/BUILD
+++ b/net/dnsmasq/BUILD
@@ -1,5 +1,15 @@
-COPTS="$COPTS  $DNSMASQ_RTC $DNSMASQ_TFTP $DNSMASQ_DHCP $DNSMASQ_SCRIPT"
-make COPTS="$OPTS $COPTS" &&
+if [[ "${DNSMASQ_RTC}" == y ]]; then
+  OPTS="-DHAVE_BROKEN_RTC ${OPTS}"
+fi &&
+
+if [[ "${DNSMASQ_NO_ID}" == y ]]; then
+  OPTS="-DNO_ID ${OPTS}"
+fi &&
+
+local i18_target &&
+
 if is_depends_enabled $SPELL gettext; then
-  make all-i18n
-fi
+  i18_target="all-i18n"
+fi &&
+
+make COPTS="${DNSMASQ_OPTS} ${OPTS}" CFLAGS="${CFLAGS}" 
PREFIX="${INSTALL_ROOT}/usr" $i18n_target
diff --git a/net/dnsmasq/CONFIGURE b/net/dnsmasq/CONFIGURE
index c30d83d..c0c8995 100755
--- a/net/dnsmasq/CONFIGURE
+++ b/net/dnsmasq/CONFIGURE
@@ -1,13 +1,49 @@
 message "Dnsmasq can use uptime instead of RTC for timing, enable this when" 
&&
 message "your RTC is broken or if your leasefiles are on a flash filesystem" 
&&
-config_query_option DNSMASQ_RTC "Use uptime instead of RTC for timing?" \
-                    n "-DHAVE_BROKEN_RTC" "" &&
+config_query DNSMASQ_RTC "Use uptime instead of RTC for timing?" n &&
 
-config_query_option DNSMASQ_TFTP "Enable the built-in TFTP server?" \
-                    y "-DHAVE_TFTP" "-DNO_TFTP" &&
+config_query DNSMASQ_NO_ID "Don't report *.bind CHAOS info to clients, 
forward such requests upstream instead?" n &&
 
-config_query_option DNSMASQ_DHCP "Enable the built-in DHCP server?" \
-                    y "-DHAVE_DHCP" "-DNO_DHCP" &&
+config_query_option DNSMASQ_OPTS "Enable authoritative DNS server support?" 
y \
+                                 "-DHAVE_AUTH" \
+                                 "-DNO_AUTH" &&
 
-config_query_option DNSMASQ_SCRIPT "Enable script actions on lease changes?" 
\
-                    y "-DHAVE_SCRIPT" "-DNO_SCRIPT"
+config_query_option DNSMASQ_OPTS "Enable ipset support?" y \
+                                 "-DHAVE_IPSET" \
+                                 "-DNO_IPSET" &&
+
+# backporting legacy options
+for o in DNSMASQ_TFTP DNSMASQ_DHCP DNSMASQ_SCRIPT; do
+  if [[ -n ${!o} ]]; then
+    list_add "DNSMASQ_OPTS" "${!o}"
+    persistent_remove ${o}
+  fi
+done &&
+
+config_query_option DNSMASQ_OPTS "Enable the built-in TFTP server?" y \
+                                 "-DHAVE_TFTP" \
+                                 "-DNO_TFTP" &&
+
+config_query_option DNSMASQ_OPTS "Enable the built-in DHCPv4 server?" y \
+                                 "-DHAVE_DHCP" \
+                                 "-DNO_DHCP" &&
+
+config_query_option DNSMASQ_OPTS "Enable the built-in DHCPv6 server?" y \
+                                 "-DHAVE_DHCP6" \
+                                 "-DNO_DHCP6" &&
+
+config_query_option DNSMASQ_OPTS "Enable script actions on lease changes?" y 
\
+                                 "-DHAVE_SCRIPT" \
+                                 "-DNO_SCRIPT" &&
+
+config_query_option DNSMASQ_OPTS "Enable dumpfile packet debugging?" y \
+                                 "-DHAVE_DUMPFILE" \
+                                 "-DNO_DUMPFILE" &&
+
+config_query_option DNSMASQ_OPTS "Enable DNS forwarding loop probe and 
removal?" y \
+                                 "-DHAVE_LOOP" \
+                                 "-DNO_LOOP" &&
+
+config_query_option DNSMASQ_OPTS "Enable inotify support for config files?" 
n \
+                                 "-DHAVE_INOTIFY" \
+                                 "-DNO_INOTIFY"
diff --git a/net/dnsmasq/DEPENDS b/net/dnsmasq/DEPENDS
index 131fa49..4fd9c2d 100755
--- a/net/dnsmasq/DEPENDS
+++ b/net/dnsmasq/DEPENDS
@@ -1,7 +1,42 @@
-depends gawk      &&
-depends gmp       &&
 depends PKG-CONFIG &&
-optional_depends dbus     "-DHAVE_DBUS" "" "DBus configuration support" &&
-optional_depends GETTEXT  "" "" "for i18n support" &&
-optional_depends libidn   "-DHAVE_IDN" "" "IDN support" &&
-optional_depends nettle   "-DHAVE_DNSSEC" "" "crypto support"
+
+optional_depends dbus \
+                 "-DHAVE_DBUS" \
+                 "" \
+                 "for DBus interface support" &&
+
+optional_depends libidn \
+                 "-DHAVE_IDN" \
+                 "" \
+                 "for international domain name 2003 support" &&
+
+optional_depends libidn2 \
+                 "-DHAVE_LIBIDN2" \
+                 "" \
+                 "for international domain name 2008 support" &&
+
+optional_depends libnetfilter_conntrack \
+                 "-DHAVE_CONNTRACK" \
+                 "" \
+                 "for conntrack support" &&
+
+optional_depends LUA \
+                 "-DHAVE_LUASCRIPT" \
+                 "" \
+                 "for Lua scripting support" &&
+
+optional_depends nettle \
+                 "-DHAVE_DNSSEC" \
+                 "" \
+                 "for DNSSEC validator support" &&
+
+if is_depends_enabled $SPELL nettle; then
+  depends gmp
+fi &&
+
+optional_depends nftables \
+                 "-DHAVE_NFTSET" \
+                 "" \
+                 "for nftset support" &&
+
+optional_depends gettext "" "" "for i18n support"
diff --git a/net/dnsmasq/DETAILS b/net/dnsmasq/DETAILS
index 42a41b2..f244ce5 100755
--- a/net/dnsmasq/DETAILS
+++ b/net/dnsmasq/DETAILS
@@ -1,17 +1,16 @@
            SPELL=dnsmasq
-         VERSION=2.86
-  STAGED_INSTALL='off'
+         VERSION=2.90
+  SECURITY_PATCH=6
           SOURCE=$SPELL-$VERSION.tar.xz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.thekelleys.org.uk/dnsmasq/$SOURCE
          SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=https://thekelleys.org.uk/dnsmasq/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
       SOURCE_GPG=kelly.gpg:$SOURCE.asc:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
-  SECURITY_PATCH=5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       LICENSE[0]=GPL
-        WEB_SITE=http://www.thekelleys.org.uk/dnsmasq/doc.html
-        KEYWORDS="net"
+        WEB_SITE=https://thekelleys.org.uk/dnsmasq/doc.html
+        KEYWORDS="net dns"
          ENTERED=20020225
            SHORT="Lightweight, easy to configure DNS forwarder and DHCP 
server"
 
diff --git a/net/dnsmasq/HISTORY b/net/dnsmasq/HISTORY
index cc79477..e0d5ec6 100644
--- a/net/dnsmasq/HISTORY
+++ b/net/dnsmasq/HISTORY
@@ -1,3 +1,7 @@
+2024-09-11 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 2.90; SECURITY_PATCH++
+       * DEPENDS, BUILD, INSTALL, CONFIGURE: rewritten dependencies and 
options, added missing
+
 2022-07-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: switch to PKG-CONFIG provider (automated)
 
diff --git a/net/dnsmasq/INSTALL b/net/dnsmasq/INSTALL
index 621a382..c9db06c 100755
--- a/net/dnsmasq/INSTALL
+++ b/net/dnsmasq/INSTALL
@@ -1,7 +1,9 @@
-if ! is_depends_enabled $SPELL gettext; then
-    make AWK=gawk PREFIX=/usr install
-else
-    make AWK=gawk PREFIX=/usr install-i18n
+local i18n_target &&
+
+if is_depends_enabled $SPELL gettext; then
+   i18n_target="install-i18n"
 fi &&
 
+make COPTS="${DNSMASQ_OPTS} ${OPTS}" CFLAGS="${CFLAGS}" 
PREFIX="${INSTALL_ROOT}/usr" install ${i18n_target} &&
+
 install_config_file dnsmasq.conf.example "$INSTALL_ROOT/etc/dnsmasq.conf"
diff --git a/net/dnsmasq/init.d/dnsmasq b/net/dnsmasq/init.d/dnsmasq
index e9cf437..8dd69c1 100644
--- a/net/dnsmasq/init.d/dnsmasq
+++ b/net/dnsmasq/init.d/dnsmasq
@@ -5,9 +5,3 @@ RUNLEVEL=3
 NEEDS="+remote_fs +network"
 
 . /etc/init.d/smgl_init
-
-restart()
-{
-  run_func stop
-  run_func start
-}