Skip to content
Snippets Groups Projects
Commit f2acc0c6 authored by prspkt's avatar prspkt Committed by Leo
Browse files

testing/ostinato: upgrade to 1.1 

* Use `make -j1`. Parallel build fails on armv7 with:
  fatal error: protocol.pb.h: No such file or directory
* Add qt5-qtsvg-dev make dependency.
* Remove bug-265.patch, changes have been applied upstream.
parent 772340d1
No related branches found
No related tags found
2 merge requests!11958community/rclone: upgrade to 1.52.3,!10414testing/ostinato: upgrade to 1.1
Hide whitespace changes
Inline Side-by-side
testing/ostinato/APKBUILD
+ 10
− 11
View file @ f2acc0c6
# Maintainer: Corentin Henry <corentinhenry@gmail.com>
# Contributor: Corentin Henry <corentinhenry@gmail.com>
pkgname=ostinato
pkgver=0.9_git20190528
pkgrel=5
_commit="edc7ed677c1d5c308e66441f464dfd69aa922643"
pkgver=1.1
pkgrel=0
pkgdesc="Packet/Traffic Generator and Analyzer"
url="https://www.ostinato.org"
arch="all"
license="GPL-3.0-or-later"
options="!check" # make test does nothing
makedepends="qt5-qtbase-dev protobuf-dev libpcap-dev qt5-qtscript-dev libnl3-dev"
makedepends="libnl3-dev libpcap-dev protobuf-dev qt5-qtbase-dev
qt5-qtscript-dev qt5-qtsvg-dev"
subpackages="$pkgname-drone $pkgname-gui"
source="$pkgname-$_commit.tar.gz::https://github.com/pstavirs/$pkgname/archive/$_commit.tar.gz
bug-265.patch
source="$pkgname-$pkgver.tar.gz::https://github.com/pstavirs/$pkgname/archive/v$pkgver.tar.gz
ModelTest.patch
"
# pstavirs/ostinato#265
# ModelTest::ModelTest is included and needed during linking even in release mode
builddir="$srcdir/$pkgname-$_commit"
build() {
qmake-qt5 PREFIX=/usr
make CXXFLAGS="$CXXFLAGS" # qmake generates broken CFLAGS, demand it use ours
# Parallel build fails on armv7 with:
# fatal error: protocol.pb.h: No such file or directory
make -j1 CXXFLAGS="$CXXFLAGS" # qmake generates broken CFLAGS, demand it use ours
}
package() {
......@@ -42,6 +42,5 @@ gui() {
mv "$pkgdir"/usr/bin/ostinato "$subpkgdir"/usr/bin/ostinato
}
sha512sums="b71bb38d9bd429198a0cce7f4abbe599f68ceb6a13d377aef437d12a972818f53ed67090191405f8b95538c9f2101fc20548f32258a1da1aca10a812fbd05a3c ostinato-edc7ed677c1d5c308e66441f464dfd69aa922643.tar.gz
25ebe30724a22cbecada8e26b07dccbd4cbcf572e10988af11baa6dc9e4aeb31e6d332cb766f726626ef8ecc889ecaae083a540cdd41cc05edb4c354554cdced bug-265.patch
sha512sums="a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449 ostinato-1.1.tar.gz
e0a3d2781c62b1898a80af8522b36d6b1a7aeae9831c33c42e4e76fe002ee7ebff50d432508a18046d7b5988f09d9a9f90a0433cfae1d2c1cbeaf664671abf6c ModelTest.patch"
testing/ostinato/bug-265.patch deleted 100644 → 0
+ 0
− 97
View file @ 772340d1
https://github.com/pstavirs/ostinato/issues/265#issuecomment-429008063
diff --git a/common/mld.cpp b/common/mld.cpp
index 52b48a5..fbb22f5 100644
--- a/common/mld.cpp
+++ b/common/mld.cpp
@@ -225,9 +225,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16);
for (int i = 0; i < data.sources_size(); i++)
{
- qToBigEndian(data.sources(i).v6_hi(),
+ qToBigEndian(quint64(data.sources(i).v6_hi()),
(uchar*)fv.data());
- qToBigEndian(data.sources(i).v6_lo(),
+ qToBigEndian(quint64(data.sources(i).v6_lo()),
(uchar*)fv.data()+8);
list << QHostAddress((quint8*)fv.constData()).toString();
@@ -240,9 +240,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16 * data.sources_size());
for (int i = 0; i < data.sources_size(); i++)
{
- qToBigEndian(data.sources(i).v6_hi(),
+ qToBigEndian(quint64(data.sources(i).v6_hi()),
(uchar*)(fv.data() + i*16));
- qToBigEndian(data.sources(i).v6_lo(),
+ qToBigEndian(quint64(data.sources(i).v6_lo()),
(uchar*)(fv.data() + i*16 + 8));
}
return fv;
@@ -254,9 +254,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
fv.resize(16);
for (int i = 0; i < data.sources_size(); i++)
{
- qToBigEndian(data.sources(i).v6_hi(),
+ qToBigEndian(quint64(data.sources(i).v6_hi()),
(uchar*)fv.data());
- qToBigEndian(data.sources(i).v6_lo(),
+ qToBigEndian(quint64(data.sources(i).v6_lo()),
(uchar*)fv.data()+8);
list << QHostAddress((quint8*)fv.constData()).toString();
@@ -295,9 +295,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
QStringList sl;
for (int j = 0; j < rec.sources_size(); j++)
{
- qToBigEndian(rec.sources(j).v6_hi(),
+ qToBigEndian(quint64(rec.sources(j).v6_hi()),
(uchar*)(ip.data()));
- qToBigEndian(rec.sources(j).v6_lo(),
+ qToBigEndian(quint64(rec.sources(j).v6_lo()),
(uchar*)(ip.data() + 8));
sl.append(QHostAddress(
(quint8*)ip.constData()).toString());
@@ -322,15 +322,15 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
QByteArray rv = list.at(i).toByteArray();
rv.insert(4, QByteArray(16+16*rec.sources_size(), char(0)));
- qToBigEndian(rec.group_address().v6_hi(),
+ qToBigEndian(quint64(rec.group_address().v6_hi()),
(uchar*)(rv.data()+4));
- qToBigEndian(rec.group_address().v6_lo(),
+ qToBigEndian(quint64(rec.group_address().v6_lo()),
(uchar*)(rv.data()+4+8));
for (int j = 0; j < rec.sources_size(); j++)
{
- qToBigEndian(rec.sources(j).v6_hi(),
+ qToBigEndian(quint64(rec.sources(j).v6_hi()),
(uchar*)(rv.data()+20+16*j));
- qToBigEndian(rec.sources(j).v6_lo(),
+ qToBigEndian(quint64(rec.sources(j).v6_lo()),
(uchar*)(rv.data()+20+16*j+8));
}
@@ -352,9 +352,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
QString recStr = list.at(i);
QString str;
- qToBigEndian(rec.group_address().v6_hi(),
+ qToBigEndian(quint64(rec.group_address().v6_hi()),
(uchar*)(ip.data()));
- qToBigEndian(rec.group_address().v6_lo(),
+ qToBigEndian(quint64(rec.group_address().v6_lo()),
(uchar*)(ip.data() + 8));
str.append(QString("Group: %1").arg(
QHostAddress((quint8*)ip.constData()).toString()));
@@ -363,9 +363,9 @@ QVariant MldProtocol::fieldData(int index, FieldAttrib attrib,
QStringList sl;
for (int j = 0; j < rec.sources_size(); j++)
{
- qToBigEndian(rec.sources(j).v6_hi(),
+ qToBigEndian(quint64(rec.sources(j).v6_hi()),
(uchar*)(ip.data()));
- qToBigEndian(rec.sources(j).v6_lo(),
+ qToBigEndian(quint64(rec.sources(j).v6_lo()),
(uchar*)(ip.data() + 8));
sl.append(QHostAddress(
(quint8*)ip.constData()).toString());
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment