Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e72119f204064af58f5d35bdcd4b3183078158b9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (e72119f204064af58f5d35bdcd4b3183078158b9)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e72119f204064af58f5d35bdcd4b3183078158b9)
  • Date: Wed, 30 Sep 2020 23:42:45 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/ldb/BUILD | 2 --
libs/ldb/DEPENDS | 16 +++++-----------
libs/ldb/DETAILS | 14 +++++---------
libs/ldb/HISTORY | 8 ++++++++
libs/ldb/INSTALL | 2 --
libs/ldb/PREPARE | 1 -
libs/ldb/PRE_BUILD | 10 ++++------
libs/ldb/ldb-talloc.patch | 11 -----------
libs/tevent/DETAILS | 1 +
libs/tevent/HISTORY | 4 ++++
libs/tevent/PRE_BUILD | 1 +
libs/tevent/patches/fix-public-headers.patch | 14 ++++++++++++++
net/samba4/DEPENDS | 14 ++------------
net/samba4/DETAILS | 2 +-
net/samba4/HISTORY | 5 +++++
net/samba4/PRE_BUILD | 14 ++++++++------
net/samba4/patches/non-glibc-fixes.patch | 24 ++++++++++++++++++++++++
17 files changed, 82 insertions(+), 61 deletions(-)

New commits:
commit e72119f204064af58f5d35bdcd4b3183078158b9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

samba4: Fix build against musl

commit 84fb1c9232b47ba4f7a693531907e0903acc65c1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

samba4: Make ldb and talloc hard dependencies

commit cf06c1fef25874cb0507f6f425524ff09d78482d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ldb 2.2.0

commit 579c8963ce386a7c96ebff144bc0d4e3ee4f67bc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tevent: Fix public headers

diff --git a/libs/ldb/BUILD b/libs/ldb/BUILD
deleted file mode 100755
index 7e35f94..0000000
--- a/libs/ldb/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/source4/lib/$SPELL &&
-default_build
diff --git a/libs/ldb/DEPENDS b/libs/ldb/DEPENDS
index 20a3619..f7bb352 100755
--- a/libs/ldb/DEPENDS
+++ b/libs/ldb/DEPENDS
@@ -2,15 +2,9 @@ depends popt &&
depends talloc &&
depends tdb &&
depends tevent &&
-
-optional_depends 'openldap' \
- '--with-ldap' \
- '--without-ldap' \
+optional_depends lmdb '' --without-ldb-lmdb \
+ 'for lmdb backend support (recommended)' &&
+optional_depends 'openldap' '' '' \
'for Lightweight Directory Access Protocol support' &&
-
-optional_depends 'python' '' '' 'for Python bindings' &&
-
-optional_depends 'sqlite' \
- '--with-sqlite3' \
- '--without-sqlite3' \
- 'for SQLite backend support'
+optional_depends 'python' '' '' 'for Python bindings' &&
+optional_depends 'sqlite' '' '' 'for SQLite backend support'
diff --git a/libs/ldb/DETAILS b/libs/ldb/DETAILS
index 63cb5f7..ab225ad 100755
--- a/libs/ldb/DETAILS
+++ b/libs/ldb/DETAILS
@@ -1,13 +1,9 @@
SPELL=ldb
-if [[ "$LDB_SCM_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=git
-fi
- SOURCE=samba4-git.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
- SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
- SOURCE_IGNORE=volatile
+ VERSION=2.2.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=https://download.samba.org/pub/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:3814078a51d2110eeda291ac859c0027df88475812bd6b5f2ce8f8f50aba9c84faced97c37aa1f45e406783a8df97c60ae778df897bb0e89ba3ac8568acced69
LICENSE[0]=GPL
WEB_SITE=http://ldb.samba.org/
KEYWORDS="database embedded"
diff --git a/libs/ldb/HISTORY b/libs/ldb/HISTORY
index e3320f0..6b099d0 100644
--- a/libs/ldb/HISTORY
+++ b/libs/ldb/HISTORY
@@ -1,3 +1,11 @@
+2020-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.2.0
+ * DEPENDS: updated dependencies and flags
+ * PRE_BUILD: removed bootstrapping code,
+ patched missing dep for tests
+ * INSTALL, PREPARE, BUILD, ldb-talloc.patch:
+ removed, no longer needed
+
2009-04-17 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Share git checkout with samba4 to save bandwidth and disk
space
* DEPENDS: Depends on popt
diff --git a/libs/ldb/INSTALL b/libs/ldb/INSTALL
deleted file mode 100755
index d7cf5d4..0000000
--- a/libs/ldb/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/source4/lib/$SPELL &&
-default_install
diff --git a/libs/ldb/PREPARE b/libs/ldb/PREPARE
deleted file mode 100755
index 5acec8d..0000000
--- a/libs/ldb/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query LDB_SCM_AUTOUPDATE "Automatically add to queue every day?" n
diff --git a/libs/ldb/PRE_BUILD b/libs/ldb/PRE_BUILD
index a54169d..efdc4fd 100755
--- a/libs/ldb/PRE_BUILD
+++ b/libs/ldb/PRE_BUILD
@@ -1,6 +1,4 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/source4/lib/$SPELL &&
-git checkout origin/v4-0-test &&
-patch $SOURCE_DIRECTORY/source4/lib/ldb/external/libevents.m4 \
- $SCRIPT_DIRECTORY/ldb-talloc.patch &&
-NOCONFIGURE="on" ./autogen.sh
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# Add missing dep for tests
+sedit "s!deps='cmocka !&replace !" wscript
diff --git a/libs/ldb/ldb-talloc.patch b/libs/ldb/ldb-talloc.patch
deleted file mode 100644
index 6975df6..0000000
--- a/libs/ldb/ldb-talloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/source4/lib/ldb/external/libevents.m4
b/source4/lib/ldb/external/libevents.m4
-index 6a0e36a..af046f1 100644
---- a/source4/lib/ldb/external/libevents.m4
-+++ b/source4/lib/ldb/external/libevents.m4
-@@ -3,5 +3,5 @@ AC_SUBST(TEVENT_CFLAGS)
- AC_SUBST(TEVENT_LIBS)
-
- AC_CHECK_HEADER(tevent.h,
-- [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"]) ],
-+ [AC_CHECK_LIB(tevent, tevent_context_init, [TEVENT_LIBS="-ltevent"], ,
-ltalloc) ],
- [PKG_CHECK_MODULES(TEVENT, tevent)])
diff --git a/libs/tevent/DETAILS b/libs/tevent/DETAILS
index 1fa974b..1c07772 100755
--- a/libs/tevent/DETAILS
+++ b/libs/tevent/DETAILS
@@ -1,5 +1,6 @@
SPELL=tevent
VERSION=0.10.2
+ PATCHLEVEL=1
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_HASH=sha512:1da8f28898f35daab515892b880d1de601062cc3e2b2570cd62e6913df17b0195a05acb7b484c628cddc0eb8b0cde893105ede3feb32bc5764e7d25684f332ba
# SOURCE2=${SPELL}-${VERSION}.tar.asc
diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY
index ea6b0be..1e92d98 100644
--- a/libs/tevent/HISTORY
+++ b/libs/tevent/HISTORY
@@ -1,3 +1,7 @@
+2020-09-15 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD, patches/fix-public-headers.patch: Fixed public headers
+ * DETAILS: PATCHLEVEL++
+
2020-08-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 0.10.2

diff --git a/libs/tevent/PRE_BUILD b/libs/tevent/PRE_BUILD
index 2f28161..4d80edd 100755
--- a/libs/tevent/PRE_BUILD
+++ b/libs/tevent/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
sed -i '/WAF_BINARY/s|../.||' Makefile
diff --git a/libs/tevent/patches/fix-public-headers.patch
b/libs/tevent/patches/fix-public-headers.patch
new file mode 100644
index 0000000..6d0a712
--- /dev/null
+++ b/libs/tevent/patches/fix-public-headers.patch
@@ -0,0 +1,14 @@
+Origin: Void-Linux
+
+tevent.h needs sys/types.h for pid_t
+
+--- a/tevent.h
++++ b/tevent.h
+@@ -31,5 +31,6 @@
+ #include <stdint.h>
+ #include <talloc.h>
+ #include <sys/time.h>
++#include <sys/types.h>
+ #include <stdbool.h>
+
+ struct tevent_context;
diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index d6e86f3..c312262 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -5,6 +5,8 @@ depends parse-yapp &&
depends popt &&
depends python3 &&
depends tevent &&
+depends talloc &&
+depends ldb &&
if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
depends git
fi &&
@@ -56,18 +58,6 @@ optional_depends SYSTEM-LOGGER
\
"--without-syslog" \
"enables logging though a syslog daemon"

-optional_depends sqlite '' '' 'for SQLite 3.x DB backend support' &&
-
-optional_depends tdb \
- '' \
- '' \
- 'for Trival Database support' &&
-
-optional_depends talloc
\
- ''
\
- ''
\
- 'for a hierarchical pool based memory allocator with
destructors' &&
-
optional_depends avahi \
"--enable-avahi" \
"--disable-avahi" \
diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index 4d090ea..f465697 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
else
VERSION=4.12.7

SOURCE_HASH=sha512:5afb1f24b029e665bb4f6bd7b7cf915243476b09b304942b2105586fa99adc6a19b46b4753ca116e230e5bb7b82e011fbe296c62bc70a8a897e56aece55a7f0b:WORKS_FOR_ME
- SECURITY_PATCH=4
+ SECURITY_PATCH=5
SOURCE=${SPELL/4}-$VERSION.tar.gz
# SOURCE2=${SPELL/4}-${VERSION}.tar.asc
# SOURCE2_IGNORE=signature
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index f01fe5e..ced6f98 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,8 @@
+2020-09-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: made ldb and talloc mandatory
+ * PRE_BUILD, patches/non-glibc-fixes.patch: Fixed build against musl
+ * DETAILS: PATCHLEVEL++
+
2020-09-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.12.7, SECURITY_PATCH++ for CVE-2020-1472

diff --git a/net/samba4/PRE_BUILD b/net/samba4/PRE_BUILD
index 96783b6..eeb8f01 100755
--- a/net/samba4/PRE_BUILD
+++ b/net/samba4/PRE_BUILD
@@ -1,7 +1,9 @@
-if [[ "$SAMBA4_BRANCH" != "scm" ]]; then
- default_pre_build
-else
- default_pre_build &&
- cd $SOURCE_DIRECTORY/source4 &&
- NOCONFIGURE="on" ./autogen.sh
+default_pre_build &&
+
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+
+if [ "scm" = "$SAMBA4_BRANCH" ]; then
+ cd source4 &&
+ NOCONFIGURE="on" ./autogen.sh
fi
diff --git a/net/samba4/patches/non-glibc-fixes.patch
b/net/samba4/patches/non-glibc-fixes.patch
new file mode 100644
index 0000000..4133484
--- /dev/null
+++ b/net/samba4/patches/non-glibc-fixes.patch
@@ -0,0 +1,24 @@
+Fix portability issues affecting non-glibc systems.
+
+---
+ nsswitch/wins.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/nsswitch/wins.c b/nsswitch/wins.c
+index 371ab78d2f87..f2b417f2bb61 100644
+--- a/nsswitch/wins.c
++++ b/nsswitch/wins.c
+@@ -22,6 +22,13 @@
+ #include "nsswitch/winbind_client.h"
+ #include "nsswitch/libwbclient/wbclient.h"
+
++#ifndef NETDB_SUCCESS
++#define NETDB_SUCCESS 0
++#endif
++#ifndef NETDB_INTERNAL
++#define NETDB_INTERNAL -1
++#endif
++
+ #ifdef HAVE_NS_API_H
+
+ #include <ns_daemon.h>


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e72119f204064af58f5d35bdcd4b3183078158b9), Ismael Luceno, 09/30/2020

Archive powered by MHonArc 2.6.24.

Top of Page