fixed syntax error in pretrans

indimail · May 15, 2024 · 7ca69c4 · 7ca69c4
1 parent 01331be
commit 7ca69c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/daemontools-x/daemontools.spec.in b/daemontools-x/daemontools.spec.in
@@ -1,6 +1,6 @@
 #
 #
-# $Id: daemontools.spec.in,v 1.46 2024-04-12 11:45:16+05:30 Cprogrammer Exp mbhangui $
+# $Id: daemontools.spec.in,v 1.47 2024-05-15 10:51:30+05:30 Cprogrammer Exp mbhangui $
 %undefine _missing_build_ids_terminate_build
 %global _unpackaged_files_terminate_build 1
 
@@ -328,8 +328,10 @@ install -m 0644 ChangeLog        %{buildroot}%{shareddir}/doc/ChangeLog-daemonto
 %pretrans
 %log
 argv1=$1
+if [ -z "$argv1" ] ; then
+  argv1=0
+fi
 if [ "$argv1" = "1" ] ; then
-%if %{undefined suse_version} && %{undefined sles_version}
   %{__mkdir_p} %{logdir}
   for i in svscan resolvconf
   do
@@ -339,7 +341,6 @@ if [ "$argv1" = "1" ] ; then
   %{__mkdir_p} %{buildroot}%{_prefix}/lib/tmpfiles.d
   %{__mkdir_p} %{buildroot}%{_rundir}/svscan
 %endif
-%endif
 fi
 
 log_it "===== Start %{name} installation =====" > /var/log/%{name}-setup.log
@@ -351,7 +352,10 @@ fi
 # create .svscan.down so that we
 # can restore state after upgrade in postinst
 %{_prefix}/bin/svok %{servicedir}/.svscan/log 2>/dev/null
-if [ $? -eq 0 ] ; then
+if [ $? -ne 0 ] ; then
+	log_it "svscan not running"
+	exit 0
+else
   touch %{servicedir}/.svscan.down
   log_it "Giving svscan exactly 5 seconds to exit nicely" >> /var/log/%{name}-setup.log
   if test -f %{_sysconfdir}/init/svscan.conf
@@ -394,11 +398,13 @@ if [ "$argv1" = "1" ] ; then
   /usr/bin/getent group  nofiles  > /dev/null || /usr/sbin/groupadd nofiles  || true
   /usr/bin/getent passwd qmaill   > /dev/null || /usr/sbin/useradd -M -g nofiles  -d %{logdir} -s /sbin/nologin qmaill || true
   if [ ! -d %{logdir} ] ; then
+    %{__mkdir_p} %{buildroot}%{logdir}
     chown qmaill:nofiles %{logdir}
   else
     chown -R qmaill:nofiles %{logdir}
   fi
   ) >> /var/log/%{name}-setup.log 2>&1
+  exit 0
 fi
 
 ### SCRIPTLET ###############################################################################

diff --git a/daemontools-x/doc/ChangeLog b/daemontools-x/doc/ChangeLog
@@ -15,6 +15,8 @@ Release @version@-@release@ Start 05/02/2024 End XX/XX/XXXX
 08. minisvc.in: fix for missing qmail group
 - 09/05/2024
 09. fix discarded-qualifier compiler warnings
+- 15/05/2024
+10. daemontools.spec: fixed syntax error for opensuse
 
 * Sun Mar 03 2024 12:20:15 +0000 Manvendra Bhangui <daemontools@indimail.org> 1.1.4-1.1%{?dist}
 Release 1.1.4-1.1 Start 09/02/2024 End 03/02/2024

diff --git a/daemontools-x/installer.c b/daemontools-x/installer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: installer.c,v 1.27 2024-05-09 22:03:17+05:30 mbhangui Exp mbhangui $
+ * $Id: installer.c,v 1.28 2024-05-12 00:20:03+05:30 mbhangui Exp mbhangui $
  * taken from ezmlm-0.54
  */
 #include <sys/types.h>
@@ -64,7 +64,7 @@ get_octal(mode_t mode)
 }
 
 void
-print_info(const char *str, const char *source, const char *dest, mode_t mode, uid_t uid, gid_t gid, unsigned long size)
+print_info(const char *str, const char *source, const char *dest, int mode, uid_t uid, gid_t gid, unsigned long size)
 {
 	struct passwd  *pw;
 	struct group   *gr;
@@ -290,12 +290,11 @@ doit(stralloc *line, int uninstall, int check)
 {
 	char           *x;
 	char           *type, *uidstr, *gidstr, *modestr, *mid, *name, *zerobuf;
-	int             fdin, fdout, opt;
+	int             fdin, fdout, opt, mode;
 	unsigned long   m, size = 0;
 	unsigned int    xlen, i;
 	uid_t           uid;
 	gid_t           gid;
-	mode_t          mode;
 	dev_t           dev;
 	struct stat     st;
 	struct passwd  *pw;
@@ -455,7 +454,7 @@ doit(stralloc *line, int uninstall, int check)
 	} else
 		gid = -1;
 	if (*modestr) {
-		scan_uint(modestr, &mode);
+		scan_int(modestr, &mode);
 		if (mode != -1) {
 			scan_8long(modestr, &m);
 			mode = (int) m;
@@ -669,14 +668,17 @@ main(int argc, char **argv)
 void
 getversion_installer_c()
 {
-	static const char *x = "$Id: installer.c,v 1.27 2024-05-09 22:03:17+05:30 mbhangui Exp mbhangui $";
+	static const char *x = "$Id: installer.c,v 1.28 2024-05-12 00:20:03+05:30 mbhangui Exp mbhangui $";
 
 	if (x)
 		x++;
 }
 
 /*
  * $Log: installer.c,v $
+ * Revision 1.28  2024-05-12 00:20:03+05:30  mbhangui
+ * fix function prototypes
+ *
  * Revision 1.27  2024-05-09 22:03:17+05:30  mbhangui
  * fix discarded-qualifier compiler warnings
  *