From 10c7da898e0459c383c54c8e88cba0c84b861b71 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Sun, 23 Apr 2023 00:53:33 +0200
Subject: net-misc/etherdfs: don' redefine FORTIFY_SOURCE

Closes: https://bugs.gentoo.org/895798
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 net-misc/etherdfs/etherdfs-20180203-r2.ebuild | 62 --------------------------
 net-misc/etherdfs/etherdfs-20180203-r3.ebuild | 63 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 62 deletions(-)
 delete mode 100644 net-misc/etherdfs/etherdfs-20180203-r2.ebuild
 create mode 100644 net-misc/etherdfs/etherdfs-20180203-r3.ebuild

diff --git a/net-misc/etherdfs/etherdfs-20180203-r2.ebuild b/net-misc/etherdfs/etherdfs-20180203-r2.ebuild
deleted file mode 100644
index 50c020777f6f..000000000000
--- a/net-misc/etherdfs/etherdfs-20180203-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="ethersrv-linux"
-MY_PV_TSR="0.8.2"
-MY_P="${MY_PN}-${PV}"
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="An ethernet-based file system for DOS"
-HOMEPAGE="http://etherdfs.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${MY_P}.tar.xz
-	tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip )
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="tsr"
-
-BDEPEND="tsr? ( app-arch/unzip )"
-
-DOCS=( "ethersrv-linux.txt" "history.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${P}-musl.patch"
-)
-
-src_prepare() {
-	default
-
-	# Respect users LDFLAGS
-	sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -i Makefile || die
-}
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-src_install() {
-	dobin ethersrv-linux
-
-	if use tsr; then
-		insinto /usr/share/etherdfs
-		newins ../ETHERDFS.EXE etherdfs.exe
-
-		DOCS+=( "../ETHERDFS.TXT" "../HISTORY.TXT" )
-	fi
-
-	newinitd "${FILESDIR}"/etherdfs.initd etherdfs
-	newconfd "${FILESDIR}"/etherdfs.confd etherdfs
-	systemd_dounit "${FILESDIR}"/etherdfs.service
-
-	einstalldocs
-}
diff --git a/net-misc/etherdfs/etherdfs-20180203-r3.ebuild b/net-misc/etherdfs/etherdfs-20180203-r3.ebuild
new file mode 100644
index 000000000000..9a2e486674b4
--- /dev/null
+++ b/net-misc/etherdfs/etherdfs-20180203-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="ethersrv-linux"
+MY_PV_TSR="0.8.2"
+MY_P="${MY_PN}-${PV}"
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="An ethernet-based file system for DOS"
+HOMEPAGE="http://etherdfs.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${MY_P}.tar.xz
+	tsr? ( mirror://sourceforge/${PN}/v${MY_PV_TSR}/${PN}.zip -> ${P}.zip )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="tsr"
+
+BDEPEND="tsr? ( app-arch/unzip )"
+
+DOCS=( "ethersrv-linux.txt" "history.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-musl.patch"
+)
+
+src_prepare() {
+	default
+
+	# Respect users LDFLAGS
+	# Don't redefine FORTIFY_SOURCE
+	sed -e 's/$(CFLAGS)/& $(LDFLAGS)/' -e 's/-D_FORTIFY_SOURCE=1//g' -i Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+
+	default
+}
+
+src_install() {
+	dobin ethersrv-linux
+
+	if use tsr; then
+		insinto /usr/share/etherdfs
+		newins ../ETHERDFS.EXE etherdfs.exe
+
+		DOCS+=( "../ETHERDFS.TXT" "../HISTORY.TXT" )
+	fi
+
+	newinitd "${FILESDIR}"/etherdfs.initd etherdfs
+	newconfd "${FILESDIR}"/etherdfs.confd etherdfs
+	systemd_dounit "${FILESDIR}"/etherdfs.service
+
+	einstalldocs
+}
-- 
cgit v1.2.3-65-gdbad