[Git][NTPsec/ntpsec][master] Updates to NEWS, buildprep, and devel/testing.adoc

Hal Murray (@hal.murray) gitlab at mg.gitlab.com
Sat Mar 29 21:11:33 UTC 2025



Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
00e5f7df by Hal Murray at 2025-03-29T14:09:39-07:00
Updates to NEWS, buildprep, and devel/testing.adoc

- - - - -


3 changed files:

- NEWS.adoc
- buildprep
- devel/testing.adoc


Changes:

=====================================
NEWS.adoc
=====================================
@@ -12,7 +12,12 @@ on user-visible changes.
 
 ## Repository Head
 
-* Add waf 2.1.4 and add the ability to use it.
+* waf has been upgraded to version 2.1.4
+  NB: on Debian, waf now installs Python programs (ntpq, ntpmon, ...)
+  in /usr/local/lib/python3.xx/site-packages rather than .../dist-packages
+  A quick fix is to link site-packages to dist-packages before installing.
+  You will have to do that again each time your distro updates to a new
+  version of Python.
 
 * Python 2.7 is now the minimum supported version.
   This is likely to be the last release supporting Python 2.


=====================================
buildprep
=====================================
@@ -64,6 +64,7 @@ done
 # Python 3 equivalents with a python3 prefix.  Compute the correct value for the
 # infix based on system Python.  This will start to be significant after Python 2
 # EOLs at the beginning of 2020.
+# This doesn't work if python isn't already installed.
 PYVERS=$(python --version 2>&1 | sed -n -e '/Python \([0-9]\).*/s//\1/p')
 if [ "$PYVERS" = "2" ]
 then
@@ -174,24 +175,30 @@ daemon () {
     # Prerequisites to build the daemon: bison, pps-tools, service libraries
     case $installer in
 	apk)
+	    # Alpine Linux
 	    $install build-base python                  # basic tools
 	    $install bison "python${PYVERS}-dev" linux-headers
 	    $install openssl-dev libcap-dev libseccomp-dev
 	    # probably needs more, but this builds
 	    # can't find timepps.h: gpsd and chrony have their own ??
+	    echo "Last tested a long time ago"
 	    ;;
 	apt)
+	    # Debian and derivatives
 	    $install build-essential			# Build environment
 	    $install bison libssl-dev			# build
 	    $install libcap-dev libseccomp-dev		# build
 	    $install libavahi-compat-libdnssd-dev	# optional build
 	    $install pps-tools
 	    $install python3-dev python-is-python3
+	    $install python-dev-is-python3
+	    echo "Last tested: Debian 12, March 2025"
 	    ;;
 	emerge)
 						# Build environment included!
 	    $install sys-libs/libcap sys-libs/libseccomp
 	    $install sys-devel/bison net-misc/pps-tools
+	    echo "Last tested a long time ago"
 	    ;;
 	pkgin)
 	    # NetBSD
@@ -213,21 +220,25 @@ daemon () {
 		echo /usr/local/lib/python3.7/site-packages > \
 			/usr/pkg/lib/python3.7/site-packages/ntpsec.pth
 	    fi
+	    echo "Last tested a long time ago"
 	    ;;
 	pkg)
 	    # FreeBSD
 	    $install bison python3
-	    $do ln -s /usr/local/bin/python3 /usr/local/bin/python
 	    # certificates for NTS
 	    $install ca_root_nss
+	    echo "Last tested: FreeBSD 14.2, March 2025"
 	    ;;
 	yum|dnf)
-	    $do $installer groupinstall "Development Tools" 	# Build environment
+	    $do $installer group install development-tools 	# Build environment
+	    $install python3 python3-devel 		# build
+	    $install python-unversioned-command-3 	# python => python3
 	    $install bison openssl-devel 		# build
 	    $install libcap-devel libseccomp-devel	# build
 	    $install pps-tools-devel			# build
 	    $install avahi-compat-libdns_sd-devel	# optional build
 	    $install libcap openssl-libs pps-tools
+	    echo "Last tested: Fedora 41, March 2025"
 	    ;;
 	yast)
 	    echo "# SLES versions 12 and earlier do not have pps-tools"
@@ -236,6 +247,7 @@ daemon () {
 	    $install openssl-devel			# build
 	    $install libcap2 openssl-libs
 	    $install "python${PYVERS}-curses"
+	    echo "Last tested a long time ago"
 	    ;;
 	zypper)
 	    $install -t pattern devel_basis		# Build environment
@@ -247,6 +259,7 @@ daemon () {
 	    $install pps-tools
 	    $install libcap2 openssl-libs
 	    $install "python${PYVERS}-curses"
+	    echo "Last tested a long time ago"
 	    ;;
     esac
 }
@@ -254,10 +267,7 @@ daemon () {
 tools () {
     # Prerequisites for the client Python tools: python extensions
     case $installer in
-	apt)
-	    $install "python${PYVERS}-dev"
-	    ;;
-	yum|dnf|yast|zypper)
+	yast|zypper)
 	    $install "python${PYVERS}-devel"
 	    ;;
     esac


=====================================
devel/testing.adoc
=====================================
@@ -10,7 +10,7 @@ directory.
 
 The build tree has been set up so that if you first waf builid then cd to
 build/main/ntpclients/ and run (say) ntpq, you should be able to test
-new bersions of the Python code without installing to rootspace.
+new versions of the Python code without installing to rootspace.
 
 The very first thing to do, even before you start up ntpd, is to try that.
 If you get a message that says
@@ -149,8 +149,18 @@ Edit /etc/rc.conf It needs to contain this:
 --------------------------------------------------
 ntpd_enable="YES"
 ntpd_program="/usr/local/sbin/ntpd"
+kld_list="mac_ntpd"              # for ntpd to droproot
+ntpd_flags=" -N -u ntpd:ntpd"    # Additional flags to ntpd
+ntpd_sync_on_start=YES           # adds -g
 --------------------------------------------------
 
+It doesn't work after a fresh install:
+  INIT: must be run as root, not uid
+That's using /etc/rc.d/ntpd
+I haven't figured out what is going on.
+It worked after I ran it for a while from the command line
+  sudo <command line from log file> -n
+
 If you are running ntpd, the first line will be there
 already.  The default is NO.
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/00e5f7df5214c033c1c18512730f8f0226669eb8

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/00e5f7df5214c033c1c18512730f8f0226669eb8
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20250329/cf945630/attachment-0001.htm>


More information about the vc mailing list