Accepting request 76282 from home:jengelh:dev
gap-system.org OBS-URL: https://build.opensuse.org/request/show/76282 OBS-URL: https://build.opensuse.org/package/show/science/gap?expand=0&rev=1
This commit is contained in:
Werner Hoch
Git OBS Bridge
commit
ba621c43d3
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
.osc
|
||||||
48
gap-final-dir.diff
Normal file
48
gap-final-dir.diff
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
parent af9cbb298352dfbeb66e414428946b11a7b9ee1a ()
|
||||||
|
commit f01d2b07a7a668e6b27b9527e070d8315c084d6e
|
||||||
|
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||||
|
Date: Sun Jun 26 10:48:09 2011 +0200
|
||||||
|
|
||||||
|
build: add a --with-gapdir option to specify future location of GAP
|
||||||
|
---
|
||||||
|
cnf/configure.in | 5 ++++-
|
||||||
|
configure.in | 6 +++++-
|
||||||
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cnf/configure.in b/cnf/configure.in
|
||||||
|
index 2b9f78b..8c7a543 100644
|
||||||
|
--- a/cnf/configure.in
|
||||||
|
+++ b/cnf/configure.in
|
||||||
|
@@ -288,8 +288,11 @@ dnl ##
|
||||||
|
dnl ## generate a makefile
|
||||||
|
dnl ##
|
||||||
|
|
||||||
|
+AC_ARG_WITH([gapbindir],
|
||||||
|
+ AS_HELP_STRING([--with-gapbindir], [Denote the final location of GAP]),
|
||||||
|
+ [gapbin="$withval"],
|
||||||
|
+ [gapbin="$PWD"])
|
||||||
|
AC_SUBST(gapbin)
|
||||||
|
-gapbin=`pwd`
|
||||||
|
|
||||||
|
AC_SUBST(BUILD_MODE)
|
||||||
|
AC_SUBST(ABI_CFLAGS)
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index c24e506..7063e6f 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -59,8 +59,12 @@ AC_PROG_CC
|
||||||
|
BASECC=`basename ${CC}`
|
||||||
|
AC_SUBST(BASECC)
|
||||||
|
AC_PROG_MAKE_SET
|
||||||
|
+
|
||||||
|
+AC_ARG_WITH([gapdir],
|
||||||
|
+ AS_HELP_STRING([--with-gapdir], [Denote the final location of GAP]),
|
||||||
|
+ [gapdir="$withval"],
|
||||||
|
+ [gapdir="$PWD"])
|
||||||
|
AC_SUBST(gapdir)
|
||||||
|
-gapdir=`pwd`
|
||||||
|
|
||||||
|
AC_ARG_WITH(gmp,
|
||||||
|
AC_HELP_STRING( [--with-gmp],
|
||||||
|
--
|
||||||
|
# Created with git-export-patch
|
||||||
24
gap-no-fancy-paths.diff
Normal file
24
gap-no-fancy-paths.diff
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
parent bed1014971e204b383cd74a48a913e294d420972 ()
|
||||||
|
commit 96502953fcae60a727bae2866243bd1f95756d33
|
||||||
|
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||||
|
Date: Sun Jun 26 23:58:07 2011 +0200
|
||||||
|
|
||||||
|
build: provide uncomplicated pathspec
|
||||||
|
---
|
||||||
|
Makefile.in | 1 +
|
||||||
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 6ceb28d..1bd298d 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -80,6 +80,7 @@ config: bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure bin/@target@-@BASECC@
|
||||||
|
|
||||||
|
bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure: cnf/configure.out
|
||||||
|
mkdir -p bin/@target@-@BASECC@/$(BUILD_MODE)-bit
|
||||||
|
+ ln -s bin/@target@-@BASECC@/$(BUILD_MODE)-bit obj
|
||||||
|
@rm -f bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
|
||||||
|
cp cnf/configure.out bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
|
||||||
|
|
||||||
|
--
|
||||||
|
# Created with git-export-patch
|
||||||
2
gap-rpmlintrc
Normal file
2
gap-rpmlintrc
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
addFilter("devel-file-in-non-devel-package")
|
||||||
|
|
||||||
44
gap-system-perl.diff
Normal file
44
gap-system-perl.diff
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
parent 9316710832a9f6d582e1dcf3b9645e9efc8efc8f ()
|
||||||
|
commit cfc9336244188eac1c5feac5542b3808dac0a435
|
||||||
|
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||||
|
Date: Sun Jun 26 16:22:03 2011 +0200
|
||||||
|
|
||||||
|
pkg/hap: default to system perl
|
||||||
|
---
|
||||||
|
pkg/Hap1.9/lib/PolyComplexes/prog | 2 +-
|
||||||
|
pkg/Hap1.9/lib/TDA/prog | 2 +-
|
||||||
|
pkg/Hap1.9/lib/TopologicalSpaces/prog | 2 +-
|
||||||
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkg/Hap1.9/lib/PolyComplexes/prog b/pkg/Hap1.9/lib/PolyComplexes/prog
|
||||||
|
index 190de99..8bb6226 100755
|
||||||
|
--- a/pkg/Hap1.9/lib/PolyComplexes/prog
|
||||||
|
+++ b/pkg/Hap1.9/lib/PolyComplexes/prog
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/local/bin/perl
|
||||||
|
+#!/usr/bin/perl
|
||||||
|
#
|
||||||
|
# Program to convert image text files to GAP matrices.
|
||||||
|
|
||||||
|
diff --git a/pkg/Hap1.9/lib/TDA/prog b/pkg/Hap1.9/lib/TDA/prog
|
||||||
|
index bd701da..93fed2c 100755
|
||||||
|
--- a/pkg/Hap1.9/lib/TDA/prog
|
||||||
|
+++ b/pkg/Hap1.9/lib/TDA/prog
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/local/bin/perl
|
||||||
|
+#!/usr/bin/perl
|
||||||
|
#
|
||||||
|
# Program to convert image text files to GAP matrices.
|
||||||
|
|
||||||
|
diff --git a/pkg/Hap1.9/lib/TopologicalSpaces/prog b/pkg/Hap1.9/lib/TopologicalSpaces/prog
|
||||||
|
index bd701da..93fed2c 100755
|
||||||
|
--- a/pkg/Hap1.9/lib/TopologicalSpaces/prog
|
||||||
|
+++ b/pkg/Hap1.9/lib/TopologicalSpaces/prog
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/local/bin/perl
|
||||||
|
+#!/usr/bin/perl
|
||||||
|
#
|
||||||
|
# Program to convert image text files to GAP matrices.
|
||||||
|
|
||||||
|
--
|
||||||
|
# Created with git-export-patch
|
||||||
80
gap-ttyname-null.diff
Normal file
80
gap-ttyname-null.diff
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
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 files changed, 28 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/system.c b/src/system.c
|
||||||
|
index a41b46b..1c39dd4 100644
|
||||||
|
--- a/src/system.c
|
||||||
|
+++ b/src/system.c
|
||||||
|
@@ -2133,12 +2133,22 @@ void InitSystem (
|
||||||
|
syBuf[0].fp = fileno(stdin);
|
||||||
|
syBuf[0].bufno = -1;
|
||||||
|
if ( isatty( fileno(stdin) ) ) {
|
||||||
|
- if ( isatty( fileno(stdout) )
|
||||||
|
- && ! SyStrcmp( 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);
|
||||||
|
@@ -2147,13 +2157,23 @@ void InitSystem (
|
||||||
|
syBuf[1].echo = syBuf[1].fp = fileno(stdout);
|
||||||
|
syBuf[1].bufno = -1;
|
||||||
|
if ( isatty( fileno(stderr) ) ) {
|
||||||
|
- if ( isatty( fileno(stdin) )
|
||||||
|
- && ! SyStrcmp( 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;
|
||||||
|
--
|
||||||
|
# Created with git-export-patch
|
||||||
84
gap-typepuns.diff
Normal file
84
gap-typepuns.diff
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
parent f01d2b07a7a668e6b27b9527e070d8315c084d6e ()
|
||||||
|
commit 9316710832a9f6d582e1dcf3b9645e9efc8efc8f
|
||||||
|
Author: Jan Engelhardt <jengelh@medozas.de>
|
||||||
|
Date: Sun Jun 26 11:42:56 2011 +0200
|
||||||
|
|
||||||
|
src: fix undefined behavior in copy operations
|
||||||
|
---
|
||||||
|
src/gap.c | 4 ++--
|
||||||
|
src/saveload.c | 6 ++++--
|
||||||
|
src/streams.c | 4 ++--
|
||||||
|
3 files changed, 8 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/gap.c b/src/gap.c
|
||||||
|
index 06fc308..a95b1d5 100644
|
||||||
|
--- a/src/gap.c
|
||||||
|
+++ b/src/gap.c
|
||||||
|
@@ -1891,7 +1891,7 @@ Obj FuncCOM_FILE (
|
||||||
|
Pr( "#I READ_GAP_ROOT: loading '%s' dynamically\n",
|
||||||
|
(Int)CSTR_STRING(filename), 0L );
|
||||||
|
}
|
||||||
|
- info = *(StructInitInfo**)result;
|
||||||
|
+ memcpy(&info, result, sizeof(info));
|
||||||
|
res = info->initKernel(info);
|
||||||
|
UpdateCopyFopyInfo();
|
||||||
|
res = res || info->initLibrary(info);
|
||||||
|
@@ -1909,7 +1909,7 @@ Obj FuncCOM_FILE (
|
||||||
|
Pr( "#I READ_GAP_ROOT: loading '%s' statically\n",
|
||||||
|
(Int)CSTR_STRING(filename), 0L );
|
||||||
|
}
|
||||||
|
- info = *(StructInitInfo**)result;
|
||||||
|
+ memcpy(&info, result, sizeof(info));
|
||||||
|
res = info->initKernel(info);
|
||||||
|
UpdateCopyFopyInfo();
|
||||||
|
res = res || info->initLibrary(info);
|
||||||
|
diff --git a/src/saveload.c b/src/saveload.c
|
||||||
|
index 52dc82d..2e2d55a 100644
|
||||||
|
--- a/src/saveload.c
|
||||||
|
+++ b/src/saveload.c
|
||||||
|
@@ -452,7 +452,7 @@ void SaveDouble( Double d)
|
||||||
|
{
|
||||||
|
UInt i;
|
||||||
|
UInt1 buf[sizeof(Double)];
|
||||||
|
- *(Double *)buf = d;
|
||||||
|
+ memcpy(buf, &d, sizeof(d));
|
||||||
|
for (i = 0; i < sizeof(Double); i++)
|
||||||
|
SAVE_BYTE(buf[i]);
|
||||||
|
}
|
||||||
|
@@ -461,9 +461,11 @@ Double LoadDouble( void)
|
||||||
|
{
|
||||||
|
UInt i;
|
||||||
|
UInt1 buf[sizeof(Double)];
|
||||||
|
+ Double d;
|
||||||
|
for (i = 0; i < sizeof(Double); i++)
|
||||||
|
buf[i] = LOAD_BYTE();
|
||||||
|
- return *(Double *)buf;
|
||||||
|
+ memcpy(&d, buf, sizeof(d));
|
||||||
|
+ return d;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************
|
||||||
|
diff --git a/src/streams.c b/src/streams.c
|
||||||
|
index e91cd92..3091fb9 100644
|
||||||
|
--- a/src/streams.c
|
||||||
|
+++ b/src/streams.c
|
||||||
|
@@ -353,7 +353,7 @@ Int READ_GAP_ROOT ( Char * filename )
|
||||||
|
Pr( "#I READ_GAP_ROOT: loading '%s' dynamically\n",
|
||||||
|
(Int)filename, 0L );
|
||||||
|
}
|
||||||
|
- info = *(StructInitInfo**)result;
|
||||||
|
+ memcpy(&info, result, sizeof(info));
|
||||||
|
res = info->initKernel(info);
|
||||||
|
if (!SyRestoring) {
|
||||||
|
UpdateCopyFopyInfo();
|
||||||
|
@@ -374,7 +374,7 @@ Int READ_GAP_ROOT ( Char * filename )
|
||||||
|
Pr( "#I READ_GAP_ROOT: loading '%s' statically\n",
|
||||||
|
(Int)filename, 0L );
|
||||||
|
}
|
||||||
|
- info = *(StructInitInfo**)result;
|
||||||
|
+ memcpy(&info, result, sizeof(info));
|
||||||
|
res = info->initKernel(info);
|
||||||
|
if (!SyRestoring) {
|
||||||
|
UpdateCopyFopyInfo();
|
||||||
|
--
|
||||||
|
# Created with git-export-patch
|
||||||
3
gap4r5p1_2011_06_03-07_59.tar.xz
Normal file
3
gap4r5p1_2011_06_03-07_59.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:feed4ef7344055a36d655aacb5c44de5d9cc037ef122d35610df3b02adf88fbd
|
||||||
|
size 168437668
|
||||||
Loading…
Reference in New Issue
Block a user