Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c2f8dd588da955ebaefbee89a1962a0df7786dcd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c2f8dd588da955ebaefbee89a1962a0df7786dcd)
  • Date: Fri, 8 Feb 2013 00:32:47 -0600

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

ChangeLog | 6 +
dev/null |binary
libs/tevent/BUILD | 2
libs/tevent/DEPENDS | 1
libs/tevent/DETAILS | 17 ++---
libs/tevent/HISTORY | 7 ++
libs/tevent/INSTALL | 2
libs/tevent/PREPARE | 2
libs/tevent/PRE_BUILD | 12 ++-
net/samba4/BUILD | 9 +-
net/samba4/CONFIGURE | 18 ++---
net/samba4/DEPENDS | 106
++++++++++++++++++++------------
net/samba4/DETAILS | 13 ++-
net/samba4/HISTORY | 14 ++++
net/samba4/PRE_BUILD | 13 +++
net/samba4/samba-4.0.0alpha7.tar.gz.sig | 0
samba.gpg |binary
17 files changed, 144 insertions(+), 78 deletions(-)

New commits:
commit c2f8dd588da955ebaefbee89a1962a0df7786dcd
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

samba4: stable => 4.0.2
updated SOURCE_URLs
changed to upstream gpg verification

* CONFIGURE: added config query for AD DC and updated ADS query
added query for winbind, swat, quotas, utmp, automount, and
dnsupdate
* DEPENDS: added optional_depends acl (forced for AD DC), krb5, openldap
avahi, sendfile, libaio, dmapi, libxlsst, docbook-xsl
re-enabled optional_depends linux-pam, cups, SYSTEM-LOGGER
removed readline, sqlite configure flags (no-longer explicitly
listed, but still optional)
* PRE_BUILD: uncompress gz file to verify tarball
* BUILD: added CONFIGURE options, fix build for stable

commit b4219fcffa902db3309e2bb738cf9a290b7002b5
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

tevent: remove git version, add stable 0.9.17
git version removed because it checks out entire samba4 and it was broken
* DEPENDS: removed depends git
* PRE_BUILD: uncompress gz to verify tarball
* BUILD, INSTALL, PREPARE: removed

commit 05634a3e9178228c2189307ba2be3514ff140259
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

samba.gpg: added with keys 6568B7EA "Samba Distribution Verification Key
<samba-bugs AT samba.org>" and 13084025 "Samba Library Distribution Key
<samba-bugs AT samba.org>"
for samba and related spells

also added to changelog the key I added to kernel.gpg yesterday

diff --git a/ChangeLog b/ChangeLog
index 3ab4b52..7e975ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * samba.gpg: added with keys 6568B7EA "Samba Distribution Verification
+ Key <samba-bugs AT samba.org>" and 13084025 "Samba Library Distribution
+ Key <samba-bugs AT samba.org>"
+ * kernel.gpg: added key 1DCF2659 "Marcel Holtmann
<marcel AT holtmann.org>"
+
2013-02-08 Ladislav Hagara <hgr AT vabo.cz>
* shell-term-fm/st: new spell, simple terminal

diff --git a/libs/tevent/BUILD b/libs/tevent/BUILD
deleted file mode 100755
index f4182d2..0000000
--- a/libs/tevent/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-default_build
diff --git a/libs/tevent/DEPENDS b/libs/tevent/DEPENDS
index 5378411..db7cf51 100755
--- a/libs/tevent/DEPENDS
+++ b/libs/tevent/DEPENDS
@@ -1,2 +1 @@
-depends git &&
depends talloc
diff --git a/libs/tevent/DETAILS b/libs/tevent/DETAILS
index 0bd3edf..d3b4fa6 100755
--- a/libs/tevent/DETAILS
+++ b/libs/tevent/DETAILS
@@ -1,13 +1,12 @@
SPELL=tevent
-if [[ "$TEVENT_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=0.9.17
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE2=${SPELL}-${VERSION}.tar.asc
+ SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://www.samba.org/ftp/tevent/$SOURCE
+ SOURCE2_URL[0]=http://www.samba.org/ftp/tevent/$SOURCE2
+ SOURCE_GPG=samba.gpg:$SOURCE2:UPSTREAM_KEY
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://ldb.samba.org/
KEYWORDS=""
diff --git a/libs/tevent/HISTORY b/libs/tevent/HISTORY
index 64c1675..95eec09 100644
--- a/libs/tevent/HISTORY
+++ b/libs/tevent/HISTORY
@@ -1,3 +1,10 @@
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: remove git version, add stable 0.9.17
+ git version removed because it checks out entire samba4 and it was
broken
+ * DEPENDS: removed depends git
+ * PRE_BUILD: uncompress gz to verify tarball
+ * BUILD, INSTALL, PREPARE: removed
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: depends on git
* DETAILS, PREPARE: Use prepare_select_branch
diff --git a/libs/tevent/INSTALL b/libs/tevent/INSTALL
deleted file mode 100755
index e85c9fd..0000000
--- a/libs/tevent/INSTALL
+++ /dev/null
@@ -1,2 +0,0 @@
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-default_install
diff --git a/libs/tevent/PREPARE b/libs/tevent/PREPARE
deleted file mode 100755
index f8b7d7e..0000000
--- a/libs/tevent/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
diff --git a/libs/tevent/PRE_BUILD b/libs/tevent/PRE_BUILD
index 008adea..d2974e5 100755
--- a/libs/tevent/PRE_BUILD
+++ b/libs/tevent/PRE_BUILD
@@ -1,4 +1,8 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/lib/$SPELL &&
-git checkout origin/v4-0-test &&
-NOCONFIGURE="on" ./autogen.sh
+message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+SOURCE_ORI=${SOURCE}
+SOURCE=${SOURCE/.gz}
+gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE
+default_pre_build
+message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}"
+rm $SOURCE
+SOURCE=${SOURCE_ORI}
diff --git a/net/samba4/BUILD b/net/samba4/BUILD
index 2b4fced..d1b48b0 100755
--- a/net/samba4/BUILD
+++ b/net/samba4/BUILD
@@ -1,8 +1,11 @@
OPTS="--enable-fhs \
- $SAMBA4_PTHREADS \
+ $SAMBA4 \
$OPTS" &&

-cd $SOURCE_DIRECTORY/source4 &&
-make_single &&
+if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
+ cd $SOURCE_DIRECTORY/source4 &&
+ make_single
+fi &&
+
default_build &&
make_normal
diff --git a/net/samba4/CONFIGURE b/net/samba4/CONFIGURE
index e2b99da..d7a0fca 100755
--- a/net/samba4/CONFIGURE
+++ b/net/samba4/CONFIGURE
@@ -1,11 +1,9 @@
-#if spell_ok openldap &&
-# spell_ok krb5; then
-# config_query SAMBA_AD \
-# "Enable Active Directory Support ?\n(Requires openldap and krb5)" y
-#else
-# config_query SAMBA_AD \
-# "Enable Active Directory Support ?\n(Requires openldap and krb5)" n
-#fi
+config_query SAMBA_AD "Enable Active Directory Support?" n
+config_query SAMBA_ADDC "Enable Active Directory Domain Controller support?"
n

-config_query_option SAMBA4_PTHREADS 'Enable POSIX threads?' n \
- '--with-pthreads' '--without-pthreads'
+config_query_option SAMBA4 "Build with winbind support (allows Windows NT
domain users to appear as UNIX users?" y "--with-winbind" "--without-winbind"
+config_query_option SAMBA4 "Build the Samba Web Administration Tool (SWAT)?"
n "--with-swat" "--without-swat"
+config_query_option SAMBA4 "Enable quotas support?" y "--with-quotas"
"--without-quotas"
+config_query_option SAMBA4 "Build with utmp support?" y "--with-utmp"
"--without-utmp"
+config_query_option SAMBA4 "Build with automount support?" y
"--with-automount" "--without-automount"
+config_query_option SAMBA4 "Build with dnsupdate support?" y
"--with-dnsupdate" "--without-dnsupdate"
diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index 9a23884..8fabf65 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -1,52 +1,57 @@
-depends e2fsprogs &&
-depends libcap &&
-depends popt "--without-included-popt" &&
-depends python &&
-depends tevent &&
-
+depends e2fsprogs &&
+depends libcap &&
+depends popt &&
+depends PYTHON &&
+depends tevent &&
if [[ "$SAMBA4_BRANCH" == "scm" ]]; then
depends git
fi &&

-#if [[ "$SAMBA_AD" == "y" ]]; then
-# depends openldap "--with-ldap" &&
-# depends krb5 "--with-krb5 --with-ads"
-#else
-# optional_depends openldap \
-# "--with-ldap" \
-# "--without-ldap" \
-# "for LDAP support"
-#fi &&
-
-optional_depends readline \
- "--with-readline" \
- "--without-readline" \
- "for readline support" &&
-
-#optional_depends linux-pam \
-# "--with-pam --with-pam_smbpass" \
-# "--without-pam" \
-# "To enable PAM authentication" &&
+if [[ "$SAMBA_ADDC" == "y" ]]; then
+ depends acl "--with-acl-support"
+else
+ optional_depends acl \
+ "--with-acl-support" \
+ "--without-acl-support" \
+ "for file system access control lists support" &&
+ optional_depends krb5 \
+ "--with-system-mitkrb5 --without-ad-dc" \
+ "--without-ad-dc" \
+ "to use system krb5"
+fi &&
+
+if [[ "$SAMBA_AD" == "y" ]]; then
+ depends openldap "--with-ldap --with-ads"
+else
+ optional_depends openldap \
+ "--with-ldap" \
+ "--without-ldap" \
+ "for LDAP support"
+fi &&
+
+optional_depends readline "" "" "for readline support" &&
+
+optional_depends linux-pam \
+ "--with-pam --with-pam_smbpass" \
+ "--without-pam" \
+ "To enable PAM authentication" &&

optional_depends gnutls \
"--enable-gnutls" \
"--disable-gnutls" \
"for encrypted communication" &&

-#optional_depends CUPS \
-# "--enable-cups" \
-# "--disable-cups" \
-# "for Samba support in CUPS" &&
+optional_depends CUPS \
+ "--enable-cups" \
+ "--disable-cups" \
+ "for Samba support in CUPS" &&

-#optional_depends SYSTEM-LOGGER \
-# "--with-syslog" \
-# "--without-syslog" \
-# "enables logging though a syslog daemon"
+optional_depends SYSTEM-LOGGER \
+ "--with-syslog" \
+ "--without-syslog" \
+ "enables logging though a syslog daemon"

-optional_depends sqlite \
- '--with-sqlite3' \
- '--without-sqlite3' \
- 'for SQLite 3.x DB backend support' &&
+optional_depends sqlite '' '' 'for SQLite 3.x DB backend support' &&

optional_depends tdb \
'' \
@@ -56,4 +61,29 @@ optional_depends tdb \
optional_depends talloc
\
''
\
''
\
- 'for a hierarchical pool based memory allocator with
destructors'
+ 'for a hierarchical pool based memory allocator with
destructors' &&
+
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "for avahi support" &&
+
+optional_depends sendfile \
+ "--enable-sendfile-support" \
+ "--disable-sendfile-support" \
+ "for sendfile support" &&
+
+optional_depends libaio \
+ "--with-aio-support" \
+ "--without-aio-support" \
+ "for asynchronous I/O support" &&
+
+optional_depends dmapi \
+ "--with-dmapi" \
+ "--without-dmapi" \
+ "for data management API for XFS Filesystem support" &&
+
+optional_depends libxslt "" "" "to build man pages and documentation" &&
+if is_depends_enabled $SPELL libxslt; then
+ depends docbook-xsl
+fi
diff --git a/net/samba4/DETAILS b/net/samba4/DETAILS
index cc92c3b..dac8217 100755
--- a/net/samba4/DETAILS
+++ b/net/samba4/DETAILS
@@ -10,13 +10,16 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
SOURCE_URL[0]=git://git.samba.org/samba.git:$SPELL
SOURCE_IGNORE=volatile
else
- VERSION=4.0.0alpha7
+ VERSION=4.0.2
SOURCE=${SPELL/4}-$VERSION.tar.gz
+ SOURCE2=${SPELL/4}-${VERSION}.tar.asc
+ SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/4}-$VERSION
- SOURCE_URL[0]=ftp://us5.samba.org/pub/samba-ftp/$SPELL/$SOURCE
- SOURCE_URL[1]=ftp://de3.samba.org/pub/samba/$SPELL/$SOURCE
- SOURCE_URL[2]=http://us1.samba.org/samba/ftp/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_URL[0]=http://www.samba.org/samba/ftp/stable/$SOURCE
+ SOURCE_URL[1]=http://ftp.samba.org/pub/samba/$SOURCE
+ SOURCE2_URL[0]=http://www.samba.org/samba/ftp/stable/$SOURCE2
+ SOURCE2_URL[1]=http://ftp.samba.org/pub/samba/$SOURCE2
+ SOURCE_GPG="samba.gpg:$SOURCE2:UPSTREAM_KEY"
fi
LICENSE[0]=GPL
WEB_SITE=http://www.samba.org/
diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 4da1f11..cafdd0b 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,17 @@
+2013-02-08 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: stable => 4.0.2
+ updated SOURCE_URLs
+ changed to upstream gpg verification
+ * CONFIGURE: added config query for AD DC and updated ADS query
+ added query for winbind, swat, quotas, utmp, automount, and
dnsupdate
+ * DEPENDS: added optional_depends acl (forced for AD DC), krb5,
openldap
+ avahi, sendfile, libaio, dmapi, libxlsst, docbook-xsl
+ re-enabled optional_depends linux-pam, cups, SYSTEM-LOGGER
+ removed readline, sqlite configure flags (no-longer explicitly
listed, but
+ still optional)
+ * PRE_BUILD: uncompress gz file to verify tarball
+ * BUILD: added CONFIGURE options, fix build for stable
+
2011-09-22 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch

diff --git a/net/samba4/PRE_BUILD b/net/samba4/PRE_BUILD
index 98b225d..ee39da5 100755
--- a/net/samba4/PRE_BUILD
+++ b/net/samba4/PRE_BUILD
@@ -1,6 +1,15 @@
-default_pre_build &&
+if [[ "$SAMBA4_BRANCH" != "scm" ]]; then
+ message "${MESSAGE_COLOR}gunzip $SOURCE_CACHE/$SOURCE${DEFAULT_COLOR}"
+ SOURCE_ORI=${SOURCE}
+ SOURCE=${SOURCE/.gz}
+ gunzip -c ${SOURCE_CACHE}/$SOURCE_ORI > $SOURCE
+ default_pre_build
+ message "${MESSAGE_COLOR}rm $SOURCE${DEFAULT_COLOR}"
+ rm $SOURCE
+ SOURCE=${SOURCE_ORI}

-if [[ "$SAMBA4_SCM" == "y" ]]; then
+else
+ default_pre_build &&
cd $SOURCE_DIRECTORY/source4 &&
NOCONFIGURE="on" ./autogen.sh
fi
diff --git a/net/samba4/samba-4.0.0alpha7.tar.gz.sig
b/net/samba4/samba-4.0.0alpha7.tar.gz.sig
deleted file mode 100644
index ca2a5eb..0000000
Binary files a/net/samba4/samba-4.0.0alpha7.tar.gz.sig and /dev/null differ
diff --git a/samba.gpg b/samba.gpg
new file mode 100644
index 0000000..7fb4d71
Binary files /dev/null and b/samba.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (c2f8dd588da955ebaefbee89a1962a0df7786dcd), Sukneet Basuta, 02/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page