From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 17 Nov 2022 16:24:54 +0000 (-0600)
Subject: Simplify release parsing, add +git into git package versions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7ddc30fcbe36363abd723d718aea97f419542cb;p=thirdparty%2Ffreeradius-server.git

Simplify release parsing, add +git into git package versions
---

diff --git a/Makefile b/Makefile
index abf4bf465fd..9306d5398a3 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ ifeq "$(RADIUS_VERSION_STRING)" ""
 endif
 
 ifeq "$(RADIUS_VERSION_RELEASE)" ""
-  RADIUSD_VERSION_RELEASE := $(shell git status > /dev/null 2>&1 && git describe | sed -e 's/^.*-\([[0-9]]*\)-g[[0-9a-f]]*/\1/')
-  RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)-$(RADIUSD_VERSION_RELEASE)
+  RADIUSD_VERSION_RELEASE := $(shell git status > /dev/null 2>&1 && git describe | cut -d '-' -f 2)
+  RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)+git$(RADIUSD_VERSION_RELEASE)
 else
   RADIUSD_PACKAGE_VERSION := $(RADIUSD_VERSION_STRING)
 endif
diff --git a/configure.ac b/configure.ac
index 3772bffb1bf..598a6a6203c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ dnl #
 if test "x$GIT" = "xyes" && git status 2>&1 > /dev/null; then
   if test "x$RADIUSD_VERSION_RELEASE" = "x"; then
     AC_MSG_CHECKING([build release])
-    RADIUSD_VERSION_RELEASE=`git describe | sed -e 's/^.*-\([[0-9]]*\)-g[[0-9a-f]]*/\1/'`
+    RADIUSD_VERSION_RELEASE=`git describe | cut -d '-' -f 2`
     AC_MSG_RESULT($RADIUSD_VERSION_RELEASE)
   fi