--- a/components/proftpd/Makefile Tue May 10 18:16:07 2016 -0700
+++ b/components/proftpd/Makefile Mon May 09 01:27:27 2016 -0700
@@ -20,48 +20,53 @@
#
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= proftpd
COMPONENT_VERSION= 1.3.5
-COMPONENT_SUBVERSION=
+COMPONENT_SUBVERSION= b
+TPNO_PROFTPD= 27604
HUMAN_VERSION= $(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
COMPONENT_PROJECT_URL= http://www.proftpd.org/
COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
- sha256:c10316fb003bd25eccbc08c77dd9057e053693e6527ffa2ea2cc4e08ccb87715
+ sha256:afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8
COMPONENT_ARCHIVE_URL= ftp://ftp.proftpd.org/distrib/source/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= service/ftp-server
# mod_gss subcomponent
COMPONENT_NAME_1= mod_gss
COMPONENT_VERSION_1= 1.3.6
+TPNO_MOD_GSS= 13480
COMPONENT_SRC_1= $(COMPONENT_NAME_1)-$(COMPONENT_VERSION_1)
COMPONENT_ARCHIVE_1= $(COMPONENT_SRC_1).tar.gz
COMPONENT_ARCHIVE_HASH_1= \
sha256:bd1cb3f8ba0668981beb54d8b4de10ab204199327a464debd9da19196bbb23c4
COMPONENT_ARCHIVE_URL_1= http://downloads.sourceforge.net/gssmod/$(COMPONENT_ARCHIVE_1)
-TPNO_PROFTPD= 17783
-TPNO_MOD_GSS= 13480
-
include $(WS_MAKE_RULES)/prep.mk
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
+PKG_MACROS += COMPONENT_VERSION_1=$(COMPONENT_VERSION_1)
+
# IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not
# enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
-# Because the IPS_COMPONENT_VERSION cannot contain letters we used '.0.5'
-# instead of 'e'.
-IPS_COMPONENT_VERSION= $(COMPONENT_VERSION)
+# Because the IPS_COMPONENT_VERSION cannot contain letters
+# ...we will use '.2' instead of 'b'.
+IPS_COMPONENT_VERSION= $(COMPONENT_VERSION).2
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) -I/usr/include/kerberosv5 -DHAVE_KRB5_H=1 -DKRB5_DLLIMP= -DHAVE__GETGRPSBYMEMBER -D_SOLARIS_DTRACE"
# Force immediate binding because of chroot().
-CONFIGURE_OPTIONS += LDFLAGS="-z guidance=nolazyload -z nolazyload -lbsm"
+LDFLAGS += -z guidance=nolazyload -z nolazyload -lbsm -z guidance=lazyload -z lazyload
+CFLAGS += -I/usr/include/kerberosv5 -DHAVE_KRB5_H=1 -DKRB5_DLLIMP=
+CFLAGS += -DHAVE__GETGRPSBYMEMBER -D_SOLARIS_DTRACE
+
+CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
CONFIGURE_OPTIONS += install_user=`id -nu`
CONFIGURE_OPTIONS += install_group=`groups | cut -f 1 -d ' '`
CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR)
@@ -107,15 +112,14 @@
install: $(INSTALL_32)
+# libcheck and specific Perl Test::Unit version is required for full test
test: $(NO_TESTS)
-# libcheck and specific Perl Test::Unit version is required for full test
-
REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
REQUIRED_PACKAGES += service/security/kerberos-5
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/core-os
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/security/gss
-REQUIRED_PACKAGES += system/linker
REQUIRED_PACKAGES += system/network