From 980269b4e3b93236ddf64da3814c357bdf7d1305 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Tue, 16 Mar 2010 18:09:04 +0800
Subject: proftpd: Upgrade to the latest version.

---
 conf/checksums.ini                |  8 --------
 recipes/proftpd/proftpd_1.3.2b.bb | 36 ------------------------------------
 recipes/proftpd/proftpd_1.3.2e.bb | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 44 deletions(-)
 delete mode 100644 recipes/proftpd/proftpd_1.3.2b.bb
 create mode 100644 recipes/proftpd/proftpd_1.3.2e.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d3dc6cd56a..3fe8493e13 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -22554,14 +22554,6 @@ sha256=6d52c706401af197bd9d7e0187c35b4a3463ea720392ffa0c020d94899b361e5
 md5=f490bca772b16472962c7b9f23b1e97d
 sha256=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc
 
-[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2.tar.gz]
-md5=756f762883cc8eed03d99dc3b1c56a8e
-sha256=5e00c20d74bbf98fb8bcc63bd4aecfd08480a87ec731dae8955bd9fca6a01bb3
-
-[ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/proftpd-1.3.2b.tar.gz]
-md5=4918908fcae9e591ba84c66edff73410
-sha256=fffee421390fe2647eeb0515a8c20759fda75e3df2014fc0a47e8a314e5ea88b
-
 [http://downloads.sourceforge.net/progear/progear-ac-0.1.tar.gz]
 md5=60a89c2c907fb5ff2293ce3dfbcdace6
 sha256=4124e24726369b42ed0a7aff33e5c572de5e4a0f46edd4e1e81125412c4bdf24
diff --git a/recipes/proftpd/proftpd_1.3.2b.bb b/recipes/proftpd/proftpd_1.3.2b.bb
deleted file mode 100644
index a50cc08b08..0000000000
--- a/recipes/proftpd/proftpd_1.3.2b.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Secure ftp daemon"
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \
-	file://make.patch;patch=1 \
-	"
-
-
-EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes"
-LDFLAGS += "-Llib"
-PARALLEL_MAKE = ""
-
-do_configure () {
-	 ./configure \
-		   --disable-auth-pam \
-                   --build=${BUILD_SYS} \
-                   --host=${HOST_SYS} \
-                   --target=${TARGET_SYS} \
-                   --prefix=/usr \
-		   --sysconfdir=/etc \
-		   --sharedstatedir=/com \
-		   --localstatedir=/var \
-                   ${EXTRA_OECONF} \
-                   $@;
-}
-
-do_install () {
-	oe_runmake DESTDIR=${D} install
-}
-
-pkg_postinst () {
-	# more chown's might be needed
-        chown root:root /usr/sbin/proftpd
-}
diff --git a/recipes/proftpd/proftpd_1.3.2e.bb b/recipes/proftpd/proftpd_1.3.2e.bb
new file mode 100644
index 0000000000..b6cec1b707
--- /dev/null
+++ b/recipes/proftpd/proftpd_1.3.2e.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz;name=src \
+	file://make.patch;patch=1 \
+	"
+SRC_URI[src.md5sum] = "4ecb82cb1050c0e897d5343f6d2cc1ed"
+SRC_URI[src.sha256sum] = "7c7f295944e8e7c85060829deeaed74f3f0b36c8f1d3936277d59bbea5d60093"
+
+
+
+EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes"
+LDFLAGS += "-Llib"
+PARALLEL_MAKE = ""
+
+do_configure () {
+	 ./configure \
+		   --disable-auth-pam \
+                   --build=${BUILD_SYS} \
+                   --host=${HOST_SYS} \
+                   --target=${TARGET_SYS} \
+                   --prefix=/usr \
+		   --sysconfdir=/etc \
+		   --sharedstatedir=/com \
+		   --localstatedir=/var \
+                   ${EXTRA_OECONF} \
+                   $@;
+}
+
+do_install () {
+	oe_runmake DESTDIR=${D} install
+}
+
+pkg_postinst () {
+	# more chown's might be needed
+        chown root:root /usr/sbin/proftpd
+}
-- 
cgit v1.2.3