mail/ifile: fix mail/ifile build with FORTIFY_SOURCE

PR:		202572
Submitted by:	Oliver Pinter <op@freebsd.org>
This commit is contained in:
Kurt Jaeger 2015-08-31 19:31:06 +00:00
parent 850e406d55
commit 5c080d0f3d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=395725
6 changed files with 61 additions and 7 deletions

View file

@ -9,6 +9,8 @@ MASTER_SITES= http://people.csail.mit.edu/jrennie/ifile/
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Application of machine learning to e-mail filtering COMMENT= Application of machine learning to e-mail filtering
LICENSE= GPLv2
USES= gmake USES= gmake
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_CSTD= gnu89 USE_CSTD= gnu89

View file

@ -1,14 +1,22 @@
--- Makefile.in.orig 2006-05-22 11:49:21.000000000 -0500 --- Makefile.in.orig 2006-05-22 16:49:21 UTC
+++ Makefile.in 2011-03-25 14:18:34.000000000 -0500 +++ Makefile.in
@@ -48,3 +48,3 @@ @@ -46,7 +46,7 @@ LIBS = @LIBS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
INCLUDEFLAGS = INCLUDEFLAGS =
-LDFLAGS = -LDFLAGS =
+LDFLAGS = @LDFLAGS@ +LDFLAGS = @LDFLAGS@
@@ -56,4 +56,4 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -54,8 +54,8 @@ bindir = @bindir@
mandir = @mandir@
# Installation locations # Installation locations
-if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi -if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi
-if [ ! $mandir ] ; then mandir = $(prefix)/man; fi -if [ ! $mandir ] ; then mandir = $(prefix)/man; fi
+# if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi +# if [ ! $bindir ] ; then bindir = $(exec_prefix)/bin; fi
+# if [ ! $mandir ] ; then mandir = $(prefix)/man; fi +# if [ ! $mandir ] ; then mandir = $(prefix)/man; fi
#### This is just a test---feel free to delete ###
printdirs:

View file

@ -0,0 +1,20 @@
--- argp/argp-fmtstream.h.orig 2006-05-22 16:49:23 UTC
+++ argp/argp-fmtstream.h
@@ -186,7 +186,7 @@ extern void __argp_fmtstream_update (arg
extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
-#ifdef __OPTIMIZE__
+#ifdef __OPTIMIZE_INLINE__
/* Inline versions of above routines. */
#if !_LIBC
@@ -298,7 +298,7 @@ __argp_fmtstream_point (argp_fmtstream_t
#undef __argp_fmtstream_ensure
#endif
-#endif /* __OPTIMIZE__ */
+#endif /* __OPTIMIZE_INLINE__ */
#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */

View file

@ -0,0 +1,12 @@
--- argp/argp-fs-xinl.c.orig 2006-05-22 16:49:22 UTC
+++ argp/argp-fs-xinl.c
@@ -24,7 +24,8 @@
#define ARGP_FS_EI
#undef __OPTIMIZE__
-#define __OPTIMIZE__
+#define __OPTIMIZE__ 0
+#define __OPTIMIZE_INLINE__
#include "argp-fmtstream.h"
/* Add weak aliases. */

View file

@ -0,0 +1,12 @@
--- argp/argp-xinl.c.orig 2006-05-22 16:49:22 UTC
+++ argp/argp-xinl.c
@@ -24,7 +24,8 @@
#define ARGP_EI
#undef __OPTIMIZE__
-#define __OPTIMIZE__
+#define __OPTIMIZE__ 0
+#define __OPTIMIZE_INLINE__
#include "argp.h"
/* Add weak aliases. */

View file

@ -1,6 +1,6 @@
--- argp/argp.h.orig Tue Jun 10 23:09:27 2003 --- argp/argp.h.orig 2006-05-22 16:49:22 UTC
+++ argp/argp.h Mon Jul 7 04:31:41 2003 +++ argp/argp.h
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@ struct argp_state
#define ARGP_NO_EXIT 0x20 #define ARGP_NO_EXIT 0x20
/* Use the gnu getopt `long-only' rules for parsing arguments. */ /* Use the gnu getopt `long-only' rules for parsing arguments. */