diff options
| -rw-r--r-- | net-fs/samba/ChangeLog | 11 | ||||
| -rw-r--r-- | net-fs/samba/Manifest | 27 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.4.12-r1.ebuild | 412 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.4.13-r1.ebuild | 412 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.4.14.ebuild (renamed from net-fs/samba/samba-3.4.13.ebuild) | 2 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.11.ebuild | 7 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.8-r1.ebuild | 444 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.8-r2.ebuild | 445 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.8.ebuild | 441 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.9-r1.ebuild | 446 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.5.9.ebuild | 445 |
11 files changed, 28 insertions, 3064 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index f8a0ca432eeb..b5fc48676e27 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -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: diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest index 0b2116050235..8120c0422de6 100644 --- a/net-fs/samba/Manifest +++ b/net-fs/samba/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 3.4/lmhosts 126 RMD160 c4ff63cf01158809311c97c768463826aa02127b SHA1 2d5be4b38357287050b25bbd9fdc3263801676ce SHA256 b4b9cad6cd728dac260f4716270bb5df09da5c84c76526ccbe6cccdb8818c56c AUX 3.4/nsswitch.conf-winbind 406 RMD160 7bbc3f7a4bdc4907bc45ad71fc0e17cc376d4e1e SHA1 0cd4966690d98802de94f0353ecf760c1a6d5245 SHA256 342657852ec465f78b1450a522211c2102ee07a65f8cb167a19ca5e277220867 AUX 3.4/nsswitch.conf-wins 392 RMD160 bf1c0b6c3128be82a3f901eb3ef70d6d621df334 SHA1 2742757c188bfeae94d272eed66405e1a5417540 SHA256 508f76bc1abe15b49ef97b6033ae873f6d630bbcb99cd69b9babe55dc2554ea0 @@ -33,24 +36,22 @@ AUX 3.6/system-auth-winbind.pam 704 RMD160 4b9220ea16830f6ccb3afbcd2bef9b074c02f AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad DIST samba-3.4.12.tar.gz 34842685 RMD160 b78ae82371fce179cddb8dfd508d8075788082d0 SHA1 89c18711cf585de415c4e7e50e83596dc583cc3e SHA256 89c0862a683d1c5f0b8710df1ae6f628aa4530bbe5cbb11cf7415b1b0446f028 -DIST samba-3.4.13.tar.gz 34805783 RMD160 da4cdb57bec225fa35b1a6e889f1c49beaaf5089 SHA1 1318670371c55fe7383d583c5d184cbef7c6e5ea SHA256 f2725e66f6d4e0120c44ba22bc4461654a4222ae9881d04157dcc1faccbbffe4 +DIST samba-3.4.14.tar.gz 34803817 RMD160 54fdadbcfa9e40a5b057a317ac39ed4882c87bd6 SHA1 b7a0d3f10eacdfde6fbf6753b65917de0099ba0f SHA256 0c44883213859c7e45c89471194f8cab04917b1610213df5df0986913b1b99be DIST samba-3.5.11.tar.gz 30752782 RMD160 b3ee1e044e9df417b0dcaf954a6a137db742cba3 SHA1 0801871ab6a11f7d8eb8bf32ff0b87896d263441 SHA256 fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597 -DIST samba-3.5.8.tar.gz 30721269 RMD160 02703bbaf7d7e7b9786a2228fe6085143c99251a SHA1 ffb71de38442eee14aafb44f819671354dc5cce9 SHA256 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796 -DIST samba-3.5.9.tar.gz 30750297 RMD160 c48b3d0ecf0b4cde2764cebdde5f8513320cd966 SHA1 77da3dff05032950fa1943057182d16894591a05 SHA256 8af8dccbb87a70a71f795180d873102b5cccba7012d66f2620cea8b87174380a DIST samba-3.6.0.tar.gz 28990069 RMD160 8e17800466443bd6529c2312eeec8acfab1d7f63 SHA1 c87e2481d755f3a7f22bae44ef2f22ca64b9d173 SHA256 e1c14569e4785758838e77852bc1e958c15405146cface568c25c5726802f53f DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d -EBUILD samba-3.4.12-r1.ebuild 11854 RMD160 6a63fd620d63eceedd349ff08de3a703c0e4a67c SHA1 de9e4f5d31cfe09aab0d0eb48c4d2ce27d50c4b0 SHA256 5daf968e52eab146b73abae4ae5b37c714ec8a13d30756980f0a1ef5a918f760 EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1 -EBUILD samba-3.4.13-r1.ebuild 11854 RMD160 6e520ff4a3df257390bfaa2c042f8cc548ce3c2a SHA1 6d6099f346122119dc11a9a8f10a7f73c7d5c7f5 SHA256 bdfaa284ceff33d7bac0880b704cd60699f86ff305834595c8f32a044e8e35a9 -EBUILD samba-3.4.13.ebuild 11879 RMD160 d8fe5d3ad76b26f653f4c2f8a62d57e748fb113f SHA1 217edcd9a75b23de4328d8f6cdbe441565bbc25a SHA256 9bb1cbe6642d07e12eb8f0e80228405fc5e09cb4f16bbf9f2c291d5750ef6c5f -EBUILD samba-3.5.11.ebuild 12077 RMD160 ef50ba69a07d13a0610d395b50b82da10c7add97 SHA1 019a297d28852b6b6ab6e866330e92d2a6cda1fa SHA256 14060a71b8b51a16319df64532cc110d05d42de98a77584b856d683895728866 -EBUILD samba-3.5.8-r1.ebuild 11968 RMD160 0b559c0d46a4e6493971616a765053e2ce216be3 SHA1 13b3686487563435be413ece26de403ebe59f8f1 SHA256 964102b971bf1c3db52b0673363f89250561f335601a9a33f3df1f2483c74917 -EBUILD samba-3.5.8-r2.ebuild 11934 RMD160 8025dc5078f57a10e1bf54f7d39d72828b464c87 SHA1 ef266e0a9c38be685fe105fa7294f12adf1da88a SHA256 3e5aafb910df330443eb320b4b90a418e1432cccacc3a0a0b4b1cf5bcbbd9e8b -EBUILD samba-3.5.8.ebuild 12734 RMD160 3d4145c2be91bb05498adbbd507ced25df9aff91 SHA1 f30d7d7e16e365d421ef79a90efc20d1729b7e0f SHA256 cf6f724a69d82644ad4a4be64aed243775c44d55fbf7d69acf443d175c91b110 -EBUILD samba-3.5.9-r1.ebuild 11977 RMD160 32eb1694399213c535e9ac0b335650b7e52ec75f SHA1 44f47d5444ba5fc56271251e0066ac0bbda99663 SHA256 c60be18861ac486b7d881a0c1636fbb20316680009144bdbb84af07e9e17dcdf -EBUILD samba-3.5.9.ebuild 12008 RMD160 d4053610ac661eb0e3ea485f587dd4b4032ffc05 SHA1 6b3114748e010c7b5f3a2e42c689e6f4432c615a SHA256 bd4aa352db979cace6634c8df1221c6e0393da8678de64e92c1cacf716adc4b7 +EBUILD samba-3.4.14.ebuild 11879 RMD160 3a4d7efbacac572151763c6e9f9e74e9738f969d SHA1 0147125a72bc06fbea0e01f416b6ab0d9707b2dc SHA256 8210ed5c7a21f7e01f29cc92679a451a31e98d84f0eab44c26e30aaa80576e69 +EBUILD samba-3.5.11.ebuild 12108 RMD160 0f93eb2ea4e33deb44794485c89d0932e09064e3 SHA1 4939178516c8e497e61dbd16c52f84db363719c4 SHA256 eed299804143869790c561937715304dd589c6966edb8583766063bca235561c EBUILD samba-3.6.0.ebuild 11300 RMD160 3fd945a8330839a61ee266c1e6f5482e70471fe2 SHA1 7237a324a76e9560629460afdd368339343c0042 SHA256 430bf06dc0aa8ae1dc2a52cccaa445a013af2da42ede16bc75f08c72830efa0d EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660 -MISC ChangeLog 80542 RMD160 959e4a5860b2369d3016af65aaf438d32e3fc304 SHA1 0e292be28292a56993d345b08d4979dc603bacb4 SHA256 b3f64c915eb2a1ac2a9860c21e8ad6a4c2c9a9c39d41ca1de5f23e8614fc606c +MISC ChangeLog 81004 RMD160 4f3b6f58e8cbfdfe3687d8ec53cc0420a1832242 SHA1 863a9152d234f4ca828b6b620083a89c132cf3a7 SHA256 9d345b737a7b4590e055bc1840517d29f1d4e5a4bd1367eeb5d481d94757c067 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk5BawQACgkQKQaZ7OJe4zYhIACfWzAJZ8PAXVEosi09/JGfq7Mf +ECgAn15YmamPqhtEU/7w0TRabrQfH3H9 +=DXF5 +-----END PGP SIGNATURE----- diff --git a/net-fs/samba/samba-3.4.12-r1.ebuild b/net-fs/samba/samba-3.4.12-r1.ebuild deleted file mode 100644 index bd8c6ddbbb3e..000000000000 --- a/net-fs/samba/samba-3.4.12-r1.ebuild +++ /dev/null @@ -1,412 +0,0 @@ -# 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.12-r1.ebuild,v 1.1 2011/08/04 18:52:26 maksbotan 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="~amd64 ~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 ) - ldb? ( sys-libs/ldb ) - 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" -} diff --git a/net-fs/samba/samba-3.4.13-r1.ebuild b/net-fs/samba/samba-3.4.13-r1.ebuild deleted file mode 100644 index 0d873beecb79..000000000000 --- a/net-fs/samba/samba-3.4.13-r1.ebuild +++ /dev/null @@ -1,412 +0,0 @@ -# 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.13-r1.ebuild,v 1.1 2011/08/04 18:52:26 maksbotan 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="~amd64 ~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 ) - ldb? ( sys-libs/ldb ) - 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" -} diff --git a/net-fs/samba/samba-3.4.13.ebuild b/net-fs/samba/samba-3.4.14.ebuild index 9f05a64b2125..aa0f4b3c2f91 100644 --- a/net-fs/samba/samba-3.4.13.ebuild +++ b/net-fs/samba/samba-3.4.14.ebuild @@ -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.4.13.ebuild,v 1.2 2011/05/05 17:24:10 vostorga Exp $ +# $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" diff --git a/net-fs/samba/samba-3.5.11.ebuild b/net-fs/samba/samba-3.5.11.ebuild index 69e08c2a952b..c0959f6e381f 100644 --- a/net-fs/samba/samba-3.5.11.ebuild +++ b/net-fs/samba/samba-3.5.11.ebuild @@ -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 @@ SRC_URI="mirror://samba/${P}.tar.gz 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 @@ DEPEND="dev-libs/popt 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 @@ pkg_setup() { 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" diff --git a/net-fs/samba/samba-3.5.8-r1.ebuild b/net-fs/samba/samba-3.5.8-r1.ebuild deleted file mode 100644 index c4b7cbe8d973..000000000000 --- a/net-fs/samba/samba-3.5.8-r1.ebuild +++ /dev/null @@ -1,444 +0,0 @@ -# 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.8-r1.ebuild,v 1.4 2011/05/05 17:24:10 vostorga Exp $ - -EAPI=4 - -inherit pam versionator multilib eutils - -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 - http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" -LICENSE="GPL-3" -SLOT="0" -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" - -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-1.0.114_p1 ) - 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="" -KRBPLUGIN="" -PLUGINEXT=".so" -SHAREDMODS="" - -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)" - -REQUIRED_USE=" - ads? ( ldap ) - swat? ( server ) -" - -pkg_setup() { - 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 smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" - use swat && SBINPROGS="${SBINPROGS} bin/swat" - use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" - use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} 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" - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" - use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" - use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" - fi - - 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 -} - -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.5.6-kerberos-dummy.patch - use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff - cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch -} - -src_configure() { - local myconf - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && 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+=" --with-cifsupcall" - else - 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 client cifsumount) \ - $(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) \ - --with-shared-modules=${SHAREDMODS} \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes - fi - - # compile modules - emake modules - - # compile pam moudles - if use pam ; then - einfo "make pam modules" - emake pam_modules - fi - - # compile winbind nss modules - if use winbind ; then - einfo "make nss modules" - emake nss_modules - fi - - # compile utilities - if [ -n "${BINPROGS}" ] ; then - einfo "make binprogs" - emake ${BINPROGS} - fi - if [ -n "${SBINPROGS}" ] ; then - einfo "make sbinprogs" - emake ${SBINPROGS} - fi - - if [ -n "${KRBPLUGIN}" ] ; then - einfo "make krbplugin" - emake ${KRBPLUGIN}${PLUGINEXT} - fi - - if use client ; then - einfo "make {,u}mount.cifs" - emake bin/{,u}mount.cifs - fi -} - -src_install() { - # install libs - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" - fi - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" - fi - - # install modules - emake installmodules DESTDIR="${D}" - - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" - - 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}" - 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} - doman ../docs/manpages/${prog/bin\/}* - done - - for prog in ${BINPROGS} ; do - dobin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - # install krbplugin - if [ -n "${KRBPLUGIN}" ] ; then - if has_version app-crypt/mit-krb5 ; then - insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 - doins ${KRBPLUGIN}${PLUGINEXT} - elif has_version app-crypt/heimdal ; then - insinto /usr/$(get_libdir)/plugin/krb5 - doins ${KRBPLUGIN}${PLUGINEXT} - fi - insinto /usr - for prog in ${KRBPLUGIN} ; do - doman ../docs/manpages/${prog/bin\/}* - done - fi - - # 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}" - 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 - doman ../docs/manpages/{u,}mount.cifs.8 - fi - - # install the spooler to cups - if use cups ; then - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - # 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 - 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 - cd ../examples - doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5" - elog "to avoid an insecure default configuration" - elog "('wide links = yes' and 'unix extensions = yes'). For more details," - elog "please see http://www.samba.org/samba/news/symlink_attack.html ." - elog "" - elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." - elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " - elog "implementation of the SMB protocol used by Windows Vista and higher" - elog "" - 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.5.0.html" -} diff --git a/net-fs/samba/samba-3.5.8-r2.ebuild b/net-fs/samba/samba-3.5.8-r2.ebuild deleted file mode 100644 index fcceb77fb3fe..000000000000 --- a/net-fs/samba/samba-3.5.8-r2.ebuild +++ /dev/null @@ -1,445 +0,0 @@ -# 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.8-r2.ebuild,v 1.1 2011/08/04 18:52:26 maksbotan Exp $ - -EAPI=4 - -inherit pam versionator multilib eutils - -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 - http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~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" - -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-1.0.114_p1 ) - cups? ( net-print/cups ) - debug? ( dev-libs/dmalloc ) - fam? ( virtual/fam ) - ldap? ( net-nds/openldap ) - ldb? ( sys-libs/ldb ) - 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="" -KRBPLUGIN="" -PLUGINEXT=".so" -SHAREDMODS="" - -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)" - -REQUIRED_USE=" - ads? ( ldap ) - swat? ( server ) -" - -pkg_setup() { - 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 smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" - use swat && SBINPROGS="${SBINPROGS} bin/swat" - use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" - use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} 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" - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" - use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" - use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" - fi - - 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 -} - -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.5.6-kerberos-dummy.patch - use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff - cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch -} - -src_configure() { - local myconf - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && 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+=" --with-cifsupcall" - else - 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 client cifsumount) \ - $(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) \ - --with-shared-modules=${SHAREDMODS} \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes - fi - - # compile modules - emake modules - - # compile pam moudles - if use pam ; then - einfo "make pam modules" - emake pam_modules - fi - - # compile winbind nss modules - if use winbind ; then - einfo "make nss modules" - emake nss_modules - fi - - # compile utilities - if [ -n "${BINPROGS}" ] ; then - einfo "make binprogs" - emake ${BINPROGS} - fi - if [ -n "${SBINPROGS}" ] ; then - einfo "make sbinprogs" - emake ${SBINPROGS} - fi - - if [ -n "${KRBPLUGIN}" ] ; then - einfo "make krbplugin" - emake ${KRBPLUGIN}${PLUGINEXT} - fi - - if use client ; then - einfo "make {,u}mount.cifs" - emake bin/{,u}mount.cifs - fi -} - -src_install() { - # install libs - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" - fi - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" - fi - - # install modules - emake installmodules DESTDIR="${D}" - - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" - - 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}" - 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} - doman ../docs/manpages/${prog/bin\/}* - done - - for prog in ${BINPROGS} ; do - dobin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - # install krbplugin - if [ -n "${KRBPLUGIN}" ] ; then - if has_version app-crypt/mit-krb5 ; then - insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 - doins ${KRBPLUGIN}${PLUGINEXT} - elif has_version app-crypt/heimdal ; then - insinto /usr/$(get_libdir)/plugin/krb5 - doins ${KRBPLUGIN}${PLUGINEXT} - fi - insinto /usr - for prog in ${KRBPLUGIN} ; do - doman ../docs/manpages/${prog/bin\/}* - done - fi - - # 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}" - 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 - doman ../docs/manpages/{u,}mount.cifs.8 - fi - - # install the spooler to cups - if use cups ; then - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - # 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 - 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 - cd ../examples - doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5" - elog "to avoid an insecure default configuration" - elog "('wide links = yes' and 'unix extensions = yes'). For more details," - elog "please see http://www.samba.org/samba/news/symlink_attack.html ." - elog "" - elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." - elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " - elog "implementation of the SMB protocol used by Windows Vista and higher" - elog "" - 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.5.0.html" -} diff --git a/net-fs/samba/samba-3.5.8.ebuild b/net-fs/samba/samba-3.5.8.ebuild deleted file mode 100644 index 6f9bf745df04..000000000000 --- a/net-fs/samba/samba-3.5.8.ebuild +++ /dev/null @@ -1,441 +0,0 @@ -# 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.8.ebuild,v 1.3 2011/05/05 17:24:10 vostorga Exp $ - -EAPI="2" - -inherit pam confutils versionator multilib eutils - -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 ~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 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-1.0.114_p1 ) - 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="" -KRBPLUGIN="" -PLUGINEXT=".so" -SHAREDMODS="" - -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 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 && KRBPLUGIN="${KRBPLUGIN} 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" - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" - use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" - use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" - fi - - 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 -} - -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.5.6-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 client cifsumount) \ - $(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) \ - --with-shared-modules=${SHAREDMODS} \ - --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 [ -n "${KRBPLUGIN}" ] ; then - einfo "make krbplugin" - emake ${KRBPLUGIN}${PLUGINEXT} || die "emake krbplugin 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 krbplugin - if [ -n "${KRBPLUGIN}" ] ; then - if has_version app-crypt/mit-krb5 ; then - insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 - doins ${KRBPLUGIN}${PLUGINEXT} || die "installing - ${KRBPLUGIN}${PLUGINEXT} failed" - elif has_version app-crypt/heimdal ; then - insinto /usr/$(get_libdir)/plugin/krb5 - doins ${KRBPLUGIN}${PLUGINEXT} || die "installing - ${KRBPLUGIN}${PLUGINEXT} failed" - fi - insinto /usr - for prog in ${KRBPLUGIN} ; do - doman ../docs/manpages/${prog/bin\/}* || die "doman failed" - done - fi - - # 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 - if use cups ; then - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - # 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 - 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 - cd ../examples - doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5" - elog "to avoid an insecure default configuration" - elog "('wide links = yes' and 'unix extensions = yes'). For more details," - elog "please see http://www.samba.org/samba/news/symlink_attack.html ." - elog "" - elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." - elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " - elog "implementation of the SMB protocol used by Windows Vista and higher" - elog "" - 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.5.0.html" -} diff --git a/net-fs/samba/samba-3.5.9-r1.ebuild b/net-fs/samba/samba-3.5.9-r1.ebuild deleted file mode 100644 index a0eddc35c4ec..000000000000 --- a/net-fs/samba/samba-3.5.9-r1.ebuild +++ /dev/null @@ -1,446 +0,0 @@ -# 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.9-r1.ebuild,v 1.1 2011/08/04 18:52:26 maksbotan Exp $ - -EAPI=4 - -inherit pam versionator multilib eutils - -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 - http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~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" - -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-1.0.114_p1 ) - cups? ( net-print/cups ) - debug? ( dev-libs/dmalloc ) - fam? ( virtual/fam ) - ldap? ( net-nds/openldap ) - ldb? ( sys-libs/ldb ) - 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="" -KRBPLUGIN="" -PLUGINEXT=".so" -SHAREDMODS="" - -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)" - -REQUIRED_USE=" - ads? ( ldap ) - swat? ( server ) -" - -pkg_setup() { - 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 smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" - use swat && SBINPROGS="${SBINPROGS} bin/swat" - use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" - use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} 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" - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" - use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" - use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" - fi - - 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 -} - -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.5.6-kerberos-dummy.patch - use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff - cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch - epatch "${CONFDIR}"/smb.conf.default.patch -} - -src_configure() { - local myconf - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && 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+=" --with-cifsupcall" - else - 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 client cifsumount) \ - $(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) \ - --with-shared-modules=${SHAREDMODS} \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes - fi - - # compile modules - emake modules - - # compile pam moudles - if use pam ; then - einfo "make pam modules" - emake pam_modules - fi - - # compile winbind nss modules - if use winbind ; then - einfo "make nss modules" - emake nss_modules - fi - - # compile utilities - if [ -n "${BINPROGS}" ] ; then - einfo "make binprogs" - emake ${BINPROGS} - fi - if [ -n "${SBINPROGS}" ] ; then - einfo "make sbinprogs" - emake ${SBINPROGS} - fi - - if [ -n "${KRBPLUGIN}" ] ; then - einfo "make krbplugin" - emake ${KRBPLUGIN}${PLUGINEXT} - fi - - if use client ; then - einfo "make {,u}mount.cifs" - emake bin/{,u}mount.cifs - fi -} - -src_install() { - # install libs - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" - fi - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" - fi - - # install modules - emake installmodules DESTDIR="${D}" - - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" - - 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}" - 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} - doman ../docs/manpages/${prog/bin\/}* - done - - for prog in ${BINPROGS} ; do - dobin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - # install krbplugin - if [ -n "${KRBPLUGIN}" ] ; then - if has_version app-crypt/mit-krb5 ; then - insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 - doins ${KRBPLUGIN}${PLUGINEXT} - elif has_version app-crypt/heimdal ; then - insinto /usr/$(get_libdir)/plugin/krb5 - doins ${KRBPLUGIN}${PLUGINEXT} - fi - insinto /usr - for prog in ${KRBPLUGIN} ; do - doman ../docs/manpages/${prog/bin\/}* - done - fi - - # 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}" - 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 - doman ../docs/manpages/{u,}mount.cifs.8 - fi - - # install the spooler to cups - if use cups ; then - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - # install misc files - insinto /etc/samba - doins ../examples/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 - 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 - cd ../examples - doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5" - elog "to avoid an insecure default configuration" - elog "('wide links = yes' and 'unix extensions = yes'). For more details," - elog "please see http://www.samba.org/samba/news/symlink_attack.html ." - elog "" - elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." - elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " - elog "implementation of the SMB protocol used by Windows Vista and higher" - elog "" - 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.5.0.html" -} diff --git a/net-fs/samba/samba-3.5.9.ebuild b/net-fs/samba/samba-3.5.9.ebuild deleted file mode 100644 index eb56bee7f846..000000000000 --- a/net-fs/samba/samba-3.5.9.ebuild +++ /dev/null @@ -1,445 +0,0 @@ -# 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.9.ebuild,v 1.1 2011/06/29 17:53:04 vostorga Exp $ - -EAPI=4 - -inherit pam versionator multilib eutils - -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 - http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2" -LICENSE="GPL-3" -SLOT="0" -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" - -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-1.0.114_p1 ) - 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="" -KRBPLUGIN="" -PLUGINEXT=".so" -SHAREDMODS="" - -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)" - -REQUIRED_USE=" - ads? ( ldap ) - swat? ( server ) -" - -pkg_setup() { - 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 smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util" - use swat && SBINPROGS="${SBINPROGS} bin/swat" - use winbind && SBINPROGS="${SBINPROGS} bin/winbindd" - use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} 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" - SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash" - use ads && SHAREDMODS="${SHAREDMODS},idmap_ad" - use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex" - fi - - 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 -} - -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.5.6-kerberos-dummy.patch - use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff - cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch - epatch "${CONFDIR}"/smb.conf.default.patch -} - -src_configure() { - local myconf - - # Filter out -fPIE - [[ ${CHOST} == *-*bsd* ]] && 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+=" --with-cifsupcall" - else - 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 client cifsumount) \ - $(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) \ - --with-shared-modules=${SHAREDMODS} \ - --without-included-popt \ - --without-included-iniparser -} - -src_compile() { - # compile libs - if use addns ; then - einfo "make addns library" - emake libaddns - fi - if use netapi ; then - einfo "make netapi library" - emake libnetapi - fi - if use smbclient ; then - einfo "make smbclient library" - emake libsmbclient - fi - if use smbsharemodes ; then - einfo "make smbsharemodes library" - emake libsmbsharemodes - fi - - # compile modules - emake modules - - # compile pam moudles - if use pam ; then - einfo "make pam modules" - emake pam_modules - fi - - # compile winbind nss modules - if use winbind ; then - einfo "make nss modules" - emake nss_modules - fi - - # compile utilities - if [ -n "${BINPROGS}" ] ; then - einfo "make binprogs" - emake ${BINPROGS} - fi - if [ -n "${SBINPROGS}" ] ; then - einfo "make sbinprogs" - emake ${SBINPROGS} - fi - - if [ -n "${KRBPLUGIN}" ] ; then - einfo "make krbplugin" - emake ${KRBPLUGIN}${PLUGINEXT} - fi - - if use client ; then - einfo "make {,u}mount.cifs" - emake bin/{,u}mount.cifs - fi -} - -src_install() { - # install libs - if use addns ; then - einfo "install addns library" - emake installlibaddns DESTDIR="${D}" - fi - if use netapi ; then - einfo "install netapi library" - emake installlibnetapi DESTDIR="${D}" - fi - if use smbclient ; then - einfo "install smbclient library" - emake installlibsmbclient DESTDIR="${D}" - fi - if use smbsharemodes ; then - einfo "install smbsharemodes library" - emake installlibsmbsharemodes DESTDIR="${D}" - fi - - # install modules - emake installmodules DESTDIR="${D}" - - if use pam ; then - einfo "install pam modules" - emake installpammodules DESTDIR="${D}" - - 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}" - 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} - doman ../docs/manpages/${prog/bin\/}* - done - - for prog in ${BINPROGS} ; do - dobin ${prog} - doman ../docs/manpages/${prog/bin\/}* - done - - # install krbplugin - if [ -n "${KRBPLUGIN}" ] ; then - if has_version app-crypt/mit-krb5 ; then - insinto /usr/$(get_libdir)/krb5/plugins/libkrb5 - doins ${KRBPLUGIN}${PLUGINEXT} - elif has_version app-crypt/heimdal ; then - insinto /usr/$(get_libdir)/plugin/krb5 - doins ${KRBPLUGIN}${PLUGINEXT} - fi - insinto /usr - for prog in ${KRBPLUGIN} ; do - doman ../docs/manpages/${prog/bin\/}* - done - fi - - # 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}" - 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 - doman ../docs/manpages/{u,}mount.cifs.8 - fi - - # install the spooler to cups - if use cups ; then - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - # install misc files - insinto /etc/samba - doins ../examples/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 - 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 - cd ../examples - doins -r auth autofs dce-dfs LDAP logon misc pdb \ - perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5" - elog "to avoid an insecure default configuration" - elog "('wide links = yes' and 'unix extensions = yes'). For more details," - elog "please see http://www.samba.org/samba/news/symlink_attack.html ." - elog "" - elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added." - elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new " - elog "implementation of the SMB protocol used by Windows Vista and higher" - elog "" - 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.5.0.html" -} |