diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-07-27 12:19:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-07-27 16:52:02 +0000 |
| commit | fc76db06bd007b1e1c6bddc07d2ee1a0ea5d1a70 (patch) | |
| tree | b3629372869c839d769df0d0345a37f78df5cffc /main | |
| parent | fa6f5015bac70e99e140a595146f32d08f7cb02e (diff) | |
| download | aports-fc76db06bd007b1e1c6bddc07d2ee1a0ea5d1a70.tar.bz2 aports-fc76db06bd007b1e1c6bddc07d2ee1a0ea5d1a70.tar.xz | |
main/zoneminder: fix build with gcc6
Diffstat (limited to 'main')
| -rw-r--r-- | main/zoneminder/APKBUILD | 6 | ||||
| -rw-r--r-- | main/zoneminder/gcc6.patch | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD index 6b6bc13be3..4fff5e7086 100644 --- a/main/zoneminder/APKBUILD +++ b/main/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=zoneminder pkgver=1.29.0 -pkgrel=10 +pkgrel=11 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" arch="x86_64" @@ -26,6 +26,7 @@ source="zoneminder-$pkgver.tar.gz::https://github.com/ZoneMinder/ZoneMinder/arch 0001-security-hardening-make-static-files-non-writable-by.patch 0001-zm_event-fix-overlap-in-memcpy-buffers.patch 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch + gcc6.patch zm-additional.sql" _builddir=$srcdir/ZoneMinder-$pkgver @@ -95,6 +96,7 @@ ab1fe4fb2392b82acf18ca8412fb927f zoneminder.initd c7b793be7b48685197acfb5b79470f2c 0001-security-hardening-make-static-files-non-writable-by.patch bab4a8253fe46154f506437f8d1f6b01 0001-zm_event-fix-overlap-in-memcpy-buffers.patch 1429766dc44764dc77c735f4320b5a44 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch +b575dd38e15b8e16261c3a06aafbfdf3 gcc6.patch 24359849eef7c5293f63136e704fdca4 zm-additional.sql" sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd zoneminder-1.29.0.tar.gz 887174a6d1489bdcfbadf760758b14ef4e184dfcae728e15cb0e697e61e1c42f zoneminder.initd @@ -102,6 +104,7 @@ sha256sums="34e1f0d4b616e320e557f8e3fbe278d3ab70f30f6278cc153b44f2193c85ddbd zo 7090caf93886b01032a8c4e5585f37e6a3e7ac59cdfdfddfd8150c03dacfd93f 0001-security-hardening-make-static-files-non-writable-by.patch 9daa0ed53e23723cb850b23a329eb207f1bcb34920c92c9edce1dc9ea2af4201 0001-zm_event-fix-overlap-in-memcpy-buffers.patch a830478a806e36d41016d3c2663d892fafa65b580d3bccccc131fe114c842834 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch +fed5f7c3fb79c2fee7ba722f7434ab869781b968710499e9bb1fddb51233bf98 gcc6.patch dea3a1b493bc7d7dbe9c431f565b9e916fb8a8bd29fcd74947b14592ef7f4494 zm-additional.sql" sha512sums="71a397df83c92de3b977832bb0a11791a3a756e7219e0cf3dc6c5c30fa0dd488ea00a925433669bf4e79873df980a852f2c805d1b7c9c8a06b6c39b9a16a2fda zoneminder-1.29.0.tar.gz fa993a86c21697467c8f63ce584531f8e2c3da977b65e6557161b4b91807b1c78b14fb64f6f54c50fddcb51b54bae6dff45776f5a69bfcc635a5c2927a292b57 zoneminder.initd @@ -109,4 +112,5 @@ fa993a86c21697467c8f63ce584531f8e2c3da977b65e6557161b4b91807b1c78b14fb64f6f54c50 a7e58312c804f58ac41ee569fefffa99e65beba29f07eff36fb3cf2aa4fd68e1fc903feb73ab0c1fc6c58442251076042b537ab21156b956d7854a86bde14307 0001-security-hardening-make-static-files-non-writable-by.patch ecd32fb6af11144efabec69522615f56462bead0960f820b466a3bb00edf28cb3a80ec705b32abb71217e3a280eb7c50cf956d0a167fdfd3692ca63da1980ab7 0001-zm_event-fix-overlap-in-memcpy-buffers.patch 8a35bfc782792ca559d6cf78e3e17f0caa45e19981cea12090b4f0ececa98bd9a121d2918e06e991ae5c06ab876ffddc94cd4f9db640f510314a3d09a6d90b4c 0001-zm_monitor-fix-overlap-in-memcpy-buffers.patch +135025923a17090ce2531f72598395aa729f658729d56cbb007b7685aba7255541a8a80b9fd155dd537fef27dfb38012ede2c8b8e27ea11f6ad9ea25f61ff607 gcc6.patch 0bb99af417441e2c12cb3b8c00ecb8d76bdc343d39092a222841ae0bd684eeba1783a8bccf5630dae56f64992f8a09ec16e0cbc7069665e1ee3b62dd3f96c3a9 zm-additional.sql" diff --git a/main/zoneminder/gcc6.patch b/main/zoneminder/gcc6.patch new file mode 100644 index 0000000000..9864f165e7 --- /dev/null +++ b/main/zoneminder/gcc6.patch @@ -0,0 +1,11 @@ +--- ./src/zm_rtp_ctrl.h.orig ++++ ./src/zm_rtp_ctrl.h +@@ -123,7 +123,7 @@ + } sdes; + + // BYE +- struct Bye ++ struct + { + uint32_t srcN[]; // list of sources + // can't express trailing text for reason (what does this mean? it's not even english!) |