diff --git a/.gitignore b/.gitignore index de0966d..7488671 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cddlib-094g.tar.gz +/cddlib-094h.tar.gz diff --git a/cddlib-polymake.patch b/cddlib-polymake.patch index 484dc48..add3a96 100644 --- a/cddlib-polymake.patch +++ b/cddlib-polymake.patch @@ -1,6 +1,6 @@ -diff -durpN cddlib-094g.orig/lib-src/cddcore.c cddlib-094g/lib-src/cddcore.c ---- cddlib-094g.orig/lib-src/cddcore.c 2012-03-23 04:41:07.000000000 -0600 -+++ cddlib-094g/lib-src/cddcore.c 2012-12-03 09:35:20.171961290 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddcore.c cddlib-094h/lib-src/cddcore.c +--- cddlib-094h.orig/lib-src/cddcore.c 2015-04-30 03:33:53.000000000 -0600 ++++ cddlib-094h/lib-src/cddcore.c 2015-05-18 07:00:00.000000000 -0600 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -96,9 +96,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddcore.c cddlib-094g/lib-src/cddcore.c /* end of cddcore.c */ -diff -durpN cddlib-094g.orig/lib-src/cddio.c cddlib-094g/lib-src/cddio.c ---- cddlib-094g.orig/lib-src/cddio.c 2012-03-23 04:41:07.000000000 -0600 -+++ cddlib-094g/lib-src/cddio.c 2012-12-03 09:35:20.172961238 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddio.c cddlib-094h/lib-src/cddio.c +--- cddlib-094h.orig/lib-src/cddio.c 2015-04-30 03:34:12.000000000 -0600 ++++ cddlib-094h/lib-src/cddio.c 2015-05-18 07:00:00.000000000 -0600 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -107,7 +107,7 @@ diff -durpN cddlib-094g.orig/lib-src/cddio.c cddlib-094g/lib-src/cddio.c #include "setoper.h" /* set operation library header (Ver. June 1, 2000 or later) */ #include "cdd.h" #include -@@ -2012,6 +2013,79 @@ void dd_fread_rational_value (FILE *f, m +@@ -2013,6 +2014,79 @@ void dd_fread_rational_value (FILE *f, m dd_set(value,rational_value); dd_clear(rational_value); } @@ -187,9 +187,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddio.c cddlib-094g/lib-src/cddio.c /****************************************************************************************/ -diff -durpN cddlib-094g.orig/lib-src/cddlib.c cddlib-094g/lib-src/cddlib.c ---- cddlib-094g.orig/lib-src/cddlib.c 2012-03-23 04:41:07.000000000 -0600 -+++ cddlib-094g/lib-src/cddlib.c 2012-12-03 09:37:31.801129162 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddlib.c cddlib-094h/lib-src/cddlib.c +--- cddlib-094h.orig/lib-src/cddlib.c 2015-04-30 03:34:48.000000000 -0600 ++++ cddlib-094h/lib-src/cddlib.c 2015-05-18 07:00:00.000000000 -0600 @@ -31,6 +31,7 @@ from the Pascal program pdd.p written by Komei Fukuda. */ @@ -217,9 +217,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddlib.c cddlib-094g/lib-src/cddlib.c +#endif + /* end of cddlib.c */ -diff -durpN cddlib-094g.orig/lib-src/cddlp.c cddlib-094g/lib-src/cddlp.c ---- cddlib-094g.orig/lib-src/cddlp.c 2012-03-23 04:41:07.000000000 -0600 -+++ cddlib-094g/lib-src/cddlp.c 2012-12-03 09:35:20.187960458 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddlp.c cddlib-094h/lib-src/cddlp.c +--- cddlib-094h.orig/lib-src/cddlp.c 2015-04-30 03:35:24.000000000 -0600 ++++ cddlib-094h/lib-src/cddlp.c 2015-05-18 07:00:00.000000000 -0600 @@ -11,6 +11,7 @@ the manual cddlibman.tex for detail. */ @@ -228,7 +228,7 @@ diff -durpN cddlib-094g.orig/lib-src/cddlp.c cddlib-094g/lib-src/cddlp.c #include "setoper.h" /* set operation library header (Ver. May 18, 2000 or later) */ #include "cdd.h" #include -@@ -3774,5 +3775,71 @@ void dd_BasisStatusMinimize(dd_rowrange +@@ -3775,5 +3776,71 @@ void dd_BasisStatusMinimize(dd_rowrange } #endif @@ -300,9 +300,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddlp.c cddlib-094g/lib-src/cddlp.c + /* end of cddlp.c */ -diff -durpN cddlib-094g.orig/lib-src/cddmp.c cddlib-094g/lib-src/cddmp.c ---- cddlib-094g.orig/lib-src/cddmp.c 2012-03-23 04:41:02.000000000 -0600 -+++ cddlib-094g/lib-src/cddmp.c 2012-12-03 09:35:20.188960406 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddmp.c cddlib-094h/lib-src/cddmp.c +--- cddlib-094h.orig/lib-src/cddmp.c 2015-04-30 03:36:27.000000000 -0600 ++++ cddlib-094h/lib-src/cddmp.c 2015-05-18 07:00:00.000000000 -0700 @@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -322,9 +322,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddmp.c cddlib-094g/lib-src/cddmp.c +#endif + /* end of cddmp.h */ -diff -durpN cddlib-094g.orig/lib-src/cddproj.c cddlib-094g/lib-src/cddproj.c ---- cddlib-094g.orig/lib-src/cddproj.c 2012-03-23 02:29:29.000000000 -0600 -+++ cddlib-094g/lib-src/cddproj.c 2012-12-03 09:35:20.188960406 -0700 +diff -durpN cddlib-094h.orig/lib-src/cddproj.c cddlib-094h/lib-src/cddproj.c +--- cddlib-094h.orig/lib-src/cddproj.c 2012-03-23 02:29:29.000000000 -0600 ++++ cddlib-094h/lib-src/cddproj.c 2012-12-03 09:35:20.188960406 -0700 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -344,9 +344,9 @@ diff -durpN cddlib-094g.orig/lib-src/cddproj.c cddlib-094g/lib-src/cddproj.c +#endif /* end of cddproj.c */ -diff -durpN cddlib-094g.orig/lib-src/gmpdef.h cddlib-094g/lib-src/gmpdef.h ---- cddlib-094g.orig/lib-src/gmpdef.h 1969-12-31 17:00:00.000000000 -0700 -+++ cddlib-094g/lib-src/gmpdef.h 2012-12-03 09:35:20.189960354 -0700 +diff -durpN cddlib-094h.orig/lib-src/gmpdef.h cddlib-094h/lib-src/gmpdef.h +--- cddlib-094h.orig/lib-src/gmpdef.h 1969-12-31 17:00:00.000000000 -0700 ++++ cddlib-094h/lib-src/gmpdef.h 2012-12-03 09:35:20.189960354 -0700 @@ -0,0 +1,257 @@ +#ifdef GMPRATIONAL +#define dd_AppendMatrix dd_AppendMatrix_gmp @@ -605,9 +605,9 @@ diff -durpN cddlib-094g.orig/lib-src/gmpdef.h cddlib-094g/lib-src/gmpdef.h +#define set_uni set_uni_gmp +#define set_write set_write_gmp +#endif -diff -durpN cddlib-094g.orig/lib-src/gmpundef.h cddlib-094g/lib-src/gmpundef.h ---- cddlib-094g.orig/lib-src/gmpundef.h 1969-12-31 17:00:00.000000000 -0700 -+++ cddlib-094g/lib-src/gmpundef.h 2012-12-03 09:35:20.189960354 -0700 +diff -durpN cddlib-094h.orig/lib-src/gmpundef.h cddlib-094h/lib-src/gmpundef.h +--- cddlib-094h.orig/lib-src/gmpundef.h 1969-12-31 17:00:00.000000000 -0700 ++++ cddlib-094h/lib-src/gmpundef.h 2012-12-03 09:35:20.189960354 -0700 @@ -0,0 +1,258 @@ +#define stringify(sym) #sym +#define MKALIAS(sym) \ @@ -867,9 +867,9 @@ diff -durpN cddlib-094g.orig/lib-src/gmpundef.h cddlib-094g/lib-src/gmpundef.h +#undef set_subset +#undef set_uni +#undef set_write -diff -durpN cddlib-094g.orig/lib-src/Makefile.am cddlib-094g/lib-src/Makefile.am ---- cddlib-094g.orig/lib-src/Makefile.am 2012-03-23 02:43:56.000000000 -0600 -+++ cddlib-094g/lib-src/Makefile.am 2012-12-03 09:35:20.190960302 -0700 +diff -durpN cddlib-094h.orig/lib-src/Makefile.am cddlib-094h/lib-src/Makefile.am +--- cddlib-094h.orig/lib-src/Makefile.am 2012-03-23 02:43:56.000000000 -0600 ++++ cddlib-094h/lib-src/Makefile.am 2012-12-03 09:35:20.190960302 -0700 @@ -7,7 +7,9 @@ cddmp.c \ cddio.c \ cddlib.c \ @@ -881,9 +881,9 @@ diff -durpN cddlib-094g.orig/lib-src/Makefile.am cddlib-094g/lib-src/Makefile.am include_HEADERS = \ cdd.h \ -diff -durpN cddlib-094g.orig/lib-src/setoper.c cddlib-094g/lib-src/setoper.c ---- cddlib-094g.orig/lib-src/setoper.c 2012-03-23 02:29:29.000000000 -0600 -+++ cddlib-094g/lib-src/setoper.c 2012-12-03 09:35:20.190960302 -0700 +diff -durpN cddlib-094h.orig/lib-src/setoper.c cddlib-094h/lib-src/setoper.c +--- cddlib-094h.orig/lib-src/setoper.c 2012-03-23 02:29:29.000000000 -0600 ++++ cddlib-094h/lib-src/setoper.c 2012-12-03 09:35:20.190960302 -0700 @@ -7,6 +7,7 @@ (set_fwrite_compl(), set_groundsize added. set_compl fixed.) */ @@ -921,9 +921,9 @@ diff -durpN cddlib-094g.orig/lib-src/setoper.c cddlib-094g/lib-src/setoper.c +#endif + /* End of the library: setoper.c */ -diff -durpN cddlib-094g.orig/lib-src-gmp/cddcore_f.c cddlib-094g/lib-src-gmp/cddcore_f.c ---- cddlib-094g.orig/lib-src-gmp/cddcore_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddcore_f.c 2012-12-03 09:35:20.191960250 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddcore_f.c cddlib-094h/lib-src-gmp/cddcore_f.c +--- cddlib-094h.orig/lib-src-gmp/cddcore_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddcore_f.c 2015-05-18 07:00:00.000000000 -0600 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -932,9 +932,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddcore_f.c cddlib-094g/lib-src-gmp/cdd #include "setoper.h" /* set operation library header (Ver. June 1, 2000 or later) */ #include "cdd_f.h" #include -diff -durpN cddlib-094g.orig/lib-src-gmp/cddio_f.c cddlib-094g/lib-src-gmp/cddio_f.c ---- cddlib-094g.orig/lib-src-gmp/cddio_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddio_f.c 2012-12-03 09:35:20.191960250 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddio_f.c cddlib-094h/lib-src-gmp/cddio_f.c +--- cddlib-094h.orig/lib-src-gmp/cddio_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddio_f.c 2015-05-18 07:00:00.000000000 -0600 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -943,9 +943,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddio_f.c cddlib-094g/lib-src-gmp/cddio #include "setoper.h" /* set operation library header (Ver. June 1, 2000 or later) */ #include "cdd_f.h" #include -diff -durpN cddlib-094g.orig/lib-src-gmp/cddlib_f.c cddlib-094g/lib-src-gmp/cddlib_f.c ---- cddlib-094g.orig/lib-src-gmp/cddlib_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddlib_f.c 2012-12-03 09:35:20.192960198 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddlib_f.c cddlib-094h/lib-src-gmp/cddlib_f.c +--- cddlib-094h.orig/lib-src-gmp/cddlib_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddlib_f.c 2015-05-18 07:00:00.000000000 -0700 @@ -31,6 +31,7 @@ from the Pascal program pdd.p written by Komei Fukuda. */ @@ -954,9 +954,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddlib_f.c cddlib-094g/lib-src-gmp/cddl #include "setoper.h" /* set operation library header (Ver. June 1, 2000 or later) */ #include "cdd_f.h" -diff -durpN cddlib-094g.orig/lib-src-gmp/cddlp_f.c cddlib-094g/lib-src-gmp/cddlp_f.c ---- cddlib-094g.orig/lib-src-gmp/cddlp_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddlp_f.c 2012-12-03 09:35:20.193960146 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddlp_f.c cddlib-094h/lib-src-gmp/cddlp_f.c +--- cddlib-094h.orig/lib-src-gmp/cddlp_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddlp_f.c 2015-05-18 07:00:00.000000000 -0600 @@ -11,6 +11,7 @@ the manual cddlibman.tex for detail. */ @@ -965,9 +965,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddlp_f.c cddlib-094g/lib-src-gmp/cddlp #include "setoper.h" /* set operation library header (Ver. May 18, 2000 or later) */ #include "cdd_f.h" #include -diff -durpN cddlib-094g.orig/lib-src-gmp/cddmp_f.c cddlib-094g/lib-src-gmp/cddmp_f.c ---- cddlib-094g.orig/lib-src-gmp/cddmp_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddmp_f.c 2012-12-03 09:35:20.194960094 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddmp_f.c cddlib-094h/lib-src-gmp/cddmp_f.c +--- cddlib-094h.orig/lib-src-gmp/cddmp_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddmp_f.c 2015-05-18 07:00:00.000000000 -0600 @@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -976,9 +976,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddmp_f.c cddlib-094g/lib-src-gmp/cddmp #include "setoper.h" /* set operation library header (Ver. March 16,1995 or later) */ #include "cdd_f.h" -diff -durpN cddlib-094g.orig/lib-src-gmp/cddproj_f.c cddlib-094g/lib-src-gmp/cddproj_f.c ---- cddlib-094g.orig/lib-src-gmp/cddproj_f.c 2012-03-23 04:43:56.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/cddproj_f.c 2012-12-03 09:35:20.194960094 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/cddproj_f.c cddlib-094h/lib-src-gmp/cddproj_f.c +--- cddlib-094h.orig/lib-src-gmp/cddproj_f.c 2015-04-30 03:38:19.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/cddproj_f.c 2015-05-18 07:00:00.000000000 -0600 @@ -10,6 +10,7 @@ the manual cddlibman.tex for detail. */ @@ -987,9 +987,9 @@ diff -durpN cddlib-094g.orig/lib-src-gmp/cddproj_f.c cddlib-094g/lib-src-gmp/cdd #include "setoper.h" /* set operation library header (Ver. June 1, 2000 or later) */ #include "cdd_f.h" #include -diff -durpN cddlib-094g.orig/lib-src-gmp/Makefile.am cddlib-094g/lib-src-gmp/Makefile.am ---- cddlib-094g.orig/lib-src-gmp/Makefile.am 2012-03-23 02:44:20.000000000 -0600 -+++ cddlib-094g/lib-src-gmp/Makefile.am 2012-12-03 09:43:46.753846543 -0700 +diff -durpN cddlib-094h.orig/lib-src-gmp/Makefile.am cddlib-094h/lib-src-gmp/Makefile.am +--- cddlib-094h.orig/lib-src-gmp/Makefile.am 2012-03-23 02:44:20.000000000 -0600 ++++ cddlib-094h/lib-src-gmp/Makefile.am 2012-12-03 09:43:46.753846543 -0700 @@ -25,4 +25,18 @@ cddtypes_f.h \ setoper.h diff --git a/cddlib-sagemath.patch b/cddlib-sagemath.patch index ba9a909..3354ac6 100644 --- a/cddlib-sagemath.patch +++ b/cddlib-sagemath.patch @@ -1,6 +1,6 @@ -diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am ---- cddlib-094g/src-gmp/Makefile.am.orig 2012-07-05 13:30:30.982562213 -0400 -+++ cddlib-094g/src-gmp/Makefile.am 2012-07-05 13:31:14.576563881 -0400 +diff -up cddlib-094h/src-gmp/Makefile.am.orig cddlib-094h/src-gmp/Makefile.am +--- cddlib-094h/src-gmp/Makefile.am.orig 2012-03-23 02:51:35.000000000 -0600 ++++ cddlib-094h/src-gmp/Makefile.am 2015-05-18 07:00:00.000000000 -0600 @@ -11,7 +11,8 @@ testcdd1_gmp \ testcdd2_gmp \ testlp1_gmp \ @@ -19,10 +19,9 @@ diff -up cddlib-094g/src-gmp/Makefile.am.orig cddlib-094g/src-gmp/Makefile.am # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c LDADD = ../lib-src-gmp/libcddgmp.la -diff -up cddlib-094g/src-gmp/Makefile.in.orig cddlib-094g/src-gmp/Makefile.in -diff -up cddlib-094g/src/Makefile.am.orig cddlib-094g/src/Makefile.am ---- cddlib-094g/src/Makefile.am.orig 2012-07-05 13:34:07.449570501 -0400 -+++ cddlib-094g/src/Makefile.am 2012-07-05 13:34:32.128571446 -0400 +diff -up cddlib-094h/src/Makefile.am.orig cddlib-094h/src/Makefile.am +--- cddlib-094h/src/Makefile.am.orig 2012-03-23 02:51:13.000000000 -0600 ++++ cddlib-094h/src/Makefile.am 2015-05-18 07:00:00.000000000 -0400 @@ -11,7 +11,8 @@ testshoot \ testcdd2 \ testlp1 \ diff --git a/cddlib.spec b/cddlib.spec index aab8a8c..81d8219 100644 --- a/cddlib.spec +++ b/cddlib.spec @@ -1,6 +1,6 @@ Name: cddlib -Version: 094g -Release: 13%{?dist} +Version: 094h +Release: 1%{?dist} Summary: A library for generating all vertices in convex polyhedrons License: GPLv2+ URL: http://www.ifor.math.ethz.ch/~fukuda/cdd_home/ @@ -89,6 +89,13 @@ for f in `find . -type f -print0 | xargs -0 grep -Fl '675 Mass'`; do rm -f $f.orig done +# The 094h release shipped with some debug flags accidentally left on +for fil in lib-src/cddlp.c lib-src-gmp/cddlp.c lib-src-gmp/cddlp_f.c; do + sed -ri.orig 's/(localdebug=ddf?_)TRUE/\1FALSE/g' $fil + touch -r ${fil}.orig $fil + rm -f ${fil}.orig +done + %build %configure @@ -143,6 +150,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %changelog +* Mon May 18 2015 Jerry James - 094h-1 +- New upstream release + * Thu Mar 12 2015 Jerry James - 094g-13 - Rebuild with hardening flags diff --git a/sources b/sources index 47924fd..c8ebca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5b1a6cc5a82beac814418907602bfeb cddlib-094g.tar.gz +1467d270860bbcb26d3ebae424690e7c cddlib-094h.tar.gz