rpms/cups/devel cups-svn.patch,1.2,1.3 cups.spec,1.179,1.180

Tue May 2 11:32:31 UTC 2006

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28744

Modified Files:
	cups-svn.patch cups.spec 
Log Message:
* Tue May  2 2006 Tim Waugh <twaugh at redhat.com>
- Sync to svn5473.


cups-svn.patch:
 0 files changed

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 cups-svn.patch
Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- cups-svn.patch	28 Apr 2006 12:41:35 -0000	1.2
+++ cups-svn.patch	2 May 2006 11:32:17 -0000	1.3
@@ -7,6 +7,14 @@
 +    return gFalse;
 +  }
 +
+--- packaging/cups.list.in	(revision 5460)
++++ packaging/cups.list.in	(working copy)
+@@ -31 +31 @@
+-%readme packaging/cups.license
++%readme packaging/cups.readme
+@@ -175 +175 @@
+-$MAN8EXT=@MAN8EXT@
++$MAN7EXT=@MAN7EXT@
 --- Makedefs.in	(revision 5460)
 +++ Makedefs.in	(working copy)
 @@ -133 +133 @@
@@ -40,7 +48,7 @@
 +
 +#
 --- backend/pap.c	(revision 0)
-+++ backend/pap.c	(revision 5470)
++++ backend/pap.c	(revision 5473)
 @@ -0,0 +1,1516 @@
 +/*
 +* "$Id$"
@@ -1565,6 +1573,9 @@
 +AC_ARG_WITH(printcap, [  --with-printcap         set default printcap file],
 --- config-scripts/cups-compiler.m4	(revision 5460)
 +++ config-scripts/cups-compiler.m4	(working copy)
+@@ -76 +76 @@
+-AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fpie option, default=no])
++AC_ARG_ENABLE(pie, [  --enable-pie            use GCC -fPIE option, default=no])
 @@ -81,0 +82,3 @@
 +PIEFLAGS=""
 +AC_SUBST(PIEFLAGS)
@@ -1572,7 +1583,7 @@
 @@ -99,2 +102,7 @@
 -				OPTIM="$OPTIM -fpie"
 -				LDFLAGS="$LDFLAGS -pie"
-+				PIEFLAGS="-pie -fpie"
++				PIEFLAGS="-pie -fPIE"
 +			fi
 +			;;
 +
@@ -1580,7 +1591,7 @@
 +			if test x$enable_pie = xyes; then
 +				echo "Sorry, --enable-pie is not supported on this OS!"
 --- config-scripts/cups-pap.m4	(revision 0)
-+++ config-scripts/cups-pap.m4	(revision 5470)
++++ config-scripts/cups-pap.m4	(revision 5473)
 @@ -0,0 +1,36 @@
 +dnl
 +dnl "$Id$"
@@ -1618,6 +1629,84 @@
 +dnl
 +dnl End of "$Id$".
 +dnl
+--- doc/help/whatsnew.html	(revision 5460)
++++ doc/help/whatsnew.html	(working copy)
+@@ -33,0 +34,3 @@
++		<LI><EM>Network Printer Discovery;</EM> CUPS can
++		now find printers on the LAN using SNMP</LI>
++
+@@ -38 +41 @@
+-	<DD><OL START="4">
++	<DD><OL START="5">
+@@ -79 +82 @@
+-	<DD><OL START="11">
++	<DD><OL START="12">
+@@ -172 +175 @@
+-	<DD><OL START="30"></EM></LI>
++	<DD><OL START="31"></EM></LI>
+@@ -272 +275 @@
+-	<DD><OL START="48">
++	<DD><OL START="49">
+@@ -379 +382 @@
+-	<DD><OL START="68">
++	<DD><OL START="69">
+@@ -396 +399 @@
+-	<DD><OL START="71">
++	<DD><OL START="72">
+@@ -414 +417 @@
+-	<DD><OL START="74">
++	<DD><OL START="75">
+@@ -449 +452 @@
+-	<DD><OL START="81">
++	<DD><OL START="82">
+@@ -506 +509 @@
+-	<DD><OL START="91">
++	<DD><OL START="92">
+@@ -522 +525 @@
+-	<DD><OL START="93">
++	<DD><OL START="94">
+--- doc/help/ref-cupsd-conf.html	(revision 5460)
++++ doc/help/ref-cupsd-conf.html	(working copy)
+@@ -931,0 +932,16 @@
++<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2</SPAN><A NAME="DefaultShared">DefaultShared</A></H2>
++
++<H3>Examples</H3>
++
++<PRE CLASS="command">
++DefaultShared yes
++DefaultShared no
++</PRE>
++
++<H3>Description</H3>
++
++<P>The <CODE>DefaultShared</CODE> directive specifies whether
++printers are shared (published) by default. The default is
++<CODE>yes</CODE>.</P>
++
++
+@@ -2669,0 +2686,22 @@
++<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2</SPAN><A NAME="UseNetworkDefault">UseNetworkDefault</A></H2>
++
++<H3>Examples</H3>
++
++<PRE CLASS="command">
++UseNetworkDefault yes
++UseNetworkDefault no
++</PRE>
++
++<H3>Description</H3>
++
++<P>The <CODE>UseNetworkDefault</CODE> directive controls whether
++the client will use a network/remote printer as a default
++printer. If enabled, the default printer of a server is used as
++the default printer on a client. When multiple servers are
++advertising a default printer, the client's default printer is
++set to the first discovered printer, or to the implicit class for
++the same printer available from multiple servers.</P>
++
++<P>The default is <CODE>yes</CODE>.</P>
++
++
 --- cups/string.h	(revision 5460)
 +++ cups/string.h	(working copy)
 @@ -34,2 +33,0 @@
@@ -1628,26 +1717,16189 @@
 @@ -40,0 +40,2 @@
 +#  include <config.h>
 +
---- cups/getifaddrs.c	(revision 5460)
-+++ cups/getifaddrs.c	(working copy)
-@@ -43 +43 @@
--static int				/* O - 0 on success, -1 on error */
-+int					/* O - 0 on success, -1 on error */
-@@ -219 +219 @@
--static void
-+void
---- cups/http-private.h	(revision 5460)
-+++ cups/http-private.h	(working copy)
-@@ -34 +34,2 @@
--#  include "config.h"
-+#  include <stdlib.h>
-+#  include <config.h>
-@@ -168 +169 @@
--static int	_cups_getifaddrs(struct ifaddrs **addrs);
-+extern int	_cups_getifaddrs(struct ifaddrs **addrs);
-@@ -170 +171 @@
--static void	_cups_freeifaddrs(struct ifaddrs *addrs);
-+extern void	_cups_freeifaddrs(struct ifaddrs *addrs);
+--- cups/getifaddrs.c	(revision 5460)
++++ cups/getifaddrs.c	(working copy)
+@@ -43 +43 @@
+-static int				/* O - 0 on success, -1 on error */
++int					/* O - 0 on success, -1 on error */
+@@ -219 +219 @@
+-static void
++void
+--- cups/http-private.h	(revision 5460)
++++ cups/http-private.h	(working copy)
+@@ -34 +34,2 @@
+-#  include "config.h"
++#  include <stdlib.h>
++#  include <config.h>
+@@ -168 +169 @@
+-static int	_cups_getifaddrs(struct ifaddrs **addrs);
++extern int	_cups_getifaddrs(struct ifaddrs **addrs);
+@@ -170 +171 @@
+-static void	_cups_freeifaddrs(struct ifaddrs *addrs);
++extern void	_cups_freeifaddrs(struct ifaddrs *addrs);
+--- man/Makefile	(revision 5460)
++++ man/Makefile	(working copy)
+@@ -49 +49,2 @@
+-		printers.conf.$(MAN5EXT)
++		printers.conf.$(MAN5EXT) \
++		subscriptions.conf.$(MAN5EXT)
+--- man/subscriptions.conf.man	(revision 0)
++++ man/subscriptions.conf.man	(revision 5473)
+@@ -0,0 +1,98 @@
++.\"
++.\" "$Id$"
[...16028 lines suppressed...]
++McCloghrie, et al.          Standards Track                    [Page 41]
++
++
++
++
++
++RFC 2578                         SMIv2                        April 1999
++
++
++   David Perkins
++   SNMPinfo
++   3763 Benton Street
++   Santa Clara, CA 95051
++   USA
++   Phone: +1 408 221-8702
++   EMail: dperkins at snmpinfo.com
++
++   Juergen Schoenwaelder
++   TU Braunschweig
++   Bueltenweg 74/75
++   38106 Braunschweig
++   Germany
++   Phone: +49 531 391-3283
++   EMail: schoenw at ibr.cs.tu-bs.de
++
++
++14.  References
++
++[1]  Information processing systems - Open Systems Interconnection -
++     Specification of Abstract Syntax Notation One (ASN.1),
++     International Organization for Standardization.  International
++     Standard 8824, (December, 1987).
++
++[2]  McCloghrie, K., Perkins, D., Schoenwaelder, J., Case, J., Rose, M.
++     and S. Waldbusser, "Conformance Statements for SMIv2", STD 58,
++     RFC 2580, April 1999.
++
++[3]  McCloghrie, K., Perkins, D., Schoenwaelder, J., Case, J., Rose, M.
++     and S. Waldbusser, "Textual Conventions for SMIv2", STD 58,
++     RFC 2579, April 1999.
++
++[4]  Information processing systems - Open Systems Interconnection -
++     Specification of Basic Encoding Rules for Abstract Syntax Notation
++     One (ASN.1), International Organization for Standardization.
++     International Standard 8825, (December, 1987).
++
++[5]  The SNMPv2 Working Group, Case, J., McCloghrie, K., Rose, M. and
++     S. Waldbusser, "Management Information Base for Version 2 of the
++     Simple Network Management Protocol (SNMPv2)", RFC 1907, January
++     1996.
++
++[6]  The SNMPv2 Working Group, Case, J., McCloghrie, K., Rose, M. and
++     S. Waldbusser, "Protocol Operations for Version 2 of the Simple
++     Network Management Protocol (SNMPv2)", RFC 1905, January 1996.
++
++
++
++
++
++McCloghrie, et al.          Standards Track                    [Page 42]
++
++
++
++
++
++RFC 2578                         SMIv2                        April 1999
++
++
++15.  Full Copyright Statement
++
++   Copyright (C) The Internet Society (1999).  All Rights Reserved.
++
++   This document and translations of it may be copied and furnished to
++   others, and derivative works that comment on or otherwise explain it
++   or assist in its implementation may be prepared, copied, published
++   and distributed, in whole or in part, without restriction of any
++   kind, provided that the above copyright notice and this paragraph are
++   included on all such copies and derivative works.  However, this
++   document itself may not be modified in any way, such as by removing
++   the copyright notice or references to the Internet Society or other
++   Internet organizations, except as needed for the purpose of
++   developing Internet standards in which case the procedures for
++   copyrights defined in the Internet Standards process must be
++   followed, or as required to translate it into languages other than
++   English.
++
++   The limited permissions granted above are perpetual and will not be
++   revoked by the Internet Society or its successors or assigns.
++
++   This document and the information contained herein is provided on an
++   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
++   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
++   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
++   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
++   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE."
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++McCloghrie, et al.          Standards Track                    [Page 43]
++
++
++
++
++
 --- filter/Makefile	(revision 5460)
 +++ filter/Makefile	(working copy)
 @@ -208 +208,2 @@
@@ -1668,10 +17920,17 @@
 +++ CHANGES.txt	(working copy)
 @@ -1 +1 @@
 -CHANGES.txt - 2006-04-24
-+CHANGES.txt - 2006-04-27
-@@ -3,0 +4,22 @@
++CHANGES.txt - 2006-04-30
+@@ -3,0 +4,29 @@
 +CHANGES IN CUPS V1.2
 +
++	- Documentation updates (STR #1618, STR #1620, STR #1622,
++	  STR #1637)
++	- "make test" did not include the SNMP backend in the
++	  test environment (STR #1625)
++	- The EPM packaging files did not work (STR #1621)
++	- "Use Default Configuration" inserted a broken
++	  configuration file (STR #1624)
 +	- Redirects in the web interface did not always preserve
 +	  the encrypted status of a connection (STR #1603)
 +	- Added the Apple "pap" backend.
@@ -1772,6 +18031,11 @@
 @@ -54 +54 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
+--- templates/ja/edit-config.tmpl.in	(revision 5460)
++++ templates/ja/edit-config.tmpl.in	(working copy)
+@@ -36 +36 @@
+-"@ENCRYPTION_REQUIRED\\n" +
++"@ENCRYPTION_REQUIRED@\\n" +
 --- templates/classes.tmpl	(revision 5460)
 +++ templates/classes.tmpl	(working copy)
 @@ -20 +20 @@
@@ -1924,6 +18188,11 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
+--- templates/sv/edit-config.tmpl.in	(revision 5460)
++++ templates/sv/edit-config.tmpl.in	(working copy)
+@@ -36 +36 @@
+-"@ENCRYPTION_REQUIRED\\n" +
++"@ENCRYPTION_REQUIRED@\\n" +
 --- templates/pl/classes.tmpl	(revision 5460)
 +++ templates/pl/classes.tmpl	(working copy)
 @@ -13 +13 @@
@@ -2019,6 +18288,11 @@
 @@ -65 +65 @@
 -<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> UdostÄ™pniaj upublicznione drukarki podÅ‚Ä…czone do tego systemu<BR>
 +<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> UdostÄ™pniaj opublikowane drukarki podÅ‚Ä…czone do tego systemu<BR>
+--- templates/pl/edit-config.tmpl.in	(revision 5460)
++++ templates/pl/edit-config.tmpl.in	(working copy)
+@@ -36 +36 @@
+-"@ENCRYPTION_REQUIRED\\n" +
++"@ENCRYPTION_REQUIRED@\\n" +
 --- templates/es/classes.tmpl	(revision 5460)
 +++ templates/es/classes.tmpl	(working copy)
 @@ -20 +20 @@
@@ -2095,6 +18369,16 @@
 @@ -58 +58 @@
 -<A HREF="{admin_uri}?op=set-allowed-users&printer_name={printer_name}">
 +<A HREF="{admin_uri}?op=set-allowed-users&printer_name={%printer_name}">
+--- templates/es/edit-config.tmpl.in	(revision 5460)
++++ templates/es/edit-config.tmpl.in	(working copy)
+@@ -36 +36 @@
+-"@ENCRYPTION_REQUIRED\\n" +
++"@ENCRYPTION_REQUIRED@\\n" +
+--- templates/edit-config.tmpl.in	(revision 5460)
++++ templates/edit-config.tmpl.in	(working copy)
+@@ -36 +36 @@
+-"@ENCRYPTION_REQUIRED\\n" +
++"@ENCRYPTION_REQUIRED@\\n" +
 --- cgi-bin/template.c	(revision 5460)
 +++ cgi-bin/template.c	(working copy)
 @@ -46,0 +47 @@


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- cups.spec	28 Apr 2006 13:32:35 -0000	1.179
+++ cups.spec	2 May 2006 11:32:17 -0000	1.180
@@ -371,6 +371,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue May  2 2006 Tim Waugh <twaugh at redhat.com>
+- Sync to svn5473.
+
 * Fri Apr 28 2006 Tim Waugh <twaugh at redhat.com>
 - Sync to svn5470.
 - No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.


