summaryrefslogtreecommitdiff
path: root/package/samba
diff options
context:
space:
mode:
Diffstat (limited to 'package/samba')
-rw-r--r--package/samba/Config.in62
-rw-r--r--package/samba/Makefile17
-rw-r--r--package/samba/files/samba.init4
-rw-r--r--package/samba/patches/patch-source3_client_mtab_c10
-rw-r--r--package/samba/patches/patch-source3_configure (renamed from package/samba/patches/patch-source_configure)18
-rw-r--r--package/samba/patches/patch-source3_registry_reg_perfcount_c (renamed from package/samba/patches/patch-source_registry_reg_perfcount_c)7
-rw-r--r--package/samba/patches/patch-source_client_mtab_c11
7 files changed, 27 insertions, 102 deletions
diff --git a/package/samba/Config.in b/package/samba/Config.in
deleted file mode 100644
index b26d2791e..000000000
--- a/package/samba/Config.in
+++ /dev/null
@@ -1,62 +0,0 @@
-config ADK_COMPILE_SAMBA
- tristate
- default n
- depends on ADK_PACKAGE_SAMBA || ADK_PACKAGE_SAMBA_CLIENT || ADK_PACKAGE_SMBFS
-
-config ADK_PACKAGE_SAMBA
- prompt "samba............................. NetBIOS/SMB file and print server"
- tristate
- default n
- select ADK_COMPILE_SAMBA
- select ADK_PACKAGE_LIBPOPT
- help
- The Samba software suite is a collection of programs that implements the
- SMB protocol for unix systems, allowing you to serve files and printers to
- Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
- to as the LanManager or Netbios protocol.
-
- http://www.samba.org/
-
- This package contains the SMB file and print server daemons.
-
-config ADK_SAMBA_CODEPAGE
- string "legacy codepage"
- default "ISO8859-1"
- depends on ADK_PACKAGE_SAMBA
- help
- which codepage should be added to package
- choose one of:
- 1125 1251 437 737 775 850 852 857 861 866 932 936 949 950
- ISO8859-1 ISO8859-13 ISO8859-15 ISO8859-2 ISO8859-5 ISO8859-7
- ISO8859-9 KOI8-R KOI8-U
-
-config ADK_PACKAGE_SAMBA_CLIENT
- prompt "samba-client...................... NetBIOS/SMB simple client"
- tristate
- default n
- select ADK_COMPILE_SAMBA
- help
- The Samba software suite is a collection of programs that implements the
- SMB protocol for unix systems, allowing you to serve files and printers to
- Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
- to as the LanManager or Netbios protocol.
-
- http://www.samba.org/
-
- This package contains a simple command-line SMB client.
-
-config ADK_PACKAGE_SAMBA_PASSWD
- prompt "samba-passwd...................... samba password utility"
- tristate
- default n
- select ADK_COMPILE_SAMBA
- help
- The Samba software suite is a collection of programs that implements the
- SMB protocol for unix systems, allowing you to serve files and printers to
- Windows, NT, OS/2 and DOS clients. This protocol is sometimes also referred
- to as the LanManager or Netbios protocol.
-
- http://www.samba.org/
-
- This package contains a the samba password utility.
-
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 5a915413a..e953e2253 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,16 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= samba
-PKG_VERSION:= 3.3.4
+PKG_VERSION:= 3.4.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1443165edb7cb3f56f1e77aec1ee3266
+PKG_MD5SUM:= 8e8a484782f2b7716b6c6bd9a7d2bf71
PKG_DESCR:= NetBIOS/SMB file and print server
PKG_SECTION:= net
PKG_URL:= http://www.samba.org
-PKG_SITES:= ftp://se.samba.org/pub/samba/stable/ \
- ftp://ftp.easynet.be/samba/stable/
+PKG_SITES:= http://samba.org/samba/ftp/stable/
-WRKSRC= ${WRKDIST}/source
+WRKSRC= ${WRKDIST}/source3
include ${TOPDIR}/mk/package.mk
@@ -21,18 +20,12 @@ $(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_STYLE:= gnu
TLDFLAGS+= -Wl,-rpath -Wl,/usr/lib/samba
CONFIGURE_ENV+= samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
samba_cv_USE_SETRESUID=no \
ac_cv_lib_ext_nsl_connect=no \
ac_cv_search_yp_get_default_domain=no \
ac_cv_lib_ext_nsl_gethostbyname=no
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_ENV+= libreplace_cv_HAVE_IPV6=yes
-else
-CONFIGURE_ENV+= libreplace_cv_HAVE_IPV6=no
-endif
CONFIGURE_ARGS+= --libdir=/usr/lib/samba \
--localstatedir=/var/log/samba \
--with-configdir=/etc/samba \
@@ -48,8 +41,6 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/samba \
--with-ldap=no \
--without-cluster-support \
--without-sendfile-support
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba ${IDIR_SAMBA}/usr/sbin
diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init
index 862a63515..a8279e366 100644
--- a/package/samba/files/samba.init
+++ b/package/samba/files/samba.init
@@ -17,8 +17,8 @@ start)
smbd -D
;;
stop)
- killall nmbd
- killall smbd
+ pkill nmbd
+ pkill smbd
;;
restart)
sh $0 stop
diff --git a/package/samba/patches/patch-source3_client_mtab_c b/package/samba/patches/patch-source3_client_mtab_c
new file mode 100644
index 000000000..d6cac2914
--- /dev/null
+++ b/package/samba/patches/patch-source3_client_mtab_c
@@ -0,0 +1,10 @@
+--- samba-3.4.3.orig/source3/client/mtab.c 2009-10-29 08:47:16.000000000 +0100
++++ samba-3.4.3/source3/client/mtab.c 2009-11-01 15:45:07.303242285 +0100
+@@ -32,6 +32,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <sys/time.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <fcntl.h>
+ #include <mntent.h>
diff --git a/package/samba/patches/patch-source_configure b/package/samba/patches/patch-source3_configure
index c41ed21e7..b99b66528 100644
--- a/package/samba/patches/patch-source_configure
+++ b/package/samba/patches/patch-source3_configure
@@ -1,14 +1,14 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.3.orig/source/configure 2009-04-01 14:19:36.000000000 +0200
-+++ samba-3.3.3/source/configure 2009-04-18 22:56:27.047962181 +0200
-@@ -44062,194 +44062,6 @@ fi
+--- samba-3.4.3.orig/source3/configure 2009-10-29 09:18:27.000000000 +0100
++++ samba-3.4.3/source3/configure 2009-11-01 14:23:21.339243541 +0100
+@@ -45625,193 +45625,6 @@ fi
+
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- #
+-#
-#
-#
-case "$host_os" in
-- *linux*)
+- *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
- # glibc <= 2.3.2 has a broken getgrouplist
- if test "$cross_compiling" = yes; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -191,8 +191,6 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
- ;;
-esac
--
--#
- # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
- #
+ #
+ # stat64 family may need <sys/stat.h> on some systems, notably ReliantUNIX
diff --git a/package/samba/patches/patch-source_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c
index a06b713d4..650394f73 100644
--- a/package/samba/patches/patch-source_registry_reg_perfcount_c
+++ b/package/samba/patches/patch-source3_registry_reg_perfcount_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.4.orig/source/registry/reg_perfcount.c 2009-04-28 08:46:16.000000000 +0200
-+++ samba-3.3.4/source/registry/reg_perfcount.c 2009-05-10 23:52:42.000000000 +0200
-@@ -616,14 +616,14 @@ static bool _reg_perfcount_add_counter(P
+--- samba-3.4.3.orig/source3/registry/reg_perfcount.c 2009-10-29 08:47:16.000000000 +0100
++++ samba-3.4.3/source3/registry/reg_perfcount.c 2009-11-20 21:11:54.000000000 +0100
+@@ -613,14 +613,14 @@ static bool _reg_perfcount_add_counter(P
obj = NULL;
memset(buf, 0, PERFCOUNT_MAX_LEN);
memcpy(buf, data.dptr, data.dsize);
diff --git a/package/samba/patches/patch-source_client_mtab_c b/package/samba/patches/patch-source_client_mtab_c
deleted file mode 100644
index 7dedcd065..000000000
--- a/package/samba/patches/patch-source_client_mtab_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- samba-3.3.3.orig/source/client/mtab.c 2009-04-01 13:48:54.000000000 +0200
-+++ samba-3.3.3/source/client/mtab.c 2009-04-18 23:27:50.522604765 +0200
-@@ -32,6 +32,7 @@
- #include <errno.h>
- #include <stdio.h>
- #include <sys/time.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <fcntl.h>
- #include <mntent.h>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-17 12:44:55 +0000