packages: cups/cups-avahi-2-backend.patch, cups/cups-avahi-5-services.patch...
baggins
baggins at pld-linux.org
Sun Feb 5 14:01:14 CET 2012
Author: baggins Date: Sun Feb 5 13:01:14 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.5.1
- numerous bugs fixed
---- Files affected:
packages/cups:
cups-avahi-2-backend.patch (1.1 -> 1.2) , cups-avahi-5-services.patch (1.1 -> 1.2) , cups-verbose-compilation.patch (1.2 -> 1.3) , cups.spec (1.313 -> 1.314) , cups-auth.patch (1.2 -> NONE) (REMOVED), cups-ssl-segfault.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/cups/cups-avahi-2-backend.patch
diff -u packages/cups/cups-avahi-2-backend.patch:1.1 packages/cups/cups-avahi-2-backend.patch:1.2
--- packages/cups/cups-avahi-2-backend.patch:1.1 Wed Dec 14 23:15:07 2011
+++ packages/cups/cups-avahi-2-backend.patch Sun Feb 5 14:01:08 2012
@@ -779,7 +779,7 @@
-
- datalen = *data++;
-
-- if (!datalen || (data + datalen) >= dataend)
+- if (!datalen || (data + datalen) > dataend)
- break;
-
- datanext = data + datalen;
================================================================
Index: packages/cups/cups-avahi-5-services.patch
diff -u packages/cups/cups-avahi-5-services.patch:1.1 packages/cups/cups-avahi-5-services.patch:1.2
--- packages/cups/cups-avahi-5-services.patch:1.1 Wed Dec 14 23:15:07 2011
+++ packages/cups/cups-avahi-5-services.patch Sun Feb 5 14:01:09 2012
@@ -1,37 +1,3 @@
-diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
-index 99b8e7b..2688eff 100644
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -1643,7 +1643,7 @@ do_config_server(http_t *http) /* I - HTTP connection */
- else
- local_protocols[0] = '\0';
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
- {
- if (local_protocols[0])
-@@ -1651,7 +1651,7 @@ do_config_server(http_t *http) /* I - HTTP connection */
- else
- strcat(local_protocols, "dnssd");
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@ do_menu(http_t *http) /* I - HTTP connection */
- #endif /* HAVE_GSSAPI */
- cgiSetVariable("KERBEROS", "");
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- cgiSetVariable("HAVE_LDAP", "1");
diff --git a/scheduler/client.c b/scheduler/client.c
index e4c9b01..984dcc5 100644
--- a/scheduler/client.c
@@ -72,22 +38,22 @@
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -27,6 +27,7 @@
- * ldap_connect() - Start new LDAP connection
- * ldap_reconnect() - Reconnect to LDAP Server
- * ldap_disconnect() - Disconnect from LDAP Server
+ * remote printers.
+ * cupsdRegisterPrinter() - Start sending broadcast information for a
+ * printer or update the broadcast contents.
+ * cupsdStartAvahiClient() - Start an Avahi client if needed
- * cupsdStartBrowsing() - Start sending and receiving broadcast
- * information.
- * cupsdStartPolling() - Start polling servers as needed.
+ * cupsdStartBrowsing() - Start sending and receiving broadcast
+ * information.
+ * cupsdStopBrowsing() - Stop sending and receiving broadcast
@@ -45,6 +46,8 @@
- * printer.
- * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT
- * record format.
+ * printer.
+ * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT
+ * record format.
+ * avahiPackTxtRecord() - Pack an array of key/value pairs into an
+ * AvahiStringList.
- * dnssdRegisterCallback() - DNSServiceRegister callback.
- * dnssdRegisterPrinter() - Start sending broadcast information for a
- * printer or update the broadcast contents.
+ * dnssdRegisterCallback() - DNSServiceRegister callback.
+ * dnssdRegisterPrinter() - Start sending broadcast information for a
+ * printer or update the broadcast contents.
@@ -83,6 +86,7 @@
*/
@@ -114,7 +80,7 @@
/*
-@@ -159,27 +174,39 @@ static void update_polling(void);
+@@ -159,26 +174,39 @@ static void update_polling(void);
static void update_smb(int onoff);
@@ -134,7 +100,6 @@
# endif /* HAVE_COREFOUNDATION */
-static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
- int for_lpd);
--static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
-static void dnssdDeregisterPrinter(cupsd_printer_t *p);
-static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
- int count);
@@ -159,9 +124,9 @@
+ void *userdata);
+#endif /* HAVE_AVAHI */
+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- {
+
+ /*
+ * 'cupsdDeregisterPrinter()' - Stop sending broadcast information for a
@@ -283,10 +310,10 @@ cupsdDeregisterPrinter(
ldap_dereg_printer(p);
#endif /* HAVE_LDAP */
@@ -224,7 +189,7 @@
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
+ if (BrowseLocalProtocols & BROWSE_DNSSD)
{
+#ifdef HAVE_DNSSD
DNSServiceErrorType error; /* Error from service creation */
@@ -260,8 +225,8 @@
+ }
+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LIBSLP
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
+ /*
+ * Enable LPD and SMB printer sharing as needed through external programs...
@@ -1834,10 +1893,10 @@ cupsdStopBrowsing(void)
BrowseSocket = -1;
}
@@ -399,24 +364,6 @@
}
-@@ -2474,7 +2588,16 @@ static int /* O - Result of comparison */
- dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
- cupsd_printer_t *b)/* I - Second printer */
- {
-- return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+ if (!a->reg_name)
-+ if (!b->reg_name)
-+ return 0;
-+ else
-+ return -1;
-+ else
-+ if (!b->reg_name)
-+ return 1;
-+ else
-+ return (_cups_strcasecmp(a->reg_name, b->reg_name));
- }
-
-
@@ -2489,6 +2612,10 @@ dnssdDeregisterPrinter(
{
cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
@@ -966,8 +913,8 @@
--- a/scheduler/dirsvc.h
+++ b/scheduler/dirsvc.h
@@ -31,6 +31,10 @@
- # endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
+ * file is missing or damaged, see the license at "http://www.cups.org/".
+ */
+#ifdef HAVE_AVAHI
+# include <avahi-client/publish.h>
@@ -977,9 +924,9 @@
* Browse protocols...
*/
@@ -131,19 +135,22 @@ VAR int PollPipe VALUE(0);
- VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL);
- /* Status buffer for pollers */
-
+ BrowseLocalProtocols
+ VALUE(BROWSE_ALL);
+ /* Protocols to support for local printers */
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
VAR char *DNSSDComputerName VALUE(NULL),
@@ -1001,7 +948,7 @@
+ /* List of dynamic ServerAlias's */
VAR DNSServiceRef DNSSDRef VALUE(NULL),
/* Master DNS-SD service reference */
- WebIFRef VALUE(NULL),
+ WebIFRef VALUE(NULL);
@@ -152,6 +159,17 @@ VAR DNSServiceRef DNSSDRef VALUE(NULL),
/* Remote printer browse reference */
#endif /* HAVE_DNSSD */
@@ -1017,26 +964,24 @@
+ /* Web interface entry group */
+#endif /* HAVE_AVAHI */
+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle BrowseSLPHandle VALUE(NULL);
- /* SLP API handle */
-@@ -195,13 +213,14 @@ extern void cupsdRegisterPrinter(cupsd_printer_t *p);
- extern void cupsdRestartPolling(void);
- extern void cupsdSaveRemoteCache(void);
- extern void cupsdSendBrowseList(void);
+ VAR char *LPDConfigFile VALUE(NULL),
+ /* LPD configuration file */
+ *SMBConfigFile VALUE(NULL);
+@@ -195,11 +213,12 @@ extern void cupsdRegisterPrinter(cupsd_printer_t *p);
+
+ extern void cupsdDeregisterPrinter(cupsd_printer_t *p, int removeit);
+ extern void cupsdRegisterPrinter(cupsd_printer_t *p);
+extern void cupsdStartAvahiClient(void);
extern void cupsdStartBrowsing(void);
- extern void cupsdStartPolling(void);
extern void cupsdStopBrowsing(void);
- extern void cupsdStopPolling(void);
-#ifdef HAVE_DNSSD
+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
extern void cupsdUpdateDNSSDName(void);
-#endif /* HAVE_DNSSD */
+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
+
+
+ /*
diff --git a/scheduler/ipp.c b/scheduler/ipp.c
index a048baa..9a3ab11 100644
--- a/scheduler/ipp.c
@@ -1071,9 +1016,9 @@
+ avahi_client_time, /* Time for next Avahi client
+ check */
+#endif /* HAVE_AVAHI */
- browse_time, /* Next browse send time */
senddoc_time, /* Send-Document time */
expire_time, /* Subscription expire time */
+ report_time, /* Malloc/client/job report time */
@@ -662,6 +666,9 @@ main(int argc, /* I - Number of command-line args */
*/
@@ -1081,9 +1026,9 @@
+#ifdef HAVE_AVAHI
+ avahi_client_time = current_time;
+#endif /* HAVE_AVAHI */
- browse_time = current_time;
event_time = current_time;
expire_time = current_time;
+ fds = 1;
@@ -884,6 +891,16 @@ main(int argc, /* I - Number of command-line args */
tmo = cupsdNextTimeout (&tmo_delay);
if (tmo && tmo_delay == 0)
================================================================
Index: packages/cups/cups-verbose-compilation.patch
diff -u packages/cups/cups-verbose-compilation.patch:1.2 packages/cups/cups-verbose-compilation.patch:1.3
--- packages/cups/cups-verbose-compilation.patch:1.2 Sat Aug 29 22:41:53 2009
+++ packages/cups/cups-verbose-compilation.patch Sun Feb 5 14:01:09 2012
@@ -6,7 +6,7 @@
-.SILENT:
+#.SILENT:
- .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+ .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
.c.o:
================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.313 packages/cups/cups.spec:1.314
--- packages/cups/cups.spec:1.313 Tue Jan 31 12:50:59 2012
+++ packages/cups/cups.spec Sun Feb 5 14:01:09 2012
@@ -17,13 +17,13 @@
Summary(pl.UTF-8): Ogólny system druku dla Uniksa
Summary(pt_BR.UTF-8): Sistema Unix de Impressão
Name: cups
-Version: 1.5.0
-Release: 10
+Version: 1.5.1
+Release: 0.1
Epoch: 1
License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
Group: Applications/Printing
Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: e54ed09ede2340fc3014913333520fe4
+# Source0-md5: 7e7026f5b6392deae46f889129b196a7
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.logrotate
@@ -44,8 +44,6 @@
Patch10: %{name}-peercred.patch
Patch11: %{name}-usb.patch
Patch12: %{name}-desktop.patch
-Patch13: %{name}-ssl-segfault.patch
-Patch14: %{name}-auth.patch
# avahi patches from fedora
Patch100: %{name}-avahi-1-config.patch
Patch101: %{name}-avahi-2-backend.patch
@@ -322,8 +320,6 @@
# why it hasn't been merged for so long (and why no other distro uses it)
#%patch11 -p1
%patch12 -p1
-%patch13 -p0
-%patch14 -p0
%patch100 -p1
%patch101 -p1
@@ -759,6 +755,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.314 2012/02/05 13:01:09 baggins
+- 1.5.1
+- numerous bugs fixed
+
Revision 1.313 2012/01/31 11:50:59 baggins
- release 10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-avahi-2-backend.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-avahi-5-services.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-verbose-compilation.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.313&r2=1.314&f=u
More information about the pld-cvs-commit
mailing list