|
|
@@ -8,7 +8,7 @@
|
|
|
Summary: Common Unix Printing System
|
|
|
Name: cups
|
|
|
Version: 1.3.11
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 6%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Daemons
|
|
|
|
|
|
@@ -67,6 +67,14 @@ Patch23: cups-str2101.patch
|
|
|
# use mpage for text-ps filter instead of texttops
|
|
|
Patch210: cups-1.3.7-cjktexttops.patch
|
|
|
|
|
|
+# security fixes
|
|
|
+Patch300: cups-1.3.8-CVE-2010-0393.patch
|
|
|
+Patch310: cups-1.3.x_CVE-2010-0540.patch
|
|
|
+Patch320: cups-1.3.11_CVE-2010-0542.patch
|
|
|
+Patch330: cups-1.3.11_CVE-2010-1748.patch
|
|
|
+Patch340: cups-CVE-2009-2820.patch
|
|
|
+Patch350: cups-CVE-2009-3553.patch
|
|
|
+
|
|
|
Url: http://www.cups.org/
|
|
|
BuildRoot: %{_tmppath}/%{name}-root
|
|
|
PreReq: chkconfig initscripts perl alternatives
|
|
|
@@ -203,6 +211,13 @@ Common UNIX Printing SystemはUNIX操作環境においてポータブルな印
|
|
|
|
|
|
%patch210 -p1 -b .cjktexttops
|
|
|
|
|
|
+%patch300 -p1 -b .CVE-2010-0393
|
|
|
+%patch310 -p0 -b .CVE-2010-0540
|
|
|
+%patch340 -p1 -b .CVE-2009-2820
|
|
|
+%patch350 -p1 -b .CVE-2009-3553
|
|
|
+%patch320 -p1 -b .CVE-2010-0542
|
|
|
+%patch330 -p1 -b .CVE-2010-1748
|
|
|
+
|
|
|
perl -pi -e 's,^#(DefaultCharset\s)utf-8,$1notused,' conf/cupsd.conf.in
|
|
|
perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in
|
|
|
perl -pi -e 's,^#(MaxLogSize\s+0),$1,' conf/cupsd.conf.in
|
|
|
@@ -228,10 +243,10 @@ export CPPFLAGS="$CPPFLAGS -I/usr/include/avahi-compat-libdns_sd"
|
|
|
|
|
|
%configure --with-docdir=%{_datadir}/%{name}/www \
|
|
|
--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
|
|
|
+ --disable-slp \
|
|
|
--with-log-file-perm=0600 --enable-pie --enable-relro \
|
|
|
--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1
|
|
|
|
|
|
-
|
|
|
perl -pi -e "s,^DSO =.*,DSO=gcc -fpic," Makedefs
|
|
|
|
|
|
# If we got this far, all prerequisite libraries must be here.
|
|
|
@@ -242,6 +257,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
make BUILDROOT=$RPM_BUILD_ROOT install
|
|
|
|
|
|
+
|
|
|
# Include Till Kamppeter's dnssd backend.
|
|
|
%if %use_avahi
|
|
|
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/%{name}/backend/dnssd
|
|
|
@@ -463,7 +479,13 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_bindir}/cupstestppd
|
|
|
%{_bindir}/cupstestdsc
|
|
|
%{_bindir}/cancel*
|
|
|
-%{_bindir}/lp*
|
|
|
+%{_bindir}/lp.cups
|
|
|
+%{_bindir}/lpoptions
|
|
|
+%attr(4755,root,root) %{_bindir}/lppasswd
|
|
|
+%{_bindir}/lpq.cups
|
|
|
+%{_bindir}/lpr.cups
|
|
|
+%{_bindir}/lprm.cups
|
|
|
+%{_bindir}/lpstat.cups
|
|
|
%dir %{_libdir}/cups
|
|
|
%dir %{_libdir}/cups/backend
|
|
|
%{_libdir}/cups/backend/http
|
|
|
@@ -533,6 +555,26 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jul 4 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-6
|
|
|
+- add --disable-slp option in configure
|
|
|
+
|
|
|
+* Sun Jul 4 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-5
|
|
|
+- add Patch340 for fix CVE-2009-2820
|
|
|
+- add Patch350 for fix CVE-2009-3553
|
|
|
+- patch340,350 are from rhel5
|
|
|
+
|
|
|
+* Sun Jul 4 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-4
|
|
|
+- fix changelog typo
|
|
|
+- add Patch310 for fix CVE-2010-0540 (texttop)
|
|
|
+- add Patch320 for fix CVE-2010-0542 (web IF CSRF)
|
|
|
+- add Patch330 for fix CVE-2010-1748 (web IF uninit memory read)
|
|
|
+
|
|
|
+* Sun Mar 7 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-3
|
|
|
+- setuid 0 to lppasswd binary
|
|
|
+
|
|
|
+* Sat Mar 6 2010 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.11-2
|
|
|
+- add Patch300 for fix CVE-2010-0393 (lppasswd)
|
|
|
+
|
|
|
* Fri Jul 10 2009 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.11-1
|
|
|
- new upstream release
|
|
|
|
inagaki