rpms/cups/devel cups-str3382.patch,NONE,1.1 cups.spec,1.528,1.529
Jiří Popelka
jpopelka at fedoraproject.org
Tue Oct 20 13:42:59 UTC 2009
- Previous message (by thread): rpms/gnome-bluetooth/devel .cvsignore, 1.23, 1.24 gnome-bluetooth.spec, 1.95, 1.96 sources, 1.24, 1.25
- Next message (by thread): rpms/cups/F-12 cups-str3382.patch,NONE,1.1 cups.spec,1.527,1.528
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jpopelka
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10234
Modified Files:
cups.spec
Added Files:
cups-str3382.patch
Log Message:
* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
- Fix cups-lpd to create unique temporary data files (bug #529838).
cups-str3382.patch:
tempfile.c | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
--- NEW FILE cups-str3382.patch ---
diff -up cups-1.4.1/cups/tempfile.c.str3382 cups-1.4.1/cups/tempfile.c
--- cups-1.4.1/cups/tempfile.c.str3382 2008-12-10 06:03:11.000000000 +0100
+++ cups-1.4.1/cups/tempfile.c 2009-10-20 15:08:39.000000000 +0200
@@ -35,6 +35,7 @@
# include <io.h>
#else
# include <unistd.h>
+# include <sys/types.h>
#endif /* WIN32 || __EMX__ */
@@ -56,7 +57,7 @@ cupsTempFd(char *filename, /* I - Point
char tmppath[1024]; /* Windows temporary directory */
DWORD curtime; /* Current time */
#else
- struct timeval curtime; /* Current time */
+ mode_t old_umask; /* Old umask before using mkstemp() */
#endif /* WIN32 */
@@ -107,33 +108,25 @@ cupsTempFd(char *filename, /* I - Point
snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir,
GetCurrentProcessId(), curtime);
-#else
- /*
- * Get the current time of day...
- */
-
- gettimeofday(&curtime, NULL);
-
- /*
- * Format a string using the hex time values...
- */
-
- snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
- (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
-#endif /* WIN32 */
/*
* Open the file in "exclusive" mode, making sure that we don't
* stomp on an existing file or someone's symlink crack...
*/
-#ifdef WIN32
fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY,
_S_IREAD | _S_IWRITE);
-#elif defined(O_NOFOLLOW)
- fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
#else
- fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
+ /*
+ * Use the standard mkstemp() call to make a temporary filename
+ * securely. -- andrew.wood at jdplc.com
+ */
+ snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir);
+
+ old_umask = umask(0077);
+ fd = mkstemp(filename);
+ umask(old_umask);
#endif /* WIN32 */
if (fd < 0 && errno != EEXIST)
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -p -r1.528 -r1.529
--- cups.spec 19 Oct 2009 11:06:26 -0000 1.528
+++ cups.spec 20 Oct 2009 13:42:59 -0000 1.529
@@ -9,7 +9,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.1
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -54,6 +54,7 @@ Patch35: cups-cups-get-classes.patch
Patch37: cups-avahi.patch
Patch38: cups-str3332.patch
Patch39: cups-str3356.patch
+Patch40: cups-str3382.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -214,6 +215,7 @@ gzip -n postscript.ppd
%patch37 -p1 -b .avahi
%patch38 -p1 -b .str3332
%patch39 -p1 -b .str3356
+%patch40 -p1 -b .str3382
%if %lspp
%patch100 -p1 -b .lspp
@@ -509,6 +511,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Tue Oct 20 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-12
+- Fix cups-lpd to create unique temporary data files (bug #529838).
+
* Mon Oct 19 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-11
- Fixed German translation (bug #529575, STR #3380).
- Previous message (by thread): rpms/gnome-bluetooth/devel .cvsignore, 1.23, 1.24 gnome-bluetooth.spec, 1.95, 1.96 sources, 1.24, 1.25
- Next message (by thread): rpms/cups/F-12 cups-str3382.patch,NONE,1.1 cups.spec,1.527,1.528
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list