From 38978eef17383fa082d47b84b97292d8132b6331 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 13 Jan 2015 10:02:02 +0800 Subject: rpcbind: upgrade to 0.2.2 Drop 0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch which has been merged to 0.2.2 (From OE-Core rev: 07a3ae994b293053c57f38b176e428322fb816bc) Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- ...bind-rpcuser-not-being-set-in-Makefile.am.patch | 34 ------------ meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb | 64 ---------------------- meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb | 63 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch delete mode 100644 meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb create mode 100644 meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb (limited to 'meta/recipes-extended/rpcbind') diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch deleted file mode 100644 index b556a46347..0000000000 --- a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 914507aa6980129fefb4decaabea1a4f60c7182b Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Wed, 21 Aug 2013 14:40:22 -0400 -Subject: [PATCH 1/1] rpcbind: rpcuser not being set in Makefile.am - -Upstream-Status: backport - -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 -Signed-off-by: Cristian Iorga ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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]) - --- -1.8.3.2 - diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb deleted file mode 100644 index b7324766f7..0000000000 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Universal Addresses to RPC Program Number Mapper" -DESCRIPTION = "The rpcbind utility is a server that converts RPC \ - program numbers into universal addresses." -SECTION = "console/network" -HOMEPAGE = "http://sourceforge.net/projects/rpcbind/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=201237&atid=976751" -DEPENDS = "libtirpc quota" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ - file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" - -SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ - file://0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch \ - file://init.d \ - ${UCLIBCPATCHES} \ - file://rpcbind.conf \ - file://rpcbind.socket \ - file://rpcbind.service \ - " - -UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ - file://0002-uclibc-rpcsvc-defines.patch \ - " -UCLIBCPATCHES ?= "" - -SRC_URI[md5sum] = "0a5f9c2142af814c55d957aaab3bcc68" -SRC_URI[sha256sum] = "da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e" - -inherit autotools update-rc.d systemd pkgconfig - -PACKAGECONFIG ??= "tcp-wrappers" -PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" - -INITSCRIPT_NAME = "rpcbind" -INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." - -SYSTEMD_SERVICE_${PN} = "rpcbind.service rpcbind.socket" - -inherit useradd - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \ - --shell /bin/false --user-group rpc" - -EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc" - -do_install_append () { - mv ${D}${bindir} ${D}${sbindir} - - install -d ${D}${sysconfdir}/init.d - sed -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/sbin/,${sbindir}/,g' \ - ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind - chmod 0755 ${D}${sysconfdir}/init.d/rpcbind - - install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir} - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system - sed -i -e 's,@SBINDIR@,${sbindir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_unitdir}/system/rpcbind.service -} diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb new file mode 100644 index 0000000000..44c79eb21f --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb @@ -0,0 +1,63 @@ +SUMMARY = "Universal Addresses to RPC Program Number Mapper" +DESCRIPTION = "The rpcbind utility is a server that converts RPC \ + program numbers into universal addresses." +SECTION = "console/network" +HOMEPAGE = "http://sourceforge.net/projects/rpcbind/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=201237&atid=976751" +DEPENDS = "libtirpc quota" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \ + file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24" + +SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ + file://init.d \ + ${UCLIBCPATCHES} \ + file://rpcbind.conf \ + file://rpcbind.socket \ + file://rpcbind.service \ + " + +UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ + file://0002-uclibc-rpcsvc-defines.patch \ + " +UCLIBCPATCHES ?= "" + +SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a" +SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29" + +inherit autotools update-rc.d systemd pkgconfig + +PACKAGECONFIG ??= "tcp-wrappers" +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" + +INITSCRIPT_NAME = "rpcbind" +INITSCRIPT_PARAMS = "start 12 2 3 4 5 . stop 60 0 1 6 ." + +SYSTEMD_SERVICE_${PN} = "rpcbind.service rpcbind.socket" + +inherit useradd + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \ + --shell /bin/false --user-group rpc" + +EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc" + +do_install_append () { + mv ${D}${bindir} ${D}${sbindir} + + install -d ${D}${sysconfdir}/init.d + sed -e 's,/etc/,${sysconfdir}/,g' \ + -e 's,/sbin/,${sbindir}/,g' \ + ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind + chmod 0755 ${D}${sysconfdir}/init.d/rpcbind + + install -m 0755 ${WORKDIR}/rpcbind.conf ${D}${sysconfdir} + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rpcbind.socket ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system + sed -i -e 's,@SBINDIR@,${sbindir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_unitdir}/system/rpcbind.service +} -- cgit v1.2.3-54-g00ecf