diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-security/recipes-ids/suricata/files/no_libhtp_build.patch | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-ids/suricata/files/no_libhtp_build.patch')
| -rw-r--r-- | meta-security/recipes-ids/suricata/files/no_libhtp_build.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-security/recipes-ids/suricata/files/no_libhtp_build.patch b/meta-security/recipes-ids/suricata/files/no_libhtp_build.patch new file mode 100644 index 000000000..2ebf021fc --- /dev/null +++ b/meta-security/recipes-ids/suricata/files/no_libhtp_build.patch @@ -0,0 +1,38 @@ +Upstream-Status: Inappropriate [configuration] + +Signed-of_by: Armin Kuster <akuster808@gmail.com> + +Index: suricata-2.0.5/Makefile.am +=================================================================== +--- suricata-2.0.5.orig/Makefile.am ++++ suricata-2.0.5/Makefile.am +@@ -5,7 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = ChangeLog COPYING LICENSE suricata.yaml.in \ + classification.config threshold.config \ + reference.config +-SUBDIRS = $(HTP_DIR) src qa rules doc contrib scripts ++SUBDIRS = src qa rules doc contrib scripts + + CLEANFILES = stamp-h[0-9]* + +Index: suricata-2.0.5/Makefile.in +=================================================================== +--- suricata-2.0.5.orig/Makefile.in ++++ suricata-2.0.5/Makefile.in +@@ -229,7 +229,6 @@ HAVE_PCAP_CONFIG = @HAVE_PCAP_CONFIG@ + HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ + HAVE_PYTHON_CONFIG = @HAVE_PYTHON_CONFIG@ + HAVE_WGET = @HAVE_WGET@ +-HTP_DIR = @HTP_DIR@ + HTP_LDADD = @HTP_LDADD@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -369,7 +368,7 @@ EXTRA_DIST = ChangeLog COPYING LICENSE s + classification.config threshold.config \ + reference.config + +-SUBDIRS = $(HTP_DIR) src qa rules doc contrib scripts ++SUBDIRS = src qa rules doc contrib scripts + CLEANFILES = stamp-h[0-9]* + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive |