ntp: resection manual-pages according to IPD4, rebuild for library/se…

…curity/openssl-3
OpenIndiana · Dec 14, 2024 · 8108c42 · 8108c42
1 parent d848d69
commit 8108c42
Show file tree

Hide file tree

Showing 11 changed files with 358 additions and 83 deletions.
diff --git a/components/network/ntp/Makefile b/components/network/ntp/Makefile
@@ -31,7 +31,7 @@ include ../../../make-rules/shared-macros.mk
 COMPONENT_NAME=		ntp
 HUMAN_VERSION=		4.2.8p18
 COMPONENT_VERSION=	$(subst p,.,$(HUMAN_VERSION))
-COMPONENT_REVISION=	1
+COMPONENT_REVISION=	2
 COMPONENT_SUMMARY=	Network Time Protocol Daemon v4
 COMPONENT_DESCRIPTION=	Network Time Protocol v4, NTP Daemon and Utilities
 COMPONENT_PROJECT_URL=	https://www.ntp.org/
@@ -54,6 +54,10 @@ include $(WS_MAKE_RULES)/common.mk
 # We modified configure.ac and m4 macros
 COMPONENT_PREP_ACTION = ( cd $(@D) && PATH="$(PATH)" ./bootstrap )
 
+# this is needed because the first part of the test-suite fails,
+# and we don't get the other parts tested at all.
+COMPONENT_TEST_ARGS += -k
+
 CFLAGS += -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
 # This is needed to help debugging https://bugs.ntp.org/show_bug.cgi?id=3552

diff --git a/components/network/ntp/Solaris/ntp.sh b/components/network/ntp/Solaris/ntp.sh
@@ -38,7 +38,7 @@ fi
 #
 if [ ! -f /etc/inet/ntp.conf ]; then
 	echo "Error: Configuration file '/etc/inet/ntp.conf' not found." \
-	    "  See ntpd(1M)."
+	    "  See ntpd(8)."
 	exit $SMF_EXIT_ERR_CONFIG
 fi
 

diff --git a/components/network/ntp/Solaris/ntp.xml b/components/network/ntp/Solaris/ntp.xml
@@ -105,7 +105,7 @@
 
 	<instance name="default" enabled="false">
 		<property_group name='config' type='application' >
-			<!-- default property settings for ntpd(1M). -->
+			<!-- default property settings for ntpd(8). -->
 
 			<propval
 			    name='wait_for_sync'
@@ -169,9 +169,9 @@
 			</loctext>
 		</common_name>
 		<documentation>
-			<manpage title='ntpd' section='1M' />
-			<manpage title='ntp.conf' section='4' />
-			<manpage title='ntpq' section='1M' />
+			<manpage title='ntpd' section='8' />
+			<manpage title='ntp.conf' section='5' />
+			<manpage title='ntpq' section='8' />
 		</documentation>
 	</template>
 </service>

diff --git a/components/network/ntp/manifests/sample-manifest.p5m b/components/network/ntp/manifests/sample-manifest.p5m
@@ -280,15 +280,15 @@ file path=usr/share/doc/ntp/ntpsweep.html
 file path=usr/share/doc/ntp/ntptrace.html
 file path=usr/share/doc/ntp/update-leap.html
 file path=usr/share/doc/sntp/sntp.html
-file path=usr/share/man/man1/calc_tickadj.1m
-file path=usr/share/man/man1/ntp-keygen.1m
-file path=usr/share/man/man1/ntp-wait.1m
-file path=usr/share/man/man1/ntpd.1m
-file path=usr/share/man/man1/ntpdc.1m
-file path=usr/share/man/man1/ntpq.1m
-file path=usr/share/man/man1/ntptrace.1m
-file path=usr/share/man/man1/sntp.1m
-file path=usr/share/man/man1/update-leap.1m
 file path=usr/share/man/man5/ntp.conf.5
 file path=usr/share/man/man5/ntp.keys.5
+file path=usr/share/man/man8/calc_tickadj.8
+file path=usr/share/man/man8/ntp-keygen.8
+file path=usr/share/man/man8/ntp-wait.8
+file path=usr/share/man/man8/ntpd.8
+file path=usr/share/man/man8/ntpdc.8
+file path=usr/share/man/man8/ntpq.8
+file path=usr/share/man/man8/ntptrace.8
+file path=usr/share/man/man8/sntp.8
+file path=usr/share/man/man8/update-leap.8
 file path=usr/share/ntp/lib/NTP/Util.pm
diff --git a/components/network/ntp/manpages/ntpdate.1m → components/network/ntp/manpages/ntpdate.8 b/components/network/ntp/manpages/ntpdate.1m → components/network/ntp/manpages/ntpdate.8
@@ -20,7 +20,7 @@
 .\"
 .\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
-.TH "ntpdate" "1M" "" "" "System Administration Commands"
+.TH "ntpdate" "8" "" "" "System Administration Commands"
 .SH NAME
 ntpdate \- set the date and time with NTP
 .SH SYNOPSIS
@@ -88,4 +88,4 @@ Disclaimer: The functionality of this program is now available in the \fBntpd\fB
 .PP
 .SH SEE ALSO
 .LP
-\fBntpd\fR(1M), \fBntpdc\fR(1M), \fBattributes\fR(5)
+\fBntpd\fR(8), \fBntpdc\fR(8), \fBattributes\fR(5)
diff --git a/components/network/ntp/manpages/ntprc.4 → components/network/ntp/manpages/ntprc.5 b/components/network/ntp/manpages/ntprc.4 → components/network/ntp/manpages/ntprc.5
@@ -20,7 +20,7 @@
 .\"
 .\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
-.TH "ntprc" "4" "" "" "File Formats"
+.TH "ntprc" "5" "" "" "File Formats"
 .SH NAME
 ntprc \- file to initialize perferences for NTP programs
 .SH DESCRIPTION
@@ -78,4 +78,4 @@ as if the \fB--peers\fR option was given.
 .RE
 .SH SEE ALSO
 .LP
-\fBntpq\fR(1M), \fBntpdc\fR(1M), \fBntp-keygen\fR(1M)
+\fBntpq\fR(8), \fBntpdc\fR(8), \fBntp-keygen\fR(8)
diff --git a/components/network/ntp/manpages/ntptime.1m → components/network/ntp/manpages/ntptime.8 b/components/network/ntp/manpages/ntptime.1m → components/network/ntp/manpages/ntptime.8
@@ -20,7 +20,7 @@
 .\"
 .\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
-.TH "ntptime" "1M" "" "" "System Administration Commands"
+.TH "ntptime" "8" "" "" "System Administration Commands"
 .SH NAME
 ntptime \- Display Kernel Time Variables.
 .SH SYNOPSIS
@@ -71,4 +71,4 @@ the software as provided in this partIcular distribution.
 .PP
 .SH SEE ALSO
 .LP
-\fBntpd\fR(1M), \fBattributes\fR(5)
+\fBntpd\fR(8), \fBattributes\fR(5)
diff --git a/components/network/ntp/ntp.p5m b/components/network/ntp/ntp.p5m
@@ -49,9 +49,9 @@ file Solaris/SmfNTPStates.html \
 file Solaris/SmfValueNTP.html \
     path=usr/lib/help/auths/locale/C/SmfValueNTP.html
 
-file manpages/ntpdate.1m path=usr/share/man/man1m/ntpdate.1m mangler.man.stability="uncommitted obsolete"
-file manpages/ntptime.1m path=usr/share/man/man1m/ntptime.1m mangler.man.stability=volatile
-file manpages/ntprc.4 path=usr/share/man/man4/ntprc.4
+file manpages/ntpdate.8 path=usr/share/man/man8/ntpdate.8 mangler.man.stability="uncommitted obsolete"
+file manpages/ntptime.8 path=usr/share/man/man8/ntptime.8 mangler.man.stability=volatile
+file manpages/ntprc.5 path=usr/share/man/man4/ntprc.5
 
 link path=usr/sbin/xntpdc target=ntpdc
 
@@ -312,15 +312,15 @@ file path=usr/share/doc/ntp/ntpsweep.html
 file path=usr/share/doc/ntp/ntptrace.html
 file path=usr/share/doc/ntp/update-leap.html
 file path=usr/share/doc/sntp/sntp.html
-file path=usr/share/man/man1/calc_tickadj.1m
-file path=usr/share/man/man1/ntp-keygen.1m
-file path=usr/share/man/man1/ntp-wait.1m
-file path=usr/share/man/man1/ntpd.1m
-file path=usr/share/man/man1/ntpdc.1m
-file path=usr/share/man/man1/ntpq.1m
-file path=usr/share/man/man1/ntptrace.1m
-file path=usr/share/man/man1/sntp.1m
-file path=usr/share/man/man1/update-leap.1m
+file path=usr/share/man/man8/calc_tickadj.8
+file path=usr/share/man/man8/ntp-keygen.8
+file path=usr/share/man/man8/ntp-wait.8
+file path=usr/share/man/man8/ntpd.8
+file path=usr/share/man/man8/ntpdc.8
+file path=usr/share/man/man8/ntpq.8
+file path=usr/share/man/man8/ntptrace.8
+file path=usr/share/man/man8/sntp.8
+file path=usr/share/man/man8/update-leap.8
 file path=usr/share/man/man5/ntp.conf.5
 file path=usr/share/man/man5/ntp.keys.5
 file path=usr/share/ntp/lib/NTP/Util.pm
diff --git a/components/network/ntp/patches/40-resection-man.patch b/components/network/ntp/patches/40-resection-man.patch
@@ -0,0 +1,35 @@
+--- sntp/loc/solaris.~1~	2015-03-22 03:59:09.000000000 +0100
++++ sntp/loc/solaris	2024-12-11 12:59:53.539993217 +0100
+@@ -1,17 +1,17 @@
+ # Solaris installations and man page suffixes
+ MAN
+-calc_tickadj,sbin,1m
+-ntp-keygen,sbin,1m
+-ntp-wait,libexec,1m
+-ntpd,libexec,1m
+-ntpdate,sbin,1m
+-ntpdc,sbin,1m
+-ntpdsim,sbin,1m
+-ntpq,sbin,1m
+-ntpsnmpd,libexec,1m
+-ntpsweep,noinst,1m
+-ntptime,sbin,1m
+-ntptrace,sbin,1m
+-sntp,sbin,1m
+-tickadj,sbin,1m
+-update-leap,sbin,1m
++calc_tickadj,sbin,8
++ntp-keygen,sbin,8
++ntp-wait,libexec,8
++ntpd,libexec,8
++ntpdate,sbin,8
++ntpdc,sbin,8
++ntpdsim,sbin,8
++ntpq,sbin,8
++ntpsnmpd,libexec,8
++ntpsweep,noinst,8
++ntptime,sbin,8
++ntptrace,sbin,8
++sntp,sbin,8
++tickadj,sbin,8
++update-leap,sbin,8
diff --git a/components/network/ntp/pkg5 b/components/network/ntp/pkg5
@@ -3,7 +3,7 @@
         "SUNWcs",
         "library/libedit",
         "library/libevent2",
-        "library/security/openssl-31",
+        "library/security/openssl-3",
         "runtime/perl",
         "service/network/dns/mdns",
         "shell/ksh93",