From d5991e3b1b3ba5e3cbabdf14392130ac5cfe9bea Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Dec 16 2008 16:59:28 +0000 Subject: Fixed build. --- diff --git a/cups-serial.patch b/cups-serial.patch new file mode 100644 index 0000000..6e111f2 --- /dev/null +++ b/cups-serial.patch @@ -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 + # include + # include + #endif /* __linux && TIOCGSERIAL */ diff --git a/cups.spec b/cups.spec index 00b67a8..78f976e 100644 --- a/cups.spec +++ b/cups.spec @@ -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 1:1.4-0.b2.1 +* Tue Dec 16 2008 Tim Waugh 1:1.4-0.b2.2 - 1.4b2. - No longer need CVE-2008-5183 patch.