merge of 1f08208ff3c43887e64b23c1f616b3c055f659f8

     and 5531936b9907566eaf1d648bfbcc4867ba699ccf

8 files changed, 23 insertions, 184 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index 9d448ea826..f23eced80e 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -109,7 +109,7 @@ kernel-module-nls-utf8 \
 # a bootable, useable, system however they *are* expected to be present
 # in DebianSlug - see slugos-lag for a more minimal configuration and some
 # more instructions about how to make a non-debianslug image.
-SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS}"
+SLUGOS_EXTRA_RDEPENDS = "${DEBIANSLUG_STANDARD_RDEPENDS} ${DEBIANSLUG_EXTRA_RDEPENDS}"
 
 #----------------------------------------------------------------------------------
 # PACKAGE VERSION CONTROL
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index e21859b082..8317f1d325 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -109,7 +109,7 @@ kernel-module-nls-utf8 \
 # a bootable, useable, system however they *are* expected to be present
 # in OpenSlug - see nslu2-bag for a more minimal configuration and some
 # more instructions about how to make a non-openslug image.
-SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS}"
+SLUGOS_EXTRA_RDEPENDS = "${OPENSLUG_STANDARD_RDEPENDS} ${OPENSLUG_EXTRA_RDEPENDS}"
 
 #----------------------------------------------------------------------------------
 # PACKAGE VERSION CONTROL
diff --git a/packages/openswan/openswan-2.1.2/.mtn2git_empty b/packages/openswan/openswan-2.1.2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openswan/openswan-2.1.2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openswan/openswan-2.1.2/flags.patch b/packages/openswan/openswan-2.1.2/flags.patch
deleted file mode 100644
index 9cdf3f2a47..0000000000
--- a/packages/openswan/openswan-2.1.2/flags.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- openswan-2.1.2/lib/libdes/Makefile~flags.patch
-+++ openswan-2.1.2/lib/libdes/Makefile
-@@ -58,9 +58,10 @@
- #CC=gcc
- #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
- # normally overridden by FreeS/WAN Makefiles anyway
--CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
-+CFLAG= -O3 -fomit-frame-pointer
- 
- CFLAGS=$(OPTS) $(CFLAG)
-+override CFLAGS+=-I${KLIPSD}/include -I${SRCDIR}
- CPP=$(CC) -E
- 
- # Assember version of des_encrypt*().
---- openswan-2.1.2/lib/libfreeswan/Makefile~flags.patch
-+++ openswan-2.1.2/lib/libfreeswan/Makefile
-@@ -45,7 +45,8 @@
- 
- LIB=libfreeswan.a
- # Original flags
--CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
-+override CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR}
-+CFLAGS+= $(USERCOMPILE)
- CFLAGS+= -Wall
- #CFLAGS+= -Wconversion
- #CFLAGS+= -Wmissing-prototypes
-@@ -59,7 +60,7 @@
- CFLAGS+= -Wbad-function-cast 
- 
- ifeq ($(USE_NAT_TRAVERSAL),true)
--CFLAGS+= -DNAT_TRAVERSAL
-+override CFLAGS+= -DNAT_TRAVERSAL
- endif
- 
- 
---- openswan-2.1.2/lib/libipsecpolicy/Makefile~flags.patch
-+++ openswan-2.1.2/lib/libipsecpolicy/Makefile
-@@ -30,7 +30,8 @@
- 
- LIB=libipsecpolicy.a
- # Original flags
--CFLAGS=-I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
-+override CFLAGS+= -I. -I${KLIPSD} -I${FREESWANSRCDIR}
-+CFLAGS+= $(USERCOMPILE)
- CFLAGS+= -Wall
- CFLAGS+= -Wpointer-arith
- CFLAGS+= -Wcast-qual
---- openswan-2.1.2/lib/liblwres/Makefile~flags.patch
-+++ openswan-2.1.2/lib/liblwres/Makefile
-@@ -24,7 +24,8 @@
- CDEFINES = -g
- CWARNINGS = -Werror
- 
--CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
-+override CFLAGS=${CINCLUDES}
-+CFLAGS+=${CDEFINES} ${CWARNINGS}
- 
- VERSION="@(\#) freeswan-hacking-9.2.1-for-fs2"
- LIBINTERFACE=2
---- openswan-2.1.2/lib/libopenswan/Makefile~flags.patch
-+++ openswan-2.1.2/lib/libopenswan/Makefile
-@@ -46,7 +46,8 @@
- 
- LIB=libopenswan.a
- # Original flags
--CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${OPENSWANSRCDIR} $(USERCOMPILE)
-+override CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${OPENSWANSRCDIR}
-+CFLAGS+= $(USERCOMPILE)
- CFLAGS+= -Wall
- #CFLAGS+= -Wconversion
- #CFLAGS+= -Wmissing-prototypes
-@@ -60,7 +61,7 @@
- CFLAGS+= -Wbad-function-cast 
- 
- ifeq ($(USE_NAT_TRAVERSAL),true)
--CFLAGS+= -DNAT_TRAVERSAL
-+override CFLAGS+= -DNAT_TRAVERSAL
- endif
- 
- 
---- openswan-2.1.2/programs/Makefile.program~flags.patch
-+++ openswan-2.1.2/programs/Makefile.program
-@@ -1,7 +1,7 @@
- 
- include ${FREESWANSRCDIR}/Makefile.ver
- 
--CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
-+override CFLAGS+=-I${KLIPSINC}
- 
- CFLAGS+= $(USERCOMPILE)
- CFLAGS+= -Wall
-@@ -15,10 +15,9 @@
- #CFLAGS+= -W
- #CFLAGS+= -Wwrite-strings
- CFLAGS+= -Wbad-function-cast 
--CFLAGS+= -DNAT_TRAVERSAL
- 
- ifeq ($(USE_NAT_TRAVERSAL),true)
--CFLAGS+= -DNAT_TRAVERSAL
-+override CFLAGS+= -DNAT_TRAVERSAL
- endif
- 
- # die if there are any warnings
---- openswan-2.1.2/programs/lwdnsq/Makefile~flags.patch
-+++ openswan-2.1.2/programs/lwdnsq/Makefile
-@@ -29,7 +29,7 @@
- CFLAGS+=-I${BIND9INCDIR}
- endif
- 
--CFLAGS+=-I${LWRESINCL}
-+override CFLAGS+=-I${LWRESINCL}
- 
- #USERCOMPILE=-g
- 
---- openswan-2.1.2/programs/pluto/Makefile~flags.patch
-+++ openswan-2.1.2/programs/pluto/Makefile
-@@ -203,7 +203,7 @@
- DEFINES+= -DSMARTCARD
- endif
- 
--CPPFLAGS = $(HDRDIRS) $(DEFINES) \
-+override CPPFLAGS = $(HDRDIRS) $(DEFINES) \
- 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
- 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
- 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
---- openswan-2.1.2/testing/utils/ikeping/Makefile~flags.patch
-+++ openswan-2.1.2/testing/utils/ikeping/Makefile
-@@ -35,7 +35,7 @@
- 
- HDRDIRS =  $(FREESWANINCLS)
- 
--CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
-+override CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
- 
- ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
- 
---- openswan-2.1.2/testing/utils/uml_netjig/Makefile~flags.patch
-+++ openswan-2.1.2/testing/utils/uml_netjig/Makefile
-@@ -43,7 +43,8 @@
- #PCAPH=-I/home/mcr/src/libpcap
- #PCAPLIB=-L/home/mcr/src/linux/i386/libpcap -lpcap
- 
--CFLAGS = -g -Wall ${PCAPH} ${NETDISSECTH} ${OPTIONS}
-+CFLAGS = -g -Wall ${PCAPH} ${NETDISSECTH}
-+override CFLAGS += ${OPTIONS}
- LIBS = ${NETDISSECTLIB} ${PCAPLIB} ${OPENSSL}
- 
- 
diff --git a/packages/openswan/openswan_2.1.2.bb b/packages/openswan/openswan_2.1.2.bb
deleted file mode 100644
index cf0671729b..0000000000
--- a/packages/openswan/openswan_2.1.2.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-LICENSE = "GPL"
-SECTION = "console/network"
-DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
-Linux operating system."
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "gmp"
-
-SRC_URI = "http://www.openswan.org/code/openswan-${PV}.tar.gz \
-	   file://flags.patch;patch=1"
-S = "${WORKDIR}/openswan-${PV}"
-
-EXTRA_OEMAKE = "-e DESTDIR=${D} \
-                USERCOMPILE="${CFLAGS}" \
-                FINALCONFDIR=${sysconfdir}/ipsec \
-                INC_RCDEFAULT=${sysconfdir}/init.d \
-                INC_USRLOCAL=${prefix} \
-                INC_MANDIR=share/man"
-
-do_compile () {
-	oe_runmake programs
-}
-
-do_install () {
-	oe_runmake install
-}
-
-FILES_${PN} += "${libdir}/ipsec/"
diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb
index 3087b21ec3..197fed95f6 100644
--- a/packages/openswan/openswan_2.2.0.bb
+++ b/packages/openswan/openswan_2.2.0.bb
@@ -9,7 +9,7 @@ RRECOMMENDS = "kernel-module-ipsec"
 RDEPENDS_nylon = "perl"
 PR = "r4"
 
-SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
+SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
 	   file://openswan-2.2.0-gentoo.patch;patch=1 \
            file://gcc4-fixes.patch;patch=1 \
 	   file://makefile-whitespace-fix.patch;patch=1 \
diff --git a/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch
new file mode 100644
index 0000000000..31e66ced31
--- /dev/null
+++ b/packages/opie-aboutapplet/opie-aboutapplet-1.2.1/opie-1.2.1.patch
@@ -0,0 +1,18 @@
+Backport from CVS
+
+Index: widget.ui
+===================================================================
+RCS file: /cvs/opie/core/applets/aboutapplet/widget.ui,v
+retrieving revision 1.7
+diff -u -u -r1.7 widget.ui
+--- aboutapplet/widget.ui	13 Nov 2005 14:40:31 -0000	1.7
++++ aboutapplet/widget.ui	22 Jan 2006 20:49:33 -0000
+@@ -42,7 +42,7 @@
+             </property>
+             <property stdset="1">
+                 <name>text</name>
+-                <string>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2&lt;/b&gt;&lt;/center&gt;</string>
++                <string>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.2.1&lt;/b&gt;&lt;/center&gt;</string>
+             </property>
+         </widget>
+         <widget row="1"  column="1" >
diff --git a/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb b/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb
index 95a085ab5e..41533f8d3b 100644
--- a/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb
+++ b/packages/opie-aboutapplet/opie-aboutapplet_1.2.1.bb
@@ -1,6 +1,7 @@
 include ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/aboutapplet \
+           file://opie-1.2.1.patch;patch=1 \
            file://add-hrw-to-authors.patch;patch=1"