File openntpd.patch of Package openntpd

--- a/src/ntp.c
+++ b/src/ntp.c
@@ -42,7 +42,7 @@
 
 volatile sig_atomic_t	 ntp_quit = 0;
 struct imsgbuf		*ibuf_main;
-struct imsgbuf		*ibuf_dns;
+static struct imsgbuf		*ibuf_dns;
 struct ntpd_conf	*conf;
 struct ctl_conns	 ctl_conns;
 u_int			 peer_cnt;
--- a/src/ntp.h
+++ b/src/ntp.h
@@ -93,7 +93,7 @@ struct s_fixedpt {
 #define	NTP_MSGSIZE_NOAUTH	48
 #define	NTP_MSGSIZE		(NTP_MSGSIZE_NOAUTH + 4 + NTP_DIGESTSIZE)
 
-struct ntp_msg {
+struct __attribute__ ((__packed__)) ntp_msg {
 	u_int8_t status;	/* status of local clock and leap info */
 	u_int8_t stratum;	/* Stratum level */
 	u_int8_t ppoll;		/* poll value */
@@ -105,7 +105,7 @@ struct ntp_msg {
 	struct l_fixedpt orgtime;
 	struct l_fixedpt rectime;
 	struct l_fixedpt xmttime;
-} __packed;
+};
 
 struct ntp_query {
 	int			fd;
--- a/src/ntp_dns.c
+++ b/src/ntp_dns.c
@@ -33,7 +33,7 @@
 #include "ntpd.h"
 
 volatile sig_atomic_t	 quit_dns = 0;
-struct imsgbuf		*ibuf_dns;
+static struct imsgbuf		*ibuf_dns;
 
 void	sighdlr_dns(int);
 int	dns_dispatch_imsg(void);
--- a/src/parse.y
+++ b/src/parse.y
@@ -57,7 +57,6 @@ int		 lgetc(int);
 int		 lungetc(int);
 int		 findeol(void);
 
-struct ntpd_conf		*conf;
 struct sockaddr_in		 query_addr4;
 struct sockaddr_in6		 query_addr6;