echo 'Creating brew-patch.diff' cat << EOF >> brew-patch.diff diff --git a/sysdeputil.c b/sysdeputil.c index 9dc8a5e..66dbe30 100644 --- a/sysdeputil.c +++ b/sysdeputil.c @@ -64,6 +64,10 @@ #include /* BEGIN config */ +#if defined(__APPLE__) + #undef VSF_SYSDEP_HAVE_UTMPX +#endif + #if defined(__linux__) #include #include 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 \ EOF