remove samba3 support, we try to only support one version per package

7 files changed, 3 insertions, 140 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 5423e3484..29412a8e5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -24,10 +24,9 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_RUNTIME_START_SERVICES=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_KEXECINIT=n \
+			ADK_PACKAGE_SAMBA3=n \
 			ADK_PACKAGE_CLASSPATH=n \
-			ADK_PACKAGE_LIBRESSL=n \
-			ADK_PACKAGE_OPENSSH_WITH_LIBRESSL=n \
-			ADK_PACKAGE_NGINX_WITH_LIBRESSL=n \
+			ADK_PACKAGE_OPENSSL=n \
 			ADK_PACKAGE_LM_SENSORS_DETECT=n \
 			ADK_PACKAGE_CRYPTINIT=n \
 			ADK_KERNEL_MPTCP=n \
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 35bf070ef..42924fdb3 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -43,15 +43,12 @@ PKGCD_WITH_LIBRESSL:=	use libressl for crypto
 PKGCS_WITH_LIBRESSL:=	libressl
 PKGCB_WITH_LIBRESSL:=	libressl
 
-PKG_FLAVOURS_KODI:=	WITH_SMB WITH_SMB3 WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
+PKG_FLAVOURS_KODI:=	WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC 
 PKG_FLAVOURS_KODI+=	WITH_WEBSERVER WITH_RTMP WITH_BLURAY WITH_LIRC
 
 PKGFD_WITH_SMB:=	enable samba4 support
 PKGFB_WITH_SMB:=	samba
 PKGFS_WITH_SMB:=	samba
-PKGFD_WITH_SMB3:=	enable samba3 support
-PKGFB_WITH_SMB3:=	samba3
-PKGFS_WITH_SMB3:=	samba3
 PKGFD_WITH_NFS:=	enable nfs support
 PKGFB_WITH_NFS:=	libnfs
 PKGFS_WITH_NFS:=	libnfs
diff --git a/package/samba3/Makefile b/package/samba3/Makefile
deleted file mode 100644
index b1c1ae369..000000000
--- a/package/samba3/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${ADK_TOPDIR}/rules.mk
-
-PKG_NAME:=		samba3
-PKG_VERSION:=		3.6.25
-PKG_RELEASE:=		1
-PKG_HASH:=		8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
-PKG_DESCR:=		file and print server (version 3)
-PKG_SECTION:=		net/fs
-PKG_BUILDDEP:=		gettext-tiny util-linux popt
-PKG_DEPENDS:=		libuuid libpopt
-PKG_URL:=		http://www.samba.org/
-PKG_SITES:=		http://samba.org/samba/ftp/stable/
-
-DISTFILES:=		samba-${PKG_VERSION}.tar.gz
-
-WRKDIST=		${WRKDIR}/samba-${PKG_VERSION}
-WRKSRC=			${WRKDIST}/source3
-
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,SAMBA3,samba3,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
-			samba_cv_USE_SETRESUID=yes \
-			samba_cv_HAVE_WRFILE_KEYTAB=yes \
-			ac_cv_func_ext_krb5_enctype_to_string=yes \
-			smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes \
-			smb_krb5_cv_enctype_to_string_takes_size_t_arg=no \
-			ac_cv_lib_ext_nsl_connect=no \
-			ac_cv_search_yp_get_default_domain=no \
-			ac_cv_lib_ext_nsl_gethostbyname=no \
-			ac_cv_file__proc_sys_kernel_core_pattern=yes \
-			libreplace_cv_HAVE_GETADDRINFO=no
-CONFIGURE_ARGS+=	--libdir=/usr/lib \
-			--localstatedir=/var/log/samba \
-			--with-configdir=/etc/samba \
-			--with-lockdir=/var/run/samba \
-			--with-privatedir=/etc/samba \
-			--with-libiconv=/dev/null \
-			--with-syslog \
-			--disable-cups \
-			--disable-swat \
-			--disable-avahi \
-			--with-utmp=no \
-			--with-pam=no \
-			--without-cluster-support \
-			--without-sendfile-support \
-			--without-winbind \
-			--with-ldap=no
-
-samba3-install:
-	${INSTALL_DIR} ${IDIR_SAMBA3}/etc/samba 
-	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/sbin
-	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/bin
-	${INSTALL_DIR} ${IDIR_SAMBA3}/usr/lib/{charset,vfs}
-	${INSTALL_DATA} ${WRKINST}/usr/lib/charset/*.so \
-			${IDIR_SAMBA3}/usr/lib/charset
-	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA3}/etc/samba
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA3}/usr/sbin
-	${CP} ${WRKINST}/usr/lib/vfs/*.so* ${IDIR_SAMBA3}/usr/lib/vfs
-	${INSTALL_DATA} ${WRKINST}/usr/lib/*.dat ${IDIR_SAMBA3}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd \
-		${IDIR_SAMBA3}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \
-		${IDIR_SAMBA3}/usr/bin
-	${CP} ${WRKINST}/usr/lib/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
-		${IDIR_SAMBA3}/usr/lib
-	$(CP) ${WRKINST}/usr/lib/{libtalloc,libtdb,libtevent}.so* \
-		${IDIR_SAMBA3}/usr/lib
-
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/samba3/files/samba3.conffiles b/package/samba3/files/samba3.conffiles
deleted file mode 100644
index 5c10c50ad..000000000
--- a/package/samba3/files/samba3.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/samba/smb.conf
diff --git a/package/samba3/files/samba3.init b/package/samba3/files/samba3.init
deleted file mode 100644
index ce327263c..000000000
--- a/package/samba3/files/samba3.init
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#PKG samba3
-#INIT 80
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${samba3:-NO}" = x"NO" && exit 0
-	test x"$samba3" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start
-	exec sh $0 start
-	;;
-start)
-	[ -d /var/run/samba ] || mkdir -p /var/run/samba
-	[ -d /var/log/samba ] || mkdir -p /var/log/samba
-	/usr/sbin/nmbd -D 
-	/usr/sbin/smbd -D
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/nmbd)
-	kill $(pgrep -f /usr/sbin/smbd)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "usage: $0 {start | stop | restart}"
-	exit 1
-esac
-exit $?
diff --git a/package/samba3/files/samba3.postinst b/package/samba3/files/samba3.postinst
deleted file mode 100644
index c198dda6f..000000000
--- a/package/samba3/files/samba3.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf samba3 NO
diff --git a/package/samba3/files/smb.conf b/package/samba3/files/smb.conf
deleted file mode 100644
index 8cae4dc2c..000000000
--- a/package/samba3/files/smb.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-[global]
- syslog = 2
- syslog only = yes
- log level = 1
- workgroup = OpenADK
- server string = OpenADK Samba Server
- security = user
- encrypt passwords = yes
- guest account = nobody
- local master = yes
- name resolve order = hosts bcast
- pid directory = /var/run/samba
- load printers = no
- printcap name = /dev/null
- unix charset = UTF8
- dos charset = ASCII 
- display charset = UTF8
- unix extensions = yes 
-
-#[media]
-# comment = Media files
-# read only = yes
-# guest ok = yes
-# path = /media