web2c/lib, web2c/pdftexdir: sync with the pdftex upstream

git-svn-id: svn://tug.org/texlive/trunk@40109 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 43 insertions, 7 deletions

diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index a0ea61120ec..fcd4fe64814 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-22  Karl Berry  <karl@freefriends.org>
+
+	* texmfmp.c: no uexit after FATAL.
+
+2016-03-21  Karl Berry  <karl@freefriends.org>
+
+	* texmfmp.c (initstarttime): wording of invalid SOURCE_DATE_EPOCH.
+
 2016-01-26  Akira Kakuto  <kakuto@fuk.kinidai.ac.jp>
 
 	* texmfmp.c: Improve to skip BOM (win32 only).
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index b5242e2d372..fae82477b93 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -3000,8 +3000,8 @@ void initstarttime(void)
             errno = 0;
             epoch = strtoll(source_date_epoch, &endptr, 10);
             if (epoch < 0 || *endptr != '\0' || errno != 0) {
-                fprintf(stderr, "Environment variable $SOURCE_DATE_EPOCH: invalid value: %s\n", source_date_epoch);
-                uexit(EXIT_FAILURE);
+       FATAL1 ("invalid value for environment variable $SOURCE_DATE_EPOCH: %s",
+                source_date_epoch);
             }
             start_time = epoch;
             makepdftime(start_time, start_time_str, /* utc= */true);
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index f09db7273bf..6f703efbcab 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-21  Karl Berry  <karl@tug.org>
+
+	* NEWS,
+	* pdftex_version.h,
+	* pdftex.web (pdftex_revision, pdftex_version_string): [1.40.]17
+	for TL'16.
+
 2016-02-15  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* pdftex.web, pdftoepdf.cc: Add \pdfsuppressptexinfo, imported from
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 44ab1c9c543..0fb6816206a 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -1,3 +1,24 @@
+pdfTeX 3.14159265-2.6-1.40.17 (TeX Live 2016)
+- changes:
+  - if environment variable SOURCE_DATE_EPOCH is set, use its value for
+    the CreationDate and ModDate values, and to seed the trailer /ID.
+    This by itself should suffice to create reproducible PDFs.  The
+    other changes support more granular output tweaks along the same lines.
+    
+  - new primitive \pdfinfoomitdate to omit CreationDate and ModDate keys.
+  - new primitive \pdftrailer to allow adding to the trailer dictionary.
+  - new primitive \pdftrailerid to set seed for the trailer /ID
+    computation; with an empty argument \pdftrailerid{}, the /ID is omitted.
+  - new primitive \pdfsuppressptexinfo to omit PTEX.* keys from output;
+    the value is a bitmask:
+    % 1 -> PTEX.Fullbanner
+    % 2 -> PTEX.FileName
+    % 4 -> PTEX.PageNumber
+    % 8 -> PTEX.InfoDict (/Producer /Creator /CreationDate /ModDate /Trapped)
+
+- bugfixes:
+  - do not crash if font size of a vf >= 2048pt.
+---------------------------------------------------
 pdfTeX 3.14159265-2.6-1.40.16 (TeX Live 2015)
 - changes:
   - support JPEG Exif as well as JFIF.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 027f46fab17..6333e215611 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -1,4 +1,4 @@
-% Copyright 1996-2015 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
+% Copyright 1996-2016 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
 % <thanh@@pdftex.org>
 
 % This file is part of pdfTeX.
@@ -15,7 +15,7 @@
 % You should have received a copy of the GNU General Public License along with
 % this program.  If not, see <http://www.gnu.org/licenses/>.
 
-% e-TeX is copyright (C) 1999-2014 by P. Breitenlohner (1994,98 by the NTS
+% e-TeX is copyright (C) 1999-2016 by P. Breitenlohner (1994,98 by the NTS
 % team); all rights are reserved. Copying of this file is authorized only if
 % (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
 % your copy. (Programs such as TIE allow the application of several change
@@ -306,8 +306,8 @@ known as `\eTeX'.
   {printed when \eTeX\ starts}
 @#
 @d pdftex_version==140 { \.{\\pdftexversion} }
-@d pdftex_revision=="16" { \.{\\pdftexrevision} }
-@d pdftex_version_string=='-1.40.16' {current \pdfTeX\ version}
+@d pdftex_revision=="17" { \.{\\pdftexrevision} }
+@d pdftex_version_string=='-1.40.17' {current \pdfTeX\ version}
 @#
 @d pdfTeX_banner=='This is pdfTeX, Version 3.14159265',eTeX_version_string,pdftex_version_string
    {printed when \pdfTeX\ starts}
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex_version.h b/Build/source/texk/web2c/pdftexdir/pdftex_version.h
index 2ec8e1a617a..17b7a7e5bc7 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex_version.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftex_version.h
@@ -1 +1 @@
-#define PDFTEX_VERSION "1.40.16"
+#define PDFTEX_VERSION "1.40.17"