portmap: Sync with OE.dev

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/portmap/files/make.patch b/meta/packages/portmap/files/make.patch
deleted file mode 100644 (file)
index 2b83130..0000000
--- 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/portmap/portmap.init
similarity index 100%
rename from meta/packages/portmap/files/portmap.init
rename to meta/packages/portmap/portmap/portmap.init

diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
index 7b23162ffa41c58eb6610704f833a8a03f6c8040..f132295ff55162e90ff09b6935ea5b5c338137e4 100644 (file)
--- a/meta/packages/portmap/portmap_6.0.bb
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -1,8 +1,8 @@
 require portmap.inc
 
-PR = "r3"
+PR = "r5"
 
-SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
+SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \
            file://destdir-no-strip.patch;patch=1 \
           file://no-tcpd-support.patch;patch=1 \
            file://no-libwrap.patch;patch=1;pnum=0 \
@@ -11,6 +11,7 @@ SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
 S = "${WORKDIR}/${PN}_${PV}/"
 
 CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
+CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
 
 fakeroot do_install() {
     install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d