diff options
Diffstat (limited to 'net-ftp/frox')
| -rw-r--r-- | net-ftp/frox/ChangeLog | 12 | ||||
| -rw-r--r-- | net-ftp/frox/Manifest | 20 | ||||
| -rw-r--r-- | net-ftp/frox/files/0.7.18-netfilter-includes.patch | 16 | ||||
| -rw-r--r-- | net-ftp/frox/files/0.7.18-respect-CFLAGS.patch | 15 | ||||
| -rw-r--r-- | net-ftp/frox/frox-0.7.18-r4.ebuild (renamed from net-ftp/frox/frox-0.7.18-r3.ebuild) | 51 | ||||
| -rw-r--r-- | net-ftp/frox/metadata.xml | 3 |
6 files changed, 85 insertions, 32 deletions
diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog index 1f960ea4df14..93903d425760 100644 --- a/net-ftp/frox/ChangeLog +++ b/net-ftp/frox/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-ftp/frox -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.16 2011/07/20 14:44:12 pacho Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.17 2012/03/03 12:53:16 pacho Exp $ + +*frox-0.7.18-r4 (03 Mar 2012) + + 03 Mar 2012; Pacho Ramos <pacho@gentoo.org> + +files/0.7.18-netfilter-includes.patch, +files/0.7.18-respect-CFLAGS.patch, + +frox-0.7.18-r4.ebuild, -frox-0.7.18-r3.ebuild, metadata.xml: + Respect CFLAGS, add transparent support and more fixes, bug #406483 by + Bertrand Jacquin. Drop old. 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #34534 diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest index b0ae638ad756..cd99ac17d46b 100644 --- a/net-ftp/frox/Manifest +++ b/net-ftp/frox/Manifest @@ -1,19 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 +AUX 0.7.18-netfilter-includes.patch 548 RMD160 23fbe1ae55963d441b30a0a0465d2ba3a03a6a17 SHA1 d3c3cc71d5996c2be3567b9390a5c1680c09b332 SHA256 76f0737fc5c53c2e52c1e9ccfbd0184575e6d13ac1c96299a4261ac34583f8b1 +AUX 0.7.18-respect-CFLAGS.patch 328 RMD160 c0c7d8f745a532212d96ff9c1434710981afca2c SHA1 aa4b7f2347a32071306ab8e0748e7fb715d847d5 SHA256 1b42fcd733cc63c773ab95c3516f4604edd08ee999dbf5f3743d78db0856e87d AUX config-0.7.18.patch 1952 RMD160 e687d97fe6bb9bf3732b3843990f0b00113adbb8 SHA1 38ec48a3464d4acd089068676178d9d7f0eaf7c7 SHA256 68ad304da31d7adf3200cf29ef77ebaa099d5dea2998897d02c5264f91e868d8 AUX frox.rc 1069 RMD160 edc6355a43aa15c157b310b3c6a805f63ac12af1 SHA1 1564c0593c293c65dca8a6beb0222b9d68eb91fb SHA256 2ad11b059524b4bfd8284326f498ebf37bf31b5bed4d92776807f67046634f5e DIST frox-0.7.18.tar.bz2 173355 RMD160 f0dec4e54a5badd8ccc471198c557ea93416a3fc SHA1 9d4e590628103f19b5c2c989a2784eb1c7100221 SHA256 f7b637dd108444ff9c2302aa134f434e1606a2f965c01492abfbdc9b1c0bd0fc EBUILD frox-0.7.18-r2.ebuild 1798 RMD160 5b2d417f4d8dbe3635c388facbf9e9b354b80a1d SHA1 b0261ef00c87fbcf78276a4e97c0728bc44962e7 SHA256 41e7f2f5ce8bf9a5c34d0ae2258590e98eac2a4099c4121dbd8cf202755480d6 -EBUILD frox-0.7.18-r3.ebuild 1833 RMD160 1f20b613717089e0832f7cfdb0d3ace64f6919e4 SHA1 8d07705c25b60090f9c4d65f4a6d4b9770663dc0 SHA256 84a8ec4b6ffc9e8b23e9453b392459d67ca0d20273b9e30d6dcb6e7fb8804ecd -MISC ChangeLog 2551 RMD160 b1d71650bee1bb52c86a85aa1b0d9d5e24b99ccc SHA1 b6ff89173dd2d445e8104a1a123e35e311c1d1cf SHA256 50a29934494cfbd758a5af308b22da5b6f45f7f75fea9e5a26d0ba7db1dd5a8c -MISC metadata.xml 248 RMD160 55f25ec59877ec3627fa4aaa346a61eacf403cad SHA1 3e7cd001b0c0005e3a86cb73d8ce32c2ad50d2fe SHA256 7404eee9a4427538674065b37d113a6531546b1126da727a21b6dbae1926bf98 +EBUILD frox-0.7.18-r4.ebuild 2141 RMD160 7a287e2926cd08914698d2205ad9f0094e4e8a8c SHA1 3c867ae301d525967358cb84a9f12a57da8e906c SHA256 4d267cecf455c1504975fa0e7a4446dbcf8c03dde9148dbb5db299f8d45f1ecd +MISC ChangeLog 2874 RMD160 2470c31d6e498e97c56bc32d780ec46053b15aa2 SHA1 1bd2271c73245f29666b9d64fc82a98ea28110b5 SHA256 4eaf34f88262394f4f0f3cd2700fcebc62a321d2db1b65828e461a697061a961 +MISC metadata.xml 341 RMD160 5e207bd2b2f647d50e302af25991ff4c329e57af SHA1 20e95a2af1dd4faef8c66e9c3d0d6ef2e0a789e7 SHA256 684946b86c6a12c6799fe043728f4d51ef626d0bb528bdf267c13d1843e5e1fb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQEIAAYFAk59qhMACgkQfXuS5UK5QB24UQP+PFqWIdv+WhX2+X3IHQ9hgLxL -/AUcTD1phDlMtRcoIFKMdxQODKDCGWhjFoQhPb8a2xOW46+EJ6QFB/q7RNw+EPOC -p646ApYZVpC7B/pcPFn83v/exbs+C3h5Ef9gkaEdYMT0RCn5he85glR6O+8vsa0J -C6nE7WmATm7ThdfP1VM= -=aK35 +iEYEARECAAYFAk9SFEIACgkQCaWpQKGI+9RrYwCcCsyumSGVDYGWCUvxkt8yvFkY +B9QAn1fF6HR52U6tlYiYbFrB+kO7DP0y +=/M1Z -----END PGP SIGNATURE----- diff --git a/net-ftp/frox/files/0.7.18-netfilter-includes.patch b/net-ftp/frox/files/0.7.18-netfilter-includes.patch new file mode 100644 index 000000000000..e40ce52862c9 --- /dev/null +++ b/net-ftp/frox/files/0.7.18-netfilter-includes.patch @@ -0,0 +1,16 @@ +--- configure.in.ori 2012-03-01 22:32:17.044450088 +0100 ++++ configure.in 2012-03-01 22:36:40.995882948 +0100 +@@ -331,7 +331,12 @@ + AC_HEADER_STDC + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h sys/time.h syslog.h unistd.h) +-AC_CHECK_HEADERS(linux/netfilter_ipv4.h, , , [#include <limits.h>]) ++AC_CHECK_HEADERS(linux/netfilter_ipv4.h, , ,[ ++ #include <limits.h> ++ #include <sys/socket.h> ++ #include <linux/in.h> ++ #include <linux/in6.h> ++]) + + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST diff --git a/net-ftp/frox/files/0.7.18-respect-CFLAGS.patch b/net-ftp/frox/files/0.7.18-respect-CFLAGS.patch new file mode 100644 index 000000000000..9fb54ac153cd --- /dev/null +++ b/net-ftp/frox/files/0.7.18-respect-CFLAGS.patch @@ -0,0 +1,15 @@ +--- configure.in 2005-02-04 11:24:55.000000000 +0100 ++++ configure.in 2012-03-01 22:56:25.985725178 +0100 +@@ -46,11 +46,9 @@ + ;; + *) + AC_MSG_RESULT(no) +- CFLAGS="$CFLAGS -O2" + ;; + esac], +- [AC_MSG_RESULT(no) +- CFLAGS="$CFLAGS -O2"] ++ [AC_MSG_RESULT(no)] + ) + + AC_MSG_CHECKING(whether to compile in profiling info) diff --git a/net-ftp/frox/frox-0.7.18-r3.ebuild b/net-ftp/frox/frox-0.7.18-r4.ebuild index 8c37d6b2ccd5..e61fb6dd5991 100644 --- a/net-ftp/frox/frox-0.7.18-r3.ebuild +++ b/net-ftp/frox/frox-0.7.18-r4.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r3.ebuild,v 1.1 2008/04/02 07:56:34 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r4.ebuild,v 1.1 2012/03/03 12:53:16 pacho Exp $ -inherit eutils +EAPI=4 +inherit eutils autotools -IUSE="clamav" +IUSE="clamav ssl transparent" MY_P=${P/_/} S=${WORKDIR}/${MY_P} @@ -16,28 +17,39 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -DEPEND="clamav? ( >=app-antivirus/clamav-0.80 )" +DEPEND="clamav? ( >=app-antivirus/clamav-0.80 ) + ssl? ( dev-libs/openssl ) + kernel_linux? ( >=sys-kernel/linux-headers-2.6 )" +RDEPEND="${DEPEND}" pkg_setup() { enewgroup ftpproxy enewuser ftpproxy -1 -1 /var/spool/frox ftpproxy + + use clamav && ewarn "Virus scanner potentialy broken in chroot - see bug #81035" } -src_compile() { +src_prepare () { + epatch "${FILESDIR}"/${PV}-respect-CFLAGS.patch + epatch "${FILESDIR}"/${PV}-netfilter-includes.patch + + eautoreconf +} +src_configure() { econf \ - --sbindir=/usr/sbin \ - --localstatedir=/var/run \ - --sysconfdir=/etc \ --enable-http-cache --enable-local-cache \ - --enable-transparent-data \ - $(use_enable clamav virus-scan) || die "bad ./configure" - - emake || die "compile problem" + --enable-procname \ + --enable-configfile=/etc/frox.conf \ + $(use_enable !kernel_linux libiptc) \ + $(use_enable clamav virus-scan) \ + $(use_enable ssl) \ + $(use_enable transparent transparent-data) \ + $(use_enable !transparent ntp) } src_install() { - make DESTDIR=${D} install || die + emake DESTDIR=${D} install keepdir /var/run/frox keepdir /var/spool/frox @@ -63,11 +75,10 @@ src_install() { cd src epatch ${FILESDIR}/config-${PV}.patch || die "config patch failed" - if use clamav; then - sed -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \ - frox.conf > ${D}/etc/frox.conf.example - ewarn "Virus scanner potentialy broken in chroot - see bug #81035." - else - cp frox.conf ${D}/etc/frox.conf.example + cp frox.conf ${D}/etc/frox.conf.example + if use clamav ; then + sed -i \ + -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \ + ${D}/etc/frox.conf.example || die fi } diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml index 1076258a0ce8..8c7655503a2b 100644 --- a/net-ftp/frox/metadata.xml +++ b/net-ftp/frox/metadata.xml @@ -4,5 +4,8 @@ <maintainer> <email>maintainer-needed@gentoo.org</email> </maintainer> +<use> +<flag name="transparent">Enable transparent proxying of data connections</flag> +</use> <longdescription></longdescription> </pkgmetadata> |