components/network/proftpd/patches/017-Makefile_in.patch

   1 #
   2 # patch teaches Makefile.in to use FIPS_CPPFLAGS, FIPS_LDFLAGS,
   3 # so it can build FIPSed mod_tls.so too.
   4 #
   5 # The patch has not been offered to upstream yet. I'd like to check
   6 # other proftpd vendors first. Just to judge how much generic vs.
   7 # Solaris specific change below is.
   8 #
   9
  10 --- a/modules/Makefile.in
  11 +++ b/modules/Makefile.in
  12 @@ -10,6 +10,9 @@ SHARED_CFLAGS=-DPR_SHARED_MODULE
  13  SHARED_LDFLAGS=-avoid-version -export-dynamic -module
  14  VPATH=@srcdir@
  15
  16 +FIPS_CPPFLAGS=@FIPS_CPPFLAGS@
  17 +FIPS_LDFLAGS=@FIPS_LDFLAGS@
  18 +
  19  include ../Make.rules
  20
  21  .SUFFIXES: .la
  22 @@ -34,6 +37,13 @@ mod_dso.o: mod_dso.c
  23         $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) $(SHARED_CFLAGS) -c $*.c
  24         $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ -rpath $(LIBEXECDIR) $(LDFLAGS) $(SHARED_LDFLAGS) $*.lo `cat $(top_srcdir)/modules/$*.c | grep '$$Libraries:' | sed -e 's/^.*\$$Libraries: \(.*\)\\$$/\1/'`
  25
  26 +mod_tls-fips-140.o: mod_tls.c
  27 +       $(CC) $(CPPFLAGS) $(FIPS_CPPFLAGS) $(CFLAGS) -c $< -o $@
  28 +
  29 +mod_tls-fips-140.la: mod_tls.c
  30 +       $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(FIPS_CPPFLAGS) $(CFLAGS) $(SHARED_CFLAGS) -c $< -o mod_tls-fips-140.lo
  31 +       $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ -rpath $(LIBEXECDIR) $(FIPS_LDFLAGS) $(LDFLAGS) $(SHARED_LDFLAGS) mod_tls-fips-140.lo `cat $(top_srcdir)/modules/$< | grep '$$Libraries:' | sed -e 's/^.*\$$Libraries: \(.*\)\\$$/\1/'`
  32 +
  33  module_glue.c: module_glue.c.tmpl $(STATIC_MODULE_OBJS)
  34         srcdir=$(srcdir) $(srcdir)/glue.sh $(GLUE_MODULE_OBJS)
  35