Revbump to fix CFLAGS (bug 240894) and LDFLAGS (bug 336956)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

6 files changed, 103 insertions, 8 deletions

diff --git a/net-ftp/linksys-tftp/ChangeLog b/net-ftp/linksys-tftp/ChangeLog
index 47af799034ff..1f3818f7f8ee 100644
--- a/net-ftp/linksys-tftp/ChangeLog
+++ b/net-ftp/linksys-tftp/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-ftp/linksys-tftp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/ChangeLog,v 1.5 2009/09/23 18:37:13 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/ChangeLog,v 1.6 2010/10/04 15:57:22 xmw Exp $
+
+*linksys-tftp-1.2.1-r1 (03 Oct 2010)
+
+  03 Oct 2010; Michael Weber <xmw@gentoo.org> linksys-tftp-1.2.1.ebuild,
+  +linksys-tftp-1.2.1-r1.ebuild,
+  +files/linksys-tftp-1.2.1-r1-Makefile.patch,
+  +files/linksys-tftp-1.2.1-r1-header.patch:
+  Revbump to fix CFLAGS (bug 240894) and LDFLAGS (bug 336956)
+
+  03 Oct 2010; Michael Weber <xmw@gentoo.org> linksys-tftp-1.2.1.ebuild:
+  Updating HOMEPAGE, pointing SRC_URI to mirrors (thanks to Roland Ramthun
+  <bts@roland-ramthun.de> for his report on bug #339495)
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> linksys-tftp-1.2.1.ebuild:
   Remove virtual/libc
diff --git a/net-ftp/linksys-tftp/Manifest b/net-ftp/linksys-tftp/Manifest
index 2e6210853c91..ad21ff50f537 100644
--- a/net-ftp/linksys-tftp/Manifest
+++ b/net-ftp/linksys-tftp/Manifest
@@ -1,4 +1,7 @@
+AUX linksys-tftp-1.2.1-r1-Makefile.patch 734 RMD160 54a85f22ec836089e0cfd1d80678c0935438d4b7 SHA1 41796d800805f27c38e33199340bfaf413d5d6db SHA256 c4e0a048d5c0808ee1c88b3c7e662f397d528fe2204b55df1119e996b516cea5
+AUX linksys-tftp-1.2.1-r1-header.patch 374 RMD160 48444f0b593c2424f02ca8c2b5540becd962af78 SHA1 2c7f58fdfc85b5ec73362a745d47b04a40029372 SHA256 2759cffe970f7927ad0c661ec1fcec015f466ee46f14bc59649754cfee49b601
 DIST linksys-tftp-1.2.1.tar.bz2 11124 RMD160 101f704f37debf6a17871f80ab0d7220340ebc31 SHA1 2e6ceaf5eac8e09954645b6d9b2a8f2c75b27552 SHA256 872e9e58d0673d14ca00edfc1d2680a77c9737ba5a4654540182e5e5ffc7f16f
-EBUILD linksys-tftp-1.2.1.ebuild 612 RMD160 7003e1679d7efc6da5cc5e811f90984d24db2858 SHA1 5a7b96008970a418baabc257d3d74b402a1f653c SHA256 0e9b70555918d77ddd845aba10d8b65d7c5daa573a236ee9c2d818d24060f599
-MISC ChangeLog 1122 RMD160 8ff317a3def37db1d477b1ee23471da689773618 SHA1 4bec66680813db8d1c9e66c6a44043177f96fc00 SHA256 2941ca22215d2201fa3e013025712f3c53d74962d2bab17062f364a794133457
+EBUILD linksys-tftp-1.2.1-r1.ebuild 760 RMD160 79a68bdb0c7de3062852d972f6977e5a03d5b959 SHA1 00959d5334fecc559fcf16b705d5a125fdb4e795 SHA256 224692f94f98b13cfcb305a3ea4cc52ea240f67f23ef8669cbb980394bd681f1
+EBUILD linksys-tftp-1.2.1.ebuild 638 RMD160 0f91d907e1986ad0389fbfe07afa3d87a3dc5263 SHA1 b2a96fa242bf8d3f5d56a22cf32dfbe10b33b6af SHA256 91327ac5b757ecc15ee24df2cb6a2430270e7b39ffaf86653ce803dd7d872a2e
+MISC ChangeLog 1623 RMD160 6d64d412f60ee7481abec28d447238b6189e555b SHA1 8db36715cb1fe6be3b2a49dfb70fca7626270227 SHA256 cd9e0c9f67f9257ff52b50e6ad01220344fe01c0f60c2f4182ffebdd31756d67
 MISC metadata.xml 307 RMD160 adf8f609356299d4ac36899199aa6c537a88ba1a SHA1 1192d0aac8a8e750aa21855c3f0ea496870d33cd SHA256 b524a9afb9171d893dafdf8434c7b707d819c4df07e53d96193e74369692de77
diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch
new file mode 100644
index 000000000000..b374e808ece2
--- /dev/null
+++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-Makefile.patch
@@ -0,0 +1,28 @@
+Fix LDFLAGS (bug http://bugs.gentoo.org/336956 ) and
+CFLAGS (bug http://bugs.gentoo.org/240894 ) by
+Michael Weber <xmw@gentoo.org>
+
+--- linksys-tftp-1.2.1/Makefile
++++ linksys-tftp-1.2.1/Makefile
+@@ -19,18 +19,18 @@
+ # We override /usr/include/arpa/tftp.h with our own because
+ # we want tu_block to be unsigned short, not short as on most platforms
+ #
+-CFLAGS=	-I. -O2 -Dsin=sin_x
++CFLAGS +=	-I. -Dsin=sin_x
+ #DEBUG
+ # CFLAGS=	-I. -Wall -ggdb -Dsin=sin_x
+ SRCS=	main.c tftp.c tftpsubs.c
+ OBJS=	main.o tftp.o tftpsubs.o
+ DOBJS=	tftpsubs.o
+-CC=	gcc
++CC?=	gcc
+ 
+ all: linksys-tftp
+ 
+ linksys-tftp: ${OBJS}
+-	${CC} -o $@ ${CFLAGS} ${OBJS} 
++	${CC} -o $@ ${CFLAGS} ${OBJS} ${LDFLAGS}
+ 
+ clean:
+ 	rm -f ${OBJS} ${DOBJS} *core linksys-tftp
diff --git a/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch
new file mode 100644
index 000000000000..386cf7b1e210
--- /dev/null
+++ b/net-ftp/linksys-tftp/files/linksys-tftp-1.2.1-r1-header.patch
@@ -0,0 +1,20 @@
+--- linksys-tftp-1.2.1/main.c
++++ linksys-tftp-1.2.1/main.c
+@@ -40,6 +40,8 @@
+ #include <setjmp.h>
+ #include <ctype.h>
+ #include <netdb.h>
++#include <stdlib.h>
++#include <strings.h>
+ 
+ #define	TIMEOUT		5		/* secs between rexmt's */
+ 
+@@ -110,7 +112,7 @@
+ char	*index();
+ char	*rindex();
+ 
+-main(argc, argv)
++int main(argc, argv)
+ 	char *argv[];
+ {
+ 	struct sockaddr_in sin;
diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r1.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..572e2f4c64c1
--- /dev/null
+++ b/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/linksys-tftp-1.2.1-r1.ebuild,v 1.1 2010/10/04 15:57:22 xmw Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TFTP client suitable for uploading to the Linksys WRT54G Wireless Router"
+HOMEPAGE="http://redsand.net/projects/linksys-tftp/linksys-tftp.php"
+SRC_URI="http://redsand.net/projects/${PN}/pub/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gcc"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PF}-Makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	doexe linksys-tftp || die
+	dodoc README || die
+}
diff --git a/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild b/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild
index 848aef36138b..a37e325e87da 100644
--- a/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild
+++ b/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild,v 1.4 2009/09/23 18:37:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/linksys-tftp/linksys-tftp-1.2.1.ebuild,v 1.5 2010/10/04 15:57:22 xmw Exp $
 
 IUSE=""
 DESCRIPTION="TFTP client suitable for uploading to the Linksys WRT54G Wireless Router"
-HOMEPAGE="http://redsand.net/"
-SRC_URI="http://redsand.net/code/linksys-tftp-${PV}.tar.bz2"
+HOMEPAGE="http://redsand.net/projects/linksys-tftp/linksys-tftp.php"
+SRC_URI="mirror://gentoo/linksys-tftp-${PV}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"