diff options
| author |   Tudor Florea <tudor.florea@enea.com> | 2015-08-04 04:31:48 +0200 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-08-19 15:38:25 -0400 |
| commit | 382f955d7c9a9f4e0c66a0f6dbe41ad8af0fb41d (patch) | |
| tree | d3275953312a1d17e94cba35c9abdf58d9e61c90 /meta-networking/recipes-daemons/pure-ftpd/pure-ftpd | |
| parent | 2f8f79895a31a612e365e90b56e51e065177632d (diff) | |
| download | meta-openembedded-contrib-382f955d7c9a9f4e0c66a0f6dbe41ad8af0fb41d.tar.gz | |
pure-ftpd: upgrade to 1.0.42
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-daemons/pure-ftpd/pure-ftpd')
2 files changed, 22 insertions, 20 deletions
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch index 54088b0447..76523fb997 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch @@ -1,20 +1,21 @@ -From cffca7cb7c055f82ced316ddee90bb701b85b92d Mon Sep 17 00:00:00 2001 -From: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> -Date: Tue, 10 Jan 2012 19:15:25 +0300 +From 1bafadf2502334a3e972ff667061469316d0d2ca Mon Sep 17 00:00:00 2001 +From: Tudor Florea <tudor.florea@enea.com> +Date: Tue, 4 Aug 2015 02:46:39 +0200 Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac Upstream-Status: Inappropriate [config] Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com> +Signed-off-by: Tudor Florea <tudor.florea@enea.com> --- - configure.ac | 12 ------------ - 1 files changed, 0 insertions(+), 12 deletions(-) + configure.ac | 12 ------------ + 1 file changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac -index ae00c08..9ba6d8d 100644 +index 6c78e8c..851d45d 100644 --- a/configure.ac +++ b/configure.ac -@@ -67,18 +67,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) +@@ -100,18 +100,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter) python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin" AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path) @@ -30,9 +31,9 @@ index ae00c08..9ba6d8d 100644 - LDFLAGS="$LDFLAGS -L/usr/local/lib" -fi - - if uname | fgrep SunOS > /dev/null 2> /dev/null ; then - CPPFLAGS="$CPPFLAGS -D_XPG4_2=1" - fi + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + + dnl Checks for header files -- -1.7.7.3 +1.9.1 diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch index 5cbbc5fa7b..4cb33bc5c8 100644 --- a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch +++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch @@ -1,6 +1,6 @@ -From 45eb89d1a6fde65caaf2d6e1a5d527f1ae7beb9c Mon Sep 17 00:00:00 2001 -From: Paul Eggleton <paul.eggleton@linux.intel.com> -Date: Mon, 3 Dec 2012 17:12:11 +0000 +From 0290bd6f4ceddff2c52dff833c9d31d24de7d0e1 Mon Sep 17 00:00:00 2001 +From: Tudor Florea <tudor.florea@enea.com> +Date: Tue, 4 Aug 2015 03:07:01 +0200 Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified We especially don't want stripping enabled. @@ -8,23 +8,24 @@ We especially don't want stripping enabled. Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> +Signed-off-by: Tudor Florea <tudor.florea@enea.com> --- - configure.ac | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + configure.ac | 2 -- + 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 3d59409..6836c0e 100644 +index 851d45d..dc410a1 100644 --- a/configure.ac +++ b/configure.ac -@@ -413,8 +413,6 @@ AC_ARG_WITH(minimal, +@@ -423,8 +423,6 @@ AC_ARG_WITH(minimal, AC_DEFINE(NO_FTP_USERS) AC_DEFINE(WITHOUT_ASCII) AC_DEFINE(BORING_MODE) -- CFLAGS="$CFLAGS -Os -fomit-frame-pointer -fgcse -falign-functions=2 -falign-jumps=2 -fno-unroll-loops " +- CFLAGS="$CFLAGS -Os -fomit-frame-pointer -fno-unroll-loops " - LDFLAGS="$LDFLAGS -s " fi ]) AC_ARG_WITH(paranoidmsg, -- -1.7.1 +1.9.1 |