Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3602ff4607c6d3c675a0adbdc50a27b4b17d33e1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3602ff4607c6d3c675a0adbdc50a27b4b17d33e1)
  • Date: Tue, 8 Apr 2014 10:43:09 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 +
archive/upx/0001-use-system-ucl.patch | 29 ++++++++++++++
archive/upx/BUILD | 17 +-------
archive/upx/DEPENDS | 3 -
archive/upx/DETAILS | 13 ++----
archive/upx/HISTORY | 6 ++
archive/upx/INSTALL | 2
archive/upx/PRE_BUILD | 9 +---
crypto/openssl/DETAILS | 4 -
crypto/openssl/HISTORY | 4 +
crypto/openssl/openssl.gpg |binary
libs/cdk/DETAILS | 4 -
libs/cdk/HISTORY | 3 +
libs/libtcod/0001-fix-installation-destination.patch | 39
+++++++++++++++++++
libs/libtcod/BUILD | 2
libs/libtcod/DEPENDS | 2
libs/libtcod/DETAILS | 16 +++++++
libs/libtcod/HISTORY | 4 +
libs/libtcod/INSTALL | 7 +++
libs/libtcod/PRE_BUILD | 4 +
libs/newt/DETAILS | 4 -
libs/newt/HISTORY | 3 +
22 files changed, 143 insertions(+), 35 deletions(-)

New commits:
commit 3602ff4607c6d3c675a0adbdc50a27b4b17d33e1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/openssl: version 1.0.1g, fixes CVE-2014-0160

commit 20a705ad8adb3dd50a48bc7c88f6a2d436ffc939
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/cdk: version 5.0-20140118

commit e883b00c2fcfb100e48c66da0967de307adf63cd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/newt: version 0.52.17

commit fe32572015ff8c2d0d034cc29f5c5cc288694474
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libtcod: new spell, a library for developing roguelike games

commit 78d2a2a4a181dac2795744b9451a67c029ec45dd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

archive/upx: version 3.91

diff --git a/ChangeLog b/ChangeLog
index 98f100d..fb46b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libtcod: new spell, a library for developing roguelike games
+
2014-04-05 Treeve Jelbert <treeve AT sourcemage.org>
* gnu.gpg: add D7E69871 "Daiki Ueno <ueno AT unixuser.org>

diff --git a/archive/upx/0001-use-system-ucl.patch
b/archive/upx/0001-use-system-ucl.patch
new file mode 100644
index 0000000..e80e848
--- /dev/null
+++ b/archive/upx/0001-use-system-ucl.patch
@@ -0,0 +1,29 @@
+From 89fb169f3d2c9bf742eba9087ce6e8ead3548652 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 7 Apr 2014 18:35:00 +0200
+Subject: [PATCH] use system ucl
+
+---
+ src/Makefile | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5375f81..83c0583 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,11 +52,7 @@ objext ?= .o
+ upx_SOURCES := $(sort $(wildcard $(srcdir)/*.cpp))
+ upx_OBJECTS := $(notdir $(upx_SOURCES:.cpp=$(objext)))
+
+-# we need UCL and zlib - you can set envvar UPX_UCLDIR
+-ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),)
+-INCLUDES += -I$(UPX_UCLDIR)/include
+-LIBS += $(addprefix -L,$(dir $(wildcard $(UPX_UCLDIR)/libucl$(libext)
$(UPX_UCLDIR)/src/.libs/libucl$(libext))))
+-endif
++INCLUDE += -I$(INSTALL_ROOT)/usr/include/ucl
+ LIBS += -lucl -lz
+ # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK
+ include $(top_srcdir)/src/stub/src/c/Makevars.lzma
+--
+1.9.0
+
diff --git a/archive/upx/BUILD b/archive/upx/BUILD
index 0d645b9..d0ad834 100755
--- a/archive/upx/BUILD
+++ b/archive/upx/BUILD
@@ -1,16 +1,7 @@
-cd $SOURCE_DIRECTORY &&
-message "Compiling UPX" &&
-cd src &&
-sedit "s!# configuration section!UCLDIR=${SOURCE_DIRECTORY2}!" Makefile &&
-sedit "s/CC_COMPILE = \$(CC) \$(CCARCH) \$(DEFS) \$(EXTRA_DEFS)
\$(INCLUDES) \$(EXTRA_INCLUDES) \$(CFLAGS) \$(EXTRA_CFLAGS)
\$(CFLAGS_OUTPUT) -c \$(CC_SRC)/CC_COMPILE = \$(CC) \$(DEFS)
\$(EXTRA_DEFS) \$(INCLUDES) \$(EXTRA_INCLUDES) ${CFLAGS} \$(EXTRA_CFLAGS)
\$(CFLAGS_OUTPUT) -c \$(CC_SRC)/" Makefile.bld &&
-sedit "s/CXX_COMPILE = \$(CXX) \$(CXXARCH) \$(DEFS) \$(EXTRA_DEFS)
\$(INCLUDES) \$(EXTRA_INCLUDES) \$(CXXFLAGS) \$(EXTRA_CXXFLAGS)
\$(CXXFLAGS_OUTPUT) -c \$(CXX_SRC)/CXX_COMPILE = \$(CXX) \$(DEFS)
\$(EXTRA_DEFS) \$(INCLUDES) \$(EXTRA_INCLUDES) ${CXXFLAGS} \$(EXTRA_CXXFLAGS)
\$(CXXFLAGS_OUTPUT) -c \$(CXX_SRC)/" Makefile.bld &&
-make target=linux &&
+cd $SOURCE_DIRECTORY/src &&
+CXX=${CXX} default_build_make &&

if spell_installed perl; then
- message "Compiling documentation" &&
- cd $SOURCE_DIRECTORY && cd doc &&
- make
+ cd $SOURCE_DIRECTORY/doc &&
+ make upx.1
fi
-
-#Deleting useless SOURCE_DIRECTORY2
-rm -rf ${SOURCE_DIRECTORY2}
diff --git a/archive/upx/DEPENDS b/archive/upx/DEPENDS
index 11a7242..1116125 100755
--- a/archive/upx/DEPENDS
+++ b/archive/upx/DEPENDS
@@ -1,2 +1,3 @@
-depends ucl &&
+depends -sub CXX gcc &&
+depends ucl &&
optional_depends "perl" "" "" "Needed to build the documentation"
diff --git a/archive/upx/DETAILS b/archive/upx/DETAILS
index a8ad187..8a8d8e8 100755
--- a/archive/upx/DETAILS
+++ b/archive/upx/DETAILS
@@ -1,12 +1,9 @@
SPELL=upx
- VERSION=1.25
- SOURCE=$SPELL-$VERSION-src.tar.gz
- SOURCE2=ucl-1.03.tar.gz
- SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
- SOURCE2_URL[0]=http://www.oberhumer.com/opensource/ucl/download/$SOURCE2
-
SOURCE_HASH=sha512:4d082bbf825ca80715d04ecdee119662376d402aa21fa31000d5587562403b13033054dbe3c76207b3af0878d1fdd6f58599dc3eb7798925d7d6899036997a58
-
SOURCE2_HASH=sha512:7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+ VERSION=3.91
+ SOURCE=$SPELL-$VERSION-src.tar.bz2
+ SOURCE_URL[0]=http://upx.sourceforge.net/download/${SOURCE}
+
SOURCE_HASH=sha512:7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}-src
SOURCE_DIRECTORY2=${BUILD_DIRECTORY}/ucl-1.03
WEB_SITE=http://upx.sourceforge.net/
ENTERED=20050330
diff --git a/archive/upx/HISTORY b/archive/upx/HISTORY
index f08776b..c6638c7 100644
--- a/archive/upx/HISTORY
+++ b/archive/upx/HISTORY
@@ -1,3 +1,9 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.91, remove SOURCE2
+ * BUILD, INSTALL: adapt to current Makefile
+ * PRE_BUILD, 0001-use-system-ucl.patch: use system ucl
+ * DEPENDS: add dependency on gcc and ucl
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/archive/upx/INSTALL b/archive/upx/INSTALL
index 476ac2a..06f9418 100755
--- a/archive/upx/INSTALL
+++ b/archive/upx/INSTALL
@@ -1,4 +1,4 @@
-cp ${SOURCE_DIRECTORY}/src/upx ${INSTALL_ROOT}/usr/bin/upx
+install -m755 ${SOURCE_DIRECTORY}/src/upx.out ${INSTALL_ROOT}/usr/bin/ &&

if spell_installed perl; then
cp ${SOURCE_DIRECTORY}/doc/upx.1 ${INSTALL_ROOT}/usr/share/man/man1/
diff --git a/archive/upx/PRE_BUILD b/archive/upx/PRE_BUILD
index 6f98591..7d32ad4 100755
--- a/archive/upx/PRE_BUILD
+++ b/archive/upx/PRE_BUILD
@@ -1,7 +1,4 @@
-mk_source_dir ${SOURCE_DIRECTORY} &&
-cd ${BUILD_DIRECTORY} &&
-unpack_file &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&

-mk_source_dir ${SOURCE_DIRECTORY2} &&
-cd ${BUILD_DIRECTORY} &&
-unpack_file 2
+patch -p1 < $SPELL_DIRECTORY/0001-use-system-ucl.patch
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index c867d4e..518f3e0 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -10,8 +10,8 @@ case $OPENSSL_BRANCH in
SECURITY_PATCH=20
;;
1.0)
- VERSION=1.0.0l
- SECURITY_PATCH=21
+ VERSION=1.0.1g
+ SECURITY_PATCH=22
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index a39ecbe..7d7f8c9 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,7 @@
+2014-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.0.1g, SECURITY_PATCH=22, CVE-2014-0160
+ * openssl.gpg: import key FA40E9E2
+
2014-01-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0l, SECURITY_PATCH=21

diff --git a/crypto/openssl/openssl.gpg b/crypto/openssl/openssl.gpg
index e01c054..5b26b13 100644
Binary files a/crypto/openssl/openssl.gpg and b/crypto/openssl/openssl.gpg
differ
diff --git a/libs/cdk/DETAILS b/libs/cdk/DETAILS
index ac94b7b..a5c7d3e 100755
--- a/libs/cdk/DETAILS
+++ b/libs/cdk/DETAILS
@@ -1,6 +1,6 @@
SPELL="cdk"
- VERSION="5.0-20120323"
-
SOURCE_HASH=sha512:bd3a3f7a79eeea23a2e79aefbe689f6b89c91108f3c1cc3e205c02021fbd39139c67da45f5c8c219d85dd57058725be1a12dce37cfaf767d756f8d56761f750f
+ VERSION="5.0-20140118"
+
SOURCE_HASH=sha512:a38bff8c39ee1a25aba7b1ab864ee03f9d53f9594994ab26d6d8272b97c5896d19c4f0695db987b1fd347c2bdd5d0c17232fef72042260d1aff0c77e14caaca4
SOURCE="${SPELL}-${VERSION}.tgz"
SOURCE_URL[0]="ftp://invisible-island.net/cdk/$SOURCE";
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.tgz}"
diff --git a/libs/cdk/HISTORY b/libs/cdk/HISTORY
index 958acfb..436f767 100644
--- a/libs/cdk/HISTORY
+++ b/libs/cdk/HISTORY
@@ -1,3 +1,6 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.0-20140118
+
2012-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.0-20120323
* INSTALL: make cdk5-config executable
diff --git a/libs/libtcod/0001-fix-installation-destination.patch
b/libs/libtcod/0001-fix-installation-destination.patch
new file mode 100644
index 0000000..9b125a0
--- /dev/null
+++ b/libs/libtcod/0001-fix-installation-destination.patch
@@ -0,0 +1,39 @@
+From 28f7c93390c97a7af648d643fc96d344eeb0252a Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 7 Apr 2014 19:19:39 +0200
+Subject: [PATCH] fix installation destination
+
+---
+ CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a573528..5dea975 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ include_directories(include)
+ find_package(OpenGL REQUIRED)
+
+ SET(ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+-SET(INSTALL_DIR ${CMAKE_CURRENT_SOURCE_DIR})
++SET(INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
+ SET(DEPENDENCY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dependencies)
+ SET(GUI_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/gui)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index c882ded..14bb952 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -85,6 +85,6 @@ ENDIF()
+
+ #${LIBTCOD_CPP_NAME} is empty on non-linux platforms
+ INSTALL(TARGETS ${LIBTCOD_NAME} ${LIBTCOD_GUI_NAME} ${LIBTCOD_CPP_NAME}
+- RUNTIME DESTINATION ${INSTALL_DIR}
+- LIBRARY DESTINATION ${INSTALL_DIR}
++ RUNTIME DESTINATION ${INSTALL_DIR}/bin
++ LIBRARY DESTINATION ${INSTALL_DIR}/lib
+ )
+--
+1.9.0
+
diff --git a/libs/libtcod/BUILD b/libs/libtcod/BUILD
new file mode 100755
index 0000000..2a137fa
--- /dev/null
+++ b/libs/libtcod/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" -DLIBTCOD_SAMPLES=off" &&
+cmake_build
diff --git a/libs/libtcod/DEPENDS b/libs/libtcod/DEPENDS
new file mode 100755
index 0000000..7c6f202
--- /dev/null
+++ b/libs/libtcod/DEPENDS
@@ -0,0 +1,2 @@
+depends sdl &&
+depends upx
diff --git a/libs/libtcod/DETAILS b/libs/libtcod/DETAILS
new file mode 100755
index 0000000..bbfcb10
--- /dev/null
+++ b/libs/libtcod/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=libtcod
+ VERSION=1.5.1
+ VERSION_HASH="d56ffc19afb9"
+ SOURCE="libtcod-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=https://bitbucket.org/jice/${SPELL}/get/${VERSION}.tar.bz2
+
SOURCE_HASH=sha512:0db7196b01838b5301f46fff42b62aa42f4835e2647a5aca1b5ae55885f43d392bb7035c5af26be3d08ac439a7d55d18edb20b1ef5e7bd8eb1e0fd1428f88c69
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/jice-${SPELL}-${VERSION_HASH}"
+ WEB_SITE="http://doryen.eptalys.net/libtcod/";
+ LICENSE[0]=BSD
+ ENTERED=20140407
+ SHORT="a free, fast, portable and uncomplicated API for roguelike
games"
+cat << EOF
+libtcod, a.k.a. “The Doryen Library”, is a free, fast, portable and
+uncomplicated API for roguelike developpers providing an advanced true color
+console, input, and lots of other utilities frequently used in roguelikes.
+EOF
diff --git a/libs/libtcod/HISTORY b/libs/libtcod/HISTORY
new file mode 100644
index 0000000..4cc134f
--- /dev/null
+++ b/libs/libtcod/HISTORY
@@ -0,0 +1,4 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * 0001-fix-installation-destination.patch, BUILD, DEPENDS,
+ DETAILS, PRE_BUILD, INSTALL: spell created
+
diff --git a/libs/libtcod/INSTALL b/libs/libtcod/INSTALL
new file mode 100755
index 0000000..fd9a1b9
--- /dev/null
+++ b/libs/libtcod/INSTALL
@@ -0,0 +1,7 @@
+default_install &&
+
+mkdir -p ${INSTALL_ROOT}/usr/include/tcod &&
+install -m644 $SOURCE_DIRECTORY/include/*.{h,hpp}
${INSTALL_ROOT}/usr/include/tcod &&
+
+mkdir -p ${INSTALL_ROOT}/usr/share/libtcod &&
+install -m644 $SOURCE_DIRECTORY/terminal.png $INSTALL_ROOT/usr/share/libtcod/
diff --git a/libs/libtcod/PRE_BUILD b/libs/libtcod/PRE_BUILD
new file mode 100755
index 0000000..e803469
--- /dev/null
+++ b/libs/libtcod/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/0001-fix-installation-destination.patch
diff --git a/libs/newt/DETAILS b/libs/newt/DETAILS
index 9900765..ab9bc7b 100755
--- a/libs/newt/DETAILS
+++ b/libs/newt/DETAILS
@@ -1,6 +1,6 @@
SPELL=newt
- VERSION=0.52.13
-
SOURCE_HASH=sha512:fb4066dc76f760edd1ce5bb215916f923337504b874029618193d5e526f35d638dffaf1774c5dfaa1b178579c008625bbead4088dcd58f2e5fac12311334eff9
+ VERSION=0.52.17
+
SOURCE_HASH=sha512:ff96180e4501af88609a647b7737e2309e04cf8c7f1e93bf338c1d133ca49fdd20acfc872f8a91d8546a4f1c7a7d2e540bf3d245ff85eaf85a0414cbc7702b41
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://fedorahosted.org/releases/n/e/${SPELL}/${SOURCE}
diff --git a/libs/newt/HISTORY b/libs/newt/HISTORY
index 415d1e4..4fe457a 100644
--- a/libs/newt/HISTORY
+++ b/libs/newt/HISTORY
@@ -1,3 +1,6 @@
+2014-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.52.17
+
2011-08-05 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 0.52.13




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3602ff4607c6d3c675a0adbdc50a27b4b17d33e1), Florian Franzmann, 04/08/2014

Archive powered by MHonArc 2.6.24.

Top of Page