summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorTim 'timtim' Ellis <tim.ellis@foonas.org>2009-02-10 15:23:06 +0000
committerTim 'timtim' Ellis <tim.ellis@foonas.org>2009-02-10 15:23:06 +0000
commit760d422b7abd60a5a493a557d331243268100751 (patch)
tree5f39a846bd59a26b2e31fac052024965234c0776 /packages
parent2680272b922509f720688505d0a9a7560410e487 (diff)
samba: Various updates:
- samba-ads depends on netatalk to support the netatalk vfs module - 3.2.7 => 3.2.8 for samba and samba-ads - Modify config so we can actually write files to the default share - Bump PR on other samba-ads build
Diffstat (limited to 'packages')
-rw-r--r--packages/samba/files/configure-3.2.8.patch (renamed from packages/samba/files/configure-3.2.7.patch)34
-rw-r--r--packages/samba/files/smb.conf2
-rw-r--r--packages/samba/samba-ads.inc8
-rw-r--r--packages/samba/samba-ads_3.2.8.bb (renamed from packages/samba/samba-ads_3.2.7.bb)2
-rw-r--r--packages/samba/samba-ads_3.3.0.bb2
-rw-r--r--packages/samba/samba_3.2.8.bb (renamed from packages/samba/samba_3.2.7.bb)4
6 files changed, 30 insertions, 22 deletions
diff --git a/packages/samba/files/configure-3.2.7.patch b/packages/samba/files/configure-3.2.8.patch
index 94d684813e..2668b9d632 100644
--- a/packages/samba/files/configure-3.2.7.patch
+++ b/packages/samba/files/configure-3.2.8.patch
@@ -1,25 +1,31 @@
-diff -urN source.old/configure source/configure
---- source.old/configure 2008-11-20 14:45:08.000000000 +0000
-+++ source/configure 2008-11-30 17:53:02.116791281 +0000
-@@ -40777,11 +40777,10 @@
+diff -urN source.old//configure source//configure
+--- source.old//configure 2009-02-03 16:34:41.000000000 +0000
++++ source//configure 2009-02-06 00:25:49.502205687 +0000
+@@ -43860,13 +43860,14 @@
*linux*)
# glibc <= 2.3.2 has a broken getgrouplist
if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
+-$as_echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+# { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling See \`config.log' for more details." >&5
-+# echo "$as_me: error: cannot run test program while cross compiling See \`config.log' for more details." >&2;}
-+# { (exit 1); exit 1; }; }
+- { (exit 1); exit 1; }; }; }
++# { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++#See \`config.log' for more details." >&5
++#$as_echo "$as_me: error: cannot run test program while cross compiling
++#See \`config.log' for more details." >&2;}
++# { (exit 1); exit 1; }; }; }
+linux_getgrouplist_ok=no
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-diff -urN source.old/configure.in source/configure.in
---- source.old/configure.in 2008-11-18 15:17:17.000000000 +0000
-+++ source/configure.in 2008-11-30 17:33:10.960791551 +0000
+diff -urN source.old//configure.in source//configure.in
+--- source.old//configure.in 2009-02-03 16:10:07.000000000 +0000
++++ source//configure.in 2009-02-06 00:23:27.346211236 +0000
@@ -275,6 +275,8 @@
fi
AC_SUBST(BROKEN_CC)
@@ -58,7 +64,7 @@ diff -urN source.old/configure.in source/configure.in
],
samba_cv_CC_NEGATIVE_ENUM_VALUES=yes,samba_cv__CC_NEGATIVE_ENUM_VALUES=no)])
if test x"$samba_cv_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-@@ -1187,22 +1175,12 @@
+@@ -1204,22 +1192,12 @@
case "$host_os" in
*linux*)
# glibc <= 2.3.2 has a broken getgrouplist
diff --git a/packages/samba/files/smb.conf b/packages/samba/files/smb.conf
index 3854621c3e..f07e3e4ec7 100644
--- a/packages/samba/files/smb.conf
+++ b/packages/samba/files/smb.conf
@@ -160,7 +160,7 @@
#============================ Share Definitions ==============================
[homes]
comment = Home Directories
- browseable = no
+ browseable = yes
writable = yes
# Un-comment the following and create the netlogon directory for Domain Logons
diff --git a/packages/samba/samba-ads.inc b/packages/samba/samba-ads.inc
index 1249528fdb..fee61a7a81 100644
--- a/packages/samba/samba-ads.inc
+++ b/packages/samba/samba-ads.inc
@@ -1,4 +1,6 @@
-DEPENDS += " openldap krb5"
+# openldap and kerberos are for active directory support
+# netatalk is needed to support a vfs module
+DEPENDS += " openldap krb5 netatalk"
EXTRA_OECONF += "\
SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
@@ -26,12 +28,12 @@ RCONFLICTS_cifs-ads-doc = "cifs-doc"
RCONFLICTS_smbfs-ads = "smbfs"
RCONFLICTS_swat-ads = "swat"
-FILES_cifs-ads= "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
+FILES_cifs-ads = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
FILES_cifs-ads-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
FILES_libsmbclient-ads = "${libdir}/libsmbclient.so.*"
FILES_libsmbclient-ads-dev = "${libdir}/libsmbclient.so ${includedir}"
FILES_smbfs-ads = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
-FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
+FILES_swat-ads = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
do_configure() {
oe_runconf
diff --git a/packages/samba/samba-ads_3.2.7.bb b/packages/samba/samba-ads_3.2.8.bb
index 83b4416625..944fc792e0 100644
--- a/packages/samba/samba-ads_3.2.7.bb
+++ b/packages/samba/samba-ads_3.2.8.bb
@@ -4,7 +4,7 @@ require samba-ads.inc
PR = "r1"
SRC_URI += "file://config-lfs.patch;patch=1 \
file://quota.patch;patch=1;pnum=0 \
- file://configure-3.2.7.patch;patch=1 \
+ file://configure-3.2.8.patch;patch=1 \
file://config-h.patch;patch=1 \
file://mtab.patch;patch=1 \
"
diff --git a/packages/samba/samba-ads_3.3.0.bb b/packages/samba/samba-ads_3.3.0.bb
index 7688fd6703..a2f2e2c47a 100644
--- a/packages/samba/samba-ads_3.3.0.bb
+++ b/packages/samba/samba-ads_3.3.0.bb
@@ -1,7 +1,7 @@
require samba.inc
require samba-ads.inc
-PR = "r1"
+PR = "r2"
SRC_URI += "file://config-lfs.patch;patch=1 \
file://quota.patch;patch=1;pnum=0 \
file://configure-3.3.0.patch;patch=1 \
diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.8.bb
index 49ff24a646..57f5753fce 100644
--- a/packages/samba/samba_3.2.7.bb
+++ b/packages/samba/samba_3.2.8.bb
@@ -1,12 +1,12 @@
require samba.inc
require samba-basic.inc
-SRC_URI += "file://configure-3.2.7.patch;patch=1 \
+SRC_URI += "file://configure-3.2.8.patch;patch=1 \
file://config-h.patch;patch=1 \
file://mtab.patch;patch=1 \
"
-PR = "r4"
+PR = "r0"
EXTRA_OECONF += "\
SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \