Merge branch '3.4' into 3.5

2019-05-12 23:58:14 +10:00 · 2019-05-12 23:58:14 +10:00 · c508275ad5
commit c508275ad5
parent 2780229cfe 2f1fb6e2d4
35 changed files with 821 additions and 269 deletions
--- a/faad2/.footprint
+++ b/faad2/.footprint
@ -3,9 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/faad
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/faad.h
-rw-r--r--	root/root	usr/include/mp4ff.h
-rw-r--r--	root/root	usr/include/mp4ff_int_types.h
-rw-r--r--	root/root	usr/include/mp4ffint.h
 -rw-r--r--	root/root	usr/include/neaacdec.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libfaad.a
@ -13,11 +10,12 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libfaad.so -> libfaad.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/libfaad.so.2 -> libfaad.so.2.0.0
 -rwxr-xr-x	root/root	usr/lib/libfaad.so.2.0.0
-rw-r--r--	root/root	usr/lib/libmp4ff.a
-rwxr-xr-x	root/root	usr/lib/libmp4ff.la
-lrwxrwxrwx	root/root	usr/lib/libmp4ff.so -> libmp4ff.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libmp4ff.so.0 -> libmp4ff.so.0.0.0
-rwxr-xr-x	root/root	usr/lib/libmp4ff.so.0.0.0
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-rw-r--r--	root/root	usr/man/man1/faad.1.gz
+-rw-r--r--	root/root	usr/lib/libfaad_drm.a
+-rwxr-xr-x	root/root	usr/lib/libfaad_drm.la
+lrwxrwxrwx	root/root	usr/lib/libfaad_drm.so -> libfaad_drm.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libfaad_drm.so.2 -> libfaad_drm.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/libfaad_drm.so.2.0.0
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/faad.1.gz
--- a/faad2/.signature
+++ b/faad2/.signature
@ -1,8 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32i3b13MSlTS8FA1dpA5DC2/Y5KsuigQNu/nV/Jip5Q1QYXkGF0+kQwUUzBh5wR0kDB1yVHHf5m/Uhqg1e7IlQw=
-SHA256 (Pkgfile) = efd77216b0e6551ef1e806eb47991cf8157def7c3c7a03104882125791f4f787
-SHA256 (.footprint) = a50412d5f3f542711a459d67524ff12426a28e709c977fba3abd4bfa7658ab98
-SHA256 (faad2-2.7.tar.bz2) = 14561b5d6bc457e825bfd3921ae50a6648f377a9396eaf16d4b057b39a3f63b5
-SHA256 (faad2-2.7-libmp4ff-shared-lib.patch) = e0aaefeb20ebfec2f09e88a190f78e5744d9f1c71fe41977db8e4f29b5b88022
-SHA256 (faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch) = c554313121f935aaabbe5b05addfc065bdf782bc0634ee9a91ceabde001ea823
-SHA256 (faad2-2.7-man1_MANS.patch) = e3e745cca309443d0149a09cc9988fec09c51e242b0e564afcb0af787dbb9031
+RWSagIOpLGJF33IWVl/YxRb/HaldiJrM3MNWeoRBj9J+ZKlX7Ip6652abL1wSx9/zrptrtpxrx0kmOjomCBhX/W6DfZz9r7Z0AA=
+SHA256 (Pkgfile) = e4a5c9146e24c08acbc9beba2c4269feacc746b6f5c376ddf5a5162268822ddf
+SHA256 (.footprint) = fca594c4b8c180ea14ca06a51517957272687f6007f5e88a6adb762b0798ca9b
+SHA256 (faad2-2.8.8.tar.gz) = 985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d
--- a/faad2/Pkgfile
+++ b/faad2/Pkgfile
@ -1,30 +1,16 @@
 # Description: AAC audio decoding library.
-# URL: http://www.audiocoding.com/
+# URL: https://www.audiocoding.com/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Matt Housh, jaeger at morpheus dot net

 name=faad2
-version=2.7
-release=2
-source=(http://downloads.sourceforge.net/project/faac/faad2-src/$name-$version/$name-$version.tar.bz2
-	faad2-2.7-libmp4ff-shared-lib.patch
-	faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
-	faad2-2.7-man1_MANS.patch)
+version=2.8.8
+release=1
+source=(https://sourceforge.net/projects/faac/files/$name-src/faad2-${version%.*}.0/$name-$version.tar.gz)

 build() {
 	cd $name-$version

-	patch -p1 -i $SRC/faad2-2.7-libmp4ff-shared-lib.patch
-	patch -p0 -i $SRC/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
-	patch -p1 -i $SRC/faad2-2.7-man1_MANS.patch
-	sed -i -e 's|iquote |I|' libfaad/Makefile.am
-	sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in
-	autoreconf -fi
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man \
-		--disable-dependency-tracking
+	./configure --prefix=/usr

 	make
 	make DESTDIR=$PKG install
--- a/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+++ b/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
@ -1,13 +0,0 @@
-Install mp4ff_int_types.h for mythmusic.
-
-http://bugs.gentoo.org/275008
-
--- common/mp4ff/Makefile.am
-+++ common/mp4ff/Makefile.am
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES = libmp4ff.la
-include_HEADERS = mp4ff.h mp4ffint.h
-+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
- 
- AM_CFLAGS = -DUSE_TAGGING=1
- 
--- a/faad2/faad2-2.7-libmp4ff-shared-lib.patch
+++ b/faad2/faad2-2.7-libmp4ff-shared-lib.patch
@ -1,29 +0,0 @@
-Ripped from Debian
-
-Patch to create a shared lib for libmp4ff.
-
--- a/common/mp4ff/Makefile.am
-+++ b/common/mp4ff/Makefile.am
-@@ -1,7 +1,8 @@
-lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
- 
-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+AM_CFLAGS = -DUSE_TAGGING=1
- 
-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_LDFLAGS = -version-info 0:0:0
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
--- a/frontend/Makefile.am
-+++ b/frontend/Makefile.am
-@@ -5,7 +5,7 @@
- 	   -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
-	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
- 	       audio.c audio.h \
--- a/faad2/faad2-2.7-man1_MANS.patch
+++ b/faad2/faad2-2.7-man1_MANS.patch
@ -1,10 +0,0 @@
-diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
--- faad2-2.7.orig/frontend/Makefile.am	2009-02-06 18:03:37.000000000 +0200
-+++ faad2-2.7/frontend/Makefile.am	2009-07-20 20:27:29.000000000 +0300
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = faad
-man_MANS = faad.man
-+man1_MANS = faad.man
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- 	   -I$(top_srcdir)/common/mp4ff
--- a/fftw/.footprint
+++ b/fftw/.footprint
@ -24,64 +24,64 @@ drwxr-xr-x	root/root	usr/lib/cmake/fftw3/
 -rw-r--r--	root/root	usr/lib/cmake/fftw3/FFTW3qConfigVersion.cmake
 -rw-r--r--	root/root	usr/lib/libfftw3.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3.so -> libfftw3.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3.so.3 -> libfftw3.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3.so -> libfftw3.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3.so.3 -> libfftw3.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3_omp.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3_omp.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3_omp.so -> libfftw3_omp.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3_omp.so.3 -> libfftw3_omp.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3_omp.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3_omp.so -> libfftw3_omp.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3_omp.so.3 -> libfftw3_omp.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3_omp.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3_threads.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3_threads.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3_threads.so -> libfftw3_threads.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3_threads.so.3 -> libfftw3_threads.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3_threads.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3_threads.so -> libfftw3_threads.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3_threads.so.3 -> libfftw3_threads.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3_threads.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3f.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3f.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3f.so -> libfftw3f.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3f.so.3 -> libfftw3f.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3f.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3f.so -> libfftw3f.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3f.so.3 -> libfftw3f.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3f.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3f_omp.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3f_omp.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3f_omp.so -> libfftw3f_omp.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3f_omp.so.3 -> libfftw3f_omp.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3f_omp.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3f_omp.so -> libfftw3f_omp.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3f_omp.so.3 -> libfftw3f_omp.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3f_omp.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3f_threads.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3f_threads.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3f_threads.so -> libfftw3f_threads.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3f_threads.so.3 -> libfftw3f_threads.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3f_threads.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3f_threads.so -> libfftw3f_threads.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3f_threads.so.3 -> libfftw3f_threads.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3f_threads.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3l.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3l.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3l.so -> libfftw3l.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3l.so.3 -> libfftw3l.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3l.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3l.so -> libfftw3l.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3l.so.3 -> libfftw3l.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3l.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3l_omp.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3l_omp.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3l_omp.so -> libfftw3l_omp.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3l_omp.so.3 -> libfftw3l_omp.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3l_omp.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3l_omp.so -> libfftw3l_omp.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3l_omp.so.3 -> libfftw3l_omp.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3l_omp.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3l_threads.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3l_threads.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3l_threads.so -> libfftw3l_threads.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3l_threads.so.3 -> libfftw3l_threads.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3l_threads.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3l_threads.so -> libfftw3l_threads.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3l_threads.so.3 -> libfftw3l_threads.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3l_threads.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3q.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3q.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3q.so -> libfftw3q.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3q.so.3 -> libfftw3q.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3q.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3q.so -> libfftw3q.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3q.so.3 -> libfftw3q.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3q.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3q_omp.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3q_omp.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3q_omp.so -> libfftw3q_omp.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3q_omp.so.3 -> libfftw3q_omp.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3q_omp.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3q_omp.so -> libfftw3q_omp.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3q_omp.so.3 -> libfftw3q_omp.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3q_omp.so.3.5.8
 -rw-r--r--	root/root	usr/lib/libfftw3q_threads.a
 -rwxr-xr-x	root/root	usr/lib/libfftw3q_threads.la
-lrwxrwxrwx	root/root	usr/lib/libfftw3q_threads.so -> libfftw3q_threads.so.3.5.7
-lrwxrwxrwx	root/root	usr/lib/libfftw3q_threads.so.3 -> libfftw3q_threads.so.3.5.7
-rwxr-xr-x	root/root	usr/lib/libfftw3q_threads.so.3.5.7
+lrwxrwxrwx	root/root	usr/lib/libfftw3q_threads.so -> libfftw3q_threads.so.3.5.8
+lrwxrwxrwx	root/root	usr/lib/libfftw3q_threads.so.3 -> libfftw3q_threads.so.3.5.8
+-rwxr-xr-x	root/root	usr/lib/libfftw3q_threads.so.3.5.8
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/fftw3.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/fftw3f.pc
--- a/fftw/.signature
+++ b/fftw/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yjmju1A4Q6gziVb+0EXoLTCvk7Ne6YPTYrN4xzdfWE5u1D1CtwYSok5QQw5Kjx46HJhOtlAKK0PHZhKi36OdQQ=
-SHA256 (Pkgfile) = 171d30c215dbfdd9219c245f6b7ee5067fa0d502f37793d51e2d765b477ba6dd
-SHA256 (.footprint) = 9bbc65cb52971df7440de485f75f223a3e4762e38e9cf84fe539948647ecedc0
-SHA256 (fftw-3.3.7.tar.gz) = 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573
+RWSagIOpLGJF395hRwUMeD0tY0sMVztmS2OdYsoFqdALar0i8VYOjwDmbN/0lrdKjlie7jPg2zRmg2A7OyZL6VokUbzLjgyhtAw=
+SHA256 (Pkgfile) = 3947873a556fbe615607ecb7946dd3bfb1c438394e5c0e3fa7937982884454bf
+SHA256 (.footprint) = 9975fc517810b30f012e58ac00df20ad7dfa07103b12f5a7eacbfd75215a0b70
+SHA256 (fftw-3.3.8.tar.gz) = 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303
--- a/fftw/Pkgfile
+++ b/fftw/Pkgfile
@ -4,19 +4,19 @@
 # Depends on: gcc-fortran

 name=fftw
-version=3.3.7
+version=3.3.8
 release=1
 source=(http://www.fftw.org/$name-$version.tar.gz)

 build() {
 	cd $name-$version

-	local config="\
-F77=gfortran \
--prefix=/usr \
--enable-threads \
--with-gnu-ld \
--enable-shared \
+	local config="
+F77=gfortran
+--prefix=/usr
+--enable-threads
+--with-gnu-ld
+--enable-shared
 --enable-openmp"

 	# use upstream default CFLAGS while keeping our -march/-mtune
--- a/iwd/.signature
+++ b/iwd/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33eVVMdArIjlgkCdoptbOgSQAEnuNeznDKFxQk9iBEtH1ZJppkE/VFaCc2y6ZAU7XFHxzHArHEvDjm8SptX0yAY=
-SHA256 (Pkgfile) = c4d770478e0522ffda272f3f1ae399f772f3976f88fefaebd94250f5d255c471
+RWSagIOpLGJF39paDWvFlJOiyBVXTtMHpL6ETSiI+aTn/1wZZDnICfTnuj8RRU3Kccq39ViijZen50lT2E02dP772bzVT5PJHgQ=
+SHA256 (Pkgfile) = 8e115d34bec2d2b5c9fb4cf08d97638bc7cfe81bcf9ffa0d033e294cd01ed32c
 SHA256 (.footprint) = c79639b76d59f1fb0815f15172c433a8374c82a6d2f5599cc82c9b8a301330b0
-SHA256 (iwd-0.17.tar.xz) = 3eda38305738a7992c03a02d29423bc5eaf5e76247bb45ae1dad8fd261e4f4d6
+SHA256 (iwd-0.18.tar.xz) = 2d70cc4889692ec1fb5e2cdbe7469d7d2b35cbecca0d293a78438fbb58e63d3a
 SHA256 (iwd) = f0eaab15666fed402e984ff12a923ce857a4985ab2e6e00c8da35fecb81c219e
--- a/iwd/Pkgfile
+++ b/iwd/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Juergen Daubert, jue at crux dot nu

 name=iwd
-version=0.17
+version=0.18
 release=1
 source=(https://www.kernel.org/pub/linux/network/wireless/$name-$version.tar.xz
        iwd)
--- a/jasper/.footprint
+++ b/jasper/.footprint
@ -3,13 +3,13 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/imgcmp
 -rwxr-xr-x	root/root	usr/bin/imginfo
 -rwxr-xr-x	root/root	usr/bin/jasper
-rwxr-xr-x	root/root	usr/bin/tmrdemo
+-rwxr-xr-x	root/root	usr/bin/jiv
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/jasper/
 -rw-r--r--	root/root	usr/include/jasper/jas_cm.h
 -rw-r--r--	root/root	usr/include/jasper/jas_config.h
-rw-r--r--	root/root	usr/include/jasper/jas_config2.h
 -rw-r--r--	root/root	usr/include/jasper/jas_debug.h
+-rw-r--r--	root/root	usr/include/jasper/jas_dll.h
 -rw-r--r--	root/root	usr/include/jasper/jas_fix.h
 -rw-r--r--	root/root	usr/include/jasper/jas_getopt.h
 -rw-r--r--	root/root	usr/include/jasper/jas_icc.h
@ -27,13 +27,15 @@ drwxr-xr-x	root/root	usr/include/jasper/
 -rw-r--r--	root/root	usr/include/jasper/jasper.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libjasper.a
-rwxr-xr-x	root/root	usr/lib/libjasper.la
-lrwxrwxrwx	root/root	usr/lib/libjasper.so -> libjasper.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libjasper.so.1 -> libjasper.so.1.0.0
-rwxr-xr-x	root/root	usr/lib/libjasper.so.1.0.0
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-rw-r--r--	root/root	usr/man/man1/imgcmp.1.gz
-rw-r--r--	root/root	usr/man/man1/imginfo.1.gz
-rw-r--r--	root/root	usr/man/man1/jasper.1.gz
-rw-r--r--	root/root	usr/man/man1/jiv.1.gz
+lrwxrwxrwx	root/root	usr/lib/libjasper.so -> libjasper.so.4
+lrwxrwxrwx	root/root	usr/lib/libjasper.so.4 -> libjasper.so.4.0.0
+-rwxr-xr-x	root/root	usr/lib/libjasper.so.4.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/jasper.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/imgcmp.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/imginfo.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/jasper.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/jiv.1.gz
--- a/jasper/.signature
+++ b/jasper/.signature
@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39GjN8M/hPgNdHs1V2EQytYRDYRZ9I3eeAQMwJSJjWIzHqPoYYcTtx3Etr8fUd2mn3pMyqmndLI6RExfWCM39wY=
-SHA256 (Pkgfile) = 2e5f8323460e4d531d3f059973d1554051690d19cb7a95a8ec857f9351f64fe3
-SHA256 (.footprint) = 0b54f0282fa947e34505a141df18cc9c729d3b915217384c50092eeeff909e90
-SHA256 (jasper-1.900.1.zip) = 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494
+RWSagIOpLGJF3y9uUqYnaSQpLOLWkd+M/G+xIYiY4AKOyiC6M9c1fShs/Cn6Jii6S3/2CK18j8lUlCSJdj0LvGWnPqrYaei+pww=
+SHA256 (Pkgfile) = 53685c3b0e1f1a1ee1cd980bf3cd6bb4a852918a4eba8034e77f819f3fd421f0
+SHA256 (.footprint) = 88d6acc67b2adc5dc929fedcedb0d1998490baf0039de26bfb48f8dca5895d64
+SHA256 (jasper-2.0.16.tar.gz) = f1d8b90f231184d99968f361884e2054a1714fdbbd9944ba1ae4ebdcc9bbfdb1
+SHA256 (jasper-1.900.1-fix-filename-buffer-overflow.patch) = f51377e9b3e4faaa6b17b2d5fcf6f6d94fe2916a65dc9c78b5a99b891f5726dc
--- a/jasper/Pkgfile
+++ b/jasper/Pkgfile
@ -1,21 +1,46 @@
 # Description: Codec JPEG-2000 Part-1 standard.
 # URL: http://www.ece.uvic.ca/~frodo/jasper/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, ronster dot romster at gmail dot com
-# Depends on: freeglut libjpeg-turbo
+# Depends on: freeglut libjpeg-turbo xorg-libxmu

 name=jasper
-version=1.900.1
+version=2.0.16
 release=1
-source=(http://www.ece.uvic.ca/~frodo/jasper/software/$name-$version.zip)
+source=(https://github.com/mdadams/jasper/archive/version-$version/$name-$version.tar.gz
+	jasper-1.900.1-fix-filename-buffer-overflow.patch)

 build() {
-	cd $name-$version
+	cd $name-version-$version

-	./configure \
-		--prefix=/usr \
-		--enable-shared
+	patch -p1 -i $SRC/jasper-1.900.1-fix-filename-buffer-overflow.patch
+	sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt

+	mkdir -p build-{shared,static}
+
+	local config="
+-DCMAKE_INSTALL_PREFIX=/usr
+-DCMAKE_INSTALL_LIBDIR=lib
+-DCMAKE_BUILD_TYPE=Release
+-DJAS_ENABLE_OPENGL=ON
+-DJAS_ENABLE_LIBJPEG=ON
+-DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF
+-DCMAKE_SKIP_RPATH=ON
+-DOpenGL_GL_PREFERENCE=GLVND"
+
+	#build static lib
+	(cd build-static
+	cmake .. $config -DJAS_ENABLE_SHARED=OFF
 	make
-	make DESTDIR=$PKG install
+	)
+
+	#build shared lib
+	(cd build-shared
+	cmake .. $config -DJAS_ENABLE_SHARED=ON
+	make
+	)
+
+	make -C build-static DESTDIR=$PKG install
+	make -C build-shared DESTDIR=$PKG install
+
+	rm -r $PKG/usr/share/doc
 }
--- a/jasper/jasper-1.900.1-fix-filename-buffer-overflow.patch
+++ b/jasper/jasper-1.900.1-fix-filename-buffer-overflow.patch
@ -0,0 +1,37 @@
+Description: Filename buffer overflow fix
+ This patch fixes a security hole by a bad buffer size handling.
+Author: Roland Stigge <stigge@antcom.de>
+Bug-Debian: http://bugs.debian.org/645118
+
+--- a/src/libjasper/include/jasper/jas_stream.h
+++ b/src/libjasper/include/jasper/jas_stream.h
+@@ -77,6 +77,7 @@
+ #include <jasper/jas_config.h>
+ 
+ #include <stdio.h>
+#include <limits.h>
+ #if defined(JAS_HAVE_FCNTL_H)
+ #include <fcntl.h>
+ #endif
+@@ -99,6 +100,12 @@ extern "C" {
+ #define O_BINARY	0
+ #endif
+ 
+#ifdef PATH_MAX
+#define JAS_PATH_MAX PATH_MAX
+#else
+#define JAS_PATH_MAX 4096
+#endif
+
+ /*
+  * Stream open flags.
+  */
+@@ -251,7 +258,7 @@ typedef struct {
+ typedef struct {
+ 	int fd;
+ 	int flags;
+-	char pathname[L_tmpnam + 1];
+	char pathname[JAS_PATH_MAX + 1];
+ } jas_stream_fileobj_t;
+ 
+ #define	JAS_STREAM_FILEOBJ_DELONCLOSE	0x01
--- a/libdca/.footprint
+++ b/libdca/.footprint
@ -8,17 +8,19 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/dca.h
 -rw-r--r--	root/root	usr/include/dts.h
 drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libdca.a
 -rwxr-xr-x	root/root	usr/lib/libdca.la
 lrwxrwxrwx	root/root	usr/lib/libdca.so -> libdca.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libdca.so.0 -> libdca.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libdca.so.0.0.0
-lrwxrwxrwx	root/root	usr/lib/libdts.a -> /usr/lib/libdca.a
+lrwxrwxrwx	root/root	usr/lib/libdts.a -> libdca.a
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdca.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libdts.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-rw-r--r--	root/root	usr/man/man1/dcadec.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/dtsdec.1.gz -> dcadec.1.gz
-rw-r--r--	root/root	usr/man/man1/extract_dca.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/extract_dts.1.gz -> extract_dca.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/dcadec.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/dtsdec.1.gz -> dcadec.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/extract_dca.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/extract_dts.1.gz -> extract_dca.1.gz
--- a/libdca/.signature
+++ b/libdca/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3wnqlL1Ja1YMcbpKsyfTEaBGcQ+MNvMPtAx/GmGpXxxPKSHLCLPwt7pyRJGwMBqQHifrtnsqXqIWjNDMenITQgw=
-SHA256 (Pkgfile) = 33b02a895234e660d31aaef062a9a268258066556382ed17b064f353ec7fe41c
-SHA256 (.footprint) = 1aafce214a4f51b6b2c22a2c1ab9678330b5d2e87e719a51c7896519b2704b1f
-SHA256 (libdca-0.0.5.tar.bz2) = dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642
+RWSagIOpLGJF35FkXcqzO99SG9zwGlqd+sRwSotn0xAaAAabi1uhYDPxXs8YdinOQ7EllT/op0CYWIjTpeW5XCpf+oLSL2PckAk=
+SHA256 (Pkgfile) = 1f701ada7e4e312398f430f7eff30f0041cb7fff4ca556cb6e894f5e11ba522b
+SHA256 (.footprint) = 204db9c1d7e6fd052e217a7900eac0e06e0cca3e21658368f4de13fe97a44bbc
+SHA256 (libdca-0.0.6.tar.bz2) = 98f98a9aa000a26b927c6facd15d18dcf664238adfc5db24f533c5932cdb1f40
--- a/libdca/Pkgfile
+++ b/libdca/Pkgfile
@ -1,24 +1,18 @@
 # Description: A free DTS Coherent Acoustics decoder. (early development stage)
 # URL: http://www.videolan.org/developers/libdca.html
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Han Boetes, han at mijncomputer dot nl
-# Depends on:

 name=libdca
-version=0.0.5
-release=2
-source=(http://download.videolan.org/pub/videolan/libdca/$version/libdca-$version.tar.bz2)
+version=0.0.6
+release=1
+source=(https://download.videolan.org/pub/videolan/$name/$version/$name-$version.tar.bz2)

 build() {
-	cd libdca-$version
+	cd $name-$version

 	sed -i configure -e 's/-mtune=pentiumpro//'

-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man \
-		--disable-static \
-		--disable-nls
+	./configure --prefix=/usr

 	make
 	make DESTDIR=$PKG install
--- a/libnfnetlink/.signature
+++ b/libnfnetlink/.signature
@ -1,6 +1,11 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF305Nqi/RB7nOEHxwNHuDxdiCv8gDX9Br03ruGuJ8BluPZZMnoynRCKTL6GtUkLvZUjYqxsIh8qv8vgfxV30MGA8=
-SHA256 (Pkgfile) = 8278fd34500431572dd0c318792de40333ea5e85ab7eb9d8dea1509336b6d842
+RWSagIOpLGJF3xGHoT4DE2J/oWP4oFe6EZeVk3aSMu6ZGIJFrTJxZ9gjkuo7z6x2OzvZQzG9qEy3DkXeaG6AZUhdsAKVAvqxkwk=
+SHA256 (Pkgfile) = a87e72f202f3eadabb663dc4aed55cb003737e5dec363b4ff87f58f436a7a603
 SHA256 (.footprint) = 790bf0e51fd246b1b45aa1a7ce0b8fa4f874a9ec83406d377ca02dbe73dd93cb
 SHA256 (libnfnetlink-1.0.1.tar.bz2) = f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a
-SHA256 (sync_with_kernel_headers.patch) = 904e4d7c8b8ab221c36a9526499ca7f50565373ed7fd4446d070a7becabbd3c0
+SHA256 (0001-build-resolve-automake-1.12-warnings.patch) = a2c1c352bb08cbf2efccd0f05d1a24a3d476efaa4e3b847ac8d79cdea03c3ecc
+SHA256 (0002-src-get-source-code-license-header-in-sync-with-curr.patch) = 2ef6209142f0899531ff0a72c2544cf1986848efa654226a5d7ad54163b3db2a
+SHA256 (0003-configure-uclinux-is-also-linux.patch) = e3e2be028ea49f44d10bc5e515c1d5c1d60f68e07680eeafb7f6e58aaf9c9e74
+SHA256 (0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch) = 0dd4c954a8158596efcbe2b16e31adbe53c8bd3aaab4ba6efd663689dacd27a7
+SHA256 (0005-include-Sync-with-kernel-headers.patch) = b7858eeb53352af4cc5c1d1f17a541a0f3b6629b6bdb1ebe8554f39064ac8242
+SHA256 (0006-src-Use-stdint-types-everywhere.patch) = 552ff8b2a0f9fb173e61017c9031b707fad4661168ab96696432b3504cb01f01
--- a/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch
+++ b/libnfnetlink/0001-build-resolve-automake-1.12-warnings.patch
@ -0,0 +1,28 @@
+From 2e5f2b81fb8cbe0d1cd33e58caa19ac308e1f847 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Tue, 9 Oct 2012 15:59:48 +0200
+Subject: [PATCH 1/6] build: resolve automake-1.12 warnings
+
+am/ltlibrary.am: warning: 'libnfnetlink.la': linking libtool libraries
+using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'
+
+Signed-off-by: Jan Engelhardt <jengelh@inai.de>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index ed549df..0926a1c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_CANONICAL_HOST
+ 
+ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
+ 	tar-pax no-dist-gzip dist-bzip2 1.6])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ 
+ dnl kernel style compile messages
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+-- 
+2.12.1
+
--- a/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch
+++ b/libnfnetlink/0002-src-get-source-code-license-header-in-sync-with-curr.patch
@ -0,0 +1,49 @@
+From 5e6b6e23a8b04475c5a9de7eddb4c18103932fe5 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Wed, 7 Aug 2013 20:53:57 +0200
+Subject: [PATCH 2/6] src: get source code license header in sync with current
+ licensing terms
+
+Since (3956761 license: upgrade to GPLv2+), we upgraded to GPLv2+,
+propagate that changes to src/iftable.c and src/rtnl.c
+
+Reported-by: Thomas Woerner <twoerner@redhat.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ src/iftable.c | 2 +-
+ src/rtnl.c    | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/iftable.c b/src/iftable.c
+index 0325335..5976ed8 100644
+--- a/src/iftable.c
+++ b/src/iftable.c
+@@ -3,7 +3,7 @@
+  * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com>
+  * (C) 2008 by Pablo Neira Ayuso <pablo@netfilter.org>
+  *
+- * This software is Free Software and licensed under GNU GPLv2. 
+ * This software is Free Software and licensed under GNU GPLv2+.
+  */
+ 
+ /* IFINDEX handling */
+diff --git a/src/rtnl.c b/src/rtnl.c
+index 5ccb272..7b4ac7d 100644
+--- a/src/rtnl.c
+++ b/src/rtnl.c
+@@ -1,10 +1,10 @@
+ /* rtnl - rtnetlink utility functions
+  *
+  * (C) 2004 by Astaro AG, written by Harald Welte <hwelte@astaro.com>
+- * 
+ *
+  * Adapted to nfnetlink by Eric Leblond <eric@inl.fr>
+  *
+- * This software is free software and licensed under GNU GPLv2. 
+ * This software is free software and licensed under GNU GPLv2+.
+  *
+  */
+ 
+-- 
+2.12.1
+
--- a/libnfnetlink/0003-configure-uclinux-is-also-linux.patch
+++ b/libnfnetlink/0003-configure-uclinux-is-also-linux.patch
@ -0,0 +1,27 @@
+From b259fe13826414c1bd5328a25c8d6d60e20e65f2 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 10 Sep 2013 16:23:29 -0300
+Subject: [PATCH 3/6] configure: uclinux is also linux
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0926a1c..b979772 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -18,7 +18,7 @@ AC_DISABLE_STATIC
+ AM_PROG_LIBTOOL
+ 
+ case "$host" in 
+-*-*-linux*) ;;
+*-*-linux* | *-*-uclinux*) ;;
+ *) AC_MSG_ERROR([Linux only, dude!]);;
+ esac
+ 
+-- 
+2.12.1
+
--- a/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
+++ b/libnfnetlink/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
@ -0,0 +1,39 @@
+From b142da8d2c9e2e2dfbe4e89e680dd124f6064ac8 Mon Sep 17 00:00:00 2001
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Mon, 3 Feb 2014 12:09:29 +0100
+Subject: [PATCH 4/6] libnfnetlink: initialize attribute padding to resolve
+ valgrind warnings
+
+==12195== Syscall param socketcall.sendto(msg) points to uninitialised byte(s)
+==12195==    at 0x51209C3: __sendto_nocancel (syscall-template.S:81)
+==12195==    by 0x53E4D12: nfnl_send (libnfnetlink.c:391)
+==12195==    by 0x53E6952: nfnl_query (libnfnetlink.c:1569)
+==12195==    by 0x4E344AF: __build_send_cfg_msg.isra.1 (libnetfilter_log.c:143)
+==12195==    by 0x4E34710: nflog_bind_group (libnetfilter_log.c:413)
+==12195==    by 0x400CB1: main (nfulnl_test.c:77)
+==12195==  Address 0x7fefff3e9 is on thread 1's stack
+
+This patch sets to zero the padding that is included to align the
+attribute payload.
+
+Reported-by: Ivan Homoliak <xhomol11@gmail.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ src/libnfnetlink.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c
+index 4b2bcd0..398b7d7 100644
+--- a/src/libnfnetlink.c
+++ b/src/libnfnetlink.c
+@@ -809,6 +809,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
+ 	nfa->nfa_type = type;
+ 	nfa->nfa_len = len;
+ 	memcpy(NFA_DATA(nfa), data, alen);
+	memset((uint8_t *)nfa + nfa->nfa_len, 0, NFA_ALIGN(alen) - alen);
+ 	n->nlmsg_len = (NLMSG_ALIGN(n->nlmsg_len) + NFA_ALIGN(len));
+ 	return 0;
+ }
+-- 
+2.12.1
+
--- a/libnfnetlink/0005-include-Sync-with-kernel-headers.patch
+++ b/libnfnetlink/0005-include-Sync-with-kernel-headers.patch
@ -1,7 +1,7 @@
-From 7a1a07c0028a1c88cd7716a058697c552a563b24 Mon Sep 17 00:00:00 2001
+From b10c90a61a5fc46f2be5aeecb9c96e84178f7717 Mon Sep 17 00:00:00 2001
 From: Felix Janda <felix.janda@posteo.de>
 Date: Sat, 16 May 2015 14:49:07 +0200
-Subject: include: Sync with kernel headers
+Subject: [PATCH 5/6] include: Sync with kernel headers

 Signed-off-by: Felix Janda <felix.janda@posteo.de>
 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
@ -106,5 +106,5 @@ index e145176..74b9e55 100644
 -#endif /* ! __KERNEL__ */
 #endif /* _NFNETLINK_COMPAT_H */
 -- 
-cgit v0.12
+2.12.1

--- a/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch
+++ b/libnfnetlink/0006-src-Use-stdint-types-everywhere.patch
@ -0,0 +1,403 @@
+From 5cb589e246c91331ee6b3926b15f5e6cfc8ad95e Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 14:59:57 +0200
+Subject: [PATCH 6/6] src: Use stdint types everywhere
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ include/libnfnetlink/libnfnetlink.h | 25 ++++++-------
+ src/iftable.c                       |  8 ++---
+ src/iftable.h                       |  4 +--
+ src/libnfnetlink.c                  | 72 ++++++++++++++++++-------------------
+ src/rtnl.c                          |  4 +--
+ src/rtnl.h                          |  2 +-
+ 6 files changed, 58 insertions(+), 57 deletions(-)
+
+diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h
+index 1d8c49d..cd0be3d 100644
+--- a/include/libnfnetlink/libnfnetlink.h
+++ b/include/libnfnetlink/libnfnetlink.h
+@@ -15,6 +15,7 @@
+ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
+ #endif
+ 
+#include <stdint.h>
+ #include <sys/socket.h>	/* for sa_family_t */
+ #include <linux/netlink.h>
+ #include <libnfnetlink/linux_nfnetlink.h>
+@@ -55,7 +56,7 @@ struct nfnlhdr {
+ struct nfnl_callback {
+ 	int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data);
+ 	void *data;
+-	u_int16_t attr_count;
+	uint16_t attr_count;
+ };
+ 
+ struct nfnl_handle;
+@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void);
+ extern int nfnl_close(struct nfnl_handle *);
+ 
+ extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, 
+-						   u_int8_t, u_int8_t, 
+						   uint8_t, uint8_t,
+ 						   unsigned int);
+ extern void nfnl_subsys_close(struct nfnl_subsys_handle *);
+ 
+@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh,
+ 			const struct iovec *iov, unsigned int num,
+ 			unsigned int flags);
+ extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *,
+-			  unsigned int, u_int8_t, u_int16_t, u_int16_t,
+-			  u_int16_t);
+			  unsigned int, uint8_t, uint16_t, uint16_t,
+			  uint16_t);
+ extern __attribute__((deprecated)) int
+ nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t,
+           unsigned, struct nlmsghdr *,
+@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *,
+ /* receiving */
+ extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len);
+ extern int nfnl_callback_register(struct nfnl_subsys_handle *,
+-				  u_int8_t type, struct nfnl_callback *cb);
+-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type);
+				  uint8_t type, struct nfnl_callback *cb);
+extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type);
+ extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len);
+ 
+ /* parsing */
+@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh);
+ 
+ /* nfnl attribute handling functions */
+ extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int);
+-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t);
+-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t);
+-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t);
+extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t);
+extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t);
+extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t);
+ extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int);
+-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t);
+-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t);
+extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t);
+extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t);
+ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);
+ #define nfnl_parse_nested(tb, max, nfa) \
+ 	nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
+@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);
+ ({	(tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; })
+ 
+ extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, 
+-				 u_int16_t type, u_int32_t len,
+				 uint16_t type, uint32_t len,
+ 				 unsigned char *val);
+ extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, 
+ 				   unsigned int size);
+diff --git a/src/iftable.c b/src/iftable.c
+index 5976ed8..157f97b 100644
+--- a/src/iftable.c
+++ b/src/iftable.c
+@@ -27,10 +27,10 @@
+ struct ifindex_node {
+ 	struct list_head head;
+ 
+-	u_int32_t	index;
+-	u_int32_t	type;
+-	u_int32_t	alen;
+-	u_int32_t	flags;
+	uint32_t	index;
+	uint32_t	type;
+	uint32_t	alen;
+	uint32_t	flags;
+ 	char		addr[8];
+ 	char		name[16];
+ };
+diff --git a/src/iftable.h b/src/iftable.h
+index 8df7f24..655df6b 100644
+--- a/src/iftable.h
+++ b/src/iftable.h
+@@ -1,8 +1,8 @@
+ #ifndef _IFTABLE_H
+ #define _IFTABLE_H
+ 
+-int iftable_delete(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif);
+-int iftable_insert(u_int32_t dst, u_int32_t mask, u_int32_t gw, u_int32_t oif);
+int iftable_delete(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif);
+int iftable_insert(uint32_t dst, uint32_t mask, uint32_t gw, uint32_t oif);
+ 
+ int iftable_init(void);
+ void iftable_fini(void);
+diff --git a/src/libnfnetlink.c b/src/libnfnetlink.c
+index 398b7d7..df57533 100644
+--- a/src/libnfnetlink.c
+++ b/src/libnfnetlink.c
+@@ -72,9 +72,9 @@
+ 
+ struct nfnl_subsys_handle {
+ 	struct nfnl_handle 	*nfnlh;
+-	u_int32_t		subscriptions;
+-	u_int8_t		subsys_id;
+-	u_int8_t		cb_count;
+	uint32_t		subscriptions;
+	uint8_t			subsys_id;
+	uint8_t			cb_count;
+ 	struct nfnl_callback 	*cb;	/* array of callbacks */
+ };
+ 
+@@ -86,11 +86,11 @@ struct nfnl_handle {
+ 	int			fd;
+ 	struct sockaddr_nl	local;
+ 	struct sockaddr_nl	peer;
+-	u_int32_t		subscriptions;
+-	u_int32_t		seq;
+-	u_int32_t		dump;
+-	u_int32_t		rcv_buffer_size;	/* for nfnl_catch */
+-	u_int32_t		flags;
+	uint32_t		subscriptions;
+	uint32_t		seq;
+	uint32_t		dump;
+	uint32_t		rcv_buffer_size;	/* for nfnl_catch */
+	uint32_t		flags;
+ 	struct nlmsghdr 	*last_nlhdr;
+ 	struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1];
+ };
+@@ -145,7 +145,7 @@ unsigned int nfnl_portid(const struct nfnl_handle *h)
+ static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh)
+ {
+ 	int i, err;
+-	u_int32_t new_subscriptions = nfnlh->subscriptions;
+	uint32_t new_subscriptions = nfnlh->subscriptions;
+ 
+ 	for (i = 0; i < NFNL_MAX_SUBSYS; i++)
+ 		new_subscriptions |= nfnlh->subsys[i].subscriptions;
+@@ -273,8 +273,8 @@ void nfnl_set_rcv_buffer_size(struct nfnl_handle *h, unsigned int size)
+  * a valid address that points to a nfnl_subsys_handle structure is returned.
+  */
+ struct nfnl_subsys_handle *
+-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id,
+-		 u_int8_t cb_count, u_int32_t subscriptions)
+nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id,
+		 uint8_t cb_count, uint32_t subscriptions)
+ {
+ 	struct nfnl_subsys_handle *ssh;
+ 
+@@ -435,10 +435,10 @@ int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov,
+  */
+ void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh,
+ 		    struct nlmsghdr *nlh, unsigned int len, 
+-		    u_int8_t family,
+-		    u_int16_t res_id,
+-		    u_int16_t msg_type,
+-		    u_int16_t msg_flags)
+		    uint8_t family,
+		    uint16_t res_id,
+		    uint16_t msg_type,
+		    uint16_t msg_flags)
+ {
+ 	assert(ssh);
+ 	assert(nlh);
+@@ -815,7 +815,7 @@ int nfnl_addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
+ }
+ 
+ /**
+- * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr 
+ * nfnl_nfa_addattr_l - Add variable length attribute to struct nfattr
+  *
+  * @nfa: struct nfattr
+  * @maxlen: maximal length of nfattr buffer
+@@ -849,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nfa, int maxlen, int type,
+ }
+ 
+ /**
+- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr
+ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr
+  *
+  * @n: netlink message header to which attribute is to be added
+  * @maxlen: maximum length of netlink message header
+  * @type: type of new attribute
+  * @data: content of new attribute
+  */
+-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)
+int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data)
+ {
+ 	assert(n);
+ 	assert(maxlen > 0);
+@@ -866,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)
+ }
+ 
+ /**
+- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr 
+ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr
+  *
+  * @nfa: struct nfattr
+  * @maxlen: maximal length of nfattr buffer
+@@ -875,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data)
+  *
+  */
+ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, 
+-		       u_int16_t data)
+		       uint16_t data)
+ {
+ 	assert(nfa);
+ 	assert(maxlen > 0);
+@@ -885,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type,
+ }
+ 
+ /**
+- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr
+ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr
+  *
+  * @n: netlink message header to which attribute is to be added
+  * @maxlen: maximum length of netlink message header
+@@ -894,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type,
+  *
+  */
+ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,
+-		   u_int16_t data)
+		   uint16_t data)
+ {
+ 	assert(n);
+ 	assert(maxlen > 0);
+@@ -904,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,
+ }
+ 
+ /**
+- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr 
+ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr
+  *
+  * @nfa: struct nfattr
+  * @maxlen: maximal length of nfattr buffer
+@@ -913,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type,
+  *
+  */
+ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, 
+-		       u_int32_t data)
+		       uint32_t data)
+ {
+ 	assert(nfa);
+ 	assert(maxlen > 0);
+@@ -923,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type,
+ }
+ 
+ /**
+- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr
+ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr
+  *
+  * @n: netlink message header to which attribute is to be added
+  * @maxlen: maximum length of netlink message header
+@@ -932,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type,
+  *
+  */
+ int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type,
+-		   u_int32_t data)
+		   uint32_t data)
+ {
+ 	assert(n);
+ 	assert(maxlen > 0);
+@@ -980,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], int max, struct nfattr *nfa, int len)
+  *
+  */ 
+ void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, 
+-			  u_int16_t type, u_int32_t len, unsigned char *val)
+			  uint16_t type, uint32_t len, unsigned char *val)
+ {
+ 	assert(iov);
+ 	assert(nfa);
+@@ -1115,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struct nfnl_handle *h,
+  * appropiately.
+  */
+ int nfnl_callback_register(struct nfnl_subsys_handle *ssh,
+-			   u_int8_t type, struct nfnl_callback *cb)
+			   uint8_t type, struct nfnl_callback *cb)
+ {
+ 	assert(ssh);
+ 	assert(cb);
+@@ -1138,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_subsys_handle *ssh,
+  * On sucess, 0 is returned. On error, -1 is returned and errno is
+  * set appropiately.
+  */
+-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type)
+int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type)
+ {
+ 	assert(ssh);
+ 
+@@ -1161,8 +1161,8 @@ int nfnl_check_attributes(const struct nfnl_handle *h,
+ 	assert(nfa);
+ 
+ 	int min_len;
+-	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+-	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+ 	const struct nfnl_subsys_handle *ssh;
+ 	struct nfnl_callback *cb;
+ 
+@@ -1212,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl_handle *h, struct nlmsghdr *nlh,
+ 			     int len)
+ {
+ 	struct nfnl_subsys_handle *ssh;
+-	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+-	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+ 	int err = 0;
+ 
+ 	if (subsys_id > NFNL_MAX_SUBSYS)
+@@ -1243,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handle *h, char *buf, int len)
+ {
+ 
+ 	while (len >= NLMSG_SPACE(0)) {
+-		u_int32_t rlen;
+		uint32_t rlen;
+ 		struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
+ 
+ 		if (nlh->nlmsg_len < sizeof(struct nlmsghdr)
+@@ -1285,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_handle *h, struct nlmsghdr *nlh)
+ static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh)
+ {
+ 	struct nfnl_subsys_handle *ssh;
+-	u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+-	u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+	uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type);
+	uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type);
+ 
+ 	/* Is this an error message? */
+ 	if (nfnl_is_error(h, nlh)) {
+diff --git a/src/rtnl.c b/src/rtnl.c
+index 7b4ac7d..284eecd 100644
+--- a/src/rtnl.c
+++ b/src/rtnl.c
+@@ -30,7 +30,7 @@
+ #define rtnl_log(x, ...)
+ 
+ static inline struct rtnl_handler *
+-find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type)
+find_handler(struct rtnl_handle *rtnl_handle, uint16_t type)
+ {
+ 	struct rtnl_handler *h;
+ 	for (h = rtnl_handle->handlers; h; h = h->next) {
+@@ -41,7 +41,7 @@ find_handler(struct rtnl_handle *rtnl_handle, u_int16_t type)
+ }
+ 
+ static int call_handler(struct rtnl_handle *rtnl_handle,
+-			u_int16_t type,
+			uint16_t type,
+ 			struct nlmsghdr *hdr)
+ {
+ 	struct rtnl_handler *h = find_handler(rtnl_handle, type);
+diff --git a/src/rtnl.h b/src/rtnl.h
+index 0c403dc..2cb22a8 100644
+--- a/src/rtnl.h
+++ b/src/rtnl.h
+@@ -7,7 +7,7 @@
+ struct rtnl_handler {
+ 	struct rtnl_handler *next;
+ 
+-	u_int16_t	nlmsg_type;
+	uint16_t	nlmsg_type;
+ 	int		(*handlefn)(struct nlmsghdr *h, void *arg);
+ 	void		*arg;
+ };
+-- 
+2.12.1
+
--- a/libnfnetlink/Pkgfile
+++ b/libnfnetlink/Pkgfile
@ -1,18 +1,29 @@
 # Description: Netfilter kernel/userspace communication library.
-# URL: http://www.netfilter.org/projects/libnfnetlink/index.html
+# URL: https://www.netfilter.org/projects/libnfnetlink/index.html
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Nathan Pardoe, lithium at poolofrandomness dot com

 name=libnfnetlink
 version=1.0.1
-release=2
-source=(http://www.netfilter.org/projects/$name/files/$name-$version.tar.bz2
-	sync_with_kernel_headers.patch)
+release=3
+source=(
+	https://www.netfilter.org/projects/$name/files/$name-$version.tar.bz2
+	0001-build-resolve-automake-1.12-warnings.patch
+	0002-src-get-source-code-license-header-in-sync-with-curr.patch
+	0003-configure-uclinux-is-also-linux.patch
+	0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
+	0005-include-Sync-with-kernel-headers.patch
+	0006-src-Use-stdint-types-everywhere.patch
+)

 build() {
 	cd $name-$version

-	patch -p1 -i $SRC/sync_with_kernel_headers.patch
+	patch -p1 -i $SRC/0001-build-resolve-automake-1.12-warnings.patch
+	patch -p1 -i $SRC/0002-src-get-source-code-license-header-in-sync-with-curr.patch
+	patch -p1 -i $SRC/0003-configure-uclinux-is-also-linux.patch
+	patch -p1 -i $SRC/0004-libnfnetlink-initialize-attribute-padding-to-resolve.patch
+	patch -p1 -i $SRC/0005-include-Sync-with-kernel-headers.patch
+	patch -p1 -i $SRC/0006-src-Use-stdint-types-everywhere.patch

 	./configure --prefix=/usr

--- a/rtmpdump/.footprint
+++ b/rtmpdump/.footprint
@ -16,10 +16,11 @@ lrwxrwxrwx	root/root	usr/lib/librtmp.so -> librtmp.so.1
 -rwxr-xr-x	root/root	usr/lib/librtmp.so.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/librtmp.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-rw-r--r--	root/root	usr/man/man1/rtmpdump.1.gz
-drwxr-xr-x	root/root	usr/man/man3/
-rw-r--r--	root/root	usr/man/man3/librtmp.3.gz
-drwxr-xr-x	root/root	usr/man/man8/
-rw-r--r--	root/root	usr/man/man8/rtmpgw.8.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/rtmpdump.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/librtmp.3.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/rtmpgw.8.gz
--- a/rtmpdump/.signature
+++ b/rtmpdump/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF39LZEninHJLdG4gTUQlq1cNvvP2pso41zYclEj0p01pi8jeyRysnrIcQmvFhDjrMyAyBXf6Y628XG/TwN4HO2Qs=
-SHA256 (Pkgfile) = 5b3ab831ee71838a704148acd32545bd7c02f358643f18409cd7a6e87f32fef0
-SHA256 (.footprint) = e565b4966bd5c0d53c752cc943adb5bf16ea5f7c048fd3efe3cffcfe5431a2c7
-SHA256 (rtmpdump-2.4_p20131018.tar.gz) = 57164e0c12f7cbff8e40b1e66cf6b889086387324851a115b427b8d2b3fff267
+RWSagIOpLGJF3wKUrPfjOmAx++Mhd8bIuPKfb8+dMySskPQUiVp5aR6VCQtE6K9SSZVRgijxVOJUKYCEwyl8VCGs4xXSYxavdw0=
+SHA256 (Pkgfile) = bcd7534fa5e10be7e1b4d1a7ba4b69924e8855056bccb56714c25f9f1624c165
+SHA256 (.footprint) = 18a78fe5a351a9baf2d0f144b99c2d06c7b8368d7dd9fe1e2a41300bbf4dad63
+SHA256 (rtmpdump-2.4-c5f04a58.tar.xz) = 14d2f9096998527b7d2d9462c720f8bc3f7d2166ef611a3a4d5da14b2518bbf6
--- a/rtmpdump/Pkgfile
+++ b/rtmpdump/Pkgfile
@ -1,16 +1,15 @@
 # Description: A tool to download rtmp streams.
 # URL: http://rtmpdump.mplayerhq.hu/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
 # Depends on: zlib openssl

 name=rtmpdump
 version=2.4
-release=1
-source=(http://crux.ster.zone/downloads/$name/$name-${version}_p20131018.tar.gz)
+release=2
+source=(http://crux.ster.zone/downloads/$name/$name-$version-c5f04a58.tar.xz)

 build() {
-	#sed -i 's/\$(MAKEFLAGS)//g' Makefile
+	cd $name

 	sed -i \
 		-e 's|OPT=|&-fPIC |' \
@ -35,7 +34,7 @@ build() {
 		CRYPTO=OPENSSL \
 		prefix=/usr \
 		sbindir=/usr/bin \
-		mandir=/usr/man \
+		mandir=/usr/share/man \
 		DESTDIR=$PKG \
 		install
 }
--- a/wavpack/.footprint
+++ b/wavpack/.footprint
@ -2,6 +2,7 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/wavpack
 -rwxr-xr-x	root/root	usr/bin/wvgain
+-rwxr-xr-x	root/root	usr/bin/wvtag
 -rwxr-xr-x	root/root	usr/bin/wvunpack
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/wavpack/
@ -9,13 +10,15 @@ drwxr-xr-x	root/root	usr/include/wavpack/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libwavpack.a
 -rwxr-xr-x	root/root	usr/lib/libwavpack.la
-lrwxrwxrwx	root/root	usr/lib/libwavpack.so -> libwavpack.so.1.1.4
-lrwxrwxrwx	root/root	usr/lib/libwavpack.so.1 -> libwavpack.so.1.1.4
-rwxr-xr-x	root/root	usr/lib/libwavpack.so.1.1.4
+lrwxrwxrwx	root/root	usr/lib/libwavpack.so -> libwavpack.so.1.2.0
+lrwxrwxrwx	root/root	usr/lib/libwavpack.so.1 -> libwavpack.so.1.2.0
+-rwxr-xr-x	root/root	usr/lib/libwavpack.so.1.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/wavpack.pc
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
-rw-r--r--	root/root	usr/man/man1/wavpack.1.gz
-rw-r--r--	root/root	usr/man/man1/wvgain.1.gz
-rw-r--r--	root/root	usr/man/man1/wvunpack.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/wavpack.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/wvgain.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/wvtag.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/wvunpack.1.gz
--- a/wavpack/.signature
+++ b/wavpack/.signature
@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30/OsJ82aYXRAQotCe7XBBOkbnKLT5Wg7U/OhoKfV5TvJigSmlbIN64qEgpTB5LBG5vPb1iY5VSkuqnz37XCrwU=
-SHA256 (Pkgfile) = 3ea89989dba4b7d66f4d6a5bc2e1bc4ee40a4bdcd93133fb4bc9a2cf5090902c
-SHA256 (.footprint) = 5b0c727e237532d6d08b0b04037cd56c25a64d34601ba6ba1784ab0d3de63a85
-SHA256 (wavpack-4.60.1.tar.bz2) = 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5
+RWSagIOpLGJF33qAmLb9EulbNu1M9PoWkIQMWuBIj0Ow80WVF8nOsurOoUje4PLF3RI20guNqxbMbqO633qWMgvH6FjZtzcwRAQ=
+SHA256 (Pkgfile) = 7626e7eae1b15ba4c483e18a8e7178d57be8588e1a3b117cb770a1fd7cc53c5f
+SHA256 (.footprint) = 30f2a1409be4dca0b518c690f96488146f388d011f93ce18e83f2a73af01fd42
+SHA256 (wavpack-5.1.0.tar.bz2) = 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944
--- a/wavpack/Pkgfile
+++ b/wavpack/Pkgfile
@ -1,19 +1,16 @@
 # Description: Lossless audio compression software.
 # URL: http://www.wavpack.com/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Jukka Heino, jukka dot heino at gmail dot com

 name=wavpack
-version=4.60.1
+version=5.1.0
 release=1
-source=(http://www.wavpack.com/wavpack-$version.tar.bz2)
+source=(http://www.wavpack.com/$name-$version.tar.bz2)

 build() {
-	cd wavpack-$version
+	cd $name-$version

-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man
+	./configure --prefix=/usr

 	make
 	make DESTDIR=$PKG install
--- a/wxgtk/.footprint
+++ b/wxgtk/.footprint
@ -736,50 +736,50 @@ drwxr-xr-x	root/root	usr/include/wx-3.0/wx/xrc/
 -rw-r--r--	root/root	usr/include/wx-3.0/wx/zstream.h
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libwx_baseu-3.0.so -> libwx_baseu-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_baseu-3.0.so.0 -> libwx_baseu-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_baseu-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_baseu-3.0.so.0 -> libwx_baseu-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_baseu-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_baseu_net-3.0.so -> libwx_baseu_net-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_baseu_net-3.0.so.0 -> libwx_baseu_net-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_baseu_net-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_baseu_net-3.0.so.0 -> libwx_baseu_net-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_baseu_net-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_baseu_xml-3.0.so -> libwx_baseu_xml-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_baseu_xml-3.0.so.0 -> libwx_baseu_xml-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_baseu_xml-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_baseu_xml-3.0.so.0 -> libwx_baseu_xml-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_baseu_xml-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_adv-3.0.so -> libwx_gtk2u_adv-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_adv-3.0.so.0 -> libwx_gtk2u_adv-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_adv-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_adv-3.0.so.0 -> libwx_gtk2u_adv-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_adv-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_aui-3.0.so -> libwx_gtk2u_aui-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_aui-3.0.so.0 -> libwx_gtk2u_aui-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_aui-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_aui-3.0.so.0 -> libwx_gtk2u_aui-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_aui-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_core-3.0.so -> libwx_gtk2u_core-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_core-3.0.so.0 -> libwx_gtk2u_core-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_core-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_core-3.0.so.0 -> libwx_gtk2u_core-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_core-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_gl-3.0.so -> libwx_gtk2u_gl-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_gl-3.0.so.0 -> libwx_gtk2u_gl-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_gl-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_gl-3.0.so.0 -> libwx_gtk2u_gl-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_gl-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_html-3.0.so -> libwx_gtk2u_html-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_html-3.0.so.0 -> libwx_gtk2u_html-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_html-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_html-3.0.so.0 -> libwx_gtk2u_html-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_html-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_media-3.0.so -> libwx_gtk2u_media-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_media-3.0.so.0 -> libwx_gtk2u_media-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_media-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_media-3.0.so.0 -> libwx_gtk2u_media-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_media-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_propgrid-3.0.so -> libwx_gtk2u_propgrid-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_propgrid-3.0.so.0 -> libwx_gtk2u_propgrid-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_propgrid-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_propgrid-3.0.so.0 -> libwx_gtk2u_propgrid-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_qa-3.0.so -> libwx_gtk2u_qa-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_qa-3.0.so.0 -> libwx_gtk2u_qa-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_qa-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_qa-3.0.so.0 -> libwx_gtk2u_qa-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_qa-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_ribbon-3.0.so -> libwx_gtk2u_ribbon-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_ribbon-3.0.so.0 -> libwx_gtk2u_ribbon-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_ribbon-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_ribbon-3.0.so.0 -> libwx_gtk2u_ribbon-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_richtext-3.0.so -> libwx_gtk2u_richtext-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_richtext-3.0.so.0 -> libwx_gtk2u_richtext-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_richtext-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_richtext-3.0.so.0 -> libwx_gtk2u_richtext-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_richtext-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_stc-3.0.so -> libwx_gtk2u_stc-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_stc-3.0.so.0 -> libwx_gtk2u_stc-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_stc-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_stc-3.0.so.0 -> libwx_gtk2u_stc-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_stc-3.0.so.0.4.0
 lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_xrc-3.0.so -> libwx_gtk2u_xrc-3.0.so.0
-lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_xrc-3.0.so.0 -> libwx_gtk2u_xrc-3.0.so.0.3.0
-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_xrc-3.0.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libwx_gtk2u_xrc-3.0.so.0 -> libwx_gtk2u_xrc-3.0.so.0.4.0
+-rwxr-xr-x	root/root	usr/lib/libwx_gtk2u_xrc-3.0.so.0.4.0
 drwxr-xr-x	root/root	usr/lib/wx/
 drwxr-xr-x	root/root	usr/lib/wx/config/
 -rwxr-xr-x	root/root	usr/lib/wx/config/gtk2-unicode-3.0
--- a/wxgtk/.signature
+++ b/wxgtk/.signature
@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yl+at8K5kYpzfDUxquyYKRQN04CH8rt8+jh1lJth1hIJXeXoSIMwZoCGLCaNo5maj5Pdf9s6hcnYafeqv5Iugs=
-SHA256 (Pkgfile) = 114d8e19df36b4cf73291875d4311a08830a10a778259669197db557b61faf08
-SHA256 (.footprint) = e64aa6a87d21311308b694de8149848b91db2bba6cb9b87ae46f852ce5957df0
-SHA256 (wxWidgets-3.0.3.tar.bz2) = 08c8033f48ec1b23520f036cde37b5ae925a6a65f137ded665633ca159b9307b
+RWSagIOpLGJF37e7cu4bpffSTWObnwHC5/rhpMCT+VJS61Hn5rosGybX4s8L7fyVDTiPo4IcVIrONqhCXlfA4/B/EeAjVmEAVAE=
+SHA256 (Pkgfile) = 6201426dc704ff15ab7801d433d0997cc0f7b2d3dd0d8964ee301522fee10f81
+SHA256 (.footprint) = 4c6c9081c7389616fdbf08951859dc8bea81834bdfe1c4539dec4c421003ea42
+SHA256 (wxWidgets-3.0.4.tar.bz2) = 96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0
 SHA256 (make-abicheck-non-fatal.patch) = 46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453
--- a/wxgtk/Pkgfile
+++ b/wxgtk/Pkgfile
@ -4,7 +4,7 @@
 # Depends on: gtk glu gst-plugins-base

 name=wxgtk
-version=3.0.3
+version=3.0.4
 release=1
 source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2
 	make-abicheck-non-fatal.patch)