diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-security/recipes-security/fail2ban | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-security/fail2ban')
-rw-r--r-- | meta-security/recipes-security/fail2ban/files/run-ptest | 3 | ||||
-rw-r--r-- | meta-security/recipes-security/fail2ban/python-fail2ban.inc (renamed from meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb) | 18 | ||||
-rw-r--r-- | meta-security/recipes-security/fail2ban/python-fail2ban_0.10.3.1.bb | 4 | ||||
-rw-r--r-- | meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.3.1.bb | 4 |
4 files changed, 24 insertions, 5 deletions
diff --git a/meta-security/recipes-security/fail2ban/files/run-ptest b/meta-security/recipes-security/fail2ban/files/run-ptest new file mode 100644 index 000000000..9f6aebe82 --- /dev/null +++ b/meta-security/recipes-security/fail2ban/files/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +##PYTHON## fail2ban-testcases diff --git a/meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb b/meta-security/recipes-security/fail2ban/python-fail2ban.inc index 7e2deba2d..9245f17b1 100644 --- a/meta-security/recipes-security/fail2ban/fail2ban_0.10.2.bb +++ b/meta-security/recipes-security/fail2ban/python-fail2ban.inc @@ -9,14 +9,15 @@ HOMEPAGE = "http://www.fail2ban.org" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=ecabc31e90311da843753ba772885d9f" -SRCREV ="a45488465e0dd547eb8479c0fa9fd577c1837213" +SRCREV ="ac0d441fd68852ffda7b15c71f16b7f4fde1a7ee" SRC_URI = " \ - git://github.com/fail2ban/fail2ban.git;branch=0.10 \ + git://github.com/fail2ban/fail2ban.git;branch=0.11 \ file://initd \ - file://fail2ban_setup.py \ + file://fail2ban_setup.py \ + file://run-ptest \ " -inherit update-rc.d setuptools +inherit update-rc.d ptest S = "${WORKDIR}/git" @@ -32,10 +33,17 @@ do_install_append () { install -d ${D}/${sysconfdir}/fail2ban install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server + chown -R root:root ${D}/${bindir} +} + +do_install_ptest_append () { + install -d ${D}${PTEST_PATH} + sed -i -e 's/##PYTHON##/${PYTHON_PN}/g' ${D}${PTEST_PATH}/run-ptest + install -D ${S}/bin/fail2ban-testcases ${D}${PTEST_PATH} } FILES_${PN} += "/run" INSANE_SKIP_${PN}_append = "already-stripped" -RDEPENDS_${PN} = "sysklogd iptables sqlite3 python python-pyinotify" +RDEPENDS_${PN} = "sysklogd iptables sqlite3 ${PYTHON_PN} ${PYTHON_PN}-pyinotify" diff --git a/meta-security/recipes-security/fail2ban/python-fail2ban_0.10.3.1.bb b/meta-security/recipes-security/fail2ban/python-fail2ban_0.10.3.1.bb new file mode 100644 index 000000000..17a7dd8dd --- /dev/null +++ b/meta-security/recipes-security/fail2ban/python-fail2ban_0.10.3.1.bb @@ -0,0 +1,4 @@ +inherit setuptools +require python-fail2ban.inc + +RDEPENDS_${PN}-ptest = "python python-modules python-fail2ban" diff --git a/meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.3.1.bb b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.3.1.bb new file mode 100644 index 000000000..5c887e857 --- /dev/null +++ b/meta-security/recipes-security/fail2ban/python3-fail2ban_0.10.3.1.bb @@ -0,0 +1,4 @@ +inherit setuptools3 +require python-fail2ban.inc + +RDEPENDS_${PN}-ptest = "python3-core python3-io python3-modules python3-fail2ban" |