b60e1801b9
Partial revert of 1e62c645b2
Some patches and string replacements were mistakenly modified as part of
the mass substitution of "macOS" for "OS X" and "Mac OS X" references.
Closes #6088.
Signed-off-by: ilovezfs <ilovezfs@icloud.com>
95 lines
2.9 KiB
Ruby
95 lines
2.9 KiB
Ruby
class Vsftpd < Formula
|
|
desc "Secure FTP server for UNIX"
|
|
homepage "https://security.appspot.com/vsftpd.html"
|
|
url "https://security.appspot.com/downloads/vsftpd-3.0.3.tar.gz"
|
|
mirror "https://fossies.org/linux/misc/vsftpd-3.0.3.tar.gz"
|
|
sha256 "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7"
|
|
|
|
bottle do
|
|
cellar :any_skip_relocation
|
|
rebuild 1
|
|
sha256 "7d98e1f2c4526539ec13519876f6c726e66b8093f3d1290325bb1c0762e70959" => :sierra
|
|
sha256 "3227e7afcd2af84901a16d675bd1a7566002c4eacffa2313d89fbc3b7e594f76" => :el_capitan
|
|
sha256 "aba9772d903374b3d3de5ce8c96a5f02badbc7676735c5ee42571ad0170dbb7f" => :yosemite
|
|
sha256 "3bd82ae896d375342b6444f3c6be2eb5987df5da5084ee3c5f8dc073e001a5c2" => :mavericks
|
|
end
|
|
|
|
depends_on "openssl" => :optional
|
|
|
|
# Patch to remove UTMPX dependency, locate macOS's PAM library, and
|
|
# remove incompatible LDFLAGS. (reported to developer via email)
|
|
patch :DATA
|
|
|
|
def install
|
|
if build.with? "openssl"
|
|
inreplace "builddefs.h", "#undef VSF_BUILD_SSL", "#define VSF_BUILD_SSL"
|
|
end
|
|
|
|
inreplace "defs.h", "/etc/vsftpd.conf", "#{etc}/vsftpd.conf"
|
|
inreplace "tunables.c", "/etc", etc
|
|
inreplace "tunables.c", "/var", var
|
|
system "make"
|
|
|
|
# make install has all the paths hardcoded; this is easier:
|
|
sbin.install "vsftpd"
|
|
etc.install "vsftpd.conf"
|
|
man5.install "vsftpd.conf.5"
|
|
man8.install "vsftpd.8"
|
|
end
|
|
|
|
def caveats
|
|
s = ""
|
|
|
|
if build.with? "openssl"
|
|
s += <<-EOS.undent
|
|
vsftpd was compiled with SSL support. To use it you must generate a SSL
|
|
certificate and set 'enable_ssl=YES' in your config file.
|
|
EOS
|
|
end
|
|
|
|
s
|
|
end
|
|
end
|
|
|
|
__END__
|
|
diff --git a/sysdeputil.c b/sysdeputil.c
|
|
index 9dc8a5e..66dbe30 100644
|
|
--- a/sysdeputil.c
|
|
+++ b/sysdeputil.c
|
|
@@ -64,6 +64,10 @@
|
|
#include <utmpx.h>
|
|
|
|
/* BEGIN config */
|
|
+#if defined(__APPLE__)
|
|
+ #undef VSF_SYSDEP_HAVE_UTMPX
|
|
+#endif
|
|
+
|
|
#if defined(__linux__)
|
|
#include <errno.h>
|
|
#include <syscall.h>
|
|
diff --git a/vsf_findlibs.sh b/vsf_findlibs.sh
|
|
index b988be6..68d4a34 100755
|
|
--- a/vsf_findlibs.sh
|
|
+++ b/vsf_findlibs.sh
|
|
@@ -20,6 +20,8 @@ if find_func pam_start sysdeputil.o; then
|
|
locate_library /usr/lib/libpam.sl && echo "-lpam";
|
|
# AIX ends shared libraries with .a
|
|
locate_library /usr/lib/libpam.a && echo "-lpam";
|
|
+ # Mac OS X / Darwin shared libraries with .dylib
|
|
+ locate_library /usr/lib/libpam.dylib && echo "-lpam";
|
|
else
|
|
locate_library /lib/libcrypt.so && echo "-lcrypt";
|
|
locate_library /usr/lib/libcrypt.so && echo "-lcrypt";
|
|
diff --git a/Makefile b/Makefile
|
|
index c63ed1b..556519e 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -10,7 +10,7 @@ CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
|
|
|
|
LIBS = `./vsf_findlibs.sh`
|
|
LINK = -Wl,-s
|
|
-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
|
|
+LDFLAGS = -fPIE -pie
|
|
|
|
OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
|
|
tunables.o ftpdataio.o secbuf.o ls.o \
|