From 46621ebffd7c9bb9e167e81e61dadc2c190aaa01 Mon Sep 17 00:00:00 2001 From: Gustavo Felisberto Date: Thu, 29 Jul 2004 22:31:26 +0000 Subject: removing shaper module --- net-ftp/proftpd/ChangeLog | 6 +- net-ftp/proftpd/Manifest | 25 ++-- net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1-r1 | 2 - net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 | 1 + net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild | 151 --------------------- net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild | 151 +++++++++++++++++++++ 6 files changed, 169 insertions(+), 167 deletions(-) delete mode 100644 net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1-r1 create mode 100644 net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 delete mode 100644 net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild create mode 100644 net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild (limited to 'net-ftp/proftpd') diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index bf2b4e0975e9..fb53b3940688 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.66 2004/07/14 14:09:24 humpback Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.67 2004/07/29 22:31:26 humpback Exp $ + + 29 Jul 2004; Gustavo Felisberto ; + -proftpd-1.2.10_rc1-r1.ebuild: + Removing the shaper module because it causes strange problems. *proftpd-1.2.10_rc3 (14 Jul 2004) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index d2919bfb3a7e..fdc4157ba2d9 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,19 +1,18 @@ -MD5 e918b040fef86b28ba4c131b7d3f45a3 proftpd-1.2.8.ebuild 2730 -MD5 37ca3406d906aa2f2057c8a8a7e3cde6 proftpd-1.2.10_rc1-r1.ebuild 3966 -MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662 -MD5 227534f14855bb7c571722be759c3435 proftpd-1.2.10_rc3.ebuild 3963 -MD5 0a106ecf6fee0a1739ebe28c455ea366 ChangeLog 10894 +MD5 7216650a43c99b76b23f258e2f9b0c62 ChangeLog 11050 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401 +MD5 c375daa933ba6b448d9c11d25b2b5ece proftpd-1.2.10_rc3-r1.ebuild 3974 +MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662 +MD5 e918b040fef86b28ba4c131b7d3f45a3 proftpd-1.2.8.ebuild 2730 MD5 0a384134b6e4e25530a282c546dfe97e proftpd-1.2.9-r2.ebuild 3437 -MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434 -MD5 b661e60d03ab2327388f6ea3b8159fed files/digest-proftpd-1.2.10_rc3 145 -MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731 -MD5 e6331bfbeaeb23c239376373955082d6 files/digest-proftpd-1.2.10_rc1-r1 145 -MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704 +MD5 227534f14855bb7c571722be759c3435 proftpd-1.2.10_rc3.ebuild 3963 +MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974 +MD5 dbf77a47ac02f269794bae3903498893 files/digest-proftpd-1.2.10_rc3-r1 70 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66 +MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275 -MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295 +MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434 MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588 -MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66 -MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974 +MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704 +MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731 +MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1-r1 deleted file mode 100644 index 8c84151f65bd..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 fefde742d34b573fab56d9acbac45593 proftpd-1.2.10rc1.tar.bz2 908722 -MD5 0745b02d8e336aa71b8bfc4289f6df8e proftpd-mod-shaper-0.5.2.tar.gz 17377 diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 new file mode 100644 index 000000000000..ca7350921c95 --- /dev/null +++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10_rc3-r1 @@ -0,0 +1 @@ +MD5 d834bb822816a2ce483cc2ef1a9533e7 proftpd-1.2.10rc3.tar.bz2 918385 diff --git a/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild deleted file mode 100644 index 32d49da335c4..000000000000 --- a/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc1-r1.ebuild,v 1.3 2004/07/15 00:03:01 agriffis Exp $ - -inherit flag-o-matic eutils - -IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd" - -MY_P=${P/_/} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="An advanced and very configurable FTP server" -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2 - shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.2.tar.gz" -HOMEPAGE="http://www.proftpd.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64" - -DEPEND="pam? ( >=sys-libs/pam-0.75 ) - mysql? ( >=dev-db/mysql-3.23.26 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - postgres? ( >=dev-db/postgresql-7.3 ) - ssl? ( >=dev-libs/openssl-0.9.6f ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )" - -src_unpack() { - unpack ${MY_P}.tar.bz2 - cd ${S} - if use shaper; then - unpack ${PN}-mod-shaper-0.5.2.tar.gz - mv mod_shaper/mod_shaper.c contrib/ - fi -} - -src_compile() { - local modules myconf - - modules="mod_ratio:mod_readme" - use pam && modules="${modules}:mod_auth_pam" - use tcpd && modules="${modules}:mod_wrap" - use shaper && modules="${modules}:mod_shaper" - - if use ldap; then - einfo ldap - modules="${modules}:mod_ldap" - append-ldflags "-lresolv" - fi - - if use ssl; then - einfo ssl - # enable mod_tls - modules="${modules}:mod_tls" - fi - - if use mysql && use postgres - then - ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules." - ewarn "Presently this ebuild defaults to mysql. If you would like to" - ewarn "change the default behaviour, merge ProFTPD with;" - ewarn "USE=\"-mysql postgres\" emerge proftpd" - sleep 5 - fi - - if use mysql; then - modules="${modules}:mod_sql:mod_sql_mysql" - myconf="--with-includes=/usr/include/mysql" - elif use postgres; then - modules="${modules}:mod_sql:mod_sql_postgres" - myconf="--with-includes=/usr/include/postgresql" - fi - - if use softquota; then - modules="${modules}:mod_quotatab" - if use mysql || use postgres; then - modules="${modules}:mod_quotatab_sql" - elif use ldap; then - modules="${modules}:mod_quotatab_file:mod_quotatab_ldap" - else - modules="${modules}:mod_quotatab_file" - fi - fi - - # New modules for 1.2.9 - # Not sure how these should be enabled yet as no use variables - # apply currently. Uncomment if you want to use them though. - # -raker 06/16/2003 - # - # modules="${modules}:mod_ifsession" - # modules="${modules}:mod_radius" - # modules="${modules}:mod_rewrite" - - # bug #30359 - use hardened && echo > lib/libcap/cap_sys.c - has_pic && echo > lib/libcap/cap_sys.c - - econf \ - --sbindir=/usr/sbin \ - --localstatedir=/var/run \ - --sysconfdir=/etc/proftpd \ - --enable-shadow \ - --disable-sendfile \ - --enable-autoshadow \ - --enable-ctrls \ - --with-modules=${modules} \ - ${myconf} $( use_enable ipv6 ) || die "bad ./configure" - - emake || die "compile problem" -} - -src_install() { - # Note rundir needs to be specified to avoid sandbox violation - # on initial install. See Make.rules - make DESTDIR=${D} install || die - - keepdir /home/ftp - keepdir /var/run/proftpd - - dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \ - COPYING CREDITS ChangeLog NEWS README* \ - doc/{license.txt,GetConf} - dohtml doc/*.html - use shaper && dohtml mod_shaper/mod_shaper.html - docinto rfc - dodoc doc/rfc/*.txt - - mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib - - insinto /etc/proftpd - newins ${FILESDIR}/proftpd.conf proftpd.conf.sample - - if use pam; then - insinto /etc/pam.d - newins ${S}/contrib/dist/rpm/ftp.pamd ftp - fi - - insinto /etc/xinetd.d - newins ${FILESDIR}/proftpd.xinetd proftpd - - exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd -} - -pkg_postinst() { - groupadd proftpd &>/dev/null - id proftpd &>/dev/null || \ - useradd -g proftpd -d /home/ftp -s /bin/false proftpd - einfo - einfo 'You can find the config files in /etc/proftpd' - einfo -} diff --git a/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild new file mode 100644 index 000000000000..cb0a0d63c2e7 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10_rc3-r1.ebuild,v 1.1 2004/07/29 22:31:26 humpback Exp $ + +inherit flag-o-matic eutils + +IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd" + +MY_P=${P/_/} +S=${WORKDIR}/${MY_P} + +DESCRIPTION="An advanced and very configurable FTP server" +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2" +# shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.2.tar.gz" +HOMEPAGE="http://www.proftpd.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64" + +DEPEND="pam? ( >=sys-libs/pam-0.75 ) + mysql? ( >=dev-db/mysql-3.23.26 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + postgres? ( >=dev-db/postgresql-7.3 ) + ssl? ( >=dev-libs/openssl-0.9.6f ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )" + +src_unpack() { + unpack ${MY_P}.tar.bz2 + cd ${S} +# if use shaper; then +# unpack ${PN}-mod-shaper-0.5.2.tar.gz +# mv mod_shaper/mod_shaper.c contrib/ +# fi +} + +src_compile() { + local modules myconf + + modules="mod_ratio:mod_readme" + use pam && modules="${modules}:mod_auth_pam" + use tcpd && modules="${modules}:mod_wrap" +# use shaper && modules="${modules}:mod_shaper" + + if use ldap; then + einfo ldap + modules="${modules}:mod_ldap" + append-ldflags "-lresolv" + fi + + if use ssl; then + einfo ssl + # enable mod_tls + modules="${modules}:mod_tls" + fi + + if use mysql && use postgres + then + ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules." + ewarn "Presently this ebuild defaults to mysql. If you would like to" + ewarn "change the default behaviour, merge ProFTPD with;" + ewarn "USE=\"-mysql postgres\" emerge proftpd" + sleep 5 + fi + + if use mysql; then + modules="${modules}:mod_sql:mod_sql_mysql" + myconf="--with-includes=/usr/include/mysql" + elif use postgres; then + modules="${modules}:mod_sql:mod_sql_postgres" + myconf="--with-includes=/usr/include/postgresql" + fi + + if use softquota; then + modules="${modules}:mod_quotatab" + if use mysql || use postgres; then + modules="${modules}:mod_quotatab_sql" + elif use ldap; then + modules="${modules}:mod_quotatab_file:mod_quotatab_ldap" + else + modules="${modules}:mod_quotatab_file" + fi + fi + + # New modules for 1.2.9 + # Not sure how these should be enabled yet as no use variables + # apply currently. Uncomment if you want to use them though. + # -raker 06/16/2003 + # + # modules="${modules}:mod_ifsession" + # modules="${modules}:mod_radius" + # modules="${modules}:mod_rewrite" + + # bug #30359 + use hardened && echo > lib/libcap/cap_sys.c + has_pic && echo > lib/libcap/cap_sys.c + + econf \ + --sbindir=/usr/sbin \ + --localstatedir=/var/run \ + --sysconfdir=/etc/proftpd \ + --enable-shadow \ + --disable-sendfile \ + --enable-autoshadow \ + --enable-ctrls \ + --with-modules=${modules} \ + ${myconf} $( use_enable ipv6 ) || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + # Note rundir needs to be specified to avoid sandbox violation + # on initial install. See Make.rules + make DESTDIR=${D} install || die + + keepdir /home/ftp + keepdir /var/run/proftpd + + dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \ + COPYING CREDITS ChangeLog NEWS README* \ + doc/{license.txt,GetConf} + dohtml doc/*.html +# use shaper && dohtml mod_shaper/mod_shaper.html + docinto rfc + dodoc doc/rfc/*.txt + + mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib + + insinto /etc/proftpd + newins ${FILESDIR}/proftpd.conf proftpd.conf.sample + + if use pam; then + insinto /etc/pam.d + newins ${S}/contrib/dist/rpm/ftp.pamd ftp + fi + + insinto /etc/xinetd.d + newins ${FILESDIR}/proftpd.xinetd proftpd + + exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd +} + +pkg_postinst() { + groupadd proftpd &>/dev/null + id proftpd &>/dev/null || \ + useradd -g proftpd -d /home/ftp -s /bin/false proftpd + einfo + einfo 'You can find the config files in /etc/proftpd' + einfo +} -- cgit v1.2.3-65-gdbad