* [PR PATCH] glibc rpc removal rebuilds
@ 2021-01-05 22:05 leahneukirchen
2021-01-06 0:29 ` [PR REVIEW] " ericonr
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: leahneukirchen @ 2021-01-05 22:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages glibc-rpc-removal
https://github.com/void-linux/void-packages/pull/27703
glibc rpc removal rebuilds
Preparing for removal of RPC things in glibc 2.32.
A patch file from https://github.com/void-linux/void-packages/pull/27703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-rpc-removal-27703.patch --]
[-- Type: text/x-diff, Size: 4812 bytes --]
From e4c2c5cf5c0d5c5d1616c2c51e030b6756930429 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:40:39 +0100
Subject: [PATCH 1/3] xorg-server: unconditionally use libtirpc.
---
srcpkgs/xorg-server/template | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 5e48034444e..06f51d611e8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
@@ -41,12 +41,6 @@ case "$XBPS_TARGET_MACHINE" in
*) configure_args+=" -Dint10=false -Dvbe=false" ;;
esac
-case "$XBPS_TARGET_MACHINE" in
- *-musl)
- # required when secure_rpc is enabled and not using glibc for rpc/rpc.h
- makedepends+=" libtirpc-devel" ;;
-esac
-
# gcc10 needs to be hinted when symbols have multiple definitions
CFLAGS="-fcommon"
From c682d2c19e5e654f379263924ac47c8813a8bb49 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:46:26 +0100
Subject: [PATCH 2/3] conntrack-tools: unconditionally use libtirpc.
---
srcpkgs/conntrack-tools/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/conntrack-tools/template b/srcpkgs/conntrack-tools/template
index 40314c29acb..2d0773538fb 100644
--- a/srcpkgs/conntrack-tools/template
+++ b/srcpkgs/conntrack-tools/template
@@ -1,20 +1,15 @@
# Template file for 'conntrack-tools'
pkgname=conntrack-tools
version=1.4.6
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config flex"
-makedepends="libnfnetlink-devel libnetfilter_conntrack-devel libnetfilter_cttimeout-devel libnetfilter_cthelper-devel libnetfilter_queue-devel libmnl-devel"
+makedepends="libmnl-devel libnetfilter_conntrack-devel
+ libnetfilter_cthelper-devel libnetfilter_cttimeout-devel
+ libnetfilter_queue-devel libnfnetlink-devel libtirpc-devel"
short_desc="Tools to interact with the netfilter connection tracking system"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-2.0-or-later"
homepage="http://conntrack-tools.netfilter.org/"
distfiles="http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.bz2"
checksum=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) makedepends+=" libtirpc-devel"
- CFLAGS="-D_GNU_SOURCE -I${XBPS_CROSS_BASE}/usr/include/tirpc"
- LDFLAGS="-ltirpc"
- ;;
-esac
From eeda2d15c646d59e549973f637d2a13c83cae3f9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 23:00:04 +0100
Subject: [PATCH 3/3] libvirt: use rpcsvc-proto unconditionally.
---
srcpkgs/libvirt/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 09255adbda3..4b907194791 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,11 +1,12 @@
# Template file for 'libvirt'
pkgname=libvirt
version=6.10.0
-revision=2
+revision=3
build_style=meson
configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
-hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext"
+hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables
+ libapparmor-devel libtool libxslt lvm2 parted perl pkg-config python3-docutils
+ rpcsvc-proto"
makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel
libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel
device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel
@@ -33,7 +34,6 @@ esac
case "$XBPS_TARGET_MACHINE" in
*-musl)
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
- hostmakedepends+=" rpcsvc-proto"
;;
*)
# LTO apparently causes the linker to confuse the glibc symbol
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
@ 2021-01-06 0:29 ` ericonr
2021-01-06 8:31 ` fosslinux
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-01-06 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27703#discussion_r552287688
Comment:
This shouldn't be necessary anymore either, I think...
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
2021-01-06 0:29 ` [PR REVIEW] " ericonr
@ 2021-01-06 8:31 ` fosslinux
2021-01-06 8:33 ` fosslinux
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: fosslinux @ 2021-01-06 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/27703#issuecomment-755161051
Comment:
How are you finding/detecting these.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
2021-01-06 0:29 ` [PR REVIEW] " ericonr
2021-01-06 8:31 ` fosslinux
@ 2021-01-06 8:33 ` fosslinux
2021-01-06 14:47 ` ericonr
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: fosslinux @ 2021-01-06 8:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/27703#issuecomment-755161051
Comment:
How are you finding/detecting these?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
` (2 preceding siblings ...)
2021-01-06 8:33 ` fosslinux
@ 2021-01-06 14:47 ` ericonr
2021-01-06 22:26 ` [PR PATCH] [Updated] " leahneukirchen
2021-01-07 23:47 ` [PR PATCH] [Merged]: " leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-01-06 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27703#issuecomment-755341082
Comment:
@fosslinux the initial search was which packages depended on libtirpc on musl but not glibc.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
` (3 preceding siblings ...)
2021-01-06 14:47 ` ericonr
@ 2021-01-06 22:26 ` leahneukirchen
2021-01-07 23:47 ` [PR PATCH] [Merged]: " leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: leahneukirchen @ 2021-01-06 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages glibc-rpc-removal
https://github.com/void-linux/void-packages/pull/27703
glibc rpc removal rebuilds
Preparing for removal of RPC things in glibc 2.32.
A patch file from https://github.com/void-linux/void-packages/pull/27703.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibc-rpc-removal-27703.patch --]
[-- Type: text/x-diff, Size: 4931 bytes --]
From 086fa6a7a140862bd3164637f0c79a6bdd256b5e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:40:39 +0100
Subject: [PATCH 1/3] xorg-server: unconditionally use libtirpc.
---
srcpkgs/xorg-server/template | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 5e48034444e..06f51d611e8 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=2
+revision=3
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
@@ -41,12 +41,6 @@ case "$XBPS_TARGET_MACHINE" in
*) configure_args+=" -Dint10=false -Dvbe=false" ;;
esac
-case "$XBPS_TARGET_MACHINE" in
- *-musl)
- # required when secure_rpc is enabled and not using glibc for rpc/rpc.h
- makedepends+=" libtirpc-devel" ;;
-esac
-
# gcc10 needs to be hinted when symbols have multiple definitions
CFLAGS="-fcommon"
From 03062286761d5635288512d2019a0892b0d82718 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 22:46:26 +0100
Subject: [PATCH 2/3] conntrack-tools: unconditionally use libtirpc.
---
srcpkgs/conntrack-tools/template | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/conntrack-tools/template b/srcpkgs/conntrack-tools/template
index 40314c29acb..2d0773538fb 100644
--- a/srcpkgs/conntrack-tools/template
+++ b/srcpkgs/conntrack-tools/template
@@ -1,20 +1,15 @@
# Template file for 'conntrack-tools'
pkgname=conntrack-tools
version=1.4.6
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config flex"
-makedepends="libnfnetlink-devel libnetfilter_conntrack-devel libnetfilter_cttimeout-devel libnetfilter_cthelper-devel libnetfilter_queue-devel libmnl-devel"
+makedepends="libmnl-devel libnetfilter_conntrack-devel
+ libnetfilter_cthelper-devel libnetfilter_cttimeout-devel
+ libnetfilter_queue-devel libnfnetlink-devel libtirpc-devel"
short_desc="Tools to interact with the netfilter connection tracking system"
maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
license="GPL-2.0-or-later"
homepage="http://conntrack-tools.netfilter.org/"
distfiles="http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.bz2"
checksum=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f
-
-case "$XBPS_TARGET_MACHINE" in
- *-musl) makedepends+=" libtirpc-devel"
- CFLAGS="-D_GNU_SOURCE -I${XBPS_CROSS_BASE}/usr/include/tirpc"
- LDFLAGS="-ltirpc"
- ;;
-esac
From bffe69a06033e1e802934d1009d7ab461b2ce163 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Jan 2021 23:00:04 +0100
Subject: [PATCH 3/3] libvirt: use rpcsvc-proto unconditionally.
---
srcpkgs/libvirt/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 09255adbda3..b4978fae705 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,11 +1,12 @@
# Template file for 'libvirt'
pkgname=libvirt
version=6.10.0
-revision=2
+revision=3
build_style=meson
configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run"
-hostmakedepends="automake libtool perl pkg-config lvm2 parted gettext-devel
- iptables libxslt docbook-xsl dnsmasq libapparmor-devel python3-docutils gettext"
+hostmakedepends="automake dnsmasq docbook-xsl gettext gettext-devel iptables
+ libapparmor-devel libtool libxslt lvm2 parted perl pkg-config python3-docutils
+ rpcsvc-proto"
makedepends="readline-devel libcap-ng-devel attr-devel gnutls-devel
libsasl-devel libcurl-devel libpcap-devel libxml2-devel libparted-devel
device-mapper-devel eudev-libudev-devel libblkid-devel libpciaccess-devel
@@ -31,10 +32,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
case "$XBPS_TARGET_MACHINE" in
- *-musl)
- CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tirpc"
- hostmakedepends+=" rpcsvc-proto"
- ;;
+ *-musl) ;;
*)
# LTO apparently causes the linker to confuse the glibc symbol
# xdr_int64_t with that provided by libtirpc, causing a crash.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: glibc rpc removal rebuilds
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
` (4 preceding siblings ...)
2021-01-06 22:26 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-01-07 23:47 ` leahneukirchen
5 siblings, 0 replies; 7+ messages in thread
From: leahneukirchen @ 2021-01-07 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
There's a merged pull request on the void-packages repository
glibc rpc removal rebuilds
https://github.com/void-linux/void-packages/pull/27703
Description:
Preparing for removal of RPC things in glibc 2.32.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-07 23:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-05 22:05 [PR PATCH] glibc rpc removal rebuilds leahneukirchen
2021-01-06 0:29 ` [PR REVIEW] " ericonr
2021-01-06 8:31 ` fosslinux
2021-01-06 8:33 ` fosslinux
2021-01-06 14:47 ` ericonr
2021-01-06 22:26 ` [PR PATCH] [Updated] " leahneukirchen
2021-01-07 23:47 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).