diff --git a/libtirpc-revert-des_crypt.patch b/libtirpc-revert-des_crypt.patch new file mode 100644 index 0000000..71b310b --- /dev/null +++ b/libtirpc-revert-des_crypt.patch @@ -0,0 +1,33 @@ +[Libtirpc-devel] [PATCH] Revert "Include des_crypt in build" +From: Mike Frysinger - 2011-06-12 05:46 + +The des_crypt code requires the crypt_client code (which wasn't +added), and that code requires a currently undefined function +(namely xdr_desresp). Since I have no idea what that's about, +and this change ends up breaking some systems, just revert it. + +Once we have a patch that improves portability without breaking +existing systems, we can revisit this. + +This reverts commit 9bdcba10aa67ce3f67810c7aaac944a00dcfcee5. + +Signed-off-by: Mike Frysinger +--- +note: please ignore the recent "Include crypt_client in build" patch + + src/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 7ee8cbc..6731ff9 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln + rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ + rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ + svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ +- auth_time.c auth_des.c authdes_prot.c des_crypt.c ++ auth_time.c auth_des.c authdes_prot.c + + ## XDR + libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c diff --git a/libtirpc.changes b/libtirpc.changes index b11f3fb..4836a28 100644 --- a/libtirpc.changes +++ b/libtirpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 17 14:18:24 UTC 2011 - aj@suse.de + +- Fix library with reverting a patch in 0.22 release + (libtirpc-revert-des_crypt.patch) + ------------------------------------------------------------------- Tue Jun 14 10:35:18 UTC 2011 - aj@suse.de diff --git a/libtirpc.spec b/libtirpc.spec index ef112d3..120f6f6 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -33,9 +33,11 @@ Patch22: libtirpc-rpc_broadcast_misformed_replies.patch Patch31: libtirpc-getpmaphandle.patch Patch32: libtirpc-pmap-setunset.patch Patch34: libtirpc-bindresvport_blacklist.patch +Patch35: libtirpc-revert-des_crypt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libtirpc1 = %{version}-%{release} + %description The Transport Independent RPC library (TI-RPC) is a replacement for the standard SunRPC library in glibc which does not support IPv6 addresses. @@ -54,6 +56,7 @@ License: Other uncritical OpenSource License ; Sun Industry Standards Sou Summary: Transport Independent RPC Library Group: System/Libraries + %description -n libtirpc1 The Transport Independent RPC library (TI-RPC) is a replacement for the standard SunRPC library in glibc which does not support IPv6 addresses. @@ -73,6 +76,7 @@ Summary: Transport Independent RPC Library Group: Development/Libraries/C and C++ Requires: libtirpc1 = %{version} glibc-devel + %description devel The Transport Independent RPC library (TI-RPC) is a replacement for the standard SunRPC library in glibc which does not support IPv6 addresses. @@ -93,12 +97,15 @@ Authors: %patch31 -p1 %patch32 -p1 %patch34 -p1 +%patch35 -p1 + %build autoreconf -fiv %configure --disable-static --with-pic --libdir=/%{_lib} --enable-gss %{__make} %{?_smp_mflags} + %install make install DESTDIR=$RPM_BUILD_ROOT # move devel so link to %{_libdir} @@ -107,19 +114,24 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir} %{__rm} -v %{buildroot}/%{_lib}/%{name}.{la,so} mv -v $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT/%{_libdir} + %clean rm -rf $RPM_BUILD_ROOT + %post -n libtirpc1 -p /sbin/ldconfig + %postun -n libtirpc1 -p /sbin/ldconfig + %files -n libtirpc1 %defattr(-,root,root) %config %{_sysconfdir}/netconfig /%{_lib}/libtirpc.so.1* %{_mandir}/man5/netconfig.5.gz + %files devel %defattr(-,root,root) %{_libdir}/libtirpc.so @@ -128,4 +140,6 @@ rm -rf $RPM_BUILD_ROOT /usr/%{_lib}/pkgconfig/* %{_mandir}/man3/* + + %changelog