diff options
author | Konstantin Shalygin | 2018-08-07 11:22:04 +0700 |
---|---|---|
committer | Konstantin Shalygin | 2018-08-07 11:22:04 +0700 |
commit | f21891ea56e5e764dd094c16413bd4126cea9035 (patch) | |
tree | 21fcf53982f31d089ac17484b46d6b0337e6651d | |
parent | c0b6b9669dd500b4ba462cf7ae15a567c81e50a1 (diff) | |
download | aur-f21891ea56e5e764dd094c16413bd4126cea9035.tar.gz |
Switch to netfilter-2.2 branch.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | ipt_ndpi.install | 2 |
3 files changed, 9 insertions, 12 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Feb 15 01:16:28 UTC 2018 +# Tue Aug 7 04:19:03 UTC 2018 pkgbase = ipt_ndpi pkgdesc = nDPI as netfilter extension. - pkgver = 1.2_1.7.0.netfilter.239.d21290a + pkgver = 1.2_2.3.0.1262.97099ff pkgrel = 1 url = https://github.com/vel21ripn/nDPI install = ipt_ndpi.install @@ -2,7 +2,7 @@ # Contributor: Shalygin Konstantin <k0ste@k0ste.ru> pkgname='ipt_ndpi' -pkgver=1.2_1.7.0.netfilter.239.d21290a +pkgver=1.2_2.3.0.1262.97099ff pkgrel=1 pkgdesc='nDPI as netfilter extension.' arch=('any') @@ -14,20 +14,18 @@ source=("${pkgname}::git+${url}") sha256sums=('SKIP') install="${pkgname}.install" _linux_custom="ARCH" -_kernver="`pacman -Ql linux| awk '/(\/modules\/)([0-9.-])+-'${_linux_custom}'\/$/ {print $2}'`" +_kernver="`pacman -Ql linux| awk '/(\/modules\/)([0-9.-])+-(.*)-'${_linux_custom}'\/$/ {print $2}'`" pkgver() { cd "${srcdir}/${pkgname}" - ndpi_version=`gawk 'match($0, /pr_info\("xt_ndpi\sv([0-9.]+)\sndpi\s%s\s%s\\\n"/, a) {print a[1]}' ndpi-netfilter/src/main.c` - package_version=`gawk 'match($0, /^(AC_INIT)\(\[(libndpi)\]\,\s\[([0-9.]+)\]\)$/, a) {print a[3]}' configure.ac` - git_branch=`git rev-parse --abbrev-ref HEAD` - git_num=`git log --pretty=oneline | wc -l | tr -d '[[:space:]]'` - git_tag=`git log -1 --format=%h` - echo -e "${ndpi_version}_${package_version}.${git_branch}.${git_num}.${git_tag}" + ndpi_version=`gawk 'match($0, /pr_info\("xt_ndpi\sv([0-9.]+)\sndpi\s%s\"$/, a) {print a[1]}' ndpi-netfilter/src/main.c` + git_version=`gawk 'match($0, /^(#define)\s(NDPI_GIT_RELEASE)\s(\")([a-z0-9.-]+)(\")$/, a) {print a[4]}' src/include/ndpi_config.h | sed -e 's/-/./g'` + echo -e "${ndpi_version}_${git_version}" } prepare() { cd "${srcdir}/${pkgname}" + git checkout netfilter-2.2 ./autogen.sh cd "src/lib" make ndpi_network_list.c.inc @@ -48,5 +46,4 @@ package() { install -Dm755 "ipt/libxt_ndpi.so" "${pkgdir}/usr/lib/iptables/libxt_ndpi.so" install -Dm644 "src/xt_ndpi.ko.gz" "${pkgdir}${_kernver}/extra/xt_ndpi.ko.gz" install -Dm644 "INSTALL" "${pkgdir}/usr/share/doc/${pkgname}/README" - cp -ax "kernel-patch" "${pkgdir}/usr/share/ndpi" } diff --git a/ipt_ndpi.install b/ipt_ndpi.install index 0bddbd3b8950..4ce6a8b84a05 100644 --- a/ipt_ndpi.install +++ b/ipt_ndpi.install @@ -1,6 +1,6 @@ post_install() { linux_custom="ARCH" - kernver="`pacman -Ql linux|gawk 'match($0, /^(.*)modules\/([0-9.-]+-'${linux_custom}')\/$/, a) {print a[2]}'`" + kernver="`pacman -Ql linux|gawk 'match($0, /^(.*)modules\/([0-9.-]+-(.*)-'${linux_custom}')\/$/, a) {print a[2]}'`" echo -e "Probe modules" depmod ${kernver} } |