Fixes for Solaris

mbhangui · mbhangui · commit 30a98398d092 · 2026-03-25T22:59:18.000+05:30
diff --git a/catChangeLog b/catChangeLog
@@ -132,6 +132,7 @@ flag=0
 nonewline=0
 bullet=0
 highlights=0
+[ -x /usr/xpg4/bin/grep ] && grep="/usr/xpg4/bin/grep" || grep="/usr/bin/grep"
 exec 0<$file
 while read line
 do
@@ -167,13 +168,13 @@ do
 		flag=2
 		continue
 	fi
-	echo $line | grep -E "^o " > /dev/null
+	echo $line | $grep -E "^o " > /dev/null
 	if [ $? -eq 0 ] ; then
 		bullet=1
 	else
 		bullet=0
 	fi
-	echo "$line" |grep -E "^[0-9]|^[0-9][0-9]|^[0-9][0-9][0-9]" > /dev/null
+	echo "$line" |$grep -E "^[0-9]|^[0-9][0-9]|^[0-9][0-9][0-9]" > /dev/null
 	if [ $? -eq 0 ] ; then
 		if [ $option -eq 2 -a $nonewline -eq 1 ] ; then
 			echo
diff --git a/daemontools-x/Makefile.SUNOS b/daemontools-x/Makefile.SUNOS
diff --git a/daemontools-x/Makevars.SUNOS b/daemontools-x/Makevars.SUNOS
@@ -0,0 +1,16 @@
+prefix = $(shell head -1 conf-prefix 2>/dev/null)
+qmaildir = $(shell head -1 conf-qmail 2>/dev/null)
+mandir = $(shell [ -d "`head -1 conf-prefix`"/man ] && echo "`head -1 conf-prefix`/man" || echo "`head -1 conf-prefix`/share/man")
+shareddir = $(shell head -1 conf-shared 2>/dev/null)
+qsysconfdir = $(shell head -1 conf-sysconfdir 2>/dev/null)
+libexecdir = $(shell head -1 conf-libexec 2>/dev/null)
+servicedir = $(shell head -1 conf-servicedir 2>/dev/null)
+version  = $(shell cat conf-version)
+release = $(shell cat conf-release 2>/dev/null ||echo "1.1")
+ucspitcp_version = $(shell [ -f ../ucspi-tcp-x/conf-version ] && cat ../ucspi-tcp-x/conf-version || echo "1.0")
+DATE = $(shell date)
+HOST = $(shell echo "`uname -m`-pc-`uname -s`-`uname -o|cut -d/ -f1`"|tr "[:upper:]" "[:lower:]")
+logdir = $(shell cat conf-logdir)
+bash = $(shell [ -f /usr/local/bin/bash ] && echo "/usr/local/bin/bash" || echo "/bin/bash")
+SYSTEM = $(shell uname -s | tr "[:lower:]" "[:upper:]")
+email = $(shell cat conf-email)
diff --git a/daemontools-x/conf-cc-SUNOS b/daemontools-x/conf-cc-SUNOS
@@ -0,0 +1 @@
+-Wimplicit -fno-strict-aliasing -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-align -Wwrite-strings
diff --git a/daemontools-x/conf-ld-SUNOS b/daemontools-x/conf-ld-SUNOS
@@ -0,0 +1 @@
+-L/usr/lib/64
diff --git a/daemontools-x/default.configure b/daemontools-x/default.configure
@@ -4,7 +4,7 @@ if [ ! -f conf-release ] ; then
 fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
-	Linux)
+	Linux|SunOS)
 	sed 's{PREFIX{/usr{'                            conf-prefix.in     > conf-prefix
 	sed 's{QMAIL{/var/indimail{'                    conf-qmail.in      > conf-qmail
 	sed 's{SYSCONFDIR{/etc/indimail{'               conf-sysconfdir.in > conf-sysconfdir
diff --git a/daemontools-x/doc/ChangeLog b/daemontools-x/doc/ChangeLog
@@ -19,6 +19,8 @@ Release @version@-@release@ Start 08/01/2026 End --/--/----
     into background
 - 24/02/2026
 12. svscan.c: set SV_PWD for main process
+- 25/03/2026
+13. Fixes for Solaris
 
 * Thu Dec 18 2025 11:46:14 +0000 Manvendra Bhangui <daemontools@indimail.org 1.1.7-1.1%{?dist}
 Release 1.1.7-1.1 Start 27/12/2024 End 18/12/2025
diff --git a/daemontools-x/installer.c b/daemontools-x/installer.c
@@ -1,8 +1,11 @@
 /*
- * $Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $
+ * $Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $
  * taken from ezmlm-0.54
  */
 #include <sys/types.h>
+#ifdef SUNOS
+#include <sys/mkdev.h>
+#endif
 #if defined(linux)
 #include <sys/sysmacros.h>
 #endif
@@ -703,14 +706,17 @@ main(int argc, char **argv)
 void
 getversion_installer_c()
 {
-	static const char *x = "$Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $";
+	static const char *x = "$Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $";
 
 	if (x)
 		x++;
 }
 
 /*
  * $Log: installer.c,v $
+ * Revision 1.31  2026-03-25 22:32:16+05:30  Cprogrammer
+ * fix compilation on Solaris
+ *
  * Revision 1.30  2025-02-23 13:17:10+05:30  Cprogrammer
  * fix SIGSEGV
  *
diff --git a/indimail-mta-x/installer.c b/indimail-mta-x/installer.c
@@ -1,8 +1,11 @@
 /*
- * $Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $
+ * $Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $
  * taken from ezmlm-0.54
  */
 #include <sys/types.h>
+#ifdef SUNOS
+#include <sys/mkdev.h>
+#endif
 #if defined(linux)
 #include <sys/sysmacros.h>
 #endif
@@ -703,14 +706,17 @@ main(int argc, char **argv)
 void
 getversion_installer_c()
 {
-	static const char *x = "$Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $";
+	static const char *x = "$Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $";
 
 	if (x)
 		x++;
 }
 
 /*
  * $Log: installer.c,v $
+ * Revision 1.31  2026-03-25 22:32:16+05:30  Cprogrammer
+ * fix compilation on Solaris
+ *
  * Revision 1.30  2025-02-23 13:17:10+05:30  Cprogrammer
  * fix SIGSEGV
  *
diff --git a/ucspi-tcp-x/Makevars.SUNOS b/ucspi-tcp-x/Makevars.SUNOS
@@ -0,0 +1,11 @@
+prefix      = $(shell head -1 conf-prefix 2>/dev/null)
+mandir      = $(shell [ -d $(prefix)/man ] && echo $(prefix)/man || echo $(prefix)/share/man)
+shareddir   = $(shell head -1 conf-shared 2>/dev/null)
+libexecdir  = $(shell head -1 conf-libexec 2>/dev/null)
+qsysconfdir = $(shell head -1 conf-sysconfdir 2>/dev/null)
+servicedir  = $(shell head -1 conf-servicedir 2>/dev/null)
+DEFS        = $(shell uname -s | tr "[:lower:]" "[:upper:]")
+SYSTEM      = $(shell uname -s | tr "[:lower:]" "[:upper:]")
+version     = $(shell cat conf-version)
+release     = $(shell cat conf-release 2>/dev/null ||echo "1.1")
+email       = $(shell cat conf-email)
diff --git a/ucspi-tcp-x/conf-cc-SUNOS b/ucspi-tcp-x/conf-cc-SUNOS
@@ -0,0 +1 @@
+-Wimplicit -fno-strict-aliasing -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-align -Wwrite-strings
diff --git a/ucspi-tcp-x/conf-ld-SUNOS b/ucspi-tcp-x/conf-ld-SUNOS
@@ -0,0 +1 @@
+-L/usr/lib/64
diff --git a/ucspi-tcp-x/default.configure b/ucspi-tcp-x/default.configure
@@ -4,7 +4,7 @@ if [ ! -f conf-release ] ; then
 fi
 SYSTEM=$(uname -s)
 case "$SYSTEM" in
-	Linux)
+	Linux|SunOS)
 	sed 's{PREFIX{/usr{'                            conf-prefix.in     > conf-prefix
 	sed 's{SYSCONFDIR{/etc/indimail{'               conf-sysconfdir.in > conf-sysconfdir
 	sed 's{SHAREDDIR{/usr/share/indimail{'          conf-shared.in     > conf-shared
diff --git a/ucspi-tcp-x/doc/ChangeLog b/ucspi-tcp-x/doc/ChangeLog
@@ -15,6 +15,8 @@ Release @version@-@release@ Start 05/09/2024 End 18/12/2025
 14. Fix errors when using GCC14
 - 23/02/2025
 15. installer.c: Fix SEGSEGV
+- 25/03/2025
+16. Fixes for Solaris
 
 * Tue Aug 06 2024 12:44:32 +0000 Manvendra Bhangui <ucspi-tcp@indimail.org> 1.1.4-1.1%{?dist}
 Release 1.1.4-1.1 Start 08/02/2024 End 06/08/2024
diff --git a/ucspi-tcp-x/installer.c b/ucspi-tcp-x/installer.c
@@ -1,8 +1,11 @@
 /*
- * $Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $
+ * $Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $
  * taken from ezmlm-0.54
  */
 #include <sys/types.h>
+#ifdef SUNOS
+#include <sys/mkdev.h>
+#endif
 #if defined(linux)
 #include <sys/sysmacros.h>
 #endif
@@ -703,14 +706,17 @@ main(int argc, char **argv)
 void
 getversion_installer_c()
 {
-	static const char *x = "$Id: installer.c,v 1.30 2025-02-23 13:17:10+05:30 Cprogrammer Exp mbhangui $";
+	static const char *x = "$Id: installer.c,v 1.31 2026-03-25 22:32:16+05:30 Cprogrammer Exp mbhangui $";
 
 	if (x)
 		x++;
 }
 
 /*
  * $Log: installer.c,v $
+ * Revision 1.31  2026-03-25 22:32:16+05:30  Cprogrammer
+ * fix compilation on Solaris
+ *
  * Revision 1.30  2025-02-23 13:17:10+05:30  Cprogrammer
  * fix SIGSEGV
  *
diff --git a/ucspi-tcp-x/load_shared.c b/ucspi-tcp-x/load_shared.c
@@ -1,5 +1,8 @@
 /*
  * $Log: load_shared.c,v $
+ * Revision 1.21  2026-03-25 22:47:48+05:30  Cprogrammer
+ * fix for Solaris
+ *
  * Revision 1.20  2024-05-09 22:55:54+05:30  mbhangui
  * fix discarded-qualifier compiler warnings
  *
@@ -68,6 +71,9 @@
 #include "dlnamespace.h"
 #endif
 #include <dlfcn.h>
+#ifdef SUNOS
+#include <link.h>
+#endif
 #include <unistd.h>
 #include <strerr.h>
 #include <str.h>
@@ -194,7 +200,7 @@ load_shared(char *file, char **argv, char **envp)
 void
 getversion_load_shared_c()
 {
-	const char     *x = "$Id: load_shared.c,v 1.20 2024-05-09 22:55:54+05:30 mbhangui Exp mbhangui $";
+	const char     *x = "$Id: load_shared.c,v 1.21 2026-03-25 22:47:48+05:30 Cprogrammer Exp mbhangui $";
 	if (x)
 		x++;
 }
diff --git a/ucspi-tcp-x/tcpserver_plugin.c b/ucspi-tcp-x/tcpserver_plugin.c
@@ -1,5 +1,8 @@
 /*
  *  $Log: tcpserver_plugin.c,v $
+ *  Revision 1.18  2026-03-25 22:47:57+05:30  Cprogrammer
+ *  fix for Solaris
+ *
  *  Revision 1.17  2024-05-09 22:55:54+05:30  mbhangui
  *  fix discarded-qualifier compiler warnings
  *
@@ -62,6 +65,9 @@
 #include "dlnamespace.h"
 #endif
 #include <dlfcn.h>
+#ifdef SUNOS
+#include <link.h>
+#endif
 #include <unistd.h>
 #include "stralloc.h"
 #include <strerr.h>
@@ -203,6 +209,6 @@ tcpserver_plugin(char **envp)
 void
 getversion_tcpserver_plugin_c()
 {
-	const char    *x = "$Id: tcpserver_plugin.c,v 1.17 2024-05-09 22:55:54+05:30 mbhangui Exp mbhangui $";
+	const char    *x = "$Id: tcpserver_plugin.c,v 1.18 2026-03-25 22:47:57+05:30 Cprogrammer Exp mbhangui $";
 	x++;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+-Wimplicit -fno-strict-aliasing -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-align -Wwrite-strings`