From: Adam Osuchowski <adwol@pld-linux.org>
Date: Fri, 11 Apr 2014 10:23:48 +0000 (+0200)
Subject: - switch egrep in vsf_findlibs.sh into text mode
X-Git-Tag: auto/th/vsftpd-3.0.2-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvsftpd.git;a=commitdiff_plain;h=4100b22

- switch egrep in vsf_findlibs.sh into text mode
  (problems with matching in binary file *.o)
---

diff --git a/vsftpd-findlibs-egrep.patch b/vsftpd-findlibs-egrep.patch
new file mode 100644
index 0000000..6167406
--- /dev/null
+++ b/vsftpd-findlibs-egrep.patch
@@ -0,0 +1,11 @@
+--- vsftpd-3.0.2/vsf_findlibs.sh.orig	2014-04-11 12:18:03.231578533 +0200
++++ vsftpd-3.0.2/vsf_findlibs.sh	2014-04-11 12:19:03.988273239 +0200
+@@ -2,7 +2,7 @@
+ # Cheesy hacky location of additional link libraries.
+ 
+ locate_library() { [ ! "$1*" = "`echo $1*`" ]; }
+-find_func() { egrep $1 $2 >/dev/null; }
++find_func() { egrep -qa $1 $2; }
+ 
+ if find_func hosts_access tcpwrap.o; then
+   echo "-lwrap";
diff --git a/vsftpd.spec b/vsftpd.spec
index e5c9a75..76dc55e 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -10,7 +10,7 @@ Summary(pl.UTF-8):	Bardzo Bezpieczny Demon FTP
 Summary(pt_BR.UTF-8):	vsftpd - Daemon FTP Muito Seguro
 Name:		vsftpd
 Version:	3.0.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	https://security.appspot.com/downloads/%{name}-%{version}.tar.gz
@@ -25,6 +25,7 @@ Patch0:		%{name}-builddefs.patch
 Patch1:		%{name}-amd64-findlibs.patch
 Patch2:		%{name}-clamav.patch
 Patch3:		%{name}-switch_sha256_to_sha1.patch
+Patch4:		%{name}-findlibs-egrep.patch
 URL:		https://security.appspot.com/vsftpd.html
 BuildRequires:	libcap-devel
 BuildRequires:	libwrap-devel
@@ -98,6 +99,7 @@ Ten pakiet pozwala na wystartowanie vsftpd jako samodzielnego demona.
 %if "%{pld_release}" == "ac"
 %patch3 -p1
 %endif
+%patch4 -p1
 
 %build
 %{__make} \