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

Do not apply unary exclamation mark to va_list (bug #957737).

Browse Source
This commit is contained in:
Jiri Popelka 2013-04-29 16:07:09 +02:00
parent a8486d4fdc
commit 47fb896364
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cups-17b1-va_list.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up cups-1.7b1/cups/ipp.c.va_list cups-1.7b1/cups/ipp.c
--- cups-1.7b1/cups/ipp.c.va_list 2013-03-14 19:45:49.000000000 +0100
+++ cups-1.7b1/cups/ipp.c 2013-04-29 15:45:52.680403846 +0200
@@ -1210,7 +1210,7 @@ ippAddStringfv(ipp_t *ipp, /* I -
group == IPP_TAG_END || group >= IPP_TAG_UNSUPPORTED_VALUE ||
(value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
- !format || !ap)
+ !format)
return (NULL);
if ((value_tag == IPP_TAG_TEXTLANG || value_tag == IPP_TAG_NAMELANG)
@@ -4449,7 +4449,7 @@ ippSetStringfv(ipp_t *ipp, /*
if (!ipp || !attr || !*attr ||
(value_tag < IPP_TAG_TEXT && value_tag != IPP_TAG_TEXTLANG &&
value_tag != IPP_TAG_NAMELANG) || value_tag > IPP_TAG_MIMETYPE ||
- !format || !ap)
+ !format)
return (0);
/*

9
cups.spec
View File

@ -14,7 +14,7 @@ Summary: CUPS printing system
Name: cups
Epoch: 1
Version: 1.7
Release: 0.1.%{prever}%{?dist}
Release: 0.2.%{prever}%{?dist}
License: GPLv2
Group: System Environment/Daemons
Url: http://www.cups.org/
@ -58,6 +58,7 @@ Patch24: cups-ricoh-deviceid-oid.patch
Patch25: cups-systemd-socket.patch
Patch26: cups-lpd-manpage.patch
Patch27: cups-avahi-address.patch
Patch28: cups-17b1-va_list.patch
Patch100: cups-lspp.patch
@ -228,6 +229,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Use IP address when resolving DNSSD URIs (bug #948288).
%patch27 -p1 -b .avahi-address
# do not apply unary exclamation mark to va_list (bug #957737).
%patch28 -p1 -b .va_list
%if %lspp
# LSPP support.
%patch100 -p1 -b .lspp
@ -624,6 +628,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
* Mon Apr 29 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.7-0.2.b1
- Do not apply unary exclamation mark to va_list (bug #957737).
* Fri Apr 19 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.7-0.1.b1
- 1.7b1
- use _tmpfilesdir macro