libndpi: patch update

This commit is contained in:
Anton Bolshakov 2014-07-19 06:31:06 +00:00
parent 87d8e5e249
commit ab474098ed
4 changed files with 66 additions and 8 deletions

View file

@ -1,5 +1,6 @@
AUX libndpi-system.patch 1661 SHA256 c74ac469e6ec8acbf43364ec7a4fa9c8411b7c3e876dce28445facc0cb4f4c01 SHA512 ca2915354104eb04301f93bb35758fcc9e0b3cb85ca7b5a6581775130bc137982888dea71ceab8d4c67300244f49c22a198a1b197f350eca39c6fd82a69470ac WHIRLPOOL 5821351984f8c29e3828b3e7faa559c718dc2343515eaeb42356a75251a85e71b22c6e810b708b83156f499e14f2601ee1a6ca321a0c6e873d278acc04b1bda3
AUX libndpi-system201407.patch 1835 SHA256 3697ab3f30e1b7a89ea9e6c46454b5c636635ee5844dc0294b08d59cd417cf27 SHA512 470d453fb7c5b361b79346b112ca4f97c03b632399f45c4234e6e20186a5820155d7e1f4bc08aae310ec045b779f52acf3bcce2dbdd8b20b35bcd3b5f08de22f WHIRLPOOL 53d011818b95c152d818cc5076f8c236a7bff0322fb47394570a217cc64b1027bffff2b97c20e2c223739700115a0bff951b58dbd1c8f82a93468b089d047660
DIST libndpi-20121108.tar.xz 341488 SHA256 3cd1b554c528c4d818eb4c33fe8874b0bbc5e807975bf51a4af1470a25f44085 SHA512 e67d95dce772b1e3fe133d9f29c0a04cd9c4923a088c5195b97eb6a30635bba580db3ce1bc50005dc41619868c4ec759ebf74a088b96b9ac9127351db0b208dc WHIRLPOOL 341eeb85c210d74316c1b9f7cb4eec539e807e12619cddbf7a6e5bf51970a7d547279d2ef23356dfb5df833d2bd3bdf133439a57389f404dc8bdc30031c11c41
EBUILD libndpi-20121108-r1.ebuild 616 SHA256 67a54ffd51b14f5e43bd56f83f6618428c4887808b8abdc71c261837f7704636 SHA512 8f19ee327ea1187ffde999c5d2bac75561e53bdaf713f61fecee71073a4208a5cfe882a481a6fd93e428c9ec4b2e0aee98f7304b65f83af8029f28b6d3c9613a WHIRLPOOL 874a621820cb1581f1ec741ac2b3bbd83ae4e3511d9310bb6fc9e59e7695195349c75dc24a063bf4369e283b441e388ff46cf5c00cb9229136335e37e5e7d288
EBUILD libndpi-20140717.ebuild 625 SHA256 c9deecdb51b3e24ac126c6ed07695cd61acddf3487d47858c262352b32bbbb4a SHA512 b9406986c6d81c69bebbe1d9d0612f542cefca22e133829ed9b3c5ea8834d338b8fb122f96caa3bab62031aa9f7f99936e2e093b79e613bb43e3938d0d329af8 WHIRLPOOL 8431cf66bae184fd9c10bc6805ae197428e0d15f09e054c20fa69e3190ad14d507ce059a9f06ebce0a0227e5137819ff7c8ea11046a86997ed2bfdaec944c864
EBUILD libndpi-9999.ebuild 542 SHA256 870c80c400d77f2e30e13f6471a82a5f90e9d1990c4629e593ee7994a247f5d9 SHA512 33fef830bc70377fc803ffe0b494f95e49d163837c05d1b28c107cc050b6b5e75951626d10e5b978ba767bdad2c24c902a882d02642a222dff0044fd6135cbfc WHIRLPOOL 478b99637657837a415604ef89eab93a08e03b9fbe962dff30944f8bcfa356a1f301ceb71c90f254c9319f6f000b5fb2176755ab1611dbc4ee204a241c9861e5
EBUILD libndpi-20140717.ebuild 631 SHA256 f39472460cf037e8f79193440bbd0b3bfdc0bd7512355edf15b63a867161c068 SHA512 f5c00f76c6ebc209d98ff10357584bbc9810e8353086278cb82a5c4b1eb8ac464f90a0d8ffcf72f867c9f231c4ee34d16b60b3f4c536bfaec0af0e5c4763b56e WHIRLPOOL 2422ba4b032e0d4934af47fb11997552bf96b81b108a4e182429f901f4aec89c6f0276ad1acde3487b68ecb482c288c5c3f5b9e2c0e4e4adad1f755964d1b2d9
EBUILD libndpi-9999.ebuild 545 SHA256 9fa2bc105ef619371f7c5b2eb4821a654a0149c115c28c6fda74a04224d50f0b SHA512 618bbd344a999270ab0c2e9cc9388127ae1dbfd729b99af56f3e98410cfdc6861617dc0428cf5089b7373e8462305b163760a7e377fcdef5532bb734dbec1c6b WHIRLPOOL ac35f83d48ba63a6ce749c4fbe55cbfea1a03cf49ebdf857fcbbdd059588d72b1b2eafd911623fda0629e27a66848357748e639d2170503a03d1dba8c26aa9f6

View file

@ -0,0 +1,58 @@
diff -urN libndpi-20140717.orig/src/include/Makefile.am libndpi-20140717/src/include/Makefile.am
--- libndpi-20140717.orig/src/include/Makefile.am 2014-07-19 14:23:00.000000000 +0800
+++ libndpi-20140717/src/include/Makefile.am 2014-07-19 14:24:24.511377042 +0800
@@ -1,9 +1,16 @@
-library_includedir=$(includedir)/libndpi-1.4/libndpi
+library_includedir=$(includedir)/libndpi
-library_include_HEADERS = ndpi_api.h \
- ndpi_debug_functions.h \
- ndpi_define.h \
- ndpi_macros.h \
- ndpi_protocols_osdpi.h \
- ndpi_public_functions.h
+library_include_HEADERS = linux_compat.h \
+ ndpi_api.h \
+ ndpi_credis.h \
+ ndpi_debug_functions.h \
+ ndpi_define.h \
+ ndpi_macros.h \
+ ndpi_main.h \
+ ndpi_protocol_history.h \
+ ndpi_protocols.h \
+ ndpi_protocols_osdpi.h \
+ ndpi_public_functions.h \
+ ndpi_structs.h \
+ ndpi_utils.h
diff -urN libndpi-20140717.orig/src/include/Makefile.in libndpi-20140717/src/include/Makefile.in
--- libndpi-20140717.orig/src/include/Makefile.in 2014-07-19 14:23:00.000000000 +0800
+++ libndpi-20140717/src/include/Makefile.in 2014-07-19 14:25:13.471380329 +0800
@@ -189,13 +189,20 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-library_includedir = $(includedir)/libndpi-1.4/libndpi
-library_include_HEADERS = ndpi_api.h \
- ndpi_debug_functions.h \
- ndpi_define.h \
- ndpi_macros.h \
- ndpi_protocols_osdpi.h \
- ndpi_public_functions.h
+library_includedir = $(includedir)/libndpi
+library_include_HEADERS = linux_compat.h \
+ ndpi_api.h \
+ ndpi_credis.h \
+ ndpi_debug_functions.h \
+ ndpi_define.h \
+ ndpi_macros.h \
+ ndpi_main.h \
+ ndpi_protocol_history.h \
+ ndpi_protocols.h \
+ ndpi_protocols_osdpi.h \
+ ndpi_public_functions.h \
+ ndpi_structs.h \
+ ndpi_utils.h
all: all-am

View file

@ -20,7 +20,7 @@ DEPEND=""
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/libndpi-system.patch
epatch "${FILESDIR}"/libndpi-system201407.patch
eautoreconf
}

View file

@ -1,9 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
EAPI="5"
inherit autotools eutils subversion
DESCRIPTION="ntop-maintained superset of the popular OpenDPI library"
@ -12,7 +11,7 @@ SRC_URI=""
LICENSE="BSD"
SLOT="0"
KEYWORDS="-*"
KEYWORDS=""
IUSE=""
ESVN_REPO_URI="https://svn.ntop.org/svn/ntop/trunk/nDPI"
@ -20,7 +19,7 @@ DEPEND=""
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/libndpi-system.patch
epatch "${FILESDIR}"/libndpi-system201407.patch
eautomake
}