control: tag -1 + patch
On 2021-08-26 13:27, Bas Couwenberg wrote:
> Source: libdap
> Version: 3.20.7-6
> Severity: serious
> Tags: upstream
> Justification: makes the package in question unusable or mostly so
>
> Dear Maintainer,
>
> The recent changes in glibc break libdap and its rdeps:
>
> In file included from /usr/include/libdap/XDRUtils.h:37,
> from /usr/include/libdap/Sequence.h:50,
> from libdap_headers.h:52,
> from ogr_dods.h:44,
> from ogrdodsdriver.cpp:29:
> /usr/include/libdap/xdr-datatypes.h:16:10: fatal error: rpc/types.h: No such
> file or directory
> 16 | #include <rpc/types.h>
> | ^~~~~~~~~~~~~
>
> /usr/include/rpc/types.h was provided by libc6-dev in bullseye, but it is no
> longer included in libc6-dev (2.31-17).
The problem is that libdap has proper TI RPC support, but it doesn't
export that information properly to libdap.pc and dap-config, sorry
about that.
Please find a patch attached to fix that.
Regards,
Aurelien
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
[email protected] http://www.aurel32.net
--- libdap-3.20.7/debian/control
+++ libdap-3.20.7/debian/control
@@ -93,7 +93,7 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdap27 ( = ${binary:Version} ), libdapserver7v5 (=${binary:Version}), libdapclient6v5 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, uuid-dev, pkg-config
+Depends: libdap27 ( = ${binary:Version} ), libdapserver7v5 (=${binary:Version}), libdapclient6v5 (=${binary:Version}) , ${misc:Depends}, libxml2-dev, libcurl4-gnutls-dev | libcurl-dev, uuid-dev, pkg-config, libtirpc-dev
Breaks: libdap-bin (<< 3.20.7-6~)
Replaces: libdap-bin (<< 3.20.7-6~)
Description: Development files (headers and static libraries) for libdap
--- libdap-3.20.7/debian/patches/series
+++ libdap-3.20.7/debian/patches/series
@@ -4,3 +4,4 @@
disable-dmr-tests.patch
disable-net-tests.patch
disable-D4FilterClauseTest.patch
+tirpc-cflags-libs.patch
--- libdap-3.20.7/debian/patches/tirpc-cflags-libs.patch
+++ libdap-3.20.7/debian/patches/tirpc-cflags-libs.patch
@@ -0,0 +1,53 @@
+Author: Aurelien Jarno <[email protected]>
+Description: Export TI RPC flags/libs in libdap.pc and dap-config
+Forwarded: no
+Last-Updated: 2021-08-27
+
+--- a/conf/acinclude.m4
++++ b/conf/acinclude.m4
+@@ -560,13 +560,15 @@
+
+ # First, we need to see if the xdr routines are in libtirpc, libc, librpc,
+ # or librpcsvc or libnsl
++ libtirpcreq=
+ dap_xdrlib=
+ PKG_PROG_PKG_CONFIG([0.9.0])
+ PKG_CHECK_MODULES([TIRPC], [libtirpc >= 0.2.4],
+ [dap_xdrlib=`echo "${TIRPC_LIBS}" | sed -e 's/^-l//'`
+ AC_SUBST([TIRPC_CFLAGS])
+ AC_SUBST([TIRPC_LIBS])
+- AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use libtirpc.])],
++ AC_DEFINE([HAVE_LIBTIRPC], [1], [Define to 1 to use libtirpc.])
++ [libtirpcreq="libtirpc"]],
+ [dap_xdrlib=""]
+ )
+ AS_IF(
+@@ -574,6 +576,7 @@
+ [AC_SEARCH_LIBS([xdr_void],[c rpc nsl rpcsvc],[
+ dap_xdrlib=`echo $ac_res|sed -e 's/^-l//'`],[
+ AC_MSG_WARN(Cannot locate library containing xdr functions.)])])
++ AC_SUBST([libtirpcreq])
+
+ # Added for autoconf 2.59 which appears to not use/set $ac_res. jhrg
+ if test -z "$dap_xdrlib" ; then dap_xdrlib=c; fi
+--- a/dap-config.in
++++ b/dap-config.in
+@@ -56,7 +56,7 @@
+ ;;
+
+ --cflags)
+- echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@"
++ echo "-I${includedir}/libdap @XML2_CFLAGS@ @CURL_CFLAGS@ @TIRPC_CFLAGS@"
+ ;;
+
+ --libs)
+--- a/libdap.pc.in
++++ b/libdap.pc.in
+@@ -10,6 +10,7 @@
+ Version: @VERSION@
+ Libs: -L${libdir} -ldap
+ Libs.private: @xmlprivatelibs@ @PTHREAD_LIBS@
++Requires: @libtirpcreq@
+ Requires.private: @xmlprivatereq@
+ Cflags: -I${includedir}/libdap
+
