rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase to cups-2.2rc1

Browse Source
This commit is contained in:
Zdenek Dohnal 2016-08-09 11:59:55 +02:00
parent b8c3875a3b
commit bd1cd7b34d
6 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -76,3 +76,4 @@ cups-1.4.4-source.tar.bz2
/cups-2.1.3-source.tar.bz2 /cups-2.1.3-source.tar.bz2
/cups-2.1.4-source.tar.gz /cups-2.1.4-source.tar.gz
/cups-2.2b2-source.tar.gz /cups-2.2b2-source.tar.gz
/cups-2.2rc1-source.tar.gz

BIN
cups-2.2b2-source.tar.gz.sig
View File

Binary file not shown.

BIN
cups-2.2rc1-source.tar.gz.sig Normal file
View File

Binary file not shown.

57
cups-serverbin-compat.patch
View File

@ -1,7 +1,7 @@
diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.c diff -up cups-2.2rc1/scheduler/conf.c.serverbin-compat cups-2.2rc1/scheduler/conf.c
--- cups-1.5b1/scheduler/conf.c.serverbin-compat 2011-05-20 06:24:54.000000000 +0200 --- cups-2.2rc1/scheduler/conf.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200
+++ cups-1.5b1/scheduler/conf.c 2011-05-23 17:20:33.000000000 +0200 +++ cups-2.2rc1/scheduler/conf.c 2016-08-09 09:58:21.324033645 +0200
@@ -491,6 +491,9 @@ cupsdReadConfiguration(void) @@ -609,6 +609,9 @@ cupsdReadConfiguration(void)
cupsdClearString(&ServerName); cupsdClearString(&ServerName);
cupsdClearString(&ServerAdmin); cupsdClearString(&ServerAdmin);
cupsdSetString(&ServerBin, CUPS_SERVERBIN); cupsdSetString(&ServerBin, CUPS_SERVERBIN);
@ -11,7 +11,7 @@ diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.
cupsdSetString(&RequestRoot, CUPS_REQUESTS); cupsdSetString(&RequestRoot, CUPS_REQUESTS);
cupsdSetString(&CacheDir, CUPS_CACHEDIR); cupsdSetString(&CacheDir, CUPS_CACHEDIR);
cupsdSetString(&DataDir, CUPS_DATADIR); cupsdSetString(&DataDir, CUPS_DATADIR);
@@ -1378,7 +1381,12 @@ cupsdReadConfiguration(void) @@ -1604,7 +1607,12 @@ cupsdReadConfiguration(void)
* Read the MIME type and conversion database... * Read the MIME type and conversion database...
*/ */
@ -24,10 +24,10 @@ diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.
snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir);
MimeDatabase = mimeNew(); MimeDatabase = mimeNew();
diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.h diff -up cups-2.2rc1/scheduler/conf.h.serverbin-compat cups-2.2rc1/scheduler/conf.h
--- cups-1.5b1/scheduler/conf.h.serverbin-compat 2011-04-22 19:47:03.000000000 +0200 --- cups-2.2rc1/scheduler/conf.h.serverbin-compat 2016-08-08 20:06:00.000000000 +0200
+++ cups-1.5b1/scheduler/conf.h 2011-05-23 15:34:25.000000000 +0200 +++ cups-2.2rc1/scheduler/conf.h 2016-08-09 09:58:21.325033636 +0200
@@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) @@ -106,6 +106,10 @@ VAR char *ConfigurationFile VALUE(NULL)
/* Root directory for scheduler */ /* Root directory for scheduler */
*ServerBin VALUE(NULL), *ServerBin VALUE(NULL),
/* Root directory for binaries */ /* Root directory for binaries */
@ -38,10 +38,10 @@ diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.
*StateDir VALUE(NULL), *StateDir VALUE(NULL),
/* Root directory for state data */ /* Root directory for state data */
*RequestRoot VALUE(NULL), *RequestRoot VALUE(NULL),
diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c diff -up cups-2.2rc1/scheduler/env.c.serverbin-compat cups-2.2rc1/scheduler/env.c
--- cups-1.5b1/scheduler/env.c.serverbin-compat 2011-01-11 04:48:42.000000000 +0100 --- cups-2.2rc1/scheduler/env.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200
+++ cups-1.5b1/scheduler/env.c 2011-05-23 17:07:17.000000000 +0200 +++ cups-2.2rc1/scheduler/env.c 2016-08-09 09:58:21.325033636 +0200
@@ -218,8 +218,13 @@ cupsdUpdateEnv(void) @@ -212,8 +212,13 @@ cupsdUpdateEnv(void)
set_if_undefined("LD_PRELOAD", NULL); set_if_undefined("LD_PRELOAD", NULL);
set_if_undefined("NLSPATH", NULL); set_if_undefined("NLSPATH", NULL);
if (find_env("PATH") < 0) if (find_env("PATH") < 0)
@ -55,10 +55,10 @@ diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c
set_if_undefined("SERVER_ADMIN", ServerAdmin); set_if_undefined("SERVER_ADMIN", ServerAdmin);
set_if_undefined("SHLIB_PATH", NULL); set_if_undefined("SHLIB_PATH", NULL);
set_if_undefined("SOFTWARE", CUPS_MINIMAL); set_if_undefined("SOFTWARE", CUPS_MINIMAL);
diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c diff -up cups-2.2rc1/scheduler/ipp.c.serverbin-compat cups-2.2rc1/scheduler/ipp.c
--- cups-1.5b1/scheduler/ipp.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 --- cups-2.2rc1/scheduler/ipp.c.serverbin-compat 2016-08-09 09:58:21.326033626 +0200
+++ cups-1.5b1/scheduler/ipp.c 2011-05-23 16:09:57.000000000 +0200 +++ cups-2.2rc1/scheduler/ipp.c 2016-08-09 10:10:16.266127629 +0200
@@ -2586,9 +2586,18 @@ add_printer(cupsd_client_t *con, /* I - @@ -2419,12 +2419,21 @@ add_printer(cupsd_client_t *con, /* I -
* Could not find device in list! * Could not find device in list!
*/ */
@ -70,6 +70,9 @@ diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c
+#endif /* __x86_64__ */ +#endif /* __x86_64__ */
send_ipp_status(con, IPP_NOT_POSSIBLE, send_ipp_status(con, IPP_NOT_POSSIBLE,
_("Bad device-uri scheme \"%s\"."), scheme); _("Bad device-uri scheme \"%s\"."), scheme);
if (!modify)
cupsdDeletePrinter(printer, 0);
return; return;
+#ifdef __x86_64__ +#ifdef __x86_64__
+ } + }
@ -77,10 +80,10 @@ diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c
} }
} }
diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c diff -up cups-2.2rc1/scheduler/job.c.serverbin-compat cups-2.2rc1/scheduler/job.c
--- cups-1.5b1/scheduler/job.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 --- cups-2.2rc1/scheduler/job.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200
+++ cups-1.5b1/scheduler/job.c 2011-05-23 16:18:57.000000000 +0200 +++ cups-2.2rc1/scheduler/job.c 2016-08-09 09:58:21.327033616 +0200
@@ -1047,8 +1047,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I @@ -1126,8 +1126,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I
i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) i ++, filter = (mime_filter_t *)cupsArrayNext(filters))
{ {
if (filter->filter[0] != '/') if (filter->filter[0] != '/')
@ -115,7 +118,7 @@ diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c
else else
strlcpy(command, filter->filter, sizeof(command)); strlcpy(command, filter->filter, sizeof(command));
@@ -1199,6 +1223,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I @@ -1283,6 +1307,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I
{ {
cupsdClosePipe(job->back_pipes); cupsdClosePipe(job->back_pipes);
cupsdClosePipe(job->side_pipes); cupsdClosePipe(job->side_pipes);
@ -144,10 +147,10 @@ diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c
close(job->status_pipes[1]); close(job->status_pipes[1]);
job->status_pipes[1] = -1; job->status_pipes[1] = -1;
diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/printers.c diff -up cups-2.2rc1/scheduler/printers.c.serverbin-compat cups-2.2rc1/scheduler/printers.c
--- cups-1.5b1/scheduler/printers.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 --- cups-2.2rc1/scheduler/printers.c.serverbin-compat 2016-08-08 20:06:00.000000000 +0200
+++ cups-1.5b1/scheduler/printers.c 2011-05-23 17:09:04.000000000 +0200 +++ cups-2.2rc1/scheduler/printers.c 2016-08-09 09:58:21.327033616 +0200
@@ -1030,9 +1030,19 @@ cupsdLoadAllPrinters(void) @@ -967,9 +967,19 @@ cupsdLoadAllPrinters(void)
* Backend does not exist, stop printer... * Backend does not exist, stop printer...
*/ */
@ -167,7 +170,7 @@ diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/p
} }
} }
@@ -3621,8 +3631,20 @@ add_printer_filter( @@ -3481,8 +3491,20 @@ add_printer_filter(
else else
snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program);

7
cups.spec
View File

@ -7,7 +7,7 @@
# but we use lib for compatibility with 3rd party drivers (at upstream request). # but we use lib for compatibility with 3rd party drivers (at upstream request).
%global cups_serverbin %{_exec_prefix}/lib/cups %global cups_serverbin %{_exec_prefix}/lib/cups
%global prever b2 %global prever rc1
%global VERSION %{version}%{prever} %global VERSION %{version}%{prever}
#%%global VERSION %{version} #%%global VERSION %{version}
@ -15,7 +15,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.2 Version: 2.2
Release: 0.2%{prever}%{?dist} Release: 0.1%{prever}%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@ -617,6 +617,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Aug 09 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2-0.2rc1
- rebase to cups-2.2rc1
* Wed Aug 03 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2-0.2b2 * Wed Aug 03 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2-0.2b2
- bug 1358589 - added information about syslog means systemd journal by default - bug 1358589 - added information about syslog means systemd journal by default

2
sources
View File

@ -1 +1 @@
817fd56423d74dada906cc9e9ebee206 cups-2.2b2-source.tar.gz 7918e68de41e2013cb580bae9004c410 cups-2.2rc1-source.tar.gz