From 469bfdd3f28d9b4a44123f3f3a99960846981eab Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 28 Oct 2024 13:53:39 +0100
Subject: [PATCH] 7.2.0 changes

---
 CHANGELOG.md          | 29 +++++++++++++++--------------
 README.md             |  2 +-
 apps/snmp/snmp_main.c |  4 ----
 doc/DEVELOP.md        |  2 +-
 scripts/version.sh    |  8 ++++++--
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81b5a2a..1ba1df26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Clixon Changelog
 
-* [7.2.0](#720) Expected: October 2024
+* [7.2.0](#720) 28 October 2024
 * [7.1.0](#710) 3 July 2024
 * [7.0.1](#701) 3 April 2024
 * [7.0.0](#700) 8 March 2024
@@ -12,18 +12,15 @@
 * [6.0.0](#600) 29 Nov 2022
 
 ## 7.2.0
-Expected: October 2024
+28 October 2024
+
+The 7.2.0 release lots of minor changes and bugfixes including memory optimizations and package builds.
 
 ### Features
 
-* Added yang domains for mount-point isolation
-  * This replaces the computation of shared yang-specs
-  * New option: `CLICON_YANG_DOMAIN_DIR`
 * Restconf: Support for list of media in Accept header
-* Refactoring of schema mount-points
-  * Add new top-level `Y_MOUNTS` and add top-level yangs and mountpoints in yspecs
-* New `clixon-autocli@2024-08-01.yang` revision
-    - Added: disable operation for module rules
+* Rearranged YANG top-levels into YANG domains, mounts, and specs
+* Deb build script
 * Optimize YANG memory
   * Autocli
     * Late evaluation of uses/grouping
@@ -34,7 +31,10 @@ Expected: October 2024
     * Added option `CLICON_YANG_USE_ORIGINAL` to use original yang object in grouping/augment
 * New: [CLI simple alias](https://github.com/clicon/cligen/issues/112)
   * See: https://clixon-docs.readthedocs.io/en/latest/cli.html#cli-aliases
-* List pagination: Added where, sort-by and direction parameter for configured data
+* List pagination more ietf-draft compliance
+  * Added where, sort-by and direction parameter for configured data
+* New `clixon-autocli@2024-08-01.yang` revision
+  * Added: disable operation for module rules
 * New `clixon-config@2024-08-01.yang` revision
   * Added: `CLICON_YANG_DOMAIN_DIR`
   * Added: `CLICON_YANG_USE_ORIGINAL`
@@ -50,9 +50,6 @@ Users may have to change how they access the system
 * Removed YANG line-number in error-messages for memory optimization
   * Re-enable by setting `YANG_SPEC_LINENR` compile-time option
 * NETCONF error returns of failed leafref references, see https://github.com/clicon/clixon/issues/536
-* List pagination of large lists
-  * For backward-compatibility, mark the list with extension cl:list-pagination-partial-state extension
-  * New default is to use regular state read mechanism, which could have poorer performance but more functionality
 
 ### C/CLI-API changes on existing features
 
@@ -64,7 +61,11 @@ Developers may need to change their code
 * Replaced `clixon_get_logflags()` with `clixon_logflags_get()`
 * New `yn_iter()` yang iterator replaces `yn_each()`
   * Use an integer iterator instead of yang object
-  * Replace `y1 = NULL; y1 = yn_each(y0, y1)` with `int inext = 0; yn_iter(y0, &inext)`
+  * Replace:
+    `y1 = yn_each(y0, y1) { ...`
+  * with:
+    `int inext = 0;
+     y1 = yn_iter(y0, &inext) { ...`
 * Add `keyw` argument to `yang_stats()`
 
 ### Corrected Busg
diff --git a/README.md b/README.md
index eab75427..c1e56ab5 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,4 @@ Matrix clixon forum https://matrix.to/#/#clixonforum:matrix.org.
 
 Other clixon projects include [CLIgen](https://github.com/clicon/cligen), [the Clixon controller](https://github.com/clicon/clixon-controller), [Clixon applications](https://github.com/clicon/clixon-examples) and others.
 
-Clixon is sponsored by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/) and [Akamai Technologies, Inc.](https://www.akamai.com).
+Clixon is sponsored primarily by [Rubicon Communications LLC(Netgate)](https://www.netgate.com/).
diff --git a/apps/snmp/snmp_main.c b/apps/snmp/snmp_main.c
index 5fe6bdb0..efb8fd73 100644
--- a/apps/snmp/snmp_main.c
+++ b/apps/snmp/snmp_main.c
@@ -341,12 +341,8 @@ main(int    argc,
     char          *argv0 = argv[0];
     clixon_handle  h;
     int            logdst = CLIXON_LOG_STDERR;
-#if 1
     struct passwd  pw = {0,};
     struct passwd *pwresult = NULL;
-#else
-    struct passwd *pw;
-#endif
     yang_stmt     *yspec = NULL;
     char          *str;
     uint32_t       id;
diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index 8c5e1f2d..21cf21e7 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -13,7 +13,7 @@ Clixon uses semantic versioning (https://semver.org).
 
 Try to keep a single master branch always working. Currently testing is made using [Travis CI](https://travis-ci.org/clicon/clixon).
 
-However, releases are made periodically (ca every 1 month) which is more tested.
+However, releases are made periodically (ca every 3 months) which are tested more.
 
 A release branch can be made, eg release-4.0 where 4.0.0, 4.0.1 are tagged
 
diff --git a/scripts/version.sh b/scripts/version.sh
index b557703e..e237fc83 100755
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -30,8 +30,12 @@ if [ -n "$PREFIX" ]; then
 fi
 V="${V}${TAG}"
 V="${V}-${INDEX}"
-V="${V}+${NR}"
-V="${V}+${HASH}"
+if [ -n "${NR}" ]; then
+   V="${V}+${NR}"
+fi
+if [ -n "${HASH}" ]; then
+    V="${V}+${HASH}"
+fi
 if [ -n "$ARCH" ]; then
     V="${V}_${ARCH}"
 fi