Your message dated Thu, 22 Sep 2022 22:09:33 +0200
with message-id <[email protected]>
and subject line Removed ntp package
has caused the Debian Bug report #931630,
regarding ntp: Please include patch to fix build on m68k (alignment)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
931630: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931630
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: ntp
Version: 1:4.2.8p13+dfsg-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: m68k
Hello!
Due to its native alignment being 16 bits wide, m68k needs an additional
padding in the struct conf_restrict:
--- ntp-4.2.8p13+dfsg.orig/include/ntp_request.h
+++ ntp-4.2.8p13+dfsg/include/ntp_request.h
@@ -672,6 +672,7 @@ struct conf_restrict {
short ippeerlimit; /* ip peer limit */
u_short flags; /* restrict flags */
u_short mflags; /* match flags */
+ u_short unused1; /* (unused) */
u_int v6_flag; /* is this v6 or not */
struct in6_addr addr6; /* match address (v6) */
struct in6_addr mask6; /* match mask (v6) */
--- ntp-4.2.8p13+dfsg.orig/ntpdc/layout.std
+++ ntp-4.2.8p13+dfsg/ntpdc/layout.std
@@ -275,6 +275,7 @@ offsetof(mask) = 4
offsetof(ippeerlimit) = 8
offsetof(flags) = 10
offsetof(mflags) = 12
+offsetof(unused1) = 14
offsetof(v6_flag) = 16
offsetof(addr6) = 20
offsetof(mask6) = 36
Could you include the attached patch to fix the build? I'm going
to send the patch upstream unless that has happened already.
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - [email protected]
`. `' Freie Universitaet Berlin - [email protected]
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Description: Add additional padding to struct conf_restrict
Fixes FTBFS on m68k.
Author: John Paul Adrian Glaubitz <[email protected]>
Last-Update: 2019-07-08
--- ntp-4.2.8p13+dfsg.orig/include/ntp_request.h
+++ ntp-4.2.8p13+dfsg/include/ntp_request.h
@@ -672,6 +672,7 @@ struct conf_restrict {
short ippeerlimit; /* ip peer limit */
u_short flags; /* restrict flags */
u_short mflags; /* match flags */
+ u_short unused1; /* (unused) */
u_int v6_flag; /* is this v6 or not */
struct in6_addr addr6; /* match address (v6) */
struct in6_addr mask6; /* match mask (v6) */
--- ntp-4.2.8p13+dfsg.orig/ntpdc/layout.std
+++ ntp-4.2.8p13+dfsg/ntpdc/layout.std
@@ -275,6 +275,7 @@ offsetof(mask) = 4
offsetof(ippeerlimit) = 8
offsetof(flags) = 10
offsetof(mflags) = 12
+offsetof(unused1) = 14
offsetof(v6_flag) = 16
offsetof(addr6) = 20
offsetof(mask6) = 36
--- End Message ---
--- Begin Message ---
Version: 1:4.2.8p15+dfsg-1+rm
ntp has been removed in favour of ntpsec.
This bug should not be applicable anymore.
--- End Message ---
