[Raw Msg Headers][Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Examining my "cvs diff"...



I have a few fairy simple and fairy obvious (?) diffs.

1. "gzip" in rotate-logs.sh should rather use complete path
2. Smtpserver's Makefile should not ever need @GETPWLIB@
3. Mailbox's Makefile may need @GENLIB@
4. Solaris 7 has gethostid() that conflicts with gethostid() in dotlock.c

Index: configure.in
===================================================================
RCS file: /cvsroot/zmailer/configure.in,v
retrieving revision 1.80
diff -u -r1.80 configure.in
--- configure.in        2000/03/24 11:59:15     1.80
+++ configure.in        2000/05/10 18:12:26
@@ -109,6 +109,7 @@
 AC_PATH_PROG(RM, rm, rm)dnl
 AC_PATH_PROG(TRUE, true, true)dnl
 AC_PATH_PROG(PERL, perl, perl)dnl
+AC_PATH_PROG(GZIP, gzip, gzip)dnl
 AC_SUBST(LIBPROGS)dnl
 
 AC_SUBST(CPPDEP)
Index: utils/rotate-logs.sh.in
===================================================================
RCS file: /cvsroot/zmailer/utils/rotate-logs.sh.in,v
retrieving revision 1.1
diff -u -r1.1 rotate-logs.sh.in
--- utils/rotate-logs.sh.in     1998/06/05 19:05:32     1.1
+++ utils/rotate-logs.sh.in     2000/05/10 18:12:33
@@ -37,5 +37,5 @@
 sleep 1800
 
 # Compress the newly separated log files
-gzip *.0
+@GZIP@ *.0
 
Index: smtpserver/Makefile.in
===================================================================
RCS file: /cvsroot/zmailer/smtpserver/Makefile.in,v
retrieving revision 1.23
diff -u -r1.23 Makefile.in
--- smtpserver/Makefile.in      2000/02/12 01:25:08     1.23
+++ smtpserver/Makefile.in      2000/05/10 18:12:29
@@ -17,7 +17,7 @@
 DEFS=          @DEFS@
 INSTALL=       @INSTALL@
 SMTPSERVER_INCL= @GENINCL@ @INCLRESOLV@ @INCLWRAP@ @INCLWHOSON@ @OPENSSLINCL@
-SMTPSERVER_LIB=         @GENLIB@ @GETPWLIB@ @LIBLOCALDBMS@ @LIBWRAP@
@LIBWHOSON@ @LIBRESOLV@ @OPENSSLLIB@ @AUTHLIB@ @LIBSOCKET@
+SMTPSERVER_LIB=         @GENLIB@ @LIBLOCALDBMS@ @LIBWRAP@ @LIBWHOSON@
@LIBRESOLV@ @OPENSSLLIB@ @AUTHLIB@ @LIBSOCKET@
 #  old vestiges: @LIBLOADAVER@
 #
 #   Above the  LIBSOCKET (for SysVR4) must be last
Index: transports/mailbox/Makefile.in
===================================================================
RCS file: /cvsroot/zmailer/transports/mailbox/Makefile.in,v
retrieving revision 1.17
diff -u -r1.17 Makefile.in
--- transports/mailbox/Makefile.in      1999/12/23 21:54:25     1.17
+++ transports/mailbox/Makefile.in      2000/05/10 18:12:30
@@ -16,7 +16,7 @@
 DEFS=          @DEFS@
 INSTALL=       @INSTALL@
 MAILBOX_INCL=  @GENINCL@
-MAILBOX_LIB=   @GETPWLIB@ @LIBMAIL@ @LIBRESOLV@ @LIBSOCKET@ $(LIBMALLOC)
+MAILBOX_LIB=   @GENLIB@ @GETPWLIB@ @LIBMAIL@ @LIBRESOLV@ @LIBSOCKET@
$(LIBMALLOC)
 
 # Compile & install time: 'make privatembox="private/"'
 privatembox=   @PRIVATEMBOX@
Index: transports/mailbox/dotlock.c
===================================================================
RCS file: /cvsroot/zmailer/transports/mailbox/dotlock.c,v
retrieving revision 1.3
diff -u -r1.3 dotlock.c
--- transports/mailbox/dotlock.c        2000/03/24 12:51:00     1.3
+++ transports/mailbox/dotlock.c        2000/05/10 18:30:43
@@ -34,8 +34,8 @@
 #if defined(sun) && defined(__svr4__)
 #include <sys/systeminfo.h>
 
-static int gethostid __((void));
-static int gethostid()
+static int xgethostid __((void));
+static int xgethostid()
 {
        char buf[1024];
 
@@ -56,8 +56,8 @@
 #define _INCLUDE_HPUX_SOURCE
 #include <sys/utsname.h>
 
-static long gethostid __((void));
-static long gethostid()
+static long xgethostid __((void));
+static long xgethostid()
 {
         struct utsname uts;
 
@@ -82,7 +82,7 @@
 
        sprintf(lockname, "%s.lock", file);
        sprintf(temp, "%s.L%x.%lx.%x",
-               file, (int)getpid(), (long)time(NULL), (int)gethostid());
+               file, (int)getpid(), (long)time(NULL), (int)xgethostid());
        unlink(temp);
        for (;;) {
                if ((fd = open(temp, O_WRONLY|O_CREAT|O_EXCL, 0666)) < 0)
---