From 75fbd88ad591fdbda12022dc25592283151e4639 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 23 Feb 2010 14:59:23 +0000 Subject: portmap: Sync with OE.dev Signed-off-by: Richard Purdie --- meta/packages/portmap/files/make.patch | 83 ------------------------------ meta/packages/portmap/files/portmap.init | 59 --------------------- meta/packages/portmap/portmap/portmap.init | 59 +++++++++++++++++++++ meta/packages/portmap/portmap_6.0.bb | 5 +- 4 files changed, 62 insertions(+), 144 deletions(-) delete mode 100644 meta/packages/portmap/files/make.patch delete mode 100755 meta/packages/portmap/files/portmap.init create mode 100755 meta/packages/portmap/portmap/portmap.init (limited to 'meta') diff --git a/meta/packages/portmap/files/make.patch b/meta/packages/portmap/files/make.patch deleted file mode 100644 index 2b83130437..0000000000 --- a/meta/packages/portmap/files/make.patch +++ /dev/null @@ -1,83 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- portmap_5beta/Makefile~make.patch -+++ portmap_5beta/Makefile -@@ -105,6 +105,13 @@ - # - #CONST = -Dconst= - -+DESTDIR = -+prefix = /usr -+sbindir = /sbin -+datadir = $(prefix)/share -+mandir = $(datadir)/man -+docdir = $(datadir)/doc/portmap -+ - ### End of configurable stuff. - ############################## - -@@ -122,35 +129,38 @@ - COPT = $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \ - $(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \ - $(LOOPBACK) $(SETPGRP) --CFLAGS = -Wall $(COPT) -O2 $(NSARCHS) -+CFLAGS = -Wall -O2 $(NSARCHS) - OBJECTS = portmap.o pmap_check.o from_local.o $(AUX) - - all: portmap pmap_dump pmap_set - - portmap: $(OBJECTS) # $(WRAP_DIR)/libwrap.a -- $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS) - --pmap_dump: pmap_dump.c -- $(CC) $(CFLAGS) -o $@ $? $(LIBS) -+pmap_dump: pmap_dump.o -+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS) - --pmap_set: pmap_set.c -- $(CC) $(CFLAGS) -o $@ $? $(LIBS) -+pmap_set: pmap_set.o -+ $(CC) $(LDFLAGS) -o $@ $? $(LIBS) - - from_local: from_local.c -- cc $(CFLAGS) -DTEST -o $@ from_local.c -+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ from_local.c - - get_myaddress: get_myaddress.c -- cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS) -+ $(CC) $(COPT) -DTEST $(CFLAGS) $(LDFLAGS) -o $@ get_myaddress.c $(LIBS) - - install: all -- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin -- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin -- install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8 -- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 -- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 -- cat BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt -- gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt -+ install -d $(DESTDIR)/$(sbindir) \ -+ $(DESTDIR)/$(docdir) \ -+ $(DESTDIR)/$(mandir)/man8 -+ install -m 0755 portmap $(DESTDIR)/$(sbindir) -+ install -m 0755 pmap_dump $(DESTDIR)/$(sbindir) -+ install -m 0755 pmap_set $(DESTDIR)/$(sbindir) -+ install -m 0644 portmap.8 $(DESTDIR)/$(mandir)/man8 -+ install -m 0644 pmap_dump.8 $(DESTDIR)/$(mandir)/man8 -+ install -m 0644 pmap_set.8 $(DESTDIR)/$(mandir)/man8 -+ cat BLURB >$(DESTDIR)/$(docdir)/portmapper.txt -+ gzip -9f $(DESTDIR)/$(docdir)/portmapper.txt - - - lint: -@@ -176,3 +186,6 @@ - portmap.o: portmap.c - portmap.o: pmap_check.h Makefile - strerror.o: strerror.c -+ -+%.o: %.c -+ $(CC) $(COPT) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c $*.c -o $*.o diff --git a/meta/packages/portmap/files/portmap.init b/meta/packages/portmap/files/portmap.init deleted file mode 100755 index e46513e115..0000000000 --- a/meta/packages/portmap/files/portmap.init +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: portmap -# Required-Start: $network -# Required-Stop: $network -# Default-Start: S 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: The RPC portmapper -# Description: Portmap is a server that converts RPC (Remote -# Procedure Call) program numbers into DARPA -# protocol port numbers. It must be running in -# order to make RPC calls. Services that use -# RPC include NFS and NIS. -### END INIT INFO - -test -f /sbin/portmap || exit 0 - -case "$1" in - start) - echo "Starting portmap daemon..." - start-stop-daemon --start --quiet --exec /sbin/portmap - - if [ -f /var/run/portmap.upgrade-state ]; then - echo "Restoring old RPC service information..." - sleep 1 # needs a short pause or pmap_set won't work. :( - pmap_set /var/run/portmap.state - $0 stop - $0 start - if [ ! -f /var/run/portmap.upgrade-state ]; then - sleep 1 - pmap_set /var/run/portmap.state + $0 stop + $0 start + if [ ! -f /var/run/portmap.upgrade-state ]; then + sleep 1 + pmap_set