Hello community, here is the log from the commit of package lprng checked in at Wed Apr 30 00:30:37 CEST 2008. -------- --- lprng/lprng.changes 2008-04-26 07:23:32.000000000 +0200 +++ lprng/lprng.changes 2008-04-29 15:32:14.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Apr 29 15:30:45 CEST 2008 - jsmeix@suse.de + +- Enhanced tmpdir.diff because of bnc#255393 and bnc#362099: + The defaults for the temporary file directories default_tmp_dir + and server_tmp_dir are changed from /tmp to /var/tmp. They must + be on the same mounted filesystem as the spool directory so that + rename(2) can be used to atomically replace (possibly huge) job + data files in the spool directory with temporary files. + Adapted the man pages for lpd.conf and printcap accordingly. + +------------------------------------------------------------------- @@ -9 +20,2 @@ -- added call to Remove_tempfiles() to remove temporary files (tmpdir.diff) +- added call to Remove_tempfiles() to remove temporary + files (tmpdir.diff) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lprng.spec ++++++ --- /var/tmp/diff_new_pack.F10529/_old 2008-04-30 00:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.F10529/_new 2008-04-30 00:27:05.000000000 +0200 @@ -14,7 +14,7 @@ Name: lprng BuildRequires: ncurses-devel ncurses-utils tcpd-devel Version: 3.8.28 -Release: 120 +Release: 122 Conflicts: cups-client Obsoletes: lprold PreReq: %insserv_prereq %fillup_prereq grep sed sh-utils permissions @@ -193,10 +193,19 @@ %{_datadir}/locale/*/*/*.mo %changelog +* Tue Apr 29 2008 jsmeix@suse.de +- Enhanced tmpdir.diff because of bnc#255393 and bnc#362099: + The defaults for the temporary file directories default_tmp_dir + and server_tmp_dir are changed from /tmp to /var/tmp. They must + be on the same mounted filesystem as the spool directory so that + rename(2) can be used to atomically replace (possibly huge) job + data files in the spool directory with temporary files. + Adapted the man pages for lpd.conf and printcap accordingly. * Sat Apr 26 2008 coolo@suse.de - buildrequire ncurses-utils for /usr/bin/clear * Wed Apr 04 2007 prusnak@suse.cz -- added call to Remove_tempfiles() to remove temporary files (tmpdir.diff) +- added call to Remove_tempfiles() to remove temporary + files (tmpdir.diff) * Mon Apr 02 2007 rguenther@suse.de - add ncurses-devel BuildRequires * Thu Mar 29 2007 rguenther@suse.de ++++++ LPRng-3.8.28-tmpdir.diff ++++++ --- /var/tmp/diff_new_pack.F10529/_old 2008-04-30 00:27:05.000000000 +0200 +++ /var/tmp/diff_new_pack.F10529/_new 2008-04-30 00:27:05.000000000 +0200 @@ -1,6 +1,14 @@ --- src/common/linelist.c +++ src/common/linelist.c -@@ -2390,6 +2390,7 @@ +@@ -11,6 +11,7 @@ + "$Id: linelist.c,v 1.65 2004/02/04 00:54:11 papowell Exp $"; + + #include "lp.h" ++#include "defs.h" + #include "errorcodes.h" + #include "globmatch.h" + #include "gethostinfo.h" +@@ -2390,6 +2391,7 @@ /* do not worry if these fail */ close( intempfd); intempfd = -1; close( outtempfd); outtempfd = -1; @@ -8,13 +16,81 @@ } } -@@ -2505,7 +2506,8 @@ +@@ -2505,7 +2507,8 @@ struct stat statb; if( Is_server ){ - if( dir == 0 ) dir = Spool_dir_DYN; -+// Why should we create tmpfiles in spooldir ? -+// if( dir == 0 ) dir = Spool_dir_DYN; ++ // only create tempfiles in spooldir when already expanded ++ if( (dir == 0) && safestrcmp(Spool_dir_DYN,SD_DEFAULT "/%P")) dir = Spool_dir_DYN; if( dir == 0 ) dir = Server_tmp_dir_DYN; } else { dir = getenv( "LPR_TMP" ); +--- src/common/vars.c.orig 2008-02-28 16:50:32.000000000 +0100 ++++ src/common/vars.c 2008-02-28 16:51:15.000000000 +0100 +@@ -200,7 +200,7 @@ struct keywords Pc_var_list[] = { + /* default remote host */ + { "default_remote_host", 0, STRING_K, &Default_remote_host_DYN,0,0,"=localhost"}, + /* default temp directory for temp files */ +-{ "default_tmp_dir", 0, STRING_K, &Default_tmp_dir_DYN,0,0,"=/tmp"}, ++{ "default_tmp_dir", 0, STRING_K, &Default_tmp_dir_DYN,0,0,"=/var/tmp"}, + /* printers that we should query for status information */ + { "destinations", 0, STRING_K, &Destinations_DYN,0,0,0}, + /* allow LPR to make direct socket connection to printer */ +@@ -492,7 +492,7 @@ struct keywords Pc_var_list[] = { + /* allow mail to user using the sendmail program */ + { "sendmail_to_user", 0, FLAG_K, &Sendmail_to_user_DYN,0,0,"=1"}, + /* server temporary file directory */ +-{ "server_tmp_dir", 0, STRING_K, &Server_tmp_dir_DYN,0,0,"=/tmp"}, ++{ "server_tmp_dir", 0, STRING_K, &Server_tmp_dir_DYN,0,0,"=/var/tmp"}, + /* no form feed separator between job files */ + { "sf", 0, FLAG_K, &No_FF_separator_DYN,0,0,"=1"}, + /* suppress headers and/or banner page */ +--- man/lpd.conf.n.orig 2008-02-28 16:38:00.000000000 +0100 ++++ man/lpd.conf.n 2008-02-28 16:48:44.000000000 +0100 +@@ -237,8 +237,11 @@ This is also used as the job class. + \fBdefault_remote_host\fR (default: "%H") + The default remote host to use. + .TP +-\fBdefault_tmp_dir\fR (default: /tmp) ++\fBdefault_tmp_dir\fR (default: /var/tmp) + Directory for temporary files. ++Must be on the same mounted filesystem as the spool directory ++so that rename(2) can atomically replace files in the ++spool directory with temporary files. + .TP + \fBdomain_name\fR (default: "") + This parameter is optional, and is appended to +@@ -561,8 +564,11 @@ accept the message on stdin, with \fIno\ + The message will contain the \fBTo:\fR, \fBFrom:\fR, + \fBCc:\fR and \fBSubject:\fR headers. + .TP +-\fBserver_tmp_dir\fR (default: /tmp) ++\fBserver_tmp_dir\fR (default: /var/tmp) + Temporary dir for the server. ++Must be on the same mounted filesystem as the spool directory ++so that rename(2) can atomically replace files in the ++spool directory with temporary files. + .TP + \fBspool_dir_perms\fR (default: 042700) + Permissions of the spool directories. +--- man/printcap.n.orig 2008-02-28 16:37:06.000000000 +0100 ++++ man/printcap.n 2008-02-28 16:37:47.000000000 +0100 +@@ -269,7 +269,7 @@ default_priority R str A + default priority for printing jobs + default_remote_host A str localhost + default remote host for printing operations +-default_tmp_dir A str /tmp ++default_tmp_dir A str /var/tmp + default temporary directory + destinations D str NULL + names of printers that lpq/lprm should talk to +@@ -576,7 +576,7 @@ sendmail D str /usr/sbin/sendmail -oi -t + server A bool false printcap entry for server only + server_auth_command A str NULL + authentication command for server program +-server_tmp_dir D str /tmp ++server_tmp_dir D str /var/tmp + temporary directory for server to create files when there + is no spool directory. + server_user D str daemon server user name used in authentication operations ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de