merge of '9bbebb754095353f3763fe66f59709eb8f986b9e'

     and 'b1b91c6f4e23fff4113ebe6b978f427acafb1ddb'

19 files changed, 115 insertions, 311 deletions

diff --git a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch b/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
deleted file mode 100644
index 208c65108b..0000000000
--- a/packages/arpwatch/arpwatch-2.1a13/05debian_fhs.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: arpwatch/Makefile.in
-diff -u arpwatch/Makefile.in:1.1.1.1 arpwatch/Makefile.in:1.1.1.1.10.1
---- arpwatch/Makefile.in:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/Makefile.in	Tue Apr 17 13:53:29 2001
-@@ -31,7 +31,8 @@
- # Pathname of directory to install the man page
- MANDEST = @mandir@
- # Pathname of directory to install database file
--ARPDIR = $(prefix)/arpwatch
-+ARPDIR = /var/lib/arpwatch
-+ETHERCODES = /usr/share/arpwatch/ethercodes.dat
- 
- # VPATH
- srcdir = @srcdir@
-@@ -45,7 +46,8 @@
- PROG = arpwatch
- CCOPT = @V_CCOPT@
- INCLS = -I. @V_INCLS@
--DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\"
-+DEFS = -DDEBUG @DEFS@ -DARPDIR=\"$(ARPDIR)\" -DPATH_SENDMAIL=\"$(SENDMAIL)\" \
-+	-DETHERCODES=\"$(ETHERCODES)\"
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
-Index: arpwatch/arpsnmp.8
-diff -u arpwatch/arpsnmp.8:1.1.1.1 arpwatch/arpsnmp.8:1.1.1.1.10.1
---- arpwatch/arpsnmp.8:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpsnmp.8	Tue Apr 17 13:53:29 2001
-@@ -1,4 +1,4 @@
--.\" @(#) $Id: arpsnmp.8,v 1.5 2000/09/17 20:34:41 leres Exp $ (LBL)
-+.\" @(#) $Id: arpsnmp.8,v 1.5 2001/04/17 20:34:41 leres Exp $ (LBL)
- .\"
- .\" Copyright (c) 1996, 1997, 1999, 2000
- .\"	The Regents of the University of California.  All rights reserved.
-@@ -69,9 +69,9 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
--ethercodes.dat - vendor ethernet block list
-+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
- .ad
- .hy
- .fi
-Index: arpwatch/arpwatch.8
-diff -u arpwatch/arpwatch.8:1.1.1.1 arpwatch/arpwatch.8:1.1.1.1.10.1
---- arpwatch/arpwatch.8:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpwatch.8	Tue Apr 17 13:53:29 2001
-@@ -1,4 +1,4 @@
--.\" @(#) $Id: arpwatch.8,v 1.13 2000/10/08 20:31:25 leres Exp $ (LBL)
-+.\" @(#) $Id: arpwatch.8,v 1.13 2001/04/17 20:31:25 leres Exp $ (LBL)
- .\"
- .\" Copyright (c) 1992, 1994, 1996, 1997, 2000
- .\"	The Regents of the University of California.  All rights reserved.
-@@ -152,9 +152,9 @@
- .na
- .nh
- .nf
--/usr/operator/arpwatch - default directory
-+/var/lib/arpwatch - default directory
- arp.dat - ethernet/ip address database
--ethercodes.dat - vendor ethernet block list
-+/usr/share/arpwatch/ethercodes.dat - vendor ethernet block list
- .ad
- .hy
- .fi
-Index: arpwatch/arpwatch.h
-diff -u arpwatch/arpwatch.h:1.1.1.1 arpwatch/arpwatch.h:1.1.1.1.10.1
---- arpwatch/arpwatch.h:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/arpwatch.h	Tue Apr 17 13:53:29 2001
-@@ -1,7 +1,7 @@
- /* @(#) $Id: arpwatch.h,v 1.29 2000/09/30 23:40:49 leres Exp $ (LBL) */
- 
- #define ARPFILE "arp.dat"
--#define ETHERCODES "ethercodes.dat"
-+/* #define ETHERCODES "ethercodes.dat" */
- #define CHECKPOINT (15*60)		/* Checkpoint time in seconds */
- 
- #define MEMCMP(a, b, n) memcmp((char *)a, (char *)b, n)
-Index: arpwatch/bihourly
-diff -u arpwatch/bihourly:1.1.1.1 arpwatch/bihourly:1.1.1.1.10.1
---- arpwatch/bihourly:1.1.1.1	Tue Apr 17 13:31:36 2001
-+++ arpwatch/bihourly	Tue Apr 17 13:53:29 2001
-@@ -6,7 +6,7 @@
- PATH=$PATH:/usr/local/sbin
- export PATH
- #
--cd /usr/operator/arpwatch
-+cd /var/lib/arpwatch
- #
- list=`cat list`
- cname=`cat cname`
-@@ -14,7 +14,7 @@
- #
- alist=""
- for r in $list; do \
--	./arpfetch $r $cname > $r 2> $errs
-+	arpfetch $r $cname > $r 2> $errs
- 	if test -s $errs; then
- 		echo "arpfetch $r failed:"
- 		sed -e 's/^/    /' $errs
diff --git a/packages/arpwatch/arpwatch_2.1a13.bb b/packages/arpwatch/arpwatch_2.1a13.bb
deleted file mode 100644
index a653488fe0..0000000000
--- a/packages/arpwatch/arpwatch_2.1a13.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Ethernet/FDDI station activity monitor"
-LICENSE = "BSD"
-SECTION = "network"
-HOMEPAGE = "http://www-nrg.ee.lbl.gov/"
-DEPENDS = "fakeroot-native"
-RRECOMMENDS = "arpwatch-data"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/pool/a/arpwatch/arpwatch-${PV}.tar.gz \
-    file://05debian_fhs.patch;patch=1 \
-    file://06debian_manpages.patch;patch=1 \
-    file://init.d \
-    file://arpwatch.default \
-    file://arpwatch.conf \
-    file://ethercodes.dat \
-    file://make.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR}"
-
-fakeroot do_install() {
-    install -d ${D}${bindir} ${D}${sbindir} ${D}${mandir}/man8 \
-               ${D}${sysconfdir}/default \
-               ${D}${sysconfdir}/init.d \
-               ${D}${datadir}/arpwatch
-
-    oe_runmake install DESTDIR=${D}
-    oe_runmake install-man DESTDIR=${D}
-
-    install -m 0755 ${S}/arp2ethers         ${D}${sbindir}
-    install -m 0755 ${S}/arpfetch           ${D}${sbindir}
-    install -m 0755 ${S}/bihourly           ${D}${sbindir}
-    install -m 0755 ${S}/massagevendor      ${D}${sbindir}
-
-    install -m 0644 ${S}/arp2ethers.8      ${D}${mandir}/man8
-    install -m 0644 ${S}/arpfetch.8        ${D}${mandir}/man8
-    install -m 0644 ${S}/bihourly.8        ${D}${mandir}/man8
-    install -m 0644 ${S}/massagevendor.8   ${D}${mandir}/man8
-
-    install -m 0755 ${WORKDIR}/init.d      ${D}${sysconfdir}/init.d/arpwatch
-    install -m 0644 ${WORKDIR}/arpwatch.default   ${D}${sysconfdir}/default/arpwatch
-    install -m 0644 ${WORKDIR}/arpwatch.conf      ${D}${sysconfdir}
-
-    install -m 0644 ${WORKDIR}/ethercodes.dat     ${D}${datadir}/arpwatch
-}
-
-PACKAGES =+ "arpwatch-data"
-FILES_arpwatch-data = "${datadir}/arpwatch/ethercodes.dat"
diff --git a/packages/gbluezconf/.mtn2git_empty b/packages/gbluezconf/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gbluezconf/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb
deleted file mode 100644
index 1f6ecaf661..0000000000
--- a/packages/gbluezconf/gbluezconf_00.10.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "GTK panel applet to control bluetooth stuff"
-LICENSE = "GPLv2"
-
-DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+"
-SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz"
-
-inherit autotools pkgconfig
-
-
-
-
diff --git a/packages/intercom/intercom_0.15.bb b/packages/intercom/intercom_0.15.bb
index 0f8d530718..28764c6411 100644
--- a/packages/intercom/intercom_0.15.bb
+++ b/packages/intercom/intercom_0.15.bb
@@ -4,11 +4,12 @@
 
 DESCRIPTION="A flexible audio communication utility"
 SECTION = "console/telephony"
-
-SRC_URI="http://mirror.optusnet.com.au/sourceforge/i/in/intercom/intercom-${PV}.tar.gz"
 LICENSE="GPL"
+
 PR = "r1"
 
+SRC_URI="ftp://ftp.cm.nu/pub/people/shane/intercom/intercom-${PV}.tar.gz"
+
 inherit autotools
-EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}"
 
+EXTRA_OECONF="--disable-crypto --with-cpu=${TARGET_ARCH}"
diff --git a/packages/links/links-x11_2.1pre26.bb b/packages/links/links-x11_2.0+2.1pre26.bb
index ba9e531ca2..c026ca7e02 100644
--- a/packages/links/links-x11_2.1pre26.bb
+++ b/packages/links/links-x11_2.0+2.1pre26.bb
@@ -1,20 +1,10 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng flex openssl zlib virtual/libx11"
+require links.inc
+
+DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
 PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1 \
-	   file://links2.desktop \
-           http://www.xora.org.uk/oe/links2.png"
-S = "${WORKDIR}/links-${PV}"
-
-inherit autotools
+SRC_URI += " file://links2.desktop \
+             http://www.xora.org.uk/oe/links2.png"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/packages/links/links.inc b/packages/links/links.inc
new file mode 100644
index 0000000000..2d299d3b57
--- /dev/null
+++ b/packages/links/links.inc
@@ -0,0 +1,18 @@
+DESCRIPTION = "Links is graphics and text mode WWW \
+browser, similar to Lynx."
+HOMEPAGE = "http://links.twibright.com/"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "jpeg libpng flex openssl zlib"
+
+LPV = "${@bb.data.getVar("PV",d,1).split("+")[1]}"
+
+SRC_URI = "http://links.twibright.com/download/links-${LPV}.tar.bz2 \
+           file://ac-prog-cxx.patch;patch=1 \
+           file://cookies-save-0.96.patch;patch=1 \
+           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
+
+inherit autotools
+
+S = "${WORKDIR}/links-${LPV}"
+
diff --git a/packages/links/links_2.0+2.1pre26.bb b/packages/links/links_2.0+2.1pre26.bb
new file mode 100644
index 0000000000..6fcf8cef84
--- /dev/null
+++ b/packages/links/links_2.0+2.1pre26.bb
@@ -0,0 +1,11 @@
+require links.inc
+
+DEPENDS += "gpm"
+RCONFLICTS="links-x11"
+PR = "r0"
+
+EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
+	        --without-libtiff --without-svgalib --with-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --without-x --without-sdl"
diff --git a/packages/links/links_2.1pre26.bb b/packages/links/links_2.1pre26.bb
deleted file mode 100644
index d8519950c6..0000000000
--- a/packages/links/links_2.1pre26.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Links is graphics and text mode WWW \
-browser, similar to Lynx."
-HOMEPAGE = "http://links.twibright.com/"
-SECTION = "console/network"
-LICENSE = "GPL"
-DEPENDS = "jpeg libpng gpm flex openssl zlib"
-RCONFLICTS="links-x11"
-PR = "r0"
-SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \
-           file://ac-prog-cxx.patch;patch=1 \
-           file://cookies-save-0.96.patch;patch=1 \
-           file://links-2.1pre17-fix-segfault-on-loading-cookies.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
-	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
-	        --without-libtiff --without-svgalib --with-fb \
-	        --without-directfb --without-pmshell --without-atheos \
-	        --without-x --without-sdl"
diff --git a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty b/packages/portmap/portmap-5-24/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/arpwatch/arpwatch-2.1a13/.mtn2git_empty
+++ b/packages/portmap/portmap-5-24/.mtn2git_empty
diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch
new file mode 100644
index 0000000000..6dacd828c6
--- /dev/null
+++ b/packages/portmap/portmap-5-24/make.patch
@@ -0,0 +1,73 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+Index: portmap_5beta/Makefile
+===================================================================
+--- portmap_5beta.orig/Makefile	2006-12-19 10:32:58.000000000 +0000
++++ portmap_5beta/Makefile	2006-12-19 10:35:54.000000000 +0000
+@@ -110,6 +110,13 @@
+ #
+ #CONST   = -Dconst=
+ 
++DESTDIR =
++prefix = /usr
++sbindir = /sbin
++datadir = $(prefix)/share
++mandir = $(datadir)/man
++docdir = $(datadir)/doc/portmap
++
+ ### End of configurable stuff.
+ ##############################
+ 
+@@ -127,7 +134,7 @@
+ COPT	= $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \
+ 	$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(BROKEN_PIPE) \
+ 	$(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
+@@ -142,20 +149,23 @@
+ 	$(CC) $(CFLAGS) -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 -s portmap ${DESTDIR}/sbin
++	install -m 0755 -s pmap_dump ${DESTDIR}/sbin
++	install -m 0755 -s pmap_set ${DESTDIR}/sbin
++	install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8
++	install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8
++	install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8
++	cat BLURB >${DESTDIR}/usr/share/doc/portmap/portmapper.txt
++	gzip -9f ${DESTDIR}/usr/share/doc/portmap/portmapper.txt
+ 
+ 
+ lint:	
+@@ -181,3 +191,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/portmap-unslung_5-7.bb b/packages/portmap/portmap-unslung_5-7.bb
deleted file mode 100644
index ee6c648e9b..0000000000
--- a/packages/portmap/portmap-unslung_5-7.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "RPC program number mapper."
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r2"
-COMPATIBLE_MACHINE = "nslu2"
-
-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_5-7.bb b/packages/portmap/portmap.inc
index 0e6e2ab6a5..ad477828fb 100644
--- a/packages/portmap/portmap_5-7.bb
+++ b/packages/portmap/portmap.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
-PR = "r2"
 
 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 \
@@ -15,7 +14,7 @@ FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
 FILES_${PN}-doc += "${docdir}"
 
 INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . start 18 2 3 4 5 . stop 81 1 ."
+INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
 
 inherit update-rc.d
 
diff --git a/packages/portmap/portmap_5-24.bb b/packages/portmap/portmap_5-24.bb
new file mode 100644
index 0000000000..064679e7f0
--- /dev/null
+++ b/packages/portmap/portmap_5-24.bb
@@ -0,0 +1 @@
+require portmap.inc
diff --git a/packages/portmap/portmap_5-9.bb b/packages/portmap/portmap_5-9.bb
index 76d66e9ad9..348a3060e4 100644
--- a/packages/portmap/portmap_5-9.bb
+++ b/packages/portmap/portmap_5-9.bb
@@ -1,33 +1,3 @@
-DESCRIPTION = "RPC program number mapper."
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r5"
-
-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"
-
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
-INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
+require portmap.inc
 
-inherit update-rc.d
-
-sbindir = "/sbin"
-
-do_compile() {
-	oe_runmake
-}
-
-do_install() {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-	oe_runmake 'docdir=${docdir}/portmap' \
-		   'DESTDIR=${D}' install
-}
+PR = "r5"
diff --git a/packages/stunnel/stunnel-4.05/.mtn2git_empty b/packages/stunnel/stunnel-4.05/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/stunnel/stunnel-4.05/.mtn2git_empty
+++ /dev/null
diff --git a/packages/stunnel/stunnel-4.05/automake.patch b/packages/stunnel/stunnel-4.05/automake.patch
deleted file mode 100644
index a1baa151d5..0000000000
--- a/packages/stunnel/stunnel-4.05/automake.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN stunnel-4.05.orig/Makefile.am stunnel-4.05/Makefile.am
---- stunnel-4.05.orig/Makefile.am	2003-01-11 23:30:48.000000000 -0500
-+++ stunnel-4.05/Makefile.am	2004-03-21 20:57:58.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = src doc tools
-+SUBDIRS = src doc
- 
- # extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe
- # extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl
diff --git a/packages/stunnel/stunnel-4.05/configure.patch b/packages/stunnel/stunnel-4.05/configure.patch
deleted file mode 100644
index 5764796aaa..0000000000
--- a/packages/stunnel/stunnel-4.05/configure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: stunnel-4.05/configure.ac
-===================================================================
---- stunnel-4.05.orig/configure.ac	2003-12-28 15:47:49.000000000 -0500
-+++ stunnel-4.05/configure.ac	2005-04-01 22:14:39.751121880 -0500
-@@ -176,8 +176,30 @@
- [AC_MSG_RESULT([no])]; LIBS="$saved_LIBS")
- 
- dnl Check PTY device files.
--AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
--AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
-+AC_ARG_WITH(ptmx,
-+    [  --with-ptmx      /dev/ptmx exists (default: check for existance)],
-+    [
-+        if test x"$withval" = "xyes"; then
-+           AC_DEFINE(HAVE_DEV_PTMX)
-+        fi
-+    ],
-+    [
-+        # Check for ptmx device
-+        AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
-+    ]
-+)
-+AC_ARG_WITH(ptc,
-+    [  --with-ptc      /dev/ptc exists (default: check for existance)],
-+    [
-+        if test x"$withval" = "xyes"; then
-+           AC_DEFINE(HAVE_DEV_PTS_AND_PTC)
-+        fi
-+    ],
-+    [
-+        # Check for ptc device
-+        AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
-+    ]
-+)
- 
- dnl Checks for header files.
- # AC_HEADER_DIRENT
diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb
deleted file mode 100644
index 5f61b1c125..0000000000
--- a/packages/stunnel/stunnel_4.05.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require stunnel.inc
-
-PR = "r1"
-SRC_URI = "ftp://stunnel.mirt.net/stunnel/OBSOLETE/stunnel-${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://automake.patch;patch=1 \
-	   file://init \
-	   file://stunnel.conf"