Skip to contentSkip to conversation

libtirpc: Support ipv6 in DISTRO_FEATURES

PATCH Jörg Sommer 3 participants 5 messages Oct 12, 2023 – Oct 13, 2023 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

This is only a minor change, because oelint-adv had warned about the space after " of PACKAGECONFIG.

________________________________
From: [email protected] <[email protected]> on behalf of Jörg Sommer via lists.openembedded.org <[email protected]>
Sent: Thursday, 12 October 2023 18:34
To: [email protected] <[email protected]>
Cc: Jörg Sommer <[email protected]>
Subject: [OE-core] [PATCH v3] libtirpc: Support ipv6 in DISTRO_FEATURES

If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails.

---
 .../libtirpc/libtirpc/ipv6.patch              | 52 +++++++++++++++++++
 .../libtirpc/libtirpc_1.3.2.bb                |  6 +++
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
meta/recipes-extended/libtirpc/libtirpc/ipv6.patch new file +52 -0
new file mode 100644
index 0000000000..f746f986f4
@@ -0,0 +1,52 @@
+From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
+Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
+From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <[email protected]>
+Date: Thu, 12 Oct 2023 16:22:59 +0200
+Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the configuration for IPv6 is disabled, the netconfig should not contain
+settings for tcp6 and udp6.
+
+The test for the configure option didn't work, because it check the wrong
+variable.
+
+Signed-off-by: Jörg Sommer <[email protected]>
+Upstream-Status: Submitted [[email protected]]
+Upstream-Status: Submitted [[email protected]]
+---
+ configure.ac    | 2 +-
+ doc/Makefile.am | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe6c517..b687f8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,7 +64,7 @@ fi
+ AC_ARG_ENABLE(ipv6,
+        [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
+        [],[enable_ipv6=yes])
+-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
++AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
+ if test "x$enable_ipv6" != xno; then
+        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
+ fi
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d42ab90..b9678f6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,3 +2,8 @@ dist_sysconf_DATA      = netconfig bindresvport.blacklist
+
+ CLEANFILES           = cscope.* *~
+ DISTCLEANFILES               = Makefile.in
++
++if ! INET6
++install-exec-hook:
++      $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
++endif
+--
+2.34.1
+
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +6 -0
index 6980135a92..edb98082f2 100644
@@ -11,6 +11,7 @@ PROVIDES = "virtual/librpc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://CVE-2021-46828.patch \
+          file://ipv6.patch \
           "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"
@@ -20,6 +21,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gssapi"
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"
+
 do_install:append() {
         test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig
 }

--
2.34.1

#2 lore raw
Quoted 92 lines · Jörg Sommer via lists.openembedded.org

This is only a minor change, because oelint-adv had warned about the space after " of PACKAGECONFIG.

________________________________
From: [email protected] <[email protected]> on behalf of Jörg Sommer via lists.openembedded.org <[email protected]>
Sent: Thursday, 12 October 2023 18:34
To: [email protected] <[email protected]>
Cc: Jörg Sommer <[email protected]>
Subject: [OE-core] [PATCH v3] libtirpc: Support ipv6 in DISTRO_FEATURES

If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails.

---
 .../libtirpc/libtirpc/ipv6.patch              | 52 +++++++++++++++++++
 .../libtirpc/libtirpc_1.3.2.bb                |  6 +++
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
meta/recipes-extended/libtirpc/libtirpc/ipv6.patch new file +52 -0
new file mode 100644
index 0000000000..f746f986f4
@@ -0,0 +1,52 @@
+From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
+Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
+From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <[email protected]>
+Date: Thu, 12 Oct 2023 16:22:59 +0200
+Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the configuration for IPv6 is disabled, the netconfig should not contain
+settings for tcp6 and udp6.
+
+The test for the configure option didn't work, because it check the wrong
+variable.
+
+Signed-off-by: Jörg Sommer <[email protected]>
+Upstream-Status: Submitted [[email protected]]
+Upstream-Status: Submitted [[email protected]]
+---
+ configure.ac    | 2 +-
+ doc/Makefile.am | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe6c517..b687f8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,7 +64,7 @@ fi
+ AC_ARG_ENABLE(ipv6,
+        [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
+        [],[enable_ipv6=yes])
+-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
++AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
+ if test "x$enable_ipv6" != xno; then
+        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
+ fi
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d42ab90..b9678f6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,3 +2,8 @@ dist_sysconf_DATA      = netconfig bindresvport.blacklist
+
+ CLEANFILES           = cscope.* *~
+ DISTCLEANFILES               = Makefile.in
++
++if ! INET6
++install-exec-hook:
++      $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
++endif
+--
+2.34.1
+
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +1 -0
index 6980135a92..edb98082f2 100644
@@ -11,6 +11,7 @@ PROVIDES = "virtual/librpc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://CVE-2021-46828.patch \
+          file://ipv6.patch \
           "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"

meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb inherit autotools pkgconfig · line 27

Quoted 7 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +4 -0
@@ -20,6 +21,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gssapi"
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"

Does this change compiling for native/nativesdk variants in anyway ?

Quoted 16 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +1 -1
+
 do_install:append() {
         test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig
 }
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189009): https://lists.openembedded.org/g/openembedded-core/message/189009
Mute This Topic: https://lists.openembedded.org/mt/101921995/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#3 lore raw
In reply to Jörg Sommer
Quoted 92 lines · Jörg Sommer via lists.openembedded.org

This is only a minor change, because oelint-adv had warned about the space after " of PACKAGECONFIG.

________________________________
From: [email protected] <[email protected]> on behalf of Jörg Sommer via lists.openembedded.org <[email protected]>
Sent: Thursday, 12 October 2023 18:34
To: [email protected] <[email protected]>
Cc: Jörg Sommer <[email protected]>
Subject: [OE-core] [PATCH v3] libtirpc: Support ipv6 in DISTRO_FEATURES

If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails.

---
 .../libtirpc/libtirpc/ipv6.patch              | 52 +++++++++++++++++++
 .../libtirpc/libtirpc_1.3.2.bb                |  6 +++
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-extended/libtirpc/libtirpc/ipv6.patch
meta/recipes-extended/libtirpc/libtirpc/ipv6.patch new file +52 -0
new file mode 100644
index 0000000000..f746f986f4
@@ -0,0 +1,52 @@
+From 077bbd32e8b7474dc5f153997732e1e6aec7fad6 Mon Sep 17 00:00:00 2001
+Message-Id: <077bbd32e8b7474dc5f153997732e1e6aec7fad6.1697120796.git.joerg.sommer@navimatix.de>
+From: =?UTF-8?q?J=C3=B6rg=20Sommer?= <[email protected]>
+Date: Thu, 12 Oct 2023 16:22:59 +0200
+Subject: [PATCH] netconfig: remove tcp6, udp6 on --disable-ipv6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If the configuration for IPv6 is disabled, the netconfig should not contain
+settings for tcp6 and udp6.
+
+The test for the configure option didn't work, because it check the wrong
+variable.
+
+Signed-off-by: Jörg Sommer <[email protected]>
+Upstream-Status: Submitted [[email protected]]
+Upstream-Status: Submitted [[email protected]]
+---
+ configure.ac    | 2 +-
+ doc/Makefile.am | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe6c517..b687f8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,7 +64,7 @@ fi
+ AC_ARG_ENABLE(ipv6,
+        [AC_HELP_STRING([--disable-ipv6], [Disable IPv6 support @<:@default=no@:>@])],
+        [],[enable_ipv6=yes])
+-AM_CONDITIONAL(INET6, test "x$disable_ipv6" != xno)
++AM_CONDITIONAL(INET6, test "x$enable_ipv6" != xno)
+ if test "x$enable_ipv6" != xno; then
+        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available])
+ fi
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index d42ab90..b9678f6 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,3 +2,8 @@ dist_sysconf_DATA      = netconfig bindresvport.blacklist
+
+ CLEANFILES           = cscope.* *~
+ DISTCLEANFILES               = Makefile.in
++
++if ! INET6
++install-exec-hook:
++      $(SED) -i '/^tcp6\|^udp6/d' "$(DESTDIR)$(sysconfdir)"/netconfig
++endif
+--
+2.34.1
+
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +1 -0
index 6980135a92..edb98082f2 100644
@@ -11,6 +11,7 @@ PROVIDES = "virtual/librpc"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://CVE-2021-46828.patch \
+          file://ipv6.patch \
           "
 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libtirpc/files/libtirpc/"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)/"

meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb inherit autotools pkgconfig · line 27

Quoted 7 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +4 -0
@@ -20,6 +21,11 @@ inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-gssapi"
 
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"

Looks like this will conflict with recent changes I made to master, so hopefully those can be resolved automatically.

Quoted 16 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +1 -1
+
 do_install:append() {
         test -e ${D}${sysconfdir}/netconfig && chown root:root ${D}${sysconfdir}/netconfig
 }
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189009): https://lists.openembedded.org/g/openembedded-core/message/189009
Mute This Topic: https://lists.openembedded.org/mt/101921995/3617261
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw
Quoted 16 lines · Dan McGregor
Quoted 13 lines · Jörg Sommer via lists.openembedded.org

This is only a minor change, because oelint-adv had warned about the space after " of PACKAGECONFIG.

________________________________
From: [email protected] <[email protected]> on behalf of Jörg Sommer via lists.openembedded.org <[email protected]>
Sent: Thursday, 12 October 2023 18:34
To: [email protected] <[email protected]>
Cc: Jörg Sommer <[email protected]>
Subject: [OE-core] [PATCH v3] libtirpc: Support ipv6 in DISTRO_FEATURES

If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails.

Quoted 7 lines

meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb inherit autotools pkgconfig · line 27

Quoted 4 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +4 -0
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"

Looks like this will conflict with recent changes I made to master, so hopefully those can be resolved automatically.

I'm happy to provide a new version that applies on master, if it's needed. Let me know if I should create it.

Signature · 5 lines
Navimatix GmbH
Tatzendpromenade 2
07745 Jena  
Geschäftsführer: Steffen Späthe, Jan Rommeley
Registergericht: Amtsgericht Jena, HRB 501480
#5 lore raw
Quoted 26 lines · Jörg Sommer via lists.openembedded.org
Quoted 16 lines · Dan McGregor
Quoted 13 lines · Jörg Sommer via lists.openembedded.org

This is only a minor change, because oelint-adv had warned about the space after " of PACKAGECONFIG.

________________________________
From: [email protected] <[email protected]> on behalf of Jörg Sommer via lists.openembedded.org <[email protected]>
Sent: Thursday, 12 October 2023 18:34
To: [email protected] <[email protected]>
Cc: Jörg Sommer <[email protected]>
Subject: [OE-core] [PATCH v3] libtirpc: Support ipv6 in DISTRO_FEATURES

If the ipv6 feature for the distribution is not set, the package should not contain settings for ipv6. This makes rpcbind doesn't try to bind to a IPv6 socket, and complain that this fails.

Quoted 7 lines

meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb inherit autotools pkgconfig · line 27

Quoted 4 lines
meta/recipes-extended/libtirpc/libtirpc_1.3.2.bb +4 -0
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
+"
+PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6"

Looks like this will conflict with recent changes I made to master, so hopefully those can be resolved automatically.

Quoted 1 line

I'm happy to provide a new version that applies on master, if it's needed. Let me know if I should create it.

Yes please rebase and send again.

Quoted 16 lines

--
Navimatix GmbH
Tatzendpromenade 2
07745 Jena
Geschäftsführer: Steffen Späthe, Jan Rommeley
Registergericht: Amtsgericht Jena, HRB 501480

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#189057): https://lists.openembedded.org/g/openembedded-core/message/189057
Mute This Topic: https://lists.openembedded.org/mt/101921995/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-