Skip to content

Commit

Permalink
Import CUPS v2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Sweet committed Mar 15, 2016
1 parent d333124 commit ba4f314
Show file tree
Hide file tree
Showing 24 changed files with 255 additions and 158 deletions.
21 changes: 20 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
CHANGES.txt - 2.1.2 - 2015-12-02
CHANGES.txt - 2.1.3 - 2016-02-05
--------------------------------

CHANGES IN CUPS V2.1.3

- The default password function did not work on some platforms
(STR #4750)
- The scheduler should not exit under memory pressure
(<rdar://problem/23255001>)
- The EPL2 and ZPL sample drivers did not properly support the CutMedia
option.
- Pending subscriptions would prevent the scheduler from idle exiting
(STR #4754)
- Fixed some issues in ipptool for skipped tests
(<rdar://problem/24137160>)
- The "lp -H resume" command did not reset the "job-state-reasons"
attribute value (STR #4752)
- The scheduler did not allow access to resource files (icons, etc.)
when the web interface was disabled (STR #4755)
- Localization fix (STR #4756)


CHANGES IN CUPS V2.1.2

- Re-release of CUPS 2.1.1 as CUPS 2.1.2 due to error in tagging of the
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
INSTALL - CUPS v2.1.2 - 2015-12-02
INSTALL - CUPS v2.1.3 - 2016-02-05
----------------------------------

This file describes how to compile and install CUPS from source code. For more
Expand Down
2 changes: 1 addition & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README - CUPS v2.1.2 - 2015-12-02
README - CUPS v2.1.3 - 2016-02-05
---------------------------------

Looking for compile instructions? Read the file "INSTALL.txt" instead...
Expand Down
6 changes: 3 additions & 3 deletions backend/lpd.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* "$Id: lpd.c 12024 2014-07-15 12:58:39Z msweet $"
* "$Id: lpd.c 13040 2016-01-11 20:29:13Z msweet $"
*
* Line Printer Daemon backend for CUPS.
*
Expand Down Expand Up @@ -1251,7 +1251,7 @@ rresvport_af(int *port, /* IO - Port number to bind to */
*/

memset(&addr, 0, sizeof(addr));
addr.addr.sa_family = family;
addr.addr.sa_family = (sa_family_t)family;

/*
* Try to bind the socket to a reserved port...
Expand Down Expand Up @@ -1320,5 +1320,5 @@ sigterm_handler(int sig) /* I - Signal */


/*
* End of "$Id: lpd.c 12024 2014-07-15 12:58:39Z msweet $".
* End of "$Id: lpd.c 13040 2016-01-11 20:29:13Z msweet $".
*/
2 changes: 1 addition & 1 deletion config-scripts/cups-common.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dnl Set the name of the config header file...
AC_CONFIG_HEADER(config.h)

dnl Version number information...
CUPS_VERSION=2.1.2
CUPS_VERSION=2.1.3

case "$CUPS_VERSION" in
*svn)
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for CUPS 2.1.2.
# Generated by GNU Autoconf 2.68 for CUPS 2.1.3.
#
# Report bugs to <https://www.cups.org/str.php>.
#
Expand Down Expand Up @@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='CUPS'
PACKAGE_TARNAME='cups'
PACKAGE_VERSION='2.1.2'
PACKAGE_STRING='CUPS 2.1.2'
PACKAGE_VERSION='2.1.3'
PACKAGE_STRING='CUPS 2.1.3'
PACKAGE_BUGREPORT='https://www.cups.org/str.php'
PACKAGE_URL='https://www.cups.org/'

Expand Down Expand Up @@ -1447,7 +1447,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures CUPS 2.1.2 to adapt to many kinds of systems.
\`configure' configures CUPS 2.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1508,7 +1508,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of CUPS 2.1.2:";;
short | recursive ) echo "Configuration of CUPS 2.1.3:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1687,7 +1687,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
CUPS configure 2.1.2
CUPS configure 2.1.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2151,7 +2151,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by CUPS $as_me 2.1.2, which was
It was created by CUPS $as_me 2.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2526,7 +2526,7 @@ esac
ac_config_headers="$ac_config_headers config.h"


CUPS_VERSION=2.1.2
CUPS_VERSION=2.1.3

case "$CUPS_VERSION" in
*svn)
Expand Down Expand Up @@ -10765,7 +10765,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by CUPS $as_me 2.1.2, which was
This file was extended by CUPS $as_me 2.1.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -10828,7 +10828,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
CUPS config.status 2.1.2
CUPS config.status 2.1.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dnl
dnl "$Id: configure.ac 12998 2015-12-02 15:09:04Z msweet $"
dnl "$Id: configure.ac 13031 2016-01-04 14:43:04Z msweet $"
dnl
dnl Configuration script for CUPS.
dnl
dnl Copyright 2007-2015 by Apple Inc.
dnl Copyright 2007-2016 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
Expand All @@ -17,7 +17,7 @@ dnl We need at least autoconf 2.60...
AC_PREREQ(2.60)

dnl Package name and version...
AC_INIT([CUPS], [2.1.2], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])
AC_INIT([CUPS], [2.1.3], [https://www.cups.org/str.php], [cups], [https://www.cups.org/])

sinclude(config-scripts/cups-opsys.m4)
sinclude(config-scripts/cups-common.m4)
Expand Down Expand Up @@ -95,5 +95,5 @@ AC_OUTPUT(Makedefs
chmod +x cups-config

dnl
dnl End of "$Id: configure.ac 12998 2015-12-02 15:09:04Z msweet $".
dnl End of "$Id: configure.ac 13031 2016-01-04 14:43:04Z msweet $".
dnl
10 changes: 5 additions & 5 deletions cups/cups.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* "$Id: cups.h 12998 2015-12-02 15:09:04Z msweet $"
* "$Id: cups.h 13031 2016-01-04 14:43:04Z msweet $"
*
* API definitions for CUPS.
*
* Copyright 2007-2014 by Apple Inc.
* Copyright 2007-2016 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
Expand Down Expand Up @@ -58,10 +58,10 @@ extern "C" {
* Constants...
*/

# define CUPS_VERSION 2.0102
# define CUPS_VERSION 2.0103
# define CUPS_VERSION_MAJOR 2
# define CUPS_VERSION_MINOR 1
# define CUPS_VERSION_PATCH 2
# define CUPS_VERSION_PATCH 3

# define CUPS_BC_FD 3
/* Back-channel file descriptor for
Expand Down Expand Up @@ -636,5 +636,5 @@ extern int cupsSetServerCredentials(const char *path, const char *common_name,
#endif /* !_CUPS_CUPS_H_ */

/*
* End of "$Id: cups.h 12998 2015-12-02 15:09:04Z msweet $".
* End of "$Id: cups.h 13031 2016-01-04 14:43:04Z msweet $".
*/
15 changes: 7 additions & 8 deletions cups/dest.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* "$Id: dest.c 12733 2015-06-12 01:21:05Z msweet $"
* "$Id: dest.c 13075 2016-01-29 21:14:05Z msweet $"
*
* User-defined destination (and option) support for CUPS.
*
* Copyright 2007-2015 by Apple Inc.
* Copyright 2007-2016 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
Expand Down Expand Up @@ -122,7 +122,7 @@ typedef struct _cups_dnssd_resolve_s /* Data for resolving URI */
#ifdef __APPLE__
static CFArrayRef appleCopyLocations(void);
static CFStringRef appleCopyNetwork(void);
static char *appleGetPaperSize(char *name, int namesize);
static char *appleGetPaperSize(char *name, size_t namesize);
static CFStringRef appleGetPrinter(CFArrayRef locations,
CFStringRef network, CFIndex *locindex);
#endif /* __APPLE__ */
Expand Down Expand Up @@ -2491,8 +2491,8 @@ appleCopyNetwork(void)
*/

static char * /* O - Default paper size */
appleGetPaperSize(char *name, /* I - Paper size name buffer */
int namesize) /* I - Size of buffer */
appleGetPaperSize(char *name, /* I - Paper size name buffer */
size_t namesize) /* I - Size of buffer */
{
CFStringRef defaultPaperID; /* Default paper ID */
pwg_media_t *pwgmedia; /* PWG media size */
Expand All @@ -2501,8 +2501,7 @@ appleGetPaperSize(char *name, /* I - Paper size name buffer */
defaultPaperID = _cupsAppleCopyDefaultPaperID();
if (!defaultPaperID ||
CFGetTypeID(defaultPaperID) != CFStringGetTypeID() ||
!CFStringGetCString(defaultPaperID, name, namesize,
kCFStringEncodingUTF8))
!CFStringGetCString(defaultPaperID, name, (CFIndex)namesize, kCFStringEncodingUTF8))
name[0] = '\0';
else if ((pwgmedia = pwgMediaForLegacy(name)) != NULL)
strlcpy(name, pwgmedia->pwg, namesize);
Expand Down Expand Up @@ -3943,5 +3942,5 @@ cups_make_string(


/*
* End of "$Id: dest.c 12733 2015-06-12 01:21:05Z msweet $".
* End of "$Id: dest.c 13075 2016-01-29 21:14:05Z msweet $".
*/
12 changes: 6 additions & 6 deletions cups/encode.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* "$Id: encode.c 12668 2015-05-27 19:30:32Z msweet $"
* "$Id: encode.c 13064 2016-01-27 16:05:09Z msweet $"
*
* Option encoding routines for CUPS.
*
* Copyright 2007-2015 by Apple Inc.
* Copyright 2007-2016 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
Expand Down Expand Up @@ -542,14 +542,13 @@ cupsEncodeOptions2(
else if (*sep == ',' && !quote)
count ++;
else if (*sep == '\\' && sep[1])
sep ++;
sep += 2;
}
}
else
count = 1;

DEBUG_printf(("2cupsEncodeOptions2: option=\"%s\", count=%d",
option->name, count));
DEBUG_printf(("2cupsEncodeOptions2: option=\"%s\", value=\"%s\", count=%d", option->name, option->value, count));

/*
* Allocate memory for the attribute values...
Expand Down Expand Up @@ -633,6 +632,7 @@ cupsEncodeOptions2(
* Skip quoted character...
*/

memmove(sep, sep + 1, strlen(sep));
sep ++;
}
}
Expand Down Expand Up @@ -853,5 +853,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */


/*
* End of "$Id: encode.c 12668 2015-05-27 19:30:32Z msweet $".
* End of "$Id: encode.c 13064 2016-01-27 16:05:09Z msweet $".
*/
Loading

0 comments on commit ba4f314

Please sign in to comment.