diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-05-03 21:25:35 +0000 |
|---|---|---|
| committer | Breno Leitao <breno.leitao@gmail.com> | 2017-05-03 21:25:35 +0000 |
| commit | 955da9c9073a1055389ea6346d2b660bdfafc0a0 (patch) | |
| tree | b1f0c26ef317542d5142486b6899b30bfdb5d49d /testing | |
| parent | 3795f1cfa7b88e6d4bce6de3ae4f998f7dda7158 (diff) | |
| download | aports-955da9c9073a1055389ea6346d2b660bdfafc0a0.tar.bz2 aports-955da9c9073a1055389ea6346d2b660bdfafc0a0.tar.xz | |
testing/ossec-hids: Fix build on non-x86-64 platforms.
Musl lacks a.out.h header, since x86-64 kernel has this file. We do not
have this file, since glib usually have. Once we are on Musl, we lack
this file on non x86-64.
This patch simply switch to the project file definitions instead of
kernel/libc.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/ossec-hids/APKBUILD | 16 | ||||
| -rw-r--r-- | testing/ossec-hids/musl_lack_of_a_out_h.patch | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/testing/ossec-hids/APKBUILD b/testing/ossec-hids/APKBUILD index f0fbf2fe02..9ee69f3393 100644 --- a/testing/ossec-hids/APKBUILD +++ b/testing/ossec-hids/APKBUILD @@ -19,6 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/ossec/$pkgname/archive/v$pkg 00_a-out-h-path.patch 01_makefile.patch 02_ossec-server.conf.patch + musl_lack_of_a_out_h.patch alpine-install-server.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -53,24 +54,11 @@ doc() { "$subpkgdir"/usr/share/doc/$pkgname } -md5sums="bcf783c2273805e2a4c2112011fafb83 ossec-hids-2.8.3.tar.gz -eb24bd8d360ae7f6e7e6f585b5256090 ossec-hids.initd -0ccfe4ca38cea21d60317210bd909d24 ossec-hids.logrotate -00139c3f9f9e0d1baf58bb5d59894be6 00_a-out-h-path.patch -4a6c8f64ec4444cd75f5ba76556ed4eb 01_makefile.patch -eda7f4b045633776043f492a4762be50 02_ossec-server.conf.patch -12427250585507a9c7029c0db5ceb2a2 alpine-install-server.patch" -sha256sums="917989e23330d18b0d900e8722392cdbe4f17364a547508742c0fd005a1df7dd ossec-hids-2.8.3.tar.gz -e0494b017f69c2059399564e33eba4f957d054c3a3fd291a10d8f015e1e4dd68 ossec-hids.initd -e97742265e5f6b792e44846bf8ca71b8cc2afd0b762bbc4b226f625486e148ef ossec-hids.logrotate -fe5072a5fac89bc44ab0f91909e9a8781ea23df91ff6faec3f62a87151d06eee 00_a-out-h-path.patch -11a629c2362b867087a78d01d1f7b4903bcb2e7ba704e7d406ccd50ff048f556 01_makefile.patch -f38bd4077546d5d4fd2b65b28fdd1694eb40437590910303808f513f70e3231b 02_ossec-server.conf.patch -ffce064fd087adf92107810fa8b4e65b7977d814b8a972814d69bb826ad365e5 alpine-install-server.patch" sha512sums="3ec9504b5a6d36c303710b3aa9cfbe616b40deca671f4814340008b6e5edd9b2094bb7f1b441da788a5eec0f8095a0624ed42b8a8fc922274cd99db634994d1a ossec-hids-2.8.3.tar.gz 62f52d91de3751c149b1c354ebb87c0a8c4a81129403b80a8448c5e6542a67b4aa9e132aab2429781913eb909320b431b381828e414d44235bb8e9a8959e0d8b ossec-hids.initd 6cdf4852feabfdd043405e2570bb9a3013eb11c1865e9178fb67a019717d44fb0fedba05ab74c4334a1bae0a0c45912213dd7d6c7e1eab31853d40beea7596a0 ossec-hids.logrotate f99f53ce5b84228de33ec3fc0bc4419714d2d7d2167d33629ab6c0d7372060c0eeb3cfc1f0696ddcacfcb7f3280f515b67427f85e5e925aeb0a6c5f6cc54f411 00_a-out-h-path.patch 1ba449afa65a9374c8fd2b1c2d00897b54c5e8ef2e0be95a1d8a8dd45dfe27d5b19c12f3a075d6021449bc1d2946fdc8c7654ddfce1e55d79d104a3add7e2850 01_makefile.patch ee0baecaeacae782f43849e8c3c4afc0aef3cb238748209f8d1d0b2bd94bea59384474caba6a45bb4022e496ef1a50a3877447a3ccd1885a0a942c9cb6051c74 02_ossec-server.conf.patch +2649b0992c62511c587b5787c5dbb2e997088f905df0a0c3530906224ec000e0ac519c75979d460202c7881df51099787f070ac74a6f8b1d9905509d1154f129 musl_lack_of_a_out_h.patch 46ada63e1f9ddaf6eb6ed6f2cfaa1e4f16b665307fbab15e34e39444075b9a0e8efef63164d4f90bc47a95720cf3afc0c6f7ff6d892ca018f3739116ca961bd5 alpine-install-server.patch" diff --git a/testing/ossec-hids/musl_lack_of_a_out_h.patch b/testing/ossec-hids/musl_lack_of_a_out_h.patch new file mode 100644 index 0000000000..2660c2a5cc --- /dev/null +++ b/testing/ossec-hids/musl_lack_of_a_out_h.patch @@ -0,0 +1,12 @@ +--- a/src/rootcheck/os_string.c.old 2017-05-03 21:21:43.796000000 +0000 ++++ b/src/rootcheck/os_string.c 2017-05-03 21:22:28.128000000 +0000 +@@ -54,7 +54,8 @@ + #ifdef SOLARIS + #include <sys/exechdr.h> + +-#elif defined Darwin || defined HPUX ++// linux here means musl-linux ++#elif defined Darwin || defined HPUX || defined linux + + /* For some reason darwin does not have that */ + struct exec |