From 760d422b7abd60a5a493a557d331243268100751 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Tue, 10 Feb 2009 15:23:06 +0000 Subject: 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 --- packages/samba/files/configure-3.2.7.patch | 86 ---------------------------- packages/samba/files/configure-3.2.8.patch | 92 ++++++++++++++++++++++++++++++ packages/samba/files/smb.conf | 2 +- packages/samba/samba-ads.inc | 8 ++- packages/samba/samba-ads_3.2.7.bb | 10 ---- packages/samba/samba-ads_3.2.8.bb | 10 ++++ packages/samba/samba-ads_3.3.0.bb | 2 +- packages/samba/samba_3.2.7.bb | 24 -------- packages/samba/samba_3.2.8.bb | 24 ++++++++ 9 files changed, 133 insertions(+), 125 deletions(-) delete mode 100644 packages/samba/files/configure-3.2.7.patch create mode 100644 packages/samba/files/configure-3.2.8.patch delete mode 100644 packages/samba/samba-ads_3.2.7.bb create mode 100644 packages/samba/samba-ads_3.2.8.bb delete mode 100644 packages/samba/samba_3.2.7.bb create mode 100644 packages/samba/samba_3.2.8.bb diff --git a/packages/samba/files/configure-3.2.7.patch b/packages/samba/files/configure-3.2.7.patch deleted file mode 100644 index 94d684813e..0000000000 --- a/packages/samba/files/configure-3.2.7.patch +++ /dev/null @@ -1,86 +0,0 @@ -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 @@ - *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 --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; }; } -+# { { 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; }; } -+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 -@@ -275,6 +275,8 @@ - fi - AC_SUBST(BROKEN_CC) - -+AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC])) -+ - dnl Check if the C compiler understands -Werror - AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [ - AC_TRY_RUN_STRICT([ -@@ -325,25 +327,11 @@ - # a runtime test is needed here - AC_SUBST(PIDL_ARGS) - AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [ -- AC_TRY_RUN( -+ AC_TRY_COMPILE([], - [ -- #include - enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF }; -- int main(void) { -- enum negative_values v1 = NEGATIVE_VALUE; -- unsigned v2 = NEGATIVE_VALUE; -- -- if (v1 != 0xFFFFFFFF) { -- printf("%u != 0xFFFFFFFF\n", v1); -- return 1; -- } -- if (v2 != 0xFFFFFFFF) { -- printf("%u != 0xFFFFFFFF\n", v2); -- return 1; -- } -- -- return 0; -- } -+ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]); -+ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]); - ], - 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 @@ - case "$host_os" in - *linux*) - # glibc <= 2.3.2 has a broken getgrouplist -- AC_TRY_RUN([ --#include -+ AC_TRY_COMPILE([ - #include --main() { -- /* glibc up to 2.3 has a broken getgrouplist */ -+],[ - #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) -- int libc_major = __GLIBC__; -- int libc_minor = __GLIBC_MINOR__; -- -- if (libc_major < 2) -- exit(1); -- if ((libc_major == 2) && (libc_minor <= 3)) -- exit(1); -+ (void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]); - #endif -- exit(0); --} - ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no]) - if test x"$linux_getgrouplist_ok" = x"yes"; then - AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist]) diff --git a/packages/samba/files/configure-3.2.8.patch b/packages/samba/files/configure-3.2.8.patch new file mode 100644 index 0000000000..2668b9d632 --- /dev/null +++ b/packages/samba/files/configure-3.2.8.patch @@ -0,0 +1,92 @@ +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 +- { { $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; }; }; } ++# { { $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 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) + ++AC_TRY_COMPILE([],[(void)sizeof(char[-1])],AC_MSG_ERROR([configure's compilation assert doesn't work with $CC])) ++ + dnl Check if the C compiler understands -Werror + AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [ + AC_TRY_RUN_STRICT([ +@@ -325,25 +327,11 @@ + # a runtime test is needed here + AC_SUBST(PIDL_ARGS) + AC_CACHE_CHECK([that the C compiler understands negative enum values],samba_cv_CC_NEGATIVE_ENUM_VALUES, [ +- AC_TRY_RUN( ++ AC_TRY_COMPILE([], + [ +- #include + enum negative_values { NEGATIVE_VALUE = 0xFFFFFFFF }; +- int main(void) { +- enum negative_values v1 = NEGATIVE_VALUE; +- unsigned v2 = NEGATIVE_VALUE; +- +- if (v1 != 0xFFFFFFFF) { +- printf("%u != 0xFFFFFFFF\n", v1); +- return 1; +- } +- if (v2 != 0xFFFFFFFF) { +- printf("%u != 0xFFFFFFFF\n", v2); +- return 1; +- } +- +- return 0; +- } ++ (void)sizeof(char[1-2*( (unsigned)NEGATIVE_VALUE != 0xFFFFFFFF)]); ++ (void)sizeof(char[1-2*((enum negative_values)NEGATIVE_VALUE != 0xFFFFFFFF)]); + ], + 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 +@@ -1204,22 +1192,12 @@ + case "$host_os" in + *linux*) + # glibc <= 2.3.2 has a broken getgrouplist +- AC_TRY_RUN([ +-#include ++ AC_TRY_COMPILE([ + #include +-main() { +- /* glibc up to 2.3 has a broken getgrouplist */ ++],[ + #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) +- int libc_major = __GLIBC__; +- int libc_minor = __GLIBC_MINOR__; +- +- if (libc_major < 2) +- exit(1); +- if ((libc_major == 2) && (libc_minor <= 3)) +- exit(1); ++ (void)sizeof(char[1-2*(__GLIBC__ < 2 || __GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)]); + #endif +- exit(0); +-} + ], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no]) + if test x"$linux_getgrouplist_ok" = x"yes"; then + AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good 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.7.bb deleted file mode 100644 index 83b4416625..0000000000 --- a/packages/samba/samba-ads_3.2.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -require samba.inc -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://config-h.patch;patch=1 \ - file://mtab.patch;patch=1 \ - " diff --git a/packages/samba/samba-ads_3.2.8.bb b/packages/samba/samba-ads_3.2.8.bb new file mode 100644 index 0000000000..944fc792e0 --- /dev/null +++ b/packages/samba/samba-ads_3.2.8.bb @@ -0,0 +1,10 @@ +require samba.inc +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.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.7.bb deleted file mode 100644 index 49ff24a646..0000000000 --- a/packages/samba/samba_3.2.7.bb +++ /dev/null @@ -1,24 +0,0 @@ -require samba.inc -require samba-basic.inc - -SRC_URI += "file://configure-3.2.7.patch;patch=1 \ - file://config-h.patch;patch=1 \ - file://mtab.patch;patch=1 \ - " - -PR = "r4" - -EXTRA_OECONF += "\ - SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ - samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ - linux_getgrouplist_ok=no \ - samba_cv_HAVE_BROKEN_GETGROUPS=no \ - samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ - samba_cv_have_setresuid=yes \ - samba_cv_have_setresgid=yes \ - samba_cv_HAVE_WRFILE_KEYTAB=yes \ - " - -do_configure() { - oe_runconf -} diff --git a/packages/samba/samba_3.2.8.bb b/packages/samba/samba_3.2.8.bb new file mode 100644 index 0000000000..57f5753fce --- /dev/null +++ b/packages/samba/samba_3.2.8.bb @@ -0,0 +1,24 @@ +require samba.inc +require samba-basic.inc + +SRC_URI += "file://configure-3.2.8.patch;patch=1 \ + file://config-h.patch;patch=1 \ + file://mtab.patch;patch=1 \ + " + +PR = "r0" + +EXTRA_OECONF += "\ + SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \ + samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \ + linux_getgrouplist_ok=no \ + samba_cv_HAVE_BROKEN_GETGROUPS=no \ + samba_cv_HAVE_FTRUNCATE_EXTEND=yes \ + samba_cv_have_setresuid=yes \ + samba_cv_have_setresgid=yes \ + samba_cv_HAVE_WRFILE_KEYTAB=yes \ + " + +do_configure() { + oe_runconf +} -- cgit v1.2.3