Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8d74f40671cc59a6410383a1e40baada567ad71a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8d74f40671cc59a6410383a1e40baada567ad71a)
  • Date: Mon, 21 Aug 2017 16:09:00 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

crypto/encfs/BUILD | 2 +-
crypto/encfs/DEPENDS | 4 ++--
crypto/encfs/DETAILS | 2 +-
crypto/encfs/HISTORY | 7 +++++++
crypto/encfs/PRE_BUILD | 3 +++
crypto/encfs/TRIGGERS | 1 -
crypto/encfs/encfs.gpg |binary
devel/nasm/DETAILS | 4 ++--
devel/nasm/HISTORY | 3 +++
libs/tinyxml/CMakeLists.txt | 25 -------------------------
libs/tinyxml/DETAILS | 12 ++++++------
libs/tinyxml/HISTORY | 5 +++++
libs/tinyxml/PRE_BUILD | 6 ------
libs/tinyxml/PRE_SUB_DEPENDS | 5 -----
libs/tinyxml/SUB_DEPENDS | 5 -----
15 files changed, 30 insertions(+), 54 deletions(-)

New commits:
commit 8d74f40671cc59a6410383a1e40baada567ad71a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

encfs: => 1.9.2

commit 460939b3a2a85a5f440614ad28732fe34c7f170e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

tinyxml: => 5.0.1

commit 45cc656ae9615fd25ec7e8ad6a6ac2b86d9ada26
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

nasm: => 2.13.01

diff --git a/crypto/encfs/BUILD b/crypto/encfs/BUILD
index e8f4e29..026099f 100755
--- a/crypto/encfs/BUILD
+++ b/crypto/encfs/BUILD
@@ -1,2 +1,2 @@
-#autoreconf -if &&
+OPTS+=' -DBUILD_SHARED_LIBS=1 -DINSTALL_LIBENCFS=1' &&
cmake_build
diff --git a/crypto/encfs/DEPENDS b/crypto/encfs/DEPENDS
index 3eda6ab..971dbb9 100755
--- a/crypto/encfs/DEPENDS
+++ b/crypto/encfs/DEPENDS
@@ -2,5 +2,5 @@ depends cmake &&
depends fuse &&
depends SSL &&
depends SYSTEM-LOGGER &&
-depends gettext &&
-depends boost
+optional_depends gettext ' -DENABLE_NLS=1' ' -DENABLE_NLS=0' 'NLS support' &&
+optional_depends tinyxml ' -DUSE_INTERNAL_TINYXML=0' '' 'use external
TinyXML'
diff --git a/crypto/encfs/DETAILS b/crypto/encfs/DETAILS
index 243b2b5..d33555e 100755
--- a/crypto/encfs/DETAILS
+++ b/crypto/encfs/DETAILS
@@ -1,5 +1,5 @@
SPELL=encfs
- VERSION=1.9.1
+ VERSION=1.9.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}

SOURCE_URL[0]=https://github.com/vgough/encfs/releases/download/v${VERSION}/$SOURCE
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 0341b38..559364f 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,10 @@
+2017-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.9.2
+ * encfs.gpg: add 23A02740 Jakob Unterwurzacher
+ * DEPENDS: add tinyxml, delete boost; gettext is optional
+ * TRIGGERS: deleted
+ * PRE_BUILD: added, fix build with libressl
+
2017-05-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9.1
* DETAILS: add gpg checking
diff --git a/crypto/encfs/PRE_BUILD b/crypto/encfs/PRE_BUILD
new file mode 100755
index 0000000..7db12d6
--- /dev/null
+++ b/crypto/encfs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/OPENSSL_VERSION_NUMBER/s/$/ || defined LIBRESSL_VERSION_NUMBER/'
encfs/SSL_Compat.h
diff --git a/crypto/encfs/TRIGGERS b/crypto/encfs/TRIGGERS
deleted file mode 100755
index 1696e74..0000000
--- a/crypto/encfs/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast boost check_self
diff --git a/crypto/encfs/encfs.gpg b/crypto/encfs/encfs.gpg
index b747162..179f23b 100644
Binary files a/crypto/encfs/encfs.gpg and b/crypto/encfs/encfs.gpg differ
diff --git a/devel/nasm/DETAILS b/devel/nasm/DETAILS
index ad53cee..ea32fc2 100755
--- a/devel/nasm/DETAILS
+++ b/devel/nasm/DETAILS
@@ -1,6 +1,6 @@
SPELL=nasm
- VERSION=2.12.02
-
SOURCE_HASH=sha512:a2b4728386aa451160cee00455d5052dbf983866693c5faa9532c57b9d246c27a4f4f07cf7ca77ee7547c1702f685e9bee8f370dd0aedb5b5fa1898f25389b83
+ VERSION=2.13.01
+
SOURCE_HASH=sha512:6561a2efb3ffea77a1a8cd364edf1ecedb2c14e1902469d7c59d743f25ca612529113d1099818abbe0a9f2592f12604f1810855bbdf8dc9de3648094a83529ae
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.nasm.us/
diff --git a/devel/nasm/HISTORY b/devel/nasm/HISTORY
index 6102fba..05416ff 100644
--- a/devel/nasm/HISTORY
+++ b/devel/nasm/HISTORY
@@ -1,3 +1,6 @@
+2017-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.13.01
+
2016-12-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.12.02

diff --git a/libs/tinyxml/CMakeLists.txt b/libs/tinyxml/CMakeLists.txt
deleted file mode 100644
index 000f50c..0000000
--- a/libs/tinyxml/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-project(tinyxml)
-
-set(tinyxmlSources
- tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
- )
-
-set(tinyxmlHeaders
- tinystr.h tinyxml.h
- )
-
-add_definitions(-DTIXML_USE_STL)
-
-add_library(tinyxml SHARED ${tinyxmlSources} )
-add_library(tinyxml_static STATIC ${tinyxmlSources} )
-
-install(TARGETS tinyxml
- DESTINATION lib)
-
-install(TARGETS tinyxml_static
- DESTINATION lib)
-
-install(FILES ${tinyxmlHeaders}
- DESTINATION include)
-
-
diff --git a/libs/tinyxml/DETAILS b/libs/tinyxml/DETAILS
index fd75143..e3c45bd 100755
--- a/libs/tinyxml/DETAILS
+++ b/libs/tinyxml/DETAILS
@@ -1,10 +1,10 @@
SPELL=tinyxml
- VERSION=2.6.2
- SOURCE="${SPELL}_${VERSION//./_}.tar.gz"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:133b5db06131a90ad0c2b39b0063f1c8e65e67288a7e5d67e1f7d9ba32af10dc5dfa0462f9723985ee27debe8f09a10a25d4b5a5aaff2ede979b1cebe8e59d56
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}"
- WEB_SITE="http://sourceforge.net/projects/tinyxml/";
+ VERSION=5.0.1
+
SOURCE_HASH=sha512:a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}2-$VERSION"
+ WEB_SITE=https://github.com/leethomason/tinyxml2
+ SOURCE_URL[0]=$WEB_SITE/archive/$VERSION.tar.gz
LICENSE[0]=ZLIB
ENTERED=20110306
SHORT="a simple, small, minimal, C++ XML parser"
diff --git a/libs/tinyxml/HISTORY b/libs/tinyxml/HISTORY
index bc1a60b..a9f12b4 100644
--- a/libs/tinyxml/HISTORY
+++ b/libs/tinyxml/HISTORY
@@ -1,3 +1,8 @@
+2017-08-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.0.1
+ now at github
+ * PRE_BUILD CMakeLists.txt PRE_SUB_DEPENDS SUB_DEPENDS: deleted
+
2015-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* SUB_DEPENDS, PRE_SUB_DEPENDS: add sub dependency on STL support

diff --git a/libs/tinyxml/PRE_BUILD b/libs/tinyxml/PRE_BUILD
deleted file mode 100755
index 81426d6..0000000
--- a/libs/tinyxml/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-cp ${SCRIPT_DIRECTORY}/CMakeLists.txt . &&
-if [[ "${TINYXML_STL}" == "y" ]]; then
- sed -i '1i#define TIXML_USE_STL=YES' tinyxml.h
-fi
diff --git a/libs/tinyxml/PRE_SUB_DEPENDS b/libs/tinyxml/PRE_SUB_DEPENDS
deleted file mode 100755
index e84eb96..0000000
--- a/libs/tinyxml/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- STL) [[ TINYXML_STL == "y" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/libs/tinyxml/SUB_DEPENDS b/libs/tinyxml/SUB_DEPENDS
deleted file mode 100755
index 3348069..0000000
--- a/libs/tinyxml/SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- STL) config_query TINYXML_STL "Build with STL support?" "y" ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8d74f40671cc59a6410383a1e40baada567ad71a), Treeve Jelbert, 08/21/2017

Archive powered by MHonArc 2.6.24.

Top of Page