netfilter now is default branch.

1 files changed, 5 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6443045e41a2..4609c3b82b03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,21 @@
 # Contributor: Shalygin Konstantin <k0ste@k0ste.ru>
 
 pkgname='ipt_ndpi'
-pkgver=1.2_1.7.0.netfilter.222.edf7a3b
+pkgver=1.2_1.7.0.netfilter.231.f87fffb
 pkgrel=1
-pkgdesc='nDPI as netfilter extension'
+pkgdesc='nDPI as netfilter extension.'
 arch=('any')
-url='https://github.com/vel21ripn/nDPI/tree/netfilter'
+url='https://github.com/vel21ripn/nDPI'
 license=('GPL')
 depends=('linux' 'iptables' 'conntrack-tools')
 makedepends=('git' 'libtool' 'gcc' 'gzip' 'gawk' 'sed')
-source=("${pkgname}::git+https://github.com/vel21ripn/nDPI")
+source=("${pkgname}::git+${url}")
 sha256sums=('SKIP')
 install="${pkgname}.install"
 _kernver="`pacman -Ql linux| awk '/(\/modules\/)([0-9.-])+-ARCH\/$/ {print $2}'`"
 
 pkgver() {
   cd "${srcdir}/${pkgname}"
-  git checkout netfilter >/dev/null 2>&1
   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`
@@ -28,7 +27,6 @@ pkgver() {
 
 prepare() {
   cd "${srcdir}/${pkgname}"
-  git checkout netfilter
   ./autogen.sh
 }
 
@@ -43,10 +41,9 @@ check() {
 }
 
 package() {
-  pushd "${srcdir}/${pkgname}/ndpi-netfilter"
+  cd "${srcdir}/${pkgname}/ndpi-netfilter"
   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"
-  popd
 }