Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 disk/autofs/DEPENDS                                                |   23 
+++-
 disk/autofs/DETAILS                                                |   16 +-
 disk/autofs/HISTORY                                                |   13 ++
 disk/autofs/INSTALL                                                |   12 --
 disk/autofs/PRE_BUILD                                              |    3 
 disk/autofs/patches/0001-Fix-build-against-musl.patch              |   56 
++++++++++
 disk/autofs/patches/0002-Fix-zero-key_thread_attempt_id-case.patch |   13 ++
 disk/autofs/patches/0003-Replace-__S_IEXEC-with-S_IXUSR.patch      |   51 
+++++++++
 8 files changed, 161 insertions(+), 26 deletions(-)

New commits:
commit 68ef24e069f9ff7a3e9991235617d0e285f062df
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    autofs: Remove editing of kmod config files
    
    It isn't the job of this spell to deal with the autofs driver.

commit bd7f33b5d682984b798d51a905d15472be8a5cbc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    autofs 5.1.7

diff --git a/disk/autofs/DEPENDS b/disk/autofs/DEPENDS
index 415b388..7074278 100755
--- a/disk/autofs/DEPENDS
+++ b/disk/autofs/DEPENDS
@@ -1,4 +1,19 @@
-optional_depends  openldap            \
-                  "--with-openldap"    \
-                  "--without-openldap" \
-                  "for ldap support"
+case "$HOST" in
+  (*-musl)
+    depends libtirpc --with-libtirpc
+    ;;
+  (*)
+    optional_depends libtirpc \
+                    --{with,without}-libtirpc \
+                    'use instead of the RPC implementation in the libc'
+    ;;
+esac &&
+optional_depends LIBSASL \
+                --{with,without}-sasl \
+                'for SASL support for LDAP maps' &&
+optional_depends openldap \
+                --{with,without}-openldap \
+                 'for LDAP map support' &&
+optional_depends systemd \
+                --{with,without}-systemd \
+                'for Systemd support'
diff --git a/disk/autofs/DETAILS b/disk/autofs/DETAILS
index 06f2a1e..0d93667 100755
--- a/disk/autofs/DETAILS
+++ b/disk/autofs/DETAILS
@@ -1,16 +1,12 @@
            SPELL=autofs
-         VERSION=4.1.4
-          SOURCE=$SPELL-$VERSION.tar.bz2
-        SOURCE2=${SOURCE}.sign
+         VERSION=5.1.7
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$KERNEL_URL/pub/linux/daemons/$SPELL/v4/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.kernel.org/pub/linux/daemons/$SPELL/v4/$SOURCE
-  SOURCE2_URL[0]=$KERNEL_URL/pub/linux/daemons/$SPELL/v4/$SOURCE2
-  SOURCE2_URL[1]=ftp://ftp.kernel.org/pub/linux/daemons/$SPELL/v4/$SOURCE2
-  SOURCE2_IGNORE=signature
-      SOURCE_GPG="kernel.gpg:$SOURCE2"
+   
SOURCE_URL[0]="$KERNEL_URL/pub/linux/daemons/$SPELL/v${VERSION%%.*}/$SOURCE"
+   
SOURCE_URL[1]="ftp://ftp.kernel.org/pub/linux/daemons/$SPELL/v${VERSION%%.*}/$SOURCE";
+     
SOURCE_HASH=sha512:cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
+        WEB_SITE="https://www.kernel.org/pub/linux/daemons/autofs/";
          ENTERED=20020220
-         UPDATED=20031119
       LICENSE[0]=GPL
         KEYWORDS="daemons disk"
            SHORT="kernel automounter userspace daemons"
diff --git a/disk/autofs/HISTORY b/disk/autofs/HISTORY
index c06f72b..95a7888 100644
--- a/disk/autofs/HISTORY
+++ b/disk/autofs/HISTORY
@@ -1,3 +1,16 @@
+2021-05-03 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: converted to hash checking
+         added WEB_SITE
+         updated spell to 5.1.7
+       * PRE_BUILD, patches/0001-Fix-build-against-musl.patch,
+         patches/0002-Fix-zero-key_thread_attempt_id-case.patch,
+         patches/0003-Replace-__S_IEXEC-with-S_IXUSR.patch:
+         fixed build against musl
+       * DEPENDS: added optional dependency on systemd
+         added optional dependency on libtirpc
+         added optional dependency on LIBSASL
+       * INSTALL: removed editing of kmod config files
+
 2008-02-06 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: removed mktemp (deprecated), is a part
          of coreutils now (which included in basesystem)
diff --git a/disk/autofs/INSTALL b/disk/autofs/INSTALL
index 9f862b4..78f8b0b 100755
--- a/disk/autofs/INSTALL
+++ b/disk/autofs/INSTALL
@@ -1,17 +1,5 @@
 default_install  &&
 
-if  [  !  -f   /etc/modules.d/autofs  ];  then
-  mkdir   -p   /etc/modules.d                 &&
-  cp           $SCRIPT_DIRECTORY/modules.d/*  \
-               /etc/modules.d
-fi  &&
-
-MOD="/etc/modules.conf"               &&
-INC="include  /etc/modules.d/autofs"  &&
-
-grep    -q  "$INC"      $MOD  ||
-echo        "$INC"  >>  $MOD  &&
-
 # together with disabling the samples subdir, we should now
 # _not_ delete the admin's config on every cast
 for  FILE  in  auto.home auto.master auto.misc
diff --git a/disk/autofs/PRE_BUILD b/disk/autofs/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/disk/autofs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/disk/autofs/patches/0001-Fix-build-against-musl.patch 
b/disk/autofs/patches/0001-Fix-build-against-musl.patch
new file mode 100644
index 0000000..af0c9a4
--- /dev/null
+++ b/disk/autofs/patches/0001-Fix-build-against-musl.patch
@@ -0,0 +1,56 @@
+Subject: [PATCH 1/3] Fix build against musl
+
+--- a/lib/nss_parse.y
++++ b/lib/nss_parse.y
+@@ -28,6 +28,10 @@
+ #include "nsswitch.h"
+ #include "nss_parse.tab.h"
+ 
++#ifndef _PATH_NSSWITCH_CONF
++#define _PATH_NSSWITCH_CONF     "/etc/nsswitch.conf"
++#endif
++
+ static pthread_mutex_t parse_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+ static struct list_head *nss_list;
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -40,6 +40,14 @@
+ #include <sys/vfs.h>
+ #include <sys/utsname.h>
+ 
++#ifndef __SWORD_TYPE
++# if __WORDSIZE == 32  /* System word size */
++#  define __SWORD_TYPE int
++# else /* __WORDSIZE == 64 */
++#  define __SWORD_TYPE long int
++# endif
++#endif
++
+ #include "automount.h"
+ #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
+ #include <dlfcn.h>
+--- a/include/log.h
++++ b/include/log.h
+@@ -16,6 +16,7 @@
+ 
+ #ifndef LOG_H
+ #define LOG_H
++#include <sys/types.h> /* for pid_t */
+ 
+ /* Define logging functions */
+ 
+--- a/include/hash.h
++++ b/include/hash.h
+@@ -5,6 +5,11 @@
+ 
+ #include <sys/types.h>
+ #include <stdint.h>
++#include <linux/stddef.h>
++
++#ifndef __GLIBC__
++#include <sys/reg.h>
++#endif
+ 
+ /*
+  * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and
diff --git 
a/disk/autofs/patches/0002-Fix-zero-key_thread_attempt_id-case.patch 
b/disk/autofs/patches/0002-Fix-zero-key_thread_attempt_id-case.patch
new file mode 100644
index 0000000..4bf61db
--- /dev/null
+++ b/disk/autofs/patches/0002-Fix-zero-key_thread_attempt_id-case.patch
@@ -0,0 +1,13 @@
+Subject: [PATCH 2/3] Fix zero key_thread_attempt_id case
+
+--- a/lib/log.c
++++ b/lib/log.c
+@@ -38,7 +38,7 @@
+       char buffer[ATTEMPT_ID_SIZE + 1];
+       char *prefixed_msg = NULL;
+ 
+-      attempt_id = pthread_getspecific(key_thread_attempt_id);
++      attempt_id = key_thread_attempt_id ? 
pthread_getspecific(key_thread_attempt_id) : 0;
+       if (attempt_id) {
+               int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+ 
diff --git a/disk/autofs/patches/0003-Replace-__S_IEXEC-with-S_IXUSR.patch 
b/disk/autofs/patches/0003-Replace-__S_IEXEC-with-S_IXUSR.patch
new file mode 100644
index 0000000..b3d828c
--- /dev/null
+++ b/disk/autofs/patches/0003-Replace-__S_IEXEC-with-S_IXUSR.patch
@@ -0,0 +1,51 @@
+Subject: [PATCH 3/3] Replace __S_IEXEC with S_IXUSR
+
+--- a/daemon/lookup.c
++++ b/daemon/lookup.c
+@@ -397,7 +397,7 @@
+               return NSS_STATUS_NOTFOUND;
+       }
+ 
+-      if (st.st_mode & __S_IEXEC)
++      if (st.st_mode & S_IXUSR)
+               type = src_prog;
+       else
+               type = src_file;
+@@ -930,7 +930,7 @@
+               return NSS_STATUS_NOTFOUND;
+       }
+ 
+-      if (st.st_mode & __S_IEXEC)
++      if (st.st_mode & S_IXUSR)
+               type = src_prog;
+       else
+               type = src_file;
+@@ -1077,7 +1077,7 @@
+       if (!S_ISREG(st.st_mode))
+               return NULL;
+ 
+-      if (st.st_mode & __S_IEXEC)
++      if (st.st_mode & S_IXUSR)
+               type = "program";
+       else
+               type = "file";
+--- a/modules/lookup_multi.c
++++ b/modules/lookup_multi.c
+@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char 
*format, int argc, const ch
+                               continue;
+                       }
+ 
+-                      if (st.st_mode & __S_IEXEC)
++                      if (st.st_mode & S_IXUSR)
+                               type = src_prog;
+                       else
+                               type = src_file;
+@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt,
+                                       continue;
+                               }
+ 
+-                              if (st.st_mode & __S_IEXEC)
++                              if (st.st_mode & S_IXUSR)
+                                       type = src_prog;
+                               else
+                                       type = src_file;