diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2002-09-07 14:15:46 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2002-09-07 14:15:46 +0000 |
commit | 7dfd94d6d60ee19c458fcc57e5696b70f649d43c (patch) | |
tree | d07fec8ca7983231dca681d2bead1a7e6e3f01c7 /net-ftp | |
parent | force autoconf-2.1 instead of 2.53a (diff) | |
download | historical-7dfd94d6d60ee19c458fcc57e5696b70f649d43c.tar.gz historical-7dfd94d6d60ee19c458fcc57e5696b70f649d43c.tar.bz2 historical-7dfd94d6d60ee19c458fcc57e5696b70f649d43c.zip |
added libpcap to DEPEND
Diffstat (limited to 'net-ftp')
-rw-r--r-- | net-ftp/proftpd/ChangeLog | 8 | ||||
-rw-r--r-- | net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1 | 1 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.2.5-r1.ebuild | 16 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild | 24 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.2.6_rc1.ebuild | 99 |
5 files changed, 22 insertions, 126 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 1134c7f9be61..1f59f6d7e15d 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,9 +1,15 @@ # ChangeLog for net-ftp/proftpd # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.9 2002/08/04 02:24:05 blocke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.10 2002/09/07 14:15:46 seemant Exp $ *proftpd-1.2.6_rc1-r1 (03 Aug 2002) + 07 Sep 2002; Seemant Kulleen <seemant@gentoo.org> proftpd-1.2.5-r1.ebuild + proftpd-1.2.6_rc1-r1.ebuild : + + Removed redundant glibc dependency and replaced it with the libpcap. + Thanks to: saragon@home.se (Daniel) in bug #7614. + 03 Aug 2002; Bruce A. Locke <blocke@shivan.org> proftpd-1.2.6_rc1-r1.ebuild, files/digest-proftpd-1.2.6_rc1-r1: diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1 b/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1 deleted file mode 100644 index 07de557fe643..000000000000 --- a/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1 +++ /dev/null @@ -1 +0,0 @@ -MD5 8bbe9e82cbcde203edfbf6dfc0562b71 proftpd-1.2.6rc1.tar.bz2 565290 diff --git a/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild index c7c35e8f1812..5f42c15f8047 100644 --- a/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild,v 1.6 2002/08/16 14:24:49 murphy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.5-r1.ebuild,v 1.7 2002/09/07 14:15:46 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="An advanced and very configurable FTP server" @@ -11,7 +11,7 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ppc sparc sparc64" -DEPEND="virtual/glibc +DEPEND="net-libs/libpcap pam? ( >=sys-libs/pam-0.75 ) mysql? ( >=dev-db/mysql-3.23.26 ) ldap? ( >=net-nds/openldap-1.2.11 ) @@ -42,17 +42,15 @@ src_compile() { use ldap && export LDFLAGS="-lresolv" - ./configure \ - --prefix=/usr \ + econf \ --sbindir=/usr/sbin \ - --mandir=/usr/share/man \ --localstatedir=/var/run \ --sysconfdir=/etc/proftpd \ --enable-shadow \ --disable-sendfile \ --enable-autoshadow \ --with-modules=${modules} \ - --host=${CHOST} ${myconf} || die "bad ./configure" + ${myconf} || die "bad ./configure" emake || die "compile problem" } @@ -61,14 +59,12 @@ src_install() { #Note rundir needs to be specified to avoid sanbox violation #on initial install. See Make.rules - make \ - prefix=${D}/usr \ + einstall \ sbindir=${D}/usr/sbin \ - mandir=${D}/usr/share/man \ localstatedir=${D}/var/run \ rundir=${D}/var/run/proftpd \ sysconfdir=${D}/etc/proftpd \ - install || die + || die #dobin contrib/genuser.pl dodir /home/ftp diff --git a/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild index 05bb6813c3a1..de9b6321b052 100644 --- a/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild +++ b/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild @@ -1,20 +1,18 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild,v 1.2 2002/08/16 14:24:49 murphy Exp $ - -PV=1.2.6rc1 -P=${PN}-${PV} -S=${WORKDIR}/${P} +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild,v 1.3 2002/09/07 14:15:46 seemant Exp $ +MY_P=${P/_/} +S=${WORKDIR}/${MY_P} DESCRIPTION="An advanced and very configurable FTP server" -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2" +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2" HOMEPAGE="http://www.proftpd.net/" SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ppc sparc sparc64" -DEPEND="virtual/glibc +DEPEND="net-libs/libpcap pam? ( >=sys-libs/pam-0.75 ) mysql? ( >=dev-db/mysql-3.23.26 ) ldap? ( >=net-nds/openldap-1.2.11 ) @@ -45,17 +43,15 @@ src_compile() { use ldap && export LDFLAGS="-lresolv" - ./configure \ - --prefix=/usr \ + econf \ --sbindir=/usr/sbin \ - --mandir=/usr/share/man \ --localstatedir=/var/run \ --sysconfdir=/etc/proftpd \ --enable-shadow \ --disable-sendfile \ --enable-autoshadow \ --with-modules=${modules} \ - --host=${CHOST} ${myconf} || die "bad ./configure" + ${myconf} || die "bad ./configure" emake || die "compile problem" } @@ -64,14 +60,12 @@ src_install() { #Note rundir needs to be specified to avoid sanbox violation #on initial install. See Make.rules - make \ - prefix=${D}/usr \ + einstall \ sbindir=${D}/usr/sbin \ - mandir=${D}/usr/share/man \ localstatedir=${D}/var/run \ rundir=${D}/var/run/proftpd \ sysconfdir=${D}/etc/proftpd \ - install || die + || die #dobin contrib/genuser.pl dodir /home/ftp diff --git a/net-ftp/proftpd/proftpd-1.2.6_rc1.ebuild b/net-ftp/proftpd/proftpd-1.2.6_rc1.ebuild deleted file mode 100644 index 0bbab9abad98..000000000000 --- a/net-ftp/proftpd/proftpd-1.2.6_rc1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.6_rc1.ebuild,v 1.2 2002/08/16 14:24:49 murphy Exp $ - -PV=1.2.6rc1 -P=${PN}-${PV} -S=${WORKDIR}/${P} - -DESCRIPTION="An advanced and very configurable FTP server" -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2" -HOMEPAGE="http://www.proftpd.net/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc sparc sparc64" - -DEPEND="virtual/glibc - 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.1 )" - -src_unpack() { - -#Fix bug #3791 - - unpack ${P}.tar.bz2 - cd ${WORKDIR}/${P} - patch contrib/mod_sql_postgres.c < ${FILESDIR}/mod_sql_postgres.c.patch || die "config patch failed" -} - -src_compile() { - local modules myconf - - modules="mod_ratio:mod_readme:mod_linuxprivs" - use pam && modules="${modules}:mod_pam" - use ldap && modules="${modules}:mod_ldap" - - if [ "`use mysql`" ] ; then - modules="${modules}:mod_sql:mod_sql_mysql" - elif [ "`use postgres`" ] ; then - modules="${modules}:mod_sql:mod_sql_postgres" - myconf="--with-includes=/usr/include/postgresql" - fi - - use ldap && export LDFLAGS="-lresolv" - - ./configure \ - --prefix=/usr \ - --sbindir=/usr/sbin \ - --mandir=/usr/share/man \ - --localstatedir=/var/run \ - --sysconfdir=/etc/proftpd \ - --enable-shadow \ - --disable-sendfile \ - --enable-autoshadow \ - --with-modules=${modules} \ - --host=${CHOST} ${myconf} || die "bad ./configure" - - emake || die "compile problem" -} - -src_install() { - - #Note rundir needs to be specified to avoid sanbox violation - #on initial install. See Make.rules - make \ - prefix=${D}/usr \ - sbindir=${D}/usr/sbin \ - mandir=${D}/usr/share/man \ - localstatedir=${D}/var/run \ - rundir=${D}/var/run/proftpd \ - sysconfdir=${D}/etc/proftpd \ - install || die - - #dobin contrib/genuser.pl - dodir /home/ftp - - dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \ - COPYING CREDITS ChangeLog NEWS README* \ - doc/{API,license.txt,GetConf,ShowUndocumented} \ - doc/development.notes - dohtml doc/*.html - docinto rfc - dodoc doc/rfc/*.txt - - cd ${D}/etc/proftpd - mv proftpd.conf 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 - - exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd -} |