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

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

2 files changed, 48 insertions, 0 deletions

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;