Update to upstream version 4.6.4

Detailed log:
- Update to upstream version 4.6.4
- Fix potential security issue (installation of
  globally-writable files)

PR:		214842
Submitted by:	shoesoft@gmx.net
Approved by:	bsd@volki.at (maintainer)
MFH:		2017Q1
This commit is contained in:
Thomas Zander 2017-01-04 08:01:51 +00:00
parent c05da8252f
commit 644516e6dc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=430544
4 changed files with 125 additions and 92 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= scid
PORTVERSION= 4.6.2
PORTREVISION= 1
PORTVERSION= 4.6.4
CATEGORIES= games databases
MASTER_SITES= SF/${PORTNAME}/Scid/Scid%204.6/
@ -15,7 +14,6 @@ USES= gmake python shebangfix tk:84,85,86 zip
SHEBANG_FILES= tcl/lang/checklangs.tcl \
tcl/lang/propagatelang.tcl \
tcl/lang/removetoken.tcl
WRKSRC= ${WRKDIR}/scid-src
TCL_LIBRARY= -L${LOCALBASE}/lib -ltcl${TCL_SHLIB_VER}
@ -31,8 +29,6 @@ CONFIGURE_ARGS= \
OPTIMIZE="${CXXFLAGS} -fno-rtti -fno-exceptions" \
WARNINGS=""
ALL_TARGET= all strip
post-configure:
@${REINPLACE_CMD} -e 's|g++|${CXX}|g; s|gcc|${CC}|g' \
${WRKSRC}/Makefile \

View file

@ -1,2 +1,3 @@
SHA256 (scid-4.6.2.zip) = 4c04a7ce8fb44ded1af17aacf7950d8aeab4eb962dd76486dbf4a69307743af7
SIZE (scid-4.6.2.zip) = 9768139
TIMESTAMP = 1480141166
SHA256 (scid-4.6.4.zip) = 4fde535051786c0f8b13e6a2a20b306e7ba29e7af7394f5e510aae4f87e223e6
SIZE (scid-4.6.4.zip) = 12248886

View file

@ -1,68 +1,33 @@
--- Makefile.conf.orig 2015-07-05 06:23:10 UTC
--- Makefile.conf.orig 2016-08-01 12:39:16 UTC
+++ Makefile.conf
@@ -156,32 +156,32 @@ toga:
install: $(INSTALL)
@@ -164,7 +164,8 @@ install: $(INSTALL)
install_scid: all_scid
- install -m 755 -d "$(SHAREDIR)"
- install -m 755 -d "$(BINDIR)"
- install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)"
- rm -f "$(BINDIR)/scid"
- @echo "#!/bin/sh" > "$(BINDIR)/scid"
- @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid"
- chmod 755 "$(BINDIR)/scid"
- chmod +x "$(BINDIR)/scid"
- install -m 644 -p scid.eco "$(SHAREDIR)"
- install -m 755 -d "$(SHAREDIR)/books"
- install -m 666 ./books/*.* "$(SHAREDIR)/books/"
- install -m 755 -d "$(SHAREDIR)/bases"
- if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi
- install -m 755 -d "$(SHAREDIR)/html"
- cp -r ./html/* "$(SHAREDIR)/html/"
- install -m 755 -d "$(SHAREDIR)/img/"
- cp -r ./img/* "$(SHAREDIR)/img/"
- install -m 755 -d "$(SHAREDIR)/tcl/"
- cp -r ./tcl/* "$(SHAREDIR)/tcl/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
+ install -m 755 -d "$(DESTDIR)$(BINDIR)"
+ install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
+ rm -f "$(DESTDIR)$(BINDIR)/scid"
+ @echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
+ @echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
+ chmod 755 "$(DESTDIR)$(BINDIR)/scid"
+ chmod +x "$(DESTDIR)$(BINDIR)/scid"
+ install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
+ install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
+ if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
+ cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
+ cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"
+ cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
install -m 755 -d "$(DESTDIR)$(BINDIR)"
- install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
+ install -m 755 $(SCRIPTS) "$(DESTDIR)$(BINDIR)"
+ install -s $(EXECS) "$(DESTDIR)$(BINDIR)"
rm -f "$(DESTDIR)$(BINDIR)/scid"
@echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
@@ -172,7 +173,7 @@ install_scid: all_scid
chmod +x "$(DESTDIR)$(BINDIR)/scid"
install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
- install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
+ install -m 644 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
@@ -185,9 +186,9 @@ install_scid: all_scid
install_engines: all_engines
- install -m 755 -d "$(SHAREDIR)/engines"
- install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid"
- install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
- install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
- install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+ install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+ install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
+ install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
- install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
+ install -s ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
- install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
+ install -s ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
install_mac: all
install -m 755 -d dist/Scid.app/Contents/MacOS
@@ -261,7 +261,7 @@ clean:
### To make the executable files smaller: type "make strip".
#
-strip:
+strip: $(EXECS)
strip $(EXECS)
### To compress scid and executables with gzexe: type "make gzexe".

View file

@ -391,17 +391,29 @@ bin/tkscid
%%DATADIR%%/img/flags/flag_yug.gif
%%DATADIR%%/img/flags/flag_zam.gif
%%DATADIR%%/img/flags/flag_zim.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_25.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_30.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_35.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_40.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_45.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_50.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_55.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_60.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_65.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_70.gif
%%DATADIR%%/img/pieces/Alpha/Alpha_80.gif
%%DATADIR%%/img/pieces/Alpha/alpha2_100.png
%%DATADIR%%/img/pieces/Alpha/alpha2_105.png
%%DATADIR%%/img/pieces/Alpha/alpha2_110.png
%%DATADIR%%/img/pieces/Alpha/alpha2_115.png
%%DATADIR%%/img/pieces/Alpha/alpha2_130.png
%%DATADIR%%/img/pieces/Alpha/alpha2_145.png
%%DATADIR%%/img/pieces/Alpha/alpha2_170.png
%%DATADIR%%/img/pieces/Alpha/alpha2_200.png
%%DATADIR%%/img/pieces/Alpha/alpha2_25.png
%%DATADIR%%/img/pieces/Alpha/alpha2_30.png
%%DATADIR%%/img/pieces/Alpha/alpha2_35.png
%%DATADIR%%/img/pieces/Alpha/alpha2_40.png
%%DATADIR%%/img/pieces/Alpha/alpha2_45.png
%%DATADIR%%/img/pieces/Alpha/alpha2_50.png
%%DATADIR%%/img/pieces/Alpha/alpha2_55.png
%%DATADIR%%/img/pieces/Alpha/alpha2_60.png
%%DATADIR%%/img/pieces/Alpha/alpha2_65.png
%%DATADIR%%/img/pieces/Alpha/alpha2_70.png
%%DATADIR%%/img/pieces/Alpha/alpha2_75.png
%%DATADIR%%/img/pieces/Alpha/alpha2_80.png
%%DATADIR%%/img/pieces/Alpha/alpha2_85.png
%%DATADIR%%/img/pieces/Alpha/alpha2_90.png
%%DATADIR%%/img/pieces/Alpha/alpha2_95.png
%%DATADIR%%/img/pieces/Alpha/copyright
%%DATADIR%%/img/pieces/Bauhaus/Bauhaus_25.gif
%%DATADIR%%/img/pieces/Bauhaus/Bauhaus_30.gif
@ -427,6 +439,29 @@ bin/tkscid
%%DATADIR%%/img/pieces/Blindfold/Blindfold_70.gif
%%DATADIR%%/img/pieces/Blindfold/Blindfold_75.gif
%%DATADIR%%/img/pieces/Blindfold/Blindfold_80.gif
%%DATADIR%%/img/pieces/Cburnett/cburnett_100.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_105.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_110.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_115.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_130.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_145.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_170.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_200.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_25.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_30.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_35.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_40.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_45.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_50.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_55.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_60.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_65.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_70.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_75.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_80.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_85.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_90.png
%%DATADIR%%/img/pieces/Cburnett/cburnett_95.png
%%DATADIR%%/img/pieces/Eboard/Eboard_25.gif
%%DATADIR%%/img/pieces/Eboard/Eboard_30.gif
%%DATADIR%%/img/pieces/Eboard/Eboard_35.gif
@ -449,6 +484,29 @@ bin/tkscid
%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_65.gif
%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_70.gif
%%DATADIR%%/img/pieces/Fantasy2/Fantasy2_80.gif
%%DATADIR%%/img/pieces/Good Companion/good_companion_100.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_105.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_110.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_115.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_130.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_145.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_170.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_200.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_25.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_30.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_35.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_40.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_45.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_50.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_55.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_60.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_65.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_70.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_75.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_80.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_85.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_90.png
%%DATADIR%%/img/pieces/Good Companion/good_companion_95.png
%%DATADIR%%/img/pieces/Kingdom/Kingdom_25.gif
%%DATADIR%%/img/pieces/Kingdom/Kingdom_30.gif
%%DATADIR%%/img/pieces/Kingdom/Kingdom_35.gif
@ -473,19 +531,30 @@ bin/tkscid
%%DATADIR%%/img/pieces/Leipzig/Leipzig_70.gif
%%DATADIR%%/img/pieces/Leipzig/Leipzig_80.gif
%%DATADIR%%/img/pieces/Leipzig/copyright
%%DATADIR%%/img/pieces/Merida/Merida_25.gif
%%DATADIR%%/img/pieces/Merida/Merida_30.gif
%%DATADIR%%/img/pieces/Merida/Merida_35.gif
%%DATADIR%%/img/pieces/Merida/Merida_40.gif
%%DATADIR%%/img/pieces/Merida/Merida_45.gif
%%DATADIR%%/img/pieces/Merida/Merida_50.gif
%%DATADIR%%/img/pieces/Merida/Merida_55.gif
%%DATADIR%%/img/pieces/Merida/Merida_60.gif
%%DATADIR%%/img/pieces/Merida/Merida_65.gif
%%DATADIR%%/img/pieces/Merida/Merida_70.gif
%%DATADIR%%/img/pieces/Merida/Merida_75.gif
%%DATADIR%%/img/pieces/Merida/Merida_80.gif
%%DATADIR%%/img/pieces/Merida/copyright
%%DATADIR%%/img/pieces/Merida/merida2_100.png
%%DATADIR%%/img/pieces/Merida/merida2_105.png
%%DATADIR%%/img/pieces/Merida/merida2_110.png
%%DATADIR%%/img/pieces/Merida/merida2_115.png
%%DATADIR%%/img/pieces/Merida/merida2_130.png
%%DATADIR%%/img/pieces/Merida/merida2_145.png
%%DATADIR%%/img/pieces/Merida/merida2_170.png
%%DATADIR%%/img/pieces/Merida/merida2_200.png
%%DATADIR%%/img/pieces/Merida/merida2_25.png
%%DATADIR%%/img/pieces/Merida/merida2_30.png
%%DATADIR%%/img/pieces/Merida/merida2_35.png
%%DATADIR%%/img/pieces/Merida/merida2_40.png
%%DATADIR%%/img/pieces/Merida/merida2_45.png
%%DATADIR%%/img/pieces/Merida/merida2_50.png
%%DATADIR%%/img/pieces/Merida/merida2_55.png
%%DATADIR%%/img/pieces/Merida/merida2_60.png
%%DATADIR%%/img/pieces/Merida/merida2_65.png
%%DATADIR%%/img/pieces/Merida/merida2_70.png
%%DATADIR%%/img/pieces/Merida/merida2_75.png
%%DATADIR%%/img/pieces/Merida/merida2_80.png
%%DATADIR%%/img/pieces/Merida/merida2_85.png
%%DATADIR%%/img/pieces/Merida/merida2_90.png
%%DATADIR%%/img/pieces/Merida/merida2_95.png
%%DATADIR%%/img/pieces/Merida1/Merida1_100.png
%%DATADIR%%/img/pieces/Merida1/Merida1_114.png
%%DATADIR%%/img/pieces/Merida1/Merida1_25.png
@ -592,6 +661,8 @@ bin/tkscid
%%DATADIR%%/tcl/utils/sound.tcl
%%DATADIR%%/tcl/utils/string.tcl
%%DATADIR%%/tcl/utils/tooltip.tcl
%%DATADIR%%/tcl/utils/tklib_license.terms
%%DATADIR%%/tcl/utils/tklib_tooltip.tcl
%%DATADIR%%/tcl/utils/validate.tcl
%%DATADIR%%/tcl/utils/win.tcl
%%DATADIR%%/tcl/utils.tcl