mirror of
https://git.yoctoproject.org/meta-security
synced 2026-06-02 01:20:29 +00:00
tripwire: update to 2.4.3.1
this also fixes clang and gcc 5.3 build issues remove merged patches Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Armin Kuster <akuster@mvista.com>
This commit is contained in:
Armin Kuster
committed by
Armin Kuster
Armin Kuster
parent
b8319ce072
commit
7717b77059
@@ -1,29 +0,0 @@
|
||||
tripwire: Add aach64 support
|
||||
|
||||
Upstream-Status: Submitted to tripwire-dev
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
|
||||
Index: config.sub
|
||||
===================================================================
|
||||
--- a/config.sub
|
||||
+++ b/config.sub
|
||||
@@ -223,7 +223,7 @@ esac
|
||||
case $basic_machine in
|
||||
# Recognize the basic CPU types without company name.
|
||||
# Some are omitted here because they have special meanings below.
|
||||
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
|
||||
+ tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | aarch64 | aarch64be |arc \
|
||||
| arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
|
||||
| pyramid | mn10200 | mn10300 | tron | a29k \
|
||||
| 580 | i960 | h8300 \
|
||||
@@ -267,7 +267,7 @@ case $basic_machine in
|
||||
# Recognize the basic CPU types with company name.
|
||||
# FIXME: clean up the formatting here.
|
||||
vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
|
||||
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
|
||||
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* | aarch64-* | aarch64be-* \
|
||||
| arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
|
||||
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
|
||||
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
|
||||
@@ -1,35 +0,0 @@
|
||||
tripwire:
|
||||
|
||||
Powerpc64 is not supported in the current tripwier release.
|
||||
|
||||
configure: error: /bin/sh ./config.sub powerpc64-poky-linux failed
|
||||
| Configure failed. The contents of all config.log files follows to aid debugging
|
||||
|
||||
Submitted upstream to Tripwire devel mailing list
|
||||
|
||||
http://sourceforge.net/p/tripwire/mailman/message/32776415/
|
||||
|
||||
Signed-off-By: Armin Kuster <akuster808@gmail.com>
|
||||
|
||||
Index: tripwire-2.4.2.2-src/config.sub
|
||||
===================================================================
|
||||
--- tripwire-2.4.2.2-src.orig/config.sub
|
||||
+++ tripwire-2.4.2.2-src/config.sub
|
||||
@@ -233,7 +233,7 @@ case $basic_machine in
|
||||
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
|
||||
| alphaev6[78] \
|
||||
| we32k | ns16k | clipper | i370 | sh | sh[34] \
|
||||
- | powerpc | powerpcle \
|
||||
+ | powerpc | powerpcle | powerpc64 \
|
||||
| 1750a | dsp16xx | pdp10 | pdp11 \
|
||||
| mips16 | mips64 | mipsel | mips64el \
|
||||
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
|
||||
@@ -280,7 +280,7 @@ case $basic_machine in
|
||||
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
|
||||
| clipper-* | orion-* \
|
||||
| sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
|
||||
- | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
|
||||
+ | powerpc-* | powerpcle-* | powerpc64-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
|
||||
| mips16-* | mips64-* | mipsel-* \
|
||||
| mips64el-* | mips64orion-* | mips64orionel-* \
|
||||
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
|
||||
+13
-27
@@ -6,21 +6,20 @@ SECTION = "security Monitor/Admin"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1c069be8dbbe48e89b580ab4ed86c127"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-src/${BPN}-${PV}/${BPN}-${PV}-src.tar.bz2 \
|
||||
file://tripwire.cron \
|
||||
file://tripwire.sh \
|
||||
file://tripwire.txt \
|
||||
file://twcfg.txt \
|
||||
file://twinstall.sh \
|
||||
file://twpol-yocto.txt \
|
||||
file://tripwire_add_ppc64.patch \
|
||||
file://tripwire_add_aarch64_to_configure.patch \
|
||||
file://add_armeb_arch.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "2462ea16fb0b5ae810471011ad2f2dd6"
|
||||
SRC_URI[sha256sum] = "e09a7bdca9302e704cc62067399e0b584488f825b0e58c82ad6d54cd2e899fad"
|
||||
SRCREV = "210a394b1ce63da7ac51a866ac2e68d439308701"
|
||||
|
||||
S = "${WORKDIR}/tripwire-${PV}-src"
|
||||
SRC_URI = "\
|
||||
git://github.com/Tripwire/tripwire-open-source.git \
|
||||
file://tripwire.cron \
|
||||
file://tripwire.sh \
|
||||
file://tripwire.txt \
|
||||
file://twcfg.txt \
|
||||
file://twinstall.sh \
|
||||
file://twpol-yocto.txt \
|
||||
"
|
||||
#PV = "2.4.3.1+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools-brokensep update-rc.d
|
||||
|
||||
@@ -32,18 +31,6 @@ TRIPWIRE_TARGET = "${TARGET_SYS}"
|
||||
CXXFLAGS += "-fno-strict-aliasing"
|
||||
EXTRA_OECONF = "--disable-openssl --enable-static --sysconfdir=/etc/tripwire"
|
||||
|
||||
do_configure () {
|
||||
#
|
||||
# sed bits taken from http://www.linuxfromscratch.org/blfs/view/svn/postlfs/tripwire.html
|
||||
#
|
||||
sed -i -e 's/!Equal/!this->Equal/' src/cryptlib/algebra.h &&
|
||||
sed -i -e '/stdtwadmin.h/i#include <unistd.h>' src/twadmin/twadmincl.cpp &&
|
||||
sed -i -e 's/eArchiveOpen e\([^)]*)\)/throw ( eArchiveOpen\1 )/' \
|
||||
-e '/throw e;/d' src/core/archive.cpp &&
|
||||
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
do_install () {
|
||||
install -d ${D}${libdir} ${D}${datadir} ${D}${base_libdir}
|
||||
install -d ${D}${sysconfdir} ${D}${mandir} ${D}${sbindir}
|
||||
@@ -77,5 +64,4 @@ FILES_${PN} += "${libdir} ${docdir}/${PN}/*"
|
||||
FILES_${PN}-dbg += "${sysconfdir}/${PN}/.debug"
|
||||
FILES_${PN}-staticdev += "${localstatedir}/lib/${PN}/lib*.a"
|
||||
|
||||
|
||||
RDEPENDS_${PN} += " perl nano msmtp cronie"
|
||||
Reference in New Issue
Block a user