diff mbox series

[oe,meta-networking] miniupnpd: Update to 2.1.20191006

Message ID 20191101173212.1184403-1-raj.khem@gmail.com
State Accepted
Commit 5a4ae66242ebb84d14fd64c4916eb570549cac39
Headers show
Series [oe,meta-networking] miniupnpd: Update to 2.1.20191006 | expand

Commit Message

Khem Raj Nov. 1, 2019, 5:32 p.m. UTC 
Forward port the patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../0001-Add-OpenEmbedded-cross-compile-case.patch   | 12 +++++-------
 ...npd_2.1.20190630.bb => miniupnpd_2.1.20191006.bb} |  4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename meta-networking/recipes-connectivity/miniupnpd/{miniupnpd_2.1.20190630.bb => miniupnpd_2.1.20191006.bb} (92%)

-- 
2.23.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
index cd4291d91b..e33d8eac1d 100644
--- a/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
+++ b/meta-networking/recipes-connectivity/miniupnpd/files/0001-Add-OpenEmbedded-cross-compile-case.patch
@@ -3,17 +3,15 @@  From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 22 Dec 2018 18:47:45 -0800
 Subject: [PATCH] Add OpenEmbedded cross compile case
 
-Upstream-Status: Pending
+Upstream-Status: Submitted [https://github.com/miniupnp/miniupnp/pull/410]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  genconfig.sh | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/genconfig.sh b/genconfig.sh
-index dc42462..59922e9 100755
 --- a/genconfig.sh
 +++ b/genconfig.sh
-@@ -98,6 +98,12 @@ if [ -f ../shared/tomato_version ]; then
+@@ -103,6 +103,12 @@ if [ -f ../shared/tomato_version ]; then
  	OS_VERSION="Tomato $TOMATO_VER"
  fi
  
@@ -26,14 +24,14 @@  index dc42462..59922e9 100755
  ${RM} ${CONFIGFILE}
  
  echo "/* MiniUPnP Project" >> ${CONFIGFILE}
-@@ -318,6 +324,11 @@ case $OS_NAME in
+@@ -346,6 +352,11 @@ case $OS_NAME in
  		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
- 		FW=netfilter
+ 		FW=iptables
  		;;
 +	OpenEmbedded)
 +		OS_URL=http://www.openembedded.org/
 +		echo "#define USE_IFACEWATCHER 1" >> ${CONFIGFILE}
-+		FW=netfilter
++		FW=iptables
 +		;;
  	AstLinux)
  		OS_URL=http://www.astlinux.org/
diff --git a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
similarity index 92%
rename from meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb
rename to meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
index 6b8fdca4c3..595e211ea5 100644
--- a/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20190630.bb
+++ b/meta-networking/recipes-connectivity/miniupnpd/miniupnpd_2.1.20191006.bb
@@ -15,8 +15,8 @@  SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${BP}.tar.gz;do
            file://miniupnpd.service \
            file://0001-Add-OpenEmbedded-cross-compile-case.patch \
            "
-SRC_URI[md5sum] = "394e676f555d8047be69730d9c4d23a5"
-SRC_URI[sha256sum] = "29f49fe6868597d041ee29f511fa7b65781b9e4e85ef2569a2381c2079e1743e"
+SRC_URI[md5sum] = "340789edd49c113afe37834cc901a1e8"
+SRC_URI[sha256sum] = "218fad7af31f3c22fb4c9db28a55a2a8b5067d41f5b38f52008a057a00d2206d"
 
 IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}"