diff mbox

[9/9] vsftpd: Upgrade to vsftpd 3.0.2

Message ID b3c6558551465ec5a19b6b7cb56962fd60a23a80.1349790798.git.chor@prevas.dk
State Accepted, archived
Delegated to: Esben Haabendal
Headers show

Commit Message

Christian Rasmussen Oct. 9, 2012, 2:40 p.m. UTC 
---
 recipes/vsftpd/vsftpd-2.3.4/nopam.patch            |   12 ------------
 recipes/vsftpd/vsftpd.inc                          |    6 +++---
 recipes/vsftpd/vsftpd_2.3.4.oe.sig                 |    1 -
 .../vsftpd/{vsftpd_2.3.4.oe => vsftpd_3.0.2.oe}    |    2 --
 recipes/vsftpd/vsftpd_3.0.2.oe.sig                 |    1 +
 5 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 recipes/vsftpd/vsftpd-2.3.4/nopam.patch
 delete mode 100644 recipes/vsftpd/vsftpd_2.3.4.oe.sig
 rename recipes/vsftpd/{vsftpd_2.3.4.oe => vsftpd_3.0.2.oe} (54%)
 create mode 100644 recipes/vsftpd/vsftpd_3.0.2.oe.sig
diff mbox

Patch

diff --git a/recipes/vsftpd/vsftpd-2.3.4/nopam.patch b/recipes/vsftpd/vsftpd-2.3.4/nopam.patch
deleted file mode 100644
index 8e0559c..0000000
--- a/recipes/vsftpd/vsftpd-2.3.4/nopam.patch
+++ /dev/null
@@ -1,12 +0,0 @@ 
-diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h
---- vsftpd-2.0.1_org/builddefs.h	2004-07-02 16:36:59.000000000 +0200
-+++ vsftpd-2.0.1_patch/builddefs.h	2004-07-21 09:34:49.044900488 +0200
-@@ -2,7 +2,7 @@
- #define VSF_BUILDDEFS_H
- 
- #undef VSF_BUILD_TCPWRAPPERS
--#define VSF_BUILD_PAM
-+#undef VSF_BUILD_PAM
- #undef VSF_BUILD_SSL
- 
- #endif /* VSF_BUILDDEFS_H */
diff --git a/recipes/vsftpd/vsftpd.inc b/recipes/vsftpd/vsftpd.inc
index 775fb44..f9c6e92 100644
--- a/recipes/vsftpd/vsftpd.inc
+++ b/recipes/vsftpd/vsftpd.inc
@@ -30,9 +30,9 @@  do_configure() {
     # Configure CFLAGS and hardcode LIBS
     mv Makefile.new Makefile
     cat Makefile \
-        | sed -e 's:^\(CC.*=\).*:\1 ${CC}:g' \
-        | sed -e 's:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g' \
-        | sed -e 's:^\(LIBS.*=\).*:\1 -lnsl -lresolv -lcrypt:g' \
+        | sed -e 's:^\(CC\s*=\).*:\1 ${CC}:g' \
+        | sed -e 's:^\(CFLAGS\s*=\)\(.*\):\1 ${CFLAGS} \2:g' \
+        | sed -e 's:^\(LIBS\s*=\).*:\1 -lnsl -lresolv -lcrypt:g' \
         > Makefile.new
     mv Makefile.new Makefile
 }
diff --git a/recipes/vsftpd/vsftpd_2.3.4.oe.sig b/recipes/vsftpd/vsftpd_2.3.4.oe.sig
deleted file mode 100644
index dd39255..0000000
--- a/recipes/vsftpd/vsftpd_2.3.4.oe.sig
+++ /dev/null
@@ -1 +0,0 @@ 
-b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea  vsftpd-2.3.4.tar.gz
diff --git a/recipes/vsftpd/vsftpd_2.3.4.oe b/recipes/vsftpd/vsftpd_3.0.2.oe
similarity index 54%
rename from recipes/vsftpd/vsftpd_2.3.4.oe
rename to recipes/vsftpd/vsftpd_3.0.2.oe
index 7edfe44..9393fd2 100644
--- a/recipes/vsftpd/vsftpd_2.3.4.oe
+++ b/recipes/vsftpd/vsftpd_3.0.2.oe
@@ -1,5 +1,3 @@ 
 LICENSE = "GPL-2.0"
 
 require ${PN}.inc
-
-SRC_URI += "file://nopam.patch"
diff --git a/recipes/vsftpd/vsftpd_3.0.2.oe.sig b/recipes/vsftpd/vsftpd_3.0.2.oe.sig
new file mode 100644
index 0000000..ba8dfe6
--- /dev/null
+++ b/recipes/vsftpd/vsftpd_3.0.2.oe.sig
@@ -0,0 +1 @@ 
+f36976bb1c5df25ac236d8a29e965ba2b825ccd0  vsftpd-3.0.2.tar.gz