SHA256
1
0
forked from pool/gap

- Update to new upstream release 4.8.2

OBS-URL: https://build.opensuse.org/package/show/science/gap?expand=0&rev=25
This commit is contained in:
Jan Engelhardt 2016-03-12 20:32:30 +00:00 committed by Git OBS Bridge
parent 3603135db7
commit 7cc26b1c43
8 changed files with 113 additions and 165 deletions

View File

@ -9,11 +9,11 @@ build: add a --with-gapdir option to specify future location of GAP
configure.in | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
Index: gap4r6/cnf/configure.in
Index: gap4r8/cnf/configure.in
===================================================================
--- gap4r6.orig/cnf/configure.in
+++ gap4r6/cnf/configure.in
@@ -352,8 +352,11 @@ AC_SUBST(CFLAGS)
--- gap4r8.orig/cnf/configure.in
+++ gap4r8/cnf/configure.in
@@ -374,8 +374,11 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
@ -26,10 +26,10 @@ Index: gap4r6/cnf/configure.in
AC_SUBST(ABI)
AC_SUBST(ABI_CFLAGS)
Index: gap4r6/configure.in
Index: gap4r8/configure.in
===================================================================
--- gap4r6.orig/configure.in
+++ gap4r6/configure.in
--- gap4r8.orig/configure.in
+++ gap4r8/configure.in
@@ -51,8 +51,12 @@ AC_PROG_CC
BASECC=`basename ${CC}`
AC_SUBST(BASECC)
@ -42,5 +42,5 @@ Index: gap4r6/configure.in
AC_SUBST(gapdir)
-gapdir=`pwd`
AC_ARG_VAR(CONFIGNAME,[Supply a (meaningful) name for the configuration you are building.
This name will be appended to the architecture-dependent named
case $target_os in
cygwin*)

View File

@ -6,11 +6,11 @@ Allow for noarch packages.
gap.shi | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
Index: gap4r6/configure.in
Index: gap4r8/configure.in
===================================================================
--- gap4r6.orig/configure.in
+++ gap4r6/configure.in
@@ -160,6 +160,9 @@ AC_SUBST(MAKE_GMP)
--- gap4r8.orig/configure.in
+++ gap4r8/configure.in
@@ -169,6 +169,9 @@ AC_SUBST(MAKE_GMP)
AC_SUBST(USE_GMP)
AC_SUBST(GMP_VER)
@ -18,12 +18,12 @@ Index: gap4r6/configure.in
+AC_SUBST([pkgdatadir])
+
mkdir -p bin
AC_OUTPUT(Makefile-${CONFIGNAME}:Makefile.in sysinfo.gap-${CONFIGNAME}:sysinfo.in bin/gap-${CONFIGNAME}.sh:gap.shi)
ln -sf gap-${CONFIGNAME}.sh bin/gap.sh
Index: gap4r6/gap.shi
AC_CONFIG_FILES([Makefile-${CONFIGNAME}:Makefile.in
sysinfo.gap-${CONFIGNAME}:sysinfo.in
Index: gap4r8/gap.shi
===================================================================
--- gap4r6.orig/gap.shi
+++ gap4r6/gap.shi
--- gap4r8.orig/gap.shi
+++ gap4r8/gap.shi
@@ -61,4 +61,4 @@ fi
##
## You probably should not change this line, which finally starts GAP.

View File

@ -1,78 +0,0 @@
parent 96502953fcae60a727bae2866243bd1f95756d33 ()
commit 94d7cff5aad36fb2f4ad8580fb813e2650905719
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Mon Jun 27 10:45:18 2011 +0200
system: fix crash related to ttyname
There are several problems with this code.
1. ttyname can return NULL, which invokes undefined behavior
when passed to strcmp.
2. ttyname may be using a static buffer, the comparison with strcmp
could potentially always yield true, so the result needs to be stored
away first.
---
src/system.c | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
Index: gap4r6/src/system.c
===================================================================
--- gap4r6.orig/src/system.c
+++ gap4r6/src/system.c
@@ -1819,12 +1819,22 @@ void InitSystem (
syBuf[0].fp = fileno(stdin);
syBuf[0].bufno = -1;
if ( isatty( fileno(stdin) ) ) {
- if ( isatty( fileno(stdout) )
- && ! strcmp( ttyname(fileno(stdin)), ttyname(fileno(stdout)) ) )
+ char *in, *out;
+
+ in = ttyname(fileno(stdin));
+ if (in != NULL)
+ in = strdup(in);
+ out = isatty(fileno(stdout)) ? ttyname(fileno(stdout)) : NULL;
+ if (out != NULL)
+ out = strdup(out);
+
+ if (in != NULL && out != NULL && strcmp(in, out) == 0)
syBuf[0].echo = fileno(stdout);
- else
- syBuf[0].echo = open( ttyname(fileno(stdin)), O_WRONLY );
+ else if (in != NULL)
+ syBuf[0].echo = open(in, O_WRONLY);
syBuf[0].isTTY = 1;
+ free(in);
+ free(out);
}
else {
syBuf[0].echo = fileno(stdout);
@@ -1833,13 +1843,23 @@ void InitSystem (
syBuf[1].echo = syBuf[1].fp = fileno(stdout);
syBuf[1].bufno = -1;
if ( isatty( fileno(stderr) ) ) {
- if ( isatty( fileno(stdin) )
- && ! strcmp( ttyname(fileno(stdin)), ttyname(fileno(stderr)) ) )
+ char *in, *err;
+
+ in = isatty(fileno(stdin)) ? ttyname(fileno(stdin)) : NULL;
+ if (in != NULL)
+ in = strdup(in);
+ err = ttyname(fileno(stderr));
+ if (err != NULL)
+ err = strdup(err);
+
+ if (in != NULL && err != NULL && strcmp(in, err) == 0)
syBuf[2].fp = fileno(stdin);
- else
- syBuf[2].fp = open( ttyname(fileno(stderr)), O_RDONLY );
+ else if (err != NULL)
+ syBuf[2].fp = open(err, O_RDONLY);
syBuf[2].echo = fileno(stderr);
syBuf[2].isTTY = 1;
+ free(in);
+ free(err);
}
else
syBuf[2].isTTY = 0;

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Mar 12 20:09:00 UTC 2016 - jengelh@inai.de
- Update to new upstream release 4.8.2
* Added support for partially variadic functions to allow function
expressions
* GAP now displays the filename and line numbers of statements in
backtraces when entering the break loop.
* Developments from HPC-GAP were backported; "atomic", "readonly"
and "readwrite" are now keywords, and thus are no longer valid
identifiers.
- Remove gap-ttyname-null.diff (fixed upstream)
-------------------------------------------------------------------
Mon Dec 7 19:40:18 UTC 2015 - jengelh@inai.de

141
gap.spec
View File

@ -17,19 +17,18 @@
Name: gap
Version: 4.7.9
Version: 4.8.2
Release: 0
Summary: System for Computational Discrete Algebra
License: GPL-2.0+
Group: Productivity/Scientific/Math
Url: http://gap-system.org/
Source: ftp://ftp.gap-system.org/pub/gap/gap4core/gap4r7p9_nopackages.zip
Source: ftp://ftp.gap-system.org/pub/gap/gap4core/gap4r8p2_nopackages.zip
Source2: %name-rpmlintrc
Source9: gap_retained_specfiles.tar.xz
Patch1: gap-final-dir.diff
Patch2: gap-multiarch.diff
Patch3: gap-ttyname-null.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
BuildRequires: fdupes
@ -128,23 +127,25 @@ BuildArch: noarch
Requires: gap >= %version
Requires: gap-4ti2interface >= 2015.11.06
# gap-ace-5.1 has no license attached: cannot ship that
Requires: gap-ace >= 5.1
#Requires: gap-ace >= 5.1
# gap-aclib-1.2 has no license attached: cannot ship that
Requires: gap-aclib >= 1.2
#Requires: gap-aclib >= 1.2
Requires: gap-alnuth >= 3.0.0
# gap-anupq-3.1.1 has no license attached: cannot ship that
Requires: gap-anupq >= 3.1.1
# gap-anupq-3.1.3 has no license attached: cannot ship that
#Requires: gap-anupq >= 3.1.3
Requires: gap-atlasrep >= 1.5.0
Requires: gap-autodoc >= 2015.09.30
Requires: gap-autodoc >= 2016.02.16
Requires: gap-automata >= 1.13
Requires: gap-automgrp >= 1.2.4
# gap-autpgrp-1.6 has no license attached: cannot ship that
Requires: gap-autpgrp >= 1.6
#Requires: gap-autpgrp >= 1.6
Requires: gap-browse >= 1.8.6
# gap-cap-2016.02.19 has no license attached: cannot ship that
#Requires: gap-cap >= 2016.02.19
Requires: gap-carat >= 2.1.4
Requires: gap-circle >= 1.5.3
Requires: gap-circle >= 1.5.4
# gap-cohomolo-1.6 has no license attached: cannot ship that
Requires: gap-cohomolo >= 1.6
#Requires: gap-cohomolo >= 1.6
Requires: gap-congruence >= 1.1.1
Requires: gap-convex >= 2012.11.15
Requires: gap-corelg >= 1.20
@ -156,124 +157,134 @@ Requires: gap-ctbllib >= 1.2.2
Requires: gap-cubefree >= 1.13
Requires: gap-cvec >= 2.5.3
Requires: gap-design >= 1.6
Requires: gap-digraphs >= 0.4.2
Requires: gap-edim >= 1.3.2
Requires: gap-example >= 3.4.5
Requires: gap-examplesforhomalg >= 2015.11.06
Requires: gap-factint >= 1.5.3
Requires: gap-fga >= 1.3.0
Requires: gap-fining >= 1.3.3
Requires: gap-float >= 0.6.2
# gap-format-1.3 has no license attached: cannot ship that
Requires: gap-format >= 1.3
#Requires: gap-format >= 1.3
Requires: gap-forms >= 1.2.3
# gap-fplsa-1.1 has no license attached: cannot ship that
Requires: gap-fplsa >= 1.1
#Requires: gap-fplsa >= 1.1
Requires: gap-fr >= 2.2.1
# gap-fwtree-1.0 hsa no license attached: cannot ship that
Requires: gap-fwtree >= 1.0
#Requires: gap-fwtree >= 1.0
Requires: gap-gapdoc >= 1.5.1
Requires: gap-gauss >= 2015.11.06
Requires: gap-gaussforhomalg >= 2015.11.06
Requires: gap-gbnp >= 1.0.1
Requires: gap-genss >= 1.6.2
Requires: gap-gpd >= 1.34
Requires: gap-genss >= 1.6.3
Requires: gap-gpd >= 1.42
Requires: gap-gradedmodules >= 2015.11.06
Requires: gap-gradedringforhomalg >= 2015.11.06
Requires: gap-grape >= 4.6.1
# gap-grpconst-2.3 has no license attached: cannot ship that
Requires: gap-grpconst >= 2.3
# gap-grape-4.7: contains nauty: Knuth's/nauty license is not OSI-compatible
#Requires: gap-grape >= 4.7
# gap-grpconst-2.5 has no license attached: cannot ship that
#Requires: gap-grpconst >= 2.5
Requires: gap-guarana >= 0.94
Requires: gap-guava >= 3.12
Requires: gap-hap >= 1.11.12
Requires: gap-hap >= 1.11.13
Requires: gap-hapcryst >= 0.1.11
Requires: gap-happrime >= 0.6
Requires: gap-hecke >= 1.4
Requires: gap-help >= 2.2
Requires: gap-homalg >= 2015.11.05
Requires: gap-homalgtocas >= 2015.11.06
Requires: gap-homalgtocas >= 2015.12.08
Requires: gap-idrel >= 2.31
Requires: gap-intpic >= 0.2.1
Requires: gap-io >= 4.4.4
Requires: gap-io >= 4.4.5
Requires: gap-io_forhomalg >= 2015.11.06
# gap-irredsol-1.2.4 has no license attached: cannot ship that
Requires: gap-irredsol >= 1.2.4
#Requires: gap-irredsol >= 1.2.4
# gap-itc-1.4 has no license attached: cannot ship that
Requires: gap-itc >= 1.4
# gap-json-0.8.2 has no license attached: cannot ship that
Requires: gap-json >= 0.8.2
Requires: gap-kan >= 1.21
# gap-kbmag-1.5 has no license attached: cannot ship that
Requires: gap-kbmag >= 1.5
#Requires: gap-itc >= 1.4
Requires: gap-json >= 1.0.1
Requires: gap-kan >= 1.25
Requires: gap-kbmag >= 1.5.3
Requires: gap-laguna >= 3.7.0
# gap-liealgdb-2.1 has no license attached: cannot ship that
Requires: gap-liealgdb >= 2.1
#Requires: gap-liealgdb >= 2.1
Requires: gap-liepring >= 1.8
Requires: gap-liering >= 2.2
Requires: gap-linboxing >= 0.5.2
# gap-linearalgebraforcap-2015.12.03: no license attached; cannot ship
#Requires: gap-linearalgebraforcap >= 2015.12.03
Requires: gap-localizeringforhomalg >= 2015.11.06
Requires: gap-loops >= 3.1.0
Requires: gap-mapclass >= 1.2
Requires: gap-matricesforhomalg >= 2015.11.06
# gap-modisom-2.3.2 not OSI compliant: cannot ship:
# permits distribution and use, but not modification.
Requires: gap-modisom >= 2.3.2
Requires: gap-modules >= 2015.11.06
#Requires: gap-modisom >= 2.3.3
# gap-modulepresentationforcap: no license attached; cannot ship
#Requires: gap-modulepresentationforcap >= 2015.12.09
Requires: gap-modules >= 2016.01.20
Requires: gap-nilmat >= 1.2
Requires: gap-nq >= 2.5.1
Requires: gap-normalizinterface >= 0.9.5
Requires: gap-nq >= 2.5.2
Requires: gap-numericalsgps >= 1.0.1
Requires: gap-openmath >= 11.2.0
Requires: gap-orb >= 4.7.3
Requires: gap-openmath >= 11.3.1
Requires: gap-orb >= 4.7.5
#Needs separate gap-core built with openmpi and update-alternatives
#Requires: gap-pargap >= 1.4.0
# gap-patterclass-2.1 has no license attached: cannot ship that
Requires: gap-patternclass >= 2.1
# gap-patternclass-2.1 has no license attached: cannot ship that
#Requires: gap-patternclass >= 2.1
Requires: gap-permut >= 1.03
Requires: gap-polenta >= 1.3.2
Requires: gap-polenta >= 1.3.5
Requires: gap-polycyclic >= 2.11
Requires: gap-polymakeinterface >= 2015.01.26
Requires: gap-polymaking >= 0.8.1
# gap-profiling-0.5.0: incomplete license (not all files covered)
#Requires: gap-profiling >= 0.5.0
# gap-qaos-1.0.28 has no license attached: cannot ship that
Requires: gap-qaos >= 1.0.28
#Requires: gap-qaos >= 1.0.28
Requires: gap-qpa >= 1.23
# gap-quagroup-1.8 has no license attached: cannot ship that
Requires: gap-quagroup >= 1.8
#Requires: gap-quagroup >= 1.8
Requires: gap-radiroot >= 2.7
Requires: gap-rcwa >= 3.7.0
Requires: gap-rcwa >= 4.0.0
Requires: gap-rds >= 1.6
Requires: gap-recog >= 1.2.3
Requires: gap-recogbase >= 1.2.3
Requires: gap-recog >= 1.2.4
Requires: gap-recogbase >= 1.2.4
# gap-repsn-3.2 has no license attached: cannot ship that
Requires: gap-repsn >= 3.0.2
Requires: gap-resclasses >= 3.4.0
Requires: gap-ringsforhomalg >= 2015.11.06
#Requires: gap-repsn >= 3.0.2
Requires: gap-resclasses >= 4.1.2
Requires: gap-ringsforhomalg >= 2016.01.20
Requires: gap-sco >= 2015.11.06
Requires: gap-scscp >= 2.1.4
Requires: gap-semigroups >= 2.5
# gap-sglppow-1.0 not OSI compliant: cannot ship
# permits distribution, but not use (how stupid) nor modification
Requires: gap-sglppow >= 1.0
Requires: gap-semigroups >= 2.7.2
# gap-sglppow-1.1 not OSI compliant: cannot ship
# permits distribution, but not use (how stupid), nor modification
#Requires: gap-sglppow >= 1.1
Requires: gap-sgpviz >= 0.998
Requires: gap-simpcomp >= 2.1.1
Requires: gap-simpcomp >= 2.1.6
# gap-singular-12.04.28 has no license attached: cannot ship
Requires: gap-singular >= 12.04.28
# gap-sla-0.14 has no license attached: cannot ship
Requires: gap-sla >= 0.14
Requires: gap-smallsemi >= 0.6.8
#Requires: gap-singular >= 12.04.28
Requires: gap-sla >= 1.1
Requires: gap-smallsemi >= 0.6.10
Requires: gap-sonata >= 2.8
# gap-sophus-1.23 has no license attached: cannot ship
Requires: gap-sophus >= 1.23
#Requires: gap-sophus >= 1.23
Requires: gap-spinsym >= 1.5
Requires: gap-symbcompcc >= 1.2
# gap-tomlib-1.2.5 has no license attached: cannot ship
Requires: gap-tomlib >= 1.2.5
Requires: gap-toolsforhomalg >= 2015.11.23
#Requires: gap-tomlib >= 1.2.5
Requires: gap-toolsforhomalg >= 2016.02.17
Requires: gap-toric >= 1.8
Requires: gap-toricvarieties >= 2012.12.22
# gap-unipot-1.2 has no license attached: cannot ship
Requires: gap-unipot >= 1.2
#Requires: gap-unipot >= 1.2
Requires: gap-unitlib >= 3.2.0
Requires: gap-utils >= 0.25
Requires: gap-wedderga >= 4.7.3
# gap-xgap-4.23 has no license attached: cannot ship
Requires: gap-xgap >= 4.23
Requires: gap-xmod >= 2.44
#Requires: gap-xgap >= 4.23
Requires: gap-xmod >= 2.51
Requires: gap-xmodalg >= 1.12
%description full
GAP is a system for computational discrete algebra, with particular
@ -334,8 +345,8 @@ emphasis on Computational Group Theory.
This subpackage contains the database of transitive groups.
%prep
%setup -qn gap4r7
%patch -P 1 -P 2 -P 3 -p1
%setup -qn gap4r8
%patch -P 1 -P 2 -p1
%build
rm -f bin/*.bat
@ -482,14 +493,16 @@ EOF
%_bindir/gac
%_bindir/gac-*
%dir %gapdir/
%gapdir/*.md
%gapdir/INSTALL
%gapdir/LICENSE
%gapdir/Makefile*
%dir %gapdir/bin/
%gapdir/bin/%_host-*
%gapdir/bin/BuildPackages.sh
%exclude %gapdir/bin/%_host-*/gap
%gapdir/config*
%gapdir/extern/
%gapdir/makepkgs
%gapdir/src/
%files doc

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:820ea2212336f8bb22745fb187937d485f1ca573f56da764855ed074e617533b
size 42321303

3
gap4r8p2_nopackages.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42dc5f559190ce13ee349f113bca9704b48779815673a076a73b9398d8e5b60a
size 40881121

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:219c5f8f9870f1a1c52cf8074cd2634ac564d5ea85b57d4440989fabe04f6ee2
size 13988
oid sha256:636d5094251922687d30503c38991d3bf54957a899b6bd250b647adf9e211124
size 12724