Attachment 241992 Details for Bug 271077 – git patch for net-mgmt/netmagis-*

[patch] git patch for net-mgmt/netmagis-*

0001-fix-ld-error-duplicate-symbol-mobjlist.patch (text/plain), 7.66 KB, created by geoffroy desvernay on 2023-05-05 10:16:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: geoffroy desvernay

Created: 2023-05-05 10:16:33 UTC

Size: 7.66 KB

patch

obsolete

>From b12bf505c8f529e67df2f733387e5f71f657410a Mon Sep 17 00:00:00 2001
>From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
>Date: Fri, 5 May 2023 12:13:49 +0200
>Subject: [PATCH] fix ld error duplicate symbol mobjlist
>
>---
> net-mgmt/netmagis-common/Makefile                     |  4 ++--
> net-mgmt/netmagis-common/distinfo                     |  6 +++---
> .../netmagis-common/files/patch-topo_src_dumpgraph.c  | 11 +++++++++++
> .../files/patch-topo_src_extractcoll.c                | 11 +++++++++++
> .../netmagis-common/files/patch-topo_src_extracteq.c  | 11 +++++++++++
> .../netmagis-common/files/patch-topo_src_extractl1.c  | 11 +++++++++++
> .../netmagis-common/files/patch-topo_src_extractl2.c  | 11 +++++++++++
> .../netmagis-common/files/patch-topo_src_extractl3.c  | 11 +++++++++++
> net-mgmt/netmagis-common/pkg-plist                    |  1 +
> net-mgmt/netmagis-topo/Makefile                       |  3 ---
> net-mgmt/netmagis-www/Makefile                        |  3 ---
> 11 files changed, 72 insertions(+), 11 deletions(-)
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c
> create mode 100644 net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c
>
>diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile
>index f685cf038738..7c5683f248e3 100644
>--- a/net-mgmt/netmagis-common/Makefile
>+++ b/net-mgmt/netmagis-common/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME?=	netmagis
>-PORTVERSION?=	2.3.4
>-PORTREVISION=	2
>+PORTVERSION?=	2.3.6
>+PORTREVISION=	1
> CATEGORIES?=	net-mgmt
> MASTER_SITES=	http://netmagis.org/files/
> PKGNAMESUFFIX?=	-common
>diff --git a/net-mgmt/netmagis-common/distinfo b/net-mgmt/netmagis-common/distinfo
>index 9a942ce257a4..ac0b03703560 100644
>--- a/net-mgmt/netmagis-common/distinfo
>+++ b/net-mgmt/netmagis-common/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1520103662
>-SHA256 (netmagis-2.3.4.tar.gz) = 041c8de59e8dfa03f2fb02da2dea2e72aa19972a638d0226c36c45312ad132da
>-SIZE (netmagis-2.3.4.tar.gz) = 670861
>+TIMESTAMP = 1682493815
>+SHA256 (netmagis-2.3.6.tar.gz) = 88f8cea812bd6c2e042e6bed696b316def1e063bd8c8f1259e737cad453b2fc6
>+SIZE (netmagis-2.3.6.tar.gz) = 694577
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c b/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c
>new file mode 100644
>index 000000000000..8a0e928b6eca
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_dumpgraph.c
>@@ -0,0 +1,11 @@
>+--- topo/src/dumpgraph.c.orig	2023-04-26 07:46:02 UTC
>++++ topo/src/dumpgraph.c
>+@@ -3,8 +3,6 @@
>+ 
>+ #include "graph.h"
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ void usage (char *progname)
>+ {
>+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [-o obj]\n", progname) ;
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c
>new file mode 100644
>index 000000000000..6181289dba9c
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractcoll.c
>@@ -0,0 +1,11 @@
>+--- topo/src/extractcoll.c.orig	2023-04-26 07:46:42 UTC
>++++ topo/src/extractcoll.c
>+@@ -233,8 +233,6 @@ void usage (char *progname)
>+     exit (1) ;
>+ }
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ int main (int argc, char *argv [])
>+ {
>+     char *prog, *errstr ;
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c b/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c
>new file mode 100644
>index 000000000000..2a3bc5174bc0
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extracteq.c
>@@ -0,0 +1,11 @@
>+--- topo/src/extracteq.c.orig	2023-04-26 07:47:44 UTC
>++++ topo/src/extracteq.c
>+@@ -205,8 +205,6 @@ void output_vlan (FILE *fp, vlan_t v, struct vlan *vob
>+ Main function
>+ ******************************************************************************/
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ void usage (char *progname)
>+ {
>+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* eq [iface]\n", progname) ;
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c
>new file mode 100644
>index 000000000000..cf3c1ce8df07
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl1.c
>@@ -0,0 +1,11 @@
>+--- topo/src/extractl1.c.orig	2023-04-26 07:45:08 UTC
>++++ topo/src/extractl1.c
>+@@ -82,8 +82,6 @@ void mark_ifaces (int termif)
>+ Main function
>+ ******************************************************************************/
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ void usage (char *progname)
>+ {
>+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [-b|-B]\n", progname) ;
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c
>new file mode 100644
>index 000000000000..6df51db791ad
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl2.c
>@@ -0,0 +1,11 @@
>+--- topo/src/extractl2.c.orig	2023-04-26 07:47:11 UTC
>++++ topo/src/extractl2.c
>+@@ -184,8 +184,6 @@ void output_vlans (FILE *fp, vlanset_t vs)
>+ Main function
>+ ******************************************************************************/
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ void usage (char *progname)
>+ {
>+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* [eq [iface]] vlanid\n", progname) ;
>diff --git a/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c b/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c
>new file mode 100644
>index 000000000000..285eab49f39f
>--- /dev/null
>+++ b/net-mgmt/netmagis-common/files/patch-topo_src_extractl3.c
>@@ -0,0 +1,11 @@
>+--- topo/src/extractl3.c.orig	2023-04-26 07:45:37 UTC
>++++ topo/src/extractl3.c
>+@@ -543,8 +543,6 @@ void walkl3 (FILE *fp, struct node *n)
>+ Main function
>+ ******************************************************************************/
>+ 
>+-MOBJ *mobjlist [NB_MOBJ] ;
>+-
>+ void usage (char *progname)
>+ {
>+     fprintf (stderr, "Usage : %s [-a|-n cidr|-v vlan|-e regexp|-E regexp|-t|-m]* cidr ... cidr\n", progname) ;
>diff --git a/net-mgmt/netmagis-common/pkg-plist b/net-mgmt/netmagis-common/pkg-plist
>index 36a48c8cfb79..a31cc3e9abcd 100644
>--- a/net-mgmt/netmagis-common/pkg-plist
>+++ b/net-mgmt/netmagis-common/pkg-plist
>@@ -6,6 +6,7 @@ lib/netmagis/msgs/en.msg
> lib/netmagis/msgs/fr.msg
> lib/netmagis/pkgtcl/arrgen.n
> lib/netmagis/pkgtcl/arrgen.tcl
>+lib/netmagis/pkgtcl/ldap-bug-fix.192
> lib/netmagis/pkgtcl/pgsql.n
> lib/netmagis/pkgtcl/pgsql.tcl
> lib/netmagis/pkgtcl/pkgIndex.tcl
>diff --git a/net-mgmt/netmagis-topo/Makefile b/net-mgmt/netmagis-topo/Makefile
>index e1c365384450..c1c172448f48 100644
>--- a/net-mgmt/netmagis-topo/Makefile
>+++ b/net-mgmt/netmagis-topo/Makefile
>@@ -6,9 +6,6 @@ COMMENT=	Netmagis topology module
> 
> LICENSE=	CECILL-B
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mobjlist
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mobjlist
>-
> RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
> 		rancid-run:net-mgmt/rancid3 \
> 		fping:net/fping
>diff --git a/net-mgmt/netmagis-www/Makefile b/net-mgmt/netmagis-www/Makefile
>index ce4506679d3d..7453a8f5cab0 100644
>--- a/net-mgmt/netmagis-www/Makefile
>+++ b/net-mgmt/netmagis-www/Makefile
>@@ -6,9 +6,6 @@ COMMENT=	Netmagis web module
> 
> LICENSE=	CECILL-B
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: mobjlist
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: mobjlist
>-
> RUN_DEPENDS=	netmagis-config:net-mgmt/netmagis-common \
> 		dot:graphics/graphviz \
> 		pwgen:sysutils/pwgen \
>-- 
>2.40.0
>

Actions: View | Diff

Attachments on bug 271077: 241756 | 241992