gentoo auto-resync : 19:03:2023 - 00:32:54

4 files changed, 112 insertions, 46 deletions

diff --git a/net-misc/portfwd/Manifest b/net-misc/portfwd/Manifest
index f35e6913b0dd..25e600eba10c 100644
--- a/net-misc/portfwd/Manifest
+++ b/net-misc/portfwd/Manifest
@@ -1,6 +1,7 @@
+AUX portfwd-0.29-build-system.patch 1871 BLAKE2B b37bcb9aea13e413954890c232ffa015dc21b1765da9ca14fa9a0a5d230f7be1aeddf57a166017694fca9ba9b7a2bfc7cd4b7dea8d75ff4b82fa7c23a4a23c0c SHA512 5e526aec6d42e69f1ab06a66fba76f42b3d70bc004d045963ca25bb126ad652848feffe712a31ba8d601487a345b1b919efd3e934c95fec169d6293fd6112695
 AUX portfwd.confd 55 BLAKE2B f88e2d20a7d2bd40d78e7c313d91f289faea41a87175b2c0ed8681d01575d05bbf53846202f5271da9c2e8770328402708aa4ad502bbbc122ffcc3a1c67a19b2 SHA512 cd9332cd659982fb2d8b6d4c27b75814d725aad534b2e72c4e287b6aac4595dae8a11bc711592e290919a3959b7ac5d9c1fc4921572593ff80876630d6b52296
 AUX portfwd.init 773 BLAKE2B 7db5df2739cbb535c6ed499fc03278f36fe738cc06166e15c3ea2e06f2cfd1cb525daa895fb81df50b93f13524987a063893d2cfbfe265436822be6d75f7cedd SHA512 380bb2e2ee7423e781d3b637afe60cd79f5fd35806e897d89885b3fdbe1b3aeff396acaa74b4b6158d874a31831c8393c549642468e2a5fc0926361c4d6869c8
 AUX portfwd.service 128 BLAKE2B 620a5bd8bf82f0b91eaf333b597c85ed8153faf41ba45014dbacc98daa4951c71e4e6ec26c24d39daa6ba66d68ea76ae55eea9c1edf35ff7355347b4d8bd880e SHA512 1e15366d1d284db537d90d07857baaf44ba3447bed0b6cff35b957d787bf5893c8bdb7e01eb692cb26d68aea9256fbe9e6b012cbeb1899a40a531050a4521f04
 DIST portfwd-0.29.tar.gz 168318 BLAKE2B 9bc323c2ec755835ff2f708746d4ebec19414085bb0241ab75e15b1fb8628f7ba69058d036b998beddfd95bfb7bbef752993e823b3bc2003f50c3a62a435ee02 SHA512 790d30afb42eb5e03846534e5098c7d1cb4241758df77fd56fc3f4fdbb05dae88ef84e16b27434035dd39a7c82beb77d490f64741181c38efc3b3928face51d1
-EBUILD portfwd-0.29-r1.ebuild 1184 BLAKE2B 41846523957f05efe72e0208c0ed87a515be920b3af5ad0f5cf370e9a9945ac46929d3995b555e37dde96c4796efe502c31c7a6745d68ed0017163fcf0154b45 SHA512 fdab62a710620107e074ee13b6bb0a52a61b4a3c086d8fcba162fec0256ca25f5e932ab7b761e650b635fc3c69377b7f3ffd1a259f32638a985fd36d2cc6c456
+EBUILD portfwd-0.29-r2.ebuild 602 BLAKE2B ddfd5c3ded002d1dd9d006a0ece182f8687e316192bfb8c9586bfbf4f40588b56a7f5f651965d1d9494b1ad261f5b15cc8875dc7c004e72db106a101c4bffe19 SHA512 553cfffbec5ea50a4c2260e730ee284498ce18320b082966201c032c4422530a2e092afc9a979dac6cfb92c92da8c2339f71a05c6688f4cc123b1c1bbeba5b69
 MISC metadata.xml 444 BLAKE2B 74cfcefad2ae617ee3d63072b41724661db2cb0e19f97d43b58055ab537488b7d8613a56c252dfbfff2eed340a24137120b323987c968e310409b503d1b6b8d5 SHA512 b9c58111060fe471db9aa8b272daea50e2368b436ddd2f013fc5f4f575c363c41265e3c56d8a10c6d95bc37235e5260bfbe9366af54ef17d337278cad5c25ccb
diff --git a/net-misc/portfwd/files/portfwd-0.29-build-system.patch b/net-misc/portfwd/files/portfwd-0.29-build-system.patch
new file mode 100644
index 000000000000..e69c33cb5ef2
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd-0.29-build-system.patch
@@ -0,0 +1,77 @@
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,7 @@ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_YACC
++AM_PROG_AR
+ AM_PROG_LEX
+ AC_PROG_RANLIB
+
+@@ -45,6 +46,7 @@ dnl )
+ dnl Checks for MSG_PROXY symbol
+ AC_TRY_RUN(
+ [
++#include <stdlib.h>
+ #include <sys/socket.h>
+ int main()
+ {
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,3 @@
+ SUBDIRS = getopt src tools doc
+ 
+-docdir = $(prefix)/doc/portfwd
+ doc_DATA = COPYING README CREDITS TODO
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -3,5 +3,4 @@
+ man_MANS = portfwd.8 portfwd.cfg.5
+ noinst_DATA = INSTALL.configure
+ 
+-docdir = $(prefix)/doc/portfwd
+ doc_DATA = FAQ conf.txt
+--- a/getopt/Makefile.am
++++ b/getopt/Makefile.am
+@@ -3,9 +3,9 @@ noinst_LIBRARIES = libgetopt.a
+ libgetopt_a_SOURCES = getopt.c getopt1.c
+ 
+ getopt.o: getopt.c
+-	$(CC) -o $@ -c $<
++	$(CC) @CFLAGS@ -o $@ -c $<
+ 	cp $@ ../src
+ getopt1.o: getopt1.c
+-	$(CC) -o $@ -c $<
++	$(CC) @CFLAGS@ -o $@ -c $<
+ 	cp $@ ../src
+ 
+--- a/getopt/getopt.c
++++ b/getopt/getopt.c
+@@ -91,6 +91,8 @@
+ # endif
+ #endif
+ 
++#include <string.h>
++
+ /* This version of `getopt' appears to the caller like standard Unix `getopt'
+    but it behaves differently for the user, since it allows the user
+    to intersperse the options with the other arguments.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,4 @@
+-CFLAGS   = -Wall -ggdb -O3 -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
+-CXXFLAGS = $(CFLAGS)
+-INCLUDES = -I$(top_srcdir)/src
++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src
+ 
+ sbin_PROGRAMS = portfwd
+ portfwd_SOURCES = addr.cc from_addr.cc host_map.cc portfwd.cc \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,5 +1,4 @@
+-CXXFLAGS = -Wall -g -O3
+-INCLUDES = -I$(top_srcdir)/src
++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src
+ 
+ noinst_PROGRAMS = t_vector udp_rcv udp_snd
+ 
diff --git a/net-misc/portfwd/portfwd-0.29-r1.ebuild b/net-misc/portfwd/portfwd-0.29-r1.ebuild
deleted file mode 100644
index c64a3293d245..000000000000
--- a/net-misc/portfwd/portfwd-0.29-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="Port Forwarding Daemon"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://portfwd.sourceforge.net"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
-
-src_prepare() {
-	default
-
-	cd src
-	sed -iorig \
-		-e "s:^CFLAGS   =.*:CFLAGS   = @CFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
-		-e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
-		Makefile.am || die
-	cd ../tools
-	sed -iorig \
-		-e "s:^CXXFLAGS =.*:CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\\\\\"\$(sysconfdir)/portfwd.cfg\\\\\":" \
-		Makefile.am || die
-	cd ../getopt
-	sed -iorig -e "s:$.CC.:\$(CC) @CFLAGS@:g" Makefile.am || die
-	cd ../doc
-	sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die
-	cd ..
-	sed -iorig -e "s:/doc/portfwd:/share/doc/$P:" Makefile.am || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	dodoc cfg/*
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
diff --git a/net-misc/portfwd/portfwd-0.29-r2.ebuild b/net-misc/portfwd/portfwd-0.29-r2.ebuild
new file mode 100644
index 000000000000..98f201afdb05
--- /dev/null
+++ b/net-misc/portfwd/portfwd-0.29-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Port Forwarding Daemon"
+HOMEPAGE="http://portfwd.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~sparc x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.29-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	dodoc cfg/*
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}