flx/flx: Refresh patches

Package-Manager: portage-2.2.28

4 files changed, 19 insertions, 80 deletions

diff --git a/flx/flx/Manifest b/flx/flx/Manifest
index d89686dd..fa34e104 100644
--- a/flx/flx/Manifest
+++ b/flx/flx/Manifest
@@ -1,8 +1,7 @@
 AUX 0.1.34-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
 AUX 0.1.34-warning-cast.diff 9513 SHA256 4bb4801f530869cb5e1bfecfa5cb007b4b5e5b1de1e25404f1c107135025a165 WHIRLPOOL 1cb86d258df028e7c46f10d8a5866f32565e359f1cfc644cadd46478de140b3f3ebc1c42a764056ca301c27b519907290ca77e7a277f0064cffba9d391b5d3a1
 AUX 0.1.34-warning-implicit-declaration.diff 1147 SHA256 610c41f21175e369bfe1185b59b875744506b4d5ec2fcdd529f7d3beb8d64d29 WHIRLPOOL 98483417447ab1a1d61facc32f65af5bf4ec70a99983592d4088d18f62840a5e35b9d31b95451a3f835b2eb3d40b12928ec52205f25bf7ae830867ffa46fecc4
-AUX 9999-respect-CFLAGS-LDFLAGS.diff 503 SHA256 8a8342cba996d51e42b5c9486ce42591b7f0899f850d05cd6c4aa5d9118b5add WHIRLPOOL e67c1eab1bca82464bbbdaa3990dba2d3d9bf744fb60bdc6a8e4da38b2dc73484bdc164c91939a4c9f83a51743b338bccb7d2c00849a53d64031b650f7ba3c55
-AUX 9999-warning-implicit-declaration.diff 1443 SHA256 8cb585822838656c1cb6a7f4f5b37108839122c3abac1d654093be642d69ff76 WHIRLPOOL 79a0ffadfe979ba7c69f6efb7b770a0a4bc2f399b2a827e2bd30f985447765651124f7decf278fc31306f302fbcad31e98bdcde0065e3d90aff15a6966841e34
+AUX 9999-respect-CFLAGS-LDFLAGS.diff 858 SHA256 9acbe7eaf5e8900153c78c891fd698fcf0b98a23d9a09335f3df43cb8e82c9e8 WHIRLPOOL 5558622a3241f9a8a9fc5d5215f652cd6b0481ca29df7c19e753188fd97ca1ac495965e9394f3e46437b3360b10acf3b14be181d12d37fb55f76ba061313039e
 EBUILD flx-0.1.34.ebuild 738 SHA256 4364104811a2dda858f7ed5daab84254bd1e97bbe0dfa839d52e6918874a6311 WHIRLPOOL 87365476ecf85a33c463041c1de0e0530d401e949ce8ed456a1bf62d07ef284b79fa0740e9e5c615774c10b13d22957956010545db2e3c44d8a06d29da2f843a
-EBUILD flx-9999.ebuild 708 SHA256 5c92e6a4ed182cdc0bfbb6afcc2d27cddcd7227f6ef1ec9a8e085d4a629ce2ea WHIRLPOOL 01e5e1a75aa3ef68aeb7bf751a503897a3546b2c3aee426d0784a4990bc2bf230cd14dc4d1682210e99271e6fe87b872658184415e4f9fcfd5fc939f4b466512
+EBUILD flx-9999.ebuild 646 SHA256 80f0999840aceed3f99da662499bc75c663c69d46156ceead15f0d16f44ce2e6 WHIRLPOOL 0c85c8e87640945afdf5f1769f122b1da01436e5b461f9c20378534aab28098a12e5364967de0443202e3a204807ad34e6da90ba9d4dd2f9876709d00e713cd0
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff b/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff
index 54f85b98..efe73339 100644
--- a/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff
+++ b/flx/flx/files/9999-respect-CFLAGS-LDFLAGS.diff
@@ -1,15 +1,27 @@
+From 2932a6d7bfc0d1bd7fdb303c5594010424b33378 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon May 27 22:36:39 2013 +0200
+Subject: [PATCH] MEDIUM: Respect CFLAGS and LDFLAGS
+
+---
+ flx/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/flx/Makefile b/flx/Makefile
-index 6bee331..7cb9fd2 100644
+index 68ecb4c..274cd94 100644
 --- a/flx/Makefile
 +++ b/flx/Makefile
 @@ -32,8 +32,8 @@ SRC=main.c arg.c utils.c md5.c flx.c fct1.c check.c sign.c \
      output.c output_file.c
  OBJ=$(SRC:.c=.o)
- COPTS=-O2
--CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
+ COPTS=-O2 -fno-strict-aliasing
+-CFLAGS= -Wall $(COPTS) -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
 -LDFLAGS=-L. -Wl,--gc-sections
-+CFLAGS	+= -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\"
-+LDFLAGS	+= -Wl,--gc-sections
++CFLAGS += -DMEM_OPTIM -DPROGRAM_NAME=\"$(NAME)\" -DPROGRAM_VERSION=\"$(VERSION)\" -U_FORTIFY_SOURCE
++LDFLAGS +=-L. -Wl,--gc-sections
  
  all:	$(NAME)
  
+-- 
+2.7.3
+
diff --git a/flx/flx/files/9999-warning-implicit-declaration.diff b/flx/flx/files/9999-warning-implicit-declaration.diff
deleted file mode 100644
index 4f5f02af..00000000
--- a/flx/flx/files/9999-warning-implicit-declaration.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/flx/arg.c b/flx/arg.c
-index d82d2d1..8b7c112 100644
---- a/flx/arg.c
-+++ b/flx/arg.c
-@@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdarg.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "arg.h"
-diff --git a/flx/check.c b/flx/check.c
-index 0a425c3..9589c5e 100644
---- a/flx/check.c
-+++ b/flx/check.c
-@@ -23,6 +23,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include "flx.h"
- #include "check.h"
-diff --git a/flx/input.c b/flx/input.c
-index 182fa83..5e9ecbc 100644
---- a/flx/input.c
-+++ b/flx/input.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "source_type.h"
- #include "input.h"
-diff --git a/flx/output.c b/flx/output.c
-index 7898fc8..801bccc 100644
---- a/flx/output.c
-+++ b/flx/output.c
-@@ -1,4 +1,6 @@
- #include <string.h>
-+#include <stdlib.h>
-+
- #include "utils.h"
- #include "flx.h"
- #include "output.h"
-diff --git a/flx/utils.c b/flx/utils.c
-index 6b0272a..16aaad2 100644
---- a/flx/utils.c
-+++ b/flx/utils.c
-@@ -6,6 +6,7 @@
- #include <fcntl.h>
- #include <stdarg.h>
- #include <ctype.h>
-+#include <stdlib.h>
- 
- #include "utils.h"
- 
-diff --git a/flx/md5.c b/flx/md5.c
-index 5323469..b9dfe45 100644
---- a/flx/md5.c
-+++ b/flx/md5.c
-@@ -15,6 +15,8 @@
-  * will fill a supplied 16-byte array with the digest.
-  */
- 
-+#include <string.h>
-+
- #include "md5.h"
- 
- static void MD5Transform(unsigned int buf[4], unsigned int const in[16]);
diff --git a/flx/flx/flx-9999.ebuild b/flx/flx/flx-9999.ebuild
index d0caf58f..fbc52bc0 100644
--- a/flx/flx/flx-9999.ebuild
+++ b/flx/flx/flx-9999.ebuild
@@ -21,7 +21,6 @@ src_prepare () {
 	default
 
 	epatch "${FILESDIR}/${PV}-respect-CFLAGS-LDFLAGS.diff"
-	epatch "${FILESDIR}/${PV}-warning-implicit-declaration.diff"
 
 	tc-export CC
 }