Merge changes introduced in the Debian 0.31-1 package.

mquinson · Jun 17, 2007 · 33f8703 · 33f8703
1 parent 9c9f53d
commit 33f8703
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 15 deletions.
diff --git a/COPYING b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,8 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
 Also add information on how to contact you by electronic and paper mail.

diff --git a/NEWS b/NEWS
@@ -1,5 +1,11 @@
 po4a NEWS
 
+===============================================================================
+* Major changes in release 0.32 ()
+
+** Security fix
+  Fix a possible race condition on a file created in /tmp.
+
 ===============================================================================
 * Major changes in release 0.31 (2007-05-07)
 

diff --git a/changelog b/changelog
@@ -1,3 +1,14 @@
+2007-06-17  Nicolas François  <nicolas.francois@centraliens.net>
+
+	Merge some changes introduced in the Debian 0.31-1 package:
+	* COPYING, lib/Locale/Po4a/BibTeX.pm, lib/Locale/Po4a/Dia.pm,
+	lib/Locale/Po4a/Docbook.pm, lib/Locale/Po4a/Guide.pm,
+	lib/Locale/Po4a/LaTeX.pm, lib/Locale/Po4a/Sgml.pm, lib/Locale/Po4a/TeX.pm,
+	lib/Locale/Po4a/Texinfo.pm, lib/Locale/Po4a/Text.pm,
+	lib/Locale/Po4a/Xml.pm: Fix the FSF address.
+	* lib/Locale/Po4a/Po.pm: Fix possible symlink attacks in /tmp. Thanks to
+	Javier Fernández-Sanguino Peña.
+
 2007-05-07  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* po4a-updatepo: Make sure $msgmerge_opt is initialized.

diff --git a/lib/Locale/Po4a/BibTeX.pm b/lib/Locale/Po4a/BibTeX.pm
@@ -16,7 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Dia.pm b/lib/Locale/Po4a/Dia.pm
@@ -21,7 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Docbook.pm b/lib/Locale/Po4a/Docbook.pm
@@ -21,7 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Guide.pm b/lib/Locale/Po4a/Guide.pm
@@ -21,7 +21,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/LaTeX.pm b/lib/Locale/Po4a/LaTeX.pm
@@ -16,7 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Foobar; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Po.pm b/lib/Locale/Po4a/Po.pm
@@ -1,5 +1,5 @@
 # Locale::Po4a::Po -- manipulation of po files 
-# $Id: Po.pm,v 1.76 2007-04-18 08:36:04 nekral-guest Exp $
+# $Id: Po.pm,v 1.77 2007-06-17 00:19:39 nekral-guest Exp $
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the terms of GPL (see COPYING).
@@ -487,14 +487,14 @@ sub gettextize {
 	# Make sure both type are the same
 	#
 	if ($typeorig ne $typetrans){
-	    $pores->write("/tmp/gettextization.failed.po");
+	    $pores->write("gettextization.failed.po");
 	    die wrap_msg(dgettext("po4a",
 	    	"po4a gettextization: Structure disparity between original and translated files:\n".
 		"msgid (at %s) is of type '%s' while\n".
 		"msgstr (at %s) is of type '%s'.\n".
 		"Original text: %s\n".
 		"Translated text: %s\n".
-	        "(result so far dumped to /tmp/gettextization.failed.po)")."%s",
+	        "(result so far dumped to gettextization.failed.po)")."%s",
 	        $reforig, $typeorig, $reftrans, $typetrans, $orig, $trans,$toobad);
 	}
 

diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
@@ -24,7 +24,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/TeX.pm b/lib/Locale/Po4a/TeX.pm
@@ -16,7 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with po4a; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm
@@ -16,7 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Foobar; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Text.pm b/lib/Locale/Po4a/Text.pm
@@ -16,7 +16,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################
 

diff --git a/lib/Locale/Po4a/Xml.pm b/lib/Locale/Po4a/Xml.pm
@@ -22,7 +22,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 ########################################################################