+++ /dev/null
-ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-06:01.texindex.asc
-
-Index: contrib/texinfo/util/texindex.c
-===================================================================
-RCS file: /home/ncvs/src/contrib/texinfo/util/texindex.c,v
-retrieving revision 1.1.1.8
-diff -u -p -I__FBSDID -r1.1.1.8 texindex.c
---- contrib/texinfo/util/texindex.c 23 May 2005 10:46:22 -0000 1.1.1.8
-+++ contrib/texinfo/util/texindex.c 8 Jan 2006 23:31:32 -0000
-@@ -384,17 +384,33 @@ For more information about these matters
- usage (1);
- }
- \f
-+static char **tv;
-+static int tv_alloc;
-+static int tv_used;
-+
-+static int
-+findtempname (char *tempname)
-+{
-+ int i;
-+
-+ for (i = 0; i < tv_used; i++)
-+ if (strcmp (tv[i], tempname) == 0)
-+ return (1);
-+ return (0);
-+}
-+
- /* Return a name for temporary file COUNT. */
-
- static char *
- maketempname (int count)
- {
- static char *tempbase = NULL;
-+ char *tempname;
- char tempsuffix[10];
-+ int fd;
-
- if (!tempbase)
- {
-- int fd;
- tempbase = concat (tempdir, "txidxXXXXXX");
-
- fd = mkstemp (tempbase);
-@@ -403,7 +419,52 @@ maketempname (int count)
- }
-
- sprintf (tempsuffix, ".%d", count);
-- return concat (tempbase, tempsuffix);
-+ tempname = concat (tempbase, tempsuffix);
-+ /*
-+ * The open logic becomes a bit convoluted. If open(2) fails due to EEXIST,
-+ * it's likely because somebody attempted to race us, or because we have
-+ * already created this file.
-+ */
-+ fd = open (tempname, O_CREAT|O_EXCL|O_WRONLY, 0600);
-+ if (fd == -1)
-+ {
-+ /*
-+ * If errno is not EEXIST, then open failed for some other reason, so
-+ * we should terminate. If errno == EEXIST AND we didn't create this
-+ * file, terminate. Otherwise, it's safe to say that errno == EEXIST
-+ * because we already created it, in this event, we can just return.
-+ */
-+ if (errno != EEXIST ||
-+ (errno == EEXIST && findtempname (tempname) == 0))
-+ pfatal_with_name (tempname);
-+ return (tempname);
-+ }
-+ else if (fd > 0)
-+ {
-+ close (fd);
-+ }
-+ if (tv == NULL)
-+ {
-+ tv_alloc = 16;
-+ tv = calloc (tv_alloc, sizeof (char *));
-+ if (tv == NULL)
-+ {
-+ fprintf (stderr, "calloc failed\n");
-+ exit (1);
-+ }
-+ }
-+ else if (tv_used == tv_alloc)
-+ {
-+ tv_alloc += 4;
-+ tv = realloc (tv, tv_alloc * sizeof (char *));
-+ if (tv == NULL)
-+ {
-+ fprintf (stderr, "realloc failed");
-+ exit (1);
-+ }
-+ }
-+ tv[tv_used++] = strdup (tempname);
-+ return tempname;
- }
-
-
+++ /dev/null
---- texinfo-4.9/po/pl.po.orig 2007-06-27 18:59:12.000000000 +0200
-+++ texinfo-4.9/po/pl.po 2007-07-01 14:47:08.802114318 +0200
-@@ -1,14 +1,14 @@
- # Polish translation for texinfo.
- # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
- # This file is distributed under the same license as the texinfo package.
--# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004.
-+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2007.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: texinfo 4.7.90\n"
-+"Project-Id-Version: texinfo 4.9\n"
- "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
- "POT-Creation-Date: 2007-06-27 09:59-0700\n"
--"PO-Revision-Date: 2004-12-05 12:24+0100\n"
-+"PO-Revision-Date: 2007-07-01 14:40+0200\n"
- "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
- "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
- "MIME-Version: 1.0\n"
-@@ -239,6 +239,10 @@
- "This is free software: you are free to change and redistribute it.\n"
- "There is NO WARRANTY, to the extent permitted by law.\n"
- msgstr ""
-+"Copyright (C) %s Free Software Foundation, Inc.\n"
-+"Licencja GPLv3+: GNU GPL wersja 3 lub pó¼niejsza <http://www.gnu.org/licenses/gpl.html>\n"
-+"To jest oprogramowanie wolnodostêpne: mo¿na je modyfikowaæ i rozpowszechniaæ.\n"
-+"Nie ma ¯ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
-
- #: info/info.c:499
- #, c-format
-@@ -3093,25 +3097,3 @@
- #, c-format
- msgid "entry %s follows an entry with a secondary name"
- msgstr "wpis %s wyst±pi³ po wpisie z dodatkow± nazw±"
--
--#~ msgid ""
--#~ "There is NO warranty. You may redistribute this software\n"
--#~ "under the terms of the GNU General Public License.\n"
--#~ "For more information about these matters, see the files named COPYING.\n"
--#~ msgstr ""
--#~ "Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
--#~ "zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
--#~ "License).\n"
--#~ "Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"
--
--#~ msgid ""
--#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
--#~ "There is NO warranty. You may redistribute this software\n"
--#~ "under the terms of the GNU General Public License.\n"
--#~ "For more information about these matters, see the files named COPYING.\n"
--#~ msgstr ""
--#~ "Copyright (C) %s Free Software Foundation, Inc.\n"
--#~ "Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
--#~ "zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
--#~ "License).\n"
--#~ "Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"