Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (b809eea6be5c2c5c9029176eeb19237f54d15ba1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (b809eea6be5c2c5c9029176eeb19237f54d15ba1)
  • Date: Wed, 17 Dec 2008 10:09:32 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

net/samba/BUILD | 14 ++++++++------
net/samba/DETAILS | 4 ++--
net/samba/HISTORY | 5 +++++
net/samba/INSTALL | 17 +----------------
4 files changed, 16 insertions(+), 24 deletions(-)

New commits:
commit b809eea6be5c2c5c9029176eeb19237f54d15ba1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

samba: Updated to version 3.2.6. Changed method for installing
CIFS support. Old method was breaking build.

diff --git a/net/samba/BUILD b/net/samba/BUILD
index 94d0bcc..f2b2f57 100755
--- a/net/samba/BUILD
+++ b/net/samba/BUILD
@@ -7,14 +7,16 @@ OPTS="--with-swatdir=/usr/share/swat \
$SAMBA_QUOTA \
$OPTS" &&

-cd source &&
+if [[ "$SAMBA_CIFS" == "y" ]]; then
+ OPTS="--with-cifsmount $OPTS"
+else
+ OPTS="--without-cifsmount $OPTS"
+fi &&
+
+cd $SOURCE_DIRECTORY/source &&
make_single &&
default_build &&
-
-if [[ "$SAMBA_CIFS" == "y" ]]; then
- gcc $CFLAGS $LDFLAGS client/mount.cifs.c \
- -o client/mount.cifs
-fi &&
+make_normal &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
ORG_DIR=`pwd`
diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index b2cd8a4..0b9f361 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,11 +1,11 @@
SPELL=samba
- VERSION=3.2.5
+ VERSION=3.2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://us5.samba.org/pub/samba-ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:bad061a830bfb4a3ada6d783378508ee4ed6cf68efed2cfa77b20e7dcd9dcf702482c15178769912d40e9b9dc1c66d31f6497c6ec9797190866fd0f9f4a365a9
+
SOURCE_HASH=sha512:0ce716fb8d4bd5db8e208f26ed1a9076660c9ab1407026bb71eaf85a4917dd5304ae32526180c8fe22085930fb87e5665c100cecd3cc002947d167be73a4dcba
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 37502fe..8e9adf8 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,8 @@
+2008-12-17 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 3.2.6.
+ * BUILD: Added option for cifs. Removed old method.
+ * INSTALL: Removed manual install of mount/umount.cifs
+
2008-11-27 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: updated spell to 3.2.5. SECURITY_PATCH++
See http://us6.samba.org/samba/history/samba-3.2.5.html
diff --git a/net/samba/INSTALL b/net/samba/INSTALL
index 42f71c0..448c63f 100755
--- a/net/samba/INSTALL
+++ b/net/samba/INSTALL
@@ -4,11 +4,6 @@ if is_depends_enabled $SPELL python; then
make python_install
fi &&

-if [[ "$SAMBA_CIFS" == "y" ]]; then
- install -m 755 client/mount.cifs \
- $INSTALL_ROOT/sbin/mount.cifs
-fi &&
-
cd .. &&

mkdir -p $INSTALL_ROOT/usr/share/samba/codepages &&
@@ -48,17 +43,7 @@ then
fi &&

install_config_file examples/smb.conf.default /etc/samba/smb.conf.default
&&
-install_config_file examples/smb.conf.default /etc/samba/smb.conf
&&
-
-#if [[ "$SAMBA_SUID" = "y" ]]; then
-# chmod u+s ${INSTALL_ROOT}/usr/bin/smbmnt \
-# ${INSTALL_ROOT}/usr/bin/smbumount &&
-
- if [[ "$SAMBA_CIFS" == "y" ]]; then
- chmod u+s ${INSTALL_ROOT}/sbin/mount.cifs \
- ${INSTALL_ROOT}/usr/sbin/umount.cifs
-# fi
-fi &&
+install_config_file examples/smb.conf.default /etc/samba/smb.conf &&

# Setup the symlink for CUPS:
if spell_ok cups; then



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (b809eea6be5c2c5c9029176eeb19237f54d15ba1), George Sherwood, 12/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page