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

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

3 files changed, 165 insertions, 0 deletions

diff --git a/gpe-shield/gpe-shield-0.2/makefile.patch b/gpe-shield/gpe-shield-0.2/makefile.patch
index e69de29bb2..58c4c0bd00 100644
--- a/gpe-shield/gpe-shield-0.2/makefile.patch
+++ b/gpe-shield/gpe-shield-0.2/makefile.patch
@@ -0,0 +1,79 @@
+? .tm_project.cache
+? gpe-shield
+? gpe-shield.desktop
+? gpe-shield_0.2.batch
+? gpe-shield_0.2_arm.ipk
+? gpe-shield_0.2_arm.ipk.asc
+? gpe-shield_0.2_arm.ipk.upload.html
+? makefile.patch
+? po
+Index: Makefile
+===================================================================
+RCS file: /cvs/gpe/base/gpe-shield/Makefile,v
+retrieving revision 1.2
+diff -r1.2 Makefile
+14a15,17
+> GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gdk-2.0`
+> GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0`
+> 
+16,17c19,20
+< GTKLDFLAGS += -L../libgpewidget -L.
+< CFLAGS += -Wall -I../libgpewidget -I.
+---
+> PACKAGE_LDFLAGS += -L../libgpewidget -L.
+> PACKAGE_CFLAGS += -I../libgpewidget -I.
+20d22
+< GTKCFLAGS += -I$(PREFIX)/include/gpe
+23a26,30
+> PACKAGE_CPPFLAGS = $(STANDARD_CPPFLAGS)
+> PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS)
+> PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GPELIBS) $(GTKLDFLAGS)
+> 
+> 
+27c34
+< CFLAGS += -g -DDEBUG
+---
+> PACKAGE_CFLAGS += -g -DDEBUG
+29c36
+< CFLAGS += -Os -fomit-frame-pointer
+---
+> PACKAGE_CFLAGS += -Os -fomit-frame-pointer
+32,58c39,40
+< CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
+< CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+< 
+< GTKCFLAGS += `pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0` 
+< GTKLDFLAGS += `pkg-config --libs gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0`
+< 
+< # setup how to compile
+< ifeq ($(NATIVE),yes)
+< 
+< STRIP=strip
+< CC=gcc
+< 
+< CFLAGS += $(GTKCFLAGS) -Wall
+< LDFLAGS += -lgpewidget $(GTKLDFLAGS)
+< 
+< else # we do cross-compile...
+< 
+< CC=arm-linux-gcc
+< STRIP=arm-linux-strip
+< 
+< CFLAGS += -march=armv4 -mtune=strongarm
+< CFLAGS += $(GTKCFLAGS) -Wall 
+< LDFLAGS += -lgpewidget $(GTKLDFLAGS) -Wall 
+< LDFLAGS += -lXinerama
+< 
+< endif #native or cross-compile
+< 
+---
+> PACKAGE_CFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -D_GNU_SOURCE
+> PACKAGE_CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+70c52
+< 	$(CC) -g -o $@ $(OBJS) $(LDFLAGS) -lgpewidget $(GTKLDFLAGS)
+---
+> 	$(CC) -g -o $@ $(OBJS) $(LDFLAGS) $(PACKAGE_LDFLAGS)
+80c62
+< 	for i in $(PIXMAPS); do install -m 644 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done
+---
+> 	for i in $(PIXMAPS); do install -m 4755 -D pixmaps/$$i $(DESTDIR)$(PREFIX)/share/pixmaps/$$i; done
diff --git a/gpe-shield/gpe-shield-0.6/backend-iptables.patch b/gpe-shield/gpe-shield-0.6/backend-iptables.patch
index e69de29bb2..5c306be02f 100644
--- a/gpe-shield/gpe-shield-0.6/backend-iptables.patch
+++ b/gpe-shield/gpe-shield-0.6/backend-iptables.patch
@@ -0,0 +1,71 @@
+Index: backend.c
+===================================================================
+RCS file: /cvs/gpe/base/gpe-shield/backend.c,v
+retrieving revision 1.8
+diff -u -r1.8 backend.c
+--- backend.c	21 Jun 2004 08:54:53 -0000	1.8
++++ backend.c	16 Aug 2004 12:17:54 -0000
+@@ -41,6 +41,7 @@
+ #define IPTABLES_CMD1 "/usr/sbin/iptables"
+ #define IPTABLES_CMD2 "/sbin/iptables"
+ #define IPTABLES_CMD3 "/usr/local/sbin/iptables"
++#define IPTABLES_CMD4 "/usr/bin/iptables"
+ 
+ static const char* IPTABLES_CMD = NULL;
+ 
+@@ -144,13 +145,17 @@
+ void
+ do_clear(void)
+ {
+-	char* cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush");
++	char* cmd;
++	
++	cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"--flush");
+ 	system(cmd);
++	
+ 	g_free(cmd);
+ 	cmd = g_strdup_printf("%s %s",IPTABLES_CMD,"-P INPUT ACCEPT"); /* reset input policy */
+ 	system(cmd);
+ 	g_free(cmd);
+ 	g_free(rule_info);
++	
+ 	rule_info = NULL;
+ 	rule_count = 0;
+ }
+@@ -387,6 +392,7 @@
+ 
+ 	pfd[0].fd = sock;
+ 	pfd[0].events = (POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI);
++	
+ 	while (poll (pfd, 1, -1) > 0)
+ 	{
+ 		if ((pfd[0].revents & POLLERR) || (pfd[0].revents & POLLHUP))
+@@ -497,7 +503,8 @@
+ 		IPTABLES_CMD = IPTABLES_CMD2;
+ 	else if (!access(IPTABLES_CMD3,X_OK))
+ 		IPTABLES_CMD = IPTABLES_CMD3;
+-	
++	else if (!access(IPTABLES_CMD4,X_OK))
++		IPTABLES_CMD = IPTABLES_CMD4;
+ }
+ 
+ /* app mainloop */
+@@ -505,8 +512,16 @@
+ int
+ suidloop (int csock)
+ {
+-        find_iptables();
+-
++	find_iptables();
++	
++	if (IPTABLES_CMD == NULL)
++	{
++		fprintf(stderr, "Iptables not found, exiting.\n");
++		close (sock);
++		unlink (PK_SOCKET);
++		exit (2);
++	}
++	
+ 	sock = csock;
+ 
+ 	while (wait_message ()) ;
diff --git a/gpe-shield/gpe-shield-0.6/desktop-name.patch b/gpe-shield/gpe-shield-0.6/desktop-name.patch
index e69de29bb2..c2afd3907e 100644
--- a/gpe-shield/gpe-shield-0.6/desktop-name.patch
+++ b/gpe-shield/gpe-shield-0.6/desktop-name.patch
@@ -0,0 +1,15 @@
+Index: gpe-shield.desktop.in
+===================================================================
+RCS file: /cvs/gpe/base/gpe-shield/gpe-shield.desktop.in,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- gpe-shield.desktop.in	4 Jun 2004 14:51:41 -0000	1.1
++++ gpe-shield.desktop.in	2 Sep 2004 22:16:43 -0000	1.2
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-_Name=Desktop Firewall
++_Name=Network Shield
+ _Comment=Change security settings and access control
+ Exec=gpe-shield
+ Terminal=0