Index: head/security/snoopy/Makefile =================================================================== --- head/security/snoopy/Makefile (revision 461296) +++ head/security/snoopy/Makefile (revision 461297) @@ -1,40 +1,50 @@ # Created by: Philippe Audeoud # $FreeBSD$ PORTNAME= snoopy PORTVERSION= 2.4.6 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= security MAINTAINER= sunpoet@FreeBSD.org COMMENT= Log every executed command to syslog LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash TEST_DEPENDS= socat:net/socat OPTIONS_DEFINE= DOCS CONFIGURE_ARGS= --disable-datasource-tid_kernel \ ac_cv_prog_SNOOPY_PROG_SOCAT_FOUND=yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes USES= autoreconf gmake libtool shebangfix GH_ACCOUNT= a2o USE_GITHUB= yes SHEBANG_GLOB= *.sh post-patch: + @${REINPLACE_CMD} -e 's| -Wall -Werror||' ${WRKSRC}/configure.ac ${WRKSRC}/build/Makefile.am.common @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/README.md + @${REINPLACE_CMD} -e '/#define.*_XOPEN_SOURCE/d' \ + ${WRKSRC}/src/configfile.c \ + ${WRKSRC}/src/datasource/sid.c \ + ${WRKSRC}/src/datasource/snoopy_version.c \ + ${WRKSRC}/src/snoopy.h \ + ${WRKSRC}/tests/bin/snoopy-test-threads.c \ + ${WRKSRC}/src/tsrm.c + @${REINPLACE_CMD} -e '/features.h/d' ${WRKSRC}/configure.ac ${WRKSRC}/src/output/socketoutput.c ${WRKSRC}/src/snoopy.h + @${REINPLACE_CMD} -e 's|#include |#include |' ${WRKSRC}/tests/bin/snoopy-test-exec-in-threads.c ${WRKSRC}/tests/bin/snoopy-test-threads.c do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/ && ${INSTALL_DATA} ChangeLog README.md ${STAGEDIR}${DOCSDIR}/ cd ${WRKSRC}/doc/ && ${INSTALL_DATA} CONTRIBUTING.md FAQ.md FILTER_exclude_spawns_of.md HACKING.md INSTALL.md ${STAGEDIR}${DOCSDIR}/ .include Index: head/security/snoopy/files/patch-src-tsrm.c =================================================================== --- head/security/snoopy/files/patch-src-tsrm.c (revision 461296) +++ head/security/snoopy/files/patch-src-tsrm.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/tsrm.c.orig 2016-09-14 15:02:26 UTC -+++ src/tsrm.c -@@ -25,7 +25,6 @@ - /* - * Includes order: from local to global - */ --#define _XOPEN_SOURCE 700 // Required by pthread_mutex_setattr - - #include "tsrm.h" - Property changes on: head/security/snoopy/files/patch-src-tsrm.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-src-datasource-snoopy_version.c =================================================================== --- head/security/snoopy/files/patch-src-datasource-snoopy_version.c (revision 461296) +++ head/security/snoopy/files/patch-src-datasource-snoopy_version.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/datasource/snoopy_version.c.orig 2016-09-14 15:02:26 UTC -+++ src/datasource/snoopy_version.c -@@ -30,7 +30,6 @@ - #include "snoopy.h" - - #ifndef _XOPEN_SOURCE /* Needed to get getpgid and getsid on older glibc */ --#define _XOPEN_SOURCE 500 - #endif - #include - #include Property changes on: head/security/snoopy/files/patch-src-datasource-snoopy_version.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-src-snoopy.h =================================================================== --- head/security/snoopy/files/patch-src-snoopy.h (revision 461296) +++ head/security/snoopy/files/patch-src-snoopy.h (nonexistent) @@ -1,14 +0,0 @@ ---- src/snoopy.h.orig 2016-09-14 15:02:26 UTC -+++ src/snoopy.h -@@ -31,11 +31,6 @@ - /* This must be the first file to be included, or implicit inclusion - * (by i.e. ) does the wrong thing - */ --#ifdef _XOPEN_SOURCE --#undef _XOPEN_SOURCE --#endif --#define _XOPEN_SOURCE 500 --#include /* Needed for GLIBC macros here */ - #include /* Needed for syslog defaults */ - #include /* Needed for _SC_ARG_MAX constant */ - Property changes on: head/security/snoopy/files/patch-src-snoopy.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-src-datasource-sid.c =================================================================== --- head/security/snoopy/files/patch-src-datasource-sid.c (revision 461296) +++ head/security/snoopy/files/patch-src-datasource-sid.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/datasource/sid.c.orig 2016-09-14 15:02:26 UTC -+++ src/datasource/sid.c -@@ -30,7 +30,6 @@ - #include "snoopy.h" - - #ifndef _XOPEN_SOURCE /* Needed to get getpgid and getsid on older glibc */ --#define _XOPEN_SOURCE 500 - #endif - #include - #include Property changes on: head/security/snoopy/files/patch-src-datasource-sid.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-tests-bin-snoopy-test-exec-in-threads.c =================================================================== --- head/security/snoopy/files/patch-tests-bin-snoopy-test-exec-in-threads.c (revision 461296) +++ head/security/snoopy/files/patch-tests-bin-snoopy-test-exec-in-threads.c (nonexistent) @@ -1,11 +0,0 @@ ---- tests/bin/snoopy-test-exec-in-threads.c.orig 2016-09-14 15:02:26 UTC -+++ tests/bin/snoopy-test-exec-in-threads.c -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - - Property changes on: head/security/snoopy/files/patch-tests-bin-snoopy-test-exec-in-threads.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-build-Makefile.am.common =================================================================== --- head/security/snoopy/files/patch-build-Makefile.am.common (revision 461296) +++ head/security/snoopy/files/patch-build-Makefile.am.common (nonexistent) @@ -1,8 +0,0 @@ ---- build/Makefile.am.common.orig 2016-09-14 15:02:26 UTC -+++ build/Makefile.am.common -@@ -9,4 +9,4 @@ MAINTAINERCLEANFILES = Makefile.in - # Note: - # -I$(top_srcdir) is here for #include 'lib/iniparser/src/iniparser.h' to work - # --AM_CFLAGS = -Wall -Werror -Wextra -Wno-unused-parameter -std=c99 -pedantic -I$(top_srcdir) -+AM_CFLAGS = -Wextra -Wno-unused-parameter -std=c99 -pedantic -I$(top_srcdir) Property changes on: head/security/snoopy/files/patch-build-Makefile.am.common ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-src-configfile.c =================================================================== --- head/security/snoopy/files/patch-src-configfile.c (revision 461296) +++ head/security/snoopy/files/patch-src-configfile.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/configfile.c.orig 2016-09-14 15:02:26 UTC -+++ src/configfile.c -@@ -35,9 +35,6 @@ - - #include "lib/inih/src/ini.h" - --#ifndef _XOPEN_SOURCE // For strdup --#define _XOPEN_SOURCE 500 --#endif - #include - #include - #include Property changes on: head/security/snoopy/files/patch-src-configfile.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-src-output-socketoutput.c =================================================================== --- head/security/snoopy/files/patch-src-output-socketoutput.c (revision 461296) +++ head/security/snoopy/files/patch-src-output-socketoutput.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/output/socketoutput.c.orig 2016-09-14 15:02:26 UTC -+++ src/output/socketoutput.c -@@ -30,7 +30,6 @@ - #include "snoopy.h" - #include "configuration.h" - --#include - #include - #include - #include Property changes on: head/security/snoopy/files/patch-src-output-socketoutput.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/snoopy/files/patch-configure.ac =================================================================== --- head/security/snoopy/files/patch-configure.ac (revision 461296) +++ head/security/snoopy/files/patch-configure.ac (revision 461297) @@ -1,30 +1,15 @@ --- configure.ac.orig 2016-09-14 15:02:26 UTC +++ configure.ac -@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([src/eventsource/execve - AC_CONFIG_AUX_DIR([build/aux]) - AC_CONFIG_MACRO_DIR([build/m4]) - m4_include([build/snoopy.m4]) --AM_INIT_AUTOMAKE([1.11 gnu silent-rules subdir-objects -Wall -Werror]) -+AM_INIT_AUTOMAKE([1.11 gnu silent-rules subdir-objects]) +@@ -125,12 +125,6 @@ SNOOPY_PROG_CHECK([wc], [WC], - ### Silent make output -@@ -125,18 +125,11 @@ SNOOPY_PROG_CHECK([wc], [WC], - - -dnl Checks for libraries. -dnl FIXME: Replace `main' with a function in `-ldl': -AC_CHECK_LIB([dl], [dlsym], [], [ - AC_MSG_ERROR([A library is missing. Unable to continue.]) -]) - dnl Checks for header files. AC_CHECK_HEADERS([ \ ctype.h \ - dlfcn.h \ - errno.h \ -- features.h \ - grp.h \ - limits.h \ - pwd.h \ Index: head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c =================================================================== --- head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c (revision 461296) +++ head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c (revision 461297) @@ -1,28 +1,11 @@ ---- tests/bin/snoopy-test-threads.c.orig 2016-09-14 15:02:26 UTC -+++ tests/bin/snoopy-test-threads.c -@@ -25,7 +25,6 @@ - /* - * Includes order: from local to global - */ --#define _XOPEN_SOURCE 500 - #define _GNU_SOURCE - - #include -@@ -42,7 +41,7 @@ - #include - #include - #include --#include -+#include - - - -@@ -307,7 +306,7 @@ int randomNumberInclusive (int nMin, int +--- tests/bin/snoopy-test-threads.c.orig 2017-12-26 01:38:15.298217000 +0800 ++++ tests/bin/snoopy-test-threads.c 2017-12-26 01:41:42.177506000 +0800 +@@ -307,7 +307,7 @@ int randomNr; // Seed - rndSeed = (unsigned int) (pthread_self() + getpid() + syscall(SYS_gettid) + time(NULL)); + rndSeed = (unsigned int) ((unsigned int)pthread_self() + getpid() + time(NULL)); srand(rndSeed); // Generate