Package: ui-utilcpp
Version: 1.10.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu impish ubuntu-patch

Hello,

In Ubuntu, which has migrated to glibc 2.33, ui-utilcpp fails to build
because it relies on rpc/clnt.h which has been split out.

The attached patch fixes the build to use libtirpc-dev instead.

Although Debian has not yet migrated to glibc 2.33, this should be safe to
apply already today.

Thanks for considering,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                   https://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru ui-utilcpp-1.10.0/debian/control ui-utilcpp-1.10.0/debian/control
--- ui-utilcpp-1.10.0/debian/control    2020-02-02 11:32:45.000000000 -0800
+++ ui-utilcpp-1.10.0/debian/control    2021-07-23 12:47:36.000000000 -0700
@@ -12,6 +12,7 @@
                libidn11-dev,
                libcap-dev,
                libboost-all-dev (>= 1.35),
+               libtirpc-dev,
                xfslibs-dev,
                doxygen (>= 1.5.6),
                graphviz (>= 2.20.2)
diff -Nru ui-utilcpp-1.10.0/debian/patches/series 
ui-utilcpp-1.10.0/debian/patches/series
--- ui-utilcpp-1.10.0/debian/patches/series     1969-12-31 16:00:00.000000000 
-0800
+++ ui-utilcpp-1.10.0/debian/patches/series     2021-07-23 12:45:47.000000000 
-0700
@@ -0,0 +1 @@
+tirpc.patch
diff -Nru ui-utilcpp-1.10.0/debian/patches/tirpc.patch 
ui-utilcpp-1.10.0/debian/patches/tirpc.patch
--- ui-utilcpp-1.10.0/debian/patches/tirpc.patch        1969-12-31 
16:00:00.000000000 -0800
+++ ui-utilcpp-1.10.0/debian/patches/tirpc.patch        2021-07-23 
12:47:36.000000000 -0700
@@ -0,0 +1,35 @@
+Description: Port from deprecated glibc rpcsvc to libtirpc-dev
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Forwarded: no
+Last-Update: 2021-07-23
+
+Index: ui-utilcpp-1.10.0/configure.ac
+===================================================================
+--- ui-utilcpp-1.10.0.orig/configure.ac
++++ ui-utilcpp-1.10.0/configure.ac
+@@ -83,8 +83,8 @@
+ AC_CHECK_FUNCS(cap_clear_flag)
+ 
+ # Push generic flags
+-AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src"])
+-AC_SUBST(AM_CXXFLAGS, ["-pthread -lrpcsvc $(ucommon-config --cflags)"])
++AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src -I/usr/include/tirpc"])
++AC_SUBST(AM_CXXFLAGS, ["-pthread -ltirpc $(ucommon-config --cflags)"])
+ AC_SUBST(AM_LDFLAGS, ["-pthread"])
+ AC_SUBST(AM_LIBADD, $(ucommon-config --libs))
+ AC_SUBST(AM_LDADD, $(ucommon-config --libs))
+Index: ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+===================================================================
+--- ui-utilcpp-1.10.0.orig/src/ui-utilcpp/Makefile.am
++++ ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+@@ -45,3 +45,10 @@
+ libui_utilcpp_la_CXXFLAGS = @AM_CXXFLAGS@ -fvisibility=default
+ libui_utilcpp_la_LDFLAGS = @AM_LDFLAGS@ -version-info @SO_VERSION@
+ libui_utilcpp_la_LIBADD = http/libui-utilcpp-http.la
++
++nodist_libui_utilcpp_la_SOURCES = xdr_rquota.c
++CLEANFILES = xdr_rquota.c
++
++xdr_rquota.c:
++      rpcgen -c /usr/include/rpcsvc/rquota.x > $@
++

Reply via email to