From a281128660c3197f07783d082d5a35423cc48e55 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 8 Jan 2018 16:46:16 +0100 Subject: [PATCH] Add glibc-rpcgen subpackage, until the replacement is packaged (#1531540) --- glibc-rpcgen.patch | 22 ++++++++++++++++++++++ glibc.spec | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 glibc-rpcgen.patch diff --git a/glibc-rpcgen.patch b/glibc-rpcgen.patch new file mode 100644 index 0000000..2fe1130 --- /dev/null +++ b/glibc-rpcgen.patch @@ -0,0 +1,22 @@ +Enable rpcgen unconditionally even if Sun RPC is disabled. +rpcgen will be installed into the glibc-rpcgen subpackage. + +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 8f2a3c8213e3564e..69be5c119bf5ff85 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -85,14 +85,12 @@ shared-only-routines = $(routines) + endif + endif + +-ifeq ($(link-obsolete-rpc),yes) + install-bin := rpcgen + rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \ + rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \ + rpc_tblout.o rpc_sample.o + extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs)) + others += rpcgen +-endif + + tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \ + tst-udp-nonblocking diff --git a/glibc.spec b/glibc.spec index c88f02a..9a9dfe0 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.26.9000-1095-g579396ee08 %define glibcversion 2.26.9000 -%define glibcrelease 36%{?dist} +%define glibcrelease 37%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -170,6 +170,7 @@ Patch0024: glibc-fedora-locarchive.patch Patch0025: glibc-fedora-streams-rh436349.patch Patch0028: glibc-fedora-localedata-rh61908.patch Patch0031: glibc-fedora-__libc_multiple_libcs.patch +Patch32: glibc-rpcgen.patch # Allow applications to call pthread_atfork without libpthread.so. Patch0046: glibc-rh1013801.patch @@ -358,6 +359,19 @@ hashing. %postun -n libcrypt /sbin/ldconfig +###################################################################### +# rpcgen subpackage +###################################################################### + +%package rpcgen +Summary: rpcgen compiler for Sun RPC protocol descriptions (glibc variant) +Provides: rpcgen +Provides: /usr/bin/rpcgen + +%description rpcgen +This package provides the rpcgen program, for compiled .x protocol +description files into C source code. + ############################################################################## # glibc "devel" sub-package ############################################################################## @@ -725,6 +739,7 @@ microbenchmark tests on the system. %patch2027 -p1 %patch0028 -p1 %patch0031 -p1 +%patch32 -p1 %patch0046 -p1 %patch2031 -p1 %patch0047 -p1 @@ -1261,6 +1276,8 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/*_p.a # - Contains the list of flies for the common subpackage. # * utils.filelist # - Contains the list of files for the utils subpackage. +# * rpcgen.filelist +# - Contains the list of files for the rpcgen subpackage. # * nscd.filelist # - Contains the list of files for the nscd subpackage. # * devel.filelist @@ -1315,7 +1332,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/*_p.a -e '\,.*/share/i18n/charmaps/.*,d' \ -e '\,/etc/\(localtime\|nsswitch.conf\|ld\.so\.conf\|ld\.so\.cache\|default\|rpc\|gai\.conf\),d' \ -e '\,/%{_lib}/lib\(pcprofile\|memusage\)\.so,d' \ - -e '\,bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\),d' + -e '\,bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\|rpcgen\),d' } | sort > rpm.filelist touch common.filelist @@ -1430,6 +1447,11 @@ cat > utils.filelist < rpcgen.filelist <