net/openmdns, fix -fno-common build error
Fix taken from FreeBSD "...go ahead" gonzalo@ (maintainer)
This commit is contained in:
parent
bbe0ffa8ff
commit
dbed198124
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2019/07/12 20:48:35 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
COMMENT = MDNS/DNS-SD daemon
|
||||
|
||||
DISTNAME = openmdns-0.7
|
||||
CATEGORIES = net
|
||||
REVISION = 1
|
||||
REVISION = 2
|
||||
|
||||
MAINTAINER = Gonzalo L. R. <gonzalo@openbsd.org>
|
||||
|
||||
|
17
net/openmdns/patches/patch-mdnsd_control_c
Normal file
17
net/openmdns/patches/patch-mdnsd_control_c
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-mdnsd_control_c,v 1.1 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
Fix -fno-common build error. Taken from
|
||||
https://svnweb.freebsd.org/ports?view=revision&revision=549579
|
||||
|
||||
Index: mdnsd/control.c
|
||||
--- mdnsd/control.c.orig
|
||||
+++ mdnsd/control.c
|
||||
@@ -53,6 +53,8 @@ void control_group_add_service(struct ctl_conn *, st
|
||||
|
||||
extern struct mdnsd_conf *conf;
|
||||
|
||||
+struct control_state control_state;
|
||||
+
|
||||
void
|
||||
control_lookup(struct ctl_conn *c, struct imsg *imsg)
|
||||
{
|
23
net/openmdns/patches/patch-mdnsd_control_h
Normal file
23
net/openmdns/patches/patch-mdnsd_control_h
Normal file
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-mdnsd_control_h,v 1.1 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
Fix -fno-common build error. Taken from
|
||||
https://svnweb.freebsd.org/ports?view=revision&revision=549579
|
||||
|
||||
Index: mdnsd/control.h
|
||||
--- mdnsd/control.h.orig
|
||||
+++ mdnsd/control.h
|
||||
@@ -26,10 +26,12 @@
|
||||
|
||||
#include "mdnsd.h"
|
||||
|
||||
-struct {
|
||||
+struct control_state {
|
||||
struct event ev;
|
||||
int fd;
|
||||
-} control_state;
|
||||
+};
|
||||
+
|
||||
+extern struct control_state control_state;
|
||||
|
||||
enum blockmodes {
|
||||
BM_NORMAL,
|
18
net/openmdns/patches/patch-mdnsd_mdns_c
Normal file
18
net/openmdns/patches/patch-mdnsd_mdns_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-mdnsd_mdns_c,v 1.3 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
Fix -fno-common build error. Taken from
|
||||
https://svnweb.freebsd.org/ports?view=revision&revision=549579
|
||||
|
||||
Index: mdnsd/mdns.c
|
||||
--- mdnsd/mdns.c.orig
|
||||
+++ mdnsd/mdns.c
|
||||
@@ -45,6 +45,9 @@ extern struct mdnsd_conf *conf;
|
||||
struct question_tree question_tree;
|
||||
struct cache_tree cache_tree;
|
||||
|
||||
+pg_q pg_queue;
|
||||
+pge_q pge_queue;
|
||||
+
|
||||
/*
|
||||
* RR cache
|
||||
*/
|
17
net/openmdns/patches/patch-mdnsd_mdnsd_c
Normal file
17
net/openmdns/patches/patch-mdnsd_mdnsd_c
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-mdnsd_mdnsd_c,v 1.1 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
Fix -fno-common build error. Taken from
|
||||
https://svnweb.freebsd.org/ports?view=revision&revision=549579
|
||||
|
||||
Index: mdnsd/mdnsd.c
|
||||
--- mdnsd/mdnsd.c.orig
|
||||
+++ mdnsd/mdnsd.c
|
||||
@@ -45,6 +45,8 @@ int mdns_sock(void);
|
||||
void fetchmyname(char [MAXHOSTNAMELEN]);
|
||||
void fetchhinfo(struct hinfo *);
|
||||
|
||||
+ctl_conns_t ctl_conns;
|
||||
+
|
||||
struct mdnsd_conf *conf = NULL;
|
||||
extern char *malloc_options;
|
||||
|
32
net/openmdns/patches/patch-mdnsd_mdnsd_h
Normal file
32
net/openmdns/patches/patch-mdnsd_mdnsd_h
Normal file
@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-mdnsd_mdnsd_h,v 1.3 2021/02/20 19:54:26 bket Exp $
|
||||
|
||||
Fix -fno-common build error. Taken from
|
||||
https://svnweb.freebsd.org/ports?view=revision&revision=549579
|
||||
|
||||
Index: mdnsd/mdnsd.h
|
||||
--- mdnsd/mdnsd.h.orig
|
||||
+++ mdnsd/mdnsd.h
|
||||
@@ -223,9 +223,11 @@ struct pge {
|
||||
};
|
||||
|
||||
/* Publish Group Queue, should hold all publishing groups */
|
||||
-TAILQ_HEAD(, pg) pg_queue;
|
||||
+typedef TAILQ_HEAD(, pg) pg_q;
|
||||
+extern pg_q pg_queue;
|
||||
/* Publish Group Entry Queue, should hold all publishing group entries */
|
||||
-TAILQ_HEAD(, pge) pge_queue;
|
||||
+typedef TAILQ_HEAD(, pge) pge_q;
|
||||
+extern pge_q pge_queue;
|
||||
|
||||
struct kif {
|
||||
char ifname[IF_NAMESIZE];
|
||||
@@ -397,7 +399,8 @@ int rr_send_an(struct rr *);
|
||||
void conflict_resolve_by_rr(struct rr *);
|
||||
|
||||
/* control.c */
|
||||
-TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns;
|
||||
+typedef TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns_t;
|
||||
+extern ctl_conns_t ctl_conns;
|
||||
int control_send_rr(struct ctl_conn *, struct rr *, int);
|
||||
int control_send_ms(struct ctl_conn *, struct mdns_service *, int);
|
||||
int control_try_answer_ms(struct ctl_conn *, char[MAXHOSTNAMELEN]);
|
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2018/09/04 12:46:18 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2021/02/20 19:54:26 bket Exp $
|
||||
@newgroup _mdnsd:664
|
||||
@newuser _mdnsd:664:_mdnsd:daemon:MDNS Daemon:/var/empty:/sbin/nologin
|
||||
@rcscript ${RCDIR}/mdnsd
|
||||
@bin bin/mdnsctl
|
||||
@bin bin/mdnsd
|
||||
@man man/man8/mdnsctl.8
|
||||
@man man/man8/mdnsd.8
|
||||
share/doc/pkg-readmes/${PKGSTEM}
|
||||
@rcscript ${RCDIR}/mdnsd
|
||||
|
Loading…
Reference in New Issue
Block a user