Fixed build.

This commit is contained in:
Tim Waugh 2008-12-16 16:59:28 +00:00
parent 1e5683c9b2
commit d5991e3b1b
2 changed files with 15 additions and 2 deletions

11
cups-serial.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up cups-1.4b2/backend/serial.c.serial cups-1.4b2/backend/serial.c
--- cups-1.4b2/backend/serial.c.serial 2008-12-16 16:25:02.000000000 +0000
+++ cups-1.4b2/backend/serial.c 2008-12-16 16:25:21.000000000 +0000
@@ -74,6 +74,7 @@
#endif /* __APPLE__ */
#if defined(__linux) && defined(TIOCGSERIAL)
+# include <linux/types.h>
# include <linux/serial.h>
# include <linux/ioctl.h>
#endif /* __linux && TIOCGSERIAL */

View File

@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
Release: 0.%{pre}.1%{?dist}
Release: 0.%{pre}.2%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@ -28,6 +28,7 @@ Patch1: cups-no-gzip-man.patch
Patch2: cups-1.1.16-system-auth.patch
Patch3: cups-multilib.patch
Patch4: cups-str2831.patch
Patch5: cups-serial.patch
Patch6: cups-banners.patch
Patch7: cups-serverbin-compat.patch
Patch8: cups-no-export-ssllibs.patch
@ -168,6 +169,7 @@ module.
%patch2 -p1 -b .system-auth
%patch3 -p1 -b .multilib
%patch4 -p1 -b .str2831
%patch5 -p1 -b .serial
%patch6 -p1 -b .banners
%patch7 -p1 -b .serverbin-compat
%patch8 -p1 -b .no-export-ssllibs
@ -450,7 +452,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/php/modules/*.so
%changelog
* Tue Dec 16 2008 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.1
* Tue Dec 16 2008 Tim Waugh <twaugh@redhat.com> 1:1.4-0.b2.2
- 1.4b2.
- No longer need CVE-2008-5183 patch.