merge of '0cc400441946f7a721b718fe50f7bbce5c9ea24f'

     and '42be14012b6790df46c62295f3a02286acecbd4f'

14 files changed, 7 insertions, 283 deletions

diff --git a/packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-shield/gpe-shield-0.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-shield/gpe-shield-0.2/makefile.patch b/packages/gpe-shield/gpe-shield-0.2/makefile.patch
deleted file mode 100644
index 58c4c0bd00..0000000000
--- a/packages/gpe-shield/gpe-shield-0.2/makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-? .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/packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-shield/gpe-shield-0.6/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch b/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch
deleted file mode 100644
index 5c306be02f..0000000000
--- a/packages/gpe-shield/gpe-shield-0.6/backend-iptables.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch b/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch
deleted file mode 100644
index c2afd3907e..0000000000
--- a/packages/gpe-shield/gpe-shield-0.6/desktop-name.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty b/packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gpe-shield/gpe-shield-0.7/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gpe-shield/gpe-shield-0.7/nostropts.patch b/packages/gpe-shield/gpe-shield-0.7/nostropts.patch
deleted file mode 100644
index 83740c7a8f..0000000000
--- a/packages/gpe-shield/gpe-shield-0.7/nostropts.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- gpe-shield-0.7/interface.c~nostropts.patch	2004-09-21 12:35:30.000000000 -0400
-+++ gpe-shield-0.7/interface.c	2005-01-04 15:43:49.604380608 -0500
-@@ -18,26 +18,6 @@
- #include <unistd.h>
- #include <dirent.h>
- #include <fcntl.h>
--#include <stropts.h>
--#include <poll.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <sys/signal.h>
--#include <sys/un.h>
--
--#include <locale.h>
--#include <libintl.h>
--#define _(x) gettext(x)
--
--#include <gtk/gtk.h>
--
--#include <stdlib.h>
--#include <stdio.h>
--#include <string.h>
--#include <unistd.h>
--#include <dirent.h>
--#include <fcntl.h>
--#include <stropts.h>
- #include <poll.h>
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/packages/gpe-shield/gpe-shield_0.2.bb b/packages/gpe-shield/gpe-shield_0.2.bb
deleted file mode 100644
index f5766871bc..0000000000
--- a/packages/gpe-shield/gpe-shield_0.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PR = "r1"
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget iptables"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-export CVSBUILD = "no"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-           file://${FILESDIR}/makefile.patch;patch=1;pnum=0"
-
-
diff --git a/packages/gpe-shield/gpe-shield_0.3.bb b/packages/gpe-shield/gpe-shield_0.3.bb
deleted file mode 100644
index 7fe229e35d..0000000000
--- a/packages/gpe-shield/gpe-shield_0.3.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-PR = "r0"
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget iptables"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-export CVSBUILD = "no"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
-
-
diff --git a/packages/gpe-shield/gpe-shield_0.4.bb b/packages/gpe-shield/gpe-shield_0.4.bb
deleted file mode 100644
index 8a9d5b693c..0000000000
--- a/packages/gpe-shield/gpe-shield_0.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PR = "r0"
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget iptables"
-RDEPENDS = "iptables"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-export CVSBUILD = "no"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
-
-
diff --git a/packages/gpe-shield/gpe-shield_0.6.bb b/packages/gpe-shield/gpe-shield_0.6.bb
deleted file mode 100644
index eff82cb38d..0000000000
--- a/packages/gpe-shield/gpe-shield_0.6.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PR = "r2"
-LICENSE = "GPL"
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget iptables"
-RDEPENDS = "iptables"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-export CVSBUILD = "no"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
-           file://backend-iptables.patch;patch=1;pnum=0 \
-           file://desktop-name.patch;patch=1;pnum=0"
diff --git a/packages/gpe-shield/gpe-shield_0.7.bb b/packages/gpe-shield/gpe-shield_0.7.bb
deleted file mode 100644
index fdce8c91c2..0000000000
--- a/packages/gpe-shield/gpe-shield_0.7.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-PR = "r1"
-inherit gpe pkgconfig
-LICENSE = "GPL"
-DEPENDS = "libgpewidget iptables"
-RDEPENDS = "iptables"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-SRC_URI += "file://nostropts.patch;patch=1"
diff --git a/packages/gpe-shield/gpe-shield_0.8.bb b/packages/gpe-shield/gpe-shield_0.8.bb
deleted file mode 100644
index ce6843a468..0000000000
--- a/packages/gpe-shield/gpe-shield_0.8.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-PR = "r1"
-inherit gpe pkgconfig
-LICENSE = "GPL"
-DEPENDS = "libgpewidget iptables virtual/kernel"
-RDEPENDS = "iptables"
-RRECOMMENDS = "kernel-module-ipt-state"
-SECTION = "gpe"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-
-DESCRIPTION = "GPE network security tool"
-
diff --git a/packages/gpe-shield/gpe-shield_0.9.bb b/packages/gpe-shield/gpe-shield_0.9.bb
index fd1d2c4a17..898d67a181 100644
--- a/packages/gpe-shield/gpe-shield_0.9.bb
+++ b/packages/gpe-shield/gpe-shield_0.9.bb
@@ -1,11 +1,14 @@
-PR          = "r0"
+DESCRIPTION = "GPE network security tool"
+SECTION     = "gpe"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 LICENSE     = "GPL"
+
 DEPENDS     = "libgpewidget iptables virtual/kernel"
 RDEPENDS    = "iptables"
 RRECOMMENDS = "kernel-module-ipt-state"
-SECTION     = "gpe"
-MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
 
-DESCRIPTION = "GPE network security tool"
+PR          = "r0"
 
 inherit gpe pkgconfig
+
+