import clean BK tree at cset 1.3670

7 files changed, 153 insertions, 0 deletions

diff --git a/packages/portmap/.mtn2git_empty b/packages/portmap/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/portmap/.mtn2git_empty
diff --git a/packages/portmap/files/.mtn2git_empty b/packages/portmap/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/portmap/files/.mtn2git_empty
diff --git a/packages/portmap/files/make.patch b/packages/portmap/files/make.patch
index e69de29bb2..2b83130437 100644
--- a/packages/portmap/files/make.patch
+++ b/packages/portmap/files/make.patch
@@ -0,0 +1,83 @@
+
+#
+# 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/packages/portmap/files/no-libwrap.patch b/packages/portmap/files/no-libwrap.patch
index e69de29bb2..751200bf12 100644
--- a/packages/portmap/files/no-libwrap.patch
+++ b/packages/portmap/files/no-libwrap.patch
@@ -0,0 +1,26 @@
+--- Makefile~	2004-06-03 11:19:23.000000000 +0100
++++ Makefile	2004-06-03 11:24:53.000000000 +0100
+@@ -15,9 +15,9 @@
+ # no access control tables. The local system, since it runs the portmap
+ # daemon, is always treated as an authorized host.
+ 
+-HOSTS_ACCESS= -DHOSTS_ACCESS
++#HOSTS_ACCESS= -DHOSTS_ACCESS
+ #WRAP_LIB = $(WRAP_DIR)/libwrap.a
+-WRAP_LIB = -lwrap
++#WRAP_LIB = -lwrap
+ 
+ # Comment out if your RPC library does not allocate privileged ports for
+ # requests from processes with root privilege, or the new portmap will
+--- pmap_check.c~	2004-06-03 11:24:20.000000000 +0100
++++ pmap_check.c	2004-06-03 11:24:33.000000000 +0100
+@@ -48,7 +48,9 @@
+ #endif
+ #include <sys/types.h>
+ #include <unistd.h>
++#ifdef HOSTS_ACCESS
+ #include <tcpd.h>
++#endif
+ 
+ extern char *inet_ntoa();
+ 
diff --git a/packages/portmap/files/portmap.init b/packages/portmap/files/portmap.init
index 6dac207350..6dac207350 100644..100755
--- a/packages/portmap/files/portmap.init
+++ b/packages/portmap/files/portmap.init
diff --git a/packages/portmap/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb
index e69de29bb2..6ce7c3eab5 100644
--- a/packages/portmap/portmap-unslung_5-7.bb
+++ b/packages/portmap/portmap-unslung_5-7.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "RPC program number mapper."
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
+	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+	file://no-libwrap.patch;patch=1;pnum=0 \
+	file://portmap.init \
+	file://make.patch;patch=1"
+S = "${WORKDIR}/portmap_5beta"
+
+sbindir = "/sbin"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	oe_runmake 'docdir=${datadir}/doc/portmap' \
+		   'DESTDIR=${D}' install
+}
diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index e69de29bb2..6ce7c3eab5 100644
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "RPC program number mapper."
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
+	http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
+	file://no-libwrap.patch;patch=1;pnum=0 \
+	file://portmap.init \
+	file://make.patch;patch=1"
+S = "${WORKDIR}/portmap_5beta"
+
+sbindir = "/sbin"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	oe_runmake 'docdir=${datadir}/doc/portmap' \
+		   'DESTDIR=${D}' install
+}