* [gentoo-commits] repo/gentoo:master commit in: net-misc/portfwd/, net-misc/portfwd/files/
@ 2016-05-04 1:02 Austin English
0 siblings, 0 replies; 2+ messages in thread
From: Austin English @ 2016-05-04 1:02 UTC (permalink / raw
To: gentoo-commits
commit: 44138a2354da9231ac8ac4c918a7d4656f9532af
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 00:31:15 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 4 00:31:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44138a23
net-misc/portfwd: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/573846
Package-Manager: portage-2.2.26
net-misc/portfwd/files/portfwd.init | 2 +-
net-misc/portfwd/portfwd-0.29-r1.ebuild | 50 +++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/net-misc/portfwd/files/portfwd.init b/net-misc/portfwd/files/portfwd.init
index a73b796..81452ba 100644
--- a/net-misc/portfwd/files/portfwd.init
+++ b/net-misc/portfwd/files/portfwd.init
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# $Id$
depend() {
diff --git a/net-misc/portfwd/portfwd-0.29-r1.ebuild b/net-misc/portfwd/portfwd-0.29-r1.ebuild
new file mode 100644
index 0000000..747d392
--- /dev/null
+++ b/net-misc/portfwd/portfwd-0.29-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils 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"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/portfwd/, net-misc/portfwd/files/
@ 2023-03-18 21:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-03-18 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 8132bd88e43fd6d55783885c570e129b98ee80e1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 21:11:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 21:54:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8132bd88
net-misc/portfwd: EAPI 8, fix configure w/ clang 16
Closes: https://bugs.gentoo.org/725162
Closes: https://bugs.gentoo.org/809326
Closes: https://bugs.gentoo.org/898092
Closes: https://bugs.gentoo.org/900308
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../portfwd/files/portfwd-0.29-build-system.patch | 76 ++++++++++++++++++++++
net-misc/portfwd/portfwd-0.29-r1.ebuild | 45 -------------
net-misc/portfwd/portfwd-0.29-r2.ebuild | 33 ++++++++++
3 files changed, 109 insertions(+), 45 deletions(-)
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..fb9649b65cd9
--- /dev/null
+++ b/net-misc/portfwd/files/portfwd-0.29-build-system.patch
@@ -0,0 +1,76 @@
+--- 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/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/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,5 +1,5 @@
+-CFLAGS = -Wall -ggdb -O3 -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
+-CXXFLAGS = $(CFLAGS)
++CFLAGS = @CFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
++CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
+ INCLUDES = -I$(top_srcdir)/src
+
+ sbin_PROGRAMS = portfwd
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,4 +1,4 @@
+-CXXFLAGS = -Wall -g -O3
++CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
+ INCLUDES = -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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-18 21:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-04 1:02 [gentoo-commits] repo/gentoo:master commit in: net-misc/portfwd/, net-misc/portfwd/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2023-03-18 21:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox