diff options
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 9 | ||||
| -rw-r--r-- | net-ftp/proftpd/Manifest | 7 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.2b.ebuild | 277 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.2c.ebuild | 277 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.3-r1.ebuild | 223 |
5 files changed, 233 insertions, 560 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 5d60a96c7fa0..a62873a3694d 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.230 2010/06/17 20:46:33 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.231 2010/06/23 13:37:01 voyageur Exp $ + +*proftpd-1.3.3-r1 (23 Jun 2010) + + 23 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org> + -proftpd-1.3.2b.ebuild, -proftpd-1.3.2c.ebuild, +proftpd-1.3.3-r1.ebuild: + Support newer mit-krb5, thanks Eray Aslan <eray.aslan@caf.com.tr> in bug + #324903 for the patch 17 Jun 2010; Patrick Lauer <patrick@gentoo.org> proftpd-1.3.2b.ebuild, proftpd-1.3.2c.ebuild, proftpd-1.3.2d.ebuild, proftpd-1.3.2e.ebuild, diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index df8fca4bdbb5..744207efe1cb 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -11,8 +11,6 @@ AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1b DIST mod_clamav-0.11rc.tar.gz 5115 RMD160 1b7f0bf94ed4664f873848e0fedee493f18726b8 SHA1 26fa4a8106fbb3266e7c94f50f12ed74fb2f3fec SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a DIST mod_gss-1.3.2.tar.gz 114142 RMD160 5dba4a716fd2abd99a83a7b263f53c07062ada9d SHA1 9f1c4530ba8ce9d96141bcb18cc123adbc04e505 SHA256 e66ee593628880e38bd0694ab256244c40fe80baa6663ea96003ce73b94e1336 DIST mod_gss-1.3.3.tar.gz 115098 RMD160 6a772ea215db7af94223fbb3bbb84614d1f7cf30 SHA1 b17015a49e41ee643f1891940f9f3f8a7d77e522 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e -DIST proftpd-1.3.2b.tar.bz2 2507569 RMD160 eac9ebe625c60b362d96965cc72a0fbb4e2479bb SHA1 facd51ff9c35fa8bf2959d2829da1304a63c646a SHA256 ac99969b0bb12f02098dcdf5c23d45c85b05ba2453b78f56fce5e7352d0ac192 -DIST proftpd-1.3.2c.tar.bz2 2536105 RMD160 0754e3e9a6915ca497924448899238d60226ca63 SHA1 d81c4b988fc70109a82804852378bfd6f28602a6 SHA256 4238ade6978ff578735b070667ff798ac10edf97af9d56d33528ebdc500916f9 DIST proftpd-1.3.2d.tar.bz2 2545428 RMD160 878f830b3dc1af9f630a8c527c8d132252daa592 SHA1 b02dacf74e3b5d4e510df67ea26063278176a690 SHA256 64be10d5190d3b596c04c04fa5764fd79ce212628b58e64a1ecbee743d17531f DIST proftpd-1.3.2e.tar.bz2 2545499 RMD160 31e814b7d009251bfa1a459066574c741309da4c SHA1 6e9bcb9d413e8c59c15de230346eada63399b2a3 SHA256 23fbb10b0f85a6141987dfd52010f7efdd723b84068964cb085cdfb97c0effdf DIST proftpd-1.3.3.tar.bz2 4132650 RMD160 01c9226f694129561dd35a03631c6a2b8bd593dc SHA1 ce7c1f96648f94e32d5d104cd1405e6778aae045 SHA256 793f2bde2ab5aeb86a68349118d87bb151ba1278987612b7a12872110f9d759c @@ -22,10 +20,9 @@ DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c7 DIST proftpd-mod-shaper-0.6.5.tar.gz 19175 RMD160 233f399c08c18514b0f23dcc3b0fd0d0670dca42 SHA1 7c841543e7ac3005c914b0f77670c94dc7a8d51f SHA256 dc69e352b0ffd7d76f4d08cad631b6401ed9a67447995f3ce47752e4fc69e935 DIST proftpd-mod-vroot-0.8.3.tar.gz 6999 RMD160 7a8d5a29e7c2754b774cebe649f8a28fc4bf9f85 SHA1 c5448ca0a7c2f1a73093ae6834f6516092cd1508 SHA256 ed3031d8330467e4c1ccb7a395b41a1d5628a89f4fcde80e3bb7ed62e987d85a DIST proftpd-mod-vroot-0.8.5.tar.gz 8349 RMD160 0e9c3ea9615ed74556fcaf6145863922ee45bedf SHA1 fea69382f4dda36b620780e69cef5872f41f86fe SHA256 305ad1e3b320dc21172982c54a614a09d43373f7289b63202788de640145bbd4 -EBUILD proftpd-1.3.2b.ebuild 8239 RMD160 ba4e68335f99cbd1e07992889ce699fd372b6386 SHA1 7128c162be0bebb2dcb9e27b05ed9094ccf5bc07 SHA256 1e29b7f7fd1d63d4b1e6f04e84b0ad7e5e1297c702427fca9889f6dcc1dd556f -EBUILD proftpd-1.3.2c.ebuild 8246 RMD160 a6dbc80973e2f2ddabc91bab494d2a499487161d SHA1 82cec7b1b5a32c5690032c4d8b41b14166b458ec SHA256 bf648aaebe53f43cc1db1aa3c1a3df94557e0ac1932ebaf5e75962e29a8baf1f EBUILD proftpd-1.3.2d.ebuild 8239 RMD160 41eda9307fe524840dafd90c876f0449005a03bd SHA1 48d13209cb678e29cdea67205ed8ea9e448ca389 SHA256 385a553eff793307305a4f10ecaf4b508341e47688d1a27b86d147e7c227da78 EBUILD proftpd-1.3.2e.ebuild 8246 RMD160 3e5d405db4d2da8daeed31e7853abda8a03dc032 SHA1 2781c8dec53c45ff47bb57e8172ead1352260725 SHA256 5830695bda8d099cf0e5d6984124b131eecb1fe49991af6561caee6bca7485e4 +EBUILD proftpd-1.3.3-r1.ebuild 7276 RMD160 d8a9357e896df752923fcf8d637f10632c510e94 SHA1 35f2ed96824739a475ea6690f6b31f0508d75ad8 SHA256 adc301d288ea9ce7a4c4960598f5fdd2e915fb6eea674a53a4755210721c0bfd EBUILD proftpd-1.3.3.ebuild 7087 RMD160 1f93876a995e5caf2145f8a03047de839ba8b507 SHA1 d03bf525d997c485226186f3a4cb901165c73723 SHA256 54eb92d72aaea49232ce31da936c14cd80cdec8de64201fe03b671b7478f93d8 -MISC ChangeLog 39034 RMD160 d29c257804d324912a5b35f604fbdf3b6df620d4 SHA1 5ac6e91c246ed6bd99ec10e74a9ad5987e2eead0 SHA256 caeef8642c14b9c3d67e10faab2478c291a18b30b0783152706381df96613004 +MISC ChangeLog 39299 RMD160 f5888e3ac460a54562007eaaa57598bece01a61b SHA1 1dea6eeebd08d5f07254b3a37f86e91a3ca68da8 SHA256 846c5551034e4afdd15a7f8ff3859fb9d970ddceed2a718f4d6417167e4c2002 MISC metadata.xml 1812 RMD160 79f9109e0364ddcff30da3f86af3c889f4ea1cee SHA1 dacd8d433d5f42e4dd7b6cb33ec9131f07abd98b SHA256 313c3786f11cc6311966be048d4290cf363e46c5e7dc31b5ed6890c7071efdbf diff --git a/net-ftp/proftpd/proftpd-1.3.2b.ebuild b/net-ftp/proftpd/proftpd-1.3.2b.ebuild deleted file mode 100644 index 07cd07095549..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.2b.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2b.ebuild,v 1.8 2010/06/17 20:46:33 patrick Exp $ - -inherit eutils flag-o-matic toolchain-funcs autotools - -KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86" - -IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd" - -CASE_VER="0.3" -CLAMAV_VER="0.11rc" -DEFLATE_VER="0.4" -MODGSS_VER="1.3.2" -SHAPER_VER="0.6.5" -VROOT_VER="0.8.3" - -DESCRIPTION="An advanced and very configurable FTP server." - -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 - case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz ) - clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz ) - deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz ) - kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MODGSS_VER}.tar.gz ) - shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz ) - vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )" - -HOMEPAGE="http://www.proftpd.org/ - http://www.castaglia.org/proftpd/ - http://www.thrallingpenguin.com/resources/mod_clamav.htm - http://gssmod.sourceforge.net" - -SLOT="0" -LICENSE="GPL-2" - -DEPEND="acl? ( sys-apps/acl sys-apps/attr ) - clamav? ( app-antivirus/clamav ) - kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) ) - ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( virtual/mysql ) - ncurses? ( sys-libs/ncurses ) - opensslcrypt? ( >=dev-libs/openssl-0.9.6f ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql-base ) - ssl? ( >=dev-libs/openssl-0.9.6f ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 ) - xinetd? ( virtual/inetd )" - -RDEPEND="${DEPEND} - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftpd )" - -S="${WORKDIR}/${P/_/}" - -pkg_setup() { - # Add the proftpd user to make the default config - # work out-of-the-box - enewgroup proftpd - enewuser proftpd -1 -1 -1 proftpd -} - -src_unpack() { - unpack ${P/_/}.tar.bz2 - cd "${S}" - - # Fix parallel build (committed upstream in 1.3.3rc1) - epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch - # Fix mysql include when both backends are enabled - epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch - # Do not use bundled libltdl when compiling mod_dso - epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch - - # Fix stripping of files - sed -e "s| @INSTALL_STRIP@||g" -i Make* - - if use case ; then - unpack ${PN}-mod-case-${CASE_VER}.tar.gz - cp -f mod_case/mod_case.c contrib/ - cp -f mod_case/mod_case.html doc/ - fi - - if use clamav ; then - unpack mod_clamav-${CLAMAV_VER}.tar.gz - cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/ - epatch mod_clamav-${CLAMAV_VER}/${PN}.patch - fi - - if use deflate ; then - unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz - cp -f mod_deflate/mod_deflate.c contrib/ - cp -f mod_deflate/mod_deflate.html doc/ - fi - - if use kerberos ; then - unpack mod_gss-${MODGSS_VER}.tar.gz - fi - - if use shaper ; then - unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz - cp -f mod_shaper/mod_shaper.c contrib/ - cp -f mod_shaper/mod_shaper.html doc/ - fi - - if use vroot ; then - unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz - cp -f mod_vroot/mod_vroot.c contrib/ - cp -f mod_vroot/mod_vroot.html doc/ - fi - - # Fix bug #221275 - # extract custom PR_ macros from aclocal.m4 to acinclude.m4 - # and delete the provided aclocal.m4 before running autoreconf - einfo "Extract custom m4 macros from aclocal.m4 ..." - sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4 - rm -f aclocal.m4 - - eautoreconf -} - -src_compile() { - addpredict /etc/krb5.conf - local modules myconf mylibs - - modules="mod_ratio:mod_readme:mod_ctrls_admin" - use acl && modules="${modules}:mod_facl" - use ban && modules="${modules}:mod_ban" - use case && modules="${modules}:mod_case" - use clamav && modules="${modules}:mod_clamav" - use deflate && modules="${modules}:mod_deflate" - use pam && modules="${modules}:mod_auth_pam" - use radius && modules="${modules}:mod_radius" - use rewrite && modules="${modules}:mod_rewrite" - use shaper && modules="${modules}:mod_shaper" - use sitemisc && modules="${modules}:mod_site_misc" - use ssl && modules="${modules}:mod_tls" - use tcpd && modules="${modules}:mod_wrap" - use vroot && modules="${modules}:mod_vroot" - - # pam needs to be explicitely disabled - use pam || myconf="${myconf} --enable-auth-pam=no" - - if use ldap ; then - modules="${modules}:mod_ldap" - mylibs="${mylibs} -lresolv" - use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS" - fi - - if use opensslcrypt ; then - myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl" - mylibs="${mylibs} -lcrypto" - CFLAGS="${CFLAGS} -DHAVE_OPENSSL" - fi - - use nls && myconf="${myconf} --enable-nls" - - if use mysql || use postgres ; then - modules="${modules}:mod_sql" - if use mysql ; then - modules="${modules}:mod_sql_mysql" - myconf="${myconf} --with-includes=/usr/include/mysql" - fi - if use postgres ; then - modules="${modules}:mod_sql_postgres" - myconf="${myconf} --with-includes=/usr/include/postgresql" - fi - fi - - if use softquota ; then - modules="${modules}:mod_quotatab" - if use mysql || use postgres ; then - modules="${modules}:mod_quotatab_sql" - fi - if use radius ; then - modules="${modules}:mod_quotatab_radius" - fi - if use ldap ; then - modules="${modules}:mod_quotatab_file:mod_quotatab_ldap" - else - modules="${modules}:mod_quotatab_file" - fi - fi - - # mod_ifsession should be the last module in the --with-modules list - # see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation - use ifsession && modules="${modules}:mod_ifsession" - - # bug #30359 - use hardened && echo > lib/libcap/cap_sys.c - gcc-specs-pie && echo > lib/libcap/cap_sys.c - - if use noauthunix ; then - myconf="${myconf} --disable-auth-unix" - else - myconf="${myconf} --enable-auth-unix" - fi - - if use kerberos ; then - cd "${S}"/mod_gss-${MODGSS_VER} - # Generate source files for installed virtual/krb5 provider - if has_version app-crypt/mit-krb5; then - econf --enable-mit - else - econf --enable-heimdal - fi - cd "${S}" - # copy the generated files - cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/ - cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/ - cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/ - - myconf="${myconf} --enable-dso --with-shared=mod_gss:mod_auth_gss" - fi - - LIBS="${mylibs}" econf \ - --sbindir=/usr/sbin \ - --localstatedir=/var/run \ - --sysconfdir=/etc/proftpd \ - --enable-shadow \ - --enable-autoshadow \ - --enable-ctrls \ - --with-modules=${modules} \ - $(use_enable acl facl) \ - $(use_enable authfile auth-file) \ - $(use_enable ipv6) \ - $(use_enable ncurses) \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - keepdir /var/run/proftpd - - dodoc "${FILESDIR}/proftpd.conf" \ - COPYING CREDITS ChangeLog NEWS README* \ - doc/license.txt - dohtml doc/*.html - dohtml doc/howto/*.html - - docinto rfc - dodoc doc/rfc/*.txt - - mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib" - - insinto /etc/proftpd - newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/proftpd.xinetd" proftpd - fi - - newinitd "${FILESDIR}/proftpd.rc6" proftpd -} - -pkg_postinst() { - elog - elog "You can find the config files in /etc/proftpd" - elog - ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." - ewarn "Remember to change that in the configuration file." - ewarn - if use mysql && use postgres ; then - ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules." - ewarn "You can use the 'SQLBackend' directive to specify the used SQL" - ewarn "backend. Without this directive the default backend is MySQL." - ewarn - fi - if use clamav ; then - ewarn "mod_clamav was updated to a new version, which uses Clamd" - ewarn "only for virus scanning, so you'll have to set Clamd up" - ewarn "and start it, also re-check the mod_clamav docs." - ewarn - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.2c.ebuild b/net-ftp/proftpd/proftpd-1.3.2c.ebuild deleted file mode 100644 index b8a8f2bb84e9..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.2c.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.2c.ebuild,v 1.2 2010/06/17 20:46:33 patrick Exp $ - -inherit eutils flag-o-matic toolchain-funcs autotools - -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - -IUSE="acl authfile ban case clamav deflate hardened ifsession ipv6 kerberos ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd" - -CASE_VER="0.3" -CLAMAV_VER="0.11rc" -DEFLATE_VER="0.4" -MODGSS_VER="1.3.2" -SHAPER_VER="0.6.5" -VROOT_VER="0.8.3" - -DESCRIPTION="An advanced and very configurable FTP server." - -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 - case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz ) - clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz ) - deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz ) - kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MODGSS_VER}.tar.gz ) - shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz ) - vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )" - -HOMEPAGE="http://www.proftpd.org/ - http://www.castaglia.org/proftpd/ - http://www.thrallingpenguin.com/resources/mod_clamav.htm - http://gssmod.sourceforge.net" - -SLOT="0" -LICENSE="GPL-2" - -DEPEND="acl? ( sys-apps/acl sys-apps/attr ) - clamav? ( app-antivirus/clamav ) - kerberos? ( || ( <app-crypt/mit-krb5-1.7 app-crypt/heimdal ) ) - ldap? ( >=net-nds/openldap-1.2.11 ) - mysql? ( virtual/mysql ) - ncurses? ( sys-libs/ncurses ) - opensslcrypt? ( >=dev-libs/openssl-0.9.6f ) - pam? ( virtual/pam ) - postgres? ( dev-db/postgresql-base ) - ssl? ( >=dev-libs/openssl-0.9.6f ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 ) - xinetd? ( virtual/inetd )" - -RDEPEND="${DEPEND} - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftpd )" - -S="${WORKDIR}/${P/_/}" - -pkg_setup() { - # Add the proftpd user to make the default config - # work out-of-the-box - enewgroup proftpd - enewuser proftpd -1 -1 -1 proftpd -} - -src_unpack() { - unpack ${P/_/}.tar.bz2 - cd "${S}" - - # Fix parallel build (committed upstream in 1.3.3rc1) - epatch "${FILESDIR}"/${PN}-1.3.2-parallel-build.patch - # Fix mysql include when both backends are enabled - epatch "${FILESDIR}"/${PN}-1.3.2-mysql-include.patch - # Do not use bundled libltdl when compiling mod_dso - epatch "${FILESDIR}"/${PN}-1.3.2-system-libltdl.patch - - # Fix stripping of files - sed -e "s| @INSTALL_STRIP@||g" -i Make* - - if use case ; then - unpack ${PN}-mod-case-${CASE_VER}.tar.gz - cp -f mod_case/mod_case.c contrib/ - cp -f mod_case/mod_case.html doc/ - fi - - if use clamav ; then - unpack mod_clamav-${CLAMAV_VER}.tar.gz - cp -f mod_clamav-${CLAMAV_VER}/mod_clamav.* contrib/ - epatch mod_clamav-${CLAMAV_VER}/${PN}.patch - fi - - if use deflate ; then - unpack ${PN}-mod-deflate-${DEFLATE_VER}.tar.gz - cp -f mod_deflate/mod_deflate.c contrib/ - cp -f mod_deflate/mod_deflate.html doc/ - fi - - if use kerberos ; then - unpack mod_gss-${MODGSS_VER}.tar.gz - fi - - if use shaper ; then - unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz - cp -f mod_shaper/mod_shaper.c contrib/ - cp -f mod_shaper/mod_shaper.html doc/ - fi - - if use vroot ; then - unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz - cp -f mod_vroot/mod_vroot.c contrib/ - cp -f mod_vroot/mod_vroot.html doc/ - fi - - # Fix bug #221275 - # extract custom PR_ macros from aclocal.m4 to acinclude.m4 - # and delete the provided aclocal.m4 before running autoreconf - einfo "Extract custom m4 macros from aclocal.m4 ..." - sed -e '/libtool\.m4/q' aclocal.m4 > acinclude.m4 - rm -f aclocal.m4 - - eautoreconf -} - -src_compile() { - addpredict /etc/krb5.conf - local modules myconf mylibs - - modules="mod_ratio:mod_readme:mod_ctrls_admin" - use acl && modules="${modules}:mod_facl" - use ban && modules="${modules}:mod_ban" - use case && modules="${modules}:mod_case" - use clamav && modules="${modules}:mod_clamav" - use deflate && modules="${modules}:mod_deflate" - use pam && modules="${modules}:mod_auth_pam" - use radius && modules="${modules}:mod_radius" - use rewrite && modules="${modules}:mod_rewrite" - use shaper && modules="${modules}:mod_shaper" - use sitemisc && modules="${modules}:mod_site_misc" - use ssl && modules="${modules}:mod_tls" - use tcpd && modules="${modules}:mod_wrap" - use vroot && modules="${modules}:mod_vroot" - - # pam needs to be explicitely disabled - use pam || myconf="${myconf} --enable-auth-pam=no" - - if use ldap ; then - modules="${modules}:mod_ldap" - mylibs="${mylibs} -lresolv" - use ssl && CFLAGS="${CFLAGS} -DUSE_LDAP_TLS" - fi - - if use opensslcrypt ; then - myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl" - mylibs="${mylibs} -lcrypto" - CFLAGS="${CFLAGS} -DHAVE_OPENSSL" - fi - - use nls && myconf="${myconf} --enable-nls" - - if use mysql || use postgres ; then - modules="${modules}:mod_sql" - if use mysql ; then - modules="${modules}:mod_sql_mysql" - myconf="${myconf} --with-includes=/usr/include/mysql" - fi - if use postgres ; then - modules="${modules}:mod_sql_postgres" - myconf="${myconf} --with-includes=/usr/include/postgresql" - fi - fi - - if use softquota ; then - modules="${modules}:mod_quotatab" - if use mysql || use postgres ; then - modules="${modules}:mod_quotatab_sql" - fi - if use radius ; then - modules="${modules}:mod_quotatab_radius" - fi - if use ldap ; then - modules="${modules}:mod_quotatab_file:mod_quotatab_ldap" - else - modules="${modules}:mod_quotatab_file" - fi - fi - - # mod_ifsession should be the last module in the --with-modules list - # see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation - use ifsession && modules="${modules}:mod_ifsession" - - # bug #30359 - use hardened && echo > lib/libcap/cap_sys.c - gcc-specs-pie && echo > lib/libcap/cap_sys.c - - if use noauthunix ; then - myconf="${myconf} --disable-auth-unix" - else - myconf="${myconf} --enable-auth-unix" - fi - - if use kerberos ; then - cd "${S}"/mod_gss-${MODGSS_VER} - # Generate source files for installed virtual/krb5 provider - if has_version app-crypt/mit-krb5; then - econf --enable-mit - else - econf --enable-heimdal - fi - cd "${S}" - # copy the generated files - cp -f mod_gss-${MODGSS_VER}/mod_gss.c contrib/ - cp -f mod_gss-${MODGSS_VER}/mod_gss.h include/ - cp -f mod_gss-${MODGSS_VER}/mod_auth_gss.c contrib/ - - myconf="${myconf} --enable-dso --with-shared=mod_gss:mod_auth_gss" - fi - - LIBS="${mylibs}" econf \ - --sbindir=/usr/sbin \ - --localstatedir=/var/run \ - --sysconfdir=/etc/proftpd \ - --enable-shadow \ - --enable-autoshadow \ - --enable-ctrls \ - --with-modules=${modules} \ - $(use_enable acl facl) \ - $(use_enable authfile auth-file) \ - $(use_enable ipv6) \ - $(use_enable ncurses) \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - keepdir /var/run/proftpd - - dodoc "${FILESDIR}/proftpd.conf" \ - COPYING CREDITS ChangeLog NEWS README* \ - doc/license.txt - dohtml doc/*.html - dohtml doc/howto/*.html - - docinto rfc - dodoc doc/rfc/*.txt - - mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib" - - insinto /etc/proftpd - newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/proftpd.xinetd" proftpd - fi - - newinitd "${FILESDIR}/proftpd.rc6" proftpd -} - -pkg_postinst() { - elog - elog "You can find the config files in /etc/proftpd" - elog - ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp." - ewarn "Remember to change that in the configuration file." - ewarn - if use mysql && use postgres ; then - ewarn "ProFTPD has been build with the MySQL and PostgreSQL modules." - ewarn "You can use the 'SQLBackend' directive to specify the used SQL" - ewarn "backend. Without this directive the default backend is MySQL." - ewarn - fi - if use clamav ; then - ewarn "mod_clamav was updated to a new version, which uses Clamd" - ewarn "only for virus scanning, so you'll have to set Clamd up" - ewarn "and start it, also re-check the mod_clamav docs." - ewarn - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild new file mode 100644 index 000000000000..9ffcba528854 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3-r1.ebuild,v 1.1 2010/06/23 13:37:01 voyageur Exp $ + +EAPI="2" +inherit eutils autotools + +CASE_VER="0.3" +CLAMAV_VER="0.11rc" +DEFLATE_VER="0.5.4" +GSS_VER="1.3.3" +VROOT_VER="0.8.5" + +DESCRIPTION="An advanced and very configurable FTP server." +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/" +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz ) + clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz ) + deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz ) + vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd" + +DEPEND="acl? ( sys-apps/acl sys-apps/attr ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + sftp? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl ) + tcpd? ( sys-apps/tcp-wrappers ) + xinetd? ( virtual/inetd )" +RDEPEND="${DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftpd )" + +S="${WORKDIR}/${P/_/}" + +__prepare_module() { + mv "${WORKDIR}"/$1/$1.c contrib + mv "${WORKDIR}"/$1/$1.html doc/contrib + rm -rf "${WORKDIR}"/$1 +} + +pkg_setup() { + if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then + eerror "Your ProFTPD server is running. In order to install this update" + eerror "you have to stop the running server. If you are using ProFTPD in" + eerror "the standalone mode you can stop the server by executing:" + eerror " /etc/init.d/proftpd stop" + eerror "If you are sure that ProFTPD is not running anymore you have to" + eerror "delete the /var/run/proftpd.pid file." + die "This update requires to stop the ProFTPD server!" + fi +} + +src_prepare() { + use case && __prepare_module mod_case + if use clamav ; then + mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib + epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch + rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER} + fi + use deflate && __prepare_module mod_deflate + use vroot && __prepare_module mod_vroot + + # Fix MySQL includes + sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c + + # Manipulate build system + sed -i -e "s/utils install-conf install/utils install/g" Makefile.in + sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in + + # Fix Gentoo Bug #284853, support newer mit-krb5 + if use kerberos; then + cd "${WORKDIR}"/mod_gss-${GSS_VER}/ || die "mod_gss cd failed" + sed -i -e "s/krb5_principal2principalname/_\0/" \ + mod_auth_gss.c.in || die "mod_auth_gss.c.in sed failed" + sed -i -e '/ac_gss_libs/s/\-ldes425\ //' \ + configure.in || die "configure.in sed failed" + eautoreconf + fi +} + +src_configure() { + local myc myl mym + + use acl && mym="${mym}:mod_facl" + use ban && mym="${mym}:mod_ban" + use case && mym="${mym}:mod_case" + use clamav && mym="${mym}:mod_clamav" + if use ctrls || use shaper ; then + myc="${myc} --enable-ctrls" + mym="${mym}:mod_ctrls_admin" + fi + use deflate && mym="${mym}:mod_deflate" + use exec && mym="${mym}:mod_exec" + if use kerberos ; then + cd "${WORKDIR}"/mod_gss-${GSS_VER} + if has_version app-crypt/mit-krb5 ; then + econf --enable-mit + else + econf --enable-heimdal + fi + mv mod_{auth_gss,gss}.c "${S}"/contrib + mv mod_gss.h "${S}"/include + mv README.mod_{auth_gss,gss} "${S}" + mv mod_gss.html "${S}"/doc/contrib + mv rfc{1509,2228}.txt "${S}"/doc/rfc + cd "${S}" + rm -rf "${WORKDIR}"/mod_gss-${GSS_VER} + mym="${mym}:mod_gss:mod_auth_gss" + fi + if use ldap ; then + myl="${myl} -lresolv" + mym="${mym}:mod_ldap" + fi + if use mysql || use postgres ; then + mym="${mym}:mod_sql:mod_sql_passwd" + if use mysql ; then + myc="${myc} --with-includes=/usr/include/mysql" + mym="${mym}:mod_sql_mysql" + fi + if use postgres ; then + myc="${myc} --with-includes=/usr/include/postgresql" + mym="${mym}:mod_sql_postgres" + fi + fi + if use sftp || use ssl ; then + CFLAGS="${CFLAGS} -DHAVE_OPENSSL" + myc="${myc} --enable-openssl --with-includes=/usr/include/openssl" + myl="${myl} -lcrypto" + fi + use radius && mym="${mym}:mod_radius" + use ratio && mym="${mym}:mod_ratio" + use readme && mym="${mym}:mod_readme" + use rewrite && mym="${mym}:mod_rewrite" + if use sftp ; then + mym="${mym}:mod_sftp" + use pam && mym="${mym}:mod_sftp_pam" + if use mysql || use postgres ; then + mym="${mym}:mod_sftp_sql" + fi + fi + use shaper && mym="${mym}:mod_shaper" + use sitemisc && mym="${mym}:mod_site_misc" + if use softquota ; then + mym="${mym}:mod_quotatab:mod_quotatab_file" + use ldap && mym="${mym}:mod_quotatab_ldap" + use radius && mym="${mym}:mod_quotatab_radius" + if use mysql || use postgres ; then + mym="${mym}:mod_quotatab_sql" + fi + fi + use ssl && mym="${mym}:mod_tls:mod_tls_shmcache" + use tcpd && mym="${mym}:mod_wrap" + use vroot && mym="${mym}:mod_vroot" + # mod_ifsession needs to be the last module in the mym list. + use ifsession && mym="${mym}:mod_ifsession" + + [ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}" + LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \ + --sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \ + $(use_enable acl facl) \ + $(use_enable authfile auth-file) \ + $(use_enable caps cap) \ + $(use_enable ident) \ + $(use_enable ipv6) \ + $(use_enable ncurses) \ + $(use_enable nls) \ + $(use_enable trace) \ + $(use_enable pam auth-pam) +} + +src_install() { + emake DESTDIR="${D}" install + + insinto /etc/proftpd + doins "${FILESDIR}"/proftpd.conf.sample + keepdir /var/run/proftpd + newinitd "${FILESDIR}"/proftpd.initd proftpd + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/proftpd.xinetd proftpd + fi + + dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES + if use doc ; then + dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html + docinto rfc + dodoc doc/rfc/*.txt + fi +} + +pkg_postinst() { + if use mysql && use postgres ; then + elog + elog "ProFTPD has been built with the MySQL and PostgreSQL modules." + elog "You can use the 'SQLBackend' directive to specify the used SQL" + elog "backend. Without this directive the default backend is MySQL." + elog + fi + if use exec ; then + ewarn + ewarn "ProFTPD has been built with the mod_exec module. This module" + ewarn "can be a security risk for your server as it executes external" + ewarn "programs. Vulnerables in these external programs may disclose" + ewarn "information or even compromise your server." + ewarn "You have been warned! Use this module at your own risk!" + ewarn + fi +} |