rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed avahi-no-threaded patch (was missing part of cupsd.h).

Browse Source 
Thanks to Joseph Wang for spotting it.
This commit is contained in:
Tim Waugh 2013-07-22 11:48:45 +01:00
parent 821355b1d4
commit 0fed0db9c4
2 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cups-avahi-no-threaded.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.7b1/scheduler/avahi.c.avahi-no-threaded cups-1.7b1/scheduler/avahi.c diff -up cups-1.7rc1/scheduler/avahi.c.avahi-no-threaded cups-1.7rc1/scheduler/avahi.c
--- cups-1.7b1/scheduler/avahi.c.avahi-no-threaded 2013-07-01 17:29:12.442460964 +0100 --- cups-1.7rc1/scheduler/avahi.c.avahi-no-threaded 2013-07-22 11:47:27.599101572 +0100
+++ cups-1.7b1/scheduler/avahi.c 2013-07-01 17:29:12.442460964 +0100 +++ cups-1.7rc1/scheduler/avahi.c 2013-07-22 11:47:27.599101572 +0100
@@ -0,0 +1,441 @@ @@ -0,0 +1,441 @@
+/* +/*
+ * "$Id$" + * "$Id$"
@ -443,9 +443,9 @@ diff -up cups-1.7b1/scheduler/avahi.c.avahi-no-threaded cups-1.7b1/scheduler/ava
+/* +/*
+ * End of "$Id$". + * End of "$Id$".
+ */ + */
diff -up cups-1.7b1/scheduler/avahi.h.avahi-no-threaded cups-1.7b1/scheduler/avahi.h diff -up cups-1.7rc1/scheduler/avahi.h.avahi-no-threaded cups-1.7rc1/scheduler/avahi.h
--- cups-1.7b1/scheduler/avahi.h.avahi-no-threaded 2013-07-01 17:29:12.442460964 +0100 --- cups-1.7rc1/scheduler/avahi.h.avahi-no-threaded 2013-07-22 11:47:27.599101572 +0100
+++ cups-1.7b1/scheduler/avahi.h 2013-07-01 17:29:12.442460964 +0100 +++ cups-1.7rc1/scheduler/avahi.h 2013-07-22 11:47:27.599101572 +0100
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * "$Id$" + * "$Id$"
@ -516,9 +516,9 @@ diff -up cups-1.7b1/scheduler/avahi.h.avahi-no-threaded cups-1.7b1/scheduler/ava
+/* +/*
+ * End of "$Id$". + * End of "$Id$".
+ */ + */
diff -up cups-1.7b1/scheduler/cupsd.h.avahi-no-threaded cups-1.7b1/scheduler/cupsd.h diff -up cups-1.7rc1/scheduler/cupsd.h.avahi-no-threaded cups-1.7rc1/scheduler/cupsd.h
--- cups-1.7b1/scheduler/cupsd.h.avahi-no-threaded 2013-03-08 00:45:54.000000000 +0000 --- cups-1.7rc1/scheduler/cupsd.h.avahi-no-threaded 2013-05-29 12:51:34.000000000 +0100
+++ cups-1.7b1/scheduler/cupsd.h 2013-07-01 17:29:12.443460968 +0100 +++ cups-1.7rc1/scheduler/cupsd.h 2013-07-22 11:47:31.319118984 +0100
@@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int); @@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int);
#include "colorman.h" #include "colorman.h"
#include "conf.h" #include "conf.h"
@ -555,9 +555,27 @@ diff -up cups-1.7b1/scheduler/cupsd.h.avahi-no-threaded cups-1.7b1/scheduler/cup
/* /*
* Prototypes... * Prototypes...
diff -up cups-1.7b1/scheduler/dirsvc.c.avahi-no-threaded cups-1.7b1/scheduler/dirsvc.c @@ -229,6 +244,17 @@ extern void cupsdStopSelect(void);
--- cups-1.7b1/scheduler/dirsvc.c.avahi-no-threaded 2012-11-01 00:57:55.000000000 +0000 extern void cupsdStartServer(void);
+++ cups-1.7b1/scheduler/dirsvc.c 2013-07-01 17:29:12.443460968 +0100 extern void cupsdStopServer(void);
+#ifdef HAVE_AVAHI
+extern void cupsdInitTimeouts(void);
+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
+ cupsd_timeoutfunc_t cb,
+ void *data);
+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
+extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
+ const struct timeval *tv);
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
+#endif /* HAVE_AVAHI */
/*
* End of "$Id: cupsd.h 10996 2013-05-29 11:51:34Z msweet $".
diff -up cups-1.7rc1/scheduler/dirsvc.c.avahi-no-threaded cups-1.7rc1/scheduler/dirsvc.c
--- cups-1.7rc1/scheduler/dirsvc.c.avahi-no-threaded 2013-05-29 12:51:34.000000000 +0100
+++ cups-1.7rc1/scheduler/dirsvc.c 2013-07-22 11:47:27.600101576 +0100
@@ -212,7 +212,7 @@ cupsdStartBrowsing(void) @@ -212,7 +212,7 @@ cupsdStartBrowsing(void)
} }
@ -632,9 +650,9 @@ diff -up cups-1.7b1/scheduler/dirsvc.c.avahi-no-threaded cups-1.7b1/scheduler/di
DNSSDMaster = NULL; DNSSDMaster = NULL;
# endif /* HAVE_DNSSD */ # endif /* HAVE_DNSSD */
diff -up cups-1.7b1/scheduler/dirsvc.h.avahi-no-threaded cups-1.7b1/scheduler/dirsvc.h diff -up cups-1.7rc1/scheduler/dirsvc.h.avahi-no-threaded cups-1.7rc1/scheduler/dirsvc.h
--- cups-1.7b1/scheduler/dirsvc.h.avahi-no-threaded 2012-04-17 00:26:18.000000000 +0100 --- cups-1.7rc1/scheduler/dirsvc.h.avahi-no-threaded 2013-05-29 12:51:34.000000000 +0100
+++ cups-1.7b1/scheduler/dirsvc.h 2013-07-01 17:29:12.444460972 +0100 +++ cups-1.7rc1/scheduler/dirsvc.h 2013-07-22 11:47:27.600101576 +0100
@@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU @@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
VAR DNSServiceRef DNSSDMaster VALUE(NULL); VAR DNSServiceRef DNSSDMaster VALUE(NULL);
/* Master DNS-SD service reference */ /* Master DNS-SD service reference */
@ -644,9 +662,9 @@ diff -up cups-1.7b1/scheduler/dirsvc.h.avahi-no-threaded cups-1.7b1/scheduler/di
/* Master polling interface for Avahi */ /* Master polling interface for Avahi */
VAR AvahiClient *DNSSDClient VALUE(NULL); VAR AvahiClient *DNSSDClient VALUE(NULL);
/* Client information */ /* Client information */
diff -up cups-1.7b1/scheduler/main.c.avahi-no-threaded cups-1.7b1/scheduler/main.c diff -up cups-1.7rc1/scheduler/main.c.avahi-no-threaded cups-1.7rc1/scheduler/main.c
--- cups-1.7b1/scheduler/main.c.avahi-no-threaded 2013-07-01 17:29:12.420460874 +0100 --- cups-1.7rc1/scheduler/main.c.avahi-no-threaded 2013-07-22 11:47:27.578101474 +0100
+++ cups-1.7b1/scheduler/main.c 2013-07-01 17:29:12.444460972 +0100 +++ cups-1.7rc1/scheduler/main.c 2013-07-22 11:47:27.601101581 +0100
@@ -155,6 +155,10 @@ main(int argc, /* I - Number of comm @@ -155,6 +155,10 @@ main(int argc, /* I - Number of comm
int launchd_idle_exit; int launchd_idle_exit;
/* Idle exit on select timeout? */ /* Idle exit on select timeout? */
@ -721,9 +739,9 @@ diff -up cups-1.7b1/scheduler/main.c.avahi-no-threaded cups-1.7b1/scheduler/main
/* /*
* Check whether we are accepting new connections... * Check whether we are accepting new connections...
*/ */
diff -up cups-1.7b1/scheduler/Makefile.avahi-no-threaded cups-1.7b1/scheduler/Makefile diff -up cups-1.7rc1/scheduler/Makefile.avahi-no-threaded cups-1.7rc1/scheduler/Makefile
--- cups-1.7b1/scheduler/Makefile.avahi-no-threaded 2013-07-01 17:29:12.421460878 +0100 --- cups-1.7rc1/scheduler/Makefile.avahi-no-threaded 2013-07-22 11:47:27.578101474 +0100
+++ cups-1.7b1/scheduler/Makefile 2013-07-01 17:29:12.444460972 +0100 +++ cups-1.7rc1/scheduler/Makefile 2013-07-22 11:47:27.601101581 +0100
@@ -17,6 +17,7 @@ include ../Makedefs @@ -17,6 +17,7 @@ include ../Makedefs
CUPSDOBJS = \ CUPSDOBJS = \
@ -740,9 +758,9 @@ diff -up cups-1.7b1/scheduler/Makefile.avahi-no-threaded cups-1.7b1/scheduler/Ma
tls.o tls.o
LIBOBJS = \ LIBOBJS = \
filter.o \ filter.o \
diff -up cups-1.7b1/scheduler/timeout.c.avahi-no-threaded cups-1.7b1/scheduler/timeout.c diff -up cups-1.7rc1/scheduler/timeout.c.avahi-no-threaded cups-1.7rc1/scheduler/timeout.c
--- cups-1.7b1/scheduler/timeout.c.avahi-no-threaded 2013-07-01 17:29:12.445460976 +0100 --- cups-1.7rc1/scheduler/timeout.c.avahi-no-threaded 2013-07-22 11:47:27.601101581 +0100
+++ cups-1.7b1/scheduler/timeout.c 2013-07-01 17:29:12.445460976 +0100 +++ cups-1.7rc1/scheduler/timeout.c 2013-07-22 11:47:27.601101581 +0100
@@ -0,0 +1,235 @@ @@ -0,0 +1,235 @@
+/* +/*
+ * "$Id$" + * "$Id$"

6
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7 Version: 1.7
Release: 0.18.%{prever}%{?dist} Release: 0.19.%{prever}%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -629,6 +629,10 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Mon Jul 22 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.19.rc1
- Fixed avahi-no-threaded patch (was missing part of cupsd.h). Thanks
to Joseph Wang for spotting it.
* Thu Jul 18 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.18.rc1 * Thu Jul 18 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.18.rc1
- Fixed downoad URL to point to the actual source, not a download - Fixed downoad URL to point to the actual source, not a download
page. page.