# HG changeset patch # User Dirk Olmes # Date 1259073286 -3600 # Node ID 24790a7e3ea2d7cf17d99617df7e955f486b0cbd # Parent 11adf80154c3010762aa0c65921fc0e26fbb8a94# Parent ae604915eca98e94044aea7825bbff77dcdfa0a4 Automated merge with http://hoho.dyndns.org/hg/portage diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/Manifest --- a/app-arch/pigz/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ b/app-arch/pigz/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -1,2 +1,5 @@ -DIST pigz-2.1.4.tar.gz 35951 RMD160 9c6651d5b75ac9bb67e66420c7b0c3bfbf4b1b15 SHA1 72f639ffb296c6a5dd7b1a45ed2620a5834d55e1 SHA256 2593933f34a8a8634c4dcbbb3ef199e6d38e4b044c3d1ba40ae1d337c49c30e2 -EBUILD pigz-2.1.4.ebuild 514 RMD160 5252ce1952dae74f49c01d5e78b01a3e4b5c14ba SHA1 88a9d881d0e96b49f6409c14df3dfd533de80a99 SHA256 b9db5adfc607d204a3c26d26db05e0dd1fe6d48f9885aefa00a509d3f0559340 +AUX pigz-2.1.5-decode-symlinks-to-stdout.patch 512 RMD160 115ae0cdc4187b8cbc2282c3b36aca5f0b8ea5b1 SHA1 158f21fa736d9034b608d5b6fd452919f7d73e51 SHA256 067acf2075e80ef083dd730a557bff87efb39a80b49be760c84bfa4cd73047ce +AUX pigz-2.1.5-gunzip-compat.patch 630 RMD160 eb1ac6a99fe17fb6c9d7029912109630e5ec984b SHA1 98c4132001d2ab808e70a728c87c9afe2d549f42 SHA256 4a2b6acde824b15453a0647c7830f7444247606aece3979b6b85b90eeb7adef1 +AUX pigz-2.1.5-respect-flags.patch 404 RMD160 e444679d43a33f44c684d99ec782f825bef66bab SHA1 8557dea8496682fa9525278b314178f5c100c9b2 SHA256 8806680b9d1f4099f7f2caa803957b104f2df24bed49b0a41f696060b43b69c4 +DIST pigz-2.1.5.tar.gz 93788 RMD160 b02f012e9f87f9f69309574ef7000bf6242b2114 SHA1 9e169aa2f1b08be057760c03c480e64651fa3299 SHA256 ae1f16f1f84c963df512a24f5b676a776ffd95f059291547672917b2f818e53b +EBUILD pigz-2.1.5.ebuild 989 RMD160 4305c3bde1dad21490bd29e3513b73e4879e9701 SHA1 4110d612ee09351ba97ba0eefb90f3bde4efa71b SHA256 a79b2b9f18b73138f86de65b368987c7141355b5b1de2dbca6c6e6031a961751 diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-arch/pigz/files/pigz-2.1.5-decode-symlinks-to-stdout.patch Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,12 @@ +diff -u pigz-2.1.5/pigz.c pigz-2.1.5-fix/pigz.c +--- pigz-2.1.5/pigz.c 2009-07-20 04:42:00.000000000 +0200 ++++ pigz-2.1.5-fix/pigz.c 2009-10-25 15:52:22.000000000 +0100 +@@ -2498,7 +2498,7 @@ + in); + return; + } +- if ((st.st_mode & S_IFMT) == S_IFLNK && !force) { ++ if ((st.st_mode & S_IFMT) == S_IFLNK && !force && !pipeout) { + if (verbosity > 0) + fprintf(stderr, "%s is a symbolic link -- skipping\n", in); + return; diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-arch/pigz/files/pigz-2.1.5-gunzip-compat.patch Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,22 @@ +--- ../pigz-2.1.5/pigz.c 2009-07-20 04:42:00.000000000 +0200 ++++ pigz.c 2009-11-24 10:50:13.000000000 +0100 +@@ -3075,9 +3075,17 @@ + if (argc < 2 && isatty(1)) + help(); + +- /* decompress if named "unpigz" */ ++ /* find program name */ + p = strrchr(argv[0], '/'); +- if (strcmp(p == NULL ? argv[0] : p + 1, "unpigz") == 0) ++ if (p == NULL) { ++ p = argv[0]; ++ } ++ else { ++ ++p; ++ } ++ ++ /* decompress if named "unpigz" or "gunzip" */ ++ if ((strcmp(p, "unpigz") == 0) || (strcmp(p, "gunzip") == 0)) + decode = 1, headis = 0; + + /* process command-line arguments */ diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/files/pigz-2.1.5-respect-flags.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-arch/pigz/files/pigz-2.1.5-respect-flags.patch Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,14 @@ +diff -U5 pigz-2.1.5.original/Makefile pigz-2.1.5/Makefile +--- pigz-2.1.5.original/Makefile 2009-10-27 22:41:31.000000000 -0600 ++++ pigz-2.1.5/Makefile 2009-10-27 22:42:45.000000000 -0600 +@@ -1,9 +1,7 @@ +-CFLAGS=-O2 +- + pigz: pigz.o yarn.o +- cc -o pigz pigz.o yarn.o -lpthread -lz ++ $(CC) $(LDFLAGS) -o pigz pigz.o yarn.o -lpthread -lz + ln -f pigz unpigz + + pigz.o: pigz.c yarn.h + + yarn.o: yarn.c yarn.h diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/pigz-2.1.4.ebuild --- a/app-arch/pigz/pigz-2.1.4.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils flag-o-matic - -DESCRIPTION="Standard GNU compressor" -HOMEPAGE="http://www.zlib.net/pigz/" -SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" - -RDEPEND="" -DEPEND="${RDEPEND} - sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" -} - -src_compile() { - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die -} - -src_install() { - dobin pigz || die -} diff -r ae604915eca9 -r 24790a7e3ea2 app-arch/pigz/pigz-2.1.5.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-arch/pigz/pigz-2.1.5.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,41 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/pigz/pigz-2.1.5.ebuild,v 1.2 2009/11/02 17:58:48 vostorga Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="A parallel implementation of gzip." +HOMEPAGE="http://www.zlib.net/pigz/" +SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz" + +LICENSE="PIGZ" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="test symlink" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND} + test? ( app-arch/ncompress )" + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/${P}-respect-flags.patch + epatch "${FILESDIR}"/${P}-decode-symlinks-to-stdout.patch + epatch "${FILESDIR}"/${P}-gunzip-compat.patch +} + +src_compile() { + tc-export CC + emake || die "make failed" +} + +src_install() { + dobin ${PN} || die "Failed to install" + dosym /usr/bin/pigz /usr/bin/unpigz + dodoc README + + if use symlink; then + dosym /usr/bin/pigz /usr/bin/gzip + dosym /usr/bin/unpigz /usr/bin/gunzip + fi +} diff -r ae604915eca9 -r 24790a7e3ea2 dev-db/pgpool-II/Manifest --- a/dev-db/pgpool-II/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ b/dev-db/pgpool-II/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -1,3 +1,4 @@ AUX pgpool-II.init 397 RMD160 982661c7ed406af8cee485aec125a3c28320d008 SHA1 b0433f446f98acd2ca82930f073c6fd886ce19a7 SHA256 fc1f92d95d198a4fa7a4ae3e0bbad5ba093667c068550bd6a18bc86ab61252fa -DIST pgpool-II-2.2.2.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b -EBUILD pgpool-II-2.2.2.ebuild 947 RMD160 d041ff1832e1ebf781e2b381f606f83dea4d1704 SHA1 7bb0f2afe399d250a91aa320880a3c0064f5ef98 SHA256 24b389566b5ba85d2468626eed3f4ff6c57189fa682f034e87819d0c3e6f0de2 +DIST pgpool-II-2.2.5.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b +EBUILD pgpool-II-2.2.5.ebuild 994 RMD160 7dd43fe7afbc7f84bdf5116282b7579a5bbb8107 SHA1 df1cba24be1f85459bfceca27d35e6ebb2dfa510 SHA256 57d1f158ac7c312a458810bdb73241bf71d767b3471407609a305d0900245385 +MISC pgpool-II-2.2.5.ebuild~ 1031 RMD160 7f676bc16621de36634b293fab0d26fca929cd74 SHA1 c5f8967885d9110e9e1a9c45e67eba885beacd18 SHA256 2a46ecb0f9bb3b5d2c5ea22f782003899ff7ba66811be69b1c074fe0b395623a diff -r ae604915eca9 -r 24790a7e3ea2 dev-db/pgpool-II/pgpool-II-2.2.2.ebuild --- a/dev-db/pgpool-II/pgpool-II-2.2.2.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="New generation connection pool server for PostgreSQL" -HOMEPAGE="http://pgpool.projects.postgresql.org/" -SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -DEPEND="dev-db/postgresql-base" - -src_unpack() { - unpack ${A} - S="${WORKDIR}/${PN}-2.2" - cd ${S} - sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die -} - -src_compile() { - econf --with-pgsql=/usr/include/postgresql || die - emake || die -} - -src_install () { - einstall || die - mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf - mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf - mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf - dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO - newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed" -} - diff -r ae604915eca9 -r 24790a7e3ea2 dev-db/pgpool-II/pgpool-II-2.2.5.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/pgpool-II/pgpool-II-2.2.5.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,34 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="New generation connection pool server for PostgreSQL" +HOMEPAGE="http://pgpool.projects.postgresql.org/" +SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +DEPEND="virtual/postgresql-base" + +src_unpack() { + unpack ${A} + S="${WORKDIR}/${PN}-2.2" + cd ${S} + sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die +} + +src_compile() { + econf || die + emake || die +} + +src_install () { + einstall || die + mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf + mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf + mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO + newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed" +} diff -r ae604915eca9 -r 24790a7e3ea2 dev-util/mercurial/Manifest --- a/dev-util/mercurial/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ b/dev-util/mercurial/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -1,5 +1,4 @@ AUX 70mercurial-gentoo.el 76 RMD160 1891ab510adb464211b4cc35c5b6e4b149da79fa SHA1 72eb35d2bf86fa8f806acfbc823b88fc5188741b SHA256 c215746e4a5375569808c6aa6ddabe08e82d33d744128179be3142d9cd53a5ab -DIST mercurial-1.3.tar.gz 1768227 RMD160 20032f18a2bbe1d60969567299bb9ca3392fe6d9 SHA1 af1bfc2817e0719124593e4ec03f0056a4b2870c SHA256 f25feec95586b60b939c60a1dfc0d20d69ebe0f1eca38dc3a8edbcba5b6dfd47 -EBUILD mercurial-1.3.ebuild 3226 RMD160 743d444c471c607972c0cedb0da2599574b6672a SHA1 a29c432f1335a05cdf26aba60ccbb62e17540f5f SHA256 0f1b83d61da1f559d97d934c7c21601015cb8a622ece49344af3bc0294cca507 -MISC mercurial-1.3.ebuild~ 3227 RMD160 53995ef1c666099a6a80610326c6c0ac208ec998 SHA1 806a68c5ddbf45e8a8eac4fda7cc596f458d4895 SHA256 caa14f58750f897be2c0cb3d8c09e699aee280d3c06ad7e4eafaf58eaa24d8bf +DIST mercurial-1.3.1.tar.gz 1770585 RMD160 1e43d8697e4d269fdc065ee82c48e1cf132f6d6f SHA1 a9537fab7c7ead501a6414d1900f46e0ae3e48b8 SHA256 ff928b557f41374974171df1b0384e33161aff97c5fe1c856a7b91bf3b154a62 +EBUILD mercurial-1.3.1.ebuild 3226 RMD160 743d444c471c607972c0cedb0da2599574b6672a SHA1 a29c432f1335a05cdf26aba60ccbb62e17540f5f SHA256 0f1b83d61da1f559d97d934c7c21601015cb8a622ece49344af3bc0294cca507 MISC metadata.xml 645 RMD160 2a33b3987960796da78558e671c4e5e0c6f10241 SHA1 6cd04e19dc7796b53afe98a9831e128c4c96f3ca SHA256 e0b05e42345698eda32c513e3a8f14d8bf42d5344dcd804b1f2234da327524e2 diff -r ae604915eca9 -r 24790a7e3ea2 dev-util/mercurial/mercurial-1.3.1.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-util/mercurial/mercurial-1.3.1.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,118 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.7 2008/10/17 08:04:41 aballier Exp $ + +inherit bash-completion elisp-common flag-o-matic eutils distutils + +DESCRIPTION="Scalable distributed SCM" +HOMEPAGE="http://www.selenic.com/mercurial/" +SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="bugzilla emacs gpg test zsh-completion" + +CDEPEND=">=dev-lang/python-2.3" +RDEPEND="${CDEPEND} + bugzilla? ( dev-python/mysql-python ) + gpg? ( app-crypt/gnupg ) + zsh-completion? ( app-shells/zsh )" +DEPEND="${CDEPEND} + emacs? ( virtual/emacs ) + test? ( app-arch/unzip + dev-python/pygments )" + +PYTHON_MODNAME="${PN} hgext" +SITEFILE="70${PN}-gentoo.el" + +src_compile() { + filter-flags -ftracer -ftree-vectorize + + distutils_src_compile + + if use emacs; then + cd "${S}"/contrib + elisp-compile mercurial.el || die "elisp-compile failed!" + fi + + rm -rf contrib/{win32,macosx} +} + +src_install() { + distutils_src_install + + dobashcompletion contrib/bash_completion ${PN} + + if use zsh-completion ; then + insinto /usr/share/zsh/site-functions + newins contrib/zsh_completion _hg + fi + + rm -f doc/*.?.txt + dodoc CONTRIBUTORS PKG-INFO README doc/*.txt + cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/ + + dobin contrib/hgk + dobin contrib/hg-relink + dobin contrib/hg-ssh + + rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh + + rm -f contrib/bash_completion + cp -r contrib "${D}"/usr/share/doc/${PF}/ + doman doc/*.? + + cat > "${T}/80mercurial" <<-EOF +HG=/usr/bin/hg +EOF + doenvd "${T}/80mercurial" + + if use emacs; then + elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" + elisp-site-file-install "${FILESDIR}"/${SITEFILE} + fi +} + +src_test() { + local testdir="${T}/tests" + mkdir -p -m1777 "${testdir}" || die + cd "${S}/tests/" + rm -f *svn* # Subversion tests fail with 1.5 + rm -f test-convert-baz* # GNU Arch baz + rm -f test-convert-cvs* # CVS + rm -f test-convert-darcs* # Darcs + rm -f test-convert-git* # git + rm -f test-convert-mtn* # monotone + rm -f test-convert-tla* # GNU Arch tla + rm -f test-doctest* # doctest always fails with python 2.5.x + if ! has userpriv ${FEATURES}; then + einfo "Removing tests which require user privileges to succeed" + rm -f test-command-template # Test is broken when run as root + rm -f test-convert # Test is broken when run as root + rm -f test-lock-badness # Test is broken when run as root + rm -f test-permissions # Test is broken when run as root + rm -f test-pull-permission # Test is broken when run as root + fi + einfo "Running Mercurial tests ..." + python run-tests.py --tmpdir="${testdir}" || die "test failed" +} + +pkg_postinst() { + distutils_pkg_postinst + use emacs && elisp-site-regen + bash-completion_pkg_postinst + + elog "If you want to convert repositories from other tools using convert" + elog "extension please install correct tool:" + elog " dev-util/cvs" + elog " dev-util/darcs" + elog " dev-util/git" + elog " dev-util/monotone" + elog " dev-util/subversion" +} + +pkg_postrm() { + distutils_pkg_postrm + use emacs && elisp-site-regen +} diff -r ae604915eca9 -r 24790a7e3ea2 dev-util/mercurial/mercurial-1.3.ebuild --- a/dev-util/mercurial/mercurial-1.3.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/mercurial/mercurial-1.0.2.ebuild,v 1.7 2008/10/17 08:04:41 aballier Exp $ - -inherit bash-completion elisp-common flag-o-matic eutils distutils - -DESCRIPTION="Scalable distributed SCM" -HOMEPAGE="http://www.selenic.com/mercurial/" -SRC_URI="http://www.selenic.com/mercurial/release/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="bugzilla emacs gpg test zsh-completion" - -CDEPEND=">=dev-lang/python-2.3" -RDEPEND="${CDEPEND} - bugzilla? ( dev-python/mysql-python ) - gpg? ( app-crypt/gnupg ) - zsh-completion? ( app-shells/zsh )" -DEPEND="${CDEPEND} - emacs? ( virtual/emacs ) - test? ( app-arch/unzip - dev-python/pygments )" - -PYTHON_MODNAME="${PN} hgext" -SITEFILE="70${PN}-gentoo.el" - -src_compile() { - filter-flags -ftracer -ftree-vectorize - - distutils_src_compile - - if use emacs; then - cd "${S}"/contrib - elisp-compile mercurial.el || die "elisp-compile failed!" - fi - - rm -rf contrib/{win32,macosx} -} - -src_install() { - distutils_src_install - - dobashcompletion contrib/bash_completion ${PN} - - if use zsh-completion ; then - insinto /usr/share/zsh/site-functions - newins contrib/zsh_completion _hg - fi - - rm -f doc/*.?.txt - dodoc CONTRIBUTORS PKG-INFO README doc/*.txt - cp hgweb*.cgi "${D}"/usr/share/doc/${PF}/ - - dobin contrib/hgk - dobin contrib/hg-relink - dobin contrib/hg-ssh - - rm -f contrib/hgk contrib/hg-relink contrib/hg-ssh - - rm -f contrib/bash_completion - cp -r contrib "${D}"/usr/share/doc/${PF}/ - doman doc/*.? - - cat > "${T}/80mercurial" <<-EOF -HG=/usr/bin/hg -EOF - doenvd "${T}/80mercurial" - - if use emacs; then - elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!" - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi -} - -src_test() { - local testdir="${T}/tests" - mkdir -p -m1777 "${testdir}" || die - cd "${S}/tests/" - rm -f *svn* # Subversion tests fail with 1.5 - rm -f test-convert-baz* # GNU Arch baz - rm -f test-convert-cvs* # CVS - rm -f test-convert-darcs* # Darcs - rm -f test-convert-git* # git - rm -f test-convert-mtn* # monotone - rm -f test-convert-tla* # GNU Arch tla - rm -f test-doctest* # doctest always fails with python 2.5.x - if ! has userpriv ${FEATURES}; then - einfo "Removing tests which require user privileges to succeed" - rm -f test-command-template # Test is broken when run as root - rm -f test-convert # Test is broken when run as root - rm -f test-lock-badness # Test is broken when run as root - rm -f test-permissions # Test is broken when run as root - rm -f test-pull-permission # Test is broken when run as root - fi - einfo "Running Mercurial tests ..." - python run-tests.py --tmpdir="${testdir}" || die "test failed" -} - -pkg_postinst() { - distutils_pkg_postinst - use emacs && elisp-site-regen - bash-completion_pkg_postinst - - elog "If you want to convert repositories from other tools using convert" - elog "extension please install correct tool:" - elog " dev-util/cvs" - elog " dev-util/darcs" - elog " dev-util/git" - elog " dev-util/monotone" - elog " dev-util/subversion" -} - -pkg_postrm() { - distutils_pkg_postrm - use emacs && elisp-site-regen -} diff -r ae604915eca9 -r 24790a7e3ea2 media-gfx/graphicsmagick/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/media-gfx/graphicsmagick/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,2 @@ +DIST GraphicsMagick-1.3.7.tar.bz2 6581207 RMD160 56a7408d2f3fc15be2859a0d5b3c42e0549faf0c SHA1 e65c4d799704245216821374f66de5796795c263 SHA256 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc +EBUILD graphicsmagick-1.3.7.ebuild 3000 RMD160 e1e5427162790a7061ca7cdda4a7f76a6a7b60b1 SHA1 4caa266b188ac6e6a393771c6c6eb6097ad074d6 SHA256 95dd7987620ab2b264326e45f810dfdb5144aa6a79ea77f2ab0ccb39a518ede4 diff -r ae604915eca9 -r 24790a7e3ea2 media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,116 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.7.ebuild,v 1.1 2009/11/24 00:20:48 bicatali Exp $ + +EAPI="2" + +inherit toolchain-funcs flag-o-matic perl-app + +MY_P=${P/graphicsm/GraphicsM} + +DESCRIPTION="Collection of tools and libraries for many image formats" +HOMEPAGE="http://www.graphicsmagick.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bzip2 cxx debug fpx -gs imagemagick jbig +jpeg +jpeg2k lcms openmp + perl +png q16 q32 +svg +threads tiff +truetype X wmf zlib" + +RDEPEND="bzip2? ( app-arch/bzip2 ) + fpx? ( media-libs/libfpx ) + gs? ( virtual/ghostscript ) + jbig? ( media-libs/jbigkit ) + jpeg? ( media-libs/jpeg ) + jpeg2k? ( >=media-libs/jasper-1.701.0 ) + lcms? ( media-libs/lcms ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + svg? ( dev-libs/libxml2 ) + tiff? ( >=media-libs/tiff-3.8.2 ) + truetype? ( >=media-libs/freetype-2.0 ) + wmf? ( media-libs/libwmf ) + X? ( x11-libs/libXext + x11-libs/libSM + x11-libs/libX11 + x11-libs/libICE ) + imagemagick? ( !media-gfx/imagemagick )" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use openmp && + [[ $(tc-getCC)$ == *gcc* ]] && + ( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] || + ! built_with_use sys-devel/gcc openmp ) + then + ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 " + ewarn "If you want to build fftw with OpenMP, abort now," + ewarn "and switch CC to an OpenMP capable compiler" + epause 5 + fi +} + +src_configure() { + local quantumDepth + if use q16 ; then + quantumDepth="16" + elif use q32 ; then + quantumDepth="32" + else + quantumDepth="8" + fi + + use debug && filter-flags -fomit-frame-pointer + + econf \ + --enable-shared \ + --enable-largefile \ + --without-included-ltdl \ + --without-frozenpaths \ + --with-modules \ + --with-quantum-depth=${quantumDepth} \ + $(use_enable debug ccmalloc) \ + $(use_enable debug prof) \ + $(use_enable debug gcov) \ + $(use_enable imagemagick magick-compat) \ + $(use_enable openmp) \ + $(use_with bzip2 bzlib) \ + $(use_with cxx magick-plus-plus) \ + $(use_with fpx) \ + $(use_with gs gslib) \ + $(use_with jbig) \ + $(use_with jpeg) \ + $(use_with jpeg2k jp2) \ + $(use_with lcms) \ + $(use_with perl) \ + $(use_with png) \ + $(use_with svg xml) \ + $(use_with threads) \ + $(use_with tiff) \ + $(use_with truetype ttf) \ + $(use_with wmf) \ + $(use_with X x) \ + $(use_with zlib) +} + +src_test() { + emake check || die "tests failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "Installation failed" + dodoc README.txt ChangeLog* NEWS.txt TODO.txt + + # Fix perllocal.pod file collision + use perl && fixlocalpod +} + +pkg_postinst() { + elog "For RAW image suport please install media-gfx/dcraw." + elog "For mpeg suport please install media-video/mpeg2vidcodec." + elog "To read gnuplot files please install sci-visualization/gnuplot." +} diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/Manifest --- a/net-fs/samba/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578 -AUX config-3.3/lmhosts 134 RMD160 7c99b13a2f273ee190c7df9392b1678b00ec461a SHA1 d63d8d846c3cecfc706d28d916ea323f2eae4ef1 SHA256 b891ca7448db3fadefd9f5ddaeb28ea19bad63c3ee21ea8f74cdc2dfecd6ab6b -AUX config-3.3/nsswitch.conf-winbind 414 RMD160 71491dd98acc39aea8f18f5cc382f6a56d80259f SHA1 fa5c1e24437d4ffc0150a2b202f5ba6df5d40463 SHA256 5466dc681036731046f53e4ef59fb7c2110783e77a38d0887432d94776c3dafa -AUX config-3.3/nsswitch.conf-wins 400 RMD160 1e005e46b161edf12a9118018eb2676e3531dd7f SHA1 ccd9903e26ada045428f1ec16678c29e21c35ef3 SHA256 e028691f7144932404ec154fdb72defb4f127e1f6c330c8864ede2f369a0d05d -AUX config-3.3/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38 -AUX config-3.3/samba.schema 16044 RMD160 b28408c64524ea44a9b0ea877d614603456a18fa SHA1 523d8bcf6313fe8ce03a3fbe762ba90b88ca5643 SHA256 c011a2f2f4fcc2839e3609cf5477507d938083f48f15a05787337b352f3afec3 -AUX config-3.3/smb.conf.example-samba3 19701 RMD160 1ce92cbedb15cf5ee4d66ee50fd7c996231facea SHA1 5c60002f23ac2a60fc27b58ea03659acb0db876a SHA256 83fd9407e71db606bb50677f9d8a557688b6eafacb32d30c7a0a6d1c666b694d -AUX config-3.3/smbusers 212 RMD160 9734e79880e91fb5a9efbd723819413da5746923 SHA1 0c93dcf9d8c854a446b8f1442a7fd9d6b5623314 SHA256 35ebdad3dcad3819996ac63909a3aa5cff72f5953e4060f48c861e399c3ea208 -AUX config-3.3/swat.xinetd 535 RMD160 de492774e24a45eeb378209aa14b212225f3229a SHA1 5d5113ce77807d972bc0d62993cd6a7c2d30705c SHA256 4de179a10806a2e3af2392c0b9002671e567bb94601cfc0a542c607e6cc9dbc9 -AUX config-3.3/system-auth-winbind 709 RMD160 0af9b97a1e35e6e1c5db484bd80ccb95fa8fecf9 SHA1 e36df120cbd51483c22cf324582034c9ff4cee2b SHA256 944f7fbc2d4d5a3da739e1dc37864efa08ee8a39cbd9a36b2ecfeefc47ed3a98 -AUX samba-conf 1291 RMD160 326fb4beee8105d839d23e37f4989d7e332c996b SHA1 af7cd695f212d7ec022df05ba2f821a8f9878ab2 SHA256 dfaf474c3cbfa3d3b26d1531c6f5913739d5815c4b8083063934ee4fd6b38861 -AUX samba-init 1133 RMD160 77a084e8f78665af0233f19dc9c4a49693360da1 SHA1 09d7f1d676856289b61e890396a9976e2ccc794a SHA256 3b41d16daf02f9a1ab12e62c4c915f58e7801c07be48e2a94086eb288bb86aad -AUX samba-xinetd 286 RMD160 c90bd8518082eb4c182d5f7bd223a76f8e3c7fab SHA1 b250c5ca539187d8b481bcfb6ea3a915d7e8b26b SHA256 964d06dc33beff38978a8f03cd12b05c33d8258ed73aa9ffbf137fe226de25b8 -DIST samba-3.3.6.tar.gz 26097470 RMD160 a4759d23e3e264dcb5902b36794d2102aab2f494 SHA1 e6dea0bc938bd74e593a78c23afb55574edfba9a SHA256 da66e05f87ce6540ef709fbd347a706bc8e3b69cfab568ebf58bfe2e9ed44263 -EBUILD samba-3.3.6.ebuild 7593 RMD160 b7bdd2cf043878df2b4392391f4f47ebf1bb4b48 SHA1 b15a0ef7b58c2f20863ca455f8bfa36ee0de193d SHA256 e9391c54879e636afdff5b505d8a183dbf31169ce3151e6a62474afd5d9048be -MISC metadata.xml 950 RMD160 4947143536f9776d7dd7f7d6552d624e1f2ac14d SHA1 ef8a8c0c5cd229c88b1f93042ebfbdafaf45deb2 SHA256 b040a13821dbd3f1214b96ed5a808188ef0996161b0ce0cc11de8d8397de960f diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/README.gentoo --- a/net-fs/samba/files/README.gentoo Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -#------------------------------------------------------------------------- -# WHATSNEW -#------------------------------------------------------------------------- -3.0.2: - If you are upgrading from a Samba version prior to 3.0.2, and you - use Samba's password database, you must run the following command: - pdbedit --force-initialized-passwords - -3.0.10: - LIBs flags changes for suid bins: LDFLAGS+='-Wl,-z,now' - -3.0.12: - libsmbclient shared library retrocompatibility is not assured: please - rebuild all samba-linked third part packages - /etc/samba/private moved to ${PRIVATE_DST} - for better File System Hierarchy adeherence - -3.0.20: - --with-idmap configure option removed - (historical: it is already included if dynamic id/gid mapping is used) - New USE flags: - async: async input/output - automount: automount support (previously default) - syslog: log to syslog daemon (previously default) - -3.0.22: - *sql backend: they were experimental, and now are marked as "deprecated" - upstream - CVE-2006-1059 security fix: 3.0.21* shipped with a bug in the debug - functions of winbind (debug>=5 reveals secret ids in logs) - -3.0.23: - *sql and xml backends have been removed by upstream devs. SQL is - temporarily continued on SourceForge (http://pdbsql.sourceforge.net), - but it will be removed with samba 4.x (and maybe 3.2.x) - see also ldap changes below - CAN-2006-1059: memory exaustion DoS against smbd in all samba versions - between 3.0.x and 3.0.23 - -General: - If you experience client locks in file transfers _only_, try the parameter - use sendfile = no (man smb.conf(5), man sendfile(2)) - There also seem some problems with the smbfs implementation of the recent - 2.6.x kernels. If you experience problems (lockups) with smbfs, try - 'mount -t cifs' as an alternative - -#------------------------------------------------------------------------- -# WINBIND -#------------------------------------------------------------------------- -3.0.7: param: 'winbind enable local accounts' is now disabled by default - -#------------------------------------------------------------------------- -# LDAP -#------------------------------------------------------------------------- -3.0.2: - If you are upgrading from prior to 3.0.2, and you are using LDAP for Samba - authentication, you must check the sambaPwdLastSet attribute on all - accounts, and ensure it is not 0. - -3.0.12: - smbldap-tools is now a separate package for ease of upgrade - -3.0.23: - a new index is required: 'index sambaSID sub' (run slapindex afterwards) - use an updated samba.schema containing the correct 'sambaSID' definition - -#------------------------------------------------------------------------- -# DOCS -#------------------------------------------------------------------------- -General: - Beside [1], there is a good HOWTO about setting up samba3 with cups and - clamav at [2] -Ldap: - Beside the Samba Guide ad [1], try to look at smbldap-tools docs [3] - -[1] http://www.samba.org -[2] http://www.gentoo.org/doc/en/quick-samba-howto.xml -[3] http://www.idealx.org/prj/samba/smbldap-howto.fr.html - diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/lmhosts --- a/net-fs/samba/files/config-3.3/lmhosts Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/lmhosts,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ -127.0.0.1 localhost diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/nsswitch.conf-winbind --- a/net-fs/samba/files/config-3.3/nsswitch.conf-winbind Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/nsswitch.conf-winbind,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ -passwd: files winbind -group: files winbind - -hosts: files dns -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/nsswitch.conf-wins --- a/net-fs/samba/files/config-3.3/nsswitch.conf-wins Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/nsswitch.conf-wins,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ -passwd: files -group: files - -hosts: files dns wins -networks: files dns - -services: db files -protocols: db files -rpc: db files -ethers: db files -netmasks: files -netgroup: files -bootparams: files - -automount: files -aliases: files diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/samba.pam --- a/net-fs/samba/files/config-3.3/samba.pam Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -#%PAM-1.0 -# * pam_smbpass.so authenticates against the smbpasswd file -# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility -# (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only -auth required pam_smbpass.so nodelay -account include system-auth -session include system-auth -password required pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/samba.schema --- a/net-fs/samba/files/config-3.3/samba.schema Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,471 +0,0 @@ -## -## schema file for OpenLDAP 2.x -## Schema for storing Samba user accounts and group maps in LDAP -## OIDs are owned by the Samba Team -## -## Prerequisite schemas - uid (cosine.schema) -## - displayName (inetorgperson.schema) -## - gidNumber (nis.schema) -## -## 1.3.6.1.4.1.7165.2.1.x - attributetypes -## 1.3.6.1.4.1.7165.2.2.x - objectclasses -## -## ----- READ THIS WHEN ADDING A NEW ATTRIBUTE OR OBJECT CLASS ------ -## -## Run the 'get_next_oid' bash script in this directory to find the -## next available OID for attribute type and object classes. -## -## $ ./get_next_oid -## attributetype ( 1.3.6.1.4.1.7165.2.1.XX NAME .... -## objectclass ( 1.3.6.1.4.1.7165.2.2.XX NAME .... -## -## Also ensure that new entries adhere to the declaration style -## used throughout this file -## -## ( 1.3.6.1.4.1.7165.2.XX.XX NAME .... -## ^ ^ ^ -## -## The spaces are required for the get_next_oid script (and for -## readability). -## -## ------------------------------------------------------------------ - -######################################################################## -## HISTORICAL ## -######################################################################## - -## -## Password hashes -## -#attributetype ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword' -# DESC 'LanManager Passwd' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword' -# DESC 'NT Passwd' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE ) - -## -## Account flags in string format ([UWDX ]) -## -#attributetype ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags' -# DESC 'Account Flags' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE ) - -## -## Password timestamps & policies -## -#attributetype ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet' -# DESC 'NT pwdLastSet' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime' -# DESC 'NT logonTime' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime' -# DESC 'NT logoffTime' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime' -# DESC 'NT kickoffTime' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange' -# DESC 'NT pwdCanChange' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange' -# DESC 'NT pwdMustChange' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -## -## string settings -## -#attributetype ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive' -# DESC 'NT homeDrive' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath' -# DESC 'NT scriptPath' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath' -# DESC 'NT profilePath' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations' -# DESC 'userWorkstations' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.17 NAME 'smbHome' -# DESC 'smbHome' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.18 NAME 'domain' -# DESC 'Windows NT domain to which the user belongs' -# EQUALITY caseIgnoreIA5Match -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{128} ) - -## -## user and group RID -## -#attributetype ( 1.3.6.1.4.1.7165.2.1.14 NAME 'rid' -# DESC 'NT rid' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -#attributetype ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID' -# DESC 'NT Group RID' -# EQUALITY integerMatch -# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -## -## The smbPasswordEntry objectclass has been depreciated in favor of the -## sambaAccount objectclass -## -#objectclass ( 1.3.6.1.4.1.7165.2.2.1 NAME 'smbPasswordEntry' SUP top AUXILIARY -# DESC 'Samba smbpasswd entry' -# MUST ( uid $ uidNumber ) -# MAY ( lmPassword $ ntPassword $ pwdLastSet $ acctFlags )) - -#objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL -# DESC 'Samba Account' -# MUST ( uid $ rid ) -# MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $ -# logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $ -# displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $ -# description $ userWorkstations $ primaryGroupID $ domain )) - -#objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY -# DESC 'Samba Auxiliary Account' -# MUST ( uid $ rid ) -# MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $ -# logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $ -# displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $ -# description $ userWorkstations $ primaryGroupID $ domain )) - -######################################################################## -## END OF HISTORICAL ## -######################################################################## - -####################################################################### -## Attributes used by Samba 3.0 schema ## -####################################################################### - -## -## Password hashes -## -attributetype ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' - DESC 'LanManager Password' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' - DESC 'MD4 hash of the unicode password' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE ) - -## -## Account flags in string format ([UWDX ]) -## -attributetype ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags' - DESC 'Account Flags' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE ) - -## -## Password timestamps & policies -## -attributetype ( 1.3.6.1.4.1.7165.2.1.27 NAME 'sambaPwdLastSet' - DESC 'Timestamp of the last password update' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.28 NAME 'sambaPwdCanChange' - DESC 'Timestamp of when the user is allowed to update the password' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.29 NAME 'sambaPwdMustChange' - DESC 'Timestamp of when the password will expire' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.30 NAME 'sambaLogonTime' - DESC 'Timestamp of last logon' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.31 NAME 'sambaLogoffTime' - DESC 'Timestamp of last logoff' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.32 NAME 'sambaKickoffTime' - DESC 'Timestamp of when the user will be logged off automatically' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.48 NAME 'sambaBadPasswordCount' - DESC 'Bad password attempt count' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.49 NAME 'sambaBadPasswordTime' - DESC 'Time of the last bad password attempt' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.55 NAME 'sambaLogonHours' - DESC 'Logon Hours' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{42} SINGLE-VALUE ) - -## -## string settings -## -attributetype ( 1.3.6.1.4.1.7165.2.1.33 NAME 'sambaHomeDrive' - DESC 'Driver letter of home directory mapping' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.34 NAME 'sambaLogonScript' - DESC 'Logon script path' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.35 NAME 'sambaProfilePath' - DESC 'Roaming profile path' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.36 NAME 'sambaUserWorkstations' - DESC 'List of user workstations the user is allowed to logon to' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{255} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.37 NAME 'sambaHomePath' - DESC 'Home directory UNC path' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.38 NAME 'sambaDomainName' - DESC 'Windows NT domain to which the user belongs' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.47 NAME 'sambaMungedDial' - DESC '' - EQUALITY caseExactMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' - DESC 'Concatenated MD4 hashes of the unicode passwords used on this account' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} ) - -## -## SID, of any type -## - -attributetype ( 1.3.6.1.4.1.7165.2.1.20 NAME 'sambaSID' - DESC 'Security ID' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE ) - - -## -## Primary group SID, compatible with ntSid -## - -attributetype ( 1.3.6.1.4.1.7165.2.1.23 NAME 'sambaPrimaryGroupSID' - DESC 'Primary Group Security ID' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.51 NAME 'sambaSIDList' - DESC 'Security ID List' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} ) - -## -## group mapping attributes -## -attributetype ( 1.3.6.1.4.1.7165.2.1.19 NAME 'sambaGroupType' - DESC 'NT Group Type' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -## -## Store info on the domain -## - -attributetype ( 1.3.6.1.4.1.7165.2.1.21 NAME 'sambaNextUserRid' - DESC 'Next NT rid to give our for users' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid' - DESC 'Next NT rid to give out for groups' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid' - DESC 'Next NT rid to give out for anything' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' - DESC 'Base at which the samba RID generation algorithm should operate' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.41 NAME 'sambaShareName' - DESC 'Share Name' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.42 NAME 'sambaOptionName' - DESC 'Option Name' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption' - DESC 'A boolean option' - EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.44 NAME 'sambaIntegerOption' - DESC 'An integer option' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.45 NAME 'sambaStringOption' - DESC 'A string option' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.46 NAME 'sambaStringListOption' - DESC 'A string list option' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) - - -attributetype ( 1.3.6.1.4.1.7165.2.1.50 NAME 'sambaPrivName' - SUP name ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.52 NAME 'sambaPrivilegeList' - DESC 'Privileges List' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} ) - -attributetype ( 1.3.6.1.4.1.7165.2.1.53 NAME 'sambaTrustFlags' - DESC 'Trust Password Flags' - EQUALITY caseIgnoreIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - - -####################################################################### -## objectClasses used by Samba 3.0 schema ## -####################################################################### - -## The X.500 data model (and therefore LDAPv3) says that each entry can -## only have one structural objectclass. OpenLDAP 2.0 does not enforce -## this currently but will in v2.1 - -## -## added new objectclass (and OID) for 3.0 to help us deal with backwards -## compatibility with 2.2 installations (e.g. ldapsam_compat) --jerry -## -objectclass ( 1.3.6.1.4.1.7165.2.2.6 NAME 'sambaSamAccount' SUP top AUXILIARY - DESC 'Samba 3.0 Auxilary SAM Account' - MUST ( uid $ sambaSID ) - MAY ( cn $ sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ - sambaLogonTime $ sambaLogoffTime $ sambaKickoffTime $ - sambaPwdCanChange $ sambaPwdMustChange $ sambaAcctFlags $ - displayName $ sambaHomePath $ sambaHomeDrive $ sambaLogonScript $ - sambaProfilePath $ description $ sambaUserWorkstations $ - sambaPrimaryGroupSID $ sambaDomainName $ sambaMungedDial $ - sambaBadPasswordCount $ sambaBadPasswordTime $ - sambaPasswordHistory $ sambaLogonHours)) - -## -## Group mapping info -## -objectclass ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top AUXILIARY - DESC 'Samba Group Mapping' - MUST ( gidNumber $ sambaSID $ sambaGroupType ) - MAY ( displayName $ description $ sambaSIDList )) - -## -## Trust password for trust relationships (any kind) -## -objectclass ( 1.3.6.1.4.1.7165.2.2.14 NAME 'sambaTrustPassword' SUP top STRUCTURAL - DESC 'Samba Trust Password' - MUST ( sambaDomainName $ sambaNTPassword $ sambaTrustFlags ) - MAY ( sambaSID $ sambaPwdLastSet )) - -## -## Whole-of-domain info -## -objectclass ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL - DESC 'Samba Domain Information' - MUST ( sambaDomainName $ - sambaSID ) - MAY ( sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ - sambaAlgorithmicRidBase ) ) - -## -## used for idmap_ldap module -## -objectclass ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY - DESC 'Pool for allocating UNIX uids/gids' - MUST ( uidNumber $ gidNumber ) ) - - -objectclass ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY - DESC 'Mapping from a SID to an ID' - MUST ( sambaSID ) - MAY ( uidNumber $ gidNumber ) ) - -objectclass ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL - DESC 'Structural Class for a SID' - MUST ( sambaSID ) ) - -objectclass ( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY - DESC 'Samba Configuration Section' - MAY ( description ) ) - -objectclass ( 1.3.6.1.4.1.7165.2.2.11 NAME 'sambaShare' SUP top STRUCTURAL - DESC 'Samba Share Section' - MUST ( sambaShareName ) - MAY ( description ) ) - -objectclass ( 1.3.6.1.4.1.7165.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURAL - DESC 'Samba Configuration Option' - MUST ( sambaOptionName ) - MAY ( sambaBoolOption $ sambaIntegerOption $ sambaStringOption $ - sambaStringListoption $ description ) ) - - -objectclass ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' SUP top AUXILIARY - DESC 'Samba Privilege' - MUST ( sambaSID ) - MAY ( sambaPrivilegeList ) ) - diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/smb.conf.example-samba3 --- a/net-fs/samba/files/config-3.3/smb.conf.example-samba3 Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,478 +0,0 @@ -# This is the main Samba configuration file. You should read the -# smb.conf(5) manual page in order to understand the options listed -# here. Samba has a huge number of configurable options (perhaps too -# many!) most of which are not shown in this example -# -# For a step to step guide on installing, configuring and using samba, -# read the Samba-HOWTO-Collection. This may be obtained from: -# http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf -# -# Many working examples of smb.conf files can be found in the -# Samba-Guide which is generated daily and can be downloaded from: -# http://www.samba.org/samba/docs/Samba-Guide.pdf -# -# Any line which starts with a ; (semi-colon) or a # (hash) -# is a comment and is ignored. In this example we will use a # -# for commentry and a ; for parts of the config file that you -# may wish to enable -# -# NOTE: Whenever you modify this file you should run the command "testparm" -# to check that you have not made any basic syntactic errors. -# -#======================= Global Settings ===================================== -[global] - -# 1. Server Naming Options: -# workgroup = NT-Domain-Name or Workgroup-Name - workgroup = MYGROUP - -# netbios name is the name you will see in "Network Neighbourhood", -# but defaults to your hostname -; netbios name = - -# server string is the equivalent of the NT Description field - server string = Samba Server %v - -# 2. Printing Options: -# CHANGES TO ENABLE PRINTING ON ALL CUPS PRINTERS IN THE NETWORK -# if you want to automatically load your printer list rather -# than setting them up individually then you'll need this - printcap name = cups - load printers = yes - -# It should not be necessary to spell out the print system type unless -# yours is non-standard. Currently supported print systems include: -# bsd, sysv, plp, lprng, aix, hpux, qnx, cups - printing = cups - -# 3. Logging Options: -# this tells Samba to use a separate log file for each machine -# that connects - log file = /var/log/samba/log.%m - -# Put a capping on the size of the log files (in Kb). - max log size = 50 - -# Set the log (verbosity) level (0 <= log level <= 10) -; log level = 3 - -# 4. Security and Domain Membership Options: -# This option is important for security. It allows you to restrict -# connections to machines which are on your local network. The -# following example restricts access to two C class networks and -# the "loopback" interface. For more examples of the syntax see -# the smb.conf man page. Do not enable this if (tcp/ip) name resolution does -# not work for all the hosts in your network. -; hosts allow = 192.168.1. 192.168.2. 127. - -# Uncomment this if you want a guest account, you must add this to /etc/passwd -# otherwise the user "nobody" is used -; guest account = pcguest -# Allow users to map to guest: - map to guest = bad user - -# Security mode. Most people will want user level security. See -# security_level.txt for details. - security = user -# Use password server option only with security = server or security = domain -# When using security = domain, you should use password server = * -; password server = -; password server = * - -# Password Level allows matching of _n_ characters of the password for -# all combinations of upper and lower case. -; password level = 8 -; username level = 8 - -# You may wish to use password encryption. Please read -# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation. -# Do not enable this option unless you have read those documents -# Encrypted passwords are required for any use of samba in a Windows NT domain -# The smbpasswd file is only required by a server doing authentication, thus -# members of a domain do not need one. - encrypt passwords = yes - -# The following are needed to allow password changing from Windows to -# also update the Linux system password. -# NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above. -# NOTE2: You do NOT need these to allow workstations to change only -# the encrypted SMB passwords. They allow the Unix password -# to be kept in sync with the SMB password. -; unix password sync = Yes -# You either need to setup a passwd program and passwd chat, or -# enable pam password change -; pam password change = yes -; passwd program = /usr/bin/passwd %u -; passwd chat = *New*UNIX*password* %n\n *Re*ype*new*UNIX*password* %n\n \ -;*passwd:*all*authentication*tokens*updated*successfully* - -# Unix users can map to different SMB User names -; username map = /etc/samba/smbusers - -# Using the following line enables you to customise your configuration -# on a per machine basis. The %m gets replaced with the netbios name -# of the machine that is connecting -; include = /etc/samba/smb.conf.%m - -# Options for using winbind. Winbind allows you to do all account and -# authentication from a Windows or samba domain controller, creating -# accounts on the fly, and maintaining a mapping of Windows RIDs to unix uid's -# and gid's. idmap uid and idmap gid are the only required parameters. -# -# winbind separator is the character a user must use between their domain -# name and username, defaults to "\" -; winbind separator = + -# -# winbind use default domain allows you to have winbind return usernames -# in the form user instead of DOMAIN+user for the domain listed in the -# workgroup parameter. -; winbind use default domain = yes -# -# template homedir determines the home directory for winbind users, with -# %D expanding to their domain name and %U expanding to their username: -; template homedir = /home/%D/%U - -# When using winbind, you may want to have samba create home directories -# on the fly for authenticated users. Ensure that /etc/pam.d/samba is -# using 'service=system-auth-winbind' in pam_stack modules, and then -# enable obedience of pam restrictions below: -; obey pam restrictions = yes - -# -# template shell determines the shell users authenticated by winbind get -; template shell = /bin/bash - -# 5. Browser Control and Networking Options: -# Most people will find that this option gives better performance. -# See speed.txt and the manual pages for details - socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 - -# Configure Samba to use multiple interfaces -# If you have multiple network interfaces then you must list them -# here. See the man page for details. -; interfaces = 192.168.12.2/24 192.168.13.2/24 - -# Configure remote browse list synchronisation here -# request announcement to, or browse list sync from: -# a specific host or from / to a whole subnet (see below) -; remote browse sync = 192.168.3.25 192.168.5.255 -# Cause this host to announce itself to local subnets here -; remote announce = 192.168.1.255 192.168.2.44 - -# set local master to no if you don't want Samba to become a master -# browser on your network. Otherwise the normal election rules apply -; local master = no - -# OS Level determines the precedence of this server in master browser -# elections. The default value should be reasonable -; os level = 33 - -# Domain Master specifies Samba to be the Domain Master Browser. This -# allows Samba to collate browse lists between subnets. Don't use this -# if you already have a Windows NT domain controller doing this job -; domain master = yes - -# Preferred Master causes Samba to force a local browser election on startup -# and gives it a slightly higher chance of winning the election -; preferred master = yes - -# 6. Domain Control Options: -# Enable this if you want Samba to be a domain logon server for -# Windows95 workstations or Primary Domain Controller for WinNT and Win2k -; domain logons = yes - -# if you enable domain logons then you may want a per-machine or -# per user logon script -# run a specific logon batch file per workstation (machine) -; logon script = %m.bat -# run a specific logon batch file per username -; logon script = %U.bat - -# Where to store roaming profiles for WinNT and Win2k -# %L substitutes for this servers netbios name, %U is username -# You must uncomment the [Profiles] share below -; logon path = \\%L\Profiles\%U - -# Where to store roaming profiles for Win9x. Be careful with this as it also -# impacts where Win2k finds it's /HOME share -; logon home = \\%L\%U\.profile - - -# The add user script is used by a domain member to add local user accounts -# that have been authenticated by the domain controller, or when adding -# users via the Windows NT Tools (ie User Manager for Domains). - -# Scripts for file (passwd, smbpasswd) backend: -; add user script = /usr/sbin/useradd -s /bin/false '%u' -; delete user script = /usr/sbin/userdel '%s' -; add user to group script = /usr/bin/gpasswd -a '%u' '%g' -; delete user from group script = /usr/bin/gpasswd -d '%u' '%g' -; set primary group script = /usr/sbin/usermod -g '%g' '%u' -; add group script = /usr/sbin/groupadd %g && getent group '%g'|awk -F: '{print $3}' -; delete group script = /usr/sbin/groupdel '%g' - -# Scripts for LDAP backend (assumes nss_ldap is in use on the domain controller. -# Needs IDEALX scripts, and configuration in smbldap_conf.pm. -# This assumes you've installed the IDEALX scripts into /usr/share/samba/scripts... -; add user script = /usr/share/samba/scripts/smbldap-useradd.pl '%u' -; delete user script = /usr/share/samba/scripts/smbldap-userdel.pl '%u' -; add user to group script = /usr/share/samba/scripts/smbldap-groupmod.pl -m '%u' '%g' -; delete user from group script = /usr/share/samba/scripts/smbldap-groupmod.pl -x '%u' '%g' -; set primary group script = /usr/share/samba/scripts/smbldap-usermod.pl -g '%g' '%u' -; add group script = /usr/share/samba/scripts/smbldap-groupadd.pl '%g' && /usr/share/samba/scripts/smbldap-groupshow.pl %g|awk '/^gidNumber:/ {print $2}' -; delete group script = /usr/share/samba/scripts/smbldap-userdel.pl '%g' - - -# The add machine script is use by a samba server configured as a domain -# controller to add local machine accounts when adding machines to the domain. -# The script must work from the command line when replacing the macros, -# or the operation will fail. Check that groups exist if forcing a group. -# Script for domain controller for adding machines: -; add machine script = /usr/sbin/useradd -d /dev/null -g machines -c 'Machine Account' -s /bin/false '%u' -# Script for domain controller with LDAP backend for adding machines (You need -# the IDEALX scripts, and to configure the smbldap_conf.pm first): -; add machine script = /usr/share/samba/scripts/smbldap-useradd.pl -w -d /dev/null -g machines -c 'Machine Account' -s /bin/false '%u' - -# Domain groups: -# Domain groups are now configured by using the 'net groupmap' tool - -# Samba Password Database configuration: -# Samba now has runtime-configurable password database backends. -# smbpasswd is for backwards compatibility only Default (not recommended), -# new installations should use tdbsam or ldap. -; passdb backend = smbpasswd -# TDB backend -; passdb backend = tdbsam -# LDAP with fallback to smbpasswd guest -# Enable SSL by using an ldaps url, or enable tls with 'ldap ssl' below. -; passdb backend = ldapsam:ldaps://ldap.mydomain.com -# Use the samba2 LDAP schema: -; passdb backend = ldapsam_compat:ldaps://ldap.mydomain.com - -# idmap uid account range: -# This is a range of unix user-id's that samba will map non-unix RIDs to, -# such as when using Winbind -; idmap uid = 10000-20000 -; idmap gid = 10000-20000 - -# LDAP configuration for Domain Controlling: -# The account (dn) that samba uses to access the LDAP server -# This account needs to have write access to the LDAP tree -# You will need to give samba the password for this dn, by -# running 'smbpasswd -w mypassword' -; ldap admin dn = cn=root,dc=mydomain,dc=com -; ldap ssl = start_tls -# start_tls should run on 389, but samba defaults incorrectly to 636 -; ldap port = 389 -; ldap suffix = dc=mydomain,dc=com -; ldap server = ldap.mydomain.com -# Seperate suffixes are available for machines, users, groups, and idmap, if -# ldap suffix appears first, it is appended to the specific suffix. -# Example for a unix-ish directory layout: -; ldap machine suffix = ou=Hosts -; ldap user suffix = ou=People -; ldap group suffix = ou=Group -; ldap idmap suffix = ou=Idmap -# Example for AD-ish layout: -; ldap machine suffix = cn=Computers -; ldap user suffix = cn=Users -; ldap group suffix = cn=Groups -; ldap idmap suffix = cn=Idmap - - -# 7. Name Resolution Options: -# All NetBIOS names must be resolved to IP Addresses -# 'Name Resolve Order' allows the named resolution mechanism to be specified -# the default order is "host lmhosts wins bcast". "host" means use the unix -# system gethostbyname() function call that will use either /etc/hosts OR -# DNS or NIS depending on the settings of /etc/host.config, /etc/nsswitch.conf -# and the /etc/resolv.conf file. "host" therefore is system configuration -# dependant. This parameter is most often of use to prevent DNS lookups -# in order to resolve NetBIOS names to IP Addresses. Use with care! -# The example below excludes use of name resolution for machines that are NOT -# on the local network segment -# - OR - are not deliberately to be known via lmhosts or via WINS. -; name resolve order = wins host lmhosts bcast - -# Windows Internet Name Serving Support Section: -# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server -; wins support = yes - -# WINS Server - Tells the NMBD components of Samba to be a WINS Client -# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both -; wins server = w.x.y.z - -# WINS Proxy - Tells Samba to answer name resolution queries on -# behalf of a non WINS capable client, for this to work there must be -# at least one WINS Server on the network. The default is NO. -; wins proxy = yes - -# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names -# via DNS nslookups. The built-in default for versions 1.9.17 is yes, -# this has been changed in version 1.9.18 to no. - dns proxy = no - -# 8. File Naming Options: -# Case Preservation can be handy - system default is _no_ -# NOTE: These can be set on a per share basis -; preserve case = no -; short preserve case = no -# Default case is normally upper case for all DOS files -; default case = lower -# Be very careful with case sensitivity - it can break things! -; case sensitive = no - -# Enabling internationalization: -# you can match a Windows code page with a UNIX character set. -# Windows: 437 (US), 737 (GREEK), 850 (Latin1 - Western European), -# 852 (Czech), 861 (???), 932 (Japanese), -# 936 (Simplified Chin.), 949 (Korean Hangul), -# 950 (Trad. Chin.). -# More detail about code page is in -# "http://www.microsoft.com/globaldev/reference/oslocversion.mspx" -# UNIX: ISO8859-1 (Western European), ISO8859-2 (Eastern Eu.), -# ISO8859-5 (Russian Cyrillic), KOI8-R (Alt-Russ. Cyril.) -# This is an example for french users: -; dos charset = 850 -; unix charset = ISO8859-1 - - -#============================ Share Definitions ============================== -[homes] - comment = Home Directories - browseable = no - writable = yes -# You can enable VFS recycle bin on a per share basis: -# Uncomment the next 2 lines (make sure you create a -# .recycle folder in the base of the share and ensure -# all users will have write access to it. See -# examples/VFS/recycle/REAME in the samba docs for details -; vfs object = /usr/lib/samba/vfs/recycle.so - -# Un-comment the following and create the netlogon directory for Domain Logons -; [netlogon] -; comment = Network Logon Service -; path = /var/lib/samba/netlogon -; guest ok = yes -; writable = no - -# Un-comment the following to provide a specific roving profile share -# the default is to use the user's home directory -;[Profiles] -; path = /var/lib/samba/profiles -; browseable = no -; guest ok = yes -# This script can be enabled to create profile directories on the fly -# You may want to turn off guest acces if you enable this, as it -# hasn't been thoroughly tested. -;root preexec = PROFILE=/var/lib/samba/profiles/%u; if [ ! -e $PROFILE ]; \ -; then mkdir -pm700 $PROFILE; chown %u:%g $PROFILE;fi - -# NOTE: If you have a CUPS print system there is no need to -# specifically define each individual printer. -# You must configure the samba printers with the appropriate Windows -# drivers on your Windows clients. On the Samba server no filtering is -# done. If you wish that the server provides the driver and the clients -# send PostScript ("Generic PostScript Printer" under Windows), you have -# to swap the 'print command' line below with the commented one. -[printers] - comment = All Printers - path = /var/spool/samba - browseable = no -# set to yes to allow user 'guest account' to print. - guest ok = no - writable = no - printable = yes - -# This share is used for Windows NT-style point-and-print support. -# To be able to install drivers, you need to be either root, or listed -# in the printer admin parameter above. Note that you also need write access -# to the directory and share definition to be able to upload the drivers. -# For more information on this, please see the Printing Support Section of -# /usr/share/doc/samba-/Samba-HOWTO-Collection.pdf -[print$] - path = /var/lib/samba/printers - browseable = yes - read only = yes - write list = @adm root - guest ok = yes - -# This one is useful for people to share files -;[tmp] -; comment = Temporary file space -; path = /tmp -; read only = no -; public = yes - -# A publicly accessible directory, but read only, except for people in -# the "staff" group -;[public] -; comment = Public Stuff -; path = /home/samba/public -; public = yes -; writable = no -; write list = @staff -# Audited directory through experimental VFS audit.so module: -# Uncomment next line. -; vfs object = /usr/lib/samba/vfs/audit.so - -# Other examples. -# -# A private printer, usable only by Fred. Spool data will be placed in Fred's -# home directory. Note that fred must have write access to the spool directory, -# wherever it is. -;[fredsprn] -; comment = Fred's Printer -; valid users = fred -; path = /homes/fred -; printer = freds_printer -; public = no -; writable = no -; printable = yes - -# A private directory, usable only by Fred. Note that Fred requires write -# access to the directory. -;[fredsdir] -; comment = Fred's Service -; path = /usr/somewhere/private -; valid users = fred -; public = no -; writable = yes -; printable = no - -# a service which has a different directory for each machine that connects -# this allows you to tailor configurations to incoming machines. You could -# also use the %u option to tailor it by user name. -# The %m gets replaced with the machine name that is connecting. -;[pchome] -; comment = PC Directories -; path = /usr/pc/%m -; public = no -; writable = yes - -# A publicly accessible directory, read/write to all users. Note that all files -# created in the directory by users will be owned by the default user, so -# any user with access can delete any other user's files. Obviously this -# directory must be writable by the default user. Another user could of course -# be specified, in which case all files would be owned by that user instead. -;[public] -; path = /usr/somewhere/else/public -; public = yes -; only guest = yes -; writable = yes -; printable = no - -# The following two entries demonstrate how to share a directory so that two -# users can place files there that will be owned by the specific users. In this -# setup, the directory should be writable by both users and should have the -# sticky bit set on it to prevent abuse. Obviously this could be extended to -# as many users as required. -;[myshare] -; comment = Mary's and Fred's stuff -; path = /usr/somewhere/shared -; valid users = mary fred -; public = no -; writable = yes -; printable = no -; create mask = 0765 - diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/smbusers --- a/net-fs/samba/files/config-3.3/smbusers Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -# Unix_name = SMB_name1 SMB_name2 ... -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/smbusers,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ -root = administrator admin -nobody = guest pcguest smbguest diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/swat.xinetd --- a/net-fs/samba/files/config-3.3/swat.xinetd Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# default: off -# description: SWAT is the Samba Web Admin Tool. Use swat \ -# to configure your Samba server. To use SWAT, \ -# connect to port 901 with your favorite web browser. -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/swat.xinetd,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ - -service swat -{ - port = 901 - socket_type = stream - wait = no - only_from = localhost - user = root - server = /usr/sbin/swat - log_on_failure += USERID - disable = yes -} diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/config-3.3/system-auth-winbind --- a/net-fs/samba/files/config-3.3/system-auth-winbind Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -#%PAM-1.0 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/config-3.2/system-auth-winbind,v 1.1 2008/03/08 12:24:12 dev-zero Exp $ - -auth required pam_env.so -auth sufficient pam_winbind.so -auth sufficient pam_unix.so likeauth nullok use_first_pass -auth required pam_deny.so - -account sufficient pam_winbind.so -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok use_authtok md5 shadow -password required pam_deny.so - -session required pam_mkhomedir.so skel=/etc/skel/ umask=0022 -session required pam_limits.so -session required pam_unix.so diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/samba-conf --- a/net-fs/samba/files/samba-conf Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -#add "winbind" to the daemon_list if you also want winbind to start -daemon_list="smbd nmbd" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -my_service_name="samba" -my_service_PRE="unset TMP TMPDIR" -my_service_POST="" - -#---------------------------------------------------------------------------- -# Daemons calls: _ -#---------------------------------------------------------------------------- -smbd_start_options="-D" -smbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- ${smbd_start_options}" -smbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/samba/smbd.pid" -smbd_reload="killall -HUP smbd" - -nmbd_start_options="-D" -nmbd_start="start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- ${nmbd_start_options}" -nmbd_stop="start-stop-daemon --stop --quiet --pidfile /var/run/samba/nmbd.pid" -nmbd_reload="killall -HUP nmbd" - -winbind_start_options="" -winbind_start="start-stop-daemon --start --quiet --exec /usr/sbin/winbindd -- ${winbind_start_options}" -winbind_stop="start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/winbindd" -winbind_reload="killall -HUP winbindd" - diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/samba-init --- a/net-fs/samba/files/samba-init Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba-init,v 1.17 2007/09/11 22:55:08 uberlord Exp $ - -opts="reload" - -depend() { - after slapd - need net - use cupsd -} - -DAEMONNAME="${SVCNAME##samba.}" -[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME} - -signal_do() { - local signal="$1" - [ -z "${signal}" ] && return 0 - - local result=0 last_result=0 daemon= cmd_exec= - for daemon in ${daemon_list} ; do - eval cmd_exec=\$${daemon}_${signal} - if [ -n "${cmd_exec}" ]; then - ebegin "${my_service_name} -> ${signal}: ${daemon}" - #echo ${cmd} '->' ${!cmd} - ${cmd_exec} > /dev/null - last_result=$? - eend ${last_result} - fi - result=$(( ${result} + ${last_result} )) - done - return ${result} -} -start() { - ${my_service_PRE} - signal_do start && return 0 - - eerror "Error: starting services (see system logs)" - signal_do stop - return 1 -} -stop() { - ${my_service_PRE} - if signal_do stop ; then - ${my_service_POST} - return 0 - fi -} -reload() { - ${my_service_PRE} - signal_do reload -} diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/files/samba-xinetd --- a/net-fs/samba/files/samba-xinetd Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -# Samba smb service with ipv6 support (for samba3) -# Remember to stop samba service starting smbd before you activate this. -service microsoft-ds -{ - flags = REUSE IPV6 - socket_type = stream - wait = no - user = root - server = /usr/sbin/smbd - log_on_failure += USERID - disable = yes -} diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/metadata.xml --- a/net-fs/samba/metadata.xml Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - -samba - - samba@gentoo.org - Samba Team - - -Samba is an Open Source/Free Software suite that provides seamless file and print services to SMB/CIFS clients. Integration with various accounting and antivirus backends. License: GNU General Public License. - - - Enable Active Directory support - Enables asynchronous input/output - Enables automount support - Enables support for the OpenAntiVirus plugins - Enables support for user quotas - Enables support for swat configuration gui - Enables support for the winbind auth daemon - - diff -r ae604915eca9 -r 24790a7e3ea2 net-fs/samba/samba-3.3.6.ebuild --- a/net-fs/samba/samba-3.3.6.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,265 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.2.0_rc2.ebuild,v 1.1 2008/06/12 12:10:25 dev-zero Exp $ - -inherit eutils pam multilib versionator confutils - -MY_P=${PN}-${PV/_/} - -DESCRIPTION="A suite of SMB and CIFS client/server programs for UNIX" -HOMEPAGE="http://www.samba.org/" -SRC_URI="mirror://samba/${MY_P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE_LINGUAS="linguas_ja linguas_pl" -IUSE="${IUSE_LINGUAS} acl ads async automount caps cups doc examples ipv6 kernel_linux ldap fam - pam quotas readline selinux swat syslog winbind" - -RDEPEND="dev-libs/popt - dev-libs/iniparser - virtual/libiconv - acl? ( kernel_linux? ( sys-apps/acl ) ) - cups? ( net-print/cups ) - ipv6? ( sys-apps/xinetd ) - ads? ( virtual/krb5 sys-fs/e2fsprogs ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - readline? ( sys-libs/readline ) - selinux? ( sec-policy/selinux-samba ) - swat? ( sys-apps/xinetd ) - syslog? ( virtual/logger ) - fam? ( virtual/fam ) - caps? ( sys-libs/libcap )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" -CONFDIR="${FILESDIR}/config-3.3" -PRIVATE_DST=/var/lib/samba/private - -# Tests are currently broken due to hardcoded paths (due to --with-fhs) -# The problem is that --without-fhs lets samba use lockdir (which can be changed in smb.conf) -# which is wrong as well. -RESTRICT="test" - -pkg_setup() { - confutils_use_depend_all ads ldap -} - -src_unpack() { - unpack ${A} - cd "${S}/source" - - # Ok, agreed, this is ugly. But it avoids a patch we - # need for every samba version and we don't need autotools - sed -i \ - -e 's|"lib32" ||' \ - -e 's|if test -d "$i/$l" ;|if test -d "$i/$l" -o -L "$i/$l";|' \ - configure || die "sed failed" - - rm "${S}/docs/manpages"/{mount,umount}.cifs.8 - - sed -i \ - -e 's|tdbsam|tdbsam:${PRIVATEDIR}/passdb.tdb|' \ - "${S}/source/script/tests/selftest.sh" || die "sed failed" -} - -src_compile() { - cd "${S}/source" - - local myconf - local mylangs - local mymod_shared - - use winbind && mymod_shared="--with-shared-modules=idmap_rid" - if use ldap ; then - myconf="${myconf} $(use_with ads)" - use winbind && mymod_shared="${mymod_shared},idmap_ad" - fi - - [[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie" - use hppa && myconf="${myconf} --disable-pie" - - use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no - - # Otherwise we get the whole swat stuff installed - if ! use swat ; then - sed -i \ - -e 's/^\(install:.*\)installswat \(.*\)/\1\2/' \ - Makefile.in || die "sed failed" - fi - - econf \ - --with-fhs \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-modulesdir=/usr/$(get_libdir)/samba \ - --with-pammodulesdir=$(getpam_mod_dir) \ - --with-swatdir=/usr/share/doc/${PF}/swat \ - --with-piddir=/var/run/samba \ - --with-lockdir=/var/cache/samba \ - --with-logfilebase=/var/log/samba \ - --with-privatedir=${PRIVATE_DST} \ - --with-libsmbclient \ - --enable-socket-wrapper \ - --enable-nss-wrapper \ - --with-cifsmount=no \ - $(use_with acl acl-support) \ - $(use_with async aio-support) \ - $(use_with automount) \ - $(use_enable cups) \ - $(use_enable fam) \ - $(use_with ads krb5) \ - $(use_with ads dnsupdate) \ - $(use_with ldap) \ - $(use_with pam) $(use_with pam pam_smbpass) \ - $(use_with quotas) $(use_with quotas sys-quotas) \ - $(use_with readline) \ - $(use_with syslog) \ - $(use_with winbind) \ - ${myconf} ${mylangs} ${mymod_shared} || die "econf failed" - - emake proto || die "emake proto failed" - emake everything || die "emake everything failed" - -} - -src_test() { - cd "${S}/source" - emake test || die "tests failed" -} - -src_install() { - cd "${S}/source" - - emake DESTDIR="${D}" install-everything || die "emake install-everything failed" - - # Extra rpctorture progs - local extra_bins="rpctorture" - for i in ${extra_bins} ; do - [[ -x "${S}/bin/${i}" ]] && dobin "${S}/bin/${i}" - done - - # remove .old stuff from /usr/bin: - rm -f "${D}"/usr/bin/*.old - - # Removing executable bits from header-files - fperms 644 /usr/include/libsmbclient.h - - # Nsswitch extensions. Make link for wins and winbind resolvers - if use winbind ; then - dolib.so nsswitch/libnss_wins.so - dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2 - dolib.so nsswitch/libnss_winbind.so - dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2 - fi - - # make the smb backend symlink for cups printing support (bug #133133) - if use cups ; then - dodir $(cups-config --serverbin)/backend - dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb - fi - - cd "${S}/source" - - # General config files - insinto /etc/samba - doins "${CONFDIR}"/{smbusers,lmhosts} - newins "${CONFDIR}/smb.conf.example-samba3" smb.conf.example - - newpamd "${CONFDIR}/samba.pam" samba - use winbind && dopamd "${CONFDIR}/system-auth-winbind" - if use swat ; then - insinto /etc/xinetd.d - newins "${CONFDIR}/swat.xinetd" swat - else - rm -f "${D}/usr/sbin/swat" - rm -f "${D}/usr/share/man/man8/swat.8" - fi - - newinitd "${FILESDIR}/samba-init" samba - newconfd "${FILESDIR}/samba-conf" samba - - if use ldap ; then - insinto /etc/openldap/schema - doins "${S}/examples/LDAP/samba.schema" - fi - - if use ipv6 ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/samba-xinetd" smb - fi - - # dirs - diropts -m0700 ; keepdir "${PRIVATE_DST}" - diropts -m1777 ; keepdir /var/spool/samba - - diropts -m0755 - keepdir /var/{log,run,cache}/samba - keepdir /var/lib/samba/{netlogon,profiles} - keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR} - keepdir /usr/$(get_libdir)/samba/{rpc,idmap,auth} - - # docs - dodoc "${FILESDIR}/README.gentoo" - dodoc "${S}"/{MAINTAINERS,README,Roadmap,WHATSNEW.txt} - dodoc "${CONFDIR}/nsswitch.conf-wins" - use winbind && dodoc "${CONFDIR}/nsswitch.conf-winbind" - - if use examples ; then - insinto /usr/share/doc/${PF} - doins -r "${S}/examples/" - find "${D}/usr/share/doc/${PF}" -type d -print0 | xargs -0 chmod 755 - find "${D}/usr/share/doc/${PF}/examples" ! -type d -print0 | xargs -0 chmod 644 - fi - - if ! use doc ; then - if ! use swat ; then - rm -rf "${D}/usr/share/doc/${PF}/swat" - else - rm -rf "${D}/usr/share/doc/${PF}/swat/help"/{guide,howto,devel} - rm -rf "${D}/usr/share/doc/${PF}/swat/using_samba" - fi - fi - -} - -pkg_preinst() { - local PRIVATE_SRC=/etc/samba/private - if [[ ! -r "${ROOT}/${PRIVATE_DST}/secrets.tdb" \ - && -r "${ROOT}/${PRIVATE_SRC}/secrets.tdb" ]] ; then - ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/" - mkdir -p "${D}/${PRIVATE_DST}" - cp -pPRf "${ROOT}/${PRIVATE_SRC}"/* "${D}/${PRIVATE_DST}/" - eend $? - fi - - if [[ ! -f "${ROOT}/etc/samba/smb.conf" ]] ; then - touch "${D}/etc/samba/smb.conf" - fi -} - -pkg_postinst() { - if use swat ; then - einfo "swat must be enabled by xinetd:" - einfo " change the /etc/xinetd.d/swat configuration" - fi - - if use ipv6 ; then - einfo "ipv6 support must be enabled by xinetd:" - einfo " change the /etc/xinetd.d/smb configuration" - fi - - elog "It is possible to start/stop daemons separately:" - elog " Create a symlink from /etc/init.d/samba.{smbd,nmbd,winbind} to" - elog " /etc/init.d/samba. Calling /etc/init.d/samba directly will start" - elog " the daemons configured in /etc/conf.d/samba" - - elog "The mount/umount.cifs helper applications are not included anymore." - elog "Please install net-fs/mount-cifs instead." - - ewarn "If you're upgrading from 3.0.24 or earlier, please make sure to" - ewarn "restart your clients to clear any cached information about the server." - ewarn "Otherwise they might not be able to connect to the volumes." -} diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/rabbitmq-server/Manifest --- a/net-misc/rabbitmq-server/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ b/net-misc/rabbitmq-server/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -1,3 +1,3 @@ AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c -DIST rabbitmq-server-1.6.0.tar.gz 130616 RMD160 d6c9de4e1fb48c6ceb1cb5d717ca2afb5e3266fe SHA1 1834c670d076fa9878223aacaa35a5a6528f1d86 SHA256 0a6e0f6b41548906b07f51be1651e8c05b3621f1c238e7969ef1dc40c47a7a0a -EBUILD rabbitmq-server-1.6.0.ebuild 1664 RMD160 c5d95edef457441d79702f3a29e4c6493a77078b SHA1 17188dc82f1b23645f5092960519dbc86848589c SHA256 ffcba324a2f47c2847f5e11bd12cd536b52782f9ac7e9238e07a3944cb53c43b +DIST rabbitmq-server-1.7.0.tar.gz 143252 RMD160 092f90946825cc3eb277019805e24db637a559f4 SHA1 84fb86d403057bb808c1b51deee0c1fca3bf7bef SHA256 a73c25ff0e725a2b9afb37e3796ad46c32f5f6c097091f6c0e40ccc878db9e4a +EBUILD rabbitmq-server-1.7.0.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638 diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/rabbitmq-server/rabbitmq-server-1.6.0.ebuild --- a/net-misc/rabbitmq-server/rabbitmq-server-1.6.0.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r1.ebuild,v 1.2 2009/04/23 03:37:16 mr_bones_ Exp $ - -inherit eutils - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." -HOMEPAGE="http://www.rabbitmq.com/" -SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Q: is RDEPEND-only sufficient for a binary package, since we don't compile? -DEPEND="dev-lang/erlang" -RDEPEND="${DEPEND}" - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" - - einfo "Correcting additional Erlang code path in scripts" - sed -i -e "s:\`dirname \$0\`\/..\/ebin:${targetdir}:g" scripts/* || die "sed failed" - - einfo "Installing Erlang module to ${targetdir}" - dodir "${targetdir}" - cp -dpR ebin include "${D}/${targetdir}" - - einfo "Installing server scripts to /usr/sbin" - # Install server scripts to sbin - dosbin scripts/rabbitmq-multi scripts/rabbitmq-server - - einfo "Installing rabbitmqctl to /usr/bin" - # Install control script to bin - dobin scripts/rabbitmqctl - - # Docs - dodoc README - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - dodir /var/lib/rabbitmq/mnesia - - # Install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq -} - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 -1 rabbitmq -} diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/rabbitmq-server-1.7.0.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,58 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $ + +inherit eutils + +DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." +HOMEPAGE="http://www.rabbitmq.com/" +SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# Q: is RDEPEND-only sufficient for a binary package, since we don't compile? +DEPEND="dev-lang/erlang + dev-python/simplejson" +RDEPEND="${DEPEND}" + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" + + einfo "Correcting additional Erlang code path in scripts" + sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed" + + einfo "Installing Erlang module to ${targetdir}" + dodir "${targetdir}" + cp -dpR ebin include "${D}/${targetdir}" + + einfo "Installing server scripts to /usr/sbin" + # Install server scripts to sbin + dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \ + scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins + + einfo "Installing rabbitmqctl to /usr/bin" + # Install control script to bin + dobin scripts/rabbitmqctl + + # Docs + dodoc README + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq + + # create the mnesia directory + diropts -m 0770 -o rabbitmq -g rabbitmq + dodir /var/lib/rabbitmq/mnesia + + # Install the init script + newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq +} + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 -1 rabbitmq +} diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/zmq/Manifest --- a/net-misc/zmq/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ b/net-misc/zmq/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -1,2 +1,2 @@ -DIST zmq-0.6.1.tar.gz 700331 RMD160 2de62f6ea0c38eb133157d39d13273ea988d5ca4 SHA1 b0f1edf1ea33adde5751c4b24359e9ebce40e554 SHA256 382f478e9806ac4d7b94244f6f7fc3697e53a17d779cc9db4e3f57dd41d6eab5 -EBUILD zmq-0.6.1.ebuild 1083 RMD160 e2289a32e90db7832116834999fd3ba2621bbec5 SHA1 8854d35583d81f38f935ff52e1cfbc243e39332a SHA256 97a1caf1389ff457cd60f909dd4cf7cd44973d992938764bd7b55be08d03cc02 +DIST zmq-1.0.0.tar.gz 1000538 RMD160 2a739a6ecbbf89940d9ef63802f08b19032c2210 SHA1 2013d8739ab03b14f28f46a355171d9680c27b20 SHA256 c6d13da3cc3430d6cab9f8b918d35f93c22397d1f02b7cc241fb3dae6bbfbc3c +EBUILD zmq-1.0.0.ebuild 1083 RMD160 e2289a32e90db7832116834999fd3ba2621bbec5 SHA1 8854d35583d81f38f935ff52e1cfbc243e39332a SHA256 97a1caf1389ff457cd60f909dd4cf7cd44973d992938764bd7b55be08d03cc02 diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/zmq/zmq-0.6.1.ebuild --- a/net-misc/zmq/zmq-0.6.1.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils flag-o-matic - -DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance." -HOMEPAGE="http://www.zeromq.org/" -SRC_URI="http://www.zeromq.org/local--files/area:download/${P}.tar.gz" -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~x86" -IUSE="amqp c examples java profile python ruby" -#DEPEND="" -#RDEPEND="${DEPEND}" - -src_compile() { - -# TODO: -# --with-perf build performance tests [default=no] -# --with-butterfly build butterfly example [default=no] -# --with-camera build camera example [default=no] -# --with-exchange build exchange example [default=no] -# --with-chat build chatroom example [default=no] -# --with-ruby build Ruby language binding [default=no] - - econf \ - $(use_with amqp) \ - $(use_with c) \ - $(use_with java) \ - $(use_with python) - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff -r ae604915eca9 -r 24790a7e3ea2 net-misc/zmq/zmq-1.0.0.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/zmq/zmq-1.0.0.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,38 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit eutils flag-o-matic + +DESCRIPTION="ZeroMQ is a brokerless messaging kernel with extremely high performance." +HOMEPAGE="http://www.zeromq.org/" +SRC_URI="http://www.zeromq.org/local--files/area:download/${P}.tar.gz" +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~x86" +IUSE="amqp c examples java profile python ruby" +#DEPEND="" +#RDEPEND="${DEPEND}" + +src_compile() { + +# TODO: +# --with-perf build performance tests [default=no] +# --with-butterfly build butterfly example [default=no] +# --with-camera build camera example [default=no] +# --with-exchange build exchange example [default=no] +# --with-chat build chatroom example [default=no] +# --with-ruby build Ruby language binding [default=no] + + econf \ + $(use_with amqp) \ + $(use_with c) \ + $(use_with java) \ + $(use_with python) + + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" +} diff -r ae604915eca9 -r 24790a7e3ea2 sys-fs/ntfs3g/Manifest --- a/sys-fs/ntfs3g/Manifest Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -AUX 10-ntfs3g.fdi 397 RMD160 a09440a0d239db40ce7c6cada0008e425a0a5dc7 SHA1 d26af4f1dcdfad6da384b0e706c79a629fa893dd SHA256 bceb8474647e9dd8a1740d3d3af559cbd9f5ad428f335606f44f87b17c712de7 -DIST ntfs-3g-1.5130.tgz 649883 RMD160 173b1c7e3a94d440ecaa19d97980ba6f3228e33e SHA1 02b7a874b02827665c97123c6335e1d856054c42 SHA256 a456973a4b44c8fa1b63214425edfd1a72fd7b26ab40d25a4372e2a4f3ac4057 -EBUILD ntfs3g-1.5130.ebuild 1278 RMD160 cb81bae446250f7f88ee77aa51c6da7201980d95 SHA1 65789307d54ec097e4eab738fb6c757fddb9fb40 SHA256 13e5ad5cc6eb5be95bccc05b4a9747ea9cf38ee854564e5cf8009c7756d5f476 -MISC metadata.xml 641 RMD160 361ae848a3012a236c512a5cfc71cc96026ba072 SHA1 9cc731cc7093ad04c8a3199948f24b2c5ff2cadb SHA256 bb0e59a4fde05b0fbad22547a263d7ef98bb5809fd00bf14c0d4d2c89cab05ed diff -r ae604915eca9 -r 24790a7e3ea2 sys-fs/ntfs3g/files/10-ntfs3g.fdi --- a/sys-fs/ntfs3g/files/10-ntfs3g.fdi Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ - - - - - ntfs-3g - ntfs-3g - locale= - - - diff -r ae604915eca9 -r 24790a7e3ea2 sys-fs/ntfs3g/metadata.xml --- a/sys-fs/ntfs3g/metadata.xml Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - - no-herd - - chutzpah@gentoo.org - Patrick McLean - - -The ntfs-3g driver is an open source, GPL licensed, third generation Linux -NTFS driver for 32-bit, little-endian architectures which was implemented -by the Linux-NTFS project. It provides full read-write access to NTFS, -excluding access to encrypted files, writing compressed files, changing -file ownership, access right. - - diff -r ae604915eca9 -r 24790a7e3ea2 sys-fs/ntfs3g/ntfs3g-1.5130.ebuild --- a/sys-fs/ntfs3g/ntfs3g-1.5130.ebuild Thu Nov 19 03:54:53 2009 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-1.5012.ebuild,v 1.1 2008/10/23 14:23:59 chutzpah Exp $ - -MY_PN="${PN/3g/-3g}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Open source read-write NTFS driver that runs under FUSE" -HOMEPAGE="http://www.ntfs-3g.org" -SRC_URI="http://www.ntfs-3g.org/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug hal suid" - -RDEPEND="hal? ( sys-apps/hal )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_compile() { - econf \ - --docdir="/usr/share/doc/${PF}" \ - --enable-ldscript \ - --disable-ldconfig \ - $(use_enable debug) - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - prepalldocs - dodoc AUTHORS ChangeLog CREDITS - - use suid && fperms u+s "/bin/${MY_PN}" - - if use hal; then - insinto /etc/hal/fdi/policy/ - doins "${FILESDIR}/10-ntfs3g.fdi" - fi -} - -pkg_postinst() { - if use suid; then - ewarn - ewarn "You have chosen to install ${PN} with the binary setuid root. This" - ewarn "means that if there any undetected vulnerabilities in the binary," - ewarn "then local users may be able to gain root access on your machine." - ewarn - fi -} diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-base/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-base/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,2 @@ +EBUILD postgresql-base-8.4.ebuild 551 RMD160 84bff8adca5eabdad72f69d06a6f5339e388a398 SHA1 cc54778a2d4923c5291ddaf31be363a2b095cb29 SHA256 d2649b8bf042b8cacdcab4748fe6dfe52380cf795b8fda28b04987fc71dfad8d +MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-base/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-base/metadata.xml Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,5 @@ + + + + postgresql + diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-base/postgresql-base-8.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-base/postgresql-base-8.4.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,16 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-base/postgresql-base-8.3.ebuild,v 1.3 2009/05/03 11:55:40 armin76 Exp $ + +EAPI="1" + +DESCRIPTION="Virtual for PostgreSQL base (clients + libraries)" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="" + +LICENSE="as-is" +SLOT="${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="|| ( =dev-db/libpq-${PV}* dev-db/postgresql-base:${SLOT} )" diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-server/Manifest --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-server/Manifest Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,2 @@ +EBUILD postgresql-server-8.4.ebuild 540 RMD160 73f13a3a927bf285f197dc66f6c6434adff23ef8 SHA1 b6a4cf82a520cf9ffe4de26094a2fc66da8fc9bc SHA256 9799e24f6530b49356a31f15fac2d34b2f62dba8ad733d393af436efb9eff80e +MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-server/metadata.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-server/metadata.xml Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,5 @@ + + + + postgresql + diff -r ae604915eca9 -r 24790a7e3ea2 virtual/postgresql-server/postgresql-server-8.4.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/virtual/postgresql-server/postgresql-server-8.4.ebuild Tue Nov 24 15:34:46 2009 +0100 @@ -0,0 +1,16 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/postgresql-server/postgresql-server-8.3.ebuild,v 1.2 2008/05/19 07:13:12 dev-zero Exp $ + +EAPI="1" + +DESCRIPTION="Virtual for PostgreSQL libraries" +HOMEPAGE="http://www.postgresql.org/" +SRC_URI="" + +LICENSE="as-is" +SLOT="${PV}" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="" + +RDEPEND="|| ( =dev-db/postgresql-${PV}* dev-db/postgresql-server:${SLOT} )"