Commit 8a2176f7 authored by Didier Raboud's avatar Didier Raboud

Drop patches included upstream:

- libsystemd.patch
- str4679-fix-local-domainsocket-access-checking.patch

Refresh 7 other patches
parent 58bcd7e0
......@@ -35,7 +35,7 @@ Last-Update: 2015-02-10
# Raw filter...
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -111,6 +111,9 @@
@@ -118,6 +118,9 @@
image/x-bitmap bmp string(0,BM) + !printable(2,14)
image/x-icon ico
......
......@@ -5,7 +5,7 @@ Bug: https://www.cups.org/str.php?L4348
Last-Updated: 2015-02-10
--- a/backend/ipp.c
+++ b/backend/ipp.c
@@ -1735,7 +1735,10 @@
@@ -1736,7 +1736,10 @@
ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
(i + 1) >= num_files);
......
Description: Check for libsystemd instead of libsystemd-daemon; libsystemd replaces libsystemd-daemon since systemd v209
Author: Michael Biebl <biebl@debian.org>
Orgin: vendor
Bug-Debian: #779770
Bug-Upstream: https://www.cups.org/str.php?L4669
Last-Update: 2015-07-13
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -56,11 +56,11 @@
AC_MSG_ERROR(Need pkg-config to enable systemd support.)
fi
else
- AC_MSG_CHECKING(for libsystemd-daemon)
- if $PKGCONFIG --exists libsystemd-daemon; then
+ AC_MSG_CHECKING(for libsystemd)
+ if $PKGCONFIG --exists libsystemd; then
AC_MSG_RESULT(yes)
- ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
- ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+ ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
+ ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
AC_DEFINE(HAVE_SYSTEMD)
if test "x$SYSTEMD_DIR" = x; then
SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
......@@ -17,7 +17,7 @@ Last-Update: 2015-02-10
/*
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -2184,7 +2184,7 @@
@@ -2182,7 +2182,7 @@
strftime(temp, sizeof(temp) - 1, "%Y-%m-%d %H:%M", curdate);
cupsFilePuts(fp, "# Job cache file for " CUPS_SVERSION "\n");
......
......@@ -4,7 +4,7 @@ Last-Update: 2015-02-10
--- a/scheduler/cups-driverd.cxx
+++ b/scheduler/cups-driverd.cxx
@@ -242,7 +242,6 @@
@@ -248,7 +248,6 @@
const char *scheme) /* I - PPD scheme */
{
ppd_info_t *ppd; /* PPD */
......@@ -12,7 +12,7 @@ Last-Update: 2015-02-10
/*
@@ -281,15 +280,6 @@
@@ -287,15 +286,6 @@
strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme));
/*
......
......@@ -12,7 +12,7 @@ Last-Update: 2015-02-10
--- a/scheduler/ipp.c
+++ b/scheduler/ipp.c
@@ -8350,6 +8350,11 @@
@@ -8352,6 +8352,11 @@
ipp_attribute_t *attr, /* Current attribute */
*attr2, /* Job attribute */
*prev2; /* Previous job attribute */
......@@ -24,7 +24,7 @@ Last-Update: 2015-02-10
/*
@@ -8411,6 +8416,85 @@
@@ -8413,6 +8418,85 @@
}
/*
......
......@@ -37,7 +37,7 @@ Last-Update: 2015-02-10
cupsDirClose(dir);
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -1233,7 +1233,7 @@
@@ -1231,7 +1231,7 @@
else if (stat(command, &backinfo))
backroot = 0;
else
......
......@@ -5,8 +5,6 @@ pwg-raster-attributes.patch
manpage-hyphen-minus.patch
rootbackends-worldreadable.patch
fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
libsystemd.patch
str4679-fix-local-domainsocket-access-checking.patch
# patches which should go upstream
cupsd-upstart-support.patch
......
Description: In absence of client.conf configuration, the default domain socket
(/var/run/cups/cups.sock) will get checked for read, write and execution bits,
but the latter doesn't make sense
Author: Didier Raboud <odyx@debian.org>
Origin: vendor
Bug: https://www.cups.org/str.php?L4679
Bug-Debian: https://bugs.debian.org/792730
Last-Update: 2015-07-18
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1012,7 +1012,7 @@
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
- (sockinfo.st_mode & S_IRWXO) == S_IRWXO)
+ (sockinfo.st_mode & (S_IROTH | S_IWOTH) ) == (S_IROTH | S_IWOTH))
cups_set_server_name(cc, CUPS_DEFAULT_DOMAINSOCKET);
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
Description: Ignore warnings from colord and Avahi in the tests, as they change the expected number of warnings.
Author: Martin Pitt <mpitt@debian.org>
Last-Update: 2015-02-10
Last-Update: 2015-08-05
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
......@@ -10,6 +10,6 @@ Last-Update: 2015-02-10
# Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | $GREP -v 'Unable to initialize USB access via libusb, libusb error' | $GREP -v 'org.freedesktop.ColorManager' | $GREP -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
if test $count != 18; then
if test $count != 8; then
echo "FAIL: $count warning messages, expected 18."
$GREP '^W ' $BASE/log/error_log
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment