Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

3 files changed, 159 insertions, 0 deletions

diff --git a/portmap/make.patch b/portmap/make.patch
index e69de29bb2..2b83130437 100644
--- a/portmap/make.patch
+++ b/portmap/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/portmap/no-libwrap.patch b/portmap/no-libwrap.patch
index e69de29bb2..751200bf12 100644
--- a/portmap/no-libwrap.patch
+++ b/portmap/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/portmap/portmap.init b/portmap/portmap.init
index e69de29bb2..3c05b8c2a3 100644
--- a/portmap/portmap.init
+++ b/portmap/portmap.init
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# start/stop portmap daemon.
+
+test -f /sbin/portmap || exit 0
+
+case "$1" in
+    start)
+	echo -n "Starting portmap daemon:"
+	echo -n " portmap"
+        start-stop-daemon --start --quiet --exec /sbin/portmap
+	echo "."
+
+	if [ -f /var/run/portmap.upgrade-state ]; then
+          echo -n "Restoring old RPC service information..."
+          sleep 1 # needs a short pause or pmap_set won't work. :(
+	  pmap_set </var/run/portmap.upgrade-state
+	  rm -f /var/run/portmap.upgrade-state
+          echo "done."
+        fi
+
+	;;
+    stop)
+        echo -n "Stopping portmap daemon:"
+        echo -n " portmap" ; start-stop-daemon --stop --quiet --oknodo --exec /sbin/portmap
+        echo "."
+	;;
+    reload)
+	;;
+    force-reload)
+        $0 restart
+	;;
+    restart)
+	pmap_dump >/var/run/portmap.state
+        $0 stop
+        $0 start
+	if [ ! -f /var/run/portmap.upgrade-state ]; then
+          sleep 1
+	  pmap_set </var/run/portmap.state
+	fi
+	rm -f /var/run/portmap.state
+	;;
+    *)
+	echo "Usage: /etc/init.d/portmap {start|stop|reload|restart}"
+	exit 1
+	;;
+esac
+
+exit 0
+