-CHANGES.txt - 2.0b1 - 2013-09-10
+CHANGES.txt - 2.0b1 - 2013-10-18
--------------------------------
CHANGES IN CUPS V2.0b1
- Added support for regular expression matching in the MIME type rules
(<rdar://problem/11131245>)
+ - Dropped support for AIX, HP-UX, and OSF/1 (aka Digital UNIX)
#
# "$Id$"
#
-# Top-level Makefile for CUPS.
+# Top-level Makefile for CUPS.
#
-# Copyright 2007-2013 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include Makedefs
EPMFLAGS = -v --output-dir dist $(EPMARCH)
-aix bsd deb depot inst pkg setld slackware swinstall tardist:
+bsd deb pkg slackware tardist:
epm $(EPMFLAGS) -f $@ cups packaging/cups.list
epm:
/*
* "$Id$"
*
- * Common backend network APIs for CUPS.
+ * Common backend network APIs for CUPS.
*
- * Copyright 2007-2011 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file. If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file. If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- * backendCheckSideChannel() - Check the side-channel for pending requests.
- * backendNetworkSideCB() - Handle common network side-channel commands.
+ * This file is subject to the Apple OS-Developed Software exception.
*/
/*
#include "backend-private.h"
#include <limits.h>
-#ifdef __hpux
-# include <sys/time.h>
-#else
-# include <sys/select.h>
-#endif /* __hpux */
+#include <sys/select.h>
/*
/*
* "$Id$"
*
- * Common run loop APIs for CUPS backends.
+ * Common run loop APIs for CUPS backends.
*
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file. If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file. If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- * backendDrainOutput() - Drain pending print data to the device.
- * backendRunLoop() - Read and write print and back-channel data.
- * backendWaitLoop() - Wait for input from stdin while handling
- * side-channel queries.
+ * This file is subject to the Apple OS-Developed Software exception.
*/
/*
#include "backend-private.h"
#include <limits.h>
-#ifdef __hpux
-# include <sys/time.h>
-#else
-# include <sys/select.h>
-#endif /* __hpux */
+#include <sys/select.h>
/*
/*
* "$Id$"
*
- * USB port backend for CUPS.
+ * USB port backend for CUPS.
*
- * This file is included from "usb.c" when compiled on UNIX/Linux.
+ * This file is included from "usb.c" when compiled on UNIX/Linux.
*
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * "LICENSE" which should have been included with this file. If this
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file. If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- * print_device() - Print a file to a USB device.
- * list_devices() - List all USB devices.
- * open_device() - Open a USB device...
- * side_cb() - Handle side-channel requests...
+ * This file is subject to the Apple OS-Developed Software exception.
*/
/*
close(fd);
}
}
-#elif defined(__hpux)
-#elif defined(__osf)
#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
int i; /* Looping var */
char device[255]; /* Device filename */
/*
* "$Id$"
*
- * "lpq" command for CUPS.
+ * "lpq" command for CUPS.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * main() - Parse options and commands.
- * show_jobs() - Show jobs.
- * show_printer() - Show printer status.
- * usage() - Show program usage.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
/*
ipp_jstate_t jobstate; /* job-state */
int jobid, /* job-id */
jobsize, /* job-k-octets */
-#ifdef __osf__
- jobpriority, /* job-priority */
-#endif /* __osf__ */
jobcount, /* Number of jobs */
jobcopies, /* Number of copies */
rank; /* Rank of job */
jobid = 0;
jobsize = 0;
-#ifdef __osf__
- jobpriority = 50;
-#endif /* __osf__ */
jobstate = IPP_JOB_PENDING;
jobname = "unknown";
jobuser = "unknown";
attr->value_tag == IPP_TAG_INTEGER)
jobsize = attr->values[0].integer;
-#ifdef __osf__
- if (!strcmp(attr->name, "job-priority") &&
- attr->value_tag == IPP_TAG_INTEGER)
- jobpriority = attr->values[0].integer;
-#endif /* __osf__ */
-
if (!strcmp(attr->name, "job-state") &&
attr->value_tag == IPP_TAG_ENUM)
jobstate = (ipp_jstate_t)attr->values[0].integer;
}
if (!longstatus && jobcount == 0)
-#ifdef __osf__
- _cupsLangPuts(stdout,
- /* TRANSLATORS: Pri is job priority. */
- _("Rank Owner Pri Job Files"
- " Total Size"));
-#else
_cupsLangPuts(stdout,
_("Rank Owner Job File(s)"
" Total Size"));
-#endif /* __osf__ */
jobcount ++;
namestr, 1024.0 * jobsize);
}
else
-#ifdef __osf__
- _cupsLangPrintf(stdout,
- _("%-6s %-10.10s %-4d %-10d %-27.27s %.0f bytes"),
- rankstr, jobuser, jobpriority, jobid, jobname,
- 1024.0 * jobsize);
-#else
_cupsLangPrintf(stdout,
_("%-7s %-7.7s %-7d %-31.31s %.0f bytes"),
rankstr, jobuser, jobid, jobname, 1024.0 * jobsize);
-#endif /* __osf */
if (attr == NULL)
break;
#
# "$Id$"
#
-# CGI makefile for CUPS.
+# CGI makefile for CUPS.
#
-# Copyright 2007-2012 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
clean:
$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
- $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib
+ $(RM) libcupscgi.so libcupscgi.dylib
#
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
- if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \
+ if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \
$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
fi
$(RM) $(LIBDIR)/libcupscgi.1.dylib
$(RM) $(LIBDIR)/libcupscgi.a
$(RM) $(LIBDIR)/libcupscgi.dylib
- $(RM) $(LIBDIR)/libcupscgi_s.a
- $(RM) $(LIBDIR)/libcupscgi.sl
- $(RM) $(LIBDIR)/libcupscgi.sl.1
$(RM) $(LIBDIR)/libcupscgi.so
$(RM) $(LIBDIR)/libcupscgi.so.1
-$(RMDIR) $(LIBDIR)
#
-# libcupscgi.so.1, libcupscgi.sl.1
+# libcupscgi.so.1
#
-libcupscgi.so.1 libcupscgi.sl.1: $(LIBOBJS)
+libcupscgi.so.1: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
$(RM) `basename $@ .1`
$(LN) $@ libcupscgi.dylib
-#
-# libcupscgi_s.a
-#
-
-libcupscgi_s.a: $(LIBOBJS)
- echo Creating $@...
- $(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcupscgi_s.o
-
-
#
# libcupscgi.la
#
dnl
dnl "$Id$"
dnl
-dnl Common configuration stuff for CUPS.
+dnl Common configuration stuff for CUPS.
dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl We need at least autoconf 2.60...
AC_CHECK_HEADER(string.h,AC_DEFINE(HAVE_STRING_H))
AC_CHECK_HEADER(strings.h,AC_DEFINE(HAVE_STRINGS_H))
AC_CHECK_HEADER(bstring.h,AC_DEFINE(HAVE_BSTRING_H))
-AC_CHECK_HEADER(usersec.h,AC_DEFINE(HAVE_USERSEC_H))
AC_CHECK_HEADER(sys/ioctl.h,AC_DEFINE(HAVE_SYS_IOCTL_H))
AC_CHECK_HEADER(sys/param.h,AC_DEFINE(HAVE_SYS_PARAM_H))
AC_CHECK_HEADER(sys/ucred.h,AC_DEFINE(HAVE_SYS_UCRED_H))
-AC_CHECK_HEADER(scsi/sg.h,AC_DEFINE(HAVE_SCSI_SG_H))
dnl Checks for iconv.h and iconv_open
AC_CHECK_HEADER(iconv.h,
dnl
dnl "$Id$"
dnl
-dnl Compiler stuff for CUPS.
+dnl Compiler stuff for CUPS.
dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Clear the debugging and non-shared library options unless the user asks
fi
# Generate position-independent code as needed...
- if test $PICFLAG = 1 -a $uname != AIX; then
+ if test $PICFLAG = 1; then
OPTIM="-fPIC $OPTIM"
fi
else
# Add vendor-specific compiler options...
case $uname in
- AIX*)
- if test -z "$OPTIM"; then
- if test "x$with_optim" = x; then
- OPTIM="-O2 -qmaxmem=6000"
- else
- OPTIM="$with_optim $OPTIM"
- fi
- fi
- ;;
- HP-UX*)
- if test -z "$OPTIM"; then
- if test "x$with_optim" = x; then
- OPTIM="+O2"
- else
- OPTIM="$with_optim $OPTIM"
- fi
- fi
-
- CFLAGS="-Ae $CFLAGS"
-
- if test $PICFLAG = 1; then
- OPTIM="+z $OPTIM"
- fi
- ;;
- OSF*)
- # Tru64 UNIX aka Digital UNIX aka OSF/1
- if test -z "$OPTIM"; then
- if test "x$with_optim" = x; then
- OPTIM="-O"
- else
- OPTIM="$with_optim"
- fi
- fi
- ;;
SunOS*)
# Solaris
if test -z "$OPTIM"; then
fi
fi
- if test $PICFLAG = 1; then
- OPTIM="-KPIC $OPTIM"
- fi
- ;;
- UNIX_SVR*)
- # UnixWare
- if test -z "$OPTIM"; then
- if test "x$with_optim" = x; then
- OPTIM="-O"
- else
- OPTIM="$with_optim $OPTIM"
- fi
- fi
-
if test $PICFLAG = 1; then
OPTIM="-KPIC $OPTIM"
fi
# Add general compiler options per platform...
case $uname in
- HP-UX*)
- # HP-UX 10.20 (at least) needs this definition to get the
- # h_errno global...
- OPTIM="$OPTIM -D_XOPEN_SOURCE_EXTENDED"
-
- # HP-UX 11.00 (at least) needs this definition to get the
- # u_short type used by the IP headers...
- OPTIM="$OPTIM -D_INCLUDE_HPUX_SOURCE"
-
- # HP-UX 11.23 (at least) needs this definition to get the
- # IPv6 header to work...
- OPTIM="$OPTIM -D_HPUX_SOURCE"
- ;;
-
Linux*)
# glibc 2.8 and higher breaks peer credentials unless you
# define _GNU_SOURCE...
OPTIM="$OPTIM -D_GNU_SOURCE"
;;
-
- OSF*)
- # Tru64 UNIX aka Digital UNIX aka OSF/1 need to be told
- # to be POSIX-compliant...
- OPTIM="$OPTIM -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_OSF_SOURCE"
- ;;
esac
dnl
dnl
dnl "$Id$"
dnl
-dnl Directory stuff for CUPS.
+dnl Directory stuff for CUPS.
dnl
-dnl Copyright 2007-2013 by Apple Inc.
-dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_PREFIX_DEFAULT(/)
libdir="$exec_prefix/lib64"
fi
;;
- HP-UX*)
- if test -d /usr/lib/hpux32; then
- libdir="$exec_prefix/lib/hpux32"
- fi
- ;;
esac
fi
if test x$rcdir = x; then
case "$uname" in
- AIX*)
- INITDIR="/etc/rc.d"
- ;;
-
Darwin*)
# Darwin and MacOS X...
if test -x /sbin/launchd; then
# FreeBSD and OpenBSD
;;
- HP-UX*)
- INITDIR="/sbin"
- RCLEVELS="2"
- RCSTART="380"
- RCSTOP="620"
- ;;
-
Linux | GNU | GNU/k*BSD*)
# Linux/HURD seems to choose an init.d directory at random...
if test -d /sbin/init.d; then
INITDDIR="/etc/rc.d"
;;
- OSF1*)
- INITDIR="/sbin"
- ;;
-
SunOS*)
# Solaris
if test "x$smfmanifestdir" != x; then
CUPS_LOCALEDIR="$datarootdir/locale"
;;
- OSF1* | AIX*)
- CUPS_LOCALEDIR="$exec_prefix/lib/nls/msg"
- ;;
-
*)
# This is the standard System V location...
CUPS_LOCALEDIR="$exec_prefix/lib/locale"
dnl
dnl "$Id$"
dnl
-dnl Manpage stuff for CUPS.
+dnl Manpage stuff for CUPS.
dnl
-dnl Copyright 2007-2012 by Apple Inc.
-dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2006 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
dnl Fix "mandir" variable...
if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/"; then
case "$uname" in
- Darwin* | Linux | GNU | *BSD* | AIX*)
- # Darwin, MacOS X, Linux, GNU HURD, *BSD, and AIX
+ Darwin* | Linux | GNU | *BSD*)
+ # Darwin, MacOS X, Linux, GNU HURD, and *BSD
mandir="/usr/share/man"
AMANDIR="/usr/share/man"
PMANDIR="/usr/share/man"
dnl Setup manpage extensions...
case "$uname" in
- SunOS* | HP-UX*)
- # Solaris and HP-UX
+ SunOS*)
+ # Solaris
MAN1EXT=1
MAN5EXT=5
MAN7EXT=7
dnl
dnl PAM stuff for CUPS.
dnl
-dnl Copyright 2007-2012 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
AC_ARG_ENABLE(pam, [ --disable-pam disable PAM support])
AC_ARG_WITH(pam_module, [ --with-pam-module specify the PAM module to use])
-dnl Don't use PAM with AIX...
-if test $uname = AIX; then
- enable_pam=no
-fi
-
PAMDIR=""
PAMFILE="pam.std"
PAMLIBS=""
dnl
dnl "$Id$"
dnl
-dnl Shared library support for CUPS.
+dnl Shared library support for CUPS.
dnl
-dnl Copyright 2007-2012 by Apple Inc.
-dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2013 by Apple Inc.
+dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
dnl
-dnl These coded instructions, statements, and computer programs are the
-dnl property of Apple Inc. and are protected by Federal copyright
-dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl which should have been included with this file. If this file is
-dnl file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law. Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file. If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
PICFLAG=1
DSOXX="\$(CXX)"
DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
;;
- UNIX_S*)
- LIBCUPS="lib$cupsbase.so.2"
- LIBCUPSCGI="libcupscgi.so.1"
- LIBCUPSIMAGE="libcupsimage.so.2"
- LIBCUPSMIME="libcupsmime.so.1"
- LIBCUPSPPDC="libcupsppdc.so.1"
- DSO="\$(CC)"
- DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -Wl,-h,\`basename \$@\` -G \$(OPTIM)"
- ;;
- HP-UX*)
- case "$uarch" in
- ia64)
- LIBCUPS="lib$cupsbase.so.2"
- LIBCUPSCGI="libcupscgi.so.1"
- LIBCUPSIMAGE="libcupsimage.so.2"
- LIBCUPSMIME="libcupsmime.so.1"
- LIBCUPSPPDC="libcupsppdc.so.1"
- DSO="\$(CC)"
- DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -Wl,-b,-z,+h,\`basename \$@\`"
- ;;
- *)
- LIBCUPS="lib$cupsbase.sl.2"
- LIBCUPSCGI="libcupscgi.sl.1"
- LIBCUPSIMAGE="libcupsimage.sl.2"
- LIBCUPSMIME="libcupsmime.sl.1"
- LIBCUPSPPDC="libcupsppdc.sl.1"
- DSO="\$(LD)"
- DSOXX="\$(LD)"
- DSOFLAGS="$DSOFLAGS -b -z +h \`basename \$@\`"
- ;;
- esac
- ;;
- IRIX)
- LIBCUPS="lib$cupsbase.so.2"
- LIBCUPSCGI="libcupscgi.so.1"
- LIBCUPSIMAGE="libcupsimage.so.2"
- LIBCUPSMIME="libcupsmime.so.1"
- LIBCUPSPPDC="libcupsppdc.so.1"
- DSO="\$(CC)"
- DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
- ;;
- OSF1* | Linux | GNU | *BSD*)
+ Linux | GNU | *BSD*)
LIBCUPS="lib$cupsbase.so.2"
LIBCUPSCGI="libcupscgi.so.1"
LIBCUPSIMAGE="libcupsimage.so.2"
DSOXX="\$(CXX)"
DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc"
;;
- AIX*)
- LIBCUPS="lib${cupsbase}_s.a"
- LIBCUPSBASE="${cupsbase}_s"
- LIBCUPSCGI="libcupscgi_s.a"
- LIBCUPSIMAGE="libcupsimage_s.a"
- LIBCUPSMIME="libcupsmime_s.a"
- LIBCUPSPPDC="libcupsppdc_s.a"
- DSO="\$(CC)"
- DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
- ;;
*)
echo "Warning: shared libraries may not be supported. Trying -shared"
echo " option with compiler."
EXTLINKCUPS="-lcups"
EXTLINKCUPSIMAGE="-lcupsimage"
else
- if test $uname = AIX; then
- LINKCUPS="-l${cupsbase}_s"
- LINKCUPSIMAGE="-lcupsimage_s"
-
- EXTLINKCUPS="-lcups_s"
- EXTLINKCUPSIMAGE="-lcupsimage_s"
- else
- LINKCUPS="-l${cupsbase}"
- LINKCUPSIMAGE="-lcupsimage"
+ LINKCUPS="-l${cupsbase}"
+ LINKCUPSIMAGE="-lcupsimage"
- EXTLINKCUPS="-lcups"
- EXTLINKCUPSIMAGE="-lcupsimage"
- fi
+ EXTLINKCUPS="-lcups"
+ EXTLINKCUPSIMAGE="-lcupsimage"
fi
AC_SUBST(EXTLINKCUPS)
# need this option, even when the library is installed in a
# standard location...
case $uname in
- HP-UX*)
- # HP-UX needs the path, even for /usr/lib...
- case "$uarch" in
- ia64)
- DSOFLAGS="-Wl,+s,+b,$libdir $DSOFLAGS"
- ;;
- *)
- DSOFLAGS="+s +b $libdir $DSOFLAGS"
- ;;
- esac
- LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
- EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
- ;;
SunOS*)
# Solaris...
if test $exec_prefix != /usr; then
/*
* "$Id$"
*
- * Configuration file for CUPS.
+ * Configuration file for CUPS.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_CONFIG_H_
#undef HAVE_STRUCT_SOCKADDR_SA_LEN
-/*
- * Do we have the AIX usersec.h header file?
- */
-
-#undef HAVE_USERSEC_H
-
-
/*
* Do we have pthread support?
*/
#
# "$Id$"
#
-# API library Makefile for CUPS.
+# API library Makefile for CUPS.
#
-# Copyright 2007-2013 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2006 by Easy Software Products, all rights reserved.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
-# This file is subject to the Apple OS-Developed Software exception.
+# This file is subject to the Apple OS-Developed Software exception.
#
include ../Makedefs
clean:
$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
- $(RM) libcups.so libcups.sl libcups.dylib
+ $(RM) libcups.so libcups.dylib
#
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
- if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
+ if test $(LIBCUPS) = "libcups.so.2"; then \
$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
fi
$(RM) $(LIBDIR)/libcups.2.dylib
$(RM) $(LIBDIR)/$(LIBCUPSSTATIC)
$(RM) $(LIBDIR)/libcups.dylib
- $(RM) $(LIBDIR)/libcups_s.a
- $(RM) $(LIBDIR)/libcups.sl
- $(RM) $(LIBDIR)/libcups.sl.2
$(RM) $(LIBDIR)/libcups.so
$(RM) $(LIBDIR)/libcups.so.2
-$(RMDIR) $(LIBDIR)
#
-# libcups.so.2, libcups.sl.2
+# libcups.so.2
#
-libcups.so.2 libcups.sl.2: $(LIBOBJS)
+libcups.so.2: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
$(LN) $@ libcups.dylib
-#
-# libcups_s.a
-#
-
-libcups_s.a: $(LIBOBJS) libcups_s.exp
- echo Creating $@...
- $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o \
- $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- $(COMMONLIBS) $(LIBZ)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcups_s.o
-
-
#
# libcups.la
#
# ifndef HAVE_HSTRERROR
extern const char *_cups_hstrerror(int error);
# define hstrerror _cups_hstrerror
-# elif defined(_AIX) || defined(__osf__)
-/*
- * AIX and Tru64 UNIX don't provide a prototype but do provide the function...
- */
-extern const char *hstrerror(int error);
# endif /* !HAVE_HSTRERROR */
# define s6_addr32 _S6_un._S6_u32
# elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__)
# define s6_addr32 __u6_addr.__u6_addr32
-# elif defined(__osf__)
-# define s6_addr32 s6_un.sa6_laddr
# elif defined(WIN32)
/*
* Windows only defines byte and 16-bit word members of the union and
+++ /dev/null
-_cups_debug_fd
-_cupsBufferGet
-_cupsBufferRelease
-_cupsGet1284Values
-_cupsGetDests
-_cupsGetPassword
-_cupsGlobals
-_cupsLangPrintError
-_cupsLangPrintf
-_cupsLangPuts
-_cupsLangString
-_cupsMD5Append
-_cupsMD5Finish
-_cupsMD5Init
-_cupsMessageFree
-_cupsMessageLoad
-_cupsMessageLookup
-_cupsNextDelay
-_cupsSetError
-_cupsSetLocale
-_cupsSNMPClose
-_cupsSNMPCopyOID
-_cupsSNMPDefaultCommunity
-_cupsSNMPIsOID
-_cupsSNMPIsOIDPrefixed
-_cupsSNMPOIDToString
-_cupsSNMPOpen
-_cupsSNMPRead
-_cupsSNMPSetDebug
-_cupsSNMPStringToOID
-_cupsSNMPWalk
-_cupsSNMPWrite
-_cupsStrAlloc
-_cupsStrFlush
-_cupsStrFormatd
-_cupsStrFree
-_cupsStrRetain
-_cupsStrScand
-_cupsStrStatistics
-_cups_getifaddrs
-_cups_freeifaddrs
-_cups_strcpy
-_cups_strlcat
-_cups_strlcpy
-_httpAddrPort
-_httpAddrSetPort
-_httpAssembleUUID
-_httpBIOMethods
-_httpCreate
-_httpEncodeURI
-_httpPeek
-_httpResolveURI
-_httpSetTimeout
-_httpWait
-_ippFindOption
-_ppdFreeLanguages
-_ppdGetEncoding
-_ppdGetLanguages
-_ppdHashName
-_ppdLocalizedAttr
-_ppdNormalizeMakeAndModel
-_ppdOpen
-_ppdOpenFile
-_ppdParseOptions
-_pwgCreateWithFile
-_pwgDestroy
-_pwgWriteFile
-_pwgGenerateSize
-_pwgInitSize
-_pwgMediaForLegacy
-_pwgMediaForPPD
-_pwgMediaForPWG
-_pwgMediaForSize
-_pwgCreateWithPPD
-_pwgGetBin
-_pwgGetInputSlot
-_pwgGetMediaType
-_pwgGetOutputBin
-_pwgGetPageSize
-_pwgGetSize
-_pwgGetSource
-_pwgGetType
-_pwgInputSlotForSource
-_pwgMediaTypeForType
-_pwgPageSizeForMedia
/*
* "$Id$"
*
- * Side-channel API code for CUPS.
+ * Side-channel API code for CUPS.
*
- * Copyright 2007-2012 by Apple Inc.
- * Copyright 2006 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2006 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
- * This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- * cupsSideChannelDoRequest() - Send a side-channel command to a backend and
- * wait for a response.
- * cupsSideChannelRead() - Read a side-channel message.
- * cupsSideChannelSNMPGet() - Query a SNMP OID's value.
- * cupsSideChannelSNMPWalk() - Query multiple SNMP OID values.
- * cupsSideChannelWrite() - Write a side-channel message.
+ * This file is subject to the Apple OS-Developed Software exception.
*/
/*
#else
# include <unistd.h>
#endif /* WIN32 */
-#ifdef __hpux
-# include <sys/time.h>
-#elif !defined(WIN32)
-# include <sys/select.h>
-#endif /* __hpux */
#ifndef WIN32
+# include <sys/select.h>
# include <sys/time.h>
#endif /* !WIN32 */
#ifdef HAVE_POLL
<UL>
- <LI>AIX, Linux, Solaris:
+ <LI>Linux, Solaris:
<PRE CLASS="command">
/etc/init.d/cups restart
</PRE></LI>
- <LI>HP-UX:
- <PRE CLASS="command">
-/sbin/init.d/cups restart
- </PRE></LI>
-
- <LI>MacOS X:
+ <LI>Mac OS X:
<PRE CLASS="command">
sudo launchctl unload /System/Library/LaunchDaemons/org.cups.cupsd.plist
sudo launchctl load /System/Library/LaunchDaemons/org.cups.cupsd.plist
<TH>Target</TH>
<TH>Type of Package</TH>
</TR>
-<TR>
- <TD>aix</TD>
- <TD>AIX installp</TD>
-</TR>
<TR>
<TD>bsd</TD>
<TD>*BSD pkg_install</TD>
<TD>deb</TD>
<TD>Debian dpkg</TD>
</TR>
-<TR>
- <TD>depot</TD>
- <TD>HP-UX swinstall</TD>
-</TR>
<TR>
<TD>epm</TD>
<TD>Portable tarball with install script</TD>
<TD>rpm</TD>
<TD>RPM binary</TD>
</TR>
-<TR>
- <TD>setld</TD>
- <TD>Tru64 UNIX setld</TD>
-</TR>
<TR>
<TD>slackware</TD>
<TD>Slackware install</TD>
</TR>
-<TR>
- <TD>swinstall</TD>
- <TD>HP-UX swinstall</TD>
-</TR>
</TABLE></DIV>
<P>Finally, the <VAR>tools/testrpm</VAR> and <VAR>tools/testosx</VAR> scripts can be used to create binary packages from the current working copy for testing on Linux and OS X, respectively:</P>
#
# "$Id$"
#
-# Makefile for the CUPS PPD Compiler.
+# Makefile for the CUPS PPD Compiler.
#
-# Copyright 2007-2012 by Apple Inc.
-# Copyright 2002-2006 by Easy Software Products.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 2002-2006 by Easy Software Products.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
#
$(RM) $(TARGETS) $(UNITTARGETS)
$(RM) -r ppd ppd2
$(RM) sample-import.drv sample.c test.drv
- $(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
+ $(RM) libcupsppdc.so libcupsppdc.dylib
#
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
- if test $(LIBCUPSPPDC) = "libcupsppdc.so.1" -o $(LIBCUPSPPDC) = "libcupsppdc.sl.1"; then \
+ if test $(LIBCUPSPPDC) = "libcupsppdc.so.1"; then \
$(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
$(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
fi
$(RM) $(LIBDIR)/libcupsppdc.1.dylib
$(RM) $(LIBDIR)/libcupsppdc.a
$(RM) $(LIBDIR)/libcupsppdc.dylib
- $(RM) $(LIBDIR)/libcupsppdc_s.a
- $(RM) $(LIBDIR)/libcupsppdc.sl
- $(RM) $(LIBDIR)/libcupsppdc.sl.1
$(RM) $(LIBDIR)/libcupsppdc.so
$(RM) $(LIBDIR)/libcupsppdc.so.1
-$(RMDIR) $(LIBDIR)
#
-# libcupsppdc.so.1, libcupsppdc.sl.1
+# libcupsppdc.so.1
#
-libcupsppdc.so.1 libcupsppdc.sl.1: $(LIBOBJS) ../cups/$(LIBCUPS)
+libcupsppdc.so.1: $(LIBOBJS) ../cups/$(LIBCUPS)
echo Linking $@...
$(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS)
$(RM) `basename $@ .1`
$(LN) $@ libcupsppdc.dylib
-#
-# libcupsppdc_s.a
-#
-
-libcupsppdc_s.a: $(LIBOBJS) ../cups/$(LIBCUPS)
- echo Creating $@...
- $(DSOXX) $(DSOFLAGS) -o libcupsppdc_s.o $(LIBOBJS) $(LINKCUPS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcupsppdc_s.o
-
-
#
# libcupsppdc.la
#
#
# "$Id$"
#
-# Scheduler Makefile for CUPS.
+# Scheduler Makefile for CUPS.
#
-# Copyright 2007-2012 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
include ../Makedefs
clean:
$(RM) $(OBJS)
$(RM) $(TARGETS) $(UNITTARGETS) convert
- $(RM) libcupsmime.so libcupsmime.sl libcupsmime.dylib
+ $(RM) libcupsmime.so libcupsmime.dylib
#
for level in $(RCLEVELS); do \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
- if test `uname` = HP-UX; then \
- level=`expr $$level - 1`; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
- fi; \
$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
done; \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
echo Installing libraries in $(LIBDIR)...
$(INSTALL_DIR) -m 755 $(LIBDIR)
$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
- if test $(LIBCUPSMIME) = "libcupsmime.so.1" -o $(LIBCUPSMIME) = "libcupsmime.sl.1"; then \
+ if test $(LIBCUPSMIME) = "libcupsmime.so.1"; then \
$(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
$(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
fi
$(RM) $(LIBDIR)/libcupsmime.1.dylib
$(RM) $(LIBDIR)/libcupsmime.a
$(RM) $(LIBDIR)/libcupsmime.dylib
- $(RM) $(LIBDIR)/libcupsmime_s.a
- $(RM) $(LIBDIR)/libcupsmime.sl
- $(RM) $(LIBDIR)/libcupsmime.sl.1
$(RM) $(LIBDIR)/libcupsmime.so
$(RM) $(LIBDIR)/libcupsmime.so.1
-$(RMDIR) $(LIBDIR)
#
-# libcupsmime.so.1, libcupsmime.sl.1
+# libcupsmime.so.1
#
-libcupsmime.so.1 libcupsmime.sl.1: $(LIBOBJS)
+libcupsmime.so.1: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
$(RM) `basename $@ .1`
$(LN) $@ libcupsmime.dylib
-#
-# libcupsmime_s.a
-#
-
-libcupsmime_s.a: $(LIBOBJS)
- echo Creating $@...
- $(DSO) $(DSOFLAGS) -o libcupsmime_s.o $(LIBOBJS) $(LIBS)
- $(RM) $@
- $(AR) $(ARFLAGS) $@ libcupsmime_s.o
-
-
#
# libcupsmime.la
#
# include <security/pam_appl.h>
# endif /* HAVE_PAM_PAM_APPL_H */
#endif /* HAVE_LIBPAM */
-#ifdef HAVE_USERSEC_H
-# include <usersec.h>
-#endif /* HAVE_USERSEC_H */
#ifdef HAVE_MEMBERSHIP_H
# include <membership.h>
#endif /* HAVE_MEMBERSHIP_H */
static int compare_locations(cupsd_location_t *a,
cupsd_location_t *b);
static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data);
-#if !HAVE_LIBPAM && !defined(HAVE_USERSEC_H)
+#if !HAVE_LIBPAM
static char *cups_crypt(const char *pw, const char *salt);
-#endif /* !HAVE_LIBPAM && !HAVE_USERSEC_H */
+#endif /* !HAVE_LIBPAM */
static void free_authmask(cupsd_authmask_t *am, void *data);
static char *get_md5_password(const char *username,
const char *group, char passwd[33]);
#if HAVE_LIBPAM
static int pam_func(int, const struct pam_message **,
struct pam_response **, void *);
-#elif !defined(HAVE_USERSEC_H)
+#else
static void to64(char *s, unsigned long v, int n);
#endif /* HAVE_LIBPAM */
#endif /* HAVE_LIBPAM */
-/*
- * Local globals...
- */
-
-#if defined(__hpux) && HAVE_LIBPAM
-static cupsd_authdata_t *auth_data; /* Current client being authenticated */
-#endif /* __hpux && HAVE_LIBPAM */
-
-
/*
* 'cupsdAddIPMask()' - Add an IP address authorization mask.
*/
strlcpy(data.username, username, sizeof(data.username));
strlcpy(data.password, password, sizeof(data.password));
-# if defined(__sun) || defined(__hpux)
+# ifdef __sun
pamdata.conv = (int (*)(int, struct pam_message **,
struct pam_response **,
void *))pam_func;
# else
pamdata.conv = pam_func;
-# endif /* __sun || __hpux */
+# endif /* __sun */
pamdata.appdata_ptr = &data;
-# ifdef __hpux
- /*
- * Workaround for HP-UX bug in pam_unix; see pam_func() below for
- * more info...
- */
-
- auth_data = &data;
-# endif /* __hpux */
-
pamerr = pam_start("cups", username, &pamdata, &pamh);
if (pamerr != PAM_SUCCESS)
{
pam_end(pamh, PAM_SUCCESS);
-#elif defined(HAVE_USERSEC_H)
- /*
- * Use AIX authentication interface...
- */
-
- char *authmsg; /* Authentication message */
- int reenter; /* ??? */
-
-
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] AIX authenticate of username \"%s\"",
- con->number, username);
-
- reenter = 1;
- if (authenticate(username, password, &reenter, &authmsg) != 0)
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG,
- "[Client %d] Unable to authenticate username "
- "\"%s\": %s", con->number, username,
- strerror(errno));
- return;
- }
-
#else
/*
* Use normal UNIX password file-based authentication...
}
-#if !HAVE_LIBPAM && !defined(HAVE_USERSEC_H)
+#if !HAVE_LIBPAM
/*
* 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms,
* as needed.
return (crypt(pw, salt));
}
}
-#endif /* !HAVE_LIBPAM && !HAVE_USERSEC_H */
+#endif /* !HAVE_LIBPAM */
/*
DEBUG_printf(("pam_func: appdata_ptr = %p\n", appdata_ptr));
-#ifdef __hpux
- /*
- * Apparently some versions of HP-UX 11 have a broken pam_unix security
- * module. This is a workaround...
- */
-
- data = auth_data;
- (void)appdata_ptr;
-#else
data = (cupsd_authdata_t *)appdata_ptr;
-#endif /* __hpux */
for (i = 0; i < num_msg; i ++)
{
return (PAM_SUCCESS);
}
-#elif !defined(HAVE_USERSEC_H)
+#else
/*
#
# "$Id$"
#
-# Startup/shutdown script for CUPS.
+# Startup/shutdown script for CUPS.
#
-# Copyright 2007-2012 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright 2007-2013 by Apple Inc.
+# Copyright 1997-2007 by Easy Software Products, all rights reserved.
#
-# These coded instructions, statements, and computer programs are the
-# property of Apple Inc. and are protected by Federal copyright
-# law. Distribution and use rights are outlined in the file "LICENSE.txt"
-# which should have been included with this file. If this file is
-# file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law. Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file. If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
#
#### OS-Dependent Information
#
# Make sure we have the standard program directories in the path
-# since some operating systems (this means YOU HP-UX!) don't
-# provide a standard path on boot-up...
+# since some operating systems don't provide a standard path on boot-up...
#
if test "x$PATH" = x; then
#
case "`uname`" in
- HP-UX* | AIX* | SINIX*)
- pid=`ps -e | awk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
- ;;
SunOS*)
pid=`ps -e | nawk '{if (match($4, ".*/cupsd$") || $4 == "cupsd") print $1}'`
;;
- UnixWare*)
- pid=`ps -e | awk '{if (match($6, ".*/cupsd$") || $6 == "cupsd") print $1}'`
- . /etc/TIMEZONE
- ;;
- OSF1*)
- pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
- ;;
Linux* | *BSD* | Darwin*)
pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'`
;;
fi
;;
- start_msg)
- # HP-UX non-standard...
- echo "Starting CUPS Server"
- ;;
-
- stop_msg)
- # HP-UX non-standard...
- echo "Starting CUPS Server"
- ;;
-
*)
echo "Usage: cups {reload|restart|start|status|stop}"
exit 1
/*
* "$Id$"
*
- * Select abstraction functions for the CUPS scheduler.
+ * Select abstraction functions for the CUPS scheduler.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 2006-2007 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * cupsdAddSelect() - Add a file descriptor to the list.
- * cupsdDoSelect() - Do a select-like operation.
- * cupsdIsSelecting() - Determine whether we are monitoring a file
- * descriptor.
- * cupsdRemoveSelect() - Remove a file descriptor from the list.
- * cupsdStartSelect() - Initialize the file polling engine.
- * cupsdStopSelect() - Shutdown the file polling engine.
- * compare_fds() - Compare file descriptors.
- * find_fd() - Find an existing file descriptor record.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
/*
# include <sys/time.h>
#elif defined(HAVE_POLL)
# include <poll.h>
-#elif defined(__hpux)
-# include <sys/time.h>
#else
# include <sys/select.h>
#endif /* HAVE_EPOLL */
/*
* "$Id$"
*
- * "lpstat" command for CUPS.
+ * "lpstat" command for CUPS.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2006 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2006 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * Contents:
- *
- * main() - Parse options and show status information.
- * check_dest() - Verify that the named destination(s) exists.
- * match_list() - Match a name from a list of comma or space-separated
- * names.
- * show_accepting() - Show acceptance status.
- * show_classes() - Show printer classes.
- * show_default() - Show default destination.
- * show_devices() - Show printer devices.
- * show_jobs() - Show active print jobs.
- * show_printers() - Show printers.
- * show_scheduler() - Show scheduler status.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
/*
if (match_list(printers, printer))
{
-#ifdef __osf__ /* Compaq/Digital like to do it their own way... */
- char scheme[HTTP_MAX_URI], /* Components of printer URI */
- username[HTTP_MAX_URI],
- hostname[HTTP_MAX_URI],
- resource[HTTP_MAX_URI];
- int port;
-
-
- if (device == NULL)
- {
- httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme),
- username, sizeof(username), hostname,
- sizeof(hostname), &port, resource, sizeof(resource));
- _cupsLangPrintf(stdout,
- _("Output for printer %s is sent to remote "
- "printer %s on %s"),
- printer, strrchr(resource, '/') + 1, hostname);
- }
- else if (!strncmp(device, "file:", 5))
- _cupsLangPrintf(stdout,
- _("Output for printer %s is sent to %s"),
- printer, device + 5);
- else
- _cupsLangPrintf(stdout,
- _("Output for printer %s is sent to %s"),
- printer, device);
-
- for (i = 0; i < num_dests; i ++)
- if (!_cups_strcasecmp(printer, dests[i].name) && dests[i].instance)
- {
- if (device == NULL)
- _cupsLangPrintf(stdout,
- _("Output for printer %s/%s is sent to "
- "remote printer %s on %s"),
- printer, dests[i].instance,
- strrchr(resource, '/') + 1, hostname);
- else if (!strncmp(device, "file:", 5))
- _cupsLangPrintf(stdout,
- _("Output for printer %s/%s is sent to %s"),
- printer, dests[i].instance, device + 5);
- else
- _cupsLangPrintf(stdout,
- _("Output for printer %s/%s is sent to %s"),
- printer, dests[i].instance, device);
- }
-#else
if (device == NULL)
_cupsLangPrintf(stdout, _("device for %s: %s"),
printer, uri);
printer, device);
for (i = 0; i < num_dests; i ++)
+ {
if (!_cups_strcasecmp(printer, dests[i].name) && dests[i].instance)
{
if (device == NULL)
_cupsLangPrintf(stdout, _("device for %s/%s: %s"),
printer, dests[i].instance, device);
}
-#endif /* __osf__ */
+ }
}
if (attr == NULL)
/*
* "$Id$"
*
- * Configuration file for CUPS on Windows.
+ * Configuration file for CUPS on Windows.
*
- * Copyright 2007-2013 by Apple Inc.
- * Copyright 1997-2007 by Easy Software Products.
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
*
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright
- * law. Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file. If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*/
#ifndef _CUPS_CONFIG_H_
* Version of software...
*/
-#define CUPS_SVERSION "CUPS v1.7.0"
-#define CUPS_MINIMAL "CUPS/1.7.0"
+#define CUPS_SVERSION "CUPS v2.0.0"
+#define CUPS_MINIMAL "CUPS/2.0.0"
/*
/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
-/*
- * Do we have the AIX usersec.h header file?
- */
-
-/* #undef HAVE_USERSEC_H */
-
-
/*
* Do we have pthread support?
*/
278C58E6136B64B000836530 /* Kerberos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kerberos.framework; path = /System/Library/Frameworks/Kerberos.framework; sourceTree = "<absolute>"; };
278C58E7136B64B000836530 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
278C58E8136B64B000836530 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; };
- 27D3037C134148CB00F022B1 /* libcups_s.exp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.exports; name = libcups_s.exp; path = ../cups/libcups_s.exp; sourceTree = "<group>"; };
27D3037D134148CB00F022B1 /* libcups2.def */ = {isa = PBXFileReference; lastKnownFileType = text; name = libcups2.def; path = ../cups/libcups2.def; sourceTree = "<group>"; };
720DD6C21358FD5F0064AA82 /* snmp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = snmp; sourceTree = BUILT_PRODUCTS_DIR; };
720DD6D21358FDDE0064AA82 /* snmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snmp.c; path = ../backend/snmp.c; sourceTree = "<group>"; };
isa = PBXGroup;
children = (
276683561337A8C5000D33D0 /* cups.strings */,
- 27D3037C134148CB00F022B1 /* libcups_s.exp */,
27D3037D134148CB00F022B1 /* libcups2.def */,
72220EB51333052D00FCA411 /* adminutil.c */,
72220EB81333056300FCA411 /* array.c */,
/* #undef HAVE_STRUCT_SOCKADDR_SA_LEN */
-/*
- * Do we have the AIX usersec.h header file?
- */
-
-/* #undef HAVE_USERSEC_H */
-
-
/*
* Do we have pthread support?
*/
projects / thirdparty / cups.git / commitdiff
