[qhull] 04/28: port and refresh quilt patches
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:06:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch master
in repository qhull.
commit 95e06efa8c7b37217d4a2666d6283311a7b8575e
Author: Barak A. Pearlmutter <barak+git at cs.nuim.ie>
Date: Sun Dec 4 16:34:32 2011 +0000
port and refresh quilt patches
---
...Add-patch-to-fix-FTBFS-with-no-add-needed.patch | 79 ----------------------
.../patches/0001-debianize-test-failure-msg.patch | 26 +++++++
debian/patches/0002-format-string-security.patch | 27 ++++++++
debian/patches/0003-QHpointer.patch | 23 +++++++
debian/patches/QHpointer.patch | 15 ----
.../patches/fix-FTBFS-643461-format-security.patch | 18 -----
debian/patches/make-new-msg.patch | 20 ------
debian/patches/series | 6 +-
8 files changed, 79 insertions(+), 135 deletions(-)
diff --git a/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch b/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch
deleted file mode 100644
index 50bff98..0000000
--- a/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From f82e13b8e955717ae21a5f002f6cc054301abcb8 Mon Sep 17 00:00:00 2001
-From: Iain Lane <laney at ubuntu.com>
-Date: Sun, 9 Jan 2011 23:22:12 +0000
-Subject: [PATCH] Add patch to fix FTBFS with --no-add-needed
-
-debian/patches/linking-no-add-needed.patch: Add new patch to
-explicitly link with the math libraries, to resolve a FTBFS with
-binutils-gold/--no-add-needed. (Closes: #556302)
----
- debian/changelog | 8 +++++++
- debian/patches/linking-no-add-needed.patch | 31 ++++++++++++++++++++++++++++
- debian/patches/series | 1 +
- 3 files changed, 40 insertions(+), 0 deletions(-)
- create mode 100644 debian/patches/linking-no-add-needed.patch
-
-diff --git a/debian/changelog b/debian/changelog
-index ef0f784..5aba8f5 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,11 @@
-+qhull (2009.1-2) UNRELEASED; urgency=low
-+
-+ * debian/patches/linking-no-add-needed.patch: Add new patch to
-+ explicitly link with the math libraries, to resolve a FTBFS with
-+ binutils-gold/--no-add-needed. (Closes: #556302)
-+
-+ -- Iain Lane <laney at ubuntu.com> Sun, 09 Jan 2011 23:20:00 +0000
-+
- qhull (2009.1-1) unstable; urgency=low
-
- * New upstream release
-diff --git a/debian/patches/linking-no-add-needed.patch b/debian/patches/linking-no-add-needed.patch
-new file mode 100644
-index 0000000..c96bc75
---- /dev/null
-+++ b/debian/patches/linking-no-add-needed.patch
-@@ -0,0 +1,31 @@
-+Explicitly link with -lm for the math libraries to be available to the linker,
-+required to fix FTBFS with binutils-gold/--no-add-needed
-+
-+ -- Iain Lane <laney at ubuntu.com> Sun, 09 Jan 2011 23:19:48 +0000
-+
-+Index: qhull-2009.1/src/Makefile.am
-+===================================================================
-+--- qhull-2009.1.orig/src/Makefile.am 2011-01-09 23:04:26.854227305 +0000
-++++ qhull-2009.1/src/Makefile.am 2011-01-09 23:12:38.512198225 +0000
-+@@ -40,7 +40,7 @@
-+
-+ # how:
-+ qhull_LDADD = libqhull.la
-+-rbox_LDADD = libqhull.la
-++rbox_LDADD = libqhull.la -lm
-+ qconvex_LDADD = libqhull.la
-+ qdelaunay_LDADD = libqhull.la
-+ qvoronoi_LDADD = libqhull.la
-+Index: qhull-2009.1/src/Makefile.in
-+===================================================================
-+--- qhull-2009.1.orig/src/Makefile.in 2011-01-09 23:12:43.582589854 +0000
-++++ qhull-2009.1/src/Makefile.in 2011-01-09 23:12:51.993239477 +0000
-+@@ -263,7 +263,7 @@
-+
-+ # how:
-+ qhull_LDADD = libqhull.la
-+-rbox_LDADD = libqhull.la
-++rbox_LDADD = libqhull.la -lm
-+ qconvex_LDADD = libqhull.la
-+ qdelaunay_LDADD = libqhull.la
-+ qvoronoi_LDADD = libqhull.la
-diff --git a/debian/patches/series b/debian/patches/series
-index 1b7b72a..595b1ee 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,2 +1,3 @@
- make-new-msg.patch
- QHpointer.patch
-+linking-no-add-needed.patch
---
-1.7.2.3
-
diff --git a/debian/patches/0001-debianize-test-failure-msg.patch b/debian/patches/0001-debianize-test-failure-msg.patch
new file mode 100644
index 0000000..00aa150
--- /dev/null
+++ b/debian/patches/0001-debianize-test-failure-msg.patch
@@ -0,0 +1,26 @@
+From: Rafael Laboissiere <rafael at debian.org>
+Date: Wed, 25 Sep 2002 10:39:30 +0200
+Subject: debianize test failure msg
+
+Redirect users to the Debian BTS in the error message of rbox.
+---
+ src/libqhull/io.c | 5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 520835b..9dcde52 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -3932,10 +3932,7 @@ qhull warning: instead of %d %d-dimensional points, input contains\n\
+ if (!strcmp(qh rbox_command, "./rbox D4"))
+ qh_fprintf(qh ferr, 8055, "\n\
+ This is the qhull test case. If any errors or core dumps occur,\n\
+-recompile qhull with 'make new'. If errors still occur, there is\n\
+-an incompatibility. You should try a different compiler. You can also\n\
+-change the choices in user.h. If you discover the source of the problem,\n\
+-please send mail to qhull_bug at qhull.org.\n\
++file a bug report against the libqhull<soversion> Debian package.\n\
+ \n\
+ Type 'qhull' for a short list of options.\n");
+ }
+--
diff --git a/debian/patches/0002-format-string-security.patch b/debian/patches/0002-format-string-security.patch
new file mode 100644
index 0000000..0f64bff
--- /dev/null
+++ b/debian/patches/0002-format-string-security.patch
@@ -0,0 +1,27 @@
+From: Peter Green <plugwash at p10link.net>
+Date: Wed, 23 Nov 2011 00:00:00 +0000
+Subject: format string security
+
+Fix FTBFS when building with hardening flags as used by dpkg 1.16.0.
+Note that this was a *false positive* by the compiler: there was
+in fact no security issue. However we will work around it anyway.
+
+Bug-Debian: http://bugs.debian.org/643461
+---
+ src/libqhull/io.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/libqhull/io.c b/src/libqhull/io.c
+index 9dcde52..45ef7bc 100644
+--- a/src/libqhull/io.c
++++ b/src/libqhull/io.c
+@@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
+ qh_memfree(point, qh normal_size);
+ qh_settempfree(&points);
+ qh_settempfree(&vertices);
+- qh_fprintf(fp, 9110, endfmt);
++ qh_fprintf(fp, 9110, "%s", endfmt);
+ } /* printfacet3math */
+
+
+--
diff --git a/debian/patches/0003-QHpointer.patch b/debian/patches/0003-QHpointer.patch
new file mode 100644
index 0000000..d4a733c
--- /dev/null
+++ b/debian/patches/0003-QHpointer.patch
@@ -0,0 +1,23 @@
+From: Rafael Laboissiere <rafael at debian.org>
+Date: Wed, 25 Sep 2002 10:39:30 +0200
+Subject: QHpointer
+
+Access globals via a pointer to allocated memory.
+---
+ src/libqhull/user.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/libqhull/user.h b/src/libqhull/user.h
+index 84e7b5f..7c50205 100644
+--- a/src/libqhull/user.h
++++ b/src/libqhull/user.h
+@@ -595,7 +595,7 @@ stop after qh_JOGGLEmaxretry attempts
+ user_eg.c for an example
+ */
+ #ifndef qh_QHpointer
+-#define qh_QHpointer 0
++#define qh_QHpointer 1
+ #if qh_QHpointer_dllimport
+ #error QH6234 Qhull error: qh_QHpointer must be defined when using qh_QHpointer_dllimport.
+ #endif
+--
diff --git a/debian/patches/QHpointer.patch b/debian/patches/QHpointer.patch
deleted file mode 100644
index 7667f53..0000000
--- a/debian/patches/QHpointer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Access globals via a pointer to allocated memory.
-
- -- Rafael Laboissiere <rafael at debian.org> Wed, 25 Sep 2002 10:39:30 +0200
-
---- qhull-orig/src/user.h 2002-04-29 11:01:46.000000000 +0200
-+++ qhull/src/user.h 2004-02-02 11:04:47.000000000 +0100
-@@ -509,7 +509,7 @@
- see:
- user_eg.c for an example
- */
--#define qh_QHpointer 0
-+#define qh_QHpointer 1
- #if 0 /* sample code */
- qhT *oldqhA, *oldqhB;
-
diff --git a/debian/patches/fix-FTBFS-643461-format-security.patch b/debian/patches/fix-FTBFS-643461-format-security.patch
deleted file mode 100644
index 34be027..0000000
--- a/debian/patches/fix-FTBFS-643461-format-security.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix FTBFS when building with hardening flags as used by
- dpkg 1.16.0.
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/643461
-Author: peter green <plugwash at p10link.net>
-Last-Update: 2011-11-23
-
---- a/src/io.c
-+++ b/src/io.c
-@@ -2166,7 +2166,7 @@
- qh_memfree (point, qh normal_size);
- qh_settempfree(&points);
- qh_settempfree(&vertices);
-- fprintf(fp, endfmt);
-+ fprintf(fp, "%s", endfmt);
- } /* printfacet3math */
-
-
diff --git a/debian/patches/make-new-msg.patch b/debian/patches/make-new-msg.patch
deleted file mode 100644
index 48a0973..0000000
--- a/debian/patches/make-new-msg.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Redirect users to the Debian BTS in the error message of rbox.
-
- -- Rafael Laboissiere <rafael at debian.org> Wed, 25 Sep 2002 10:39:30 +0200
-
---- qhull-orig/src/io.c 2004-01-31 12:00:15.000000000 +0100
-+++ qhull/src/io.c 2004-02-06 09:54:18.000000000 +0100
-@@ -4017,11 +4017,8 @@
- qh rbox_command[strlen(qh rbox_command)-1]= '\0';
- if (!strcmp (qh rbox_command, "./rbox D4"))
- fprintf (qh ferr, "\n\
--This is the qhull test case. If any errors or core dumps occur,\n\
--recompile qhull with 'make new'. If errors still occur, there is\n\
--an incompatibility. You should try a different compiler. You can also\n\
--change the choices in user.h. If you discover the source of the problem,\n\
--please send mail to qhull_bug at qhull.org.\n\
-+This is the qhull test case. If any errors or core dumps occur,\n\
-+fill a bug report against the libqhull<soversion> Debian package.\n\
- \n\
- Type 'qhull' for a short list of options.\n");
- }
diff --git a/debian/patches/series b/debian/patches/series
index 1f97522..d10f049 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-make-new-msg.patch
-QHpointer.patch
-fix-FTBFS-643461-format-security.patch
+0001-debianize-test-failure-msg.patch
+0002-format-string-security.patch
+0003-QHpointer.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qhull.git
More information about the debian-science-commits
mailing list