From: Karol Krenski Date: Thu, 13 Jul 2006 11:26:26 +0000 (+0000) Subject: - no longer need X-Git-Tag: auto/ac/cups-1_2_1-7~1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=c99a5c6e8453752b58b6ffa22330cd0e74abb2d2;p=packages%2Fcups.git - no longer need Changed files: cups-str1723.patch -> 1.2 cups-str1736.patch -> 1.2 cups-str1740.patch -> 1.2 cups-str1776.patch -> 1.2 --- diff --git a/cups-str1723.patch b/cups-str1723.patch deleted file mode 100644 index a1e50af..0000000 --- a/cups-str1723.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- cups-1.2.1/cups/http-addrlist.c.orig 2006-05-24 16:55:15.000000000 +0100 -+++ cups-1.2.1/cups/http-addrlist.c 2006-05-24 16:56:11.000000000 +0100 -@@ -506,6 +506,9 @@ - temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1); - # endif /* WIN32 */ - -+ if (!first) -+ first = temp; -+ - addr = temp; - } - -@@ -527,6 +530,9 @@ - temp->addr.ipv4.sin_port = htons(portnum); - temp->addr.ipv4.sin_addr.s_addr = htonl(0x7f000001); - -+ if (!first) -+ first = temp; -+ - if (addr) - addr->next = temp; - else -@@ -556,6 +562,9 @@ - temp->addr.ipv6.sin6_family = AF_INET6; - temp->addr.ipv6.sin6_port = htons(portnum); - -+ if (!first) -+ first = temp; -+ - addr = temp; - } - -@@ -576,6 +585,9 @@ - temp->addr.ipv4.sin_family = AF_INET; - temp->addr.ipv4.sin_port = htons(portnum); - -+ if (!first) -+ first = temp; -+ - if (addr) - addr->next = temp; - else diff --git a/cups-str1736.patch b/cups-str1736.patch deleted file mode 100644 index b2cc0c5..0000000 --- a/cups-str1736.patch +++ /dev/null @@ -1,169 +0,0 @@ ---- cups-1.2.1/scheduler/client.c.orig 2006-05-22 17:34:01.000000000 +0200 -+++ cups-1.2.1/scheduler/client.c 2006-06-05 14:54:53.436660500 +0200 -@@ -1882,24 +1882,27 @@ - - - if (con->filename) -+ { - fd = open(con->filename, O_RDONLY); -- else -- fd = open("/dev/null", O_RDONLY); - -- if (fd < 0) -- { -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s", -- con->http.fd, con->filename ? con->filename : "/dev/null", -- strerror(errno)); -- return (0); -- } -+ if (fd < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "cupsdSendCommand: %d Unable to open \"%s\" for reading: %s", -+ con->http.fd, con->filename ? con->filename : "/dev/null", -+ strerror(errno)); -+ return (0); -+ } - -- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); -+ fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); -+ } -+ else -+ fd = -1; - - con->pipe_pid = pipe_command(con, fd, &(con->file), command, options, root); - -- close(fd); -+ if (fd >= 0) -+ close(fd); - - cupsdLogMessage(CUPSD_LOG_INFO, "Started \"%s\" (pid=%d)", command, - con->pipe_pid); ---- cups-1.2.1/scheduler/job.c.orig 2006-05-18 23:00:56.000000000 +0200 -+++ cups-1.2.1/scheduler/job.c 2006-06-05 14:44:04.660114500 +0200 -@@ -3090,28 +3090,6 @@ - job->status = 0; - memset(job->filters, 0, sizeof(job->filters)); - -- filterfds[1][0] = open("/dev/null", O_RDONLY); -- -- if (filterfds[1][0] < 0) -- { -- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.", -- strerror(errno)); -- snprintf(printer->state_message, sizeof(printer->state_message), -- "Unable to open \"/dev/null\" - %s.", strerror(errno)); -- -- cupsdAddPrinterHistory(printer); -- -- cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job, -- "Job canceled because the server could not open /dev/null."); -- -- goto abort_job; -- } -- -- fcntl(filterfds[1][0], F_SETFD, fcntl(filterfds[1][0], F_GETFD) | FD_CLOEXEC); -- -- cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: filterfds[%d] = [ %d %d ]", -- 1, filterfds[1][0], filterfds[1][1]); -- - for (i = 0, slot = 0, filter = (mime_filter_t *)cupsArrayFirst(filters); - filter; - i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) -@@ -3165,36 +3143,43 @@ - else - { - job->print_pipes[0] = -1; -- if (!strncmp(printer->device_uri, "file:/dev/", 10) && -- strcmp(printer->device_uri, "file:/dev/null")) -- job->print_pipes[1] = open(printer->device_uri + 5, -- O_WRONLY | O_EXCL); -- else if (!strncmp(printer->device_uri, "file:///dev/", 12) && -- strcmp(printer->device_uri, "file:///dev/null")) -- job->print_pipes[1] = open(printer->device_uri + 7, -- O_WRONLY | O_EXCL); -+ if (!strcmp(printer->device_uri, "file:/dev/null") || -+ !strcmp(printer->device_uri, "file:///dev/null")) -+ job->print_pipes[1] = -1; - else -- job->print_pipes[1] = open(printer->device_uri + 5, -- O_WRONLY | O_CREAT | O_TRUNC, 0600); -- -- if (job->print_pipes[1] < 0) - { -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "Unable to open output file \"%s\" - %s.", -- printer->device_uri, strerror(errno)); -- snprintf(printer->state_message, sizeof(printer->state_message), -- "Unable to open output file \"%s\" - %s.", -- printer->device_uri, strerror(errno)); -+ if (!strncmp(printer->device_uri, "file:/dev/", 10)) -+ job->print_pipes[1] = open(printer->device_uri + 5, -+ O_WRONLY | O_EXCL); -+ else if (!strncmp(printer->device_uri, "file:///dev/", 12)) -+ job->print_pipes[1] = open(printer->device_uri + 7, -+ O_WRONLY | O_EXCL); -+ else if (!strncmp(printer->device_uri, "file:///", 8)) -+ job->print_pipes[1] = open(printer->device_uri + 7, -+ O_WRONLY | O_CREAT | O_TRUNC, 0600); -+ else -+ job->print_pipes[1] = open(printer->device_uri + 5, -+ O_WRONLY | O_CREAT | O_TRUNC, 0600); - -- cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job, -- "Job canceled because the server could not open the " -- "output file."); -+ if (job->print_pipes[1] < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to open output file \"%s\" - %s.", -+ printer->device_uri, strerror(errno)); -+ snprintf(printer->state_message, sizeof(printer->state_message), -+ "Unable to open output file \"%s\" - %s.", -+ printer->device_uri, strerror(errno)); - -- goto abort_job; -- } -+ cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job, -+ "Job canceled because the server could not open the " -+ "output file."); - -- fcntl(job->print_pipes[1], F_SETFD, -- fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC); -+ goto abort_job; -+ } -+ -+ fcntl(job->print_pipes[1], F_SETFD, -+ fcntl(job->print_pipes[1], F_GETFD) | FD_CLOEXEC); -+ } - } - - cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -3274,25 +3259,7 @@ - argv[0] = sani_uri; - - filterfds[slot][0] = -1; -- filterfds[slot][1] = open("/dev/null", O_WRONLY); -- -- if (filterfds[slot][1] < 0) -- { -- cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to open \"/dev/null\" - %s.", -- strerror(errno)); -- snprintf(printer->state_message, sizeof(printer->state_message), -- "Unable to open \"/dev/null\" - %s.", strerror(errno)); -- -- cupsdAddPrinterHistory(printer); -- -- cupsdAddEvent(CUPSD_EVENT_JOB_COMPLETED, job->printer, job, -- "Job canceled because the server could not open a file."); -- -- goto abort_job; -- } -- -- fcntl(filterfds[slot][1], F_SETFD, -- fcntl(filterfds[slot][1], F_GETFD) | FD_CLOEXEC); -+ filterfds[slot][1] = -1; - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job: backend=\"%s\"", - command); diff --git a/cups-str1740.patch b/cups-str1740.patch deleted file mode 100644 index 073cb73..0000000 --- a/cups-str1740.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- cups-1.2.1/filter/pstops.c.orig 2006-05-22 19:31:23.000000000 +0100 -+++ cups-1.2.1/filter/pstops.c 2006-06-02 15:08:26.000000000 +0100 -@@ -1305,6 +1305,9 @@ - - if (first_page) - { -+ char *page_setup; /* PageSetup commands to send */ -+ -+ - doc_puts(doc, "%%BeginPageSetup\n"); - - if (pageinfo->num_options > 0) -@@ -1344,20 +1347,28 @@ - */ - - if (doc_setup) -+ { - doc_puts(doc, doc_setup); -+ free(doc_setup); -+ } - - if (any_setup) -+ { - doc_puts(doc, any_setup); -+ free(any_setup); -+ } -+ } - -- /* -- * Free the command strings... -- */ -+ /* -+ * Output commands for the current page... -+ */ - -- if (doc_setup) -- free(doc_setup); -+ page_setup = ppdEmitString(ppd, PPD_ORDER_PAGE, 0); - -- if (any_setup) -- free(any_setup); -+ if (page_setup) -+ { -+ doc_puts(doc, page_setup); -+ free(page_setup); - } - } - diff --git a/cups-str1776.patch b/cups-str1776.patch deleted file mode 100644 index f4a9956..0000000 --- a/cups-str1776.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cups-1.2.1/scheduler/printers.c.orig 2006-05-16 21:47:26.000000000 +0200 -+++ cups-1.2.1/scheduler/printers.c 2006-06-18 10:22:03.525788250 +0200 -@@ -665,7 +665,7 @@ - dp = (cupsd_printer_t *)cupsArrayNext(Printers)) - if (dp != p && (dp->type & CUPS_PRINTER_DEFAULT)) - { -- DefaultPrinter = p; -+ DefaultPrinter = dp; - break; - } - }