* [gentoo-commits] gentoo-x86 commit in net-fs/samba: samba-3.4.14.ebuild ChangeLog samba-3.5.11.ebuild samba-3.5.9-r1.ebuild samba-3.4.13.ebuild samba-3.5.8.ebuild samba-3.5.8-r2.ebuild samba-3.5.9.ebuild samba-3.4.12-r1.ebuild samba-3.5.8-r1.ebuild samba-3.4.13-r1.ebuild
@ 2011-08-09 17:14 Victor Ostorga (vostorga)
0 siblings, 0 replies; only message in thread
From: Victor Ostorga (vostorga) @ 2011-08-09 17:14 UTC (permalink / raw
To: gentoo-commits
vostorga 11/08/09 17:14:39
Modified: ChangeLog samba-3.5.11.ebuild
Added: samba-3.4.14.ebuild
Removed: samba-3.5.9-r1.ebuild samba-3.4.13.ebuild
samba-3.5.8.ebuild samba-3.5.8-r2.ebuild
samba-3.5.9.ebuild samba-3.4.12-r1.ebuild
samba-3.5.8-r1.ebuild samba-3.4.13-r1.ebuild
Log:
Cleaning up vulnerable versions CVE-2011-2522 CVE-2011-2694 bug 377909; rolling back ldb DEPEND until bug 377809 is done; fixing KEYWORDS
(Portage version: 2.1.10.3/cvs/Linux i686)
Revision Changes Path
1.480 net-fs/samba/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.480&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.480&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.479&r2=1.480
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -r1.479 -r1.480
--- ChangeLog 9 Aug 2011 13:22:46 -0000 1.479
+++ ChangeLog 9 Aug 2011 17:14:39 -0000 1.480
@@ -1,6 +1,15 @@
# ChangeLog for net-fs/samba
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.479 2011/08/09 13:22:46 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.480 2011/08/09 17:14:39 vostorga Exp $
+
+*samba-3.4.14 (09 Aug 2011)
+
+ 09 Aug 2011; Víctor Ostorga <vostorga@gentoo.org> -samba-3.4.12-r1.ebuild,
+ -samba-3.4.13.ebuild, -samba-3.4.13-r1.ebuild, +samba-3.4.14.ebuild,
+ -samba-3.5.8.ebuild, -samba-3.5.8-r1.ebuild, -samba-3.5.8-r2.ebuild,
+ -samba-3.5.9.ebuild, -samba-3.5.9-r1.ebuild, samba-3.5.11.ebuild:
+ Cleaning up vulnerable versions CVE-2011-2522 CVE-2011-2694 bug 377909;
+ rolling back ldb DEPEND until bug 377809 is done; fixing KEYWORDS
09 Aug 2011; Robert Piasek <dagger@gentoo.org> -samba-3.6.0_rc3.ebuild,
-samba-3.6.0_rc3-r1.ebuild, +samba-3.6.0.ebuild:
1.2 net-fs/samba/samba-3.5.11.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild?r1=1.1&r2=1.2
Index: samba-3.5.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba-3.5.11.ebuild 7 Aug 2011 20:12:39 -0000 1.1
+++ samba-3.5.11.ebuild 9 Aug 2011 17:14:39 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild,v 1.1 2011/08/07 20:12:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.11.ebuild,v 1.2 2011/08/09 17:14:39 vostorga Exp $
EAPI=4
@@ -15,7 +15,7 @@
http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes smbtav2
swat syslog winbind"
@@ -39,7 +39,6 @@
debug? ( dev-libs/dmalloc )
fam? ( virtual/fam )
ldap? ( net-nds/openldap )
- ldb? ( sys-libs/ldb )
pam? ( virtual/pam
winbind? ( dev-libs/iniparser )
)
@@ -92,7 +91,7 @@
fi
use cups && BINPROGS="${BINPROGS} bin/smbspool"
-# use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
+ use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
if use winbind ; then
BINPROGS="${BINPROGS} bin/wbinfo"
1.1 net-fs/samba/samba-3.4.14.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.4.14.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.4.14.ebuild?rev=1.1&content-type=text/plain
Index: samba-3.4.14.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.14.ebuild,v 1.1 2011/08/09 17:14:39 vostorga Exp $
EAPI="2"
inherit pam confutils versionator multilib
MY_PV=${PV/_/}
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Library bits of the samba network filesystem"
HOMEPAGE="http://www.samba.org/"
SRC_URI="mirror://samba/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
syslog winbind "
DEPEND="dev-libs/popt
!net-fs/samba-client
!net-fs/samba-libs
!net-fs/samba-server
!net-fs/cifs-utils
sys-libs/talloc
sys-libs/tdb
virtual/libiconv
ads? ( virtual/krb5 sys-fs/e2fsprogs
client? ( sys-apps/keyutils ) )
avahi? ( net-dns/avahi[dbus] )
caps? ( sys-libs/libcap )
client? ( !net-fs/mount-cifs
dev-libs/iniparser )
cluster? ( dev-db/ctdb )
cups? ( net-print/cups )
debug? ( dev-libs/dmalloc )
fam? ( virtual/fam )
ldap? ( net-nds/openldap )
pam? ( virtual/pam
winbind? ( dev-libs/iniparser ) )
readline? ( >=sys-libs/readline-5.2 )
syslog? ( virtual/logger )"
RDEPEND="${DEPEND}"
# Disable tests since we don't want to build that much here
RESTRICT="test"
SBINPROGS=""
BINPROGS=""
if use server ; then
SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
bin/profiles bin/sharesec bin/eventlogadm"
use swat && SBINPROGS="${SBINPROGS} bin/swat"
use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
fi
if use client ; then
BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
bin/ntlm_auth"
use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
fi
use cups && BINPROGS="${BINPROGS} bin/smbspool"
use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
if use winbind ; then
BINPROGS="${BINPROGS} bin/wbinfo"
mymod_shared="--with-shared-modules=idmap_rid,idmap_hash"
use ldap && mymod_shared="${mymod_shared},idmap_adex,idmap_ldap"
use ads && mymod_shared="${mymod_shared},idmap_ad"
fi
S="${WORKDIR}/${MY_P}/source3"
# TODO:
# - enable iPrint on Prefix/OSX and Darwin?
# - selftest-prefix? selftest?
# - AFS?
CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
pkg_setup() {
if use winbind &&
[[ $(tc-getCC)$ == *gcc* ]] &&
[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
then
eerror "It is a known issue that ${P} will not build with "
eerror "winbind use flag enabled when using gcc < 4.3 ."
eerror "Please use at least the latest stable gcc version."
die "Using sys-devel/gcc < 4.3 with winbind use flag."
fi
confutils_use_depend_all ads ldap
confutils_use_depend_all swat server
confutils_use_depend_all client netapi
}
src_prepare() {
cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
# ensure that winbind has correct ldflags (QA notice)
sed -i \
-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
configure || die "sed failed"
epatch "${CONFDIR}"/${PN}-3.4.9-kerberos-dummy.patch
}
src_configure() {
local myconf
# Filter out -fPIE
[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
# Upstream refuses to make this configurable
use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
# use_with doesn't accept 2 USE-flags
if use client && use ads ; then
myconf="${myconf} --with-cifsupcall"
else
myconf="${myconf} --without-cifsupcall"
fi
# Notes:
# - automount is only needed in conjunction with NIS and we don't have that
# anymore => LDAP?
# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
econf ${myconf} \
--with-piddir=/var/run/samba \
--sysconfdir=/etc/samba \
--localstatedir=/var \
$(use_enable debug developer) \
--enable-largefile \
--enable-socket-wrapper \
--enable-nss-wrapper \
$(use_enable swat) \
$(use_enable debug dmalloc) \
$(use_enable cups) \
--disable-iprint \
$(use_enable fam) \
--enable-shared-libs \
--disable-dnssd \
$(use_enable avahi) \
--with-fhs \
--with-privatedir=/var/lib/samba/private \
--with-rootsbindir=/var/cache/samba \
--with-lockdir=/var/cache/samba \
--with-swatdir=/usr/share/doc/${PF}/swat \
--with-configdir=/etc/samba \
--with-logfilebase=/var/log/samba \
--with-pammodulesdir=$(getpam_mod_dir) \
--without-afs \
--without-fake-kaserver \
--without-vfs-afsacl \
$(use_with ldap) \
$(use_with ads) \
$(use_with ads krb5 /usr) \
$(use_with ads dnsupdate) \
--without-automount \
$(use_with client cifsmount) \
$(use_with pam) \
$(use_with pam pam_smbpass) \
$(use_with syslog) \
$(use_with quota quotas) \
$(use_with quota sys-quotas) \
--without-utmp \
--without-lib{talloc,tdb} \
$(use_with netapi libnetapi) \
$(use_with smbclient libsmbclient) \
$(use_with smbsharemodes libsmbsharemodes) \
$(use_with addns libaddns) \
$(use_with cluster ctdb /usr) \
$(use_with cluster cluster-support) \
$(use_with acl acl-support) \
$(use_with aio aio-support) \
--with-sendfile-support \
$(use_with winbind) \
${mymod_shared} \
--without-included-popt \
--without-included-iniparser
}
src_compile() {
# compile libs
if use addns ; then
einfo "make addns library"
emake libaddns || die "emake libaddns failed"
fi
if use netapi ; then
einfo "make netapi library"
emake libnetapi || die "emake libnetapi failed"
fi
if use smbclient ; then
einfo "make smbclient library"
emake libsmbclient || die "emake libsmbclient failed"
fi
if use smbsharemodes ; then
einfo "make smbsharemodes library"
emake libsmbsharemodes || die "emake libsmbsharemodes failed"
fi
# compile modules
emake modules || die "building modules failed"
# compile pam moudles
if use pam ; then
einfo "make pam modules"
emake pam_modules || die "emake pam_modules failed";
fi
# compile winbind nss modules
if use winbind ; then
einfo "make nss modules"
emake nss_modules || die "emake nss_modules failed";
fi
# compile utilities
if [ -n "${BINPROGS}" ] ; then
einfo "make binprogs"
emake ${BINPROGS} || die "emake binprogs failed";
fi
if [ -n "${SBINPROGS}" ] ; then
einfo "make sbinprogs"
emake ${SBINPROGS} || die "emake sbinprogs failed";
fi
if use client ; then
einfo "make {,u}mount.cifs"
emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
fi
}
src_install() {
# install libs
if use addns ; then
einfo "install addns library"
emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
fi
if use netapi ; then
einfo "install netapi library"
emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
fi
if use smbclient ; then
einfo "install smbclient library"
emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
fi
if use smbsharemodes ; then
einfo "install smbsharemodes library"
emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
fi
# install modules
emake installmodules DESTDIR="${D}" || die "installing modules failed"
if use pam ; then
einfo "install pam modules"
emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
if use winbind ; then
newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
doman ../docs/manpages/pam_winbind.8
fi
newpamd "${CONFDIR}/samba.pam" samba
dodoc pam_smbpass/README
fi
# Nsswitch extensions. Make link for wins and winbind resolvers
if use winbind ; then
einfo "install libwbclient"
emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
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
einfo "install libwbclient related manpages"
doman ../docs/manpages/idmap_rid.8
doman ../docs/manpages/idmap_hash.8
if use ldap ; then
doman ../docs/manpages/idmap_adex.8
doman ../docs/manpages/idmap_ldap.8
fi
if use ads ; then
doman ../docs/manpages/idmap_ad.8
fi
fi
# install binaries
insinto /usr
for prog in ${SBINPROGS} ; do
dosbin ${prog} || die "installing ${prog} failed"
doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
done
for prog in ${BINPROGS} ; do
dobin ${prog} || die "installing ${prog} failed"
doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
done
# install server components
if use server ; then
doman ../docs/manpages/vfs* ../docs/manpages/samba.7
diropts -m0700
keepdir /var/lib/samba/private
diropts -m1777
keepdir /var/spool/samba
diropts -m0755
keepdir /var/{cache,log}/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/{auth,pdb,rpc,idmap,nss_info,gpext}
newconfd "${CONFDIR}/samba.confd" samba
newinitd "${CONFDIR}/samba.initd" samba
insinto /etc/samba
doins "${CONFDIR}"/{smbusers,lmhosts}
if use ldap ; then
insinto /etc/openldap/schema
doins ../examples/LDAP/samba.schema
fi
if use swat ; then
insinto /etc/xinetd.d
newins "${CONFDIR}/swat.xinetd" swat
script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
|| die "installing swat failed"
fi
dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
fi
# install client files ({u,}mount.cifs into /)
if use client ; then
into /
dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
fi
# install the spooler to cups
use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
# install misc files
insinto /etc/samba
doins "${CONFDIR}"/smb.conf.default
doman ../docs/manpages/smb.conf.5
insinto /usr/"$(get_libdir)"/samba
doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
# install docs
if use doc ; then
dohtml -r ../docs/htmldocs/*
dodoc ../docs/*.pdf
fi
# install examples
if use examples ; then
einfo "install examples"
insinto /usr/share/doc/${PF}/examples
if use smbclient ; then
doins -r ../examples/libsmbclient
fi
if use winbind ; then
doins -r ../examples/pam_winbind ../examples/nss
fi
if use server ; then
doins -r \
../examples/{auth,autofs,dce-dfs,LDAP,logon,misc} \
../examples/{pdb,perfcounter,printer-accounting} \
../examples/{printing,scripts,tridge,validchars,VFS}
fi
fi
# Remove empty installation directories
rmdir --ignore-fail-on-non-empty \
"${D}/usr/$(get_libdir)/samba" \
"${D}/usr"/{sbin,bin} \
"${D}/usr/share"/{man,locale,} \
"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
# || die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
}
pkg_postinst() {
elog "The default passdb backend has been changed to 'tdbsam' in samba 3.4!"
elog "That breaks existing setups using the 'smbpasswd' backend without"
elog "explicit declaration!"
elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
elog "'pdbedit -i smbpasswd -e tdbsam'."
elog "For further information make sure to read the release notes at"
elog "http://samba.org/samba/history/${P}.html and "
elog "http://samba.org/samba/history/${PN}-3.4.0.html"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-09 17:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-09 17:14 [gentoo-commits] gentoo-x86 commit in net-fs/samba: samba-3.4.14.ebuild ChangeLog samba-3.5.11.ebuild samba-3.5.9-r1.ebuild samba-3.4.13.ebuild samba-3.5.8.ebuild samba-3.5.8-r2.ebuild samba-3.5.9.ebuild samba-3.4.12-r1.ebuild samba-3.5.8-r1.ebuild samba-3.4.13-r1.ebuild Victor Ostorga (vostorga)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox