From owner-svn-ports-head@freebsd.org Sun Jul 5 09:46:38 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F7AD3674D8; Sun, 5 Jul 2020 09:46:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B03kQ2pDbz3VWB; Sun, 5 Jul 2020 09:46:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 43583B5A8; Sun, 5 Jul 2020 09:46:38 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0659kcc0042285; Sun, 5 Jul 2020 09:46:38 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0659kbZl042283; Sun, 5 Jul 2020 09:46:37 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202007050946.0659kbZl042283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 5 Jul 2020 09:46:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541271 - in head/net/l2tpd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/net/l2tpd: . files X-SVN-Commit-Revision: 541271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jul 2020 09:46:38 -0000 Author: tobik Date: Sun Jul 5 09:46:37 2020 New Revision: 541271 URL: https://svnweb.freebsd.org/changeset/ports/541271 Log: net/l2tpd: Unbreak build with GCC 10 (-fno-common default) /usr/local/bin/ld: pty.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: misc.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: control.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: avp.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: call.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: network.o:(.bss+0x140): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: avpsend.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: scheduler.o:(.bss+0x8): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: file.o:(.bss+0x228): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: aaa.o:(.bss+0x0): multiple definition of `rand_source'; l2tpd.o:(.bss+0x530): first defined here /usr/local/bin/ld: control.o: in function `handle_special': control.c:(.text+0x220e): undefined reference to `check_control' /usr/local/bin/ld: control.o: in function `handle_packet': control.c:(.text+0x22d0): undefined reference to `check_payload' /usr/local/bin/ld: control.c:(.text+0x22e6): undefined reference to `expand_payload' /usr/local/bin/ld: control.c:(.text+0x231a): undefined reference to `check_control' /usr/local/bin/ld: control.c:(.text+0x2414): undefined reference to `write_packet' http://package18.nyi.freebsd.org/data/121amd64-default-PR244494/2020-06-10_18h04m44s/logs/errors/l2tpd-0.69_10.log PR: 246700 Modified: head/net/l2tpd/Makefile head/net/l2tpd/files/patch-control.c Modified: head/net/l2tpd/Makefile ============================================================================== --- head/net/l2tpd/Makefile Sun Jul 5 09:44:25 2020 (r541270) +++ head/net/l2tpd/Makefile Sun Jul 5 09:46:37 2020 (r541271) @@ -14,6 +14,7 @@ BROKEN_armv6= fails to link: undefined reference to ch BROKEN_armv7= fails to link: undefined reference to check_control USES= compiler:nestedfct +CFLAGS+= -fcommon PORTDOCS= README ETCDIR= ${PREFIX}/etc/l2tp Modified: head/net/l2tpd/files/patch-control.c ============================================================================== --- head/net/l2tpd/files/patch-control.c Sun Jul 5 09:44:25 2020 (r541270) +++ head/net/l2tpd/files/patch-control.c Sun Jul 5 09:46:37 2020 (r541271) @@ -1,5 +1,5 @@ ---- control.c.orig.o Thu Apr 11 00:09:33 2002 -+++ control.c Tue Aug 9 13:20:07 2005 +--- control.c.orig 2002-04-10 20:09:33 UTC ++++ control.c @@ -16,8 +16,6 @@ #include #include @@ -9,7 +9,43 @@ #include #include #include "l2tp.h" -@@ -1582,6 +1580,12 @@ +@@ -1076,7 +1074,7 @@ int control_finish (struct tunnel *t, struct call *c) + return 0; + } + +-inline int check_control (const struct buffer *buf, struct tunnel *t, ++static inline int check_control (const struct buffer *buf, struct tunnel *t, + struct call *c) + { + /* +@@ -1212,7 +1210,7 @@ inline int check_control (const struct buffer *buf, st + return 0; + } + +-inline int check_payload (struct buffer *buf, struct tunnel *t, ++static inline int check_payload (struct buffer *buf, struct tunnel *t, + struct call *c) + { + /* +@@ -1318,7 +1316,7 @@ inline int check_payload (struct buffer *buf, struct t + #endif + return 0; + } +-inline int expand_payload (struct buffer *buf, struct tunnel *t, ++static inline int expand_payload (struct buffer *buf, struct tunnel *t, + struct call *c) + { + /* +@@ -1498,7 +1496,7 @@ void send_zlb (void *data) + toss (buf); + } + +-inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, ++static inline int write_packet (struct buffer *buf, struct tunnel *t, struct call *c, + int convert) + { + /* +@@ -1582,6 +1580,12 @@ inline int write_packet (struct buffer *buf, struct tu wbuf[pos++] = e; for (x = 0; x < buf->len; x++) { @@ -22,3 +58,12 @@ e = *((char *) buf->start + x); if ((e < 0x20) || (e == PPP_ESCAPE) || (e == PPP_FLAG)) { +@@ -1657,7 +1661,7 @@ void handle_special (struct buffer *buf, struct call * + } + } + +-inline int handle_packet (struct buffer *buf, struct tunnel *t, ++int handle_packet (struct buffer *buf, struct tunnel *t, + struct call *c) + { + int res;