* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-01-21 5:17 sjhill at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: sjhill at uclibc.org @ 2007-01-21 5:17 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-01-20 21:17:06 -0800 (Sat, 20 Jan 2007)
New Revision: 17428
Log:
Patch to remove usage of legacy 'index' function.
Added:
trunk/buildroot/package/samba/samba-remove-legacy-index.patch
Changeset:
Added: trunk/buildroot/package/samba/samba-remove-legacy-index.patch
===================================================================
--- trunk/buildroot/package/samba/samba-remove-legacy-index.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-remove-legacy-index.patch 2007-01-21 05:17:06 UTC (rev 17428)
@@ -0,0 +1,22 @@
+diff -ur samba-3.0.23d/source/registry/reg_perfcount.c samba-3.0.23d-patched/source/registry/reg_perfcount.c
+--- samba-3.0.23d/source/registry/reg_perfcount.c 2006-07-10 11:27:54.000000000 -0500
++++ samba-3.0.23d-patched/source/registry/reg_perfcount.c 2007-01-20 23:12:23.456180669 -0600
+@@ -614,15 +614,15 @@
+ obj = NULL;
+ memset(buf, 0, PERFCOUNT_MAX_LEN);
+ memcpy(buf, data.dptr, data.dsize);
+- begin = index(buf, '[');
+- end = index(buf, ']');
++ begin = strchr(buf, '[');
++ end = strchr(buf, ']');
+ if(begin == NULL || end == NULL)
+ return False;
+ start = begin+1;
+
+ while(start < end)
+ {
+- stop = index(start, ',');
++ stop = strchr(start, ',');
+ if(stop == NULL)
+ stop = end;
+ *stop = '\0';
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-04-03 15:35 jacmet at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: jacmet at uclibc.org @ 2007-04-03 15:35 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2007-04-03 08:35:26 -0700 (Tue, 03 Apr 2007)
New Revision: 18313
Log:
3.0.23d now under old-versions. Thanks to Michael Benedict
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2007-04-03 12:09:46 UTC (rev 18312)
+++ trunk/buildroot/package/samba/samba.mk 2007-04-03 15:35:26 UTC (rev 18313)
@@ -5,7 +5,7 @@
#############################################################
SAMBA_VER:=3.0.23d
SAMBA_SOURCE:=samba-$(SAMBA_VER).tar.gz
-SAMBA_SITE:=ftp://us1.samba.org/pub/samba/
+SAMBA_SITE:=ftp://us4.samba.org/pub/samba/old-versions/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VER)/source
SAMBA_CAT:=$(ZCAT)
SAMBA_BINARY:=bin/smbd
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-07-17 0:21 sjhill at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: sjhill at uclibc.org @ 2007-07-17 0:21 UTC (permalink / raw)
To: buildroot
Author: sjhill
Date: 2007-07-16 17:21:16 -0700 (Mon, 16 Jul 2007)
New Revision: 19117
Log:
Bump Samba to latest version and update patches.
Added:
trunk/buildroot/package/samba/samba-use-unsigned-enums.patch
Modified:
trunk/buildroot/package/samba/samba-getgrouplist.patch
trunk/buildroot/package/samba/samba-remove-legacy-index.patch
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba-getgrouplist.patch
===================================================================
--- trunk/buildroot/package/samba/samba-getgrouplist.patch 2007-07-17 00:20:32 UTC (rev 19116)
+++ trunk/buildroot/package/samba/samba-getgrouplist.patch 2007-07-17 00:21:16 UTC (rev 19117)
@@ -1,12 +1,12 @@
-diff -ur samba-3.0.23c/source/configure.in samba-3.0.23c-patched/source/configure.in
---- samba-3.0.23c/source/configure.in 2006-07-21 11:22:57.000000000 -0500
-+++ samba-3.0.23c-patched/source/configure.in 2006-11-09 10:23:26.000000000 -0600
-@@ -1399,38 +1399,6 @@
+diff -ur samba-3.0.25a/source/configure.in samba-3.0.25a-patched/source/configure.in
+--- samba-3.0.25a/source/configure.in 2007-05-23 10:29:20.000000000 -0500
++++ samba-3.0.25a-patched/source/configure.in 2007-06-19 11:38:21.000000000 -0500
+@@ -1370,38 +1370,6 @@
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
#
--#
-#
+-#
-case "$host_os" in
- *linux*)
- # glibc <= 2.3.2 has a broken getgrouplist
Modified: trunk/buildroot/package/samba/samba-remove-legacy-index.patch
===================================================================
--- trunk/buildroot/package/samba/samba-remove-legacy-index.patch 2007-07-17 00:20:32 UTC (rev 19116)
+++ trunk/buildroot/package/samba/samba-remove-legacy-index.patch 2007-07-17 00:21:16 UTC (rev 19117)
@@ -1,7 +1,7 @@
-diff -ur samba-3.0.23d/source/registry/reg_perfcount.c samba-3.0.23d-patched/source/registry/reg_perfcount.c
---- samba-3.0.23d/source/registry/reg_perfcount.c 2006-07-10 11:27:54.000000000 -0500
-+++ samba-3.0.23d-patched/source/registry/reg_perfcount.c 2007-01-20 23:12:23.456180669 -0600
-@@ -614,15 +614,15 @@
+diff -ur samba-3.0.25a/source/registry/reg_perfcount.c samba-3.0.25a-patched/source/registry/reg_perfcount.c
+--- samba-3.0.25a/source/registry/reg_perfcount.c 2007-02-28 22:55:05.000000000 -0600
++++ samba-3.0.25a-patched/source/registry/reg_perfcount.c 2007-06-19 11:40:01.000000000 -0500
+@@ -615,14 +615,14 @@
obj = NULL;
memset(buf, 0, PERFCOUNT_MAX_LEN);
memcpy(buf, data.dptr, data.dsize);
@@ -13,8 +13,7 @@
return False;
start = begin+1;
- while(start < end)
- {
+ while(start < end) {
- stop = index(start, ',');
+ stop = strchr(start, ',');
if(stop == NULL)
Added: trunk/buildroot/package/samba/samba-use-unsigned-enums.patch
===================================================================
--- trunk/buildroot/package/samba/samba-use-unsigned-enums.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-use-unsigned-enums.patch 2007-07-17 00:21:16 UTC (rev 19117)
@@ -0,0 +1,43 @@
+diff -ur samba-3.0.25a/source/configure.in samba-3.0.25a-patched/source/configure.in
+--- samba-3.0.25a/source/configure.in 2007-06-19 11:40:49.000000000 -0500
++++ samba-3.0.25a-patched/source/configure.in 2007-06-19 11:45:04.000000000 -0500
+@@ -511,37 +511,8 @@
+ AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
+ fi
+
+-############################################
+-# check if the compiler can handle negative enum values
+-# and don't truncate the values to INT_MAX
+-# a runtime test is needed here
+-AC_SUBST(PIDL_ARGS)
+-AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [
+- AC_TRY_RUN(
+-[
+- #include <stdio.h>
+- 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;
+- }
+-],
+- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
+-if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
+- AC_MSG_WARN([using --unit-enums for pidl])
+- PIDL_ARGS="$PIDL_ARGS --uint-enums"
+-fi
++# Just hard code this for cross compile cases
++PIDL_ARGS="$PIDL_ARGS --uint-enums"
+
+ dnl Figure out the flags to support named structure initializers
+
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2007-07-17 00:20:32 UTC (rev 19116)
+++ trunk/buildroot/package/samba/samba.mk 2007-07-17 00:21:16 UTC (rev 19117)
@@ -3,9 +3,9 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.23d
+SAMBA_VERSION:=3.0.25b
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE:=ftp://us4.samba.org/pub/samba/old-versions/
+SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
SAMBA_CAT:=$(ZCAT)
SAMBA_BINARY:=bin/smbd
@@ -28,6 +28,7 @@
$(TARGET_CONFIGURE_ARGS) \
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
samba_cv_USE_SETREUID=yes \
+ samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -38,6 +39,7 @@
--with-logfilebase=/var/log/samba \
--with-configdir=/etc/samba \
--without-ldap \
+ --without-libaddns \
--with-included-popt \
--with-included-iniparser \
--disable-cups \
@@ -91,6 +93,10 @@
for file in $(SAMBA_TARGETS_) ; do \
rm -f $(TARGET_DIR)/$$file; \
done
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+ for file in $(SAMBA_TARGETS_y) ; do \
+ $(STRIP) --strip-unneeded $(TARGET_DIR)/$$file; \
+ done
$(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d
@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ] ; then \
$(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-07-23 7:56 ulf at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ulf at uclibc.org @ 2007-07-23 7:56 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-23 00:56:00 -0700 (Mon, 23 Jul 2007)
New Revision: 19197
Log:
Update SAMBA configuration + cleanup
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2007-07-23 07:54:13 UTC (rev 19196)
+++ trunk/buildroot/package/samba/samba.mk 2007-07-23 07:56:00 UTC (rev 19197)
@@ -19,7 +19,8 @@
$(SAMBA_DIR)/.unpacked: $(DL_DIR)/$(SAMBA_SOURCE)
$(SAMBA_CAT) $(DL_DIR)/$(SAMBA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh `dirname $(SAMBA_DIR)` package/samba/ samba\*.patch
- touch $(SAMBA_DIR)/.unpacked
+ $(CONFIG_UPDATE) $(SAMBA_DIR)
+ touch $@
$(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked
(cd $(SAMBA_DIR); rm -rf config.cache; \
@@ -45,7 +46,7 @@
--disable-cups \
--disable-static \
);
- touch $(SAMBA_DIR)/.configured
+ touch $@
$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-07-28 21:51 ulf at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ulf at uclibc.org @ 2007-07-28 21:51 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-28 14:51:58 -0700 (Sat, 28 Jul 2007)
New Revision: 19308
Log:
Use only single job to build Samba
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2007-07-28 18:52:47 UTC (rev 19307)
+++ trunk/buildroot/package/samba/samba.mk 2007-07-28 21:51:58 UTC (rev 19308)
@@ -49,7 +49,7 @@
touch $@
$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
SAMBA_TARGETS_ :=
SAMBA_TARGETS_y :=
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2007-09-23 23:23 ulf at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ulf at uclibc.org @ 2007-09-23 23:23 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-23 16:23:52 -0700 (Sun, 23 Sep 2007)
New Revision: 19982
Log:
Bump SAMBA version to 3.0.26a, 3.0.25b has moved
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2007-09-23 22:08:51 UTC (rev 19981)
+++ trunk/buildroot/package/samba/samba.mk 2007-09-23 23:23:52 UTC (rev 19982)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.25b
+SAMBA_VERSION:=3.0.26a
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
@@ -14,8 +14,6 @@
$(DL_DIR)/$(SAMBA_SOURCE):
$(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE)
-samba-source: $(DL_DIR)/$(SAMBA_SOURCE)
-
$(SAMBA_DIR)/.unpacked: $(DL_DIR)/$(SAMBA_SOURCE)
$(SAMBA_CAT) $(DL_DIR)/$(SAMBA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh `dirname $(SAMBA_DIR)` package/samba/ samba\*.patch
@@ -107,6 +105,10 @@
samba: uclibc $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+samba-source: $(DL_DIR)/$(SAMBA_SOURCE)
+
+samba-unpacked: $(SAMBA_DIR)/.unpacked
+
samba-clean:
rm -f $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
for file in $(SAMBA_TARGETS_y); do \
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-03-06 18:23 ninevoltz at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:23 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-06 10:23:59 -0800 (Thu, 06 Mar 2008)
New Revision: 21226
Log:
update samba version
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-03-06 18:23:39 UTC (rev 21225)
+++ trunk/buildroot/package/samba/samba.mk 2008-03-06 18:23:59 UTC (rev 21226)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.26a
+SAMBA_VERSION:=3.0.28
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-03-11 19:13 ninevoltz at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-11 19:13 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-03-11 12:13:38 -0700 (Tue, 11 Mar 2008)
New Revision: 21306
Log:
updated samba version
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-03-11 18:54:17 UTC (rev 21305)
+++ trunk/buildroot/package/samba/samba.mk 2008-03-11 19:13:38 UTC (rev 21306)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.28
+SAMBA_VERSION:=3.0.28a
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-06-24 8:36 jacmet at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: jacmet at uclibc.org @ 2008-06-24 8:36 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-24 01:36:37 -0700 (Tue, 24 Jun 2008)
New Revision: 22486
Log:
samba: use generic samba.org location over http
Based on patch by Thiago A. Correa.
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-06-24 00:50:07 UTC (rev 22485)
+++ trunk/buildroot/package/samba/samba.mk 2008-06-24 08:36:37 UTC (rev 22486)
@@ -5,7 +5,7 @@
#############################################################
SAMBA_VERSION:=3.0.28a
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
+SAMBA_SITE:=http://samba.org/samba/ftp/stable/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
SAMBA_CAT:=$(ZCAT)
SAMBA_BINARY:=bin/smbd
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-07-03 8:12 ulf at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: ulf at uclibc.org @ 2008-07-03 8:12 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-03 01:12:51 -0700 (Thu, 03 Jul 2008)
New Revision: 22615
Log:
install SAMBA SWAT correctly, add hint for autoconf, courtesy HC Egtvedt
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-07-03 08:11:04 UTC (rev 22614)
+++ trunk/buildroot/package/samba/samba.mk 2008-07-03 08:12:51 UTC (rev 22615)
@@ -28,10 +28,13 @@
samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
samba_cv_USE_SETREUID=yes \
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
+ samba_cv_HAVE_IFACE_IFCONF=yes \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --localstatedir=/var \
--with-lockdir=/var/cache/samba \
--with-piddir=/var/run \
--with-privatedir=/etc/samba \
@@ -96,6 +99,9 @@
for file in $(SAMBA_TARGETS_y); do \
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \
done
+ifeq ($(strip $(BR2_PACKAGE_SAMBA_SWAT)),y)
+ cp -dpfr $(SAMBA_DIR)/../swat $(TARGET_DIR)/usr/
+endif
$(INSTALL) -m 0755 package/samba/S91smb $(TARGET_DIR)/etc/init.d
@if [ ! -f $(TARGET_DIR)/etc/samba/smb.conf ]; then \
$(INSTALL) -m 0755 -D package/samba/simple.conf $(TARGET_DIR)/etc/samba/smb.conf; \
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-10-06 19:53 wberrier at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: wberrier at uclibc.org @ 2008-10-06 19:53 UTC (permalink / raw)
To: buildroot
Author: wberrier
Date: 2008-10-06 12:53:29 -0700 (Mon, 06 Oct 2008)
New Revision: 23607
Log:
samba.mk:
-force some performance enhancing autoconf options
-run 'installscripts' so findsmb and smbtar are installed
-samba binaires were segfaulting with uclibc 0.9.29
when not using: samba_cv_fpie=no. Force it.
Config.in:
-create configure options for findsmb and smbtar
S91smb:
-create dir (/var/lock/subsys) that is referenced
later in script
Modified:
trunk/buildroot/package/samba/Config.in
trunk/buildroot/package/samba/S91smb
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/Config.in
===================================================================
--- trunk/buildroot/package/samba/Config.in 2008-10-06 19:20:58 UTC (rev 23606)
+++ trunk/buildroot/package/samba/Config.in 2008-10-06 19:53:29 UTC (rev 23607)
@@ -27,6 +27,18 @@
help
Write Eventlog records to a tdb or perform other eventlog functions
+config BR2_PACKAGE_SAMBA_FINDSMB
+ bool "findsmb"
+ default y
+ depends on BR2_PACKAGE_SAMBA_SMBCLIENT
+ depends on BR2_PACKAGE_SAMBA_NMBLOOKUP
+ depends on BR2_PACKAGE_MICROPERL
+ help
+ Script to browse network
+
+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_NET
bool "net"
default y
@@ -149,6 +161,16 @@
help
Samba Web Administration Tool
+config BR2_PACKAGE_SAMBA_SMBTAR
+ bool "smbtar"
+ default y
+ depends on BR2_PACKAGE_SAMBA_SMBCLIENT
+ help
+ tar-like script that wraps smbclient
+
+comment "smbtar - disabled (requires smbclient)"
+ depends on !BR2_PACKAGE_SAMBA_SMBCLIENT
+
config BR2_PACKAGE_SAMBA_TDB
bool "tdb"
default y
Modified: trunk/buildroot/package/samba/S91smb
===================================================================
--- trunk/buildroot/package/samba/S91smb 2008-10-06 19:20:58 UTC (rev 23606)
+++ trunk/buildroot/package/samba/S91smb 2008-10-06 19:53:29 UTC (rev 23607)
@@ -9,6 +9,7 @@
# Make directories.
mkdir -p /var/cache/samba
mkdir -p /var/log/samba
+mkdir -p /var/lock/subsys
RETVAL=0
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-10-06 19:20:58 UTC (rev 23606)
+++ trunk/buildroot/package/samba/samba.mk 2008-10-06 19:53:29 UTC (rev 23607)
@@ -29,6 +29,10 @@
samba_cv_USE_SETREUID=yes \
samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
samba_cv_HAVE_IFACE_IFCONF=yes \
+ samba_cv_HAVE_MMAP=yes \
+ samba_cv_HAVE_FCNTL_LOCK=yes \
+ samba_cv_HAVE_SECURE_MKSTEMP=yes \
+ samba_cv_fpie=no \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -58,6 +62,7 @@
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_CIFS) += usr/sbin/mount.cifs \
usr/sbin/umount.cifs
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_EVENTLOGADM) += usr/bin/eventlogadm
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_FINDSMB) += usr/bin/findsmb
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NET) += usr/bin/net
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD) += usr/sbin/nmbd
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP) += usr/bin/nmblookup
@@ -73,6 +78,7 @@
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBPASSWD) += usr/bin/smbpasswd
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSPOOL) += usr/bin/smbspool
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBSTATUS) += usr/bin/smbstatus
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTAR) += usr/bin/smbtar
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBTREE) += usr/bin/smbtree
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT) += usr/sbin/swat
SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB) += usr/bin/tdbbackup \
@@ -91,7 +97,7 @@
PRIVATEDIR="${TARGET_DIR}/etc/samba" \
CONFIGDIR="${TARGET_DIR}/etc/samba" \
VARDIR="${TARGET_DIR}/var/log/samba" \
- -C $(SAMBA_DIR) installservers installbin installcifsmount
+ -C $(SAMBA_DIR) installservers installbin installcifsmount installscripts
for file in $(SAMBA_TARGETS_); do \
rm -f $(TARGET_DIR)/$$file; \
done
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-12-02 14:46 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-02 14:46 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-02 06:46:38 -0800 (Tue, 02 Dec 2008)
New Revision: 24229
Log:
samba: bump version to 3.0.33
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-12-02 09:15:08 UTC (rev 24228)
+++ trunk/buildroot/package/samba/samba.mk 2008-12-02 14:46:38 UTC (rev 24229)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.28a
+SAMBA_VERSION:=3.0.33
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-12-05 14:46 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-05 14:46 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-05 06:46:56 -0800 (Fri, 05 Dec 2008)
New Revision: 24283
Log:
samba: predefine a autoconf result for enums with negative values
The configure script tries to find out if enums can be negative, this is not
supported when cross compiling, since it tries to run the binary. This commit
sets the test to yes, i.e. negative enums are possible.
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-12-05 10:22:52 UTC (rev 24282)
+++ trunk/buildroot/package/samba/samba.mk 2008-12-05 14:46:56 UTC (rev 24283)
@@ -33,6 +33,7 @@
samba_cv_HAVE_FCNTL_LOCK=yes \
samba_cv_HAVE_SECURE_MKSTEMP=yes \
samba_cv_fpie=no \
+ SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-12-12 9:09 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-12 9:09 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-12 01:09:51 -0800 (Fri, 12 Dec 2008)
New Revision: 24389
Log:
samba: bump version to 3.2.5
This patch bumps Samba version to 3.2.5. In the process Samba now
depends on libiconv. This dependency is needed because Samba wants to use
various formats when talking to the different parts of the system.
Two new patches are introduced, one to double check if BSD functions are
available, and one to skip checking for glibc version. The use unsigned
enum patch could be removed since this can be supplied with a autoconf
variable.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Added:
trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch
trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch
Modified:
trunk/buildroot/package/samba/Config.in
trunk/buildroot/package/samba/samba-getgrouplist.patch
trunk/buildroot/package/samba/samba-remove-legacy-index.patch
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/Config.in
===================================================================
--- trunk/buildroot/package/samba/Config.in 2008-12-12 09:03:47 UTC (rev 24388)
+++ trunk/buildroot/package/samba/Config.in 2008-12-12 09:09:51 UTC (rev 24389)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_SAMBA
bool "samba"
+ select BR2_PACKAGE_LIBICONV
help
Provides print services to all manner of SMB/CIFS clients,
including the numerous versions of Microsoft Windows
Added: trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch
===================================================================
--- trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch 2008-12-12 09:09:51 UTC (rev 24389)
@@ -0,0 +1,18 @@
+--- a/source/client/mount.cifs.c
++++ b/source/client/mount.cifs.c
+@@ -91,6 +91,7 @@ char * prefixpath = NULL;
+
+ /* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
+ * don't link to libreplace so need them here. */
++#if defined(__GLIBC__) && !(defined(__UCLIBC__) && defined(__USE_BSD))
+
+ /* like strncpy but does not 0 fill the buffer and always null
+ * terminates. bufsize is the size of the destination buffer */
+@@ -126,6 +127,7 @@ static size_t strlcat(char *d, const cha
+ }
+ return ret;
+ }
++#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
+
+ /* BB finish BB
+
Added: trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch
===================================================================
--- trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch 2008-12-12 09:09:51 UTC (rev 24389)
@@ -0,0 +1,99 @@
+--- a/source/configure
++++ b/source/configure
+@@ -40770,85 +40770,8 @@ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-#
+-#
+-#
+-case "$host_os" in
+- *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; }; }
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <unistd.h>
+-#include <sys/utsname.h>
+-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);
+-#endif
+- exit(0);
+-}
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- linux_getgrouplist_ok=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-linux_getgrouplist_ok=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+- if test x"$linux_getgrouplist_ok" = x"yes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETGROUPLIST 1
+-_ACEOF
+-
+- fi
+- ;;
+- *)
++# Stripped glibc test which is not needed for uClibc
++linux_getgrouplist_ok=yes
+
+ for ac_func in getgrouplist
+ do
+@@ -40943,8 +40866,6 @@ _ACEOF
+ fi
+ done
+
+- ;;
+-esac
+
+ #
+ # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
Modified: trunk/buildroot/package/samba/samba-getgrouplist.patch
===================================================================
--- trunk/buildroot/package/samba/samba-getgrouplist.patch 2008-12-12 09:03:47 UTC (rev 24388)
+++ trunk/buildroot/package/samba/samba-getgrouplist.patch 2008-12-12 09:09:51 UTC (rev 24389)
@@ -1,7 +1,6 @@
-diff -ur samba-3.0.25a/source/configure.in samba-3.0.25a-patched/source/configure.in
---- samba-3.0.25a/source/configure.in 2007-05-23 10:29:20.000000000 -0500
-+++ samba-3.0.25a-patched/source/configure.in 2007-06-19 11:38:21.000000000 -0500
-@@ -1370,38 +1370,6 @@
+--- a/source/configure.in
++++ b/source/configure.in
+@@ -1182,38 +1182,6 @@ AC_TRY_COMPILE([
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
#
Modified: trunk/buildroot/package/samba/samba-remove-legacy-index.patch
===================================================================
--- trunk/buildroot/package/samba/samba-remove-legacy-index.patch 2008-12-12 09:03:47 UTC (rev 24388)
+++ trunk/buildroot/package/samba/samba-remove-legacy-index.patch 2008-12-12 09:09:51 UTC (rev 24389)
@@ -1,7 +1,6 @@
-diff -ur samba-3.0.25a/source/registry/reg_perfcount.c samba-3.0.25a-patched/source/registry/reg_perfcount.c
---- samba-3.0.25a/source/registry/reg_perfcount.c 2007-02-28 22:55:05.000000000 -0600
-+++ samba-3.0.25a-patched/source/registry/reg_perfcount.c 2007-06-19 11:40:01.000000000 -0500
-@@ -615,14 +615,14 @@
+--- a/source/registry/reg_perfcount.c
++++ b/source/registry/reg_perfcount.c
+@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P
obj = NULL;
memset(buf, 0, PERFCOUNT_MAX_LEN);
memcpy(buf, data.dptr, data.dsize);
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-12-12 09:03:47 UTC (rev 24388)
+++ trunk/buildroot/package/samba/samba.mk 2008-12-12 09:09:51 UTC (rev 24389)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.0.33
+SAMBA_VERSION:=3.2.5
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
@@ -32,8 +32,9 @@
samba_cv_HAVE_MMAP=yes \
samba_cv_HAVE_FCNTL_LOCK=yes \
samba_cv_HAVE_SECURE_MKSTEMP=yes \
+ samba_cv_HAVE_NATIVE_ICONV=no \
+ samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
samba_cv_fpie=no \
- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -45,17 +46,21 @@
--with-privatedir=/etc/samba \
--with-logfilebase=/var/log/samba \
--with-configdir=/etc/samba \
+ --with-libiconv=$(STAGING_DIR) \
--without-ldap \
- --without-libaddns \
+ --without-ads \
+ --without-acl \
--with-included-popt \
--with-included-iniparser \
+ --disable-shared-libs \
+ --disable-static \
--disable-cups \
- --disable-static \
+ $(BR2_LARGEFILE) \
)
touch $@
$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
+ $(MAKE1) -C $(SAMBA_DIR)
SAMBA_TARGETS_ :=
SAMBA_TARGETS_y :=
@@ -98,13 +103,22 @@
PRIVATEDIR="${TARGET_DIR}/etc/samba" \
CONFIGDIR="${TARGET_DIR}/etc/samba" \
VARDIR="${TARGET_DIR}/var/log/samba" \
- -C $(SAMBA_DIR) installservers installbin installcifsmount installscripts
+ -C $(SAMBA_DIR) installlibs installservers installbin installcifsmount installscripts
+ # Do not install the LDAP-like embedded database tools
+ rm -f $(addprefix $(TARGET_DIR)/usr/bin/ldb, add del edit modify search)
+ # Remove not used library by Samba binaries
+ rm -f $(TARGET_DIR)/usr/lib/libnetapi*
+ rm -f $(TARGET_DIR)/usr/lib/libsmbclient*
+ rm -f $(TARGET_DIR)/usr/lib/libtalloc*
+ rm -f $(TARGET_DIR)/usr/lib/libtdb*
+ # Remove not wanted Samba binaries
for file in $(SAMBA_TARGETS_); do \
rm -f $(TARGET_DIR)/$$file; \
done
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+ # Strip the wanted Samba binaries
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
for file in $(SAMBA_TARGETS_y); do \
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$$file; \
+ $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/$$file; \
done
ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
cp -dpfr $(SAMBA_DIR)/../swat $(TARGET_DIR)/usr/
@@ -116,7 +130,7 @@
rm -rf $(TARGET_DIR)/var/cache/samba
rm -rf $(TARGET_DIR)/var/lib/samba
-samba: uclibc $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+samba: libiconv $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
samba-source: $(DL_DIR)/$(SAMBA_SOURCE)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-12-12 9:29 egtvedt at uclibc.org
2008-12-12 10:06 ` Peter Korsgaard
0 siblings, 1 reply; 25+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-12 9:29 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-12 01:29:37 -0800 (Fri, 12 Dec 2008)
New Revision: 24390
Log:
samba: make proto first to allow parallel build afterwards
This patch fixes parallel build of Samba. The trick is to make proto before
executing a full make.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-12-12 09:09:51 UTC (rev 24389)
+++ trunk/buildroot/package/samba/samba.mk 2008-12-12 09:29:37 UTC (rev 24390)
@@ -60,7 +60,8 @@
touch $@
$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
- $(MAKE1) -C $(SAMBA_DIR)
+ $(MAKE) -C $(SAMBA_DIR) proto
+ $(MAKE) -C $(SAMBA_DIR)
SAMBA_TARGETS_ :=
SAMBA_TARGETS_y :=
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2008-12-12 9:29 egtvedt at uclibc.org
@ 2008-12-12 10:06 ` Peter Korsgaard
2008-12-12 10:14 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 25+ messages in thread
From: Peter Korsgaard @ 2008-12-12 10:06 UTC (permalink / raw)
To: buildroot
>>>>> "egtvedt" == egtvedt <egtvedt@uclibc.org> writes:
Hi,
egtvedt> Author: egtvedt
egtvedt> Date: 2008-12-12 01:29:37 -0800 (Fri, 12 Dec 2008)
egtvedt> New Revision: 24390
egtvedt> Log:
egtvedt> samba: make proto first to allow parallel build afterwards
egtvedt> This patch fixes parallel build of Samba. The trick is to make proto before
egtvedt> executing a full make.
egtvedt> $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
egtvedt> - $(MAKE1) -C $(SAMBA_DIR)
egtvedt> + $(MAKE) -C $(SAMBA_DIR) proto
Shouldn't this then be $(MAKE1) ?
egtvedt> + $(MAKE) -C $(SAMBA_DIR)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2008-12-12 10:06 ` Peter Korsgaard
@ 2008-12-12 10:14 ` Hans-Christian Egtvedt
2008-12-12 10:29 ` Peter Korsgaard
0 siblings, 1 reply; 25+ messages in thread
From: Hans-Christian Egtvedt @ 2008-12-12 10:14 UTC (permalink / raw)
To: buildroot
On Fri, 12 Dec 2008 11:06:26 +0100
Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "egtvedt" == egtvedt <egtvedt@uclibc.org> writes:
<snipp>
> egtvedt> $(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
> egtvedt> - $(MAKE1) -C $(SAMBA_DIR)
> egtvedt> + $(MAKE) -C $(SAMBA_DIR) proto
>
> Shouldn't this then be $(MAKE1) ?
>
Not needed, it is safe to parallel build the proto stuff. The problem
is that the all: rule does not depend properly on proto.
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2008-12-12 10:14 ` Hans-Christian Egtvedt
@ 2008-12-12 10:29 ` Peter Korsgaard
2008-12-12 10:35 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 25+ messages in thread
From: Peter Korsgaard @ 2008-12-12 10:29 UTC (permalink / raw)
To: buildroot
>>>>> "Hans-Christian" == Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> writes:
>> Shouldn't this then be $(MAKE1) ?
>>
Hans-Christian> Not needed, it is safe to parallel build the proto stuff. The problem
Hans-Christian> is that the all: rule does not depend properly on proto.
Ok, it would probably be handy to add a small comment to explain why
it's done like this.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2008-12-12 10:34 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2008-12-12 10:34 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-12-12 02:34:25 -0800 (Fri, 12 Dec 2008)
New Revision: 24391
Log:
samba: add a comment about why make proto is done before make
This patch adds a comment why make proto is needed before make.
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2008-12-12 09:29:37 UTC (rev 24390)
+++ trunk/buildroot/package/samba/samba.mk 2008-12-12 10:34:25 UTC (rev 24391)
@@ -60,6 +60,7 @@
touch $@
$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
+ # make proto must be done before make to be parallel safe
$(MAKE) -C $(SAMBA_DIR) proto
$(MAKE) -C $(SAMBA_DIR)
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2008-12-12 10:29 ` Peter Korsgaard
@ 2008-12-12 10:35 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 25+ messages in thread
From: Hans-Christian Egtvedt @ 2008-12-12 10:35 UTC (permalink / raw)
To: buildroot
On Fri, 12 Dec 2008 11:29:34 +0100
Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "Hans-Christian" == Hans-Christian Egtvedt
> >>>>> <hans-christian.egtvedt@atmel.com> writes:
>
> >> Shouldn't this then be $(MAKE1) ?
> >>
>
> Hans-Christian> Not needed, it is safe to parallel build the proto
> stuff. The problem Hans-Christian> is that the all: rule does not
> depend properly on proto.
>
> Ok, it would probably be handy to add a small comment to explain why
> it's done like this.
>
Okay, done in r24391.
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2009-01-13 7:26 egtvedt at uclibc.org
2009-01-13 8:00 ` Bernhard Reutner-Fischer
0 siblings, 1 reply; 25+ messages in thread
From: egtvedt at uclibc.org @ 2009-01-13 7:26 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2009-01-13 07:26:55 +0000 (Tue, 13 Jan 2009)
New Revision: 24809
Log:
samba: properly disable largefile if not selected in Buildroot
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2009-01-13 00:46:39 UTC (rev 24808)
+++ trunk/buildroot/package/samba/samba.mk 2009-01-13 07:26:55 UTC (rev 24809)
@@ -11,6 +11,10 @@
SAMBA_BINARY:=bin/smbd
SAMBA_TARGET_BINARY:=usr/sbin/smbd
+ifneq ($(BR2_LARGEFILE),y)
+SAMBA_DISABLE_LARGEFILE:=--disable-largefile
+endif
+
$(DL_DIR)/$(SAMBA_SOURCE):
$(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE)
@@ -55,7 +59,7 @@
--disable-shared-libs \
--disable-static \
--disable-cups \
- $(BR2_LARGEFILE) \
+ $(SAMBA_DISABLE_LARGEFILE) \
)
touch $@
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2009-01-13 7:29 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2009-01-13 7:29 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2009-01-13 07:29:35 +0000 (Tue, 13 Jan 2009)
New Revision: 24810
Log:
samba: bump version to 3.2.7 and refresh patches against this version
This patch bumps the Samba version to 3.2.7 and refreshes the patches. It also
fixes two minor issues by introducing two new small patches.
Added:
trunk/buildroot/package/samba/samba-fix-client-mtab.patch
trunk/buildroot/package/samba/samba-fix-mount.cifs.patch
Removed:
trunk/buildroot/package/samba/samba-use-unsigned-enums.patch
Modified:
trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch
trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch
trunk/buildroot/package/samba/samba-getgrouplist.patch
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch
===================================================================
--- trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch 2009-01-13 07:26:55 UTC (rev 24809)
+++ trunk/buildroot/package/samba/samba-add-check-for-__use_bsd.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -1,6 +1,6 @@
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
-@@ -91,6 +91,7 @@ char * prefixpath = NULL;
+@@ -96,6 +96,7 @@ char * prefixpath = NULL;
/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
* don't link to libreplace so need them here. */
@@ -8,11 +8,11 @@
/* like strncpy but does not 0 fill the buffer and always null
* terminates. bufsize is the size of the destination buffer */
-@@ -126,6 +127,7 @@ static size_t strlcat(char *d, const cha
- }
- return ret;
+@@ -177,6 +178,7 @@ static void mount_cifs_usage(void)
+ SAFE_FREE(mountpassword);
+ exit(EX_USAGE);
}
+#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
- /* BB finish BB
-
+ /* caller frees username if necessary */
+ static char * getusername(void) {
Modified: trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch
===================================================================
--- trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch 2009-01-13 07:26:55 UTC (rev 24809)
+++ trunk/buildroot/package/samba/samba-do-not-check-glibc-version.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -1,6 +1,6 @@
--- a/source/configure
+++ b/source/configure
-@@ -40770,85 +40770,8 @@ fi
+@@ -41016,85 +41016,8 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -88,7 +88,7 @@
for ac_func in getgrouplist
do
-@@ -40943,8 +40866,6 @@ _ACEOF
+@@ -41189,8 +41112,6 @@ _ACEOF
fi
done
Added: trunk/buildroot/package/samba/samba-fix-client-mtab.patch
===================================================================
--- trunk/buildroot/package/samba/samba-fix-client-mtab.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-fix-client-mtab.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -0,0 +1,11 @@
+--- a/source/client/mtab.c
++++ b/source/client/mtab.c
+@@ -31,6 +31,8 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <fcntl.h>
Added: trunk/buildroot/package/samba/samba-fix-mount.cifs.patch
===================================================================
--- trunk/buildroot/package/samba/samba-fix-mount.cifs.patch (rev 0)
+++ trunk/buildroot/package/samba/samba-fix-mount.cifs.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -0,0 +1,40 @@
+--- a/source/client/mount.cifs.c
++++ b/source/client/mount.cifs.c
+@@ -16,6 +16,10 @@
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
++#ifdef _SAMBA_BUILD_
++#include "include/config.h"
++#endif
++
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
+@@ -57,10 +61,6 @@
+ #endif /* _SAMBA_BUILD_ */
+ #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
+
+-#ifdef _SAMBA_BUILD_
+-#include "include/config.h"
+-#endif
+-
+ #ifndef MS_MOVE
+ #define MS_MOVE 8192
+ #endif
+@@ -138,6 +138,7 @@ static size_t strlcat(char *d, const cha
+ return ret;
+ }
+ #endif
++#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
+
+ /* BB finish BB
+
+@@ -178,7 +179,6 @@ static void mount_cifs_usage(void)
+ SAFE_FREE(mountpassword);
+ exit(EX_USAGE);
+ }
+-#endif /* __GLIBC__ && !(__UCLIBC__ && __USE_BSD) */
+
+ /* caller frees username if necessary */
+ static char * getusername(void) {
Modified: trunk/buildroot/package/samba/samba-getgrouplist.patch
===================================================================
--- trunk/buildroot/package/samba/samba-getgrouplist.patch 2009-01-13 07:26:55 UTC (rev 24809)
+++ trunk/buildroot/package/samba/samba-getgrouplist.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -1,6 +1,6 @@
--- a/source/configure.in
+++ b/source/configure.in
-@@ -1182,38 +1182,6 @@ AC_TRY_COMPILE([
+@@ -1199,38 +1199,6 @@ AC_TRY_COMPILE([
AC_DEFINE(HAVE_PRCTL, 1, [Whether prctl is available]),[])
#
Deleted: trunk/buildroot/package/samba/samba-use-unsigned-enums.patch
===================================================================
--- trunk/buildroot/package/samba/samba-use-unsigned-enums.patch 2009-01-13 07:26:55 UTC (rev 24809)
+++ trunk/buildroot/package/samba/samba-use-unsigned-enums.patch 2009-01-13 07:29:35 UTC (rev 24810)
@@ -1,43 +0,0 @@
-diff -ur samba-3.0.25a/source/configure.in samba-3.0.25a-patched/source/configure.in
---- samba-3.0.25a/source/configure.in 2007-06-19 11:40:49.000000000 -0500
-+++ samba-3.0.25a-patched/source/configure.in 2007-06-19 11:45:04.000000000 -0500
-@@ -511,37 +511,8 @@
- AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
- fi
-
--############################################
--# check if the compiler can handle negative enum values
--# and don't truncate the values to INT_MAX
--# a runtime test is needed here
--AC_SUBST(PIDL_ARGS)
--AC_CACHE_CHECK([that the C compiler understands negative enum values],SMB_BUILD_CC_NEGATIVE_ENUM_VALUES, [
-- AC_TRY_RUN(
--[
-- #include <stdio.h>
-- 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;
-- }
--],
-- SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes,SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=no)])
--if test x"$SMB_BUILD_CC_NEGATIVE_ENUM_VALUES" != x"yes"; then
-- AC_MSG_WARN([using --unit-enums for pidl])
-- PIDL_ARGS="$PIDL_ARGS --uint-enums"
--fi
-+# Just hard code this for cross compile cases
-+PIDL_ARGS="$PIDL_ARGS --uint-enums"
-
- dnl Figure out the flags to support named structure initializers
-
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2009-01-13 07:26:55 UTC (rev 24809)
+++ trunk/buildroot/package/samba/samba.mk 2009-01-13 07:29:35 UTC (rev 24810)
@@ -3,7 +3,7 @@
# samba
#
#############################################################
-SAMBA_VERSION:=3.2.5
+SAMBA_VERSION:=3.2.7
SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
SAMBA_SITE:=http://samba.org/samba/ftp/stable/
SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2009-01-13 7:26 egtvedt at uclibc.org
@ 2009-01-13 8:00 ` Bernhard Reutner-Fischer
2009-01-13 8:03 ` Hans-Christian Egtvedt
0 siblings, 1 reply; 25+ messages in thread
From: Bernhard Reutner-Fischer @ 2009-01-13 8:00 UTC (permalink / raw)
To: buildroot
On Tue, Jan 13, 2009 at 07:26:56AM +0000, egtvedt at uclibc.org wrote:
>Author: egtvedt
>Date: 2009-01-13 07:26:55 +0000 (Tue, 13 Jan 2009)
>New Revision: 24809
>
>Log:
>samba: properly disable largefile if not selected in Buildroot
properly would mean using $(DISABLE_LARGEFILE). Please fix.
>
>
>Modified:
> trunk/buildroot/package/samba/samba.mk
>
>
>Changeset:
>Modified: trunk/buildroot/package/samba/samba.mk
>===================================================================
>--- trunk/buildroot/package/samba/samba.mk 2009-01-13 00:46:39 UTC (rev 24808)
>+++ trunk/buildroot/package/samba/samba.mk 2009-01-13 07:26:55 UTC (rev 24809)
>@@ -11,6 +11,10 @@
> SAMBA_BINARY:=bin/smbd
> SAMBA_TARGET_BINARY:=usr/sbin/smbd
>
>+ifneq ($(BR2_LARGEFILE),y)
>+SAMBA_DISABLE_LARGEFILE:=--disable-largefile
>+endif
>+
> $(DL_DIR)/$(SAMBA_SOURCE):
> $(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE)
>
>@@ -55,7 +59,7 @@
> --disable-shared-libs \
> --disable-static \
> --disable-cups \
>- $(BR2_LARGEFILE) \
>+ $(SAMBA_DISABLE_LARGEFILE) \
> )
> touch $@
>
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
@ 2009-01-13 8:02 egtvedt at uclibc.org
0 siblings, 0 replies; 25+ messages in thread
From: egtvedt at uclibc.org @ 2009-01-13 8:02 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2009-01-13 08:02:52 +0000 (Tue, 13 Jan 2009)
New Revision: 24811
Log:
samba: use proper BR variable to disable largefile while configuring
Modified:
trunk/buildroot/package/samba/samba.mk
Changeset:
Modified: trunk/buildroot/package/samba/samba.mk
===================================================================
--- trunk/buildroot/package/samba/samba.mk 2009-01-13 07:29:35 UTC (rev 24810)
+++ trunk/buildroot/package/samba/samba.mk 2009-01-13 08:02:52 UTC (rev 24811)
@@ -11,10 +11,6 @@
SAMBA_BINARY:=bin/smbd
SAMBA_TARGET_BINARY:=usr/sbin/smbd
-ifneq ($(BR2_LARGEFILE),y)
-SAMBA_DISABLE_LARGEFILE:=--disable-largefile
-endif
-
$(DL_DIR)/$(SAMBA_SOURCE):
$(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE)
@@ -59,7 +55,7 @@
--disable-shared-libs \
--disable-static \
--disable-cups \
- $(SAMBA_DISABLE_LARGEFILE) \
+ $(DISABLE_LARGEFILE) \
)
touch $@
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/samba
2009-01-13 8:00 ` Bernhard Reutner-Fischer
@ 2009-01-13 8:03 ` Hans-Christian Egtvedt
0 siblings, 0 replies; 25+ messages in thread
From: Hans-Christian Egtvedt @ 2009-01-13 8:03 UTC (permalink / raw)
To: buildroot
On Tue, 13 Jan 2009 09:00:54 +0100
Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> wrote:
> On Tue, Jan 13, 2009 at 07:26:56AM +0000, egtvedt at uclibc.org wrote:
> >Author: egtvedt
> >Date: 2009-01-13 07:26:55 +0000 (Tue, 13 Jan 2009)
> >New Revision: 24809
> >
> >Log:
> >samba: properly disable largefile if not selected in Buildroot
>
> properly would mean using $(DISABLE_LARGEFILE). Please fix.
>
Thanks, corrected.
--
Best regards,
Hans-Christian Egtvedt
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2009-01-13 8:03 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-24 8:36 [Buildroot] svn commit: trunk/buildroot/package/samba jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-13 8:02 egtvedt at uclibc.org
2009-01-13 7:29 egtvedt at uclibc.org
2009-01-13 7:26 egtvedt at uclibc.org
2009-01-13 8:00 ` Bernhard Reutner-Fischer
2009-01-13 8:03 ` Hans-Christian Egtvedt
2008-12-12 10:34 egtvedt at uclibc.org
2008-12-12 9:29 egtvedt at uclibc.org
2008-12-12 10:06 ` Peter Korsgaard
2008-12-12 10:14 ` Hans-Christian Egtvedt
2008-12-12 10:29 ` Peter Korsgaard
2008-12-12 10:35 ` Hans-Christian Egtvedt
2008-12-12 9:09 egtvedt at uclibc.org
2008-12-05 14:46 egtvedt at uclibc.org
2008-12-02 14:46 egtvedt at uclibc.org
2008-10-06 19:53 wberrier at uclibc.org
2008-07-03 8:12 ulf at uclibc.org
2008-03-11 19:13 ninevoltz at uclibc.org
2008-03-06 18:23 ninevoltz at uclibc.org
2007-09-23 23:23 ulf at uclibc.org
2007-07-28 21:51 ulf at uclibc.org
2007-07-23 7:56 ulf at uclibc.org
2007-07-17 0:21 sjhill at uclibc.org
2007-04-03 15:35 jacmet at uclibc.org
2007-01-21 5:17 sjhill at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox