diff --git a/vsftpd-2.2.2-dso.patch b/vsftpd-2.2.2-dso.patch new file mode 100644 index 0000000..72db8d1 --- /dev/null +++ b/vsftpd-2.2.2-dso.patch @@ -0,0 +1,12 @@ +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 \ diff --git a/vsftpd.spec b/vsftpd.spec index 1f0ffab..e99bec3 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -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.patch 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 - 2.2.2-3 +- fixes #565067 - FTBFS: ImplicitDSOLinking + * Thu Dec 17 2009 Jiri Skala - 2.2.2-2 - corrected two patches due to fuzz 0