CUPS source distribution fixes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@1494 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 79004781db3aafa70626016014cc36fc6619ab84..f96a6da0f650b874a9ef750e52783396e942ca57 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,15 +3,34 @@ CHANGES.txt - 01/03/2000
 
 CHANGES IN CUPS V1.1.5-2
 
-       - More configure script changes for *BSD.
+       - Fixed configure check for OpenSSL to work with RSA
+         code.
        - Added configure check for <sys/ioctl.h>, and use this
          check in backend/serial.c.
+       - Updated configure script handling of data,
+         configuration, and state directories to use datadir,
+         sysconfdir, and localstatedir variables.
+       - NetBSD uses different serial port filenames than
+         FreeBSD and OpenBSD.
        - The pdftops filter didn't need some X-specific files.
+       - The scheduler makefile doesn't do a chown anymore when
+         installing (cupsd did this automatically on startup
+         anyways)
 
 
 CHANGES IN CUPS V1.1.5-1
 
-       - 
+       - There was a typo in the top-level Makefile
+       - The top-level Makefile did not install an init script
+         for run level 5. 
+       - The configure script did not add the "crypto" library
+         when checking for the OpenSSL library. 
+       - The OKIDATA PPD files were missing. 
+       - The config.h.in file defined the wrong version number. 
+       - The serial backend did not define "funky_hex" under *BSD. 
+       - Updated the Visual C++ project files and some of the
+         CUPS API sources to compile under Windows again. 
+
 
 CHANGES IN CUPS V1.1.5
 

diff --git a/Makedefs.in b/Makedefs.in
index b04a26987c3ca28a254e78cdb3c35cd9beb20d93..f0a74bc85959dce907bbdc7b992f62d373a0bbad 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.31 2000/10/16 23:02:08 mike Exp $"
+# "$Id: Makedefs.in,v 1.32 2001/01/03 17:44:39 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -30,7 +30,6 @@ AR    =       @AR@
 AWK    =       @AWK@
 CC     =       @LIBTOOL@ @CC@
 CHMOD  =       @CHMOD@
-CHOWN  =       @CHOWN@
 CP     =       @CP@
 CXX    =       @LIBTOOL@ @CXX@
 DSO    =       @DSO@
@@ -163,5 +162,5 @@ CAT8EXT             =       @CAT8EXT@
        $(MV) t.z $@
 
 #
-# End of "$Id: Makedefs.in,v 1.31 2000/10/16 23:02:08 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.32 2001/01/03 17:44:39 mike Exp $"
 #

diff --git a/Makefile b/Makefile
index 421c111c63c927c3badf321faeaace1af6fef306..31d0254a1a2b2abcb103440ceab0940290dad555 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.27 2000/12/21 13:45:21 mike Exp $"
+# "$Id: Makefile,v 1.28 2001/01/03 17:44:40 mike Exp $"
 #
 #   Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -75,7 +75,7 @@ install:
        echo Installing in templates...
        (cd templates; $(MAKE) $(MFLAGS) install)
        echo Installing startup script...
-       if test "x$INITDIR" != "x"; then \
+       if test "x$(INITDIR)" != "x"; then \
                $(MKDIR) $(prefix)/$(INITDIR)/init.d; \
                $(RM) $(prefix)/$(INITDIR)/init.d/cups; \
                $(INSTALL_SCRIPT) cups.sh $(prefix)/$(INITDIR)/init.d/cups; \
@@ -123,5 +123,5 @@ tardist:
        epm $(EPMFLAGS) -f tardist cups
 
 #
-# End of "$Id: Makefile,v 1.27 2000/12/21 13:45:21 mike Exp $".
+# End of "$Id: Makefile,v 1.28 2001/01/03 17:44:40 mike Exp $".
 #

diff --git a/backend/serial.c b/backend/serial.c
index 906c5588ad695f0bc68e1d3b4d7508de60cf9877..fa4482f7b29861b9150c71905df1839ba9d05022 100644 (file)
--- a/backend/serial.c
+++ b/backend/serial.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: serial.c,v 1.26 2001/01/03 16:10:28 mike Exp $"
+ * "$Id: serial.c,v 1.27 2001/01/03 17:44:40 mike Exp $"
  *
  *   Serial port backend for the Common UNIX Printing System (CUPS).
  *
@@ -484,10 +484,10 @@ main(int  argc,           /* I - Number of command-line arguments (6 or 7) */
 void
 list_devices(void)
 {
-#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#if defined(__hpux) || defined(__sgi) || defined(__sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
   static char  *funky_hex = "0123456789abcdefghijklmnopqrstuvwxyz";
                                /* Funky hex numbering used for some devices */
-#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
+#endif /* __hpux || __sgi || __sun || __FreeBSD__ || __OpenBSD__ */
 
 #ifdef __linux
   int  i;              /* Looping var */
@@ -718,7 +718,7 @@ list_devices(void)
       printf("serial serial:%s?baud=38400 \"Unknown\" \"Serial Port #%d\"\n",
              device, i + 1);
   }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
   int  i, j;           /* Looping vars */
   int  fd;             /* File descriptor */
   char device[255];    /* Device filename */
@@ -800,10 +800,47 @@ list_devices(void)
              device, i + 1);
     }
   }
++#elif defined(__NetBSD__)
+  int  i, j;           /* Looping vars */
+  int  fd;             /* File descriptor */
+  char device[255];    /* Device filename */
+
+
+ /*
+  * Standard serial ports...
+  */
+
+  for (i = 0; i < 4; i ++)
+  {
+    sprintf(device, "/dev/tty%02d", i);
+    if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+    {
+      close(fd);
+      printf("serial serial:%s?baud=115200 \"Unknown\" \"Serial Port #%d\"\n",
+             device, i + 1);
+    }
+  }
+
+ /*
+  * Cyclades-Z ports...
+  */
+
+  for (i = 0; i < 16; i ++) /* Should be up to 65536 boards... */
+    for (j = 0; j < 64; j ++)
+    {
+      sprintf(device, "/dev/ttyCZ%02d%02d", i, j);
+      if ((fd = open(device, O_WRONLY | O_NOCTTY | O_NDELAY)) >= 0)
+      {
+       close(fd);
+       printf("serial serial:%s?baud=115200 \"Unknown\" \"Cyclades #%d Serial Prt #%d\"\n",
+              device, i, j + 1);
+      }
+    }
+
 #endif
 }
 
 
 /*
- * End of "$Id: serial.c,v 1.26 2001/01/03 16:10:28 mike Exp $".
+ * End of "$Id: serial.c,v 1.27 2001/01/03 17:44:40 mike Exp $".
  */

diff --git a/configure.in b/configure.in
index 1cf4b35c22d7c8faa8f55ed1a2afde3aa0bd267e..4618d24ef37d342d98412cb2c5c02aa93e5e6d42 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: configure.in,v 1.64 2001/01/03 16:10:27 mike Exp $"
+dnl "$Id: configure.in,v 1.65 2001/01/03 17:44:40 mike Exp $"
 dnl
 dnl   Configuration script for the Common UNIX Printing System (CUPS).
 dnl
@@ -200,11 +200,26 @@ if test "$enable_ssl" = "yes"; then
        dnl included...
        SAVELIBS="$LIBS"
 
-       LIBS="-lcrypto $LIBS"
-       AC_CHECK_LIB(ssl,SSL_new,
-               SSLLIBS="-lssl -lcrypto"
-               AC_DEFINE(HAVE_LIBSSL)
-       )
+       dnl Some ELF systems can't resolve all the symbols in libcrypto
+       dnl if libcrypto was linked against RSAREF, and fail to link the
+       dnl test program correctly, even though a correct installation
+       dnl of OpenSSL exists.  So we test the linking three times in
+       dnl case the RSAREF libraries are needed.
+
+       for libcrypto in \
+               "-lcrypto" \
+               "-lcrypto -lrsaref" \
+               "-lcrypto -lRSAglue -lrsaref"
+       do
+               AC_CHECK_LIB(ssl,SSL_new,
+                       [SSLLIBS="-lssl $libcrypto"
+                        AC_DEFINE(HAVE_LIBSSL)],,
+                       $libcrypto
+               )
+               if test "x${SSLLIBS}" != "x"; then
+                       break
+               fi
+       done
 
        LIBS="$SAVELIBS"
 fi
@@ -396,7 +411,7 @@ if test "$datadir" = "\${prefix}/share"; then
                datadir="/usr/share"
        else
                datadir="$prefix/share"
-        fi
+       fi
 fi
 
 dnl Fix "includedir" variable if it hasn't been specified...
@@ -519,13 +534,13 @@ AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)
 
 dnl Setup default locations...
-CUPS_SERVERROOT='${prefix}/etc/cups'
-CUPS_LOGDIR='${prefix}/var/log/cups'
-CUPS_REQUESTS='${prefix}/var/spool/cups'
+CUPS_SERVERROOT='${sysconfdif}/cups'
+CUPS_LOGDIR='${localstatedir}/log/cups'
+CUPS_REQUESTS='${localstatedir}/spool/cups'
 
-AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$prefix/etc/cups")
-AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$prefix/var/log/cups")
-AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$prefix/var/spool/cups")
+AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$sysconfdir/cups")
+AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$localstatedir/log/cups")
+AC_DEFINE_UNQUOTED(CUPS_REQUESTS, "$localstatedir/spool/cups")
 
 dnl See what directory to put server executables...
 case "$uname" in
@@ -552,8 +567,8 @@ AC_SUBST(CUPS_REQUESTS)
 dnl Set the CUPS_LOCALE directory...
 case "$uname" in
        Linux* | FreeBSD* | NetBSD* | OpenBSD*)
-               CUPS_LOCALEDIR='${exec_prefix}/share/locale'
-               AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$exec_prefix/share/locale")
+               CUPS_LOCALEDIR='${datadir}/locale'
+               AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$datadir/locale")
                ;;
 
        OSF1*)
@@ -571,13 +586,13 @@ esac
 AC_SUBST(CUPS_LOCALEDIR)
 
 dnl Set the CUPS_DATADIR directory...
-CUPS_DATADIR='${exec_prefix}/share/cups'
-AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$exec_prefix/share/cups")
+CUPS_DATADIR='${datadir}/cups'
+AC_DEFINE_UNQUOTED(CUPS_DATADIR, "$datadir/cups")
 AC_SUBST(CUPS_DATADIR)
 
 dnl Set the CUPS_DOCROOT directory...
-CUPS_DOCROOT='${exec_prefix}/share/doc/cups'
-AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$exec_prefix/share/doc/cups")
+CUPS_DOCROOT='${datadir}/doc/cups'
+AC_DEFINE_UNQUOTED(CUPS_DOCROOT, "$datadir/doc/cups")
 AC_SUBST(CUPS_DOCROOT)
 
 dnl Set the CUPS_FONTPATH directory...
@@ -586,5 +601,5 @@ AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$fontpath")
 AC_OUTPUT(Makedefs cups.sh)
 
 dnl
-dnl End of "$Id: configure.in,v 1.64 2001/01/03 16:10:27 mike Exp $".
+dnl End of "$Id: configure.in,v 1.65 2001/01/03 17:44:40 mike Exp $".
 dnl

diff --git a/scheduler/Makefile b/scheduler/Makefile
index e0989dbe3f22afe7ef1cc49a8f4d922ebeacb8bf..a94d01c80bc10a4b5126061a37c3db5786442cc0 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.33 2000/12/18 21:38:58 mike Exp $"
+# "$Id: Makefile,v 1.34 2001/01/03 17:44:42 mike Exp $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -69,10 +69,8 @@ install:
        $(CHMOD) ugo+rx $(LOGDIR)
        -$(MKDIR) $(REQUESTS)
        $(CHMOD) u+rwx,go-rwx $(REQUESTS)
-       $(CHOWN) lp $(REQUESTS)
        -$(MKDIR) $(REQUESTS)/tmp
        $(CHMOD) u+rwx,go-rwx,+t $(REQUESTS)/tmp
-       $(CHOWN) lp $(REQUESTS)/tmp
 
 
 #
@@ -151,5 +149,5 @@ $(OBJS):    ../config.h ../Makedefs
 
 
 #
-# End of "$Id: Makefile,v 1.33 2000/12/18 21:38:58 mike Exp $".
+# End of "$Id: Makefile,v 1.34 2001/01/03 17:44:42 mike Exp $".
 #