summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/kodi/Makefile16
-rw-r--r--package/samba3/Makefile73
-rw-r--r--package/samba3/files/samba.conffiles1
-rw-r--r--package/samba3/files/samba.init31
-rw-r--r--package/samba3/files/samba.postinst3
-rw-r--r--package/samba3/files/smb.conf24
6 files changed, 144 insertions, 4 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 61965104b..2c5d3f979 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
PKG_VERSION:= ff25ea118e3580bb1ebcbb7c450ed933da1782be
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
PKG_DEPENDS:= boost python2 libstdcxx glibc-gconv libsquish
@@ -29,12 +29,15 @@ PKG_BUILDDEP+= zip-host unzip-host libsquish giflib-host
PKG_URL:= http://kodi.tv/
PKG_SITES:= https://github.com/xbmc/xbmc.git
-PKG_FLAVOURS_KODI:= WITH_SMB WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC
+PKG_FLAVOURS_KODI:= WITH_SMB WITH_SMB3 WITH_NFS WITH_SSH WITH_AVAHI WITH_CEC
PKG_FLAVOURS_KODI+= WITH_WEBSERVER WITH_RTMP WITH_BLURAY WITH_LIRC
-PKGFD_WITH_SMB:= enable samba support
+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
@@ -113,7 +116,7 @@ CONFIGURE_ARGS+= --disable-optical-drive \
--disable-wayland \
--disable-pulse \
--disable-mid \
- --disable-debug \
+ --enable-debug \
--enable-alsa \
--enable-texturepacker \
--enable-udev \
@@ -129,6 +132,11 @@ CONFIGURE_ARGS+= --enable-samba
else
CONFIGURE_ARGS+= --disable-samba
endif
+ifneq ($(ADK_PACKAGE_KODI_WITH_SMB3),)
+CONFIGURE_ARGS+= --enable-samba
+else
+CONFIGURE_ARGS+= --disable-samba
+endif
ifneq ($(ADK_PACKAGE_KODI_WITH_SSH),)
CONFIGURE_ARGS+= --enable-ssh
else
diff --git a/package/samba3/Makefile b/package/samba3/Makefile
new file mode 100644
index 000000000..5555c4872
--- /dev/null
+++ b/package/samba3/Makefile
@@ -0,0 +1,73 @@
+# 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:= samba
+PKG_VERSION:= 3.6.25
+PKG_RELEASE:= 1
+PKG_HASH:= 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
+PKG_DESCR:= smb file and print server
+PKG_SECTION:= net/fs
+PKG_BUILDDEP:= gettext-tiny util-linux popt
+PKG_DEPENDS:= samba-lib libuuid libpopt
+PKG_URL:= http://www.samba.org/
+PKG_SITES:= http://samba.org/samba/ftp/stable/
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+
+WRKSRC= ${WRKDIST}/source3
+
+include ${ADK_TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,SAMBA,samba,${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
+
+samba-install:
+ ${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba
+ ${INSTALL_DIR} ${IDIR_SAMBA}/usr/sbin
+ ${INSTALL_DIR} ${IDIR_SAMBA}/usr/bin
+ ${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/{charset,vfs}
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/charset/*.so \
+ ${IDIR_SAMBA}/usr/lib/charset
+ ${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
+ ${CP} ${WRKINST}/usr/lib/vfs/*.so* ${IDIR_SAMBA}/usr/lib/vfs
+ ${INSTALL_DATA} ${WRKINST}/usr/lib/*.dat ${IDIR_SAMBA}/usr/lib
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd \
+ ${IDIR_SAMBA}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \
+ ${IDIR_SAMBA}/usr/bin
+ ${CP} ${WRKINST}/usr/lib/{libsmbclient,libsmbsharemodes,libnetapi}.so* \
+ ${IDIR_SAMBA}/usr/lib
+ $(CP) ${WRKINST}/usr/lib/{libtalloc,libtdb,libtevent}.so* \
+ ${IDIR_SAMBA}/usr/lib
+
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/samba3/files/samba.conffiles b/package/samba3/files/samba.conffiles
new file mode 100644
index 000000000..5c10c50ad
--- /dev/null
+++ b/package/samba3/files/samba.conffiles
@@ -0,0 +1 @@
+/etc/samba/smb.conf
diff --git a/package/samba3/files/samba.init b/package/samba3/files/samba.init
new file mode 100644
index 000000000..b7e370484
--- /dev/null
+++ b/package/samba3/files/samba.init
@@ -0,0 +1,31 @@
+#!/bin/sh
+#PKG samba
+#INIT 80
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${samba:-NO}" = x"NO" && exit 0
+ test x"$samba" = 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/samba.postinst b/package/samba3/files/samba.postinst
new file mode 100644
index 000000000..876c7bc72
--- /dev/null
+++ b/package/samba3/files/samba.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf samba NO
diff --git a/package/samba3/files/smb.conf b/package/samba3/files/smb.conf
new file mode 100644
index 000000000..8cae4dc2c
--- /dev/null
+++ b/package/samba3/files/smb.conf
@@ -0,0 +1,24 @@
+[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