Merge pull request trusteddomainproject#372 from thegushi/feature/verbose-version

opendmarc -V: show configure args, git hash, and clarify SPF backend

Author: thegushi

configure.ac

@@ -66,6 +66,23 @@ AC_CHECK_TYPES([ns_type], [], [], [[
 #include <resolv.h>
 ]])
 
+#
+# Version string: use git describe on dev builds for a hash suffix
+#
+AC_CHECK_PROG([GIT], [git], [git])
+AC_MSG_CHECKING([build version string])
+DMARCF_VERSION=$PACKAGE_VERSION
+if test -n "$GIT" && $GIT describe --tags --dirty >/dev/null 2>&1; then
+    _git_ver=$($GIT describe --tags --dirty)
+    _git_ver=${_git_ver#v}
+    if test "$_git_ver" != "$PACKAGE_VERSION"; then
+        DMARCF_VERSION=$_git_ver
+    fi
+fi
+AC_MSG_RESULT([$DMARCF_VERSION])
+AC_DEFINE_UNQUOTED([DMARCF_VERSION], ["$DMARCF_VERSION"],
+                   [Version string, including git hash on development builds])
+
 #
 # Hexadecimal version, for use in generating dmarc.h
 #
@@ -567,5 +584,7 @@ AC_CONFIG_FILES([ Makefile
 		reports/opendmarc-reports
 		reports/opendmarc-reports.8
 	])
+AC_DEFINE_UNQUOTED([CONFIGURE_ARGS], ["$ac_configure_args"],
+                   [Arguments passed to configure])
 AC_OUTPUT()
 # @end1

opendmarc/opendmarc.c

@@ -3482,7 +3482,7 @@ mlfi_eom(SMFICTX *ctx)
 
 			dmarcf_dstring_printf(dfc->mctx_afrf,
 			                      "User-Agent: %s/%s\n",
-			                      DMARCF_PRODUCTNS, VERSION);
+			                      DMARCF_PRODUCTNS, DMARCF_VERSION);
 
 			dmarcf_dstring_cat(dfc->mctx_afrf,
 			                   "Auth-Failure: dmarc\n");
@@ -3778,7 +3778,7 @@ mlfi_eom(SMFICTX *ctx)
 	if (conf->conf_addswhdr)
 	{
 		snprintf(header, sizeof header, "%s v%s %s %s",
-		         DMARCF_PRODUCT, VERSION, hostname,
+		         DMARCF_PRODUCT, DMARCF_VERSION, hostname,
 		         dfc->mctx_jobid != NULL ? dfc->mctx_jobid
 		                                 : JOBIDUNKNOWN);
 
@@ -4291,13 +4291,14 @@ main(int argc, char **argv)
 
 		  case 'V':
 			printf("%s: %s v%s\n", progname, DMARCF_PRODUCT,
-			       VERSION);
+			       DMARCF_VERSION);
 			printf("\tSMFI_VERSION 0x%x\n", SMFI_VERSION);
 #ifdef HAVE_SMFI_VERSION
 			(void) smfi_version(&mvmajor, &mvminor, &mvrelease);
 			printf("\tlibmilter version %d.%d.%d\n",
 			       mvmajor, mvminor, mvrelease);
 #endif /* HAVE_SMFI_VERSION */
+			printf("\tConfigured with: %s\n", CONFIGURE_ARGS);
 			dmarcf_optlist(stdout);
 			return EX_OK;
 
@@ -5196,7 +5197,7 @@ main(int argc, char **argv)
 		}
 
 		syslog(LOG_INFO, "%s v%s starting%s%s%s", DMARCF_PRODUCT,
-		       VERSION,
+		       DMARCF_VERSION,
 		       strlen(argstr) == 0 ? "" : " (",
 		       argstr,
 		       strlen(argstr) == 0 ? "" : ")");
@@ -5256,7 +5257,7 @@ main(int argc, char **argv)
 	{
 		syslog(LOG_INFO,
 		       "%s v%s terminating with status %d, errno = %d",
-		       DMARCF_PRODUCT, VERSION, status, errno);
+		       DMARCF_PRODUCT, DMARCF_VERSION, status, errno);
 	}
 
 	/* release memory */

opendmarc/util.c

@@ -69,13 +69,13 @@ static char *optlist[] =
 #endif /* POLL */
 
 #if WITH_SPF
-	"WITH_SPF",
+# if HAVE_SPF2_H
+	"WITH_SPF (libspf2)",
+# else /* HAVE_SPF2_H */
+	"WITH_SPF (internal)",
+# endif /* HAVE_SPF2_H */
 #endif /* WITH_SPF */
 
-#if HAVE_SPF2_H
-	"WITH_SPF2",
-#endif /* HAVE_SPF2_H */
-
 	NULL
 };