[Reproducible-commits] [texlive-bin] 102/400: * fix for arm (preliminary) * another upstream fix for synctex/ini mode crashes
Maria Valentina Marin Rodrigues
akira-guest at moszumanska.debian.org
Thu Jul 9 21:39:38 UTC 2015
This is an automated email from the git hooks/post-receive script.
akira-guest pushed a commit to branch master
in repository texlive-bin.
commit b49744826f426ffa7653cd9f59d5a2a4e920f9a8
Author: Norbert Preining <preining at debian.org>
Date: Thu Jun 28 00:47:56 2012 +0000
* fix for arm (preliminary)
* another upstream fix for synctex/ini mode crashes
---
debian/changelog | 7 +++
debian/quilt/fix-pipe-in-out-regression | 76 ++++++++++++++++++++++++--
debian/quilt/series | 1 +
debian/quilt/upstream-fix-ini-synctex-segfault | 33 +++++++++++
debian/rules | 9 +++
5 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eb09c9d..1e597e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+texlive-bin (2012.20120623-3) UNRELEASED; urgency=low
+
+ * Build with -marm on armhf to fix lilypond FTBFS (Closes: #678604)
+ (Thanks Peter Michael Green)
+
+ -- Norbert Preining <preining at debian.org> Thu, 28 Jun 2012 09:34:16 +0900
+
texlive-bin (2012.20120623-2) unstable; urgency=low
* fix reading from and writing to pipes from within tex: new
diff --git a/debian/quilt/fix-pipe-in-out-regression b/debian/quilt/fix-pipe-in-out-regression
index 6f4868c..68cb697 100644
--- a/debian/quilt/fix-pipe-in-out-regression
+++ b/debian/quilt/fix-pipe-in-out-regression
@@ -3,14 +3,62 @@ the argument passed to popen is one that should only be used on
Windows. (additional "b"). Since we will never compile these sources
on Windows, simply remove the problematics "b"s and get it back on.
---
- texk/web2c/lib/texmfmp.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ texk/web2c/lib/ChangeLog | 8 ++++++++
+ texk/web2c/lib/texmfmp.c | 22 +++++++++++++++-------
+ 2 files changed, 23 insertions(+), 7 deletions(-)
Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
===================================================================
---- texlive-bin-2012.20120623.orig/texk/web2c/lib/texmfmp.c 2012-04-16 22:39:06.000000000 +0900
-+++ texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c 2012-06-26 16:00:03.154246698 +0900
-@@ -1853,7 +1853,7 @@
+--- texlive-bin-2012.20120623.orig/texk/web2c/lib/texmfmp.c 2012-06-28 09:38:21.810278326 +0900
++++ texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c 2012-06-28 09:44:56.514267775 +0900
+@@ -527,7 +527,9 @@
+ /* Like runsystem(), the runpopen() function is called only when
+ shellenabledp == 1. Unlike runsystem(), here we write errors to
+ stderr, since we have nowhere better to use; and of course we return
+- a file handle (or NULL) instead of a status indicator. */
++ a file handle (or NULL) instead of a status indicator.
++
++ Also, we append "b" to MODE on Windows. */
+
+ static FILE *
+ runpopen (char *cmd, const char *mode)
+@@ -536,9 +538,14 @@
+ char *safecmd = NULL;
+ char *cmdname = NULL;
+ int allow;
+-
+ #ifdef WIN32
+ char *pp;
++#endif
++ string realmode = xmalloc(strlen(mode)+2);
++
++ strcpy(realmode, mode);
++#ifdef WIN32
++ strcat(realmode, "b");
+
+ for (pp = cmd; *pp; pp++) {
+ if (*pp == '\'') *pp = '"';
+@@ -552,9 +559,9 @@
+ allow = shell_cmd_is_allowed (cmd, &safecmd, &cmdname);
+
+ if (allow == 1)
+- f = popen (cmd, mode);
++ f = popen (cmd, realmode);
+ else if (allow == 2)
+- f = popen (safecmd, mode);
++ f = popen (safecmd, realmode);
+ else if (allow == -1)
+ fprintf (stderr, "\nrunpopen quotation error in command line: %s\n",
+ cmd);
+@@ -565,6 +572,7 @@
+ free (safecmd);
+ if (cmdname)
+ free (cmdname);
++ free (realmode);
+ return f;
+ }
+ #endif /* ENABLE_PIPES */
+@@ -1857,7 +1865,7 @@
fname = xmalloc(strlen((const_string)(nameoffile+1))+1);
strcpy(fname,(const_string)(nameoffile+1));
recorder_record_input (fname + 1);
@@ -19,7 +67,7 @@ Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
free(fname);
for (i=0; i<NUM_PIPES; i++) {
if (pipes[i]==NULL) {
-@@ -1895,10 +1895,10 @@
+@@ -1899,10 +1907,10 @@
is better to be prepared */
if (STREQ((fname+strlen(fname)-4),".tex"))
*(fname+strlen(fname)-4) = 0;
@@ -32,3 +80,19 @@ Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
}
recorder_record_output (fname + 1);
free(fname);
+Index: texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog
+===================================================================
+--- texlive-bin-2012.20120623.orig/texk/web2c/lib/ChangeLog 2012-06-28 09:38:52.014277080 +0900
++++ texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog 2012-06-28 09:40:08.130274192 +0900
+@@ -1,3 +1,11 @@
++2012-06-27 Norbert Preining <preining at logic.at>
++
++ * texmfmp.c (runpopen): append "b" on Windows.
++ (open_in_or_pipe): do not use the "b" here.
++ (This makes pdftex's \input"|..." feature work again,
++ unintentionally broken.)
++ tex-live mail, 26 Jun 2012 14:02:26.
++
+ 2012-06-27 Karl Berry <karl at tug.org>
+
+ * texmfmp.c (generic_synctex_get_current_name): return the
diff --git a/debian/quilt/series b/debian/quilt/series
index c5ba941..4db4c85 100644
--- a/debian/quilt/series
+++ b/debian/quilt/series
@@ -24,4 +24,5 @@ patch-lacheck -p0
patch-pdftex -p0
patch-update-updmap-manpage
xdvi-upupstream-fixes
+upstream-fix-ini-synctex-segfault
fix-pipe-in-out-regression
diff --git a/debian/quilt/upstream-fix-ini-synctex-segfault b/debian/quilt/upstream-fix-ini-synctex-segfault
new file mode 100644
index 0000000..ba23020
--- /dev/null
+++ b/debian/quilt/upstream-fix-ini-synctex-segfault
@@ -0,0 +1,33 @@
+---
+ texk/web2c/lib/ChangeLog | 5 +++++
+ texk/web2c/lib/texmfmp.c | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+Index: texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog
+===================================================================
+--- texlive-bin-2012.20120623.orig/texk/web2c/lib/ChangeLog 2012-05-04 16:10:16.000000000 +0900
++++ texlive-bin-2012.20120623/texk/web2c/lib/ChangeLog 2012-06-28 09:38:52.014277080 +0900
+@@ -1,3 +1,8 @@
++2012-06-27 Karl Berry <karl at tug.org>
++
++ * texmfmp.c (generic_synctex_get_current_name): return the
++ empty string if passed null (can happen with -ini).
++
+ 2012-05-04 Peter Breitenlohner <peb at mppmu.mpg.de>
+
+ * printversion.c (printversionandexit): Update 'Copyright 2012'.
+Index: texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c
+===================================================================
+--- texlive-bin-2012.20120623.orig/texk/web2c/lib/texmfmp.c 2012-06-28 09:36:56.706282341 +0900
++++ texlive-bin-2012.20120623/texk/web2c/lib/texmfmp.c 2012-06-28 09:38:21.810278326 +0900
+@@ -127,6 +127,10 @@
+ char *generic_synctex_get_current_name (void)
+ {
+ char *pwdbuf, *ret;
++ if (!fullnameoffile) {
++ ret = xstrdup("");
++ return ret;
++ }
+ if (kpse_absolute_p(fullnameoffile, false)) {
+ return xstrdup(fullnameoffile);
+ }
diff --git a/debian/rules b/debian/rules
index b7488ac..cda5f11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,15 @@ ifeq ($(DEB_HOST_ARCH), alpha)
export LDFLAGS = -Wl,--no-relax
endif
+#
+# it seems that ARM metafont segfaults due to a problem with armhf's malloc
+# see Debian bug #678604
+# Building in arm mode helps
+#
+ifeq ($(DEB_HOST_ARCH), armhf)
+ export CFLAGS = -marm
+endif
+
# warning: if the --with autoreconf is removed then
# the patch debian/patches/debian-no-linked-scripts
# must be adapted to also patch the Makefile.in!
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git
More information about the Reproducible-commits
mailing list