[Pkg-cups-devel] r719 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/local debian/patches
Martin Pitt
mpitt at alioth.debian.org
Sun Mar 16 21:59:57 UTC 2008
Author: mpitt
Date: Sun Mar 16 21:59:57 2008
New Revision: 719
Log:
merge from trunk
Added:
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.examples
cupsys/branches/cups-1.2-ubuntu/debian/local/apparmor-profile
cupsys/branches/cups-1.2-ubuntu/debian/patches/pbmprint.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/testsuite-exit-code.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch (contents, props changed)
Removed:
cupsys/branches/cups-1.2-ubuntu/debian/NEWS
Modified:
cupsys/branches/cups-1.2-ubuntu/ (props changed)
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/control
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch (contents, props changed)
cupsys/branches/cups-1.2-ubuntu/debian/rules
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Sun Mar 16 21:59:57 2008
@@ -1,3 +1,69 @@
+cupsys (1.3.6-2ubuntu1) UNRELEASED; urgency=low
+
+ * Merge with Debian unstable, where I applied most of our remaining Delta;
+ Remaining Ubuntu changes:
+ - debian/cupsys.{pre,post}inst, debian/cupsys.preinst:
+ + Revert to single cupsd.conf file for upgrade from Dapper, can be
+ dropped after releasing Hardy.
+ + Revert usr/share/doc symlink/directory breakage for upgrade from
+ Gutsy, can be dropped after releasing Hardy.
+ - debian/control, debian/rules: Drop cupsys-dbg package. This is not worth
+ keeping as the only delta, so we can sync this package after Hardy's
+ release.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Sun, 16 Mar 2008 22:57:04 +0100
+
+cupsys (1.3.6-2) unstable; urgency=low
+
+ * debian/rules: Configure with default log file permissions 0640.
+ (Closes: #469853)
+ * debian/control: Mention "lpr" in the description of -bsd, for easier
+ apt-cache search catching. (Closes: #426519)
+ * Remove debian/NEWS, there's nothing new since Etch's release.
+ (Closes: #376580)
+ * Add debian/patches/pbmprint.dpatch: Fix printing of PBM files, thanks to
+ Eugeniy Meshcheryakov! (Closes: #313536)
+ * debian/cupsys.preinst: Only chown /var/run/cups if it exists. (LP #156634)
+ * Move scripting examples from cupsys to libcupsys2-dev. No need to install
+ those 1.3 MB by default on every system, this is much more developer
+ oriented. Mention this in the package description.
+ * debian/rules: Explicitly build with -fno-stack-protector on arm and armel,
+ since the compiler produces segfaulting binaries. Works around #469517.
+ * search_mime_files_in_usr_share.dpatch: Do not fatally fail if
+ DataDir/mime does not exist. This both makes much more sense (since
+ /etc/cups is the canonical dir which must exist, and /usr/share/cups/mime
+ is optional), and also unbreaks the test suite (which does not create this
+ directory by default).
+ * pidfile.dpatch: Specify PidFile in temporary directory in the self test's
+ cupsd.conf.
+ * debian/rules clean: Remove test suite HTML reports.
+ * Add testsuite-exit-code.dpatch: Exit with nonzero if the test suite fails,
+ so that it is easier to integrate into package building.
+ * pdftops-cups-1.4.dpatch: Update pdftops location in test suite, too, so
+ that it does not fail the PDF printing test. (Forwarded to STR #2759)
+ * debian/rules: Run test suite on build. This will fail the build if any
+ tests fail, so that problems on particular platforms will be caught
+ easily.
+ * debian/control: Add alternative (build-)depends to heimdal-dev.
+ * debian/rules, debian/cupsys.postinst: Call update-rc.d to not install stop
+ symlinks for runlevels 0 and 6, since they just needlessly slow down
+ shutdown. Remove the obsolete kill symlinks on upgrade. Patch adopted from
+ the Ubuntu branch, but without using the Ubuntu-only 'multiuser' mode of
+ update-rc.d.
+ * Add debian/local/apparmor-profile: AppArmor profile (taken from Ubuntu
+ branch). Install it in debian/rules if package is built on Ubuntu (tested
+ with lsb_release -is). Reload AppArmor in debian/cupsys.postinst if both
+ the cupsys profile and AppArmor itself are present.
+ * Add debian/patches/ubuntu-disable-browsing.dpatch: Disable Browsing by
+ default when building on Ubuntu.
+ * Add debian/patches/ubuntu-default-error-policy-retry-job.dpatch: Set
+ default job error policy to "Retry", since it is less confusing and a
+ better default on desktop machines. This is only applied when building on
+ Ubuntu.
+ * debian/control: Add Vcs-{Svn,Browser} fields.
+
+ -- Martin Pitt <mpitt at debian.org> Sun, 16 Mar 2008 22:34:50 +0100
+
cupsys (1.3.6-1ubuntu2) hardy; urgency=low
* debian/cupsys.preinst:
Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control Sun Mar 16 21:59:57 2008
@@ -4,8 +4,10 @@
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian CUPS Maintainers <pkg-cups-devel at lists.alioth.debian.org>
Standards-Version: 3.7.3
-Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev, libavahi-compat-libdnssd-dev
+Build-Depends: libpam0g-dev, libtiff4-dev, libjpeg62-dev, zlib1g-dev, libpng12-dev, libslp-dev, libgnutls-dev, libpaper-dev, libldap2-dev, debhelper (>= 5.0), po-debconf, cdbs (>= 0.4.27), sharutils, dpatch (>= 1.11), libdbus-1-dev, libkrb5-dev | heimdal-dev, libavahi-compat-libdnssd-dev
Uploaders: Kenshi Muto <kmuto at debian.org>, Martin Pitt <mpitt at debian.org>, Roger Leigh <rleigh at debian.org>, Martin-Éric Racine <q-funk at iki.fi>, Masayuki Hatta (mhatta) <mhatta at debian.org>, Jeff Licquia <licquia at debian.org>
+Vcs-Svn: svn://svn.debian.org/svn/pkg-cups/cupsys/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-cups/cupsys/trunk
Package: libcupsys2
Priority: optional
@@ -51,7 +53,7 @@
Priority: optional
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript | gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript | gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser
Replaces: cupsys-pstoraster
Conflicts: cupsys-pstoraster (<< 2)
Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
@@ -92,7 +94,7 @@
Priority: optional
Section: libdevel
Architecture: any
-Depends: libcupsys2 (= ${binary:Version}), libgnutls-dev, libkrb5-dev
+Depends: libcupsys2 (= ${binary:Version}), libgnutls-dev, libkrb5-dev | heimdal-dev
Provides: libcupsys-dev
Conflicts: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
Replaces: libcupsys1-dev, libcupsys-dev, cupsys (<< 1.1.22-3)
@@ -103,7 +105,9 @@
handling various document types.
.
This package provides the files necessary for developing CUPS-aware
- applications and CUPS drivers.
+ applications and CUPS drivers, as well as examples how to communicate
+ with cupsys from different programming languages (Perl, Java, and
+ PHP).
.
The terms "Common UNIX Printing System" and "CUPS" are trademarks of
Easy Software Products (www.easysw.com), and refer to the original
@@ -141,9 +145,9 @@
Replaces: lpr, cupsys (<= 1.1.15-2), manpages-fr (<< 0.9.5-1)
Description: Common UNIX Printing System(tm) - BSD commands
The Common UNIX Printing System (or CUPS(tm)) is a printing system and
- general replacement for lpd and the like. It supports the Internet
- Printing Protocol (IPP), and has its own filtering driver model for
- handling various document types.
+ general replacement for lpr, lpd and the like. It supports the
+ Internet Printing Protocol (IPP), and has its own filtering driver
+ model for handling various document types.
.
This package provides the BSD commands for interacting with CUPS. It
is provided separately to allow CUPS to coexist with other printing
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.examples Sun Mar 16 21:59:57 2008
@@ -1,3 +1,2 @@
debian/filters/*
debian/printer.schema
-scripting
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst Sun Mar 16 21:59:57 2008
@@ -134,11 +134,6 @@
fi
fi
- # Remove shutdown and reboot links; this init script does not need them.
- if dpkg --compare-versions "$2" lt "1.2.1-2ubuntu3"; then
- rm -f /etc/rc0.d/K19cupsys /etc/rc6.d/K19cupsys
- fi
-
# Add symlink to local files required by LSB
if [ ! -e /usr/share/ppd/1-local-admin -a ! -L /usr/share/ppd/1-local-admin ]; then
ln -s /usr/local/share/ppd /usr/share/ppd/1-local-admin
@@ -156,10 +151,15 @@
ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/cups/ssl/server.key
fi
- # Reload AppArmor profile
- if [ -x /etc/init.d/apparmor ]; then
- invoke-rc.d apparmor force-reload || true
- fi
+ # Remove shutdown and reboot links; this init script does not need them.
+ if dpkg --compare-versions "$2" lt-nl "1.3.6-2"; then
+ rm -f /etc/rc0.d/K??cupsys /etc/rc6.d/K??cupsys
+ fi
+
+ # Reload AppArmor profile if present
+ if [ -e /etc/apparmor.d/usr.sbin.cupsd ] && [ -x /etc/init.d/apparmor ]; then
+ invoke-rc.d apparmor force-reload || true
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Added: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.examples
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2-dev.examples Sun Mar 16 21:59:57 2008
@@ -0,0 +1 @@
+scripting
Added: cupsys/branches/cups-1.2-ubuntu/debian/local/apparmor-profile
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/local/apparmor-profile Sun Mar 16 21:59:57 2008
@@ -0,0 +1,136 @@
+# vim:syntax=apparmor
+# Last Modified: Thu Aug 2 12:54:46 2007
+# Author: Martin Pitt <martin.pitt at ubuntu.com>
+
+#include <tunables/global>
+
+/usr/sbin/cupsd {
+ #include <abstractions/base>
+ #include <abstractions/bash>
+ #include <abstractions/authentication>
+ #include <abstractions/dbus>
+ #include <abstractions/fonts>
+ #include <abstractions/nameservice>
+ #include <abstractions/perl>
+ #include <abstractions/user-tmp>
+
+ capability chown,
+ capability fowner,
+ capability fsetid,
+ capability kill,
+ capability net_bind_service,
+ capability setgid,
+ capability setuid,
+
+ # nasty, but we limit file access pretty tightly, and cups chowns a
+ # lot of files to 'lp' which it cannot read/write afterwards any
+ # more
+ capability dac_override,
+
+ # the bluetooth backend needs this
+ network bluetooth,
+
+ /bin/bash ixr,
+ /bin/dash ixr,
+ /bin/hostname ixr,
+ /dev/lp* rw,
+ /dev/ttyS* rw,
+ /dev/usb/lp* rw,
+ /dev/parport* rw,
+ /etc/cups/ rw,
+ /etc/cups/** rw,
+ /etc/foomatic/* r,
+ /etc/gai.conf r,
+ /etc/shadow m,
+ /etc/passwd m,
+ /etc/group m,
+ /etc/papersize r,
+ /etc/pnm2ppa.conf r,
+ /etc/printcap rwl,
+ /etc/ssl/** r,
+ @{PROC}/net/ r,
+ @{PROC}/net/* r,
+ @{PROC}/sys/dev/parport/** r,
+ /sys/** r,
+ /usr/bin/* ixr,
+ /usr/sbin/* ixr,
+ /bin/* ixr,
+ /sbin/* ixr,
+ /usr/lib/** rm,
+
+ # backends which come with CUPS can be confined
+ /usr/lib/cups/backend/bluetooth ixr,
+ /usr/lib/cups/backend/dnssd ixr,
+ /usr/lib/cups/backend/http ixr,
+ /usr/lib/cups/backend/ipp ixr,
+ /usr/lib/cups/backend/lpd ixr,
+ /usr/lib/cups/backend/parallel ixr,
+ /usr/lib/cups/backend/scsi ixr,
+ /usr/lib/cups/backend/serial ixr,
+ /usr/lib/cups/backend/snmp ixr,
+ /usr/lib/cups/backend/socket ixr,
+ /usr/lib/cups/backend/usb ixr,
+ # we treat cups-pdf specially, since it needs to write into /home
+ # and thus needs extra paranoia
+ /usr/lib/cups/backend/cups-pdf Px,
+ # third party backends get no restrictions as they often need high
+ # privileges and this is beyond our control
+ /usr/lib/cups/backend/* Ux,
+
+ /usr/lib/cups/cgi-bin/* ixr,
+ /usr/lib/cups/daemon/* ixr,
+ /usr/lib/cups/monitor/* ixr,
+ /usr/lib/cups/notifier/* ixr,
+ # filters and drivers (PPD generators) are always run as non-root,
+ # and there are a lot of third-party drivers which we cannot predict
+ /usr/lib/cups/filter/* Uxr,
+ /usr/lib/cups/driver/* Uxr,
+ /usr/local/share/** r,
+ /usr/share/** r,
+ /var/cache/cups/ rw,
+ /var/cache/cups/** rw,
+ /var/log/cups/ rw,
+ /var/log/cups/* rw,
+ /var/run/avahi-daemon/socket rw,
+ /var/run/cups/ rw,
+ /var/run/cups/** rw,
+ /var/spool/cups/ rw,
+ /var/spool/cups/** rw,
+
+ # third-party printer drivers; no known structure here
+ /opt/** rix,
+
+ # FIXME: no policy ATM for hplip
+ /usr/bin/hpijs Ux,
+
+ # Kerberos authentication
+ /etc/krb5.conf r,
+ /etc/cups/krb5.keytab rw,
+}
+
+# separate profile since this needs to write into /home
+/usr/lib/cups/backend/cups-pdf {
+ #include <abstractions/base>
+ #include <abstractions/fonts>
+ #include <abstractions/nameservice>
+ #include <abstractions/user-tmp>
+
+ capability chown,
+ capability fowner,
+ capability fsetid,
+ capability setgid,
+ capability setuid,
+
+ /bin/dash ixr,
+ /bin/bash ixr,
+ /etc/papersize r,
+ /etc/cups/cups-pdf.conf r,
+ @{HOME}/PDF/ w,
+ @{HOME}/PDF/* w,
+ /usr/bin/gs ixr,
+ /usr/lib/cups/backend/cups-pdf mr,
+ /usr/lib/ghostscript/** mr,
+ /usr/share/** r,
+ /var/log/cups/cups-pdf_log w,
+ /var/spool/cups-pdf/** rw,
+}
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Sun Mar 16 21:59:57 2008
@@ -13,5 +13,7 @@
include_krb5_h_in_job_h.dpatch
search_mime_files_in_usr_share.dpatch
pdftops-cups-1.4.dpatch
+pbmprint.dpatch
+testsuite-exit-code.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-default-error-policy-retry-job.dpatch
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/pbmprint.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/pbmprint.dpatch Sun Mar 16 21:59:57 2008
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pbmprint.dpatch by <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix PBM printing: P1 was not handled at all, and P4 was inverted. (#313536)
+## DP: Forwarded to http://www.cups.org/str.php?L2746.
+
+ at DPATCH@
+diff -urNad trunk~/filter/image-pnm.c trunk/filter/image-pnm.c
+--- trunk~/filter/image-pnm.c 2008-01-16 23:20:33.000000000 +0100
++++ trunk/filter/image-pnm.c 2008-03-07 22:28:48.000000000 +0100
+@@ -178,6 +178,18 @@
+ switch (format)
+ {
+ case 1 :
++ for (x = img->xsize, inptr = in; x > 0; x --, inptr ++) {
++ int c;
++ do {
++ c = fgetc(fp);
++ } while (c != '1' && c != '0' && c != EOF);
++ if (c == '1')
++ *inptr = 0;
++ else if (c == '0')
++ *inptr = 255;
++ }
++ break;
++
+ case 2 :
+ for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
+ if (fscanf(fp, "%d", &val) == 1)
+@@ -203,9 +215,9 @@
+ x --, inptr ++)
+ {
+ if (*outptr & bit)
+- *inptr = 255;
+- else
+ *inptr = 0;
++ else
++ *inptr = 255;
+
+ if (bit > 1)
+ bit >>= 1;
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/pdftops-cups-1.4.dpatch Sun Mar 16 21:59:57 2008
@@ -2,12 +2,14 @@
## pdftops-cups-1.4.dpatch by <till.kamppeter at gmail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: 1.4 uses a small filter/pdftops.c wrapper instead of xpdf. Backport this
+## DP: since it generally works much better than the 1.3 current one.
+## DP: Test suite fix is http://www.cups.org/str.php?L2759
@DPATCH@
-diff -urNad cupsys-1.3.5~/filter/Makefile cupsys-1.3.5/filter/Makefile
---- cupsys-1.3.5~/filter/Makefile 2007-07-20 01:27:49.000000000 +0200
-+++ cupsys-1.3.5/filter/Makefile 2008-02-23 17:02:03.000000000 +0100
+diff -urNad trunk~/filter/Makefile trunk/filter/Makefile
+--- trunk~/filter/Makefile 2007-07-20 01:27:49.000000000 +0200
++++ trunk/filter/Makefile 2008-03-16 20:18:42.000000000 +0100
@@ -19,7 +19,7 @@
@@ -36,9 +38,9 @@
#
# rastertolabel
-diff -urNad cupsys-1.3.5~/filter/pdftops.c cupsys-1.3.5/filter/pdftops.c
---- cupsys-1.3.5~/filter/pdftops.c 1970-01-01 01:00:00.000000000 +0100
-+++ cupsys-1.3.5/filter/pdftops.c 2008-02-23 17:02:09.000000000 +0100
+diff -urNad trunk~/filter/pdftops.c trunk/filter/pdftops.c
+--- trunk~/filter/pdftops.c 1970-01-01 01:00:00.000000000 +0100
++++ trunk/filter/pdftops.c 2008-03-16 20:18:42.000000000 +0100
@@ -0,0 +1,314 @@
+/*
+ * "$Id$"
@@ -354,3 +356,15 @@
+/*
+ * End of "$Id$".
+ */
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh 2008-03-16 20:18:42.000000000 +0100
++++ trunk/test/run-stp-tests.sh 2008-03-16 20:18:50.000000000 +0100
+@@ -238,7 +238,7 @@
+ ln -s $root/filter/rastertoepson /tmp/cups-$user/bin/filter
+ ln -s $root/filter/rastertohp /tmp/cups-$user/bin/filter
+ ln -s $root/filter/texttops /tmp/cups-$user/bin/filter
+-ln -s $root/pdftops/pdftops /tmp/cups-$user/bin/filter
++ln -s $root/filter/pdftops /tmp/cups-$user/bin/filter
+
+ ln -s $root/data/classified /tmp/cups-$user/share/banners
+ ln -s $root/data/confidential /tmp/cups-$user/share/banners
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/pidfile.dpatch Sun Mar 16 21:59:57 2008
@@ -5,12 +5,12 @@
## DP: Forwarded upstream: http://www.cups.org/str.php?L2465
@DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.c cupsys-1.3.0~rc2/scheduler/conf.c
---- cupsys-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.c 2007-08-01 13:23:12.000000000 +0100
-@@ -167,7 +167,8 @@
+diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
+--- trunk~/scheduler/conf.c 2008-03-16 14:26:26.000000000 +0100
++++ trunk/scheduler/conf.c 2008-03-16 14:26:26.000000000 +0100
+@@ -168,7 +168,8 @@
#endif /* HAVE_AUTHORIZATION_H */
- { "TempDir", &TempDir, CUPSD_VARTYPE_STRING },
+ { "TempDir", &TempDir, CUPSD_VARTYPE_PATHNAME },
{ "Timeout", &Timeout, CUPSD_VARTYPE_INTEGER },
- { "UseNetworkDefault", &UseNetworkDefault, CUPSD_VARTYPE_BOOLEAN }
+ { "UseNetworkDefault", &UseNetworkDefault, CUPSD_VARTYPE_BOOLEAN },
@@ -18,7 +18,7 @@
};
#define NUM_VARS (sizeof(variables) / sizeof(variables[0]))
-@@ -413,6 +414,7 @@
+@@ -414,6 +415,7 @@
cupsdSetString(&RemoteRoot, "remroot");
cupsdSetString(&ServerHeader, "CUPS/1.2");
cupsdSetString(&StateDir, CUPS_STATEDIR);
@@ -26,10 +26,10 @@
#ifdef HAVE_GSSAPI
cupsdSetString(&GSSServiceName, CUPS_DEFAULT_GSSSERVICENAME);
#endif /* HAVE_GSSAPI */
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.h cupsys-1.3.0~rc2/scheduler/conf.h
---- cupsys-1.3.0~rc2~/scheduler/conf.h 2007-07-11 22:46:42.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.h 2007-08-01 13:19:41.000000000 +0100
-@@ -186,6 +186,7 @@
+diff -urNad trunk~/scheduler/conf.h trunk/scheduler/conf.h
+--- trunk~/scheduler/conf.h 2008-03-16 14:21:55.000000000 +0100
++++ trunk/scheduler/conf.h 2008-03-16 14:26:26.000000000 +0100
+@@ -189,6 +189,7 @@
/* Server key file */
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
@@ -37,9 +37,9 @@
#ifdef HAVE_LAUNCHD
VAR int LaunchdTimeout VALUE(DEFAULT_TIMEOUT);
-diff -urNad cupsys-1.3.0~rc2~/scheduler/main.c cupsys-1.3.0~rc2/scheduler/main.c
---- cupsys-1.3.0~rc2~/scheduler/main.c 2007-07-19 00:52:15.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/main.c 2007-08-01 13:19:41.000000000 +0100
+diff -urNad trunk~/scheduler/main.c trunk/scheduler/main.c
+--- trunk~/scheduler/main.c 2008-03-16 14:21:55.000000000 +0100
++++ trunk/scheduler/main.c 2008-03-16 14:26:26.000000000 +0100
@@ -89,6 +89,8 @@
static void sigterm_handler(int sig);
static long select_timeout(int fds);
@@ -49,7 +49,7 @@
/*
-@@ -529,6 +531,11 @@
+@@ -595,6 +597,11 @@
}
#endif /* __sgi */
@@ -61,7 +61,7 @@
/*
* Initialize authentication certificates...
*/
-@@ -1009,9 +1016,39 @@
+@@ -1145,9 +1152,39 @@
cupsdStopSelect();
@@ -101,3 +101,14 @@
/*
* 'cupsdClosePipe()' - Close a pipe as necessary.
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh 2007-07-11 23:46:42.000000000 +0200
++++ trunk/test/run-stp-tests.sh 2008-03-16 14:26:48.000000000 +0100
+@@ -302,6 +302,7 @@
+ DocumentRoot $root/doc
+ RequestRoot /tmp/cups-$user/spool
+ TempDir /tmp/cups-$user/spool/temp
++PidFile /tmp/cups-$user/cupsd.pid
+ MaxLogSize 0
+ AccessLog /tmp/cups-$user/log/access_log
+ ErrorLog /tmp/cups-$user/log/error_log
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/search_mime_files_in_usr_share.dpatch Sun Mar 16 21:59:57 2008
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
---- trunk~/scheduler/conf.c 2008-02-16 00:26:51.000000000 +0100
-+++ trunk/scheduler/conf.c 2008-02-26 13:01:21.000000000 +0100
-@@ -341,6 +341,7 @@
+--- trunk~/scheduler/conf.c 2008-03-16 14:22:22.000000000 +0100
++++ trunk/scheduler/conf.c 2008-03-16 14:23:33.000000000 +0100
+@@ -342,6 +342,7 @@
cups_file_t *fp; /* Configuration file */
int status; /* Return status */
char temp[1024], /* Temporary buffer */
@@ -16,7 +16,7 @@
*slash; /* Directory separator */
cups_lang_t *language; /* Language */
struct passwd *user; /* Default user */
-@@ -1092,11 +1093,22 @@
+@@ -1073,11 +1074,21 @@
/*
* Read the MIME type and conversion database...
@@ -31,9 +31,8 @@
+ MimeDatabase = mimeLoad(temp2, temp);
+ if (!MimeDatabase)
+ {
-+ cupsdLogMessage(CUPSD_LOG_EMERG,
++ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to load MIME database from \'%s\'!", temp2);
-+ exit(errno);
+ }
+
+ MimeDatabase = mimeMerge(MimeDatabase, ServerRoot, temp);
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/testsuite-exit-code.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/testsuite-exit-code.dpatch Sun Mar 16 21:59:57 2008
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testsuite-exit-code.dpatch by <mpitt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If any test fails, exit with nonzero. This makes it easier to integrate into package build scripts.
+## DP: Forwarded to http://www.cups.org/str.php?L2758
+
+ at DPATCH@
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh 2008-03-16 19:55:04.000000000 +0100
++++ trunk/test/run-stp-tests.sh 2008-03-16 19:57:39.000000000 +0100
+@@ -590,14 +590,18 @@
+
+ if test $fail != 0; then
+ echo "$fail tests failed."
++ EXITCODE=1
+ else
+ echo "All tests were successful."
++ EXITCODE=0
+ fi
+
+ echo "Log files can be found in /tmp/cups-$user/log."
+ echo "A HTML report was created in test/$strfile."
+ echo ""
+
++exit $EXITCODE
++
+ #
+ # End of "$Id: run-stp-tests.sh 6649 2007-07-11 21:46:42Z mike $"
+ #
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-default-error-policy-retry-job.dpatch Sun Mar 16 21:59:57 2008
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+## ubuntu-default-error-policy-retry-job.dpatch by <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Set default job error policy to "Retry", since it is less confusing and
+## DP: a better default on desktop machines. This patch is only applied when
+## DP: building on Ubuntu.
+
+[ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] || { echo -n '(ignored)' >&2; exit 0; }
+. /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.c cupsys-1.3.0~rc2/scheduler/conf.c
+--- cupsys-1.3.0~rc2~/scheduler/conf.c 2007-07-30 17:47:10.000000000 +0100
++++ cupsys-1.3.0~rc2/scheduler/conf.c 2007-08-01 15:33:55.000000000 +0100
+@@ -548,7 +548,7 @@
+ cupsdClearString(&BrowseLocalOptions);
+ cupsdClearString(&BrowseRemoteOptions);
+
+- cupsdSetString(&ErrorPolicy, "stop-printer");
++ cupsdSetString(&ErrorPolicy, "retry-job");
+
+ #ifdef HAVE_LDAP
+ cupsdClearString(&BrowseLDAPBindDN);
Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ubuntu-disable-browsing.dpatch Sun Mar 16 21:59:57 2008
@@ -0,0 +1,27 @@
+#! /bin/sh -e
+## ubuntu-disable-browsing.dpatch by <martin.pitt at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable Browsing by default on Ubuntu (not sanctioned yet by
+## DP: https://wiki.ubuntu.com/DefaultNetworkServices). This is only applied
+## DP: when building on Ubuntu.
+
+[ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ] || { echo -n '(ignored)' >&2; exit 0; }
+. /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+diff -urNad cupsys-1.3.0~rc2~/conf/cupsd.conf.in cupsys-1.3.0~rc2/conf/cupsd.conf.in
+--- cupsys-1.3.0~rc2~/conf/cupsd.conf.in 2007-07-25 01:40:03.000000000 +0100
++++ cupsys-1.3.0~rc2/conf/cupsd.conf.in 2007-08-01 15:27:56.000000000 +0100
+@@ -19,9 +19,10 @@
+ @CUPS_LISTEN_DOMAINSOCKET@
+
+ # Show shared printers on the local network.
+-Browsing On
++Browsing Off
+ BrowseOrder allow,deny
+ BrowseAllow all
++BrowseAddress @LOCAL
+
+ # Default authentication type, when authentication is required...
+ DefaultAuthType Basic
Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules Sun Mar 16 21:59:57 2008
@@ -18,13 +18,20 @@
unpatch: deapply-dpatches
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin --with-printcap=/var/run/cups/printcap
+# workaround for http://bugs.debian.org/469517
+ifneq ($(findstring $(DEB_BUILD_ARCH), arm armel),)
+ CFLAGS += -fno-stack-protector
+endif
+
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin --with-printcap=/var/run/cups/printcap --with-log-file-perm=0640 CFLAGS="$(CFLAGS)"
DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
-DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
+DEB_DH_INSTALLINIT_ARGS := -u'start 20 2 3 4 5 . stop 80 1 .'
+DEB_DH_STRIP_ARGS := --dbg-package=cupsys-dbg
DEB_DH_FIXPERMS_ARGS := -Xusr/lib/cups/backend-available
-DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/cupsys/examples/scripting
+DEB_DH_COMPRESS_ARGS := -Xusr/share/doc/libcupsys2-dev/examples/scripting
DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_MAKE_CHECK_TARGET := check
LDFLAGS := -Wl,--as-needed
common-post-build-arch::
@@ -35,6 +42,7 @@
clean::
rm -f man/client.conf.man packaging/cups.list
rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
+ rm -f test/cups-str*.html
common-install-prehook-impl::
(cd fonts && $(MAKE) install BUILDROOT=$(DEB_DESTDIR))
@@ -64,11 +72,10 @@
# the system-config-printer applet
install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cupsys/etc/dbus-1/system.d/cups.conf
- rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.o
- rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.so
-
- # install AppArmor profile
- install -D -m 644 debian/local/apparmor-profile $(DEB_DESTDIR)/../cupsys/etc/apparmor.d/usr.sbin.cupsd
+ # install AppArmor profile on Ubuntu
+ if [ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ]; then \
+ install -D -m 644 debian/local/apparmor-profile debian/$(cdbs_curpkg)/etc/apparmor.d/usr.sbin.cupsd; \
+ fi
binary-post-install/libcupsimage2-dev::
rm -r debian/libcupsimage2-dev/usr/share/doc/libcupsimage2-dev
@@ -77,8 +84,8 @@
rm -r debian/cupsys-bsd/usr/share/doc/cupsys-bsd
ln -s libcupsys2 debian/cupsys-bsd/usr/share/doc/cupsys-bsd
binary-post-install/libcupsys2-dev::
- rm -r debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
- ln -s libcupsys2 debian/libcupsys2-dev/usr/share/doc/libcupsys2-dev
+ rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.o
+ rm -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/scripting/php/*.so
binary-post-install/cupsys-client::
rm -r debian/cupsys-client/usr/share/doc/cupsys-client
ln -s libcupsys2 debian/cupsys-client/usr/share/doc/cupsys-client
More information about the Pkg-cups-devel
mailing list