From 7afd052f9f2ffb9f4cc3b602d318039443bb589a Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 30 Aug 2022 09:42:28 +0000
Subject: [PATCH] minidlna: update to 1.3.2 and drop upstreamed patches and
 addon (104)

1.3.2 - Released 30-Aug-2022
--------------------------------
- Improved DNS rebinding attack protection.
- Added Samsung Neo QLED series (2021) support.
- Added webm/rm/rmvb support.

1.3.1 - Released 11-Feb-2022
--------------------------------
- Fixed a potential crash in SSDP request parsing.
- Fixed a configure script failure on some platforms.
- Protect against DNS rebinding attacks.
- Fix an socket leakage issue on some platforms.
- Minor bug fixes.
---
 .../addons/service/minidlna/changelog.txt     |  3 ++
 packages/addons/service/minidlna/package.mk   |  8 ++---
 .../minidlna-02-fix-autoconf-271.patch        | 31 -------------------
 .../minidlna-03-allow-gettext-0.20.patch      | 14 ---------
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 packages/addons/service/minidlna/patches/minidlna-02-fix-autoconf-271.patch
 delete mode 100644 packages/addons/service/minidlna/patches/minidlna-03-allow-gettext-0.20.patch

diff --git a/packages/addons/service/minidlna/changelog.txt b/packages/addons/service/minidlna/changelog.txt
index 7a7d2093ab..72aa3ccfb1 100644
--- a/packages/addons/service/minidlna/changelog.txt
+++ b/packages/addons/service/minidlna/changelog.txt
@@ -1,3 +1,6 @@
+104
+- update to 1.3.2
+
 103
 - fix build
 
diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk
index 3ec30c8a6c..fc3b1043fa 100644
--- a/packages/addons/service/minidlna/package.mk
+++ b/packages/addons/service/minidlna/package.mk
@@ -2,13 +2,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minidlna"
-PKG_VERSION="1.3.0"
-PKG_SHA256="47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63"
-PKG_REV="103"
+PKG_VERSION="1.3.2"
+PKG_SHA256="222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="BSD-3c/GPLv2"
 PKG_SITE="https://sourceforge.net/projects/minidlna/"
-PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-${PKG_VERSION}.tar.gz"
+PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/${PKG_VERSION}/minidlna-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ffmpeg flac libexif libiconv libid3tag libjpeg-turbo libogg libvorbis sqlite"
 PKG_SECTION="service"
 PKG_SHORTDESC="MiniDLNA (ReadyMedia): a fully compliant DLNA/UPnP-AV server"
diff --git a/packages/addons/service/minidlna/patches/minidlna-02-fix-autoconf-271.patch b/packages/addons/service/minidlna/patches/minidlna-02-fix-autoconf-271.patch
deleted file mode 100644
index f4a413d25b..0000000000
--- a/packages/addons/service/minidlna/patches/minidlna-02-fix-autoconf-271.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac	2021-09-14 20:57:49.719326718 +1000
-+++ b/configure.ac	2021-09-14 20:57:24.852784827 +1000
-@@ -404,7 +404,7 @@
-     AC_CHECK_LIB([exif], [exif_data_new_from_file], [LIBEXIF_LIBS="-lexif"], [unset ac_cv_lib_exif_exif_data_new_from_file; LDFLAGS="$LDFLAGS_SAVE"; continue])
-     break
- done
--test x"$ac_cv_lib_jpeg_jpeg_set_defaults" = x"yes" || AC_MSG_ERROR([Could not find libexif])
-+test x"$ac_cv_lib_exif_exif_data_new_from_file" = x"yes" || AC_MSG_ERROR([Could not find libexif])
- AC_SUBST(LIBEXIF_LIBS)
- 
- LDFLAGS_SAVE="$LDFLAGS"
-@@ -415,7 +415,7 @@
-     AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue])
-     break
- done
--test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
-+test x"$ac_cv_lib_id3tag__lz_id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag])
- AC_SUBST(LIBID3TAG_LIBS)
- 
- LDFLAGS_SAVE="$LDFLAGS"
-@@ -441,8 +441,8 @@
- 		  [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])])
-     break
- done
--if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" &&
--   test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then
-+if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz_av_open_input_file" != x"yes" &&
-+   test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz_avformat_open_input" != x"yes"; then
-    AC_MSG_ERROR([Could not find libavformat - part of ffmpeg])
- fi
- AC_SUBST(LIBAVFORMAT_LIBS)
diff --git a/packages/addons/service/minidlna/patches/minidlna-03-allow-gettext-0.20.patch b/packages/addons/service/minidlna/patches/minidlna-03-allow-gettext-0.20.patch
deleted file mode 100644
index 1ac00c3dd1..0000000000
--- a/packages/addons/service/minidlna/patches/minidlna-03-allow-gettext-0.20.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: [PATCH] configure.ac: allow gettext >=0.18
-
-diff --git a/configure.ac b/configure.ac
-index cb596b9..2eaf0a4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,6 +29,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC_USE_SYSTEM_EXTENSIONS])
- AM_ICONV
- AM_GNU_GETTEXT([external])
- AM_GNU_GETTEXT_VERSION(0.18)
-+AM_GNU_GETTEXT_REQUIRE_VERSION(0.18)
- 
- # Checks for programs.
- AC_PROG_AWK