From af50344ff281529bb156c527c212bc648df37532 Mon Sep 17 00:00:00 2001 From: njlzk Date: Sat, 11 Jan 2020 17:36:56 +0800 Subject: [PATCH] delete patches --- cups-driverd-timeout.patch | 21 ------- cups-journal-history.patch | 109 --------------------------------- cups-logrotate.patch | 63 ------------------- cups-uri-compat.patch | 4 +- cups-web-devices-timeout.patch | 19 ------ cups.spec | 12 ++-- 6 files changed, 9 insertions(+), 219 deletions(-) delete mode 100644 cups-driverd-timeout.patch delete mode 100644 cups-journal-history.patch delete mode 100644 cups-logrotate.patch delete mode 100644 cups-web-devices-timeout.patch diff --git a/cups-driverd-timeout.patch b/cups-driverd-timeout.patch deleted file mode 100644 index b7240a3..0000000 --- a/cups-driverd-timeout.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.7b1/scheduler/ipp.c.driverd-timeout cups-1.7b1/scheduler/ipp.c ---- cups-1.7b1/scheduler/ipp.c.driverd-timeout 2013-04-19 12:24:43.003841810 +0200 -+++ cups-1.7b1/scheduler/ipp.c 2013-04-19 12:24:43.204839107 +0200 -@@ -4556,7 +4556,7 @@ copy_model(cupsd_client_t *con, /* I - - close(temppipe[1]); - - /* -- * Wait up to 30 seconds for the PPD file to be copied... -+ * Wait up to 70 seconds for the PPD file to be copied... - */ - - total = 0; -@@ -4576,7 +4576,7 @@ copy_model(cupsd_client_t *con, /* I - - FD_SET(temppipe[0], &input); - FD_SET(CGIPipes[0], &input); - -- timeout.tv_sec = 30; -+ timeout.tv_sec = 70; - timeout.tv_usec = 0; - - if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) diff --git a/cups-journal-history.patch b/cups-journal-history.patch deleted file mode 100644 index 07717e8..0000000 --- a/cups-journal-history.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff --git a/scheduler/log.c b/scheduler/log.c -index b6226201f..cdb5437dc 100644 ---- a/scheduler/log.c -+++ b/scheduler/log.c -@@ -565,56 +565,15 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ - if (level > LogLevel && LogDebugHistory <= 0) - return (1); - --#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -- if (!strcmp(ErrorLog, "syslog")) -- { -- cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL; -- static const char * const job_states[] = -- { /* job-state strings */ -- "Pending", -- "PendingHeld", -- "Processing", -- "ProcessingStopped", -- "Canceled", -- "Aborted", -- "Completed" -- }; -- -- va_start(ap, message); -- -- do -- { -- va_copy(ap2, ap); -- status = format_log_line(message, ap2); -- va_end(ap2); -- } -- while (status == 0); -- -- va_end(ap); -- -- if (job) -- sd_journal_send("MESSAGE=%s", log_line, -- "PRIORITY=%i", log_levels[level], -- PWG_Event"=JobStateChanged", -- PWG_ServiceURI"=%s", printer ? printer->uri : "", -- PWG_JobID"=%d", job->id, -- PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING], -- PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0), -- NULL); -- else -- sd_journal_send("MESSAGE=%s", log_line, -- "PRIORITY=%i", log_levels[level], -- NULL); -- -- return (1); -- } --#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ -- - /* - * Format and write the log message... - */ - -+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -+ if (job && strcmp(ErrorLog, "syslog")) -+#else - if (job) -+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ - snprintf(jobmsg, sizeof(jobmsg), "[Job %d] %s", job->id, message); - else - strlcpy(jobmsg, message, sizeof(jobmsg)); -@@ -673,7 +632,43 @@ cupsdLogJob(cupsd_job_t *job, /* I - Job */ - return (1); - } - else if (level <= LogLevel) -+ { -+#ifdef HAVE_SYSTEMD_SD_JOURNAL_H -+ if (!strcmp(ErrorLog, "syslog")) -+ { -+ cupsd_printer_t *printer = job ? (job->printer ? job->printer : (job->dest ? cupsdFindDest(job->dest) : NULL)) : NULL; -+ static const char * const job_states[] = -+ { /* job-state strings */ -+ "Pending", -+ "PendingHeld", -+ "Processing", -+ "ProcessingStopped", -+ "Canceled", -+ "Aborted", -+ "Completed" -+ }; -+ -+ if (job) -+ sd_journal_send("MESSAGE=%s", log_line, -+ "PRIORITY=%i", log_levels[level], -+ PWG_Event"=JobStateChanged", -+ PWG_ServiceURI"=%s", printer ? printer->uri : "", -+ PWG_JobID"=%d", job->id, -+ PWG_JobState"=%s", job->state_value < IPP_JSTATE_PENDING ? "" : job_states[job->state_value - IPP_JSTATE_PENDING], -+ PWG_JobImpressionsCompleted"=%d", ippGetInteger(job->impressions, 0), -+ NULL); -+ else -+ sd_journal_send("MESSAGE=%s", log_line, -+ "PRIORITY=%i", log_levels[level], -+ NULL); -+ -+ return (1); -+ } -+ else -+#endif /* HAVE_SYSTEMD_SD_JOURNAL_H */ -+ - return (cupsdWriteErrorLog(level, log_line)); -+ } - else - return (1); - } diff --git a/cups-logrotate.patch b/cups-logrotate.patch deleted file mode 100644 index 6b8eb8c..0000000 --- a/cups-logrotate.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up cups-2.1b1/scheduler/log.c.logrotate cups-2.1b1/scheduler/log.c ---- cups-2.1b1/scheduler/log.c.logrotate 2015-06-04 20:00:31.000000000 +0200 -+++ cups-2.1b1/scheduler/log.c 2015-06-29 13:25:09.623350218 +0200 -@@ -26,6 +26,9 @@ - # include - #endif /* HAVE_ASL_H */ - #include -+#include -+#include -+#include - - - /* -@@ -135,12 +138,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - } - - /* -- * Format the filename as needed... -+ * Format the filename... - */ - -- if (!*lf || -- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && -- MaxLogSize > 0)) -+ if (strncmp(logname, "/dev/", 5)) - { - /* - * Handle format strings... -@@ -254,6 +255,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I - /* - * Change ownership and permissions of non-device logs... - */ -+ -+ fchown(cupsFileNumber(*lf), RunUser, Group); -+ fchmod(cupsFileNumber(*lf), LogFilePerm); -+ } -+ } -+ -+ /* -+ * Has someone else (i.e. logrotate) already rotated the log for us? -+ */ -+ else if (strncmp(filename, "/dev/", 5)) -+ { -+ struct stat st; -+ if (stat(filename, &st) || st.st_size == 0) -+ { -+ /* File is either missing or has zero size. */ -+ -+ cupsFileClose(*lf); -+ if ((*lf = cupsFileOpen(filename, "a")) == NULL) -+ { -+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, -+ strerror(errno)); -+ -+ return (0); -+ } -+ -+ /* -+ * Change ownership and permissions of non-device logs... -+ */ - - fchown(cupsFileNumber(*lf), RunUser, Group); - fchmod(cupsFileNumber(*lf), LogFilePerm); diff --git a/cups-uri-compat.patch b/cups-uri-compat.patch index 2520a5b..a77acad 100644 --- a/cups-uri-compat.patch +++ b/cups-uri-compat.patch @@ -26,8 +26,8 @@ diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c + { + char *x = e + mfrlen; + if (!strncmp (x, "%20", 3)) -+ /* Take mfr name out of mdl name for compatibility with -+ * Fedora 11 before bug #507244 was fixed. */ ++ /* Take mfr name out of mdl name for compatibility ++ * before bug #507244 was fixed. */ + strcpy (e, x + 3); puts(fixed_uri); + } + } diff --git a/cups-web-devices-timeout.patch b/cups-web-devices-timeout.patch deleted file mode 100644 index fa3a320..0000000 --- a/cups-web-devices-timeout.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout cups-1.7rc1/cgi-bin/admin.c ---- cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout 2013-05-29 12:51:34.000000000 +0100 -+++ cups-1.7rc1/cgi-bin/admin.c 2013-08-16 16:01:17.308264287 +0100 -@@ -1019,13 +1019,13 @@ do_am_printer(http_t *http, /* I - HTTP - } - - /* -- * Scan for devices for up to 30 seconds... -+ * Scan for devices for up to 10 seconds... - */ - - fputs("DEBUG: Getting list of devices...\n", stderr); - - current_device = 0; -- if (cupsGetDevices(http, 5, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE, -+ if (cupsGetDevices(http, 10, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE, - (cups_device_cb_t)choose_device_cb, - (void *)title) == IPP_OK) - { diff --git a/cups.spec b/cups.spec index 5a0a645..2b76804 100644 --- a/cups.spec +++ b/cups.spec @@ -1,7 +1,7 @@ Name: cups Epoch: 1 Version: 2.2.8 -Release: 7 +Release: 8 Summary: CUPS is the standards-based, open source printing system for linux operating systems. License: GPLv2+ and LGPLv2+ with exceptions and AML Url: http://www.cups.org/ @@ -19,8 +19,6 @@ Patch5: cups-banners.patch Patch7: cups-no-export-ssllibs.patch Patch8: cups-direct-usb.patch Patch12: cups-eggcups.patch -Patch13: cups-driverd-timeout.patch -Patch15: cups-logrotate.patch Patch16: cups-usb-paperout.patch Patch19: cups-uri-compat.patch Patch22: cups-hp-deviceid-oid.patch @@ -28,14 +26,12 @@ Patch24: cups-ricoh-deviceid-oid.patch Patch25: cups-systemd-socket.patch Patch30: cups-freebind.patch Patch35: cups-ipp-multifile.patch -Patch36: cups-web-devices-timeout.patch Patch37: cups-synconclose.patch Patch38: cups-ypbind.patch Patch100: cups-lspp.patch Patch9: cups-lpr-help.patch Patch18: cups-filter-debug.patch Patch29: cups-dymo-deviceid.patch -Patch40: cups-journal-history.patch Patch41: cups-accesslog-null.patch Patch42: cups-epson-A6-crash.patch Patch43: cups-ippvalidateattr-regression.patch @@ -335,6 +331,12 @@ rm -f %{_exec_prefix}/lib/cups/backend/smb %doc %{_datadir}/%{name}/www/apple-touch-icon.png %changelog +* Sat Jan 11 2020 openEuler Buildteam - 2.2.8-8 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: delete patches + * Wed Sep 25 2019 gaoguanghui - 2.2.8-7 - Type:cves - ID:CVE-2019-8675 CVE-2019-8696 -- Gitee