Skip to Content.
Sympa Menu

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

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 (e6538e5d3a401179ca8e3a69da0cca968c521f04)
  • Date: Tue, 15 Jan 2019 14:58:28 +0000

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

libs/talloc/BUILD | 2 --
libs/talloc/CONFIGURE | 2 --
libs/talloc/DEPENDS | 2 +-
libs/talloc/DETAILS | 4 ++--
libs/talloc/HISTORY | 7 +++++++
libs/talloc/PRE_BUILD | 4 +---
libs/tevent/DEPENDS | 1 +
libs/tevent/DETAILS | 4 ++--
libs/tevent/HISTORY | 5 +++++
libs/tevent/PRE_BUILD | 3 +++
10 files changed, 22 insertions(+), 12 deletions(-)

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

tevent - fix build

commit 5a9b17d147d2d2548fce812b1c9bb1af2c2a2cfa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

talloc: => 2.1.15

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

tevent: => 0.9.38

diff --git a/libs/talloc/BUILD b/libs/talloc/BUILD
index 2b54fe4..eb50e9e 100755
--- a/libs/talloc/BUILD
+++ b/libs/talloc/BUILD
@@ -1,5 +1,3 @@
-OPTS="$TALLOC_OPTS $OPTS" &&
-
cd $SOURCE_DIRECTORY &&
if [[ "$TALLOC_BRANCH" == "scm" ]]
then
diff --git a/libs/talloc/CONFIGURE b/libs/talloc/CONFIGURE
deleted file mode 100755
index 98eecad..0000000
--- a/libs/talloc/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query_option TALLOC_OPTS "Build pytalloc module?" y \
- "" "--disable-python"
diff --git a/libs/talloc/DEPENDS b/libs/talloc/DEPENDS
index 51409c5..8aaf08f 100755
--- a/libs/talloc/DEPENDS
+++ b/libs/talloc/DEPENDS
@@ -1,4 +1,4 @@
-depends python &&
+depends python3 &&
depends -sub 'SSL' ${HTTP_DL_HANDLER} &&

optional_depends libbsd "" "" "to use secure strlcpy and strlcat" &&
diff --git a/libs/talloc/DETAILS b/libs/talloc/DETAILS
index 10033e2..1a974be 100755
--- a/libs/talloc/DETAILS
+++ b/libs/talloc/DETAILS
@@ -8,8 +8,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
SOURCE_IGNORE=volatile
else
- VERSION=2.1.8
-
SOURCE_HASH=sha512:8e905c369c74387de21e8d3126cda322a4df2bdb056d3a404de20587e009f63eb16ac673976b43dd399838609aabfea49c38f628adebed19ae7362ed4f0cd121
+ VERSION=2.1.15
+
SOURCE_HASH=sha512:41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=${SOURCE/.gz/}.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index e6318386..5d878c0 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,10 @@
+2019-01-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.1.15
+ * PRE_BUILD: fix waf
+ * BUILD: remove obsolete option
+ * DEPENDS: add python3
+ * CONFIGURE: delete
+
2016-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.1.8
* PRE_BUILD, 0001-do-not-build-manpage.patch: only build manpage if
diff --git a/libs/talloc/PRE_BUILD b/libs/talloc/PRE_BUILD
index 3bcf858..61d72b4 100755
--- a/libs/talloc/PRE_BUILD
+++ b/libs/talloc/PRE_BUILD
@@ -10,6 +10,4 @@ cd "${SOURCE_DIRECTORY}" &&
if ! is_depends_enabled $SPELL docbook-xsl; then
patch -p1 < "${SPELL_DIRECTORY}/0001-do-not-build-manpage.patch"
fi &&
-
-# XXX doesn't work with python3
-sedit '1s/$/2/' buildtools/bin/waf
+sed -i '/WAF_BINARY/s|../.||' Makefile
diff --git a/libs/tevent/DEPENDS b/libs/tevent/DEPENDS
index c659b31..97b2325 100755
--- a/libs/tevent/DEPENDS
+++ b/libs/tevent/DEPENDS
@@ -1,2 +1,3 @@
+depends python3 &&
depends talloc &&
depends -sub 'SSL' ${HTTP_DL_HANDLER}
diff --git a/libs/tevent/DETAILS b/libs/tevent/DETAILS
index 728d839..f60ca87 100755
--- a/libs/tevent/DETAILS
+++ b/libs/tevent/DETAILS
@@ -1,7 +1,7 @@
SPELL=tevent
- VERSION=0.9.31
+ VERSION=0.9.38
SOURCE=${SPELL}-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:048e37a7f5d3b8e948215fdb909c9b6e94b915c9d4978a8e18c73c9d27d5b1f179c10d19ec90325f8250e7c177c28231ad116a2975caaa43312c383e75517258
+
SOURCE_HASH=sha512:f475a7b7c261368bd641992c8f657c081bbbe783535ff435a7b68f7749d0e5873d57d05cf6ce80a28ccc9f11033022d28e9ae357b03854109c2c279a003d2035
# SOURCE2=${SPELL}-${VERSION}.tar.asc
# SOURCE2_IGNORE=signature
SOURCE_URL[0]=https://www.samba.org/ftp/tevent/$SOURCE
diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY
index dc96778..a95dcca 100644
--- a/libs/tevent/HISTORY
+++ b/libs/tevent/HISTORY
@@ -1,3 +1,8 @@
+2019-01-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.38
+ * PRE_BUILD: added, fix WAF usage
+ * DEPENDS: add python3
+
2017-05-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.31

diff --git a/libs/tevent/PRE_BUILD b/libs/tevent/PRE_BUILD
new file mode 100755
index 0000000..2f28161
--- /dev/null
+++ b/libs/tevent/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sed -i '/WAF_BINARY/s|../.||' Makefile



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e6538e5d3a401179ca8e3a69da0cca968c521f04), Treeve Jelbert, 01/15/2019

Archive powered by MHonArc 2.6.24.

Top of Page