PSARC/2011/084 LP print service EOF 7079107 CUPS changes for LP EOF 7079183...

sonam gupta - Sun Microsystems - Bangalore India

2011-08-19 781f50c3ea5ed949bac01c5af6787ceec4aef011

PSARC/2011/084 LP print service EOF
7079107 CUPS changes for LP EOF
7079183 Rename a2ps package because of LP EOF
7079201 man(1) is unable to find CUPS man pages.

 components/a2ps/a2ps.p5m

@@ -23,7 +23,7 @@

<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
set name=pkg.fmri \
    value=pkg:/print/lp/filter/a2ps@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
    value=pkg:/print/filter/a2ps@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.description \
    value="GNU a2ps converts files into PostScript for printing or viewing."
set name=pkg.summary \
@@ -35,6 +35,8 @@
set name=org.opensolaris.arc-caseid \
    value=PSARC/2004/262
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
set pkg.linted=true

dir path=etc
dir path=etc/gnu
dir path=etc/lp

 components/cups/Makefile

@@ -65,9 +65,6 @@
CONFIGURE_OPTIONS +=     "ac_cv_func_statfs=no"

$(BUILD_DIR)/%/.installed:    ENV +=    DSTROOT="$(PROTO_DIR)"
$(BUILD_DIR)/%/.installed:    ENV +=    MAN1EXT="1cups"
$(BUILD_DIR)/%/.installed:    ENV +=    MAN8EXT="1cups"
$(BUILD_DIR)/%/.installed:    ENV +=    MAN8DIR="1cups"

PATCH_LEVEL =    0


 components/cups/Solaris/print-service-selector

File was deleted

 components/cups/Solaris/service-selector.xml

File was deleted

 components/cups/cups.p5m

@@ -153,7 +153,7 @@
dir path=usr/share/locale/zh_CN
dir path=usr/share/locale/zh_TW
dir path=usr/share/man
dir path=usr/share/man/man1cups
dir path=usr/share/man/man1
dir path=usr/share/man/man5
dir path=usr/share/man/man7
dir path=usr/share/man/man8
@@ -174,11 +174,6 @@

# edited file-objects
file group=lp mode=0640 path=etc/cups/cupsd.conf preserve=true
file Solaris/print-service-selector mode=0555 \
     path=lib/svc/method/print-service-selector
file Solaris/service-selector.xml mode=0444 \
     path=lib/svc/manifest/application/print/service-selector.xml \
     restart_fmri=svc:/system/manifest-import:default
file path=lib/svc/manifest/application/cups.xml mode=0444 \
     restart_fmri=svc:/system/manifest-import:default

@@ -186,28 +181,23 @@
file Solaris/ManageCUPS.html mode=0444 \
     path=usr/lib/help/auths/locale/C/ManageCUPS.html

# move: cancel lp lpr lpstat lpq lprm
# from usr/bin to usr/lib/cups/bin
file usr/bin/cancel path=usr/lib/cups/bin/cancel
file usr/bin/lp path=usr/lib/cups/bin/lp
file usr/bin/lpr path=usr/lib/cups/bin/lpr
file usr/bin/lpstat path=usr/lib/cups/bin/lpstat
file usr/bin/lpq path=usr/lib/cups/bin/lpq
file usr/bin/lprm path=usr/lib/cups/bin/lprm

# move: cupsaccept lpc lpmove lpadmin lpinfo
# from usr/sbin to usr/lib/cups/bin
file usr/sbin/cupsaccept path=usr/lib/cups/bin/cupsaccept
file usr/sbin/lpc path=usr/lib/cups/bin/lpc
file usr/sbin/lpmove path=usr/lib/cups/bin/lpmove
file usr/sbin/lpadmin path=usr/lib/cups/bin/lpadmin
file usr/sbin/lpinfo path=usr/lib/cups/bin/lpinfo
file path=usr/bin/cancel
file path=usr/bin/lp
file path=usr/bin/lpr
file path=usr/bin/lpstat
file path=usr/bin/lpq
file path=usr/bin/lprm
file path=usr/sbin/cupsaccept
file path=usr/sbin/lpc
file path=usr/sbin/lpmove
file path=usr/sbin/lpadmin
file path=usr/sbin/lpinfo

# install the desktop menu related bits
file Solaris/desktop-print-management mode=0555 \
     path=usr/lib/cups/bin/desktop-print-management
     path=usr/bin/desktop-print-management
file Solaris/desktop-print-management-applet mode=0555 \
     path=usr/lib/cups/bin/desktop-print-management-applet
     path=usr/bin/desktop-print-management-applet
file Solaris/smb mode=0555 \
     path=usr/lib/cups/backend/smb

@@ -299,7 +289,6 @@
file path=usr/sbin/cupsctl
file path=usr/sbin/cupsd
file path=usr/sbin/cupsfilter
file path=usr/sbin/lpinfo
file path=usr/share/cups/banners/classified
file path=usr/share/cups/banners/confidential
file path=usr/share/cups/banners/labeled
@@ -1135,38 +1124,37 @@
file path=usr/share/locale/ru/cups_ru.po
file path=usr/share/locale/sv/cups_sv.po
file path=usr/share/locale/zh_TW/cups_zh_TW.po
# Pages from "1" and "1m" sections should be moved to "1cups" section.
file usr/share/man/man1/cancel.1 path=usr/share/man/man1cups/cancel.1cups
file usr/share/man/man1/cups-config.1 path=usr/share/man/man1cups/cups-config.1cups
file usr/share/man/man1/cupstestdsc.1 path=usr/share/man/man1cups/cupstestdsc.1cups
file usr/share/man/man1/cupstestppd.1 path=usr/share/man/man1cups/cupstestppd.1cups
file usr/share/man/man1/lp.1 path=usr/share/man/man1cups/lp.1cups
file usr/share/man/man1/lpoptions.1 path=usr/share/man/man1cups/lpoptions.1cups
file usr/share/man/man1/lppasswd.1 path=usr/share/man/man1cups/lppasswd.1cups
file usr/share/man/man1/lpq.1 path=usr/share/man/man1cups/lpq.1cups
file usr/share/man/man1/lpr.1 path=usr/share/man/man1cups/lpr.1cups
file usr/share/man/man1/lprm.1 path=usr/share/man/man1cups/lprm.1cups
file usr/share/man/man1/lpstat.1 path=usr/share/man/man1cups/lpstat.1cups
file usr/share/man/man1/ppdc.1 path=usr/share/man/man1cups/ppdc.1cups
file usr/share/man/man1/ppdhtml.1 path=usr/share/man/man1cups/ppdhtml.1cups
file usr/share/man/man1/ppdi.1 path=usr/share/man/man1cups/ppdi.1cups
file usr/share/man/man1/ppdmerge.1 path=usr/share/man/man1cups/ppdmerge.1cups
file usr/share/man/man1/ppdpo.1 path=usr/share/man/man1cups/ppdpo.1cups
file usr/share/man/man1m/cups-deviced.1m path=usr/share/man/man1cups/cups-deviced.1cups
file usr/share/man/man1m/cups-driverd.1m path=usr/share/man/man1cups/cups-driverd.1cups
file usr/share/man/man1m/cups-lpd.1m path=usr/share/man/man1cups/cups-lpd.1cups
file usr/share/man/man1m/cups-polld.1m path=usr/share/man/man1cups/cups-polld.1cups
file usr/share/man/man1m/cupsaccept.1m path=usr/share/man/man1cups/cupsaccept.1cups
file usr/share/man/man1m/cupsaddsmb.1m path=usr/share/man/man1cups/cupsaddsmb.1cups
file usr/share/man/man1m/cupsctl.1m path=usr/share/man/man1cups/cupsctl.1cups
file usr/share/man/man1m/cupsd.1m path=usr/share/man/man1cups/cupsd.1cups
file usr/share/man/man1m/cupsenable.1m path=usr/share/man/man1cups/cupsenable.1cups
file usr/share/man/man1m/cupsfilter.1m path=usr/share/man/man1cups/cupsfilter.1cups
file usr/share/man/man1m/lpadmin.1m path=usr/share/man/man1cups/lpadmin.1cups
file usr/share/man/man1m/lpc.1m path=usr/share/man/man1cups/lpc.1cups
file usr/share/man/man1m/lpinfo.1m path=usr/share/man/man1cups/lpinfo.1cups
file usr/share/man/man1m/lpmove.1m path=usr/share/man/man1cups/lpmove.1cups
# Pages for cups from "1m" sections should also be moved to "8" section.
file path=usr/share/man/man1/cancel.1
file path=usr/share/man/man1/cups-config.1
file path=usr/share/man/man1/cupstestdsc.1
file path=usr/share/man/man1/cupstestppd.1
file path=usr/share/man/man1/lp.1
file path=usr/share/man/man1/lpoptions.1
file path=usr/share/man/man1/lppasswd.1
file path=usr/share/man/man1/lpq.1
file path=usr/share/man/man1/lpr.1
file path=usr/share/man/man1/lprm.1
file path=usr/share/man/man1/lpstat.1
file path=usr/share/man/man1/ppdc.1
file path=usr/share/man/man1/ppdhtml.1
file path=usr/share/man/man1/ppdi.1
file path=usr/share/man/man1/ppdmerge.1
file path=usr/share/man/man1/ppdpo.1
file path=usr/share/man/man1m/cups-deviced.1m
file path=usr/share/man/man1m/cups-driverd.1m
file path=usr/share/man/man1m/cups-lpd.1m
file path=usr/share/man/man1m/cups-polld.1m 
file path=usr/share/man/man1m/cupsaccept.1m
file path=usr/share/man/man1m/cupsaddsmb.1m
file path=usr/share/man/man1m/cupsctl.1m
file path=usr/share/man/man1m/cupsd.1m
file path=usr/share/man/man1m/cupsenable.1m
file path=usr/share/man/man1m/cupsfilter.1m
file path=usr/share/man/man1m/lpadmin.1m
file path=usr/share/man/man1m/lpc.1m
file path=usr/share/man/man1m/lpinfo.1m
file path=usr/share/man/man1m/lpmove.1m
# Pages for cups from "1m" sections should also be copied to "8" section.
file usr/share/man/man1m/cups-deviced.1m path=usr/share/man/man8/cups-deviced.8
file usr/share/man/man1m/cups-driverd.1m path=usr/share/man/man8/cups-driverd.8
file usr/share/man/man1m/cups-lpd.1m path=usr/share/man/man8/cups-lpd.8
@@ -1205,16 +1193,18 @@
link path=usr/lib/libcupsmime.so target=libcupsmime.so.1
link path=usr/lib/libcupsppdc.so target=libcupsppdc.so.1

link path=usr/lib/cups/bin/accept target=cupsaccept
link path=usr/lib/cups/bin/cupsdisable target=cupsaccept
link path=usr/lib/cups/bin/cupsenable target=cupsaccept
link path=usr/lib/cups/bin/cupsreject target=cupsaccept
link path=usr/lib/cups/bin/reject target=cupsaccept
link path=usr/sbin/accept target=cupsaccept
link path=usr/sbin/cupsdisable target=cupsaccept
link path=usr/bin/disable target=../sbin/cupsaccept
link path=usr/sbin/cupsenable target=cupsaccept
link path=usr/bin/enable target=../sbin/cupsaccept
link path=usr/sbin/cupsreject target=cupsaccept
link path=usr/sbin/reject target=cupsaccept

link path=usr/share/man/man1cups/accept.1cups target=cupsaccept.1cups
link path=usr/share/man/man1cups/cupsdisable.1cups target=cupsenable.1cups
link path=usr/share/man/man1cups/cupsreject.1cups target=cupsaccept.1cups
link path=usr/share/man/man1cups/reject.1cups target=cupsaccept.1cups
link path=usr/share/man/man1/accept.1 target=../man1m/cupsaccept.1m
link path=usr/share/man/man1/cupsdisable.1 target=../man1m/cupsenable.1m
link path=usr/share/man/man1/cupsreject.1 target=../man1m/cupsaccept.1m
link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m

legacy pkg=SUNWcupsr \
       desc="Common Unix Print System v1.4 (root)" \

 components/cups/patches/00-man.patch

File was deleted

 components/cups/patches/02-smf.patch

@@ -1,21 +1,35 @@
--- init/cups.xml.in.orig    Fri Oct  2 22:41:34 2009
+++ init/cups.xml.in    Fri Oct  2 22:42:36 2009
@@ -60,6 +60,14 @@
         <service_fmri value='svc:/application/print/server' />
--- init/cups.xml.in.orig    Thu Jul  8 22:54:14 2010
+++ init/cups.xml.in    Tue Aug 16 14:51:37 2011
@@ -52,14 +52,6 @@
         <service_fmri value='svc:/milestone/network' />
     </dependency>
 
+    <dependency
+        name='ipp-listener'
+        grouping='exclude_all'
+        restart_on='none'
+        type='service'>
+        <service_fmri value='svc:/application/print/ipp-listener' />
+    </dependency>
+
-    <dependency
-        name='lpsched'
-        grouping='exclude_all'
-        restart_on='none'
-        type='service'>
-        <service_fmri value='svc:/application/print/server' />
-    </dependency>
-
     <exec_method
         type='method'
         name='stop'
@@ -90,7 +98,7 @@
@@ -66,7 +58,7 @@
         exec=':kill'
         timeout_seconds='60' />
 
-    <instance name='default' enabled='false' >
+    <instance name='default' enabled='true' >
 
         <dependency
             name='config_data'
@@ -87,10 +79,12 @@
         </exec_method>
 
         <property_group name='general' type='framework'>
+            <propval name='active' type='boolean'
+                value='true' />
             <propval name='action_authorization' type='astring'
                 value='solaris.smf.manage.cups' />
             <propval name='value_authorization' type='astring'
@@ -24,7 +38,31 @@
         </property_group>
 
         <template>
@@ -190,7 +198,7 @@
@@ -144,14 +138,6 @@
         <service_fmri value='svc:/milestone/network' />
     </dependency>
 
-    <dependency
-        name='in-lpd'
-        grouping='exclude_all'
-        restart_on='none'
-        type='service'>
-        <service_fmri value='svc:/application/print/rfc1179' />
-    </dependency>
-
     <exec_method
         type='method'
         name='stop'
@@ -158,7 +144,7 @@
         exec=':kill'
         timeout_seconds='60' />
 
-    <instance name='default' enabled='false' >
+    <instance name='default' enabled='true' >
         <dependency
             name='cupsd'
             grouping='require_all'
@@ -190,7 +176,7 @@
             <propval name='action_authorization' type='astring'
                 value='solaris.smf.manage.cups' />
             <propval name='value_authorization' type='astring'

 components/cups/patches/07-scf-active.patch

File was deleted

 components/cups/patches/12-base-tx.patch

@@ -1,11 +1,12 @@
Index: Makedefs.in
===================================================================
--- Makedefs.in    (revision 8801)
--- Makedefs.in (revision 8801)
+++ Makedefs.in    (working copy)
@@ -125,7 +125,7 @@
@@ -124,7 +124,7 @@
 BACKLIBS    =    @BACKLIBS@
 BANNERTOPS    =    @BANNERTOPS@
 CFLAGS        =    @CPPFLAGS@ @CFLAGS@
 COMMONLIBS    =    @LIBS@ -lscf
 COMMONLIBS    =    @LIBS@
-CUPSDLIBS    =    @CUPSDLIBS@
+CUPSDLIBS    =    @CUPSDLIBS@ @LABELING_LIBS@
 CXXFLAGS    =    @CPPFLAGS@ @CXXFLAGS@
@@ -19,7 +20,7 @@
+dnl
+dnl    Security Labeled environment support for the Common UNIX Printing System (CUPS).
+dnl
+dnl    Copyright 2009 by Sun Microsystems, Inc.
+dnl    Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+dnl
+dnl   This program is free software; you can redistribute it and/or modify
+dnl   it under the terms of the GNU General Public License as published by
@@ -90,7 +91,7 @@
Index: config.h.in
===================================================================
--- config.h.in.orig    Thu Aug 12 21:11:46 2010
+++ config.h.in    Tue Dec  7 01:30:14 2010
+++ config.h.in    Tue Aug 16 18:03:17 2011
@@ -665,7 +665,17 @@
 #undef HAVE_SYS_STATVFS_H
 #undef HAVE_SYS_VFS_H
@@ -111,8 +112,8 @@
 /*
Index: scheduler/ipp.c
===================================================================
--- scheduler/ipp.c.orig    Wed Oct  6 13:07:44 2010
+++ scheduler/ipp.c    Tue Dec  7 01:30:14 2010
--- scheduler/ipp.c.orig    Thu Oct  7 01:37:44 2010
+++ scheduler/ipp.c    Tue Aug 16 18:03:17 2011
@@ -856,7 +856,52 @@
   return (0);
 }
@@ -431,8 +432,8 @@
   */
Index: scheduler/printers.c
===================================================================
--- scheduler/printers.c.orig    Wed Sep 22 11:35:07 2010
+++ scheduler//printers.c    Tue Dec  7 01:30:14 2010
--- scheduler/printers.c.orig    Thu Sep 23 00:05:07 2010
+++ scheduler/printers.c    Tue Aug 16 18:03:34 2011
@@ -1011,7 +1011,93 @@
   p->users     = NULL;
 }
@@ -529,8 +530,9 @@
  */
Index: scheduler/job.c
===================================================================
--- scheduler/job.c.orig    Sat Oct 16 21:13:56 2010
+++ scheduler/job.c    Tue Dec  7 01:30:14 2010

--- scheduler/job.c.orig    Sun Oct 17 09:43:56 2010
+++ scheduler/job.c    Tue Aug 16 18:03:43 2011
@@ -911,8 +911,14 @@
     }
   }
@@ -589,11 +591,11 @@
+
   cupsdSetJobState(job, IPP_JOB_PROCESSING, CUPSD_JOB_DEFAULT, NULL);
   cupsdSetPrinterState(printer, IPP_PRINTER_PROCESSING, 0);
 

Index: scheduler/printers.h
===================================================================
--- scheduler/printers.h.orig    Tue Mar 30 15:07:33 2010
+++ scheduler/printers.h    Tue Dec  7 01:30:14 2010
--- scheduler/printers.h.orig    Wed Mar 31 03:37:33 2010
+++ scheduler/printers.h    Tue Aug 16 18:03:51 2011
@@ -151,6 +151,8 @@
                             const char *username);
 extern void        cupsdFreePrinterUsers(cupsd_printer_t *p);
@@ -618,8 +620,8 @@
 typedef struct cupsd_joblog_s        /**** Job log message ****/
Index: scheduler/client.c
===================================================================
--- scheduler/client.c.orig    Sat Oct 16 21:13:56 2010
+++ scheduler/client.c    Tue Dec  7 01:30:14 2010
--- scheduler/client.c.orig    Sun Oct 17 09:43:56 2010
+++ scheduler/client.c    Tue Aug 16 18:04:07 2011
@@ -90,7 +90,12 @@
 #  include <tcpd.h>
 #endif /* HAVE_TCPD_H */

 components/cups/patches/15-thread-safety-removal.patch

@@ -1,5 +1,5 @@
--- cups/http-private.h.orig    Tue Jan 11 03:25:59 2011
+++ cups/http-private.h    Tue Jan 11 03:26:21 2011
--- cups/http-private.h    Mon Apr 12 09:33:53 2010
+++ cups/http-private.h    Tue Aug 16 17:44:40 2011
@@ -98,7 +98,6 @@
  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
  */
@@ -8,8 +8,8 @@
 
 typedef struct
 {
--- scheduler/main.c.orig    Tue Jan 11 03:26:50 2011
+++ scheduler/main.c    Tue Jan 11 03:27:08 2011
--- scheduler/main.c    Wed Sep 22 04:04:57 2010
+++ scheduler/main.c    Tue Aug 16 17:44:46 2011
@@ -549,8 +549,6 @@
   * Startup the server...
   */
@@ -19,8 +19,8 @@
   cupsdStartServer();
 
  /*
--- scheduler/server.c.orig    Tue Jan 11 03:27:36 2011
+++ scheduler/server.c    Tue Jan 11 03:32:26 2011
--- scheduler/server.c    Mon Apr 12 09:33:53 2010
+++ scheduler/server.c    Tue Aug 16 17:44:53 2011
@@ -44,7 +44,41 @@
 void
 cupsdStartServer(void)
@@ -63,8 +63,8 @@
   * Create the default security profile...
   */
 
--- cups/http.c.orig    Wed Jan 12 01:52:14 2011
+++ cups/http.c    Wed Jan 12 02:01:58 2011
--- cups/http.c    Tue Aug 10 11:45:55 2010
+++ cups/http.c    Tue Aug 16 17:45:00 2011
@@ -83,12 +83,10 @@
  *   http_debug_hex()     - Do a hex dump of a buffer.
  *   http_field()         - Return the field index for a field name.
@@ -97,7 +97,7 @@
 #endif /* HAVE_SSL */
 
 
@@ -1220,22 +1206,20 @@
@@ -1188,22 +1174,20 @@
 void
 httpInitialize(void)
 {
@@ -127,7 +127,7 @@
 #elif !defined(SO_NOSIGPIPE)
  /*
   * Ignore SIGPIPE signals...
@@ -1258,56 +1242,30 @@
@@ -1226,56 +1210,30 @@
 #endif /* WIN32 */
 
 #ifdef HAVE_GNUTLS
@@ -193,7 +193,7 @@
 }
 
 
@@ -2865,27 +2823,7 @@
@@ -2833,27 +2791,7 @@
 }
 #endif /* HAVE_SSL */
 
@@ -221,7 +221,7 @@
  * 'http_send()' - Send a request with all fields and the trailing blank line.
  */
 
@@ -3255,20 +3193,6 @@
@@ -3223,20 +3161,6 @@
 }
 #endif /* HAVE_SSL */
 

 components/meta-packages/history/print%2lp%2filter%2a2ps.p5m

New file
@@ -0,0 +1,29 @@
#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
# Common Development and Distribution License (the "License").
# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
# If applicable, add the following below this CDDL HEADER, with the
# fields enclosed by brackets "[]" replaced with your own identifying
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
#

set name=pkg.fmri value=pkg:/print/lp/filter/a2ps@4.13,5.11-0.173.0.0.0.0.0
set name=pkg.renamed value=true

set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

depend fmri=print/filter/a2ps@4.13,5.11-0.173.0.0.0.0.0 type=require