rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed MIME type rules for image/jpeg and image/x-bitmap (bug #516438, STR

Browse Source 
#3284).
This commit is contained in:
Tim Waugh 2009-08-10 09:38:00 +00:00
parent bce58e985e
commit 2da5993abb
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cups-str3284.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up cups-1.4rc1/conf/mime.types.str3284 cups-1.4rc1/conf/mime.types
--- cups-1.4rc1/conf/mime.types.str3284 2009-05-17 00:48:35.000000000 +0100
+++ cups-1.4rc1/conf/mime.types 2009-08-10 10:32:46.887840076 +0100
@@ -95,7 +95,7 @@ application/vnd.hp-HPGL hpgl \
image/gif gif string(0,GIF87a) string(0,GIF89a)
image/png png string(0,<89>PNG)
-image/jpeg jpeg jpg jpe string(0,<FFD8FF>) &&\
+image/jpeg jpeg jpg jpe string(0,<FFD8FF>) +\
(char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\
char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\
char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\
@@ -114,7 +114,7 @@ image/x-sun-raster ras string(0,<59a66a
#image/fpx fpx
image/x-alias pix short(8,8) short(8,24)
-image/x-bitmap bmp string(0,BM) && !printable(2,14)
+image/x-bitmap bmp string(0,BM) + !printable(2,14)
image/x-icon ico
########################################################################

6
cups.spec
View File

@ -63,6 +63,7 @@ Patch35: cups-cups-get-classes.patch
Patch36: cups-str3272.patch
Patch37: cups-avahi.patch
Patch38: cups-str3277.patch
Patch39: cups-str3284.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@ -226,6 +227,7 @@ module.
%patch36 -p1 -b .str3272
%patch37 -p1 -b .avahi
%patch38 -p1 -b .str3277
%patch39 -p1 -b .str3284
%if %lspp
%patch100 -p1 -b .lspp
@ -520,7 +522,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
* Fri Aug 7 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.14
* Mon Aug 10 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.14
- Fixed MIME type rules for image/jpeg and image/x-bitmap
(bug #516438, STR #3284).
- Clear out cache files on upgrade.
- Require acl.