diff options
| -rw-r--r-- | net-misc/atftp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/atftp/Manifest | 11 | ||||
| -rw-r--r-- | net-misc/atftp/atftp-0.7.ebuild | 31 | ||||
| -rw-r--r-- | net-misc/atftp/files/atftp-0.7-gcc.patch | 20 |
4 files changed, 46 insertions, 22 deletions
diff --git a/net-misc/atftp/ChangeLog b/net-misc/atftp/ChangeLog index 2bbc207644d8..57aa708f7ccd 100644 --- a/net-misc/atftp/ChangeLog +++ b/net-misc/atftp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/atftp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/ChangeLog,v 1.16 2005/02/07 15:17:14 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/ChangeLog,v 1.17 2005/02/07 21:11:03 vapier Exp $ + + 07 Feb 2005; Mike Frysinger <vapier@gentoo.org> + +files/atftp-0.7-gcc.patch, atftp-0.7.ebuild: + Added patch to fix building #71090. 07 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> atftp-0.6.2.ebuild: added ~amd64 to 0.6.2, fixes #81083 diff --git a/net-misc/atftp/Manifest b/net-misc/atftp/Manifest index 94a5e482cea0..b90bc8ad971a 100644 --- a/net-misc/atftp/Manifest +++ b/net-misc/atftp/Manifest @@ -1,10 +1,11 @@ +MD5 24f40a46e6362dd16be882ec3fc52dd8 ChangeLog 2467 MD5 aeb8979d927bc14fc0a59e354a4f8cd2 atftp-0.6-r3.ebuild 992 -MD5 96c77577f48b6ef94406856a99dd1f4b atftp-0.7.ebuild 934 MD5 e3e297320c39d59036eef5b62f189fc6 atftp-0.6.2.ebuild 1044 -MD5 87e369eb566671ccc3a638cba914cecc ChangeLog 2333 -MD5 401c2182f70ea502b2b13567dee9daf9 files/digest-atftp-0.7 61 +MD5 1ed02b2db3312dfaa79ed876843f7aaa atftp-0.7.ebuild 905 +MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019 MD5 6edbe26f81fbd488b6fbffd1bbd27ca9 files/digest-atftp-0.6-r3 61 -MD5 f3d1e03f8ce70ea8ed775de7407304f3 files/atftp.init 437 MD5 e14c6bca387e9af7d2734fb9f08a67ee files/digest-atftp-0.6.2 63 -MD5 ef1244d13cccdfbe2dff44442e0c3d1f files/atftp-0.6-security.patch 1019 MD5 939f5bfbb9b7a728330cc124175c39e3 files/atftp.confd 105 +MD5 f3d1e03f8ce70ea8ed775de7407304f3 files/atftp.init 437 +MD5 401c2182f70ea502b2b13567dee9daf9 files/digest-atftp-0.7 61 +MD5 0adc9648a64aa6a05a55bf822eec7265 files/atftp-0.7-gcc.patch 540 diff --git a/net-misc/atftp/atftp-0.7.ebuild b/net-misc/atftp/atftp-0.7.ebuild index df6b8d5547e6..baa176a59e24 100644 --- a/net-misc/atftp/atftp-0.7.ebuild +++ b/net-misc/atftp/atftp-0.7.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/atftp-0.7.ebuild,v 1.9 2005/02/07 15:17:14 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/atftp/atftp-0.7.ebuild,v 1.10 2005/02/07 21:11:03 vapier Exp $ + +inherit eutils DESCRIPTION="Advanced TFTP implementation client/server" HOMEPAGE="ftp://ftp.mamalinux.com/pub/atftp/" @@ -8,29 +10,26 @@ SRC_URI="ftp://ftp.mamalinux.com/pub/atftp/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~sparc ~ppc arm ~amd64" +KEYWORDS="~amd64 arm ~ppc ~sparc ~x86" IUSE="tcpd" DEPEND="tcpd? ( sys-apps/tcp-wrappers ) !virtual/tftp" PROVIDE="virtual/tftp" -src_compile () { - econf `use_enable tcpd libwrap` || die "./configure failed" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-gcc.patch +} - sed -i \ - -e "/^CFLAGS =/s:-g::" \ - -e "/^CFLAGS =/s:-O2::" \ - -e "/^CFLAGS =/s:$: ${CFLAGS}:" \ - Makefile - emake || die +src_compile() { + econf $(use_enable tcpd libwrap) || die "./configure failed" + emake CFLAGS="${CFLAGS} -D_REENTRANT" || die } src_install() { - make install DESTDIR=${D} || die "Installation failed" - - exeinto /etc/init.d - newexe ${FILESDIR}/atftp.init atftp - insinto /etc/conf.d - newins ${FILESDIR}/atftp.confd atftp + make install DESTDIR="${D}" || die "Installation failed" + newinitd ${FILESDIR}/atftp.init atftp + newconfd ${FILESDIR}/atftp.confd atftp } diff --git a/net-misc/atftp/files/atftp-0.7-gcc.patch b/net-misc/atftp/files/atftp-0.7-gcc.patch new file mode 100644 index 000000000000..374dbdb01c71 --- /dev/null +++ b/net-misc/atftp/files/atftp-0.7-gcc.patch @@ -0,0 +1,20 @@ +--- argz.h.orig 2005-02-07 16:04:41.000000000 -0500 ++++ argz.h 2005-02-07 16:05:01.000000000 -0500 +@@ -180,7 +180,7 @@ + #ifdef __USE_EXTERN_INLINES + extern inline char * + __argz_next (__const char *__argz, size_t __argz_len, +- __const char *__entry) __THROW ++ __const char *__entry) + { + if (__entry) + { +@@ -194,7 +194,7 @@ + } + extern inline char * + argz_next (__const char *__argz, size_t __argz_len, +- __const char *__entry) __THROW ++ __const char *__entry) + { + return __argz_next (__argz, __argz_len, __entry); + } |