From 4b4e32e57f06543bf0629ced0c1353cfe9a2fcba Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 17 Dec 2006 03:26:58 +0000 Subject: [PATCH] Version bump with a lot of help from Chris Smith #143903. Package-Manager: portage-2.1.2_rc3-r5 --- net-fs/samba/ChangeLog | 7 +- net-fs/samba/Manifest | 23 +- net-fs/samba/files/digest-samba-3.0.23d | 9 + net-fs/samba/samba-3.0.23d.ebuild | 294 ++++++++++++++++++++++++ 4 files changed, 325 insertions(+), 8 deletions(-) create mode 100644 net-fs/samba/files/digest-samba-3.0.23d create mode 100644 net-fs/samba/samba-3.0.23d.ebuild diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index bea9a60381c5..6b1bd490713c 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-fs/samba # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.259 2006/12/17 01:58:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.260 2006/12/17 03:26:58 vapier Exp $ + +*samba-3.0.23d (17 Dec 2006) + + 17 Dec 2006; Mike Frysinger +samba-3.0.23d.ebuild: + Version bump with a lot of help from Chris Smith #143903. 17 Dec 2006; Mike Frysinger samba-3.0.23a.ebuild: Unpack the gentoo tarball first so that it doesnt force old timestamps onto diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 18432a03b9c5..a75d872176cf 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -10,6 +10,7 @@ DIST samba-3-gentoo-0.3.11.tar.bz2 15929 RMD160 2ad449ab8ceddb2d2f940eaebdab7965 DIST samba-3-gentoo-0.3.12.tar.bz2 16286 RMD160 ee6a63e9fc3a7ad87e5f0ce288b1176cb445dbe1 SHA1 474fb063a6a965a28ad65e0acb240799c1e56a1a SHA256 3f49e8f7254122be1d1b2f94594fcf57c8417989c40265a44f1bb4ba86b3a17e DIST samba-3-gentoo-0.3.13.tar.bz2 16532 RMD160 9ad61f4391a7c452a40391551f222d6e8107e70b SHA1 40a1e2d5080ae022ff00ac60ed3e804d8d3763f5 SHA256 e910780553784c0fb41ffad25a8185c20879eb14b8d53ce888e5ad05dc0e4e93 DIST samba-3-gentoo-0.3.14.tar.bz2 16011 RMD160 9b0b5bb67ccc554e337a242fcacb1d41b4c97add SHA1 b4100c7694cca1aaaa9c71f8007913c6502807e3 SHA256 6d76ad33bea7af92a8445275bad6aab05e7a59a7bac67be09ebca4f9e9af8dfc +DIST samba-3-gentoo-0.3.15.tar.bz2 15774 RMD160 facce158355559a300923272b655f6c0c50c8b3b SHA1 60d9f9d9d6c192213d775e45c3ceb6183971a486 SHA256 820758c4a8710da27fc1dc3f25729bce79fd0d2a92db5414353f5fe730f5c439 DIST samba-3-gentoo-0.3.3.tar.bz2 17675 RMD160 d9193e67c6ee0861de3f7ba16de42cb38922913c SHA1 96b21e6d29ffe30adb08a189e93b10081066217d SHA256 1e376c070ba597ad8822741b3b55f810a2613dede9cad1ef3b0f28cc3abb1fdf DIST samba-3.0.14a.tar.gz 15605851 RMD160 69993b25fc5d4d172fc70e26b9e5e4b5b9ab0c0f SHA1 978ff392d575c717069c66e918f6bbbf815b84b1 SHA256 d8721cc71b9c4ac878d3eef02f01bde7aee18bddd4e40bf213fca577edf3fd18 DIST samba-3.0.20b.tar.gz 17165513 RMD160 c7fe6cf7e3cae6835efd631f9c7d8b97c8253370 SHA1 e46fa8465dd70c670d84d697e408e70cbc18bb56 SHA256 61d165b7df5cfae1968833caf76d53a9ebfd3849a40098ed26caafcda0a073f6 @@ -18,6 +19,7 @@ DIST samba-3.0.21b.tar.gz 17539079 RMD160 883f855523e2a079cd7295df6647b3cb9b56c2 DIST samba-3.0.22.tar.gz 17542657 RMD160 b41cffc999c524c1650d2dd3fbd063dc79741091 SHA1 76eba872b3e8f647e16d0d8d129e02848a7989d7 SHA256 781466885804343248afb74dfdd57df0c7165b252ded06a71c0f24827b2a8e2d DIST samba-3.0.23.tar.gz 17677551 RMD160 d8814845c5e177e5ac0a376c40e7e2d1b3733dd7 SHA1 94b40c42b976ef19714a105823416e64fd855d5c SHA256 a198213c44c9837169916c82a885c9916e1627c5dc2285663998f8c307d8590e DIST samba-3.0.23a.tar.gz 17683518 RMD160 d7ab7ec895923d74c8b11507c3cc678d0b0b895c SHA1 11d6b75811c38ed89da2460386e36fd23af24d3c SHA256 e0504eabb825875213cc06607d93946227d884cb3d09e551c4a1de547b1956f2 +DIST samba-3.0.23d.tar.gz 17704221 RMD160 2c80a504f01dc78e2fa52e1f7d765812ac20672e SHA1 080d617ecda196db4e6d58ac55573ee016e37b60 SHA256 0af21d6cfeb8186987cc5b59e41034f663124859ce30b5b98f3abed501f2cd46 DIST samba-vscan-0.3.6.tar.bz2 166733 RMD160 462a9de0789122c0627b0ed4f6e7b6ed3cd883af SHA256 5e552668d8e31d78281a4e93c4ac9b3490e145bc27d4ad0029d175f6c90a755a DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 EBUILD samba-3.0.14a-r2.ebuild 9191 RMD160 8cab9f853ce337f20195cf26015a836244ea109e SHA1 b5149f6fe4118fbe04a9346feb427c81ab5ae6c5 SHA256 3d2665dcc83e17709eb272bec93ca68167da5951a3574b9bf7905939cf575276 @@ -56,10 +58,14 @@ EBUILD samba-3.0.23a.ebuild 8217 RMD160 90c43ca5eac274e1965c7609fec576f9ad8c89bc MD5 d46f902b92a4a3d77b7899fd90e888ad samba-3.0.23a.ebuild 8217 RMD160 90c43ca5eac274e1965c7609fec576f9ad8c89bc samba-3.0.23a.ebuild 8217 SHA256 11a6692c5619413eee274d57d9d2ffb7a9ad162209fedca87f80db6f4a7ad3e3 samba-3.0.23a.ebuild 8217 -MISC ChangeLog 44787 RMD160 ee585e5627e9ae6818bc5ff4414cd12120279668 SHA1 c75c3f95b8c7b042f98bf96d99e3c586109a9bbb SHA256 2461682b8c93c13266d347f92dfb8a9c39017bcf84a6cb6239a9c19417acd72d -MD5 004a7abaf100f45670b978f6db71ca6f ChangeLog 44787 -RMD160 ee585e5627e9ae6818bc5ff4414cd12120279668 ChangeLog 44787 -SHA256 2461682b8c93c13266d347f92dfb8a9c39017bcf84a6cb6239a9c19417acd72d ChangeLog 44787 +EBUILD samba-3.0.23d.ebuild 8246 RMD160 d2672d1b5afcb4e97490cc793bf12918f1f9b0f8 SHA1 4f339d08e64f9392612568a457a4d6d6b0aefd3a SHA256 597da5ad529bbd74333d190500a89ec65b4934d3ca33a58b54345d81f8f5cbf9 +MD5 1413bb02c5c92c92e3b2fbc705262458 samba-3.0.23d.ebuild 8246 +RMD160 d2672d1b5afcb4e97490cc793bf12918f1f9b0f8 samba-3.0.23d.ebuild 8246 +SHA256 597da5ad529bbd74333d190500a89ec65b4934d3ca33a58b54345d81f8f5cbf9 samba-3.0.23d.ebuild 8246 +MISC ChangeLog 44951 RMD160 02d4575c28d645a13ec555da7dec2eb09176cbb4 SHA1 759c215b9a68e3182ef118a5939ee89f86cb74e9 SHA256 019e69447394f7bd573e05a94847215c52d2a0ac1cefc151f1360bcda9742bc9 +MD5 6796b020d5e758ca0fe3c191719aa4d9 ChangeLog 44951 +RMD160 02d4575c28d645a13ec555da7dec2eb09176cbb4 ChangeLog 44951 +SHA256 019e69447394f7bd573e05a94847215c52d2a0ac1cefc151f1360bcda9742bc9 ChangeLog 44951 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491 @@ -91,10 +97,13 @@ SHA256 ae4166a3ea2e4d460f1f421d9f79e04809eca19153ede6904d7104fcab04fc61 files/di MD5 1b4ea5b0f2f47a85b1632d4cfb19d7c5 files/digest-samba-3.0.23a 771 RMD160 77c01ce47cda16f1c0fd6ca791dc3b17e3e1fc5b files/digest-samba-3.0.23a 771 SHA256 16d8cbdd4db0901523de3d7d7cf693deb7394bf71bcf47c7826bd182f10183bf files/digest-samba-3.0.23a 771 +MD5 13675ea30af4dd21c7aba8b559de468b files/digest-samba-3.0.23d 771 +RMD160 1fab9b6e1e88a1885bfc474d19ca1df43c85db59 files/digest-samba-3.0.23d 771 +SHA256 30f6f8be83fa2e02aabfbed9e619367d82f4e70c67e9baeab97fdd451b8f4d2e files/digest-samba-3.0.23d 771 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFhKRFK9sYciBdMQMRAmb3AJ9FFOj5VFNE3z+0DaoYJk8+kl8zeACaArNF -ZcgEsbp+AGgAPowxOl6EyBU= -=e5bD +iD8DBQFFhLkKK9sYciBdMQMRApNcAJ9FUy3qi5g0qaZLSgprabRi3lo+WgCghs5O +jX3mtyaL04GHoR2UKOjo274= +=w6K1 -----END PGP SIGNATURE----- diff --git a/net-fs/samba/files/digest-samba-3.0.23d b/net-fs/samba/files/digest-samba-3.0.23d new file mode 100644 index 000000000000..3b3eca08f048 --- /dev/null +++ b/net-fs/samba/files/digest-samba-3.0.23d @@ -0,0 +1,9 @@ +MD5 78346283a12e7e9a6eeec9a5b0019a26 samba-3-gentoo-0.3.15.tar.bz2 15774 +RMD160 facce158355559a300923272b655f6c0c50c8b3b samba-3-gentoo-0.3.15.tar.bz2 15774 +SHA256 820758c4a8710da27fc1dc3f25729bce79fd0d2a92db5414353f5fe730f5c439 samba-3-gentoo-0.3.15.tar.bz2 15774 +MD5 afe6923d05fed5b5ccab593c7a407cd1 samba-3.0.23d.tar.gz 17704221 +RMD160 2c80a504f01dc78e2fa52e1f7d765812ac20672e samba-3.0.23d.tar.gz 17704221 +SHA256 0af21d6cfeb8186987cc5b59e41034f663124859ce30b5b98f3abed501f2cd46 samba-3.0.23d.tar.gz 17704221 +MD5 900502ba36b80620229b94e5129bc856 samba-vscan-0.3.6b.tar.bz2 164471 +RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b samba-vscan-0.3.6b.tar.bz2 164471 +SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4 samba-vscan-0.3.6b.tar.bz2 164471 diff --git a/net-fs/samba/samba-3.0.23d.ebuild b/net-fs/samba/samba-3.0.23d.ebuild new file mode 100644 index 000000000000..cfd7404f7bf0 --- /dev/null +++ b/net-fs/samba/samba-3.0.23d.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.23d.ebuild,v 1.1 2006/12/17 03:26:58 vapier Exp $ + +WANT_AUTOCONF="latest" +inherit eutils autotools versionator + +IUSE_LINGUAS="ja pl" +IUSE="acl async automount cups doc examples kerberos kernel_linux ldap fam + linguas_ja linguas_pl + oav pam python quotas readline selinux swat syslog winbind" +#RESTRICT="test" # tests are enabled with --enable-socket-wrapper + +VSCAN_VER="0.3.6b" +PATCH_VER="0.3.15" +MY_P=${PN}-${PV/_/} +MY_PP=${PN}-$(get_major_version)-gentoo-${PATCH_VER} +S2=${WORKDIR}/${MY_P} +S=${S2}/source +PFVSCAN=${PN}-vscan-${VSCAN_VER} +DESCRIPTION="SAMBA is a suite of SMB and CIFS client/server programs for UNIX" +HOMEPAGE="http://www.samba.org/ http://www.openantivirus.org/projects.php" +SRC_URI="mirror://gentoo/${MY_PP}.tar.bz2 + mirror://samba/${MY_P}.tar.gz + mirror://samba/old-versions/${MY_P}.tar.gz + oav? ( mirror://sourceforge/openantivirus/${PFVSCAN}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" + +RDEPEND="dev-libs/popt + virtual/libiconv + acl? ( kernel_linux? ( sys-apps/acl ) ) + cups? ( net-print/cups ) + ldap? ( kerberos? ( virtual/krb5 ) 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 ) + " +DEPEND="${RDEPEND} + sys-devel/autoconf + >=sys-apps/sed-4" + +PRIVATE_DST=/var/lib/samba/private +PATCHDIR=${WORKDIR}/patches +CONFDIR=${WORKDIR}/configs + +src_unpack() { + unpack ${A} + cd "${S2}" + + rm -rf ${S2}/examples.ORIG + + export EPATCH_SUFFIX="patch" + epatch ${PATCHDIR}/general + if use oav ; then + cd ${WORKDIR} + if [[ -d ${PATCHDIR}/vscan ]] ; then + epatch ${PATCHDIR}/vscan + fi + cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS + fi + + # patches screw with autotool files + cd "${S}" + eautoconf +} + +src_compile() { + local myconf + local mylangs + local mymod_shared + + 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 kerberos ads)" + use winbind && mymod_shared="${mymod_shared},idmap_ad" + fi + + [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" + use hppa && myconf="${myconf} --disable-pie" + + use fam && export ac_cv_header_fam_h=yes || export ac_cv_header_fam_h=no + 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 \ + $(use_with acl acl-support) \ + $(use_with async aio-support) \ + $(use_with automount) \ + $(use_enable cups) \ + $(use_with kerberos krb5) \ + $(use_with ldap) \ + $(use_with pam) $(use_with pam pam_smbpass) \ + $(use_with python) \ + $(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 + + emake proto || die "SAMBA make proto error" + emake everything || die "SAMBA make everything error" + + emake rpctorture >& rpctorture.log || ewarn "rpctorture didn't build [that's ok!]" + + if use python ; then + python python/setup.py build + fi + + # Build samba-vscan plugins + if use oav ; then + cd ${S2}/examples/VFS/${PFVSCAN} + econf \ + --with-fhs \ + --libdir=/usr/$(get_libdir)/samba \ + || die "${PFVSCAN} ./configure failed" + emake || die "Failed to make ${PFVSCAN}" + fi + +} + +src_install() { + local extra_bins="rpctorture" + + emake DESTDIR="${D}" install-everything || die + + # Extra rpctorture progs + 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 "${S}"/nsswitch/libnss_wins.so || die + dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 + dolib.so "${S}"/nsswitch/libnss_winbind.so || die + dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 + fi + + if use pam ; then + exeinto /$(get_libdir)/security + doexe "${S}"/bin/pam_smbpass.so || die + if use winbind ; then + exeinto /$(get_libdir)/security + doexe "${S}"/bin/pam_winbind.so || die + fi + fi + + if use kernel_linux ; then + # mount backend + dodir /sbin + dosym ../usr/bin/smbmount /sbin/mount.smbfs + dosym ../usr/bin/mount.cifs /sbin/mount.cifs + 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 + + # VFS plugin modules + if use oav ; then + cd ${S2}/examples/VFS/${PFVSCAN} + make install DESTDIR=${D} || die "VFS: vscan error" + insinto /etc/samba + doins ${S2}/examples/VFS/${PFVSCAN}/openantivirus/*conf + fi + + # Python extensions + if use python ; then + cd ${S} + python python/setup.py install --root=${D} || die + fi + + # General config files + insinto /etc/samba + doins ${CONFDIR}/smbusers + newins ${CONFDIR}/smb.conf.example-samba3 smb.conf.example + doins ${CONFDIR}/lmhosts + + newpamd ${CONFDIR}/samba.pam samba + use winbind && doins ${CONFDIR}/system-auth-winbind + insinto /etc/xinetd.d + newins ${CONFDIR}/swat.xinetd swat + newinitd ${CONFDIR}/samba-init samba + newconfd ${CONFDIR}/samba-conf samba + if use ldap ; then + insinto /etc/openldap/schema + doins ${S2}/examples/LDAP/samba.schema + 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} + keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth} + + # docs + dodoc ${FILESDIR}/README.gentoo + dodoc ${S2}/{COPYING,Manifest,README,Roadmap,WHATSNEW.txt} + dodoc ${CONFDIR}/nsswitch.conf-wins + use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind + + if use oav ; then + docinto ${PFVSCAN} + cd ${WORKDIR}/${PFVSCAN} + dodoc AUTHORS COPYING ChangeLog FAQ INSTALL NEWS README TODO + dodoc */*.conf + fi + + if use examples ; then + docinto examples + cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples + chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d` + chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d` + 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 + + # Patch ChangeLog + docinto gentoo + dodoc ${PATCHDIR}/ChangeLog +} + +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 swat ; then + einfo "swat must be enabled by xinetd:" + einfo " change the /etc/xinetd.d/swat configuration" + fi + einfo "Latest info: README.gentoo in documentation directory" +} + +pkg_postrm(){ + # If stale docs, and one isn't re-emerging the latest version, removes + # (this is actually a portage bug, though) + [[ -n ${PF} && ! -f ${ROOT}/usr/lib/${PN}/en.msg ]] && \ + rm -rf "${ROOT}"/usr/share/doc/${PF} +} -- 2.26.2