From e70325e83d97d6cef9bd38f6c5e4e0a7af5dd6fc Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 14 Jan 2020 10:08:19 +0000
Subject: user/*: Modernise / fix syntax / deps / code / tests

---
 user/libid3tag/APKBUILD    |  6 ++++--
 user/libid3tag/gperf.patch | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 user/libid3tag/gperf.patch

(limited to 'user/libid3tag')

diff --git a/user/libid3tag/APKBUILD b/user/libid3tag/APKBUILD
index 0984fc93f..e20e012d5 100644
--- a/user/libid3tag/APKBUILD
+++ b/user/libid3tag/APKBUILD
@@ -8,11 +8,12 @@ url="http://www.underbit.com/products/mad/"
 arch="all"
 license="GPL-2.0+"
 depends=""
-makedepends="zlib-dev"
+makedepends="gperf zlib-dev"
 subpackages="$pkgname-dev"
 source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz
 	CVE-2004-2779.patch
 	CVE-2017-11550.patch
+	gperf.patch
 	"
 
 # secfixes:
@@ -63,4 +64,5 @@ EOF
 
 sha512sums="ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3  libid3tag-0.15.1b.tar.gz
 4c27e104d45ae34affc1bef8ec613e65c7e4791185d2ef1cb27974ec7025c06c35d30d6278ce7e3107dff959bd55a708246c3c1a9d5ad7b093424cfb93b79f63  CVE-2004-2779.patch
-6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535  CVE-2017-11550.patch"
+6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535  CVE-2017-11550.patch
+3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb  gperf.patch"
diff --git a/user/libid3tag/gperf.patch b/user/libid3tag/gperf.patch
new file mode 100644
index 000000000..a365811c5
--- /dev/null
+++ b/user/libid3tag/gperf.patch
@@ -0,0 +1,12 @@
+diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h
+--- libid3tag-0.15.1b-orig/compat.h	2004-01-23 10:41:32.000000000 +0100
++++ libid3tag-0.15.1b/compat.h	2017-03-15 01:49:23.808834401 +0100
+@@ -34,7 +34,7 @@ struct id3_compat {
+ };
+ 
+ struct id3_compat const *id3_compat_lookup(register char const *,
+-					   register unsigned int);
++					   register size_t);
+ 
+ int id3_compat_fixup(struct id3_tag *);
+ 
-- 
cgit v1.2.3-70-g09d2