# HG changeset patch
# User Dimitri Pascual <quetzal@khetzal.info>
# Date 1187280605 0
# Node ID 8d16f133d83e99c491edd5b386329b23b162d22f
# Parent  2e65ac2a22e44428f55fd648084a8f07ffff65af
Add php, sqlite. Fix samba, zlib

diff -r 2e65ac2a22e4 -r 8d16f133d83e package/Config.in
--- a/package/Config.in	Tue Aug 14 19:42:08 2007 +0000
+++ b/package/Config.in	Thu Aug 16 16:10:05 2007 +0000
@@ -240,6 +240,7 @@ source "package/pciutils/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmanfm/Config.in"
 source "package/pcmcia/Config.in"
+source "package/php/Config.in"
 source "package/pidgin/Config.in"
 source "package/poppler/Config.in"
 source "package/portage/Config.in"
@@ -274,6 +275,7 @@ source "package/secretmaryo/Config.in"
 source "package/secretmaryo/Config.in"
 source "package/sox/Config.in"
 source "package/speex/Config.in"
+source "package/sqlite/Config.in"
 source "package/squashfs-cross-tools/Config.in"
 source "package/strace/Config.in"
 source "package/streamtuner/Config.in"
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/Config.in
--- a/package/samba/Config.in	Tue Aug 14 19:42:08 2007 +0000
+++ b/package/samba/Config.in	Thu Aug 16 16:10:05 2007 +0000
@@ -1,10 +1,181 @@ config BR2_PACKAGE_SAMBA
 config BR2_PACKAGE_SAMBA
-	bool "samba (broken)"
+	bool "samba"
 	default n
 	help
-	  Samba is an Open Source/Free Software suite that has, since 1992,
-	  provided file and print services to all manner of SMB/CIFS clients,
-	  including the numerous versions of Microsoft Windows operating
-	  systems. Samba is freely available under the GNU General Public
-	  License.
-	  http://www.samba.org
+	  Provides print services to all manner of SMB/CIFS clients,
+	  including the numerous versions of Microsoft Windows
+	  operating systems.
+
+	  http://www.samba.org/
+
+	  NOTE: A complete Samba install takes close to 40MB of space,
+		so choose only the components you need.
+
+menu "Samba tools selection"
+	depends BR2_PACKAGE_SAMBA
+
+config BR2_PACKAGE_SAMBA_CIFS
+	bool "cifs"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Support CIFS
+
+config BR2_PACKAGE_SAMBA_EVENTLOGADM
+	bool "eventlogadm"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Write Eventlog records to a tdb or perform other eventlog functions
+
+config BR2_PACKAGE_SAMBA_NET
+	bool "net"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Distributed SMB/CIFS Server Management Utility
+
+config BR2_PACKAGE_SAMBA_NMBD
+	bool "nmbd"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  NetBIOS name server to provide NetBIOS over IP naming services
+	  to clients
+
+config BR2_PACKAGE_SAMBA_NMBLOOKUP
+	bool "nmblookup"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Query NetBIOS names and map them to IP addresses in a network
+	  using NetBIOS over TCP/IP queries
+
+config BR2_PACKAGE_SAMBA_NTLM_AUTH
+	bool "ntlm_auth"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Helper utility that authenticates users using NT/LM authentication
+
+config BR2_PACKAGE_SAMBA_PDBEDIT
+	bool "pdbedit"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Manage the SAM database (Database of Samba Users)
+
+config BR2_PACKAGE_SAMBA_PROFILES
+	bool "profiles"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Utility that reports and changes SIDs in Windows NT registry files
+
+config BR2_PACKAGE_SAMBA_RPCCLIENT
+	bool "rpcclient"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Tool for executing client side MS-RPC functions using RPC
+	  calls from a UNIX workstation.
+
+config BR2_PACKAGE_SAMBA_SMBCACLS
+	bool "smbcacls"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Set or get ACLs on an NT file or directory names
+
+config BR2_PACKAGE_SAMBA_SMBCLIENT
+	bool "smbclient"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  ftp-like client to access SMB/CIFS resources on servers
+
+config BR2_PACKAGE_SAMBA_SMBCONTROL
+	bool "smbcontrol"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Send messages to smbd, nmbd or winbindd processes
+
+config BR2_PACKAGE_SAMBA_SMBCQUOTAS
+	bool "smbcquotas"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Set or get QUOTAs of NTFS 5 shares
+
+config BR2_PACKAGE_SAMBA_SMBGET
+	bool "smbget"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  wget-like utility for download files over SMB
+
+config BR2_PACKAGE_SAMBA_SMBPASSWD
+	bool "smbpasswd"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Change a user's SMB passwd
+
+config BR2_PACKAGE_SAMBA_SMBSPOOL
+	bool "smbspool"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Send a print file to an SMB printer
+
+config BR2_PACKAGE_SAMBA_SMBSTATUS
+	bool "smbstatus"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Report on current Samba connections
+
+config BR2_PACKAGE_SAMBA_SMBTREE
+	bool "smbtree"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  A text based smb network browser
+
+config BR2_PACKAGE_SAMBA_SWAT
+	bool "swat"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Samba Web Administration Tool
+
+config BR2_PACKAGE_SAMBA_TDB
+	bool "tdb"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Tools to operate on the .tdb database files
+
+config BR2_PACKAGE_SAMBA_TESTPARM
+	bool "testparm"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Check an smb.conf configuration file for internal correctness
+
+config BR2_PACKAGE_SAMBA_WINBINDD
+	bool "winbindd"
+	default y
+	depends on BR2_PACKAGE_SAMBA
+	help
+	  Name Service Switch daemon for resolving names from NT servers
+
+config BR2_PACKAGE_SAMBA_WBINFO
+	bool "wbinfo"
+	default y
+	depends on BR2_PACKAGE_SAMBA_WINBINDD
+	help
+	  Query information from winbind daemon
+
+endmenu
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/samba.mk
--- a/package/samba/samba.mk	Tue Aug 14 19:42:08 2007 +0000
+++ b/package/samba/samba.mk	Thu Aug 16 16:10:05 2007 +0000
@@ -5,136 +5,119 @@
 #############################################################
 SAMBA_VERSION:=3.0.25b
 SAMBA_SOURCE:=samba-$(SAMBA_VERSION).tar.gz
-SAMBA_SITE:=http://samba.org/samba/ftp
-SAMBA_CAT:=zcat
-SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)
-SAMBA_BINARY:=samba
+SAMBA_SITE:=ftp://us4.samba.org/pub/samba/
+SAMBA_DIR:=$(BUILD_DIR)/samba-$(SAMBA_VERSION)/source
+SAMBA_CAT:=$(ZCAT)
+SAMBA_BINARY:=bin/smbd
+SAMBA_TARGET_BINARY:=usr/sbin/smbd
 
 $(DL_DIR)/$(SAMBA_SOURCE):
-	 $(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(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 $(SAMBA_DIR) package/samba/ \*.patch*
+	toolchain/patch-kernel.sh `dirname $(SAMBA_DIR)` package/samba/ samba\*.patch
 	$(CONFIG_UPDATE) $(SAMBA_DIR)
-	touch $(SAMBA_DIR)/.unpacked
+	touch $@
 
 $(SAMBA_DIR)/.configured: $(SAMBA_DIR)/.unpacked
-	(cd $(SAMBA_DIR)/source; 				\
-		./autogen.sh;					\
-		rm -rf config.cache; 				\
-		env $(TARGET_CONFIGURE_OPTS) 			\
-		PKG_CONFIG_PATH=$(STAGING_DIR)/lib/pkgconfig \
-		SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
+	(cd $(SAMBA_DIR); rm -rf config.cache; \
+		./autogen.sh; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		samba_cv_HAVE_GETTIMEOFDAY_TZ=yes \
+		samba_cv_USE_SETREUID=yes \
+		samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes \
 		./configure \
-		--host=$(REAL_GNU_TARGET_NAME) \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		$(DISABLE_NLS) \
+		--with-lockdir=/var/cache/samba \
+		--with-piddir=/var/run \
+		--with-privatedir=/etc/samba \
+		--with-logfilebase=/var/log/samba \
+		--with-configdir=/etc/samba \
+		--without-ldap \
+		--without-libaddns \
+		--with-included-popt \
+		--with-included-iniparser \
+		--disable-cups \
 		--disable-static \
-		--disable-debug \
-		--disable-doc \
-		--disable-cups \
-		--disable-iprint \
-		--disable-fam \
-		--without-afs \
-		--without-ldap \
-		--without-ads \
-		--without-dnsupdate \
-		--without-automount \
-		--without-smbmount \
-		--without-cifsmount \
-		--without-pam \
-		--without-pam_smbpass \
-		--without-nisplus-home \
-		--without-syslog \
-		--without-quotas \
-		--without-sys-quotas \
-		--without-utmp \
-		--without-libmsrpc \
-		--without-libaddns \
-		--without-libsmbclient \
-		--without-libsmbsharemodes \
-		--without-cluster-support \
-		--without-acl-support \
-		--without-aio-support \
-		--without-winbind \
-		--with-sendfile-support \
 	);
-	touch $(SAMBA_DIR)/.configured
+	touch $@
 
+$(SAMBA_DIR)/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(SAMBA_DIR)
 
-$(SAMBA_DIR)/src/$(SAMBA_BINARY): $(SAMBA_DIR)/.configured
-	$(MAKE) -C $(SAMBA_DIR)/source
+SAMBA_TARGETS_ :=
+SAMBA_TARGETS_y :=
 
-$(STAGING_DIR)/bin/$(SAMBA_BINARY): $(SAMBA_DIR)/src/$(SAMBA_BINARY)
-	$(MAKE) prefix=$(STAGING_DIR) \
-	    exec_prefix=$(STAGING_DIR) \
-	    bindir=$(STAGING_DIR)/bin \
-	    sbindir=$(STAGING_DIR)/sbin \
-	    libexecdir=$(STAGING_DIR)/libexec \
-	    datadir=$(STAGING_DIR)/share \
-	    sysconfdir=$(STAGING_DIR)/etc \
-	    sharedstatedir=$(STAGING_DIR)/com \
-	    localstatedir=$(STAGING_DIR)/var \
-	    libdir=$(STAGING_DIR)/usr/lib \
-	    includedir=$(STAGING_DIR)/include \
-	    oldincludedir=$(STAGING_DIR)/include \
-	    infodir=$(STAGING_DIR)/info \
-	    mandir=$(STAGING_DIR)/man \
-	    -C $(SAMBA_DIR) install
+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_NET)		+= usr/bin/net
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBD)		+= usr/sbin/nmbd
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NMBLOOKUP)	+= usr/bin/nmblookup
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_NTLM_AUTH)	+= usr/bin/ntlm_auth
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PDBEDIT)	+= usr/bin/pdbedit
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_PROFILES)	+= usr/bin/profiles
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_RPCCLIENT)	+= usr/bin/rpcclient
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCACLS)	+= usr/bin/smbcacls
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCLIENT)	+= usr/bin/smbclient
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCONTROL)	+= usr/bin/smbcontrol
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBCQUOTAS)	+= usr/bin/smbcquotas
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SMBGET)	+= usr/bin/smbget
+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_SMBTREE)	+= usr/bin/smbtree
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_SWAT)		+= usr/sbin/swat
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TDB)		+= usr/bin/tdbbackup     \
+						   usr/bin/tdbdump       \
+						   usr/bin/tdbtool
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_TESTPARM)	+= usr/bin/testparm
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WINBINDD)	+= usr/sbin/winbindd
+SAMBA_TARGETS_$(BR2_PACKAGE_SAMBA_WBINFO)	+= usr/bin/wbinfo
 
-$(TARGET_DIR)/usr/bin/$(SAMBA_BINARY): $(STAGING_DIR)/bin/$(SAMBA_BINARY)
-ifeq ($(BR2_ENABLE_LOCALE),y)
-	for lang in $(LINGUAS); do \
-	  mkdir -p $(TARGET_DIR)/usr/share/locale/$$lang/LC_MESSAGES/; \
-	  cp -a $(STAGING_DIR)/share/locale/$$lang/LC_MESSAGES/samba.mo \
-	  	$(TARGET_DIR)/usr/share/locale/$$lang/LC_MESSAGES/; \
+$(TARGET_DIR)/$(SAMBA_TARGET_BINARY): $(SAMBA_DIR)/$(SAMBA_BINARY)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) 	\
+		prefix="${TARGET_DIR}/usr" \
+		BASEDIR="${TARGET_DIR}/usr" \
+		SBINDIR="${TARGET_DIR}/usr/sbin" \
+		LOCKDIR="${TARGET_DIR}/var/cache/samba" \
+		PRIVATEDIR="${TARGET_DIR}/etc/samba" \
+		CONFIGDIR="${TARGET_DIR}/etc/samba" \
+		VARDIR="${TARGET_DIR}/var/log/samba" \
+		-C $(SAMBA_DIR) installservers installbin installcifsmount
+	for file in $(SAMBA_TARGETS_) ; do \
+		rm -f $(TARGET_DIR)/$$file; \
 	done
-endif
-	#
-	# Copy icons
-	mkdir -p $(TARGET_DIR)/usr/share/pixmaps/samba/
-	cp -a $(STAGING_DIR)/share/pixmaps/samba/* $(TARGET_DIR)/usr/share/pixmaps/samba/
-	#
-	# Copy preferences
-	mkdir -p $(TARGET_DIR)/etc/samba
-	cp -a $(STAGING_DIR)/etc/samba/samba.schemas $(TARGET_DIR)/etc/samba
-	# 
-	# Copy sound files
-	mkdir -p $(TARGET_DIR)/usr/share/sounds
-	cp -a $(STAGING_DIR)/share/sounds/samba $(TARGET_DIR)/usr/share/sounds/
-	#
-	# Copy binaries
-	cp -a $(STAGING_DIR)/bin/$(SAMBA_BINARY) $(TARGET_DIR)/usr/bin/
-	$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/bin/$(SAMBA_BINARY)
-	# local skeleton
-	tar cf - -C package/samba/root . | tar x -C $(TARGET_DIR)
+	$(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; \
+	fi;
+	rm -rf $(TARGET_DIR)/var/cache/samba
+	rm -rf $(TARGET_DIR)/var/lib/samba
 
-samba: uclibc popt $(TARGET_DIR)/usr/bin/$(SAMBA_BINARY)
+samba: uclibc $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
 
 samba-clean:
-	$(RM) $(STAGING_DIR)/bin/samba $(TARGET_DIR)/bin/samba
-	$(RM) $(STAGING_DIR)/etc/samba/samba.schemas
-	$(RM) $(TARGET_DIR)/etc/samba/samba.schemas
+	rm -f $(TARGET_DIR)/$(SAMBA_TARGET_BINARY)
+	for file in $(SAMBA_TARGETS_y) ; do \
+		rm -f $(TARGET_DIR)/$$file; \
+	done
+	rm -f $(TARGET_DIR)/etc/init.d/S91smb
+	rm -rf $(TARGET_DIR)/etc/samba
 	-$(MAKE) -C $(SAMBA_DIR) clean
-	# local skeleton
-	- ( cd package/samba/root && find . -type f -exec rm $(TARGET_DIR)/{} \; ) 
 
 samba-dirclean:
 	rm -rf $(SAMBA_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/zlib/zlib.mk
--- a/package/zlib/zlib.mk	Tue Aug 14 19:42:08 2007 +0000
+++ b/package/zlib/zlib.mk	Thu Aug 16 16:10:05 2007 +0000
@@ -3,11 +3,12 @@
 # zlib
 #
 #############################################################
-ZLIB_VER:=1.2.3
-ZLIB_SOURCE:=zlib-$(ZLIB_VER).tar.bz2
-ZLIB_SITE:=http://www.zlib.net/
-ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VER)
-ZLIB_CFLAGS:=$(TARGET_CFLAGS) -fPIC
+ZLIB_VERSION:=1.2.3
+ZLIB_SOURCE:=zlib-$(ZLIB_VERSION).tar.bz2
+ZLIB_CAT:=$(BZCAT)
+ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
+ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VERSION)
+ZLIB_CFLAGS:=-fPIC
 ifeq ($(BR2_LARGEFILE),y)
 ZLIB_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
@@ -15,59 +16,67 @@ endif
 $(DL_DIR)/$(ZLIB_SOURCE):
 	$(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE)
 
-$(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE)
-	bzcat $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+$(ZLIB_DIR)/.patched: $(DL_DIR)/$(ZLIB_SOURCE)
+	$(ZLIB_CAT) $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(ZLIB_DIR) package/zlib/ zlib\*.patch
-	touch $(ZLIB_DIR)/.source
+	$(CONFIG_UPDATE) $(@D)
+	touch $@
 
-$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.source
-	(cd $(ZLIB_DIR); \
+$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
+	(cd $(ZLIB_DIR); rm -rf config.cache ; \
+		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(ZLIB_CFLAGS)" \
 		./configure \
 		--shared \
 		--prefix=/usr \
 		--exec-prefix=$(STAGING_DIR)/usr/bin \
-		--libdir=$(STAGING_DIR)/lib \
-		--includedir=$(STAGING_DIR)/include \
-	);
-	touch $(ZLIB_DIR)/.configured;
+		--libdir=$(STAGING_DIR)/usr/lib \
+		--includedir=$(STAGING_DIR)/usr/include \
+	)
+	touch $@
 
-$(ZLIB_DIR)/libz.so.$(ZLIB_VER): $(ZLIB_DIR)/.configured
+$(ZLIB_DIR)/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/.configured
 	$(MAKE) -C $(ZLIB_DIR) all libz.a
-	touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VER)
+	touch -c $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION)
 
-$(STAGING_DIR)/lib/libz.so.$(ZLIB_VER): $(ZLIB_DIR)/libz.so.$(ZLIB_VER)
-	cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/lib;
-	cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/include;
-	cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/include;
-	cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/lib;
-	(cd $(STAGING_DIR)/lib; ln -fs libz.so.$(ZLIB_VER) libz.so.1);
-	chmod a-x $(STAGING_DIR)/lib/libz.so.$(ZLIB_VER)
-	touch -c $(STAGING_DIR)/lib/libz.so.$(ZLIB_VER)
+$(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(ZLIB_DIR)/libz.so.$(ZLIB_VERSION)
+	cp -dpf $(ZLIB_DIR)/libz.a $(STAGING_DIR)/usr/lib/
+	cp -dpf $(ZLIB_DIR)/zlib.h $(STAGING_DIR)/usr/include/
+	cp -dpf $(ZLIB_DIR)/zconf.h $(STAGING_DIR)/usr/include/
+	cp -dpf $(ZLIB_DIR)/libz.so* $(STAGING_DIR)/usr/lib/
+	ln -sf libz.so.$(ZLIB_VERSION) $(STAGING_DIR)/usr/lib/libz.so.1
+	chmod a-x $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+	touch -c $@
 
-$(TARGET_DIR)/lib/libz.so.$(ZLIB_VER): $(STAGING_DIR)/lib/libz.so.$(ZLIB_VER)
-	cp -dpf $(STAGING_DIR)/lib/libz.so* $(TARGET_DIR)/lib;
-	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libz.so*
-	touch -c $(TARGET_DIR)/lib/libz.so.$(ZLIB_VER)
+$(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION): $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+	mkdir -p $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/lib/libz.so* $(TARGET_DIR)/usr/lib
+	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libz.so*
+	touch -c $@
 
-$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/lib/libz.so.$(ZLIB_VER)
-	mkdir -p $(TARGET_DIR)/usr/include
-	cp -dpf $(STAGING_DIR)/include/zlib.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(STAGING_DIR)/include/zconf.h $(TARGET_DIR)/usr/include/
-	cp -dpf $(STAGING_DIR)/lib/libz.a $(TARGET_DIR)/usr/lib/
-	rm -f $(TARGET_DIR)/lib/libz.so
-	(cd $(TARGET_DIR)/usr/lib; ln -fs ../../lib/libz.so.$(ZLIB_VER) libz.so)
-	touch -c $(TARGET_DIR)/usr/lib/libz.a
+$(TARGET_DIR)/usr/lib/libz.a: $(STAGING_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
+	mkdir -p $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/include/zlib.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(STAGING_DIR)/usr/include/zconf.h $(TARGET_DIR)/usr/include/
+	cp -dpf $(STAGING_DIR)/usr/lib/libz.a $(TARGET_DIR)/usr/lib/
+	rm -f $(TARGET_DIR)/lib/libz.so $(TARGET_DIR)/usr/lib/libz.so
+	ln -sf libz.so.$(ZLIB_VERSION) $(TARGET_DIR)/usr/lib/libz.so
+	touch -c $@
 
 zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
 
-zlib: uclibc $(TARGET_DIR)/lib/libz.so.$(ZLIB_VER)
+zlib: uclibc $(TARGET_DIR)/usr/lib/libz.so.$(ZLIB_VERSION)
 
 zlib-source: $(DL_DIR)/$(ZLIB_SOURCE)
 
 zlib-clean:
-	rm -f $(TARGET_DIR)/lib/libz.so*
+	rm -f $(TARGET_DIR)/usr/lib/libz.so* \
+		$(TARGET_DIR)/usr/include/zlib.h \
+		$(TARGET_DIR)/usr/include/zconf.h \
+		$(STAGING_DIR)/usr/include/zlib.h \
+		$(STAGING_DIR)/usr/include/zconf.h \
+		$(STAGING_DIR)/usr/lib/libz.*
 	-$(MAKE) -C $(ZLIB_DIR) clean
 
 zlib-dirclean:
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/php/Config.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/php/Config.in	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,47 @@
+config BR2_PACKAGE_PHP
+	bool "php"
+	default n
+	help
+	  PHP  is a widely-used general-purpose scripting
+	  language that is especially suited for Web development
+	  and can be embedded into HTML.
+
+	  http://www.php.net
+
+config BR2_PACKAGE_PHP_CLI
+        bool "cli interface"
+        depends on BR2_PACKAGE_PHP
+        default y
+        help
+          command line interface for php. 
+          you must have at least cli or cgi selected.
+
+config BR2_PACKAGE_PHP_CGI
+        bool "cgi interface"
+        depends on BR2_PACKAGE_PHP
+        default y
+        help
+          cgi interface for php
+          you must have at least cli or cgi selected.
+
+config BR2_PACKAGE_PHP_OPENSSL
+        bool "openssl support"
+        depends on BR2_PACKAGE_PHP && BR2_PACKAGE_OPENSSL
+        default y
+        help
+          openssl support
+
+config BR2_PACKAGE_PHP_XML2
+        bool "xml2 support"
+        depends on BR2_PACKAGE_PHP && BR2_PACKAGE_LIBXML2
+        default y
+        help
+          xml support
+
+config BR2_PACKAGE_PHP_ZLIB
+        bool "zlib support"
+        depends on BR2_PACKAGE_PHP && BR2_PACKAGE_ZLIB
+        default y
+        help
+          zlib support
+
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/php/php.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/php/php.mk	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,127 @@
+#############################################################
+#
+# php
+#
+#############################################################
+PHP_VER:=5.2.3
+PHP_SOURCE:=php-$(PHP_VER).tar.bz2
+PHP_SITE:=http://us.php.net/get/${PHP_SOURCE}/from/us2.php.net/mirror
+PHP_DIR:=$(BUILD_DIR)/php-$(PHP_VER)
+PHP_CAT=bzcat
+PHP_DEPS=
+PHP_TARGET_DEPS=
+
+ifneq ($(BR2_PACKAGE_PHP_CLI),y)
+	PHP_CLI="--disable-cli"
+else
+	PHP_CLI="--enable-cli"
+	PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php
+endif
+
+ifneq ($(BR2_PACKAGE_PHP_CGI),y)
+	PHP_CGI="--disable-cgi"
+else
+	PHP_CGI="--enable-cgi"
+	PHP_TARGET_DEPS+=$(TARGET_DIR)/usr/bin/php-cgi
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_OPENSSL),y)
+	PHP_OPENSSL="--with-openssl=$(STAGING_DIR)/usr"
+	PHP_DEPS+=openssl
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_XML2),y)
+	PHP_XML=--enable-libxml \
+		--with-libxml-dir=${STAGING_DIR}/usr \
+		 --enable-xml \
+		 --enable-xmlreader \
+		 --enable-xmlwriter
+	PHP_DEPS+=libxml2
+endif
+
+ifeq ($(BR2_PACKAGE_PHP_ZLIB),y)
+	PHP_ZLIB="--with-zlib=$(STAGING_DIR)/usr"
+	PHP_DEPS+=zlib
+endif
+
+
+$(DL_DIR)/$(PHP_SOURCE):
+	 $(WGET) -P $(DL_DIR) $(PHP_SITE)
+
+php-source: $(DL_DIR)/$(PHP_SOURCE)
+
+$(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
+	$(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PHP_DIR)/.unpacked
+
+$(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
+	(cd $(PHP_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CC=$(TARGET_CC) \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/ \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share/misc \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--disable-all \
+		--enable-spl \
+		--enable-session \
+		--enable-sockets \
+		--with-pcre-regex \
+		--without-pear \
+		--disable-ipv6 \
+		$(DISABLE_NLS) \
+		$(PHP_OPENSSL) \
+		$(PHP_XML) \
+		$(PHP_CLI) \
+		$(PHP_CGI) \
+		$(PHP_ZLIB) \
+	);
+	touch $(PHP_DIR)/.configured
+
+$(PHP_DIR)/.built: $(PHP_DIR)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(PHP_DIR)
+	touch $(PHP_DIR)/.built
+
+$(PHP_DIR)/.staged: $(PHP_DIR)/.built
+	$(MAKE) DESTDIR=$(STAGING_DIR) INSTALL_ROOT=$(STAGING_DIR) CC=$(TARGET_CC) -C $(PHP_DIR) install
+	touch $(PHP_DIR)/.staged
+
+$(TARGET_DIR)/usr/bin/php: $(PHP_DIR)/.staged
+	cp -dpf $(STAGING_DIR)/usr/bin/php $(TARGET_DIR)/usr/bin/php
+	chmod 755 $(TARGET_DIR)/usr/bin/php
+
+$(TARGET_DIR)/usr/bin/php-cgi: $(PHP_DIR)/.staged
+	cp -dpf $(STAGING_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php-cgi
+	chmod 755 $(TARGET_DIR)/usr/bin/php-cgi
+
+$(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
+	cp $(PHP_DIR)/php.ini-dist $(TARGET_DIR)/etc/php.ini
+
+php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
+
+php-clean:
+	rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
+	-$(MAKE) -C $(PHP_DIR) clean
+
+php-dirclean:
+	rm -rf $(PHP_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_PHP)),y)
+TARGETS+=php
+endif
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/S91smb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/samba/S91smb	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Stolen from RedHat FC5.
+#
+
+# Check that smb.conf exists.
+[ -f /etc/samba/smb.conf ] || exit 0
+
+# Make directories.
+mkdir -p /var/cache/samba
+mkdir -p /var/log/samba
+
+RETVAL=0
+
+start() {
+	echo -n "Starting SMB services: "
+	smbd -D
+	RETVAL=$?
+	echo "done"
+
+	echo -n "Starting NMB services: "
+	nmbd -D
+	RETVAL2=$?
+	echo "done"
+
+	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/smb || \
+	   RETVAL=1
+	return $RETVAL
+}	
+
+stop() {
+	echo -n "Shutting down SMB services: "
+	kill -9 `pidof smbd`
+	RETVAL=$?
+	rm -f /var/run/smbd.pid
+	echo "done"
+
+	echo -n "Shutting down NMB services: "
+	kill -9 `pidof nmbd`
+	RETVAL2=$?
+	rm -f /var/run/nmbd.pid
+
+	[ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/smb
+	echo "done"
+	return $RETVAL
+}	
+
+restart() {
+	stop
+	start
+}	
+
+reload() {
+        echo -n "Reloading smb.conf file: "
+	kill -HUP `pidof smbd`
+	RETVAL=$?
+	echo "done"
+	return $RETVAL
+}	
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart)
+  	restart
+	;;
+  reload)
+  	reload
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
+
+exit $?
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/samba-getgrouplist.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/samba/samba-getgrouplist.patch	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,42 @@
+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
+-       AC_TRY_RUN([
+-#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);
+-}
+-], [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])
+-       fi
+-       ;;
+-    *)
+-       AC_CHECK_FUNCS(getgrouplist)
+-       ;;
+-esac
+-
+-#
+ # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
+ #
+ 
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/samba-remove-legacy-index.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/samba/samba-remove-legacy-index.patch	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,21 @@
+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);
+-	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';
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/samba-use-unsigned-enums.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/samba/samba-use-unsigned-enums.patch	Thu Aug 16 16:10:05 2007 +0000
@@ -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
+ 
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/simple.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/samba/simple.conf	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,25 @@
+#======================= Global Settings =====================================
+[global]
+workgroup = MSHOME
+server string = MYDATA
+max log size = 50
+security = share
+encrypt passwords = yes
+smb passwd file = /etc/samba/smbpasswd
+log file = /var/log/samba/log.smbd
+hosts allow = 127.
+interfaces = eth0 192.168.9.253/255.255.255.0
+socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
+
+#============================ Share Definitions ==============================
+idmap uid = 16777216-33554431
+idmap gid = 16777216-33554431
+template shell = /bin/false
+winbind use default domain = no
+
+[data]
+path = /data
+public = yes
+only guest = yes
+writable = yes
+printable = no
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/sqlite/Config.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/sqlite/Config.in	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SQLITE
+	bool "sqlite"
+	default n
+	select BR2_PACKAGE_NCURSES
+	select BR2_READLINE
+	help
+	  SQLite is a small C library that implements a self-contained,
+	  embeddable, zero-configuration SQL database engine.
+
+	  http://www.sqlite.org/
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/sqlite/sqlite.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package/sqlite/sqlite.mk	Thu Aug 16 16:10:05 2007 +0000
@@ -0,0 +1,83 @@
+#############################################################
+#
+# sqlite
+#
+#############################################################
+
+SQLITE_VERSION:=3.4.1
+SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
+SQLITE_SITE:=http://www.sqlite.org
+SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
+SQLITE_CAT:=$(ZCAT)
+
+$(DL_DIR)/$(SQLITE_SOURCE):
+	$(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE)
+
+$(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE)
+	$(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(SQLITE_DIR)/.unpacked
+
+$(SQLITE_DIR)/.configured: $(SQLITE_DIR)/.unpacked
+	(cd $(SQLITE_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		config_BUILD_CC="$(HOSTCC)" \
+		config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+		config_TARGET_CC="$(TARGET_CC)" \
+		config_TARGET_READLINE_LIBS="-L$(TARGET_DIR)/usr/lib -L$(TARGET_DIR)/lib -lncurses -lreadline" \
+		config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
+		./configure \
+		--target=$(GNU_TARGET_NAME) \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--includedir=/include \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--enable-shared \
+		--enable-static \
+		--disable-tcl \
+		--enable-tempstore \
+		--enable-threadsafe \
+		--enable-releasemode \
+	);
+	touch $(SQLITE_DIR)/.configured
+
+$(SQLITE_DIR)/sqlite3: $(SQLITE_DIR)/.configured
+	$(MAKE) -C $(SQLITE_DIR)
+
+$(STAGING_DIR)/usr/bin/sqlite3: $(SQLITE_DIR)/sqlite3
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(SQLITE_DIR) install
+
+$(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
+	cp -a $(STAGING_DIR)/usr/bin/sqlite3 $(TARGET_DIR)/usr/bin
+	cp -a $(STAGING_DIR)/lib/libsqlite3*.so* $(TARGET_DIR)/lib/
+	$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libsqlite3.so*
+
+sqlite:	uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3
+
+sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)
+
+sqlite-clean:
+	@if [ -d $(SQLITE_DIR)/Makefile ] ; then \
+		$(MAKE) -C $(SQLITE_DIR) clean ; \
+	fi;
+
+sqlite-dirclean:
+	rm -rf $(SQLITE_DIR)
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
+TARGETS+=sqlite
+endif
diff -r 2e65ac2a22e4 -r 8d16f133d83e package/samba/samba-cross_compile_glibc2.3.patch
--- a/package/samba/samba-cross_compile_glibc2.3.patch	Tue Aug 14 19:42:08 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-diff -r 3a0d6041e08c source/configure.in
---- a/source/configure.in	Tue Aug 07 09:14:25 2007 +0200
-+++ b/source/configure.in	Tue Aug 07 09:15:57 2007 +0200
-@@ -1375,23 +1375,7 @@ case "$host_os" in
- case "$host_os" in
-     *linux*)
-        # glibc <= 2.3.2 has a broken getgrouplist
--       AC_TRY_RUN([
--#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);
--}
--], [linux_getgrouplist_ok=yes], [linux_getgrouplist_ok=no])
-+       linux_getgrouplist_ok=no
-        if test x"$linux_getgrouplist_ok" = x"yes"; then
-           AC_DEFINE(HAVE_GETGROUPLIST, 1, [Have good getgrouplist])
-        fi