New: [PATCH] Samba package
https://bugs.busybox.net/show_bug.cgi?id=665
Summary: [PATCH] Samba package
Product: buildroot
Version: unspecified
Platform: PC
OS/Version: Linux
Status: NEW
Severity: enhancement
Priority: P5
Component: Outdated package
AssignedTo: unassigned at buildroot.uclibc.org
ReportedBy: rvpaasen at t3i.nl
CC: buildroot at uclibc.org
Estimated Hours: 0.0
Created an attachment (id=701)
--> (https://bugs.busybox.net/attachment.cgi?id=701)
samba package
Hi,
I have updated the samba package to the new makefile format. I also updated to samba version 3.3.8 (latest 3.3.x version).
Patch is attached and to be aplied to the current git.
Richard.
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
https://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #1 from Sven Neumann <[email protected]> 2009-10-17 21:51:56 UTC --- I tried to apply this patch to an uptodate git clone, but the patch did not apply:
error: patch failed: package/samba/Config.in:8
error: package/samba/Config.in: patch does not apply
error: patch failed: package/samba/samba.mk:3
error: package/samba/samba.mk: patch does not apply
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #2 from rvpaasen <[email protected]> 2009-10-17 22:06:40 UTC ---
I created the patch with 'git diff package/samba'. Could you try using 'patch'? Here patching succeeds:
mmnet at Wodan:[buildroot]:~/broot/buildroot.git$ rm -rf package/samba mmnet at Wodan:[buildroot]:~/broot/buildroot.git$ git pull Already up-to-date.
mmnet at Wodan:[buildroot]:~/broot/buildroot.git$ git checkout package/samba mmnet at Wodan:[buildroot]:~/broot/buildroot.git$ ls package/samba/
Config.in samba-add-check-for-__use_bsd.patch samba-fix-client-mtab.patch
samba-getgrouplist.patch samba-remove-legacy-index.patch
S91smb samba-do-not-check-glibc-version.patch samba-fix-mount.cifs.patch
samba.mk simple.conf
mmnet at Wodan:[buildroot]:~/broot/buildroot.git$ patch -p1 < ../buildroot-samba.patch
patching file package/samba/Config.in
patching file package/samba/samba.mk mmnet@Wodan:[buildroot]:~/broot/buildroot.git$
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #3 from Sven Neumann <[email protected]> 2009-10-17 22:14:24 UTC --- Perhaps I did something wrong, trying again now ...
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #4 from Sven Neumann <[email protected]> 2009-10-17 22:26:08 UTC --- I am sorry, I did apply the patch in the wrong branch. Running a rebuild now, will report back later...
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #5 from Sven Neumann <[email protected]> 2009-10-18 10:01:42 UTC --- The build completed successfully here. But I found that the libsmbclient.h header is not installed, even if BR2_PACKAGE_SAMBA_LIBSMBCLIENT is selected. I am testing a patch now to fix this...
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #6 from Sven Neumann <[email protected]> 2009-10-18 11:32:43 UTC --- The header is installed correctly in staging_dir, but for whatever reason, it is not being picked up later by the gvfs configure script:
checking libsmbclient.h usability... no
checking libsmbclient.h presence... no
checking for libsmbclient.h... no
checking for Samba 3.0 libraries... no
Unfortunately I only have access to the build log right now, which makes it somewhat difficult to investigate this in more detail.
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #7 from Sven Neumann <[email protected]> 2009-10-18 11:56:52 UTC --- Looking at build logs from before the samba update, it appears that this problem has existed before, but got unnoticed so far. So the problem is more likely in the gvfs package and not related to this patch.
So this change looks good from my point. For your convenience I will send a git formatted patch to the list.
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 samba: updated the samba package to version 3.3.8
From: rvpaasen <[email protected]>
Update the samba package to the new makefile format and also update it to samba version 3.3.8 (latest 3.3.x version).
--- package/samba/Config.in | 71 ++++++++-- package/samba/samba.mk | 351 +++++++++++++++++++++++------------------------ 2 files changed, 233 insertions(+), 189 deletions(-)
package/samba/Config.in +61 -10
@@ -8,7 +8,7 @@ config BR2_PACKAGE_SAMBA http://www.samba.org/ - NOTE: A complete Samba install takes close to 40MB of space, + NOTE: A complete Samba install takes over 50MB of space, so choose only the components you need. menu "Samba tools selection"
@@ -40,15 +40,6 @@ config BR2_PACKAGE_SAMBA_FINDSMB comment "findsmb - disabled (requires nmblookup, smbclient and perl)" depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL -config BR2_PACKAGE_SAMBA_LIBSMBCLIENT - bool "libsmbclient" - depends on BR2_PACKAGE_SAMBA - help - libsmbclient is a library toolset that permits applications - to manipulate CIFS/SMB network resources using many of the - standards POSIX functions available for manipulating local - files. - config BR2_PACKAGE_SAMBA_NET bool "net" default y
@@ -95,6 +86,7 @@ config BR2_PACKAGE_SAMBA_PROFILES config BR2_PACKAGE_SAMBA_RPCCLIENT bool "rpcclient" + select BR2_PACKAGE_READLINE default y depends on BR2_PACKAGE_SAMBA help
@@ -110,6 +102,7 @@ config BR2_PACKAGE_SAMBA_SMBCACLS config BR2_PACKAGE_SAMBA_SMBCLIENT bool "smbclient" + select BR2_PACKAGE_READLINE default y depends on BR2_PACKAGE_SAMBA help
@@ -136,6 +129,13 @@ config BR2_PACKAGE_SAMBA_SMBGET help wget-like utility for download files over SMB +config BR2_PACKAGE_SAMBA_SMBLDBTOOLS + bool "smbldbtools" + default y + depends on BR2_PACKAGE_SAMBA + help + ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools + config BR2_PACKAGE_SAMBA_SMBPASSWD bool "smbpasswd" default y
@@ -143,6 +143,13 @@ config BR2_PACKAGE_SAMBA_SMBPASSWD help Change a user's SMB passwd +config BR2_PACKAGE_SAMBA_SMBSHARESEC + bool "smbsharesec" + default y + depends on BR2_PACKAGE_SAMBA + help + Manipulate share permissions on SMB file shares + config BR2_PACKAGE_SAMBA_SMBSPOOL bool "smbspool" default y
@@ -210,3 +217,47 @@ config BR2_PACKAGE_SAMBA_WBINFO Query information from winbind daemon endmenu + + +menu "Samba libraries selection" + depends on BR2_PACKAGE_SAMBA + +config BR2_PACKAGE_SAMBA_LIBSMBCLIENT + bool "libsmbclient" + depends on BR2_PACKAGE_SAMBA + help + libsmbclient is a library toolset that permits applications + to manipulate CIFS/SMB network resources using many of the + standards POSIX functions available for manipulating local + files. + +endmenu + + +menu "Samba support selection" + depends on BR2_PACKAGE_SAMBA + +config BR2_PACKAGE_SAMBA_AVAHI + bool "support avahi" + default y + depends on BR2_PACKAGE_SAMBA + depends on BR2_PACKAGE_AVAHI + help + Include support for avahi + +comment "support avhai - disabled (requires avahi)" + depends on !BR2_PACKAGE_AVAHI + +config BR2_PACKAGE_SAMBA_GAMIN + bool "support gamin" + default y + depends on BR2_PACKAGE_SAMBA + depends on BR2_PACKAGE_GAMIN + help + Include support for gamin + +comment "support gamin - disabled (requires gamin)" + depends on !BR2_PACKAGE_GAMIN + +endmenu +
package/samba/samba.mk +172 -179
361 lines not on this page · raw message
Signature · 1 line
1.6.5
PATCH 1/1 samba: updated the samba package to version 3.3.8
package/samba/samba.mk line 19
Quoted 7 lines · Sven Neumann
From: rvpaasen <[email protected]>
Update the samba package to the new makefile format and also update it to samba version 3.3.8 (latest 3.3.x version).
package/samba/samba.mk +2
-0+SAMBA_DEPENDENCIES = \ + uclibc \
this dependency above is not needed (because implied and may be another libc too), please drop it.
http://repo.or.cz/w/buildroot.git?a=commit;h=567d5c24536c8462b6df24f6c7654a72b00f202d
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #8 from Sven Neumann <[email protected]> 2009-10-18 17:23:14 UTC --- While trying to find the cause of the gvfs problem, I attempted to build the updated samba package on my Debian sid system. This unveiled a problem in your patch. Your patch adds a SAMBA_HOOK_POST_EXTRACT hook that calls the autogen.sh script. This will regenerate the configure script (among other things). Depending on the version of autoconf that is being called by autogen.sh, the resulting configure script will differ. On my system this causes the samba-do-not-check-glibc-version.patch to fail. If I remove the SAMBA_HOOK_POST_EXTRACT hook entirely, everything works just fine. So it appears this is not needed at all?
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 samba: updated the samba package to version 3.3.8
From: rvpaasen <[email protected]>
Update the samba package to the new makefile format and also update it to samba version 3.3.8 (latest 3.3.x version). Based on the patch from bug 665, but with uclibc dependency and call to autogen.sh removed.
--- package/samba/Config.in | 71 +++++++++-- package/samba/samba.mk | 344 ++++++++++++++++++++++------------------------- 2 files changed, 225 insertions(+), 190 deletions(-)
package/samba/Config.in +61 -10
@@ -8,7 +8,7 @@ config BR2_PACKAGE_SAMBA http://www.samba.org/ - NOTE: A complete Samba install takes close to 40MB of space, + NOTE: A complete Samba install takes over 50MB of space, so choose only the components you need. menu "Samba tools selection"
@@ -40,15 +40,6 @@ config BR2_PACKAGE_SAMBA_FINDSMB comment "findsmb - disabled (requires nmblookup, smbclient and perl)" depends on !BR2_PACKAGE_SAMBA_SMBCLIENT || !BR2_PACKAGE_SAMBA_NMBLOOKUP || !BR2_PACKAGE_MICROPERL -config BR2_PACKAGE_SAMBA_LIBSMBCLIENT - bool "libsmbclient" - depends on BR2_PACKAGE_SAMBA - help - libsmbclient is a library toolset that permits applications - to manipulate CIFS/SMB network resources using many of the - standards POSIX functions available for manipulating local - files. - config BR2_PACKAGE_SAMBA_NET bool "net" default y
@@ -95,6 +86,7 @@ config BR2_PACKAGE_SAMBA_PROFILES config BR2_PACKAGE_SAMBA_RPCCLIENT bool "rpcclient" + select BR2_PACKAGE_READLINE default y depends on BR2_PACKAGE_SAMBA help
@@ -110,6 +102,7 @@ config BR2_PACKAGE_SAMBA_SMBCACLS config BR2_PACKAGE_SAMBA_SMBCLIENT bool "smbclient" + select BR2_PACKAGE_READLINE default y depends on BR2_PACKAGE_SAMBA help
@@ -136,6 +129,13 @@ config BR2_PACKAGE_SAMBA_SMBGET help wget-like utility for download files over SMB +config BR2_PACKAGE_SAMBA_SMBLDBTOOLS + bool "smbldbtools" + default y + depends on BR2_PACKAGE_SAMBA + help + ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch tools + config BR2_PACKAGE_SAMBA_SMBPASSWD bool "smbpasswd" default y
@@ -143,6 +143,13 @@ config BR2_PACKAGE_SAMBA_SMBPASSWD help Change a user's SMB passwd +config BR2_PACKAGE_SAMBA_SMBSHARESEC + bool "smbsharesec" + default y + depends on BR2_PACKAGE_SAMBA + help + Manipulate share permissions on SMB file shares + config BR2_PACKAGE_SAMBA_SMBSPOOL bool "smbspool" default y
@@ -210,3 +217,47 @@ config BR2_PACKAGE_SAMBA_WBINFO Query information from winbind daemon endmenu + + +menu "Samba libraries selection" + depends on BR2_PACKAGE_SAMBA + +config BR2_PACKAGE_SAMBA_LIBSMBCLIENT + bool "libsmbclient" + depends on BR2_PACKAGE_SAMBA + help + libsmbclient is a library toolset that permits applications + to manipulate CIFS/SMB network resources using many of the + standards POSIX functions available for manipulating local + files. + +endmenu + + +menu "Samba support selection" + depends on BR2_PACKAGE_SAMBA + +config BR2_PACKAGE_SAMBA_AVAHI + bool "support avahi" + default y + depends on BR2_PACKAGE_SAMBA + depends on BR2_PACKAGE_AVAHI + help + Include support for avahi + +comment "support avhai - disabled (requires avahi)" + depends on !BR2_PACKAGE_AVAHI + +config BR2_PACKAGE_SAMBA_GAMIN + bool "support gamin" + default y + depends on BR2_PACKAGE_SAMBA + depends on BR2_PACKAGE_GAMIN + help + Include support for gamin + +comment "support gamin - disabled (requires gamin)" + depends on !BR2_PACKAGE_GAMIN + +endmenu +
package/samba/samba.mk +164 -180
353 lines not on this page · raw message
Signature · 1 line
1.6.5
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #9 from rvpaasen <[email protected]> 2009-10-18 19:10:47 UTC --- I used an Ubuntu 9.04 system to build. The autogen.sh script was also called before configuring the package by the previous samba.mk and since it didn't break the build (on my system), I kept the call in place. The package also builds without calling autogen.sh so it's probably best to remove it.
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
--- Comment #10 from Sven Neumann <[email protected]> 2009-10-18 21:59:41 UTC --- The gvfs patches that I just sent to the mailing-list fix the problem described in comment #6. It was indeed unrelated to your patch.
I've also sent an updated patch for samba to the mailing-list that has the uclibc dependency and the call to autogen.sh dropped.
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.
PATCH 1/1 samba: updated the samba package to version 3.3.8
In reply to Sven NeumannQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sven" == Sven Neumann <[email protected]> writes:
Hi,
Sven> From: rvpaasen <[email protected]>
Sven> Update the samba package to the new makefile format and also update Sven> it to samba version 3.3.8 (latest 3.3.x version). Based on the Sven> patch from bug 665, but with uclibc dependency and call to Sven> autogen.sh removed.
Thanks, committed with a few minor fixes.
Sven> +config BR2_PACKAGE_SAMBA_AVAHI
Sven> + bool "support avahi"
Sven> + default y
Sven> + depends on BR2_PACKAGE_SAMBA
Sven> + depends on BR2_PACKAGE_AVAHI
Sven> + help
Sven> + Include support for avahi
Sven> +
Sven> +comment "support avhai - disabled (requires avahi)"
Sven> + depends on !BR2_PACKAGE_AVAHI
typo -> s/avhai/avahi/
Sven> + $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline,) \
'if' supports a 3 parameter form as well, so you can get rid of the last comma - E.G.:
$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline)
Which is imho more readable.
Sven> +SAMBA_CONF_OPT = \
Sven> + --localstatedir=/var \
Sven> + --with-piddir=/var/run \
Sven> + --with-lockdir=/var/lock \
Sven> + --with-logfilebase=/var/log \
Sven> + --with-configdir=/etc/samba \
Sven> + --with-privatedir=/etc/samba \
Sven> + \
Sven> + --disable-cups \
Long term we should probably enable cups support if enabled similar to avahi/gamin.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 Samba package
In reply to bugzilla at busybox.nethttps://bugs.busybox.net/show_bug.cgi?id=665
Peter Korsgaard <[email protected]> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED--- Comment #11 from Peter Korsgaard <[email protected]> 2009-10-20 12:52:19 UTC --- Committed, thanks!
Signature · 3 lines
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug.