packages (DEVEL): cups/cups-certs_FHS.patch, cups/cups-dnssd.patch - adjust...

[lisu]

Author: lisu                         Date: Mon Jun  1 12:05:26 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- adjusted for 1.4b3

---- Files affected:
packages/cups:
   cups-certs_FHS.patch (1.1 -> 1.1.4.1) , cups-dnssd.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: packages/cups/cups-certs_FHS.patch
diff -u packages/cups/cups-certs_FHS.patch:1.1 packages/cups/cups-certs_FHS.patch:1.1.4.1
--- packages/cups/cups-certs_FHS.patch:1.1	Mon Dec 18 15:01:21 2006
+++ packages/cups/cups-certs_FHS.patch	Mon Jun  1 14:05:21 2009
@@ -1,25 +1,32 @@
---- cups-1.2.7/config-scripts/cups-directories.m4.orig	2006-08-29 22:48:59.000000000 +0200
-+++ cups-1.2.7/config-scripts/cups-directories.m4	2006-12-18 03:28:33.624756362 +0100
-@@ -311,8 +311,14 @@
+--- cups-1.4b3/config-scripts/cups-directories.m4~	2009-04-13 01:04:51.000000000 +0200
++++ cups-1.4b3/config-scripts/cups-directories.m4	2009-06-01 10:44:33.000000000 +0200
+@@ -411,16 +411,13 @@
  AC_SUBST(CUPS_SERVERROOT)
  
  # Transient run-time state
--CUPS_STATEDIR="$localstatedir/run/cups"
--AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
+-case "$uname" in
+-	Darwin*)
+-		# Darwin (Mac OS X)
+-		CUPS_STATEDIR="$CUPS_SERVERROOT"
+-		;;
+-	*)
+-		# All others
+-		CUPS_STATEDIR="$localstatedir/run/cups"
+-		;;
+-esac
 +AC_ARG_WITH(logdir, [  --with-statedir           set path for certs state],statedir="$withval",statedir="")
 +
 +if test x$logdir = x; then
-+	CUPS_STATEDIR="$localstatedir/lib/cups"
++       CUPS_STATEDIR="$localstatedir/lib/cups"
 +else
-+	CUPS_STATEDIR="$statedir"
++       CUPS_STATEDIR="$statedir"
 +fi
-+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
+ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
  AC_SUBST(CUPS_STATEDIR)
  
- dnl
---- cups-1.2.7/config-scripts/cups-network.m4.orig	2006-10-20 17:07:21.000000000 +0200
-+++ cups-1.2.7/config-scripts/cups-network.m4	2006-12-18 03:30:16.608100516 +0100
-@@ -72,7 +72,7 @@
+--- cups-1.4b3/config-scripts/cups-network.m4~	2008-09-09 00:03:01.000000000 +0200
++++ cups-1.4b3/config-scripts/cups-network.m4	2009-06-01 10:45:32.000000000 +0200
+@@ -49,7 +49,7 @@
  				;;
  			*)
  				# All others use FHS standard...

================================================================
Index: packages/cups/cups-dnssd.patch
diff -u packages/cups/cups-dnssd.patch:1.1.2.1 packages/cups/cups-dnssd.patch:1.1.2.2
--- packages/cups/cups-dnssd.patch:1.1.2.1	Fri Dec 19 16:31:33 2008
+++ packages/cups/cups-dnssd.patch	Mon Jun  1 14:05:21 2009
@@ -1,6 +1,6 @@
---- cups-1.4b2/Makedefs.in~	2008-12-19 16:19:46.000000000 +0100
-+++ cups-1.4b2/Makedefs.in	2008-12-19 16:20:36.000000000 +0100
-@@ -124,7 +124,7 @@
+--- cups-1.4b3/Makedefs.in~	2009-06-01 10:47:46.000000000 +0200
++++ cups-1.4b3/Makedefs.in	2009-06-01 10:49:03.000000000 +0200
+@@ -123,7 +123,7 @@
  BACKLIBS	=	@BACKLIBS@
  BANNERTOPS	=	@BANNERTOPS@
  CFLAGS		=	@CPPFLAGS@ @CFLAGS@
@@ -9,9 +9,9 @@
  CUPSDLIBS	=	@CUPSDLIBS@
  CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
  CXXLIBS		=	@CXXLIBS@
---- cups-1.4b2/scheduler/dirsvc.c~	2008-10-08 06:26:38.000000000 +0200
-+++ cups-1.4b2/scheduler/dirsvc.c	2008-12-19 16:22:36.000000000 +0100
-@@ -1948,7 +1948,7 @@
+--- cups-1.4b3/scheduler/dirsvc.c~	2009-05-14 19:54:37.000000000 +0200
++++ cups-1.4b3/scheduler/dirsvc.c	2009-06-01 10:54:49.000000000 +0200
+@@ -2042,7 +2042,7 @@
  
      WebIFRef = DNSSDRef;
      if ((error = DNSServiceRegister(&WebIFRef,
@@ -20,21 +20,21 @@
  				    0, webif, "_http._tcp", NULL,
  				    NULL, htons(DNSSDPort), 7,
  				    "\006path=/", dnssdRegisterCallback,
-@@ -2622,7 +2622,7 @@
+@@ -2765,7 +2765,7 @@
      do
      {
        p->ipp_ref = DNSSDRef;
 -      if ((se = DNSServiceRegister(&p->ipp_ref, kDNSServiceFlagsShareConnection,
 +      if ((se = DNSServiceRegister(&p->ipp_ref, 0,
-                                    0, name, regtype, domain, NULL,
+                                    0, name, regtype, NULL, NULL,
  				   htons(DNSSDPort), ipp_len, ipp_txt,
  				   dnssdRegisterCallback,
-@@ -2693,7 +2693,7 @@
+@@ -2854,7 +2854,7 @@
  
        p->printer_ref = DNSSDRef;
        if ((se = DNSServiceRegister(&p->printer_ref,
 -                                   kDNSServiceFlagsShareConnection,
 +                                   0,
- 				   0, name, "_printer._tcp", domain, NULL,
+ 				   0, name, "_printer._tcp", NULL, NULL,
  				   htons(515), printer_len, printer_txt,
  				   dnssdRegisterCallback,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-certs_FHS.patch?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups-dnssd.patch?r1=1.1.2.1&r2=1.1.2.2&f=u