Attachment 227722 Details for Bug 258326 – net/unfs3: patch and unbreak with -fno-common

[patch] net/unfs3: patch and unbreak with -fno-common

0001-net-unfs3-patch-and-unbreak-with-fno-common.patch (text/plain), 3.29 KB, created by Robert Clausecker on 2021-09-06 22:50:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-09-06 22:50:27 UTC

Size: 3.29 KB

patch

obsolete

>From 73d49514e8c654e0c8231033d96d72fb281c241b Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 7 Sep 2021 00:48:54 +0200
>Subject: [PATCH] net/unfs3: patch and unbreak with -fno-common
>
>---
> net/unfs3/Makefile                     | 23 +++++++++++++----------
> net/unfs3/files/patch-Config_exports.h | 11 +++++++++++
> net/unfs3/files/patch-Config_exports.l | 18 ++++++++++++++++++
> net/unfs3/pkg-descr                    |  2 +-
> 4 files changed, 43 insertions(+), 11 deletions(-)
> create mode 100644 net/unfs3/files/patch-Config_exports.h
> create mode 100644 net/unfs3/files/patch-Config_exports.l
>
>diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile
>index 401b383ab369..fd87caae14bb 100644
>--- a/net/unfs3/Makefile
>+++ b/net/unfs3/Makefile
>@@ -1,30 +1,33 @@
> # Created by: Clement Laforet <clement@FreeBSD.org>
> 
> PORTNAME=	unfs3
>-PORTVERSION=	0.9.22
>-PORTREVISION=	1
>+DISTVERSION=	0.9.22
>+PORTREVISION=	2
> CATEGORIES=	net
>-MASTER_SITES=	SF
>+MASTER_SITES=	https://github.com/unfs3/unfs3/releases/download/unfs3-${DISTVERSION}/
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	fuz@fuz.su
> COMMENT=	User-space implementation of the NFSv3 server specification
> 
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: export_path
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: export_path
>-
> USES=		autoreconf
> GNU_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
> CONFIGURE_ENV=	YACC=byacc
> 
>-PLIST_FILES=	sbin/unfsd man/man7/tags.7.gz man/man8/unfsd.8.gz
>-
> MAKE_JOBS_UNSAFE=	yes
>+INSTALL_TARGET=	install-strip
>+
>+PLIST_FILES=	man/man7/tags.7.gz \
>+		man/man8/unfsd.8.gz \
>+		sbin/unfsd
> 
> OPTIONS_DEFINE=	CLUSTER_EXT
>+CLUSTER_EXT_DESC=	include clustering extensions
> CLUSTER_EXT_CONFIGURE_ON=	--enable-cluster
> 
>+post-extract:
>+	@${RM} ${WRKSRC}/Config/lex.yy.c
>+
> .include <bsd.port.mk>
>diff --git a/net/unfs3/files/patch-Config_exports.h b/net/unfs3/files/patch-Config_exports.h
>new file mode 100644
>index 000000000000..fb11e191d1df
>--- /dev/null
>+++ b/net/unfs3/files/patch-Config_exports.h
>@@ -0,0 +1,11 @@
>+--- Config/exports.h.orig	2021-09-06 22:17:18 UTC
>++++ Config/exports.h
>+@@ -22,7 +22,7 @@
>+ extern exports	exports_nfslist;
>+ /* Options cache */
>+ extern int	exports_opts;
>+-const char      *export_path; 
>++extern const char      *export_path; 
>+ extern uint32 	export_fsid;
>+ extern uint32   export_password_hash;
>+ 
>diff --git a/net/unfs3/files/patch-Config_exports.l b/net/unfs3/files/patch-Config_exports.l
>new file mode 100644
>index 000000000000..5d4edc546521
>--- /dev/null
>+++ b/net/unfs3/files/patch-Config_exports.l
>@@ -0,0 +1,18 @@
>+--- Config/exports.l.orig	2021-09-06 22:20:46 UTC
>++++ Config/exports.l
>+@@ -14,7 +14,7 @@
>+ 
>+ #define YY_NO_UNPUT
>+ 
>+-YYSTYPE yylval;
>++extern YYSTYPE yylval;
>+ extern int e_error;
>+ 
>+ /*
>+@@ -67,4 +67,4 @@ OLDNET {IP}"/"{IP}
>+ 
>+ .			{ return *yytext; }
>+ \n			{ return '\n'; }
>+-   
>+\ No newline at end of file
>++   
>diff --git a/net/unfs3/pkg-descr b/net/unfs3/pkg-descr
>index 0f4864839c14..b70b86101249 100644
>--- a/net/unfs3/pkg-descr
>+++ b/net/unfs3/pkg-descr
>@@ -3,4 +3,4 @@ provides a daemon for the MOUNT and NFS protocols, which are used by NFS
> clients for accessing files on the server.
> Since it runs in user-space, you can use it in a jail.
> 
>-WWW: http://unfs3.sourceforge.net/
>+WWW: https://unfs3.github.io/
>-- 
>2.32.0
>

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 258326: 227722