svn commit: r461297 - in head/security/snoopy: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Feb 9 14:07:39 UTC 2018
Author: sunpoet
Date: Fri Feb 9 14:07:36 2018
New Revision: 461297
URL: https://svnweb.freebsd.org/changeset/ports/461297
Log:
Use REINPLACE_CMD instead of patch files
Deleted:
head/security/snoopy/files/patch-build-Makefile.am.common
head/security/snoopy/files/patch-src-configfile.c
head/security/snoopy/files/patch-src-datasource-sid.c
head/security/snoopy/files/patch-src-datasource-snoopy_version.c
head/security/snoopy/files/patch-src-output-socketoutput.c
head/security/snoopy/files/patch-src-snoopy.h
head/security/snoopy/files/patch-src-tsrm.c
head/security/snoopy/files/patch-tests-bin-snoopy-test-exec-in-threads.c
Modified:
head/security/snoopy/Makefile
head/security/snoopy/files/patch-configure.ac
head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c
Modified: head/security/snoopy/Makefile
==============================================================================
--- head/security/snoopy/Makefile Fri Feb 9 14:07:31 2018 (r461296)
+++ head/security/snoopy/Makefile Fri Feb 9 14:07:36 2018 (r461297)
@@ -30,7 +30,17 @@ 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 <wait.h>|#include <sys/wait.h>|' ${WRKSRC}/tests/bin/snoopy-test-exec-in-threads.c ${WRKSRC}/tests/bin/snoopy-test-threads.c
do-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
Modified: head/security/snoopy/files/patch-configure.ac
==============================================================================
--- head/security/snoopy/files/patch-configure.ac Fri Feb 9 14:07:31 2018 (r461296)
+++ head/security/snoopy/files/patch-configure.ac Fri Feb 9 14:07:36 2018 (r461297)
@@ -1,18 +1,9 @@
--- 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], [], [
@@ -22,9 +13,3 @@
dnl Checks for header files.
AC_CHECK_HEADERS([ \
ctype.h \
- dlfcn.h \
- errno.h \
-- features.h \
- grp.h \
- limits.h \
- pwd.h \
Modified: head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c
==============================================================================
--- head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c Fri Feb 9 14:07:31 2018 (r461296)
+++ head/security/snoopy/files/patch-tests-bin-snoopy-test-threads.c Fri Feb 9 14:07:36 2018 (r461297)
@@ -1,23 +1,6 @@
---- 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 <snoopy.h>
-@@ -42,7 +41,7 @@
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <unistd.h>
--#include <wait.h>
-+#include <sys/wait.h>
-
-
-
-@@ -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
More information about the svn-ports-head
mailing list