SPF and DANE went mainline

diff --git a/build-farm.conf.template b/build-farm.conf.template
index eb856176dc96c4982e33651fd59523ae7880b6b5..ec2810a97e560e4fc2a9d23dbac99a20de5e9be3 100644 (file)
--- a/build-farm.conf.template
+++ b/build-farm.conf.template
@@ -161,8 +161,8 @@ our %conf =(
         #LOOKUP_PGSQL => 'yes',
         #SUPPORT_PROXY => 'yes',
         #SUPPORT_SOCKS => 'yes',
         #LOOKUP_PGSQL => 'yes',
         #SUPPORT_PROXY => 'yes',
         #SUPPORT_SOCKS => 'yes',

-        #EXPERIMENTAL_SPF => 'yes',
-        #EXPERIMENTAL_DANE => 'yes',
+        #SUPPORT_SPF => 'yes',
+        #SUPPORT_DANE => 'yes',

     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:
     },
     # Settings to add to Local/Makefile. These will add to variables that
     # are already defined earlier in the Makefile.  Example:


@@ -173,7 +173,7 @@ our %conf =(
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',
         # Or enable debugging flags
         #CFLAGS => '-g -Wall',
         #LFLAGS => '-g',

-        # If set EXPERIMENTAL_SPF above, add it to the linker:
+        # If set SUPPORT_SPF above, add it to the linker:

         #LDFLAGS => '-lspf2',
     },
 
         #LDFLAGS => '-lspf2',
     },