diff options
| -rw-r--r-- | net-fs/samba/ChangeLog | 10 | ||||
| -rw-r--r-- | net-fs/samba/Manifest | 28 | ||||
| -rw-r--r-- | net-fs/samba/files/digest-samba-3.0.14a-r1 (renamed from net-fs/samba/files/digest-samba-3.0.14a) | 2 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.0.14a-r1.ebuild (renamed from net-fs/samba/samba-3.0.14a.ebuild) | 30 |
4 files changed, 38 insertions, 32 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 590b91a14636..fe4a4a5e40ab 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-fs/samba # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.165 2005/04/27 13:29:23 satya Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.166 2005/04/27 19:52:09 seemant Exp $ + +*samba-3.0.14a-r1 (27 Apr 2005) + + 27 Apr 2005; Seemant Kulleen <seemant@gentoo.org> + +samba-3.0.14a-r1.ebuild: + replace with -r1, which has improved patches, and a ChangeLog for the + patchset. No more /usr/bin/mount.cifs.old and stuff in this. A lot cleaner + now 27 Apr 2005; Christian Andreetta <satya@gentoo.org> files/samba-init: 'use cupsd' removed due to bug #89956 diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index f49afa830bd0..cdadafe8f84b 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,25 +1,27 @@ -MD5 dde473d4519c83ca5e81ce51466117f2 samba-3.0.13.ebuild 15542 -MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380 -MD5 f87cb328df2c36f0f8388ce1a2f3663a ChangeLog 29587 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491 +MD5 f87cb328df2c36f0f8388ce1a2f3663a ChangeLog 29587 MD5 9a596af446db6134bba0952d9ac50e02 samba-3.0.14a.ebuild 8833 +MD5 4ec9fc723b0d9801152c2ddfd4442de9 samba-3.0.10.ebuild 16380 +MD5 dde473d4519c83ca5e81ce51466117f2 samba-3.0.13.ebuild 15542 +MD5 38b86b174e5f58abec066847b8256ca4 samba-3.0.14a-r1.ebuild 8687 MD5 fa1dcd2c95a81c22c2ad68de6698a85e files/digest-samba-3.0.10 206 -MD5 b2d8f41a9dad89b3e073259680a517cf files/digest-samba-3.0.13 136 -MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527 MD5 def157a63ec14450df82373617c7dc4b files/samba-3.0.11-gcc4.patch 485 -MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523 +MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126 +MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298 MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392 -MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291 -MD5 b1539a8893af27a4615304fb09e24968 files/samba-init 1132 +MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239 +MD5 8e27b3b4cae228d0f047b5ec2df9d52c files/digest-samba-3.0.14a 214 +MD5 3cff882704d5ba84a75a76fc4262b3d3 files/digest-samba-3.0.14a-r1 216 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.x-libdirsymlink.patch 592 -MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298 -MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126 MD5 e75c2316eced1d80cb2161848581c6a3 files/samba-3.0.x-python-setup.patch 1094 -MD5 0c0364e7f0bc4cc48d8f9b103e606a93 files/samba-2.2.8-statfs.patch 239 MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425 +MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291 +MD5 b1539a8893af27a4615304fb09e24968 files/samba-init 1132 +MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332 MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044 MD5 239ef0e21552896faeef21c685561245 files/smb.conf.example-samba3.gz 7808 -MD5 8e27b3b4cae228d0f047b5ec2df9d52c files/digest-samba-3.0.14a 214 MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204 +MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527 MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869 -MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332 +MD5 e17a1638ad9f30f2e39db4c8981a2fcd files/vscan-0.3.5-libclamav.patch 523 +MD5 b2d8f41a9dad89b3e073259680a517cf files/digest-samba-3.0.13 136 diff --git a/net-fs/samba/files/digest-samba-3.0.14a b/net-fs/samba/files/digest-samba-3.0.14a-r1 index 17bb8fa10d44..6396cb203f7d 100644 --- a/net-fs/samba/files/digest-samba-3.0.14a +++ b/net-fs/samba/files/digest-samba-3.0.14a-r1 @@ -1,3 +1,3 @@ MD5 ebee37e66a8b5f6fd328967dc09088e8 samba-3.0.14a.tar.gz 15605851 MD5 68c9d099d942d85e68d96804b26ac788 samba-vscan-0.3.6.tar.bz2 166733 -MD5 d0e94c22baf93401ea6ddf12937f6ca3 samba-3-gentoo-patches-0.3.tar.bz2 3878 +MD5 a8c1ff94ec17898e5b7806ff5fa70ee3 samba-3-gentoo-patches-0.3.1.tar.bz2 4658 diff --git a/net-fs/samba/samba-3.0.14a.ebuild b/net-fs/samba/samba-3.0.14a-r1.ebuild index 21f756e53996..8228c1101267 100644 --- a/net-fs/samba/samba-3.0.14a.ebuild +++ b/net-fs/samba/samba-3.0.14a-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a.ebuild,v 1.2 2005/04/26 21:32:56 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r1.ebuild,v 1.1 2005/04/27 19:52:09 seemant Exp $ inherit eutils versionator @@ -9,7 +9,7 @@ IUSE="acl cups doc kerberos ldap mysql pam postgres python quotas readline winbind xml xml2 libclamav oav selinux" VSCAN_VER=0.3.6 -PATCH_VER=0.3 +PATCH_VER=0.3.1 MY_P=${PN}-${PV/_/} MY_PP=${PN}-$(get_major_version)-gentoo-patches-${PATCH_VER} S2=${WORKDIR}/${MY_P} @@ -44,6 +44,7 @@ DEPEND="${RDEPEND} >=sys-apps/sed-4" PRIVATE_DST=/var/lib/samba/private +PATCHDIR=${WORKDIR}/gentoo/patches src_unpack() { unpack ${A}; cd ${S2} @@ -51,10 +52,10 @@ src_unpack() { rm -rf ${S2}/examples.ORIG export EPATCH_SUFFIX="patch" - epatch ${WORKDIR}/gentoo/patches/general + epatch ${PATCHDIR}/general if use oav ; then cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS - epatch ${WORKDIR}/gentoo/patches/vscan + epatch ${PATCHDIR}/vscan fi } @@ -111,17 +112,7 @@ src_compile() { $(use_with quotas) $(use_with quotas sys-quotas) \ ${myconf} || die - # Show install dirs - einfo "Dir conf:" - emake showlayout - # serialized headers make - make proto || die - - # Compile main SAMBA pieces - einfo "make everything" - emake \ - LAZYLDFLAGS="-Wl,-z,now" \ - everything || die "SAMBA make everything error" + emake everything || die "SAMBA make everything error" einfo "make rpctorture" emake rpctorture || ewarn "rpctorture didn't build" @@ -130,7 +121,7 @@ src_compile() { python python/setup.py build fi - # Build selected samba-vscan plugins + # Build samba-vscan plugins if use oav; then cd ${S2}/examples/VFS/${PFVSCAN} econf \ @@ -146,7 +137,6 @@ src_install() { local extra_bins="rpctorture" make DESTDIR=${D} install-everything || die - make DESTDIR=${D} INSTALLPERMS=4555 installsubin || die # Extra rpctorture progs exeinto /usr/bin @@ -155,6 +145,9 @@ src_install() { einfo "Extra binaries: ${i}" done + # remove .old stuff from /usr/bin: + rm -f ${D}/usr/bin/*.old + # Nsswitch extensions. Make link for wins and winbind resolvers dolib.so ${S}/nsswitch/libnss_wins.so dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 @@ -251,6 +244,9 @@ src_install() { rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel} rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba fi + + docinto gentoo + dodoc ${PATCHDIR}/ChangeLog } pkg_preinst() { |