diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 37b86a0..5227cec 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,7 +1,5 @@ -AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578 -AUX samba-conf 1291 RMD160 326fb4beee8105d839d23e37f4989d7e332c996b SHA1 af7cd695f212d7ec022df05ba2f821a8f9878ab2 SHA256 dfaf474c3cbfa3d3b26d1531c6f5913739d5815c4b8083063934ee4fd6b38861 -AUX samba-init 1133 RMD160 77a084e8f78665af0233f19dc9c4a49693360da1 SHA1 09d7f1d676856289b61e890396a9976e2ccc794a SHA256 3b41d16daf02f9a1ab12e62c4c915f58e7801c07be48e2a94086eb288bb86aad -AUX samba-xinetd 286 RMD160 c90bd8518082eb4c182d5f7bd223a76f8e3c7fab SHA1 b250c5ca539187d8b481bcfb6ea3a915d7e8b26b SHA256 964d06dc33beff38978a8f03cd12b05c33d8258ed73aa9ffbf137fe226de25b8 +AUX config-4.0/samba-conf 69 RMD160 2b5f0af9d9cdb3659d2975884aee6e2557e76319 SHA1 833a5d2c0d6eaa72991adb01873054c20cfe666f SHA256 41d6a03e7cf1d1351c49bf4918a5618d0747817d2c3235fa2ddf1e5f2f1c9b84 +AUX config-4.0/samba-init 561 RMD160 e55b04772673770c4f2f268681ae3ef9f8832e82 SHA1 56c1f7345106c32ee9194885ae41d0479ddfca29 SHA256 86ba67625da78ca7ad0eb46ca3d1f22af7827d135a1e9c25017500e8c722ad1b DIST samba-4.0.0alpha7.tar.gz 11927771 RMD160 551aface24e04e8b5665c1d2e12ec8bc7a725d0f SHA1 f59bedd40e0fd5a85e31ea4a06e8a4a874c6c9b7 SHA256 744d97ad7fc964efa27f02bdc4f93b533269e4e5e27639035ae80942510c743e -EBUILD samba-4.0.0_alpha7.ebuild 5289 RMD160 8f20ecca7aad4817249fe474578fd871316e7fe0 SHA1 efe03124c9642ced2b02b605f32e250a7777116e SHA256 5841444d3d9612ead3b0e885d25109aecef9987a7223d1d9e9306bd9db066034 +EBUILD samba-4.0.0_alpha7.ebuild 3927 RMD160 31fbc64579345f47e45ec6e62368e3b5df4c33c8 SHA1 bdb3a9b25f30536822095ef5d9880dfab42668d4 SHA256 e84d9e40714a93bf082aa73954edc6b06aecb2eb72beef8868dfca0692db5b17 MISC samba-9999.ebuild.old_svn 8339 RMD160 863bcbf1d8ebec56ae70eb428d1c99d1567ff2e3 SHA1 dfbcadc3241baaac7c9aea62d72ecae5924a0d3d SHA256 132bba6308140f951bae6d5e7860e40a212de58708ff3a7053045d5ba0656469 diff --git a/net-fs/samba/files/README.gentoo b/net-fs/samba/files/README.gentoo deleted file mode 100644 index 6d3c005..0000000 --- a/net-fs/samba/files/README.gentoo +++ /dev/null @@ -1,79 +0,0 @@ -#------------------------------------------------------------------------- -# WHATSNEW -#------------------------------------------------------------------------- -3.0.2: - If you are upgrading from a Samba version prior to 3.0.2, and you - use Samba's password database, you must run the following command: - pdbedit --force-initialized-passwords - -3.0.10: - LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now' - -3.0.12: - libsmbclient shared library retrocompatibility is not assured: please - rebuild all samba-linked third part packages - /etc/samba/private moved to ${PRIVATE_DST} - for better File System Hierarchy adeherence - -3.0.20: - --with-idmap configure option removed - (historical: it is already included if dynamic id/gid mapping is used) - New USE flags: - async: async input/output - automount: automount support (previously default) - syslog: log to syslog daemon (previously default) - -3.0.22: - *sql backend: they were experimental, and now are marked as "deprecated" - upstream - CVE-2006-1059 security fix: 3.0.21* shipped with a bug in the debug - functions of winbind (debug>=5 reveals secret ids in logs) - -3.0.23: - *sql and xml backends have been removed by upstream devs. SQL is - temporarily continued on SourceForge (http://pdbsql.sourceforge.net), - but it will be removed with samba 4.x (and maybe 3.2.x) - see also ldap changes below - CAN-2006-1059: memory exaustion DoS against smbd in all samba versions - between 3.0.x and 3.0.23 - -General: - If you experience client locks in file transfers _only_, try the parameter - use sendfile = no (man smb.conf(5), man sendfile(2)) - There also seem some problems with the smbfs implementation of the recent - 2.6.x kernels. If you experience problems (lockups) with smbfs, try - 'mount -t cifs' as an alternative - -#------------------------------------------------------------------------- -# WINBIND -#------------------------------------------------------------------------- -3.0.7: param: 'winbind enable local accounts' is now disabled by default - -#------------------------------------------------------------------------- -# LDAP -#------------------------------------------------------------------------- -3.0.2: - If you are upgrading from prior to 3.0.2, and you are using LDAP for Samba - authentication, you must check the sambaPwdLastSet attribute on all - accounts, and ensure it is not 0. - -3.0.12: - smbldap-tools is now a separate package for ease of upgrade - -3.0.23: - a new index is required: 'index sambaSID sub' (run slapindex afterwards) - use an updated samba.schema containing the correct 'sambaSID' definition - -#------------------------------------------------------------------------- -# DOCS -#------------------------------------------------------------------------- -General: - Beside [1], there is a good HOWTO about setting up samba3 with cups and - clamav at [2] -Ldap: - Beside the Samba Guide ad [1], try to look at smbldap-tools docs [3] - -[1] http://www.samba.org -[2] http://www.gentoo.org/doc/en/quick-samba-howto.xml -[3] http://www.idealx.org/prj/samba/smbldap-howto.fr.html - diff --git a/net-fs/samba/files/config-4.0/samba-conf b/net-fs/samba/files/config-4.0/samba-conf new file mode 100644 index 0000000..6751650 --- /dev/null +++ b/net-fs/samba/files/config-4.0/samba-conf @@ -0,0 +1,2 @@ +# Command line options for the samba daemon +samba_start_options="-D" diff --git a/net-fs/samba/files/config-4.0/samba-init b/net-fs/samba/files/config-4.0/samba-init new file mode 100644 index 0000000..de3cce0 --- /dev/null +++ b/net-fs/samba/files/config-4.0/samba-init @@ -0,0 +1,31 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: $ + +opts="reload" + +depend() { + after slapd + need net +} + +start() { + ebegin "Starting Samba 4.x daemon... " + start-stop-daemon --start --quiet \ + --exec ${DAEMON} -- ${samba_start_options} + eend $? +} + +stop() { + ebegin "Stopping Samba 4.x daemon... " + start-stop-daemon --stop --quiet \ + --pidfile /var/run/samba/samba.pid + eend $? +} + +reload() { + ebegin "Reloading Samba 4.x daemon... " + killall -HUP smbd + eend $? +} diff --git a/net-fs/samba/files/samba-conf b/net-fs/samba/files/samba-conf deleted file mode 100644 index b67595a..0000000 --- a/net-fs/samba/files/samba-conf +++ /dev/null @@ -1,28 +0,0 @@ -#add "winbind" to the daemon_list if you also want winbind to start -daemon_list="smbd nmbd" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -my_service_name="samba" -my_service_PRE="unset TMP TMPDIR" -my_service_POST="" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -smbd_start_options="-D" -smbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- ${smbd_start_options}" -smbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/samba/smbd.pid" -smbd_reload="killall -HUP smbd" - -nmbd_start_options="-D" -nmbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- ${nmbd_start_options}" -nmbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/samba/nmbd.pid" -nmbd_reload="killall -HUP nmbd" - -winbind_start_options="" -winbind_start="start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- ${winbind_start_options}" -winbind_stop="start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/winbindd" -winbind_reload="killall -HUP winbindd" - diff --git a/net-fs/samba/files/samba-init b/net-fs/samba/files/samba-init deleted file mode 100644 index bdefea6..0000000 --- a/net-fs/samba/files/samba-init +++ /dev/null @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.17 2007/09/11 22:55:08 uberlord Exp $ - -opts="reload" - -depend() { - after slapd - need net - use cupsd -} - -DAEMONNAME="${SVCNAME##samba.}" -[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} - -signal_do() { - local signal="$1" - [ -z "${signal}" ] && return 0 - - local result=0 last_result=0 daemon= cmd_exec= - for daemon in ${daemon_list} ; do - eval cmd_exec=\$${daemon}_${signal} - if [ -n "${cmd_exec}" ]; then - ebegin "${my_service_name} -> ${signal}: ${daemon}" - #echo ${cmd} '->' ${!cmd} - ${cmd_exec} > /dev/null - last_result=$? - eend ${last_result} - fi - result=$(( ${result} + ${last_result} )) - done - return ${result} -} -start() { - ${my_service_PRE} - signal_do start && return 0 - - eerror "Error: starting services (see system logs)" - signal_do stop - return 1 -} -stop() { - ${my_service_PRE} - if signal_do stop ; then - ${my_service_POST} - return 0 - fi -} -reload() { - ${my_service_PRE} - signal_do reload -} diff --git a/net-fs/samba/files/samba-xinetd b/net-fs/samba/files/samba-xinetd deleted file mode 100644 index a85f5b3..0000000 --- a/net-fs/samba/files/samba-xinetd +++ /dev/null @@ -1,12 +0,0 @@ -# Samba smb service with ipv6 support (for samba3) -# Remember to stop samba service starting smbd before you activate this. -service microsoft-ds -{ - flags = REUSE IPV6 - socket_type = stream - wait = no - user = root - server = /usr/sbin/smbd - log_on_failure += USERID - disable = yes -} diff --git a/net-fs/samba/samba-4.0.0_alpha7.ebuild b/net-fs/samba/samba-4.0.0_alpha7.ebuild index ffeb93e..266028f 100644 --- a/net-fs/samba/samba-4.0.0_alpha7.ebuild +++ b/net-fs/samba/samba-4.0.0_alpha7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.34.ebuild,v 1.1 2009/03/29 16:49:58 patrick Exp $ -inherit autotools eutils pam python multilib versionator confutils +inherit autotools eutils python multilib versionator confutils MY_P=${PN}-${PV/_/} @@ -12,7 +12,7 @@ SRC_URI="mirror://samba/samba4/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl caps debug developer doc dso examples gnutls ldap readline swat threads" +IUSE="acl caps debug developer doc dso examples gnutls ldap readline threads" RDEPEND="sys-libs/e2fsprogs-libs dev-lang/python @@ -20,8 +20,7 @@ RDEPEND="sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) gnutls? ( >=net-libs/gnutls-2.0 ) ldap? ( >=net-nds/openldap-2.4.15 ) - readline? ( sys-libs/readline ) - swat? ( sys-apps/xinetd )" + readline? ( sys-libs/readline )" # Don't build, if modularized Samba 3.3 (from dev-zero overlay) is installed #DEPEND="!net-fs/samba-client @@ -56,13 +55,6 @@ src_compile() { use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no - # Otherwise we get the whole swat stuff installed - if ! use swat ; then - sed -i \ - -e 's/^\(install:.*\)installswat \(.*\)/\1\2/' \ - Makefile.in || die "sed failed" - fi - use doc && myconf="${myconf} --docdir=/usr/share/doc/${PF}" econf \ @@ -96,49 +88,17 @@ src_install() { emake DESTDIR="${D}" install || die "emake install failed" - # Extra rpctorture progs - local extra_bins="rpctorture" - for i in ${extra_bins} ; do - [[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}" - done - - # remove .old stuff from /usr/bin: - rm -f "${D}"/usr/bin/*.old - - emake DESTDIR="${D}" python_install || die "emake installpython failed" - # We're doing that manually - find "${D}/usr/$(get_libdir)/python${PYVER}/site-packages" -iname "*.pyc" -delete - - # General config files - insinto /etc/samba - newins "${CONFDIR}/smb.conf.example" smb.conf.example - - newpamd "${CONFDIR}/samba.pam" samba - if use swat ; then - insinto /etc/xinetd.d - newins "${CONFDIR}/swat.xinetd" swat - else - rm -f "${D}/usr/sbin/swat" - rm -f "${D}/usr/share/man/man8/swat.8" - fi - newinitd "${CONFDIR}/samba-init" samba newconfd "${CONFDIR}/samba-conf" samba # dirs diropts -m0700 ; keepdir "${PRIVATE_DST}" - diropts -m1777 ; keepdir /var/spool/samba diropts -m0755 keepdir /var/{log,run,cache}/samba - keepdir /var/lib/samba/{netlogon,profiles} - keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR} - keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth} # docs - dodoc "${FILESDIR}/README.gentoo" - dodoc "${S}"/{MAINTAINERS,README,Roadmap,WHATSNEW.txt} - dodoc "${CONFDIR}/nsswitch.conf-wins" + dodoc "${S}"/{BUGS,NEWS,TODO} if use examples ; then insinto /usr/share/doc/${PF}/python @@ -168,11 +128,6 @@ pkg_postinst() { python_version python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba - if use swat ; then - einfo "swat must be enabled by xinetd:" - einfo " change the /etc/xinetd.d/swat configuration" - fi - elog "Specialized mount/umount.cifs helper applications are not yet available for" elog "Samba 4.0." elog "You may try to install net-fs/mount-cifs at your own risk."