Merge branch 'dev' into dev

Author: wb2osz

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 8
       - name: dependency
@@ -149,7 +149,7 @@ jobs:
             make package
           fi
       - name: archive binary
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: direwolf_${{ matrix.config.os }}_${{ matrix.config.arch }}_${{ github.sha }}
           path: |

CHANGES.md

@@ -6,6 +6,9 @@
 
 ### New Features: ###
 
+
+- New NCHANNEL feature to map a channel number to an external network TCP KISS TNC.  See xxx for example of a bridge to LoRa APRS.  See [APRS-LoRa-VHF-APRS-Bridge.pdf](https://github.com/wb2osz/direwolf-doc/blob/main/APRS-LoRa-VHF-APRS-Bridge.pdf) for explanation.
+
 - [http://www.aprs.org/aprs11/tocalls.txt](http://www.aprs.org/aprs11/tocalls.txt) has been abandoned since the end of 2021.  [https://github.com/aprsorg/aprs-deviceid](https://github.com/aprsorg/aprs-deviceid) is now considered to be the authoritative source of truth for the vendor/model encoding.
 
 ## Version 1.7  --  October 2023 ##

CMakeLists.txt

@@ -210,6 +210,7 @@ if (C_CLANG OR C_GCC)
   # TODO:
   # Try error checking -fsanitize=bounds-strict -fsanitize=leak
   # Requires libubsan and liblsan, respectively.
+  # Maybe -fstack-protector-all, -fstack-check
 
   ###set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wvla -ffast-math -ftree-vectorize -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE ${EXTRA_FLAGS}")
   if(FREEBSD)

cmake/cpack/direwolf.desktop.in

@@ -6,5 +6,5 @@ Icon=@CMAKE_PROJECT_NAME@_icon.png
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=HamRadio
-Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25
+Categories=Network;HamRadio
+Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25

conf/CMakeLists.txt

@@ -25,8 +25,18 @@ string(REGEX REPLACE "^%C%([^\n]*)" "\\1" file_content "${file_content}")
 file(WRITE "${CMAKE_BINARY_DIR}/direwolf.conf" "${file_content}")
 
 # install udev rules for CM108
+# There are two locations.  The one in /etc/udev/rules.d is meant for local customization and
+# takes precedence for the same name.
+# https://sources.debian.org/src/direwolf/1.7+dfsg-2/debian/patches/lib-udev-rules/
+# says that we should use the /usr/lib/udev/rules.d location when building a package.
+# TODO:  I think the proper solution is to select the location based on whether
+# the application installation location is /usr/local or /usr.
 if(LINUX)
-  install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
+  if (CMAKE_INSTALL_PREFIX STREQUAL "/usr/local") 
+    install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /etc/udev/rules.d/)
+  else()
+    install(FILES "${CUSTOM_CONF_DIR}/99-direwolf-cmedia.rules" DESTINATION /usr/lib/udev/rules.d/)
+  endif()
 endif()
 
 install(FILES "${CMAKE_BINARY_DIR}/direwolf.conf" DESTINATION ${INSTALL_CONF_DIR})