From f68082db816ae1475e223880b50c11e9411fc0e6eb283b3f27b6820d9738bc17 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 26 Aug 2013 12:00:59 +0000 Subject: [PATCH 1/2] Accepting request 195608 from home:okir:branches:Base:System Resubmitting: - Updated to latest upstream revision, and removed libtirpc-revert-des_crypt.patch which is now upstream - Verified that the bugfix for bnc#702472 is in upstream - verified that SLE patches are present (bnc#831296) OBS-URL: https://build.opensuse.org/request/show/195608 OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=28 --- libtirpc-0.2.2.tar.bz2 | 3 --- libtirpc-0.2.4-rc2.tar.bz2 | 3 +++ libtirpc-revert-des_crypt.patch | 33 --------------------------------- libtirpc.changes | 8 ++++++++ libtirpc.spec | 16 ++++++++++------ 5 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 libtirpc-0.2.2.tar.bz2 create mode 100644 libtirpc-0.2.4-rc2.tar.bz2 delete mode 100644 libtirpc-revert-des_crypt.patch diff --git a/libtirpc-0.2.2.tar.bz2 b/libtirpc-0.2.2.tar.bz2 deleted file mode 100644 index a4f49ab..0000000 --- a/libtirpc-0.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705 -size 464094 diff --git a/libtirpc-0.2.4-rc2.tar.bz2 b/libtirpc-0.2.4-rc2.tar.bz2 new file mode 100644 index 0000000..a669143 --- /dev/null +++ b/libtirpc-0.2.4-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68374f9ac6ddcf4a4b1a0680c691160e05533563eb43b1c297e9495ad4a5b4c5 +size 164622 diff --git a/libtirpc-revert-des_crypt.patch b/libtirpc-revert-des_crypt.patch deleted file mode 100644 index 71b310b..0000000 --- a/libtirpc-revert-des_crypt.patch +++ /dev/null @@ -1,33 +0,0 @@ -[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 a562334..5040b3b 100644 --- a/libtirpc.changes +++ b/libtirpc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 19 08:31:28 UTC 2013 - okir@suse.com + +- Updated to latest upstream revision, and removed + libtirpc-revert-des_crypt.patch which is now upstream +- Verified that the bugfix for bnc#702472 is in upstream +- verified that SLE patches are present (bnc#831296) + ------------------------------------------------------------------- Mon Apr 15 14:08:31 UTC 2013 - mmeister@suse.com diff --git a/libtirpc.spec b/libtirpc.spec index 8262f7c..5d7f774 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -16,10 +16,12 @@ # +%define tarversion 0.2.4-rc2 + Name: libtirpc # src/crypt_client.c tirpc/spinlock.h and tirpc/rpcsvc/crypt.x have the BSD # advertising clause -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Transport Independent RPC Library License: BSD-4-Clause @@ -28,14 +30,13 @@ BuildRequires: libgssglue-devel BuildRequires: libtool BuildRequires: pkg-config Url: http://sourceforge.net/projects/libtirpc/ -Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{tarversion}.tar.bz2 Source1: baselibs.conf Patch21: libtirpc-clnt_broadcast_fix.patch 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} @@ -70,17 +71,20 @@ This implementation allows the support of other transports than UDP and TCP over IPv4 %prep -%setup -q +%setup -q -n %name-%tarversion %patch21 -p1 %patch22 -p1 %patch31 -p1 %patch32 -p1 %patch34 -p1 -%patch35 -p1 %build autoreconf -fiv -%configure --disable-static --with-pic --libdir=/%{_lib} --enable-gss +%configure --disable-static \ + --with-pic \ + --libdir=/%{_lib} \ + --enable-gss \ + --with-gssglue %{__make} %{?_smp_mflags} %install From bf793068482f7338882234d2e4f975b555ba6c40d9dddf0c7320ab6644606f97 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 1 Oct 2013 07:27:04 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=29 --- libtirpc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libtirpc.spec b/libtirpc.spec index 5d7f774..749034b 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -30,7 +30,8 @@ BuildRequires: libgssglue-devel BuildRequires: libtool BuildRequires: pkg-config Url: http://sourceforge.net/projects/libtirpc/ -Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{tarversion}.tar.bz2 +# http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{tarversion}.tar.bz2 +Source: %{name}-%{tarversion}.tar.bz2 Source1: baselibs.conf Patch21: libtirpc-clnt_broadcast_fix.patch Patch22: libtirpc-rpc_broadcast_misformed_replies.patch