diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for net-ftp/vsftpd -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.107 2009/01/02 16:33:32 cla Exp $ + 06 May 2009; Nathan Phillip Brink + vsftpd-2.0.7-r1.ebuild, +vsftpd-2.0.7-r2.ebuild, +metadata.xml: + Removed many KEYWORDS, stabilized x86 for 2.0.7-r1, added 2.0.7-r2 + corresponding to Gentoo's 2.0.7-r1, described logrotate useflag in + metadata.xml, whitespace changes + 05 Jan 2009; Nathan Brink Initial import from Gentoo's Portage. Fixed issue with linking when {/usr/lib and /usr/lib64} and {/lib64 and lib} are not symlinked. diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -7,5 +7,7 @@ AUX vsftpd.init 1922 RMD160 50925ca15a4f AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b -EBUILD vsftpd-2.0.7-r1.ebuild 3413 RMD160 4e6968e972b3aee4a2854c3cb66c3237635ce075 SHA1 819bfaa04ac4abdd49a8947e6565a56a44ca1476 SHA256 80dd33fcfc8218a5c95c3ea6fe460725e70afc0e00ccb25de4b61a227859cf11 -MISC ChangeLog 15121 RMD160 1e7f7dd6f864e965314b98bb17b57c000ca146d3 SHA1 818a7cf1a62fff9098f91db796657b2055c0d095 SHA256 5053ac19cad67a7b782284cddeb53cd27717b21c0b6512e0acfbec26e117e286 +EBUILD vsftpd-2.0.7-r1.ebuild 3337 RMD160 be09a76c1e6a7a2f4be42aadc71d75f264c13ff0 SHA1 0a63faef9a61a1aef328e436c7f51ba9d1affa67 SHA256 d743109c5528232878d268318885b65219250314ca96e4fd89bb5d304f347469 +EBUILD vsftpd-2.0.7-r2.ebuild 3261 RMD160 c0a0962af2e9a9d49b496fc8532bf18716fc7b1f SHA1 b651456f491b4c97dc9b3f7ea4b9c067f84fa072 SHA256 8d4688ffbe4846ba00828f79619f609cd9aee283e5cbc8520dc547774b26911a +MISC ChangeLog 15428 RMD160 8a034324a367d9af80c82e2b15b5286a4b4200dd SHA1 05a25a6f26897b590fd06649388a75b53af84895 SHA256 fe122a3e042d619250513ff2750a8469214a2f6c089f4bcc93fde0aa7ab3c74e +MISC metadata.xml 354 RMD160 2a8c6399d267518a342f258ac3edb1d568164a54 SHA1 45b5cdb37090f2c07d40190866bd3b755cd6c1fe SHA256 5b6855c6e26ae707dffa0d8e7bbb92b498904a36460e6e20aeb055489caaa765 diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/metadata.xml @@ -0,0 +1,13 @@ + + + + no-herd + + ohnobinki@ohnopublishing.net + + + + Install logrotate script and depend on logrotate. + + + diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild --- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild +++ b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="ftp://vsftpd.beasts.org/users/c LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd" +KEYWORDS="amd64 x86" IUSE="caps logrotate pam tcpd ssl selinux xinetd" DEPEND="caps? ( sys-libs/libcap ) @@ -39,22 +39,22 @@ src_unpack() { # Configure vsftpd build defaults echo "#!/bin/sh" > vsf_findlibs.sh if use tcpd; then - echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h - echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh + echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h + echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh fi if use ssl; then - echo "#define VSF_BUILD_SSL" >> builddefs.h - echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh + echo "#define VSF_BUILD_SSL" >> builddefs.h + echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh fi if use pam; then - echo "\"-lpam\"" >> vsf_findlibs.sh + echo "\"-lpam\"" >> vsf_findlibs.sh else - echo "#undef VSF_BUILD_PAM" >> builddefs.h + echo "#undef VSF_BUILD_PAM" >> builddefs.h fi # Ensure that we don't link against libcap unless asked if use caps ; then - echo "echo \"-lcap\"" >> vsf_findlibs.sh + echo "echo \"-lcap\"" >> vsf_findlibs.sh else sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c sed -i '/libcap/ d' vsf_findlibs.sh diff --git a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild copy from net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild copy to net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild --- a/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild +++ b/net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild @@ -10,8 +10,8 @@ SRC_URI="ftp://vsftpd.beasts.org/users/c LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd" -IUSE="caps logrotate pam tcpd ssl selinux xinetd" +KEYWORDS="amd64 ~x86" +IUSE="caps pam tcpd ssl selinux xinetd" DEPEND="caps? ( sys-libs/libcap ) pam? ( virtual/pam ) @@ -19,7 +19,6 @@ DEPEND="caps? ( sys-libs/libcap ) ssl? ( >=dev-libs/openssl-0.9.7d )" RDEPEND="${DEPEND} net-ftp/ftpbase - logrotate? ( app-admin/logrotate ) selinux? ( sec-policy/selinux-ftpd ) xinetd? ( sys-apps/xinetd )" @@ -39,22 +38,22 @@ src_unpack() { # Configure vsftpd build defaults echo "#!/bin/sh" > vsf_findlibs.sh if use tcpd; then - echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h - echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh + echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h + echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh fi if use ssl; then - echo "#define VSF_BUILD_SSL" >> builddefs.h - echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh + echo "#define VSF_BUILD_SSL" >> builddefs.h + echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh fi if use pam; then - echo "\"-lpam\"" >> vsf_findlibs.sh + echo "\"-lpam\"" >> vsf_findlibs.sh else - echo "#undef VSF_BUILD_PAM" >> builddefs.h + echo "#undef VSF_BUILD_PAM" >> builddefs.h fi # Ensure that we don't link against libcap unless asked if use caps ; then - echo "echo \"-lcap\"" >> vsf_findlibs.sh + echo "echo \"-lcap\"" >> vsf_findlibs.sh else sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c sed -i '/libcap/ d' vsf_findlibs.sh @@ -87,10 +86,8 @@ src_install() { insinto /etc/vsftpd newins vsftpd.conf vsftpd.conf.example - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}/vsftpd.logrotate" vsftpd - fi + insinto /etc/logrotate.d + newins "${FILESDIR}/vsftpd.logrotate" vsftpd if use xinetd ; then insinto /etc/xinetd.d