[Pkg-cups-devel] r422 - in cupsys/branches/cups-1.2-ubuntu/debian:
. patches po
Martin Pitt
mpitt at alioth.debian.org
Mon Jan 29 10:28:35 CET 2007
Author: mpitt
Date: Mon Jan 29 10:28:35 2007
New Revision: 422
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
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/po/es.po
cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po
cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
cupsys/branches/cups-1.2-ubuntu/debian/rules
Log:
* Merge to Debian.
* Added directories and links for PPD files according to the FHS
extension for a distribution-independent printer driver location:
http://lists.freestandards.org/pipermail/printing-architecture/2006/001512.html
(Debian bug #408154).
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 Mon Jan 29 10:28:35 2007
@@ -1,3 +1,83 @@
+cupsys (1.2.7-2ubuntu1) feisty; urgency=low
+
+ * Merge from debian unstable, remaining changes:
+ - Snakeoil SSL cert support:
+ + debian/control: Add ssl-cert dependency.
+ + debian/cupsys.postinst: Symlink snakeoil SSL certificate if present.
+ - TearDown (fast shutdown):
+ + debian/control: Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) dependency.
+ + debian/cupsys.postinst: Remove obsolete rc.d links.
+ + debian/rules: Use 'multiuser' update-rc.d mode.
+ - debian/control: Drop libcupsys2-gnutls10 and cupsys-dbg packages.
+ - Run cupsd as system user 'cupsd' instead of root to confine impact of
+ security vulnerabilities:
+ + cupsys{,-client}.postinst: Set up cupsys user and put it into the
+ appropriate groups.
+ + debian/cupsys.init.d: Set up proper permissions of log files.
+ + debian/cupsys.init.d: Disable 'reload', force-reload does restart,
+ since cupsd cannot reload as non-root.
+ + debian/cupsys.logrotate: Own the log files to cupsys:lpadmin.
+ + Add debian/patches/ubuntu-external-pam-helper.dpatch: Helper program
+ cups-check-pam-auth which performs PAM authentication and returns the
+ status as exit code.
+ + debian/cupsys.files: Install cups-check-pam-auth.
+ + debian/cupsys.postinst: Set permissions of cups-check-pam-auth to
+ cupsys:shadow 2754.
+ + debian/rules: Configure with --enable-privilege-dropping.
+ + debian/rules: Install lpd backend suid root so that it can bind to a
+ privileged port.
+ - Support user-installed PPDs:
+ - debian/cupsys.dirs: Add usr/share/ppd/custom.
+ - debian/cupsys.init.d: Set up this dir as root:lpadmin 03775.
+ - debian/patches/14_dont_force_ssl.dpatch: Do not require SSL for the web
+ frontend since gnome-cups-manager does not cope with that.
+ - debian/patches/58_cupsd.conf-AllowLocal.dpatch: Allow access to local
+ ethernet by default. This just affects the ACL, for actually enabling
+ access cupsd needs to be switched to not only listen on localhost. (So
+ this does not need to be configured in two different places).
+ - debian/patches/ubuntu-default-error-policy-retry-job.dpatch: Retry a
+ failed job instead of stopping the print queue.
+ - debian/patches/ubuntu-disable-browsing.dpatch: Disable browsing by
+ default.
+ - Changed dependency in cupsys-bsd for netbase into update-inetd.
+ - Removed obsolete emacs config settings at the end of changelog.
+
+ * Added directories and links for PPD files according to the FHS
+ extension for a distribution-independent printer driver location:
+ http://lists.freestandards.org/pipermail/printing-architecture/2006/001512.html
+ (Debian bug #408154).
+
+ -- Till Kamppeter <till.kamppeter at gmail.com> Fri, 26 Jan 2007 13:22:06 +0000
+
+cupsys (1.2.7-2) unstable; urgency=high
+
+ [ Kenshi Muto ]
+ * Applied upstream patches to fix some (include RC) bugs as dpatch style:
+ - STR2106: Raw PBM files did not print correctly
+ - STR2111: The PostScript filter did not properly output
+ document setup commands for reversed output (closes: Bug#403703)
+ - STR2117: The scheduler did not parse IPv6 netmask properly
+ - STR2121: cupsDoAuthentication() did not translate the password
+ prompt
+ - STR2123: The backends incorrectly used STATUS:
+ media-tray-empty-error messages for out-of-paper conditions
+ - STR2133: httpGetLength2() did not handle error messages without
+ content correctly
+ - STR2135: cupsMarkOptions() did not handle the
+ multiple-document-handling option
+ - STR2137: Collated output produced by the PostScript filter could
+ lose some options
+ - STR2144: job-hold-until with time values for the next day would
+ be held for 60 days
+ * 67_printcap: Add Printcap/PrintcapFormat/PrintcapGUI variables to
+ cupsd.conf file. (closes: #401981)
+ * cupsys makes /var/run/cups/certs. Although CUPS daemon can make
+ it automatically, the daemon logs an warning.
+ * 68_edit-config: Provide same cupsd.conf as initial package
+ installation.
+
+ -- Kenshi Muto <kmuto at debian.org> Wed, 6 Dec 2006 22:42:34 +0000
+
cupsys (1.2.7-1ubuntu2) feisty; urgency=low
* Change dependency in cupsys-bsd for netbase into update-inetd.
@@ -966,6 +1046,83 @@
-- Martin Pitt <martin.pitt at ubuntu.com> Fri, 13 Jan 2006 15:28:22 +0100
+cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
+
+ [ Kenshi Muto ]
+ * New SVN release taken from rr4885.
+ * Updated Russian debconf translation, taken from cupsys trunk.
+ * Downgrade port and browse question to low.
+ * Add timeout routine to avoid lockup.
+ * debian/patches/08_cupsd.conf.conf.d.dpatch:
+ - Commented out Port/Listen/Browsing from cupsd.conf.in.
+ CUPS crashes when there is a duplicate definition.
+ * Updated Swedish debconf translation.
+ * Set seen false flag when ports configuration is failed.
+ * Allow '*' for hostname in ports.conf.
+ * Use /bin/echo instead of shell built-in echo.
+ * Improve cupsys.templates.
+ * Updated Russian, German, Czech,French, Vietnamese debconf translation.
+ * Removed example descriptions from init.d script.
+ * Fix IPv4 validation.
+
+ [ Martin Pitt ]
+ * Adapt debian/patches/02_configure.dpatch to r4885.
+ * Move forcefully killing of cupsd if start-stop-daemon fails from
+ postinst to init script, where it belongs to. Do not kill all running
+ cupsd processes, but only the one in the pid file; this will unbreak cupsd
+ behaviour in chroots.
+ * debian/cupsys.default: Remove obsolete FORCE_RESTART option.
+ * Resurrect debian/patches/01_cupsimage.dpatch (formerly
+ 03_cupsimage.dpatch), as we get unresolved symbols if libcupsimage
+ isn't properly linked to libcupsys, causing other packages to FTBFS.
+ Thanks to Adam Conrad.
+ * debian/cupsys.init.d: Add --oknodo to not fail if cupsd is already
+ running.
+ * debian/rules: In clean rule, clean up a lot of files that are left behind
+ by 'make clean'.
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 23 Dec 2005 06:33:05 +0000
+
+cupsys (1.1.99.b1.r4876-1) unstable; urgency=low
+
+ [ Martin Pitt ]
+ * debian/local/{enable_browsing,browsing_status}: Adapt configuration file
+ locations to new conf.d structure.
+ * debian/cupsys.templates: Fix default value for cupsys/browse: 'yes' is an
+ invalid bool option, change to true.
+ * debian/cupsys.init.d: Use LSB init functions. Add lsb-base package
+ dependency.
+ * debian/cupsys.postinst: Wait a second between kill -9'ing cupsys and
+ checking if the process still exists to avoid false positives and upgrade
+ failures.
+ * Clean up support for /etc/cups/conf.d:
+ - Add debian/patches/08_cupsd.conf.conf.d.dpatch: Add include commands to
+ default cupsd.conf file.
+ - debian/cupsys.postinst: Remove fiddling with cupsd.conf.
+ - This will ensure that cupsd.conf will remain an unchanged conffile.
+ * debian/rules: Remove empty debian/patched on clean.
+ * debian/patches/10_cupsd.conf2.dpatch: Re-enable listening to localhost to
+ make the web interface work.
+ * debian/patches/44_fixconfdirperms.dpatch:
+ - Put configuration files into group root instead of nobody to avoid
+ privilege escalation of nobody/nogroup and comply to Debian standards.
+ - Use CUPS_DEFAULT_GROUP instead of 'nobody' as the default group for
+ setgid'ing to and conffiles which must be writable for cupsd.
+ - Disable changing permissions of cupsd.conf conffile.
+ * Add debian/patches/09_runasuser_fixes.dpatch:
+ - scheduler/main.c: Generate a certificate even when running as user, just
+ as in 1.1.x; this unbreaks local certificate authorization for cupsd
+ when it runs as normal user.
+ - scheduler/main.c: When running as non-root, call initgroups() instead of
+ setgroups() to allow auxiliary groups. These are required to access
+ different device types (lp for USB/parallel printers, dialout for serial
+ printers, etc.)
+
+ [ Kenshi Muto ]
+ * New SVN release taken from r4876.
+
+ -- Kenshi Muto <kmuto at debian.org> Thu, 8 Dec 2005 21:26:22 +0900
+
cupsys (1.1.99.b1.r4841-1ubuntu8) dapper; urgency=low
* debian/cupsys.init.d: Remove the hideous killing hacks and just invoke
@@ -2891,4 +3048,3 @@
-- Jeff Licquia <licquia at debian.org> Sun, 6 Nov 1999 20:58:02 -0500
-
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 Mon Jan 29 10:28:35 2007
@@ -214,6 +214,10 @@
chown root:lp /etc/cups/ppd ; chmod 755 /etc/cups/ppd
chown cupsys:shadow /usr/lib/cups/daemon/cups-check-pam-auth
chmod 2754 /usr/lib/cups/daemon/cups-check-pam-auth
+ if [ ! -d /var/run/cups/certs ]; then
+ mkdir /var/run/cups/certs && chown cupsys:lpadmin /var/run/cups/certs \
+ && chmod 511 /var/run/cups/certs
+ fi
if [ -f /etc/cups/classes.conf ]; then
chown root:lp /etc/cups/classes.conf ; chmod 600 /etc/cups/classes.conf
fi
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 Mon Jan 29 10:28:35 2007
@@ -1,3 +1,12 @@
+00_00str2111.dpatch
+00_01str2137.dpatch
+00_02str2144.dpatch
+00_03str2106.dpatch
+00_04str2117.dpatch
+00_05str2133.dpatch
+00_06str2121.dpatch
+00_07str2123.dpatch
+00_08str2135.dpatch
02_configure.dpatch
#03_manext.dpatch
03_clean.dpatch
@@ -29,6 +38,10 @@
62_classes_crash.dpatch
#64_driverfolder.dpatch
65_detect_http_shutdown.dpatch
+#66_setegid.dpatch
+67_printcap.dpatch
+68_edit-config.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-external-pam-helper.dpatch
ubuntu-default-error-policy-retry-job.dpatch
+
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/es.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/es.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/es.po Mon Jan 29 10:28:35 2007
@@ -21,8 +21,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cupsys 1.2.2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-28 05:01-0600\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2006-08-15 01:10+0200\n"
"Last-Translator: Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>\n"
"Language-Team: Debian L10n Spanish Team <debian-l10n-spanish at lists.debian."
@@ -39,7 +39,7 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:1002
msgid ""
"This package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if you have other computers "
@@ -60,7 +60,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:1002
msgid ""
"All print jobs in IPP get a MIME type. Since not all sources of print jobs "
"can attach an appropriate type, many jobs get submitted as the MIME type "
@@ -76,7 +76,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:1003
msgid ""
"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
"type as \"raw\" jobs, which causes them to be sent directly to the printer "
@@ -88,7 +88,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:1004
msgid ""
"If you will be accepting print jobs from Windows computers, you probably "
"want this option set, as Windows gives all IPP print jobs processed by a "
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/eu.po Mon Jan 29 10:28:35 2007
@@ -21,7 +21,6 @@
msgid "Do you want to set up the BSD lpd compatibility server?"
msgstr "BSD lpd bateragarritasun zerbiztaria konfiguratu nahi al duzu?"
-
#. Type: boolean
#. Description
#: ../cupsys-bsd.templates:1002
@@ -31,11 +30,10 @@
"that submit jobs over the network via \"BSD\" or \"LPR\" services, and these "
"computers cannot be converted to use the IPP protocol that CUPS uses."
msgstr ""
-"Pakete honek BSD-moduko inprimatze lanak onartu eta CUPS-era bidaltzen dituen "
-"zerbitzari bat du. Berau \"BSD\" edo \"LPR\" zerbitzuen bidez sare bidez lanak "
-"bidaltzen dituzten eta CUPS-ek erabiltzen duen IPP protokoloa erabili ezin duten "
-"ordenagailuak badituzu bakarrik konfiguratu behar da."
-
+"Pakete honek BSD-moduko inprimatze lanak onartu eta CUPS-era bidaltzen "
+"dituen zerbitzari bat du. Berau \"BSD\" edo \"LPR\" zerbitzuen bidez sare "
+"bidez lanak bidaltzen dituzten eta CUPS-ek erabiltzen duen IPP protokoloa "
+"erabili ezin duten ordenagailuak badituzu bakarrik konfiguratu behar da."
#. Type: boolean
#. Description
@@ -43,7 +41,6 @@
msgid "Do you want CUPS to print unknown jobs as raw jobs?"
msgstr "CUPS-ek lan ezezagunak lan gordinak bezala inprimatzea nahi duzu?"
-
#. Type: boolean
#. Description
#: ../cupsys.templates:1002
@@ -54,11 +51,11 @@
"that MIME type, it attempts to guess what the format is. By default, if it "
"cannot guess the proper type, it rejects the job."
msgstr ""
-"IPP inprimatze lan guztiek MIME mota bat dute. Inprimatze lan jatorri guztiek "
-"ezin dutenez mota zuzena ezarri, lan gehienal application/octet-stream MIME "
-"mota erabiliaz bidaltzen dita. Honegatik CUP-ek MIME mota hoentako lan bat "
-"jasotzean zein formatukoa den antzematen saiatuko da. Lehenespen bezala "
-"dagokien mota antzeman ezin diren lanak ukatu egingo dira."
+"IPP inprimatze lan guztiek MIME mota bat dute. Inprimatze lan jatorri "
+"guztiek ezin dutenez mota zuzena ezarri, lan gehienal application/octet-"
+"stream MIME mota erabiliaz bidaltzen dita. Honegatik CUP-ek MIME mota "
+"hoentako lan bat jasotzean zein formatukoa den antzematen saiatuko da. "
+"Lehenespen bezala dagokien mota antzeman ezin diren lanak ukatu egingo dira."
#. Type: boolean
#. Description
@@ -81,9 +78,9 @@
"print jobs this way."
msgstr ""
"Windows ordenagailutik inprimatze lanak onartu behar badituzu, ziurrenik "
-"aukera hau gaitu beharko duzu Windows-ek kontrolagailu lokal batek prozesaturiko "
-"IPP inprimatze lan guztiei application/octet-stream MIME mota ezartzen bait die. "
-"Sama-k ere inprimatze lanak era hoentara bidaltzen ditu."
+"aukera hau gaitu beharko duzu Windows-ek kontrolagailu lokal batek "
+"prozesaturiko IPP inprimatze lan guztiei application/octet-stream MIME mota "
+"ezartzen bait die. Sama-k ere inprimatze lanak era hoentara bidaltzen ditu."
#. Type: multiselect
#. Choices
@@ -145,8 +142,8 @@
msgid ""
"CUPS uses backend programs for communication with printer device or port."
msgstr ""
-"CUPS-ek inrpimagailu gailu edo atakarekin komunikazioa lortzeko motoreak erabiltzen ditu."
-
+"CUPS-ek inrpimagailu gailu edo atakarekin komunikazioa lortzeko motoreak "
+"erabiltzen ditu."
#. Type: multiselect
#. Description
@@ -155,8 +152,8 @@
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
msgstr ""
-"Zoritxarrez, zenbait motorek arazoak zor ditzakete. (Adibidez zenbait "
-"PPC kernel hasutura motore paraleloaz)"
+"Zoritxarrez, zenbait motorek arazoak zor ditzakete. (Adibidez zenbait PPC "
+"kernel hasutura motore paraleloaz)"
#. Type: multiselect
#. Description
@@ -165,5 +162,5 @@
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
msgstr ""
-"Mesedez hautatu CUPS-ek erabiliko duen komunikazio motorea. Aukera lehenetsiak "
-"ingurune arruntenetan funtzionatu beharko luke."
+"Mesedez hautatu CUPS-ek erabiliko duen komunikazio motorea. Aukera "
+"lehenetsiak ingurune arruntenetan funtzionatu beharko luke."
Modified: cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/po/pt_BR.po Mon Jan 29 10:28:35 2007
@@ -12,16 +12,17 @@
# Developers do not need to manually edit POT or PO files.
#
msgid ""
-msgstr "pt_BR utf-8\n"
+msgstr ""
"Project-Id-Version: cupsys\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-08 04:31+0100\n"
+"Report-Msgid-Bugs-To: pkg-cups-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-07-03 22:26+0900\n"
"PO-Revision-Date: 2006-11-09 20:17-0200\n"
"Last-Translator: Felipe Augusto van de Wiel (faw) <faw at cathedrallabs.org>\n"
"Language-Team: l10n portuguese <debian-l10n-portuguese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"pt_BR utf-8\n"
#. Type: boolean
#. Description
@@ -31,7 +32,7 @@
#. Type: boolean
#. Description
-#: ../cupsys-bsd.templates:1001
+#: ../cupsys-bsd.templates:1002
msgid ""
"This package contains a server that can accept BSD-style print jobs and "
"submit them to CUPS. It should only be set up if you have other computers "
@@ -71,7 +72,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:1003
msgid ""
"It is possible to cause CUPS to treat all unrecognized jobs with this MIME "
"type as \"raw\" jobs, which causes them to be sent directly to the printer "
@@ -83,7 +84,7 @@
#. Type: boolean
#. Description
-#: ../cupsys.templates:1001
+#: ../cupsys.templates:1004
msgid ""
"If you will be accepting print jobs from Windows computers, you probably "
"want this option set, as Windows gives all IPP print jobs processed by a "
@@ -161,7 +162,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2011
msgid ""
"Unfortunately, some backend programs cause some trouble. (For example, some "
"PPC kernel crashes with the parallel backend)"
@@ -171,7 +172,7 @@
#. Type: multiselect
#. Description
-#: ../cupsys.templates:2002
+#: ../cupsys.templates:2012
msgid ""
"Please choose the backend program to be used by CUPS. The default choice "
"should fit the most common environments."
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 Mon Jan 29 10:28:35 2007
@@ -78,6 +78,14 @@
ln -s ../../ppd/custom $(DEB_DESTDIR)/../cupsys/usr/share/cups/model/custom
+ # Add PPD directories according to FHS extension for distribution-
+ # independent printer driver location
+
+ mkdir -p debian/cupsys/usr/local/share/ppd
+ mkdir -p debian/cupsys/opt/share/ppd
+ ln -s ../../local/share/ppd debian/cupsys/usr/share/ppd/1-local-admin
+ ln -s /opt/share/ppd debian/cupsys/usr/share/ppd/2-third-party
+
# install lpd backend suid root so that it can bind to port <
# 1024 (required for RFC compliance)
chown root:lp debian/cupsys/usr/lib/cups/backend-available/lpd
More information about the Pkg-cups-devel
mailing list