From 0733cdc407ab6e02e7f12444276973c0fd45d715 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 12 Jun 2018 15:33:34 +0200 Subject: [PATCH] 1590123 - cups-driverd doesn't recognize static gzipped ppds --- cups-journal-history.patch | 18 ------------------ cups.spec | 3 +++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/cups-journal-history.patch b/cups-journal-history.patch index 5555ae2..c7f4901 100644 --- a/cups-journal-history.patch +++ b/cups-journal-history.patch @@ -91,21 +91,3 @@ diff -up cups-2.2.6/scheduler/log.c.journal-history cups-2.2.6/scheduler/log.c else return (1); } -@@ -989,7 +980,7 @@ cupsdLogPage(cupsd_job_t *job, /* I - J - *bufptr = '\0'; - - #ifdef HAVE_SYSTEMD_SD_JOURNAL_H -- if (!strcmp(ErrorLog, "syslog")) -+ if (!strcmp(PageLog, "syslog")) - { - static const char * const job_states[] = - { /* job-state strings */ -@@ -1186,7 +1177,7 @@ cupsdLogRequest(cupsd_client_t *con, /* - } - - #ifdef HAVE_SYSTEMD_SD_JOURNAL_H -- if (!strcmp(ErrorLog, "syslog")) -+ if (!strcmp(AccessLog, "syslog")) - { - sd_journal_print(LOG_INFO, "REQUEST %s - %s \"%s %s HTTP/%d.%d\" %d " CUPS_LLFMT " %s %s", con->http->hostname, con->username[0] != '\0' ? con->username : "-", states[con->operation], _httpEncodeURI(temp, con->uri, sizeof(temp)), con->http->version / 100, con->http->version % 100, code, CUPS_LLCAST con->bytes, con->request ? ippOpString(con->request->request.op.operation_id) : "-", con->response ? ippErrorString(con->response->request.status.status_code) : "-"); - return (1); diff --git a/cups.spec b/cups.spec index 3965b11..8deb991 100644 --- a/cups.spec +++ b/cups.spec @@ -86,6 +86,8 @@ BuildRequires: systemd BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(dbus-1) BuildRequires: automake +# needed for decompressing functions when reading from gzipped ppds +BuildRequires: zlib-devel # gcc and gcc-c++ is no longer in buildroot by default # gcc for most of files @@ -664,6 +666,7 @@ rm -f %{cups_serverbin}/backend/smb %changelog * Tue Jun 12 2018 Zdenek Dohnal - 1:2.2.7-2 - 1589593 - cupsd LogLevel ignored when logging to journald (syslog) +- 1590123 - cups-driverd doesn't recognize static gzipped ppds * Tue Apr 03 2018 Zdenek Dohnal - 1:2.2.7-1 - rebase to 2.2.7