Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/samba/ChangeLog10
-rw-r--r--net-fs/samba/files/3.0.26a-CVE-2007-5398.patch36
-rw-r--r--net-fs/samba/samba-3.0.27.ebuild308
-rw-r--r--net-fs/samba/samba-3.0.30.ebuild (renamed from net-fs/samba/samba-3.0.28a.ebuild)4
4 files changed, 11 insertions, 347 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index b7bd56bf7c84..169d19405412 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-fs/samba
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.335 2008/05/30 10:57:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.336 2008/05/31 08:27:47 dev-zero Exp $
+
+*samba-3.0.30 (31 May 2008)
+
+ 31 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+ -files/3.0.26a-CVE-2007-5398.patch, -samba-3.0.27.ebuild,
+ -samba-3.0.28a.ebuild, +samba-3.0.30.ebuild:
+ Version bump (bug #224201, #212955). Punted old versions (mips stable
+ keyword drop).
30 May 2008; Raúl Porcel <armin76@gentoo.org> samba-3.0.28a-r1.ebuild:
ia64 stable wrt #222299
diff --git a/net-fs/samba/files/3.0.26a-CVE-2007-5398.patch b/net-fs/samba/files/3.0.26a-CVE-2007-5398.patch
deleted file mode 100644
index e27c73e596f9..000000000000
--- a/net-fs/samba/files/3.0.26a-CVE-2007-5398.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 089a51061b1be809f278ab4e9a741d0a44e52750
-Author: Gerald (Jerry) Carter <jerry@samba.org>
-Date: Wed Nov 14 20:51:14 2007 -0600
-
- Fix for CVE-2007-5398.
-
- == Subject: Remote code execution in Samba's WINS
- == server daemon (nmbd) when processing name
- == registration followed name query requests.
- ==
- == CVE ID#: CVE-2007-5398
- ==
- == Versions: Samba 3.0.0 - 3.0.26a (inclusive)
- ...
- Secunia Research reported a vulnerability that allows for
- the execution of arbitrary code in nmbd. This defect may
- only be exploited when the "wins support" parameter has
- been enabled in smb.conf.
-
-diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c
-index 87a38b9..bbcc1ec 100644
---- a/source/nmbd/nmbd_packets.c
-+++ b/source/nmbd/nmbd_packets.c
-@@ -963,6 +963,12 @@ for id %hu\n", packet_type, nmb_namestr(&orig_nmb->question.question_name),
- nmb->answers->ttl = ttl;
-
- if (data && len) {
-+ if (len < 0 || len > sizeof(nmb->answers->rdata)) {
-+ DEBUG(5,("reply_netbios_packet: "
-+ "invalid packet len (%d)\n",
-+ len ));
-+ return;
-+ }
- nmb->answers->rdlength = len;
- memcpy(nmb->answers->rdata, data, len);
- }
diff --git a/net-fs/samba/samba-3.0.27.ebuild b/net-fs/samba/samba-3.0.27.ebuild
deleted file mode 100644
index 3fd3fc4ec9b2..000000000000
--- a/net-fs/samba/samba-3.0.27.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.27.ebuild,v 1.11 2007/12/29 10:27:56 vapier Exp $
-
-inherit eutils pam python multilib versionator confutils
-
-MY_P=${PN}-${PV/_/}
-
-DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz
- mirror://samba/old-versions/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE_LINGUAS="linguas_ja linguas_pl"
-IUSE="${IUSE_LINGUAS} acl ads async automount caps cups doc examples ipv6 kernel_linux ldap fam
- pam python quotas readline selinux swat syslog winbind"
-
-RDEPEND="dev-libs/popt
- virtual/libiconv
- acl? ( kernel_linux? ( sys-apps/acl ) )
- cups? ( net-print/cups )
- ipv6? ( sys-apps/xinetd )
- ads? ( virtual/krb5 )
- ldap? ( net-nds/openldap )
- pam? ( virtual/pam )
- python? ( dev-lang/python )
- readline? ( sys-libs/readline )
- selinux? ( sec-policy/selinux-samba )
- swat? ( sys-apps/xinetd )
- syslog? ( virtual/logger )
- fam? ( virtual/fam )
- caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-CONFDIR=${FILESDIR}/config
-PRIVATE_DST=/var/lib/samba/private
-
-pkg_setup() {
- confutils_use_depend_all ads ldap
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}/source"
-
- # This patch adds "-Wl,-z,now" to smb{mnt,umount}
- # Please read ... for further informations
- epatch "${FILESDIR}/3.0.26a-lazyldflags.patch"
-
- # Bug #196015 (upstream: #5021)
- epatch "${FILESDIR}/3.0.26a-invalid-free-fix.patch"
-
- # Ok, agreed, this is ugly. But it avoids a patch we
- # need for every samba version and we don't need autotools
- sed -i \
- -e 's|"lib32" ||' \
- -e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \
- configure || die "sed failed"
-
- rm "${S}/docs/manpages"/{mount,umount}.cifs.8
-}
-
-src_compile() {
- cd "${S}/source"
-
- local myconf
- local mylangs
- local mymod_shared
-
- python_version
- myconf="--with-python=no"
- use python && myconf="--with-python=${python}"
-
- mylangs="--with-manpages-langs=en"
- use linguas_ja && mylangs="${mylangs},ja"
- use linguas_pl && mylangs="${mylangs},pl"
-
- use winbind && mymod_shared="--with-shared-modules=idmap_rid"
- if use ldap ; then
- myconf="${myconf} $(use_with ads)"
- use winbind && mymod_shared="${mymod_shared},idmap_ad"
- fi
-
- [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
- use hppa && myconf="${myconf} --disable-pie"
-
- 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
-
- econf \
- --with-fhs \
- --sysconfdir=/etc/samba \
- --localstatedir=/var \
- --with-configdir=/etc/samba \
- --with-libdir=/usr/$(get_libdir)/samba \
- --with-swatdir=/usr/share/doc/${PF}/swat \
- --with-piddir=/var/run/samba \
- --with-lockdir=/var/cache/samba \
- --with-logfilebase=/var/log/samba \
- --with-privatedir=${PRIVATE_DST} \
- --with-libsmbclient \
- --without-spinlocks \
- --enable-socket-wrapper \
- --with-cifsmount=no \
- $(use_with acl acl-support) \
- $(use_with async aio-support) \
- $(use_with automount) \
- $(use_enable cups) \
- $(use_enable fam) \
- $(use_with ads krb5) \
- $(use_with ldap) \
- $(use_with pam) $(use_with pam pam_smbpass) \
- $(use_with quotas) $(use_with quotas sys-quotas) \
- $(use_with readline) \
- $(use_with kernel_linux smbmount) \
- $(use_with syslog) \
- $(use_with winbind) \
- ${myconf} ${mylangs} ${mymod_shared} || die "econf failed"
-
- emake proto || die "emake proto failed"
- emake everything || die "emake everything failed"
-
- if use python ; then
- emake python_ext || die "emake python_ext failed"
- fi
-}
-
-src_test() {
- cd "${S}/source"
- emake test || die "tests failed"
-}
-
-src_install() {
- cd "${S}/source"
-
- emake DESTDIR="${D}" install-everything || die "emake install-everything 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
-
- # Nsswitch extensions. Make link for wins and winbind resolvers
- if use winbind ; then
- dolib.so nsswitch/libnss_wins.so
- dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
- dolib.so nsswitch/libnss_winbind.so
- dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
- fi
-
- if use pam ; then
- dopammod bin/pam_smbpass.so
- use winbind && dopammod bin/pam_winbind.so
- fi
-
- if use kernel_linux ; then
- # Warning: this can byte you if /usr is
- # on a separate volume and you have to mount
- # a smb volume before the local mount
- dosym ../usr/bin/smbmount /sbin/mount.smbfs
- fperms 4755 /usr/bin/smbmnt
- fperms 4755 /usr/bin/smbumount
- fi
-
- # bug #46389: samba doesn't create symlink anymore
- # beaviour seems to be changed in 3.0.6, see bug #61046
- dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
- dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
-
- # make the smb backend symlink for cups printing support (bug #133133)
- if use cups ; then
- dodir $(cups-config --serverbin)/backend
- dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
- fi
-
- if use python ; then
- 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
- fi
-
- cd "${S}/source"
-
- # General config files
- insinto /etc/samba
- doins "${CONFDIR}"/{smbusers,lmhosts}
- newins "${CONFDIR}/smb.conf.example-samba3" smb.conf.example
-
- newpamd "${CONFDIR}/samba.pam" samba
- use winbind && doins ${CONFDIR}/system-auth-winbind
- 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 "${FILESDIR}/samba-init" samba
- newconfd "${FILESDIR}/samba-conf" samba
-
- if use ldap ; then
- insinto /etc/openldap/schema
- doins "${S}/examples/LDAP/samba.schema"
- fi
-
- if use ipv6 ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/samba-xinetd" smb
- fi
-
- # 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}"/{README,Roadmap,WHATSNEW.txt}
- dodoc "${CONFDIR}/nsswitch.conf-wins"
- use winbind && dodoc "${CONFDIR}/nsswitch.conf-winbind"
-
- if use examples ; then
- insinto /usr/share/doc/${PF}
- doins -r "${S}/examples/"
- find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755
- find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644
- if use python ; then
- insinto /usr/share/doc/${PF}/python
- doins -r "${S}/source/python/examples"
- fi
- fi
-
- if ! use doc ; then
- if ! use swat ; then
- rm -rf "${D}/usr/share/doc/${PF}/swat"
- else
- rm -rf "${D}/usr/share/doc/${PF}/swat/help"/{guide,howto,devel}
- rm -rf "${D}/usr/share/doc/${PF}/swat/using_samba"
- fi
- fi
-
-}
-
-pkg_preinst() {
- local PRIVATE_SRC=/etc/samba/private
- if [[ ! -r "${ROOT}/${PRIVATE_DST}/secrets.tdb" \
- && -r "${ROOT}/${PRIVATE_SRC}/secrets.tdb" ]] ; then
- ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
- mkdir -p "${D}/${PRIVATE_DST}"
- cp -pPRf "${ROOT}/${PRIVATE_SRC}"/* "${D}/${PRIVATE_DST}/"
- eend $?
- fi
-
- if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]] ; then
- touch "${D}/etc/samba/smb.conf"
- fi
-}
-
-pkg_postinst() {
- if use python ; then
- python_version
- python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/samba
- fi
-
- if use swat ; then
- einfo "swat must be enabled by xinetd:"
- einfo " change the /etc/xinetd.d/swat configuration"
- fi
-
- if use ipv6 ; then
- einfo "ipv6 support must be enabled by xinetd:"
- einfo " change the /etc/xinetd.d/smb configuration"
- fi
-
- elog "It is possible to start/stop daemons seperately:"
- elog " Create a symlink from /etc/init.d/samba.{smbd,nmbd,winbind} to"
- elog " /etc/init.d/samba. Calling /etc/init.d/samba directly will start"
- elog " the daemons configured in /etc/conf.d/samba"
-
- elog "The mount/umount.cifs helper applications are not included anymore."
- elog "Please install net-fs/mount-cifs instead."
-}
-
-pkg_postrm() {
- if use python ; then
- python_version
- python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/samba
- fi
-}
diff --git a/net-fs/samba/samba-3.0.28a.ebuild b/net-fs/samba/samba-3.0.30.ebuild
index 75ad6e32f528..8fef5ca58efe 100644
--- a/net-fs/samba/samba-3.0.28a.ebuild
+++ b/net-fs/samba/samba-3.0.30.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28a.ebuild,v 1.3 2008/05/17 12:33:00 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.30.ebuild,v 1.1 2008/05/31 08:27:47 dev-zero Exp $
inherit autotools eutils pam python multilib versionator confutils
@@ -58,7 +58,7 @@ src_unpack() {
"${FILESDIR}/3.0.28-libcap_detection.patch" \
"${FILESDIR}/3.0.28-fix_broken_readdir_detection.patch" \
"${FILESDIR}/3.0.28-autoconf-2.62-fix.patch" \
- "${FILESDIR}/${PV}-wrong_python_ldflags.patch"
+ "${FILESDIR}/3.0.28a-wrong_python_ldflags.patch"
eautoconf -I. -Ilib/replace