Hello community, here is the log from the commit of package cups for openSUSE:Factory checked in at Thu Mar 18 23:08:52 CET 2010. -------- --- cups/cups.changes 2009-12-15 22:22:48.000000000 +0100 +++ cups/cups.changes 2010-03-16 12:49:40.000000000 +0100 @@ -1,0 +2,33 @@ +Wed Jan 27 14:43:37 CET 2010 - jsmeix@suse.de + +- CUPS 1.3 -> 1.4 version upgrade and major cleanup: + For the CUPS upstream changes see the CHANGES.txt file. + Such a major version upgrade is the perfect chance + to drop almost all our own patches to enforce a + reset to almost 100% compliance with upstream. + Here our openSUSE CUPS versions and their number of patches + (i.e. the "Patch" entries in the cups.spec files): + CUPS version 1.2.12 in openSUSE 10.3: 37 + CUPS version 1.3.7 in openSUSE 11.0: 29 + CUPS version 1.3.9 in openSUSE 11.1: 26 + CUPS version 1.3.11 in openSUSE 11.2: 17 + Of course this includes patches with backported bug fixes + via our maintenance but nevertheless there were really + too much openSUSE specific patches. + Therefore I would like to provide CUPS 1.4 "as is" to the + furthest possible extent (there are still 6 patches left). + Then let's see if we get bug reports because of this. + I did such a reset to 100% compliance with upstream + already in the past for sane-backends and guess what: + I got no single bug report at all because of this. + I guess what they do at upstream is actually not so bad ;-) +- Added the explicite path to '--with-cachedir=/var/cache/cups' + in cups.spec to avoid that the fallback value 'yes' results + the cache directory '/etc/cups/yes/'. +- cups-1.3.11-CVE-2009-2820-regression-fix.patch and + cups-1.3.11-CVE-2009-2820.patch have become + obsolete because it is fixed in the source. +- cups-1.4-full_path_to_configure_with-pdftops.patch has become + obsolete because it is fixed in the source. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PrintAnalyzer cups-1.1.21-testppd_duplex.patch cups-1.2.0-ppdsdat_generation.patch cups-1.2.11-testppd_filename.patch cups-1.2.7-libwrap.patch cups-1.3.11-CVE-2009-2820-regression-fix.patch cups-1.3.11-CVE-2009-2820.patch cups-1.3.11-source.tar.bz2 cups-1.3.3-mime.patch cups-1.3.3-pswrite.patch cups-1.3.3-testppd_none.patch cups-1.3.7-additional_policies.patch cups-1.3.7-keeping_recommended.patch cups-1.3.7-lppasswd_fixperm.patch cups-1.3.9-CVE-2009-3553.patch cups-1.4svn-pdftops.c cups-pdf.ppd cups-pstopdf cups.SuSEfirewall2 dvitops full_path_to_configure_with-pdftops.patch lphelp.c ogonki poll_ppd_base.c pswrite quosnmp setcupsbroadcasting New: ---- cups-1.4-additional_policies.patch cups-1.4-do_not_strip_recommended_from_PPDs.patch cups-1.4.2-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ ++++ 738 lines (skipped) ++++ between cups/cups.spec ++++ and cups/cups.spec ++++++ cups-1.3.9-desktop_file.patch ++++++ --- /var/tmp/diff_new_pack.KOPaSE/_old 2010-03-18 23:06:50.000000000 +0100 +++ /var/tmp/diff_new_pack.KOPaSE/_new 2010-03-18 23:06:50.000000000 +0100 @@ -1,9 +1,9 @@ ---- cups-1.3.9/desktop/cups.desktop.orig 2008-09-06 02:30:39.000000000 +0200 -+++ cups-1.3.9/desktop/cups.desktop 2008-10-13 10:50:03.000000000 +0200 +--- desktop/cups.desktop.in.orig 2009-10-02 19:15:07.000000000 +0200 ++++ desktop/cups.desktop.in 2010-01-27 15:14:58.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] -Categories=System;Printing;HardwareSettings;X-Red-Hat-Base; --Exec=htmlview http://localhost:631/ +-Exec=@CUPS_HTMLVIEW@ http://localhost:631/ +Categories=System;Printing;HardwareSettings; +Exec=desktop-launch http://localhost:631/ Icon=cups ++++++ cups-1.3.7-additional_policies.patch -> cups-1.4-additional_policies.patch ++++++ --- cups/cups-1.3.7-additional_policies.patch 2008-07-14 18:17:01.000000000 +0200 +++ cups/cups-1.4-additional_policies.patch 2010-01-27 16:28:21.000000000 +0100 @@ -1,58 +1,26 @@ ---- cups-1.3.7/conf/cupsd.conf.in.orig 2008-07-08 12:11:01.000000000 +0200 -+++ cups-1.3.7/conf/cupsd.conf.in 2008-07-08 13:11:57.000000000 +0200 -@@ -78,6 +78,55 @@ - </Limit> - </Policy> - -+DefaultPolicy default -+ -+# easy is a very relaxed policy -+<Policy easy> -+ # Job-related operations must be done by the owner or an administrator... -+ <Limit All> -+ Satisfy any -+ Order allow,deny -+ </Limit> -+</Policy> -+ -+# paranoid is a very restricted policy -+<Policy paranoid> -+ # Job-related operations must be done by the owner -+ <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job> -+ Require user @OWNER -+ Allow from 127.0.0.0/8 -+ Order deny,allow -+ </Limit> -+ # All administration operations require an administrator to authenticate... -+ <Limit CUPS-Add-Modify-Printer CUPS-Delete-Printer CUPS-Add-Modify-Class CUPS-Delete-Class CUPS-Set-Default> -+ AuthType Default -+ Require user @SYSTEM -+ Allow from 127.0.0.0/8 -+ Order deny,allow -+ </Limit> -+ -+ # All printer operations require a printer operator to authenticate... -+ <Limit Pause-Printer Resume-Printer Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Accept-Jobs CUPS-Reject-Jobs> -+ AuthType Default -+ Require user @CUPS_DEFAULT_PRINTADMIN_AUTH@ -+ Allow from 127.0.0.0/8 -+ Order deny,allow -+ </Limit> -+ -+ # Only the owner or an administrator can cancel or authenticate a job... -+ <Limit Cancel-Job CUPS-Authenticate-Job> -+ Require user @OWNER -+ Allow from 127.0.0.0/8 -+ Order deny,allow -+ </Limit> +--- conf/cupsd.conf.in.orig 2010-01-27 11:49:09.000000000 +0100 ++++ conf/cupsd.conf.in 2010-01-27 11:55:34.000000000 +0100 +@@ -120,3 +120,23 @@ DefaultAuthType Basic + # + # End of "$Id: cupsd.conf.in 8805 2009-08-31 16:34:06Z mike $". + # + ++# The policy below is added by openSUSE/Novell during build of our cups package. ++# The policy 'allowallforanybody' is totally open and insecure and therefore ++# it can only be used within an internal network where only trused users exist ++# and where the cupsd is not accessible at all from any external host. ++# Have in mind that any user who is allowed to do printer admin tasks ++# can change the print queues as he likes (e.g. send copies of confidental ++# print jobs from an internal network to any external destination). ++# For documentation regarding 'Managing Operation Policies' see ++# http://www.cups.org/documentation.php/doc-1.4/policies.html ++<Policy allowallforanybody> + <Limit All> -+ Require user @OWNER @CUPS_DEFAULT_PRINTADMIN_AUTH@ -+ Allow from 127.0.0.0/8 + Order deny,allow ++ Allow from all + </Limit> +</Policy> ++# Explicitely set the CUPS 'default' policy to be used by default: ++DefaultPolicy default ++# End of additions by openSUSE/Novell. + - # - # End of "$Id: cupsd.conf.in 7199 2008-01-08 00:16:30Z mike $". - # ++++++ cups-1.4-do_not_strip_recommended_from_PPDs.patch ++++++ --- scheduler/cups-driverd.cxx.orig 2009-06-09 00:00:14.000000000 +0200 +++ scheduler/cups-driverd.cxx 2009-07-01 14:38:44.000000000 +0200 @@ -211,7 +211,6 @@ add_ppd(const char *filename, /* I - PP const char *scheme) /* I - PPD scheme */ { ppd_info_t *ppd; /* PPD */ - char *recommended; /* Foomatic driver string */ /* @@ -250,15 +249,6 @@ add_ppd(const char *filename, /* I - PP strlcpy(ppd->record.scheme, scheme, sizeof(ppd->record.scheme)); /* - * Strip confusing (and often wrong) "recommended" suffix added by - * Foomatic drivers... - */ - - if ((recommended = strstr(ppd->record.make_and_model, - " (recommended)")) != NULL) - *recommended = '\0'; - - /* * Add the PPD to the PPD arrays... */ ++++++ cups-1.3.11-source.tar.bz2 -> cups-1.4.2-source.tar.bz2 ++++++ ++++ 427614 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org