diff --git a/main/libtirpc/APKBUILD b/main/libtirpc/APKBUILD index 7a3dcce41f6..bfc7c783301 100644 --- a/main/libtirpc/APKBUILD +++ b/main/libtirpc/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa pkgname=libtirpc -pkgver=1.2.6 +pkgver=1.3.1 pkgrel=0 pkgdesc="Transport Independent RPC library (SunRPC replacement)" url="https://sourceforge.net/projects/libtirpc" @@ -63,5 +63,5 @@ nokrb() { amove usr/lib/libtirpc-nokrb.* } -sha512sums="bcb6b5c062c1301aa1246ec93ae0a5c1d221b8421126d020863517cb814b43ed038fb6c0c2faf4e68ff133b69abefe4f4d42bfc870671da6c27ca941a30b155a libtirpc-1.2.6.tar.bz2 -ccb6352c3c3b896765581595b9a0e45a527c34cbc16495d3890f996a2bc077a02ceae0ddd63505b3420a8414b93a267c82a11bc75997de8f9ca0a22e4c4daa5c soname-suffix.patch" +sha512sums="131f746800ac7280cc3900597018fc8dbc8da50c14e29dbaccf36a6d110eded117351108c6b069eaac90d77cfec17014b08e9afddcf153fda2d780ba64260cbc libtirpc-1.3.1.tar.bz2 +8bd50cab1e34a88f4f82ae722bdd60839212173a0ac6ceef21dee4dceea37a9fa2953b8a40068918b3c0d95b476111f0d7f19830efd3e4bff1ec5e72a5f9fade soname-suffix.patch" diff --git a/main/libtirpc/soname-suffix.patch b/main/libtirpc/soname-suffix.patch index 4941bab172d..1e07ed442c0 100644 --- a/main/libtirpc/soname-suffix.patch +++ b/main/libtirpc/soname-suffix.patch @@ -1,29 +1,10 @@ -Allow to append a suffix to the library name via configuration -variable SONAME_SUFFIX. +Allow appending a suffix with SONAME_SUFFIX= ---- a/configure.ac -+++ b/configure.ac -@@ -74,6 +74,8 @@ - [],[enable_symvers=yes]) - AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes) - -+AC_ARG_VAR([SONAME_SUFFIX], [Suffix to be appended to the library name]) -+ - AC_CANONICAL_BUILD - # Check for which host we are on and setup a few things - # specifically based on the host -@@ -98,6 +100,7 @@ - AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) - - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) --AC_OUTPUT(libtirpc.pc) -+AC_CONFIG_FILES([libtirpc$SONAME_SUFFIX.pc:libtirpc.pc.in]) -+AC_OUTPUT - - +diff --git a/Makefile.am b/Makefile.am +index 3f60637..252568b 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@ nobase_include_HEADERS += \ endif pkgconfigdir=$(libdir)/pkgconfig @@ -32,9 +13,50 @@ variable SONAME_SUFFIX. CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in libtirpc*.tar.gz +diff --git a/configure.ac b/configure.ac +index 8065881..c1a2a97 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,6 +74,8 @@ AC_ARG_ENABLE(symvers, + [],[enable_symvers=yes]) + AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes) + ++AC_ARG_VAR([SONAME_SUFFIX], [Suffix to be appended to the library name]) ++ + AC_CANONICAL_BUILD + # Check for which host we are on and setup a few things + # specifically based on the host +@@ -98,6 +100,7 @@ AC_CHECK_LIB([pthread], [pthread_create]) + AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) + + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) +-AC_OUTPUT(libtirpc.pc) ++AC_CONFIG_FILES([libtirpc$SONAME_SUFFIX.pc:libtirpc.pc.in]) ++AC_OUTPUT + + +diff --git a/libtirpc.pc.in b/libtirpc.pc.in +index d2c7878..090b3fa 100644 +--- a/libtirpc.pc.in ++++ b/libtirpc.pc.in +@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ + libdir=@libdir@ + includedir=@includedir@ + +-Name: libtirpc ++Name: libtirpc@SONAME_SUFFIX@ + Description: Transport Independent RPC Library + Requires: + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltirpc ++Libs: -L${libdir} -ltirpc@SONAME_SUFFIX@ + Libs.private: -lpthread + Cflags: -I${includedir}/tirpc +diff --git a/src/Makefile.am b/src/Makefile.am +index b2d5436..7280403 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -10,12 +10,12 @@ +@@ -10,12 +10,12 @@ noinst_HEADERS = rpc_com.h debug.h AM_CPPFLAGS = -I$(top_srcdir)/tirpc -include config.h -DPORTMAP -DINET6 \ -D_GNU_SOURCE -Wall -pipe @@ -51,7 +73,7 @@ variable SONAME_SUFFIX. binddynport.c bindresvport.c \ clnt_bcast.c clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ -@@ -27,26 +27,26 @@ +@@ -27,26 +27,26 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ auth_time.c debug.c if AUTHDES @@ -86,18 +108,3 @@ variable SONAME_SUFFIX. CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in ---- a/libtirpc.pc.in -+++ b/libtirpc.pc.in -@@ -3,10 +3,10 @@ - libdir=@libdir@ - includedir=@includedir@ - --Name: libtirpc -+Name: libtirpc@SONAME_SUFFIX@ - Description: Transport Independent RPC Library - Requires: - Version: @PACKAGE_VERSION@ --Libs: -L@libdir@ -ltirpc -+Libs: -L@libdir@ -ltirpc@SONAME_SUFFIX@ - Libs.private: -lpthread - Cflags: -I@includedir@/tirpc