mail/mboxgrep: fixes for -fno-common and missing prototypes

This commit is contained in:
naddy 2021-02-03 19:13:11 +00:00
parent f657b77181
commit 65b2142d3b
4 changed files with 50 additions and 7 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2019/07/12 21:02:22 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2021/02/03 19:13:11 naddy Exp $
COMMENT= scan mailboxes for messages matching a regular expression
DISTNAME= mboxgrep-0.7.9
REVISION= 0
CATEGORIES= mail
HOMEPAGE= http://www.mboxgrep.org/
@ -21,8 +22,7 @@ CONFIGURE_STYLE= gnu dest
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
# md5.c:122: warning: incompatible implicit declaration of built-in function 'bcopy'
CFLAGS += -DSTDC_HEADERS
CFLAGS += -DHAVE_CONFIG_H
NO_TEST= Yes

View File

@ -1,11 +1,22 @@
$OpenBSD: patch-src_main_c,v 1.1 2015/06/19 12:44:49 ajacoutot Exp $
$OpenBSD: patch-src_main_c,v 1.2 2021/02/03 19:13:11 naddy Exp $
fix for -fno-common
main.c:317: warning: dereferencing 'void *' pointer
main.c:317: error: request for member '_file' in something not a structure or union
--- src/main.c.orig Fri Jun 19 14:37:26 2015
+++ src/main.c Fri Jun 19 14:37:27 2015
@@ -55,7 +55,7 @@ pcre_extra *hints;
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
@@ -47,6 +47,7 @@
#include <dmalloc.h>
#endif /* HAVE_LIBDMALLOC */
+option_t config;
regex_t posix_pattern;
#ifdef HAVE_LIBPCRE
pcre *pcre_pattern;
@@ -55,7 +56,7 @@ pcre_extra *hints;
char *boxname, *outboxname, *pipecmd, *tmpfilename;
int maildir_count = 0;
int count = 0;

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_mboxgrep_h,v 1.1 2021/02/03 19:13:11 naddy Exp $
Index: src/mboxgrep.h
--- src/mboxgrep.h.orig
+++ src/mboxgrep.h
@@ -129,6 +129,6 @@ typedef struct
}
option_t;
-option_t config;
+extern option_t config;
#endif /* MBOXGREP_H */

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-src_misc_c,v 1.1 2021/02/03 19:13:11 naddy Exp $
Index: src/misc.c
--- src/misc.c.orig
+++ src/misc.c
@@ -20,12 +20,9 @@
-#define _XOPEN_SOURCE /* Pull in strptime(3) from time.h */
-#define _BSD_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
- * from string.h. */
-
#include <config.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <errno.h>
#include <stdlib.h>
#include <time.h>