rpms/vsftpd/devel vsftpd-2.2.2-dso.patch, NONE, 1.1 vsftpd.spec, 1.104, 1.105

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19192

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.2.2-dso.patch 
Log Message:
* Mon Feb 15 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-3
- fixes #565067 - FTBFS: ImplicitDSOLinking


vsftpd-2.2.2-dso.patch:
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vsftpd-2.2.2-dso.patch ---
diff -up vsftpd-2.2.2/Makefile.dso vsftpd-2.2.2/Makefile
--- vsftpd-2.2.2/Makefile.dso	2010-02-15 14:22:36.107319983 +0100
+++ vsftpd-2.2.2/Makefile	2010-02-15 14:37:45.760066748 +0100
@@ -5,7 +5,7 @@ IFLAGS  = -idirafter dummyinc
 #CFLAGS = -g
 CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
 
-LIBS	=	-lwrap -lnsl -lpam -lcap -ldl
+LIBS	=	-lwrap -lnsl -lpam -lcap -ldl -lcrypto
 LINK	=	-Wl,-s
 
 OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- vsftpd.spec	17 Dec 2009 13:14:17 -0000	1.104
+++ vsftpd.spec	15 Feb 2010 13:46:19 -0000	1.105
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -51,6 +51,8 @@ Patch12: vsftpd-2.1.1-daemonize_plus.pat
 Patch13: vsftpd-2.2.0-openssl.patch
 Patch14: vsftpd-2.2.0-wildchar.patch
 
+Patch15: vsftpd-2.2.2-dso.patch
+
 %description
 vsftpd is a Very Secure FTP daemon. It was written completely from
 scratch.
@@ -75,6 +77,7 @@ cp %{SOURCE1} .
 %patch12 -p1 -b .daemonize_plus
 %patch13 -p1 -b .openssl
 %patch14 -p1 -b .wildchar
+%patch15 -p1 -b .dso
 
 %build
 %ifarch s390x sparcv9 sparc64
@@ -139,6 +142,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-3
+- fixes #565067 - FTBFS: ImplicitDSOLinking
+
 * Thu Dec 17 2009 Jiri Skala <jskala at redhat.com> - 2.2.2-2
 - corrected two patches due to fuzz 0