From f8b1a52e683440dcb7e4b3222f33669a79805802 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Thu, 19 Feb 2015 15:54:09 +0000 Subject: main/rpcbind: upgrade to 0.2.3_rc2 --- ...001-Avoid-use-of-glibc-sys-cdefs.h-header.patch | 223 +++++++++++++++++++++ main/rpcbind/APKBUILD | 33 +-- main/rpcbind/rpcbind-0.2.1-rpcuser.patch | 26 --- 3 files changed, 240 insertions(+), 42 deletions(-) create mode 100644 main/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch delete mode 100644 main/rpcbind/rpcbind-0.2.1-rpcuser.patch diff --git a/main/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch b/main/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch new file mode 100644 index 0000000000..1fcd228715 --- /dev/null +++ b/main/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch @@ -0,0 +1,223 @@ +From 2a44d862233f2126581e290d568e1c8b8f2eb9f5 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Thu, 19 Feb 2015 15:28:45 +0000 +Subject: [PATCH] Avoid use of glibc sys/cdefs.h header + +--- + src/check_bound.c | 2 +- + src/pmap_svc.c | 10 +++++----- + src/rpcb_svc.c | 10 +++++----- + src/rpcb_svc_4.c | 14 +++++++------- + src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- + src/rpcbind.c | 12 ++++++------ + src/util.c | 2 +- + src/warmstart.c | 4 ++-- + 8 files changed, 50 insertions(+), 50 deletions(-) + +diff --git a/src/check_bound.c b/src/check_bound.c +index c70b845..5d21730 100644 +--- a/src/check_bound.c ++++ b/src/check_bound.c +@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ + static struct fdlist *fdtail; + static char *nullstring = ""; + +-static bool_t check_bound __P((struct fdlist *, char *uaddr)); ++static bool_t check_bound (struct fdlist *, char *uaddr); + + /* + * Returns 1 if the given address is bound for the given addr & transport +diff --git a/src/pmap_svc.c b/src/pmap_svc.c +index ad28b93..9c7d409 100644 +--- a/src/pmap_svc.c ++++ b/src/pmap_svc.c +@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; + #include "rpcbind.h" + #include "xlog.h" + #include /* svc_getcaller routine definition */ +-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, +- rpcprot_t)); +-static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); +-static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); +-static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); ++static struct pmaplist *find_service_pmap (rpcprog_t, rpcvers_t, ++ rpcprot_t); ++static bool_t pmapproc_change (struct svc_req *, SVCXPRT *, u_long); ++static bool_t pmapproc_getport (struct svc_req *, SVCXPRT *); ++static bool_t pmapproc_dump (struct svc_req *, SVCXPRT *); + + /* + * Called for all the version 2 inquiries. +diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c +index 92361a2..95ffb9b 100644 +--- a/src/rpcb_svc.c ++++ b/src/rpcb_svc.c +@@ -52,10 +52,10 @@ + + #include "rpcbind.h" + +-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, +- rpcvers_t)); +-static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, +- rpcvers_t)); ++static void *rpcbproc_getaddr_3_local (void *, struct svc_req *, SVCXPRT *, ++ rpcvers_t); ++static void *rpcbproc_dump_3_local (void *, struct svc_req *, SVCXPRT *, ++ rpcvers_t); + + /* + * Called by svc_getreqset. There is a separate server handle for +@@ -74,7 +74,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) + } argument; + char *result; + xdrproc_t xdr_argument, xdr_result; +- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); ++ void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t); + rpcprog_t setprog = 0; + + rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); +diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c +index f1a72a6..b6fc6a8 100644 +--- a/src/rpcb_svc_4.c ++++ b/src/rpcb_svc_4.c +@@ -53,13 +53,13 @@ + #include + #include "rpcbind.h" + +-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, +- rpcvers_t)); +-static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); ++static void *rpcbproc_getaddr_4_local (void *, struct svc_req *, SVCXPRT *, ++ rpcvers_t); ++static void *rpcbproc_getversaddr_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t); + static void *rpcbproc_getaddrlist_4_local +- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); +-static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); +-static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); ++ (void *, struct svc_req *, SVCXPRT *, rpcvers_t); ++static void free_rpcb_entry_list (rpcb_entry_list_ptr *); ++static void *rpcbproc_dump_4_local (void *, struct svc_req *, SVCXPRT *, rpcvers_t); + + /* + * Called by svc_getreqset. There is a separate server handle for +@@ -77,7 +77,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) + } argument; + char *result; + xdrproc_t xdr_argument, xdr_result; +- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); ++ void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t); + rpcprog_t setprog = 0; + + rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 9a094f5..0b556a2 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -99,29 +99,29 @@ struct finfo { + static struct finfo FINFO[NFORWARD]; + + +-static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); +-static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); +-static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); +-static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); +-static int find_rmtcallfd_by_netid __P((char *)); +-static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); +-static int forward_register __P((u_int32_t, struct netbuf *, int, char *, +- rpcproc_t, rpcvers_t, u_int32_t *)); +-static struct finfo *forward_find __P((u_int32_t)); +-static int free_slot_by_xid __P((u_int32_t)); +-static int free_slot_by_index __P((int)); +-static int netbufcmp __P((struct netbuf *, struct netbuf *)); +-static struct netbuf *netbufdup __P((struct netbuf *)); +-static void netbuffree __P((struct netbuf *)); +-static int check_rmtcalls __P((struct pollfd *, int)); +-static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); +-static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); +-static void handle_reply __P((int, SVCXPRT *)); +-static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); +-static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); +-static char *getowner __P((SVCXPRT *, char *, size_t)); +-static int add_pmaplist __P((RPCB *)); +-static int del_pmaplist __P((RPCB *)); ++static bool_t xdr_encap_parms (XDR *, struct encap_parms *); ++static bool_t xdr_rmtcall_args (XDR *, struct r_rmtcall_args *); ++static bool_t xdr_rmtcall_result (XDR *, struct r_rmtcall_args *); ++static bool_t xdr_opaque_parms (XDR *, struct r_rmtcall_args *); ++static int find_rmtcallfd_by_netid (char *); ++static SVCXPRT *find_rmtcallxprt_by_fd (int); ++static int forward_register (u_int32_t, struct netbuf *, int, char *, ++ rpcproc_t, rpcvers_t, u_int32_t *); ++static struct finfo *forward_find (u_int32_t); ++static int free_slot_by_xid (u_int32_t); ++static int free_slot_by_index (int); ++static int netbufcmp (struct netbuf *, struct netbuf *); ++static struct netbuf *netbufdup (struct netbuf *); ++static void netbuffree (struct netbuf *); ++static int check_rmtcalls (struct pollfd *, int); ++static void xprt_set_caller (SVCXPRT *, struct finfo *); ++static void send_svcsyserr (SVCXPRT *, struct finfo *); ++static void handle_reply (int, SVCXPRT *); ++static void find_versions (rpcprog_t, char *, rpcvers_t *, rpcvers_t *); ++static rpcblist_ptr find_service (rpcprog_t, rpcvers_t, char *); ++static char *getowner (SVCXPRT *, char *, size_t); ++static int add_pmaplist (RPCB *); ++static int del_pmaplist (RPCB *); + + /* + * Set a mapping of program, version, netid +diff --git a/src/rpcbind.c b/src/rpcbind.c +index 6d8bed2..63da6b2 100644 +--- a/src/rpcbind.c ++++ b/src/rpcbind.c +@@ -132,13 +132,13 @@ char *tcp_uaddr; /* Universal TCP address */ + static char servname[] = "rpcbind"; + static char superuser[] = "superuser"; + +-int main __P((int, char *[])); ++int main (int, char *[]); + +-static int init_transport __P((struct netconfig *)); +-static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, +- struct netbuf *)); +-static void terminate __P((int)); +-static void parseargs __P((int, char *[])); ++static int init_transport (struct netconfig *); ++static void rbllist_add (rpcprog_t, rpcvers_t, struct netconfig *, ++ struct netbuf *); ++static void terminate (int); ++static void parseargs (int, char *[]); + + int + main(int argc, char *argv[]) +diff --git a/src/util.c b/src/util.c +index a6c835b..ff9e1f4 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4; + static struct sockaddr_in6 *local_in6; + #endif + +-static int bitmaskcmp __P((void *, void *, void *, int)); ++static int bitmaskcmp (void *, void *, void *, int); + + /* + * For all bits set in "mask", compare the corresponding bits in +diff --git a/src/warmstart.c b/src/warmstart.c +index b6eb73e..42dd3af 100644 +--- a/src/warmstart.c ++++ b/src/warmstart.c +@@ -58,8 +58,8 @@ + #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" + #endif + +-static bool_t write_struct __P((char *, xdrproc_t, void *)); +-static bool_t read_struct __P((char *, xdrproc_t, void *)); ++static bool_t write_struct (char *, xdrproc_t, void *); ++static bool_t read_struct (char *, xdrproc_t, void *); + + static bool_t + write_struct(char *filename, xdrproc_t structproc, void *list) +-- +2.2.2 + diff --git a/main/rpcbind/APKBUILD b/main/rpcbind/APKBUILD index 83de428f77..fcf18dac30 100644 --- a/main/rpcbind/APKBUILD +++ b/main/rpcbind/APKBUILD @@ -1,24 +1,24 @@ # Maintainer: Natanael Copa pkgname=rpcbind -pkgver=0.2.1 -pkgrel=3 +pkgver=0.2.3_rc2 +pkgrel=0 pkgdesc="portmap replacement which supports RPC over various protocols" url="http://rpcbind.sourceforge.net" arch="all" license="custom" depends= install="$pkgname.pre-install $pkgname.pre-upgrade" -makedepends="libtirpc-dev autoconf automake" +makedepends="libtirpc-dev autoconf automake bsd-compat-headers" subpackages="$pkgname-dbg $pkgname-doc" -source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 +source="$pkgname-$pkgver.tar.gz::http://git.infradead.org/users/steved/rpcbind.git/snapshot/95cb04e539a74dbf53e87a13c291389a3e6d4f1d.tar.gz 0002-uclibc-rpcsvc-defines.patch - rpcbind-0.2.1-rpcuser.patch musl-poll.patch musl-sunrpc.patch rpcbind.initd - rpcbind.confd" + rpcbind.confd + 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch" -_builddir="$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/rpcbind-95cb04e prepare() { cd "$_builddir" for i in $source; do @@ -40,6 +40,7 @@ build() { --with-statedir=/var/lib/rpcbind \ --with-rpcuser=rpc \ --enable-debug \ + --with-systemdsystemunitdir='no' \ || return 1 make || return 1 } @@ -51,24 +52,24 @@ package() { install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING } -md5sums="0a5f9c2142af814c55d957aaab3bcc68 rpcbind-0.2.1.tar.bz2 +md5sums="01eb2544467d6239c1a1de8ab19d2bcf rpcbind-0.2.3_rc2.tar.gz bea09b7ec434264756ec7c09da59b8bf 0002-uclibc-rpcsvc-defines.patch -05a4f6558dbfe4c69574ff3a8fee250d rpcbind-0.2.1-rpcuser.patch 30bf8bbad7e28239a4fdd5f075640663 musl-poll.patch 7825226deb532d8b91380e5425304965 musl-sunrpc.patch 381a2722c69b4597af532381f1ffeae0 rpcbind.initd -2517c71cdb08f133b0d50055a44c56de rpcbind.confd" -sha256sums="da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e rpcbind-0.2.1.tar.bz2 +2517c71cdb08f133b0d50055a44c56de rpcbind.confd +cab57f0dcff8425e5a00241f6e75e64a 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch" +sha256sums="7d0bbc262138c5f9f2b42f53c1953bf5440379cfe3a926fc400926b44bba6d81 rpcbind-0.2.3_rc2.tar.gz 86f56219652ce4e8009b6bb28c8a970fff55fff22c244d10efbe6e097a2e66f9 0002-uclibc-rpcsvc-defines.patch -ba5d2f25b9c06b057da97418fd479b511e1d16dc7f300173383c33904f1890bd rpcbind-0.2.1-rpcuser.patch 91b795f046e956ded5d16b77867a6c8199f4b221e4cab467865b16f26b8bfd32 musl-poll.patch 8852c055fa257113d3df3525a5600e6f02f4eacba29cf98a8c0c714e4551cfc9 musl-sunrpc.patch 674d5af3957c81ff4bd97811d88e064b75f742c351b63c51c397d3779fb57604 rpcbind.initd -55bcd47a4d0f194f09e6abb13695853459f869b54ce09ef051e55efcd8ad3903 rpcbind.confd" -sha512sums="5ec1e25c64ad3cd80fc2f14ced64a331afbe896fb3da54c812e3c4a78a69df181f607492762fe852732cc0ac9bd87ee118760b9e7fad2b3f028d581fecc93849 rpcbind-0.2.1.tar.bz2 +55bcd47a4d0f194f09e6abb13695853459f869b54ce09ef051e55efcd8ad3903 rpcbind.confd +a1af9dd7631205d35d8bae464b5eb9965ec16952fb9479d1e58dd2fbd40f3ec3 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch" +sha512sums="632c1025a562adfd2487aa22f5d8f3a49b93a16beb202c7736eae7e466ca481f0b6ea4c71842bd577555ab823ba10ec8e13d78a6f1d15f57b3b23bcc5893bd61 rpcbind-0.2.3_rc2.tar.gz 205dcf072055f3ff0477b26f63be7e228244bcaeaf3670ad9f5a9a39faa9d58f89b9eb2a98d79059a749b6ff834d37c260e71a8b06507027e315b29152b2a94d 0002-uclibc-rpcsvc-defines.patch -f9836d2a0d4fa11a9033bdf654637645e977d27e01e6fe232f67d92e9c6ffb4124d9191101148cb9cf4df2672b020f5cfebc5f3d54fd5e592c6283ebc29f9833 rpcbind-0.2.1-rpcuser.patch 9ff75b07622f12dd8363ad21709bd60addcb7d428aa9e181467e8da0c4ac087653934fdfb7bcec31c52b43a96a1829793cee18e68878d5cc69fa920865bdbad8 musl-poll.patch f8782018825e176adcb323c93cdf44612914a7a71e12f2dd4afb1593c62b91709fcf62246cc4e57ae2527d117cb05eabfc8436958da524186490615bf50c0bd4 musl-sunrpc.patch 9fb26b3a496c616a36f85a3af5580fb364bf404ae040ba8719d30dbdea0ea906cf07e1bc1b4c5f6e4b95b121bbd5b5c687ae17cf26617b2b2981ff7e3ef6d83b rpcbind.initd -0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd" +0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd +a2e2d2539b5943c93a9d44f11679ff5b7ca958b49040015a50e6a6bb865663031993e2888453b3c4ee0bef74f1eecc39a1b785ffcb1b596b156d24741154c2b5 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch" diff --git a/main/rpcbind/rpcbind-0.2.1-rpcuser.patch b/main/rpcbind/rpcbind-0.2.1-rpcuser.patch deleted file mode 100644 index 426f997e7f..0000000000 --- a/main/rpcbind/rpcbind-0.2.1-rpcuser.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit b3b031b07cc5909aaf964f9d4cf46f6097769320 -Author: Steve Dickson -Date: Wed Aug 21 14:40:22 2013 -0400 - - rpcbind: rpcuser not being set in Makefile.am - - Commit 8d7a0708 cause a regression where the rpcuser id was not - being set, which in turn cause rpcbind to immediately exit. - This patch removes the extra ',' that was in the AC_ARG_WITH - statement in the configure.ac file. - - Signed-off-by: Steve Dickson - -diff --git a/configure.ac b/configure.ac -index 2b67720..1cf42d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,7 +23,7 @@ AC_ARG_WITH([statedir], - AC_SUBST([statedir], [$with_statedir]) - - AC_ARG_WITH([rpcuser], -- AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), -+ AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]) - ,, [with_rpcuser=root]) - AC_SUBST([rpcuser], [$with_rpcuser]) - -- cgit v1.2.3