Use patches

2 files changed, 18 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecf5bc2c3bf3..822aec37f5c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,16 +2,18 @@ pkgbase = libnftnl-fullcone
 	pkgdesc = Netfilter library providing interface to the nf_tables subsystem (with fullcone patch)
 	pkgver = 1.2.3
 	pkgrel = 1
-	url = https://github.com/fullcone-nat-nftables/
+	url = https://netfilter.org/projects/libnftnl/
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	depends = libmnl
-	depends = nft-fullcone
 	provides = libnftnl
 	conflicts = libnftnl
-	source = libnftnl-fullcone::git+https://github.com/fullcone-nat-nftables/libnftnl-1.2.3-with-fullcone.git
+	source = https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.3.tar.bz2
+	source = https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.3.tar.bz2.sig
+	source = https://github.com/wongsyrone/lede-1/raw/master/package/libs/libnftnl/patches/999-01-libnftnl-add-fullcone-expression-support.patch
 	validpgpkeys = 37D964ACC04981C75500FB9BD55D978A8A1420E4
+	sha256sums = e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255
 	sha256sums = SKIP
+	sha256sums = 321fd41802d77eabade6e4e7131ad8b32d7861d4f362f4ef0d54d414f6248b58
 
 pkgname = libnftnl-fullcone
diff --git a/PKGBUILD b/PKGBUILD
index 00e3763c6c45..edaab3533f54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Contributor: Sébastien Luttringer
+# Maintainer: Sébastien Luttringer
 
 pkgname=libnftnl-fullcone
 _pkgname=libnftnl
@@ -6,18 +6,20 @@ pkgver=1.2.3
 pkgrel=1
 pkgdesc='Netfilter library providing interface to the nf_tables subsystem (with fullcone patch)'
 arch=('x86_64')
-url='https://github.com/fullcone-nat-nftables/'
+url='https://netfilter.org/projects/libnftnl/'
 license=('GPL2')
-depends=('libmnl' 'nft-fullcone')
-makedepends=('git')
+depends=('libmnl')
 provides=('libnftnl')
 conflicts=('libnftnl')
 validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
-source=("$pkgname::git+https://github.com/fullcone-nat-nftables/libnftnl-$pkgver-with-fullcone.git")
-sha256sums=('SKIP')
+source=("https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2"{,.sig}
+'https://github.com/wongsyrone/lede-1/raw/master/package/libs/libnftnl/patches/999-01-libnftnl-add-fullcone-expression-support.patch')
+sha256sums=('e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255'
+            'SKIP'
+            '321fd41802d77eabade6e4e7131ad8b32d7861d4f362f4ef0d54d414f6248b58')
 
 prepare() {
-  cd $pkgname
+  cd $_pkgname-$pkgver
   # apply patch from the source array (should be a pacman feature)
   local src
   for src in "${source[@]}"; do
@@ -30,19 +32,19 @@ prepare() {
 }
 
 build() {
-  cd $pkgname
+  cd $_pkgname-$pkgver
   autoreconf -fi
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd $pkgname
+  cd $_pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $pkgname
+  cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }