use configure option to dont save queues between restarts instead of downstream patch reverting the issue
This commit is contained in:
Zdenek Dohnal
parent
592296aa15
commit
9003c6ec4b
@ -1,162 +1,45 @@
|
||||
diff --git a/NEWS b/NEWS
|
||||
index c2fce749..24d888ce 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -3,12 +3,6 @@ NEWS - OpenPrinting CUPS Filters v1.27.5 - 2020-06-05
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3c3d68ad..4e2ee330 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -850,6 +850,16 @@ PKG_CHECK_EXISTS([liblouis], [
|
||||
AM_CONDITIONAL(ENABLE_BRAILLE, test "x$enable_braille" = xyes)
|
||||
AC_SUBST(TABLESDIR)
|
||||
|
||||
CHANGES IN V1.27.5
|
||||
|
||||
- - cups-browsed: Do not remove the created local queues on
|
||||
- shutdown, to avoid their re-creation on restart, so that
|
||||
- desktops get no cluttered with notifications of new queues
|
||||
- being created. One can return to the old behavior via
|
||||
- "KeepGeneratedQueuesOnShutdown No" in cups-browsed.conf
|
||||
- (Ubuntu bug #1869981, #1878241).
|
||||
- cups-browsed: Do not accept DNS-SD broadcasts of IPPS type
|
||||
of "remote" CUPS queues of another CUPS instance on the
|
||||
local machine. This way we get a local queue pointing to
|
||||
+# ===============================================
|
||||
+# Should we keep generated queues after shutdown?
|
||||
+# ===============================================
|
||||
+AC_ARG_ENABLE(saving-created-queues, AS_HELP_STRING([--enable-saving-created-queues], [enable saving created queues during shutdown]),
|
||||
+ [SAVING_CREATED_QUEUES=$enableval],[SAVING_CREATED_QUEUES="no"])
|
||||
+
|
||||
+AS_IF([test "x$SAVING_CREATED_QUEUES" != "xno"],
|
||||
+ [AC_DEFINE([SAVING_CREATED_QUEUES], [1], [Define whether we save queues during shutdown])]
|
||||
+)
|
||||
+
|
||||
# =========================================
|
||||
# Local queue naming for remote CUPS queues
|
||||
# =========================================
|
||||
@@ -979,6 +989,7 @@ Build configuration:
|
||||
apple-raster: ${APPLE_RASTER_FILTER}
|
||||
pclm: ${enable_pclm}
|
||||
local queue naming for remote CUPS queues: ${REMOTE_CUPS_LOCAL_QUEUE_NAMING}
|
||||
+ keep generated queues during shutdown: ${SAVING_CREATED_QUEUES}
|
||||
all ipp printer auto-setup: ${enable_auto_setup_all}
|
||||
only driverless auto-setup: ${enable_auto_setup_driverless_only}
|
||||
only local auto-setup: ${enable_auto_setup_local_only}
|
||||
diff --git a/utils/cups-browsed.c b/utils/cups-browsed.c
|
||||
index 7ca6724c..dca3972f 100644
|
||||
index 59e3c269..00039c49 100644
|
||||
--- a/utils/cups-browsed.c
|
||||
+++ b/utils/cups-browsed.c
|
||||
@@ -456,7 +456,6 @@ static create_ipp_printer_queues_t CreateIPPPrinterQueues = IPP_PRINTERS_DRIVERL
|
||||
@@ -466,7 +466,11 @@ static create_ipp_printer_queues_t CreateIPPPrinterQueues = IPP_PRINTERS_DRIVERL
|
||||
static create_ipp_printer_queues_t CreateIPPPrinterQueues = IPP_PRINTERS_ALL;
|
||||
#endif
|
||||
#endif
|
||||
-static unsigned int KeepGeneratedQueuesOnShutdown = 1;
|
||||
+#ifdef SAVING_CREATED_QUEUES
|
||||
static unsigned int KeepGeneratedQueuesOnShutdown = 1;
|
||||
+#else
|
||||
+static unsigned int KeepGeneratedQueuesOnShutdown = 0;
|
||||
+#endif
|
||||
static ipp_queue_type_t IPPPrinterQueueType = PPD_YES;
|
||||
static int NewIPPPrinterQueuesShared = 0;
|
||||
static int AutoClustering = 1;
|
||||
@@ -10200,17 +10199,9 @@ void avahi_browser_shutdown() {
|
||||
for (p = (remote_printer_t *)cupsArrayFirst(remote_printers);
|
||||
p; p = (remote_printer_t *)cupsArrayNext(remote_printers)) {
|
||||
if (p->type && p->type[0]) {
|
||||
- if (KeepGeneratedQueuesOnShutdown) {
|
||||
- if (p->status != STATUS_TO_BE_RELEASED &&
|
||||
- p->status != STATUS_DISAPPEARED) {
|
||||
- p->status = STATUS_UNCONFIRMED;
|
||||
- p->timeout = time(NULL) + TIMEOUT_CONFIRM;
|
||||
- }
|
||||
- } else {
|
||||
- if (p->status != STATUS_TO_BE_RELEASED)
|
||||
- p->status = STATUS_DISAPPEARED;
|
||||
- p->timeout = time(NULL) + TIMEOUT_IMMEDIATELY;
|
||||
- }
|
||||
+ if (p->status != STATUS_TO_BE_RELEASED)
|
||||
+ p->status = STATUS_DISAPPEARED;
|
||||
+ p->timeout = time(NULL) + TIMEOUT_IMMEDIATELY;
|
||||
}
|
||||
}
|
||||
if (in_shutdown == 0)
|
||||
@@ -11645,13 +11636,6 @@ read_configuration (const char *filename)
|
||||
else if (!strcasecmp(value, "no") || !strcasecmp(value, "false") ||
|
||||
!strcasecmp(value, "off") || !strcasecmp(value, "0"))
|
||||
NewBrowsePollQueuesShared = 0;
|
||||
- } else if (!strcasecmp(line, "KeepGeneratedQueuesOnShutdown") && value) {
|
||||
- if (!strcasecmp(value, "yes") || !strcasecmp(value, "true") ||
|
||||
- !strcasecmp(value, "on") || !strcasecmp(value, "1"))
|
||||
- KeepGeneratedQueuesOnShutdown = 1;
|
||||
- else if (!strcasecmp(value, "no") || !strcasecmp(value, "false") ||
|
||||
- !strcasecmp(value, "off") || !strcasecmp(value, "0"))
|
||||
- KeepGeneratedQueuesOnShutdown = 0;
|
||||
} else if (!strcasecmp(line, "AutoClustering") && value) {
|
||||
if (!strcasecmp(value, "yes") || !strcasecmp(value, "true") ||
|
||||
!strcasecmp(value, "on") || !strcasecmp(value, "1"))
|
||||
@@ -12444,13 +12428,12 @@ fail:
|
||||
g_object_unref (proxy);
|
||||
|
||||
/* Remove all queues which we have set up */
|
||||
- if (KeepGeneratedQueuesOnShutdown == 0)
|
||||
- for (p = (remote_printer_t *)cupsArrayFirst(remote_printers);
|
||||
- p; p = (remote_printer_t *)cupsArrayNext(remote_printers)) {
|
||||
- if (p->status != STATUS_TO_BE_RELEASED)
|
||||
- p->status = STATUS_DISAPPEARED;
|
||||
- p->timeout = time(NULL) + TIMEOUT_IMMEDIATELY;
|
||||
- }
|
||||
+ for (p = (remote_printer_t *)cupsArrayFirst(remote_printers);
|
||||
+ p; p = (remote_printer_t *)cupsArrayNext(remote_printers)) {
|
||||
+ if (p->status != STATUS_TO_BE_RELEASED)
|
||||
+ p->status = STATUS_DISAPPEARED;
|
||||
+ p->timeout = time(NULL) + TIMEOUT_IMMEDIATELY;
|
||||
+ }
|
||||
update_cups_queues(NULL);
|
||||
|
||||
cancel_subscription (subscription_id);
|
||||
diff --git a/utils/cups-browsed.conf.5 b/utils/cups-browsed.conf.5
|
||||
index 8ef649fd..99ed3796 100644
|
||||
--- a/utils/cups-browsed.conf.5
|
||||
+++ b/utils/cups-browsed.conf.5
|
||||
@@ -732,27 +732,6 @@ not to share newly discovered IPP printers.
|
||||
.fam C
|
||||
NewIPPPrinterQueuesShared Yes
|
||||
|
||||
-.fam T
|
||||
-.fi
|
||||
-How to handle the print queues cups-browsed creates when cups-browsed
|
||||
-is shut down:
|
||||
-.PP
|
||||
-"KeepGeneratedQueuesOnShutdown No" makes the queues being
|
||||
-removed. This makes sense as these queues only work while cups-browsed
|
||||
-is running. cups-browsed has to determine to which member printer of a
|
||||
-cluster to pass on the job.
|
||||
-.PP
|
||||
-"KeepGeneratedQueuesOnShutdown Yes" (the default) makes the queues not
|
||||
-being removed. This is the recommended setting for a system where
|
||||
-cups-browsed is permanently running and only stopped for short times
|
||||
-(like log rotation) or on shutdown. This avoids the re-creation of the
|
||||
-queues when cups-browsed is restarted, which often causes a clutter of
|
||||
-CUPS notifications on the desktop.
|
||||
-.PP
|
||||
-.nf
|
||||
-.fam C
|
||||
- KeepGeneratedQueuesOnShutdown No
|
||||
-
|
||||
.fam T
|
||||
.fi
|
||||
If there is more than one remote CUPS printer whose local queue
|
||||
@@ -869,7 +848,7 @@ local queue named "LJ4050":
|
||||
.fi
|
||||
As DNS-SD service names are unique in a network you can create a
|
||||
cluster from exactly specified printers (spaces replaced by
|
||||
-underscores):
|
||||
+underscors):
|
||||
.PP
|
||||
.nf
|
||||
.fam C
|
||||
diff --git a/utils/cups-browsed.conf.in b/utils/cups-browsed.conf.in
|
||||
index 7e248c51..ca4371fe 100644
|
||||
--- a/utils/cups-browsed.conf.in
|
||||
+++ b/utils/cups-browsed.conf.in
|
||||
@@ -552,23 +552,6 @@ BrowseRemoteProtocols @BROWSEREMOTEPROTOCOLS@
|
||||
# NewIPPPrinterQueuesShared Yes
|
||||
|
||||
|
||||
-# How to handle the print queues cups-browsed creates when
|
||||
-# cups-browsed is shut down:
|
||||
-
|
||||
-# "KeepGeneratedQueuesOnShutdown No" makes the queues being
|
||||
-# removed. This makes sense as these queues only work while
|
||||
-# cups-browsed is running. cups-browsed has to determine to which
|
||||
-# member printer of a cluster to pass on the job.
|
||||
-
|
||||
-# "KeepGeneratedQueuesOnShutdown Yes" (the default) makes the queues
|
||||
-# not being removed. This is the recommended setting for a system
|
||||
-# where cups-browsed is permanently running and only stopped for short
|
||||
-# times (like log rotation) or on shutdown. This avoids the
|
||||
-# re-creation of the queues when cups-browsed is restarted, which
|
||||
-# often causes a clutter of CUPS notifications on the desktop.
|
||||
-
|
||||
-# KeepGeneratedQueuesOnShutdown No
|
||||
-
|
||||
# If there is more than one remote CUPS printer whose local queue
|
||||
# would get the same name and AutoClustering is set to "Yes" (the
|
||||
# default) only one local queue is created which makes up a
|
||||
@@ -664,7 +647,7 @@ BrowseRemoteProtocols @BROWSEREMOTEPROTOCOLS@
|
||||
|
||||
# As DNS-SD service names are unique in a network you can create a
|
||||
# cluster from exactly specified printers (spaces replaced by
|
||||
-# underscores):
|
||||
+# underscors):
|
||||
|
||||
# Cluster hrdep: oldlaser_@_hr-server1 newlaser_@_hr-server2
|
||||
|
||||
|
||||
@ -324,6 +324,7 @@ done
|
||||
* Fri Aug 21 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.27.5-7
|
||||
- use configure option instead of downstream, cups-browsed.conf editing, patch
|
||||
- the exact path in cups-browsed manpage was removed, use the patch removing it instead of downstream one
|
||||
- use configure option to dont save queues between restarts instead of downstream patch reverting the issue
|
||||
|
||||
* Wed Aug 19 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1.27.5-6
|
||||
- 1867412 - cups-browsed leaks memory
|
||||
|
||||
Loading…
Reference in New Issue
Block a user