Author: glen Date: Fri Apr 11 13:55:50 2008 GMT Module: SPECS Tag: AC-branch ---- Log message: - update from HEAD: up to 1.3.7 - resolves CVE-2008-0047, CVE-2008-1373 and other bugs
---- Files affected: SPECS: cups.spec (1.202.2.1 -> 1.202.2.2) ---- Diffs: ================================================================ Index: SPECS/cups.spec diff -u SPECS/cups.spec:1.202.2.1 SPECS/cups.spec:1.202.2.2 --- SPECS/cups.spec:1.202.2.1 Thu Dec 20 00:28:08 2007 +++ SPECS/cups.spec Fri Apr 11 15:55:44 2008 @@ -21,13 +21,13 @@ Summary(pl.UTF-8): Ogólny system druku dla Uniksa Summary(pt_BR.UTF-8): Sistema Unix de Impressão Name: cups -Version: 1.3.5 +Version: 1.3.7 Release: 1 Epoch: 1 -License: GPL/LGPL +License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception Group: Applications/Printing Source0: http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2 -# Source0-md5: 355705c528e9a8d0d439da15454d79a6 +# Source0-md5: db4a45a17104f10f3ee599d88267c9e5 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.logrotate @@ -42,6 +42,9 @@ Patch6: %{name}-certs_FHS.patch Patch7: %{name}-direct_usb.patch Patch8: %{name}-satisfy-any.patch +Patch9: %{name}-no-polluted-krb5config.patch +Patch10: %{name}-java-fix.patch +Patch11: %{name}-verbose-compilation.patch URL: http://www.cups.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -74,6 +77,14 @@ Obsoletes: printingdaemon Conflicts: ghostscript < 7.05.4 Conflicts: logrotate < 3.7-4 +# pstoraster: +Suggests: cups-filter-pstoraster +# Contains imagetops...: +Suggests: kdelibs +# pdftops: +Suggests: poppler-progs +# pstops: +Suggests: psutils BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _ulibdir %{_prefix}/lib @@ -108,6 +119,7 @@ Summary: Common Unix Printing System Libraries Summary(pl.UTF-8): Biblioteki dla CUPS Summary(pt_BR.UTF-8): Sistema Unix de Impressão - bibliotecas para uso em clientes cups +License: LGPL v2 + openssl exception Group: Libraries Provides: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: cups-libs @@ -125,6 +137,7 @@ %package clients Summary: Common Unix Printing System Clients Summary(pl.UTF-8): Aplikacje klienckie dla CUPS +License: GPL v2 + openssl exception Group: Applications/Printing Requires: %{name}-libs = %{epoch}:%{version}-%{release} Provides: printingclient @@ -140,6 +153,7 @@ Summary: Common Unix Printing System Libraries - images manipulation Summary(pl.UTF-8): Biblioteki dla CUPS - obsługa formatów graficznych Summary(pt_BR.UTF-8): Sistema Unix de Impressão - bibliotecas para uso em clientes cups +License: LGPL v2 + openssl exception Group: Libraries Requires: %{name}-lib = %{epoch}:%{version}-%{release} Obsoletes: libcups1 @@ -157,11 +171,13 @@ Summary: Common Unix Printing System development files Summary(pl.UTF-8): Ogólny system druku dla Uniksa - pliki nagłówkowe Summary(pt_BR.UTF-8): Sistema Unix de Impressão - ambiente de desenvolvimento +License: LGPL v2 + openssl exception Group: Development/Libraries Requires: %{name}-image-lib = %{epoch}:%{version}-%{release} Requires: %{name}-lib = %{epoch}:%{version}-%{release} # for libcups %{?with_gnutls:Requires: gnutls-devel} +Requires: krb5-devel %{!?with_gnutls:Requires: openssl-devel} Requires: zlib-devel # for libcupsimage @@ -185,6 +201,7 @@ Summary: Common Unix Printing System static libraries Summary(pl.UTF-8): Ogólny system druku dla Uniksa - biblioteki statyczne Summary(pt_BR.UTF-8): Common Unix Printing System - bibliotecas estáticas +License: LGPL v2 + openssl exception Group: Development/Libraries Requires: %{name}-devel = %{epoch}:%{version}-%{release} @@ -201,6 +218,7 @@ %package -n perl-cups Summary: Perl module for CUPS Summary(pl.UTF-8): Moduł Perla CUPS +License: GPL v2 + openssl exception Group: Development/Languages/Perl Requires: %{name}-lib = %{epoch}:%{version}-%{release} @@ -213,6 +231,7 @@ %package -n php-cups Summary: PHP module for CUPS Summary(pl.UTF-8): Moduł PHP CUPS +License: GPL v2 + openssl exception Group: Development/Languages/PHP Requires: %{name}-lib = %{epoch}:%{version}-%{release} %{?requires_php_extension} @@ -228,6 +247,7 @@ %package -n java-cups Summary: CUPS java classes Summary(pl.UTF-8): Klasy javy CUPS +License: GPL v2 + openssl exception Group: Development/Languages/Java Requires: jpackage-utils @@ -240,6 +260,7 @@ %package -n java-cups-javadoc Summary: Online manual for %{name} Summary(pl.UTF-8): Dokumentacja online do %{name} +License: GPL v2 + openssl exception Group: Documentation Requires: jpackage-utils @@ -255,6 +276,7 @@ %package backend-usb Summary: USB backend for CUPS Summary(pl.UTF-8): Backend USB dla CUPS-a +License: GPL v2 + openssl exception Group: Applications/Printing Requires: %{name} = %{epoch}:%{version}-%{release} @@ -267,6 +289,7 @@ %package backend-serial Summary: Serial port backend for CUPS Summary(pl.UTF-8): Backend obsługujący porty szeregowe dla CUPS-a +License: GPL v2 + openssl exception Group: Applications/Printing Requires: %{name} = %{epoch}:%{version}-%{release} @@ -281,6 +304,7 @@ %package backend-parallel Summary: Parallel port backend for CUPS Summary(pl.UTF-8): Backend obsługujący porty równoległe dla CUPS-a +License: GPL v2 + openssl exception Group: Applications/Printing Requires: %{name} = %{epoch}:%{version}-%{release} @@ -295,6 +319,7 @@ %package lpd Summary: LPD compatibility support for CUPS print server Summary(pl.UTF-8): Wsparcie dla LPD w serwerze wydruków CUPS +License: GPL v2 + openssl exception Group: Applications/Printing Requires: %{name} = %{epoch}:%{version}-%{release} Requires: rc-inetd @@ -316,6 +341,9 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 %build %{__aclocal} -I config-scripts @@ -324,7 +352,7 @@ --libdir=%{_ulibdir} \ --enable-shared \ --with-cups-user=lp \ - --with-cups-group=sys \ + --with-cups-group=lp \ --with-system-groups=sys \ --with-printcap=/etc/printcap \ %{?with_static_libs:--enable-static} \ @@ -755,6 +783,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.202.2.2 2008-04-11 13:55:44 glen +- update from HEAD: up to 1.3.7 - resolves CVE-2008-0047, CVE-2008-1373 and other bugs + Revision 1.202.2.1 2007-12-19 23:28:08 glen - merged update to 1.3.5 from HEAD ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cups.spec?r1=1.202.2.1&r2=1.202.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
