cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update swi-prolog to 5.10.5.

Browse Source 
OK jasper@
This commit is contained in:
edd 2011-09-17 16:06:32 +00:00
parent 8e20ccb2ac
commit 26f505717d
8 changed files with 70 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lang/swi-prolog/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.37 2011/09/15 15:36:54 jasper Exp $
# $OpenBSD: Makefile,v 1.38 2011/09/17 16:06:32 edd Exp $
COMMENT = Prolog for the real world
V = 5.10.4
V = 5.10.5
XV = 6.6.66
DISTNAME = pl-$V
PKGNAME = swi-prolog-$V
REVISION = 4
CATEGORIES = lang
SHARED_LIBS = pl 3.0
@ -45,10 +44,11 @@ MAKE_FLAGS = SONAMEOPT= \
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = graphics/jpeg
LIB_DEPENDS = devel/gmp
LIB_DEPENDS = devel/gmp \
devel/libexecinfo
WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt c crypto gmp jpeg m
WANTLIB += ncursesw pthread readline ssl z
WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xt c crypto execinfo gmp
WANTLIB += jpeg m ncursesw pthread readline ssl z
FULLARCH = ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd${OSREV}
SUBST_VARS = V XV FULLARCH BOOT
@ -62,7 +62,16 @@ pre-patch:
done
post-install:
cd ${PREFIX}/lib && ln -s swipl-$V/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
cd ${PREFIX}/lib && \
ln -s swipl-$V/lib/${FULLARCH}/libpl.so.${LIBpl_VERSION}
mv ${PREFIX}/lib/swipl-${V}/xpce-${XV}/man/xpce-client.1 \
${PREFIX}/man/man1/
# XXX figure out why these tests fail
######pre-regress:
###### rm ${WRKBUILD}/src/Tests/thread/agc.pl
###### rm ${WRKBUILD}/src/Tests/thread/agc2.pl
.include <bsd.port.mk>

10
lang/swi-prolog/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pl-5.10.4.tar.gz) = NjQzuy+ApsK+/q7ndoGXtA==
RMD160 (pl-5.10.4.tar.gz) = WJGQhgajZ2osbGAI+MsvZyTNIR8=
SHA1 (pl-5.10.4.tar.gz) = SBgooAtvoOo+YKCBt17Xz1VZG5c=
SHA256 (pl-5.10.4.tar.gz) = 5lJ1QC5tGqqgf6PbtW8vCMtog2bSkjJMwYsXvwUAv7M=
SIZE (pl-5.10.4.tar.gz) = 13242637
MD5 (pl-5.10.5.tar.gz) = HKRe3dNZD7UlCFdh51pOvQ==
RMD160 (pl-5.10.5.tar.gz) = HtNZS0bv6tH9ZrIy/4vddl10kgA=
SHA1 (pl-5.10.5.tar.gz) = vCfpl+IBIK7ZvmivL9zPsJP/Fus=
SHA256 (pl-5.10.5.tar.gz) = ONk41qZOiUaFqkS/nqNLVQV2TNCE4H5rTCGp3Ym1edU=
SIZE (pl-5.10.5.tar.gz) = 13329752

86
lang/swi-prolog/patches/patch-packages_xpce_src_img_gifread_c
View File

@ -1,86 +0,0 @@
$OpenBSD: patch-packages_xpce_src_img_gifread_c,v 1.2 2011/09/16 10:42:58 jasper Exp $
From bb328029beb148691edc031d9db9cf0a503c8247 Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
Date: Thu, 18 Aug 2011 11:46:53 +0200
Subject: [PATCH] SECURITY: Bug#7 Gif-reader bufferoverflow. Petr Pisar.
From 30fbc4e030cbef5871e1b96c31458116ce3e2ee8 Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
Date: Thu, 18 Aug 2011 16:26:44 +0200
Subject: [PATCH] SECURITY: Bug#7: More gif-read fixes.
--- packages/xpce/src/img/gifread.c.orig Fri Sep 16 12:42:34 2011
+++ packages/xpce/src/img/gifread.c Fri Sep 16 12:42:32 2011
@@ -169,7 +169,7 @@ GIFReadFD(IOSTREAM *fd,
/* read colormaps */
if ( BitSet((UCHAR) buf[4], LOCALCOLORMAP) )
{ if ( (rval=ReadColorMap(fd, GifScreen.BitPixel, at, ac, closure))
- != GIF_OK )
+ != GIF_OK )
{ setGifError("Error reading GIF colormap");
return rval;
}
@@ -466,7 +466,7 @@ LZWReadByte(IOSTREAM * fd, int flag, int input_code_si
firstcode = oldcode = GetCode(fd, code_size, FALSE);
}
while (firstcode == clear_code);
- return firstcode;
+ return (firstcode&255);
}
if (sp > stack)
return *--sp;
@@ -487,11 +487,11 @@ LZWReadByte(IOSTREAM * fd, int flag, int input_code_si
max_code = clear_code + 2;
sp = stack;
firstcode = oldcode = GetCode(fd, code_size, FALSE);
- return firstcode;
- } else if (code == end_code)
+ return (firstcode&255);
+ } else if (code == end_code || code > max_code)
{
int count;
- UCHAR buf[260];
+ UCHAR buf[260]; /* Block buffer */
if (ZeroDataBlock)
return -2;
@@ -504,12 +504,12 @@ LZWReadByte(IOSTREAM * fd, int flag, int input_code_si
}
incode = code;
- if (code >= max_code)
- {
- *sp++ = firstcode;
+ if (code == max_code)
+ { if ( sp < stack+sizeof(stack) ) /* stack is UCHAR */
+ *sp++ = firstcode;
code = oldcode;
}
- while (code >= clear_code)
+ while (code >= clear_code && sp < stack+sizeof(stack) )
{
*sp++ = vals[code];
if (code == (int) next[code])
@@ -520,7 +520,8 @@ LZWReadByte(IOSTREAM * fd, int flag, int input_code_si
code = next[code];
}
- *sp++ = firstcode = vals[code];
+ if ( sp < stack+sizeof(stack) )
+ *sp++ = firstcode = vals[code];
if ((code = max_code) < (1 << MAX_LZW_BITS))
{
@@ -537,9 +538,9 @@ LZWReadByte(IOSTREAM * fd, int flag, int input_code_si
oldcode = incode;
if (sp > stack)
- return *--sp;
+ return ((*--sp) & 255);
}
- return code;
+ return (code&255);
}

17
lang/swi-prolog/patches/patch-src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2011/08/18 10:51:08 edd Exp $
--- src/Makefile.in.orig Mon Aug 15 16:19:18 2011
+++ src/Makefile.in Mon Aug 15 16:19:34 2011
@@ -75,7 +75,7 @@ COFLAGS=@COFLAGS@
$OpenBSD: patch-src_Makefile_in,v 1.2 2011/09/17 16:06:32 edd Exp $
--- src/Makefile.in.orig Fri Aug 19 15:31:28 2011
+++ src/Makefile.in Sat Sep 17 11:59:17 2011
@@ -76,7 +76,7 @@ COFLAGS=@COFLAGS@
CWFLAGS=@CWFLAGS@
CIFLAGS=@CIFLAGS@
CMFLAGS=@CMFLAGS@
@ -10,3 +10,12 @@ $OpenBSD: patch-src_Makefile_in,v 1.1 2011/08/18 10:51:08 edd Exp $
CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) $(CPFLAGS)
LDFLAGS=@LDFLAGS@ $(CPFLAGS)
@@ -209,7 +209,7 @@ $(RUNTIMEDIR)/$(SHARED): dirs $(OBJ) $(LIBOBJ) $(XOBJ)
else
$(RUNTIMEDIR)/$(SHAREDV): dirs $(OBJ) $(LIBOBJ) $(XOBJ)
$(CC) -shared $(COFLAGS) -o $@ $(SONAMEOPT) \
- $(OBJ) $(LIBOBJ) $(XOBJ) $(LDFLAGS) $(LIBS)
+ $(OBJ) $(LIBOBJ) $(XOBJ) $(LDFLAGS) -lexecinfo $(LIBS)
$(RUNTIMEDIR)/$(SHARED): $(RUNTIMEDIR)/$(SHAREDV)
( cd ../lib/$(PLARCH) && rm -f $(SHARED) && ln -s $(SHAREDV) $(SHARED) )

10
lang/swi-prolog/patches/patch-src_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_configure_in,v 1.6 2011/04/08 07:55:16 jasper Exp $
--- src/configure.in.orig Mon Mar 28 18:10:29 2011
+++ src/configure.in Fri Apr 8 09:40:12 2011
@@ -488,6 +488,10 @@ case "$ARCH" in
$OpenBSD: patch-src_configure_in,v 1.7 2011/09/17 16:06:32 edd Exp $
--- src/configure.in.orig Fri Aug 19 15:31:28 2011
+++ src/configure.in Sat Sep 17 11:34:22 2011
@@ -498,6 +498,10 @@ case "$PLARCH" in
[String used to prefix all symbols requested through dlsym()])
CMFLAGS="-no-cpp-precomp"
;;
@ -12,7 +12,7 @@ $OpenBSD: patch-src_configure_in,v 1.6 2011/04/08 07:55:16 jasper Exp $
*cygwin*)
SO_EXT="dll"
SO_pic=""
@@ -563,7 +567,7 @@ esac
@@ -587,7 +591,7 @@ esac
[ static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_lock(&m);
pthread_mutex_unlock(&m);

19
lang/swi-prolog/patches/patch-src_test_pl Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_test_pl,v 1.1 2011/09/17 16:06:32 edd Exp $
threading regression tests fail to terminate. disable them while we figure out
why. Dialog started with upstream:
http://www.swi-prolog.org/bugzilla/show_bug.cgi?id=11
--- src/test.pl.orig Sat Sep 17 17:17:28 2011
+++ src/test.pl Sat Sep 17 17:17:49 2011
@@ -2616,8 +2616,8 @@ testdir('Tests/library').
testdir('Tests/charset').
testdir('Tests/clp').
testdir('Tests/GC').
-testdir('Tests/thread') :-
- current_prolog_flag(threads, true).
+%testdir('Tests/thread') :-
+% current_prolog_flag(threads, true).
:- dynamic
failed/1,

3
lang/swi-prolog/pkg/PFRAG.shared
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.7 2011/04/28 18:59:18 jasper Exp $
@comment $OpenBSD: PFRAG.shared,v 1.8 2011/09/17 16:06:32 edd Exp $
@lib lib/libpl.so.${LIBpl_VERSION}
lib/swipl-${V}/lib/${FULLARCH}/cgi.so
lib/swipl-${V}/lib/${FULLARCH}/crypt.so
@ -27,6 +27,7 @@ lib/swipl-${V}/lib/${FULLARCH}/streaminfo.so
lib/swipl-${V}/lib/${FULLARCH}/table.so
lib/swipl-${V}/lib/${FULLARCH}/time.so
lib/swipl-${V}/lib/${FULLARCH}/turtle.so
lib/swipl-${V}/lib/${FULLARCH}/uid.so
lib/swipl-${V}/lib/${FULLARCH}/unix.so
lib/swipl-${V}/lib/${FULLARCH}/uri.so
lib/swipl-${V}/lib/${FULLARCH}/zlib4pl.so

22
lang/swi-prolog/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2011/04/28 18:59:18 jasper Exp $
@comment $OpenBSD: PLIST,v 1.10 2011/09/17 16:06:32 edd Exp $
%%SHARED%%
bin/swipl
bin/swipl-ld
@ -9,12 +9,12 @@ lib/pkgconfig/swipl.pc
lib/swipl-${V}/
lib/swipl-${V}/Makefile
lib/swipl-${V}/bin/
lib/swipl-${V}/bin/swipl.home
lib/swipl-${V}/bin/${FULLARCH}/
@bin lib/swipl-${V}/bin/${FULLARCH}/swipl
@bin lib/swipl-${V}/bin/${FULLARCH}/swipl-ld
@bin lib/swipl-${V}/bin/${FULLARCH}/swipl-rc
lib/swipl-${V}/bin/${FULLARCH}/xpce
lib/swipl-${V}/bin/swipl.home
lib/swipl-${V}/boot/
lib/swipl-${V}/boot/apply.pl
lib/swipl-${V}/boot/attvar.pl
@ -175,6 +175,7 @@ lib/swipl-${V}/doc/Manual/next.gif
lib/swipl-${V}/doc/Manual/operators.html
lib/swipl-${V}/doc/Manual/opsummary.html
lib/swipl-${V}/doc/Manual/option.html
lib/swipl-${V}/doc/Manual/optparse.html
lib/swipl-${V}/doc/Manual/ordsets.html
lib/swipl-${V}/doc/Manual/overrule.html
lib/swipl-${V}/doc/Manual/overview.html
@ -370,6 +371,7 @@ lib/swipl-${V}/library/am_match.pl
lib/swipl-${V}/library/ansi_term.pl
lib/swipl-${V}/library/apply.pl
lib/swipl-${V}/library/apply_macros.pl
lib/swipl-${V}/library/arithmetic.pl
lib/swipl-${V}/library/assoc.pl
lib/swipl-${V}/library/backcomp.pl
lib/swipl-${V}/library/base32.pl
@ -496,6 +498,7 @@ lib/swipl-${V}/library/help.pl
lib/swipl-${V}/library/helpidx.pl
lib/swipl-${V}/library/hotfix.pl
lib/swipl-${V}/library/http/
lib/swipl-${V}/library/http/INDEX.pl
lib/swipl-${V}/library/http/README
lib/swipl-${V}/library/http/dcg_basics.pl
lib/swipl-${V}/library/http/html_head.pl
@ -558,6 +561,7 @@ lib/swipl-${V}/library/nb_set.pl
lib/swipl-${V}/library/occurs.pl
lib/swipl-${V}/library/operators.pl
lib/swipl-${V}/library/option.pl
lib/swipl-${V}/library/optparse.pl
lib/swipl-${V}/library/ordsets.pl
lib/swipl-${V}/library/oset.pl
lib/swipl-${V}/library/pairs.pl
@ -624,6 +628,7 @@ lib/swipl-${V}/library/record.pl
lib/swipl-${V}/library/rewrite.pl
lib/swipl-${V}/library/rlimit.pl
lib/swipl-${V}/library/semweb/
lib/swipl-${V}/library/semweb/INDEX.pl
lib/swipl-${V}/library/semweb/README
lib/swipl-${V}/library/semweb/dc.rdfs
lib/swipl-${V}/library/semweb/eor.rdfs
@ -670,6 +675,7 @@ lib/swipl-${V}/library/threadutil.pl
lib/swipl-${V}/library/time.pl
lib/swipl-${V}/library/tty.pl
lib/swipl-${V}/library/ugraphs.pl
lib/swipl-${V}/library/uid.pl
lib/swipl-${V}/library/unicode/
lib/swipl-${V}/library/unicode/blocks.pl
lib/swipl-${V}/library/unicode/unicode_data.pl
@ -1100,7 +1106,6 @@ lib/swipl-${V}/xpce-${XV}/lib/${FULLARCH}/
lib/swipl-${V}/xpce-${XV}/man/
lib/swipl-${V}/xpce-${XV}/man/faq/
lib/swipl-${V}/xpce-${XV}/man/faq/faq.html
lib/swipl-${V}/xpce-${XV}/man/index.obj
lib/swipl-${V}/xpce-${XV}/man/reference/
lib/swipl-${V}/xpce-${XV}/man/reference/bug_fixes.doc
lib/swipl-${V}/xpce-${XV}/man/reference/changes.doc
@ -1300,7 +1305,6 @@ lib/swipl-${V}/xpce-${XV}/man/reference/objects.doc
lib/swipl-${V}/xpce-${XV}/man/reference/predicates.doc
lib/swipl-${V}/xpce-${XV}/man/reference/tools.doc
lib/swipl-${V}/xpce-${XV}/man/reference/topics.doc
lib/swipl-${V}/xpce-${XV}/man/xpce-client.1
lib/swipl-${V}/xpce-${XV}/pl/
lib/swipl-${V}/xpce-${XV}/pl/Makefile
lib/swipl-${V}/xpce-${XV}/pl/swipl.rc
@ -1320,10 +1324,8 @@ lib/swipl-${V}/xpce-${XV}/prolog/boot/pce_portray.pl
lib/swipl-${V}/xpce-${XV}/prolog/boot/pce_principal.pl
lib/swipl-${V}/xpce-${XV}/prolog/boot/pce_realise.pl
lib/swipl-${V}/xpce-${XV}/prolog/contrib/
lib/swipl-${V}/xpce-${XV}/prolog/contrib/README
lib/swipl-${V}/xpce-${XV}/prolog/contrib/contrib.pl
lib/swipl-${V}/xpce-${XV}/prolog/contrib/rubik/
lib/swipl-${V}/xpce-${XV}/prolog/contrib/rubik/README
lib/swipl-${V}/xpce-${XV}/prolog/contrib/rubik/maplist.pl
lib/swipl-${V}/xpce-${XV}/prolog/contrib/rubik/rubik.pl
lib/swipl-${V}/xpce-${XV}/prolog/contrib/rubik/rubikpce.pl
@ -1359,7 +1361,6 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/compatibility/global.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/compatibility/resource.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/compatibility/send.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/attribute.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/behaviour.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/bitmaps/
@ -1388,7 +1389,6 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/prompter.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/proto.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dialog/util.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/
lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/browser.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/emit.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/form.pl
@ -1414,7 +1414,6 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/doc/xml_hierarchy.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dragdict.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/dragdrop.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/draw/
lib/swipl-${V}/xpce-${XV}/prolog/lib/draw/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/draw/align.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/draw/attribute.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/draw/canvas.pl
@ -1448,6 +1447,7 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/html_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/java_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/language_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/latex_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/logtalk_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/man_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/outline_mode.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/emacs/prolog_colour.pl
@ -1473,7 +1473,6 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/gradient.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/gui_tracer.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/help_message.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/http/
lib/swipl-${V}/xpce-${XV}/prolog/lib/http/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/http/html_hierarchy.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/http/html_refman.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/http/html_write.pl
@ -1575,7 +1574,6 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/pce_xref.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/pcedraw.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/persistent_frame.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/plot/
lib/swipl-${V}/xpce-${XV}/prolog/lib/plot/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/plot/axis.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/plot/barchart.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/plot/demo.pl
@ -1608,11 +1606,11 @@ lib/swipl-${V}/xpce-${XV}/prolog/lib/tabular.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/toc_filesystem.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/toolbar.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/README
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/break.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/browse.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/browse_xref.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/clause.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/emacs_debug_modes.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/exceptions.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/gui.pl
lib/swipl-${V}/xpce-${XV}/prolog/lib/trace/icons/