Version bump. Fixed manifest (bug #212774). Fixed system-auth-winbind installation...
authorTiziano Müller <dev-zero@gentoo.org>
Mon, 10 Mar 2008 08:15:41 +0000 (08:15 +0000)
committerTiziano Müller <dev-zero@gentoo.org>
Mon, 10 Mar 2008 08:15:41 +0000 (08:15 +0000)
Package-Manager: portage-2.1.4.4

net-fs/samba/ChangeLog
net-fs/samba/Manifest
net-fs/samba/files/config/system-auth-winbind
net-fs/samba/samba-3.0.28a.ebuild [new file with mode: 0644]

index 272b98d8baf0a8f46c7e1ec1f6eb1e5c3ce285e0..a276ab1d877c541044ecc7881cd5f76fc2c006b5 100644 (file)
@@ -1,6 +1,13 @@
 # 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.330 2008/03/08 12:24:01 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.331 2008/03/10 08:15:40 dev-zero Exp $
+
+*samba-3.0.28a (10 Mar 2008)
+
+  10 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  files/config/system-auth-winbind, +samba-3.0.28a.ebuild:
+  Version bump. Fixed manifest (bug #212774). Fixed system-auth-winbind
+  installation (bug #212387).
 
 *samba-3.2.0_pre2 (08 Mar 2008)
 
index c6d119ae2f9d14046d095e440d3f00e472c50c40..7c55927623c82a8d4427a9c28d63b0d06543ec44 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.0.26a-CVE-2007-5398.patch 1232 RMD160 b547196a44437d6336495ea727f9abfcfd41e79c SHA1 e2b7d91446e07bf1be5930187417f26841995743 SHA256 37a0181aa647de7feb888d675ea726e135bbe53bc3099076eaf0682fc1b11b05
 AUX 3.0.26a-invalid-free-fix.patch 541 RMD160 13e1b0420ae9c06a2e6d4f9a8a0a3af8c32318b9 SHA1 0457c901f55b86b9b3751dc67b86a26cb19ec4e7 SHA256 4a727b9a02cbc7e2efc00190d5068c82e12a0b9fdad2a50869a2f10bc39a06f2
 AUX 3.0.26a-lazyldflags.patch 1466 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d SHA1 35742557c810ae4bfbbfecc3a6c3549c392fd313 SHA256 07eb35a567540bc88657f75881c8daf10de3697b64ec9bd7167f1df80cfb0d55
@@ -25,22 +22,17 @@ AUX config/samba.schema 16044 RMD160 b28408c64524ea44a9b0ea877d614603456a18fa SH
 AUX config/smb.conf.example-samba3 19701 RMD160 1ce92cbedb15cf5ee4d66ee50fd7c996231facea SHA1 5c60002f23ac2a60fc27b58ea03659acb0db876a SHA256 83fd9407e71db606bb50677f9d8a557688b6eafacb32d30c7a0a6d1c666b694d
 AUX config/smbusers 208 RMD160 04d432806e3024543096da6e079820032a850436 SHA1 ef8344b94b3860d405f8663206be9d5cab6030a9 SHA256 845fbb6c93e4570fc40ca59e2471a9a72cb76fe20ce5bde5f75fec65b5471702
 AUX config/swat.xinetd 531 RMD160 76c6d999a77c356d1013ab2586762e034550aac3 SHA1 3c25ea5418a007c875959cf12416ef1cbc37952b SHA256 12c2e1a907d1751f2431fc2b1a4702ee6ddca228c81056333dd96a4f146ac1ab
-AUX config/system-auth-winbind 873 RMD160 7392d93abc16dd5e1caaebe8bbe3aa786b1122fb SHA1 5e1161d30926f6b9772645a61ad664d2d15b81ff SHA256 365843527fe3c6b0576d499646a36690558699ffc21e4ef089099c3e773accbe
+AUX config/system-auth-winbind 705 RMD160 fc6cc98cd1749d4e44f7edfbfd904fe77aaf046f SHA1 1b55c7b4211133b8fe27d07dd0a4a14539fbf859 SHA256 73791c615c207f2ff5589866eda7def275ed0b1085ac3f465ba9442258858e14
 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
 DIST samba-3.0.27.tar.gz 18135175 RMD160 e81cbcfc7d5b1768f78d1e7a6908695207543dac SHA1 d1157992adbab1f5d5aff54f370d1797fcf8927e SHA256 a8fe4c4b8dde879c61d6989015dafde240c461051a0769f739d8227597825859
 DIST samba-3.0.28.tar.gz 18159912 RMD160 816b57bff30a968c56be0c6864e6ea9f18981737 SHA1 4fcad8134f89a123a254138de0ace4a13993b007 SHA256 dcaf9213b9f7c749b346214ae21808cd336947c71693b4eca1af6f037725d98e
+DIST samba-3.0.28a.tar.gz 18172643 RMD160 646680c49fd56d98430d325884a5911d406e13be SHA1 b4829b133af3865f6518bae14af4d989b6f1c31a SHA256 9dc9ecb26017b1831cb1e0b212e1eb8c0b6176df6513fc737b585f453181d9de
 DIST samba-3.2.0pre2.tar.gz 16593448 RMD160 8e233f98623b7a31a7c745d69a108997e803c7f5 SHA1 4b656ae17ebfb5ce1ecdc7124673eb7da19f515c SHA256 bb71293c8587b2def6c35553c8f062252f18f4a5f0e871dcbed8f747c90a4e69
 EBUILD samba-3.0.27.ebuild 8773 RMD160 a3a889c643267c254309f36d2bd08447186bb6b5 SHA1 aa91fab445d3e3f94c4cbbd35cddf0df84f0c956 SHA256 e3d330432891f3f3b6ef441587f283e3c72b6364207e7eaea0d1346b1e72fb2b
 EBUILD samba-3.0.28.ebuild 9235 RMD160 94456ea5555dbc3033189cc22c07d4f46b0b44ff SHA1 9c3b4dba5367a5a7ff07e90971296173c4566869 SHA256 01aea306fbf660735332f1e467e041dfde1a60b7f214b635465df57e8d62baaf
+EBUILD samba-3.0.28a.ebuild 9264 RMD160 67cf412960cbe32659ec7c30128f667234bde746 SHA1 1159c79afd2481f667fafbccaff9869bf4ba8488 SHA256 f027354b42290525889c9e4510eb2f21406c53d57030f1ed89e462cb744ab7be
 EBUILD samba-3.2.0_pre2.ebuild 8681 RMD160 146b3c435100eccec6b7bdcef510b0847f7b317f SHA1 af627d61a536c2055fb693b8ae5334f0721172d6 SHA256 d4f80695aaf4b3ba7f5e505f1b422efcb5c6fdc859aa9296c69060aaccc0fc44
-MISC ChangeLog 56441 RMD160 015472419c9e59e1ee45c3ecfaa593d5da467ab5 SHA1 4068efc3f60f4ad7c7ea00d1a98473e54d62fe7e SHA256 c4c28769d011be4d8631a44ea1a414a1c3e09a47aa824232ada16428d16d1cfb
+MISC ChangeLog 56686 RMD160 57b0658d4d2386dde4331b8a74b2f801b65c4e0f SHA1 1a50f866f70f6a39c56c973acc13b8b33bb9f0a0 SHA256 2f579777c54cdeadd4a1bc2e513eb31bcce826289ad1ad141893ca0cc83edb48
 MISC metadata.xml 489 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 SHA1 317e61704a10a3bd888d32c6834721f5d40d00ff SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH01aD/ejvha5XGaMRAqkUAJwNT2LAt2TZXFL1G8ucstzXhWlt7ACePjoN
-Bs6av9TKLk7zkBrPiIkwe5s=
-=OjxA
------END PGP SIGNATURE-----
index d3ef029a8cd7a92e754fbbbf675316082df87cfa..984289a222a4dfe1a9f234e3db5c72551be65da0 100644 (file)
@@ -1,18 +1,18 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config/system-auth-winbind,v 1.1 2007/09/07 21:07:40 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config/system-auth-winbind,v 1.2 2008/03/10 08:15:41 dev-zero Exp $
 
-auth        required      /lib/security/pam_env.so
-auth        sufficient    /lib/security/pam_winbind.so
-auth        sufficient    /lib/security/pam_unix.so likeauth nullok use_first_pass
-auth        required      /lib/security/pam_deny.so
+auth        required      pam_env.so
+auth        sufficient    pam_winbind.so
+auth        sufficient    pam_unix.so likeauth nullok use_first_pass
+auth        required      pam_deny.so
 
-account     sufficient    /lib/security/pam_winbind.so
-account     required      /lib/security/pam_unix.so
+account     sufficient    pam_winbind.so
+account     required      pam_unix.so
 
-password    required      /lib/security/pam_cracklib.so retry=3
-password    sufficient    /lib/security/pam_unix.so nullok use_authtok md5 shadow
-password    required      /lib/security/pam_deny.so
+password    required      pam_cracklib.so retry=3
+password    sufficient    pam_unix.so nullok use_authtok md5 shadow
+password    required      pam_deny.so
 
-session     required      /lib/security/pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      /lib/security/pam_limits.so
-session     required      /lib/security/pam_unix.so
+session     required      pam_mkhomedir.so skel=/etc/skel/ umask=0022 
+session     required      pam_limits.so
+session     required      pam_unix.so
diff --git a/net-fs/samba/samba-3.0.28a.ebuild b/net-fs/samba/samba-3.0.28a.ebuild
new file mode 100644 (file)
index 0000000..311bc62
--- /dev/null
@@ -0,0 +1,320 @@
+# 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.1 2008/03/10 08:15:40 dev-zero Exp $
+
+inherit autotools 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}"
+
+# Tests are broken now :-(
+RESTRICT="test"
+
+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"
+
+       epatch "${FILESDIR}/3.0.28-libcap_detection.patch" \
+               "${FILESDIR}/3.0.28-fix_broken_readdir_detection.patch"
+
+       eautoconf -I. -Ilib/replace
+
+       # 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-pammodulesdir=$(getpam_mod_dir) \
+               --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
+
+       # Removing executable bits from header-files
+       fperms 644 /usr/include/lib{msrpc,smbclient}.h
+
+       # 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 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 && dopamd "${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}"/{MAINTAINERS,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 separately:"
+       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."
+
+       ewarn "If you're upgrading from 3.0.24 or earlier, please make sure to"
+       ewarn "restart your clients to clear any cached information about the server."
+       ewarn "Otherwise they might not be able to connect to the volumes."
+}
+
+pkg_postrm() {
+       if use python ; then
+               python_version
+               python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/samba
+       fi
+}