[gentoo-commits] repo/gentoo:master commit in: net-misc/portfwd/files/

[Sam James]

commit: b17d286105097a4108ea021a20280825eea1ab78
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 18 22:17:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 18 23:08:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17d2861

net-misc/portfwd: cleanup Makefile patch further

Signed-off-by: Sam James  gentoo.org>

 .../portfwd/files/portfwd-0.29-build-system.patch  | 31 +++---
 1 file changed, 16 insertions(+), 15 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
index fb9649b65cd9..e69c33cb5ef2 100644
--- a/net-misc/portfwd/files/portfwd-0.29-build-system.patch
+++ b/net-misc/portfwd/files/portfwd-0.29-build-system.patch
@@ -1,10 +1,3 @@
 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.
@@ -14,7 +7,7 @@
 +AM_PROG_AR
  AM_PROG_LEX
  AC_PROG_RANLIB
- 
+
 @@ -45,6 +46,7 @@ dnl )
  dnl Checks for MSG_PROXY symbol
  AC_TRY_RUN(
@@ -23,6 +16,13 @@
  #include 
  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 @@
@@ -58,19 +58,20 @@
 to intersperse the options with the other arguments.
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,4 @@
 -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
+-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,4 +1,4 @@
+@@ -1,5 +1,4 @@
 -CXXFLAGS = -Wall -g -O3
-+CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\"
- INCLUDES = -I$(top_srcdir)/src
+-INCLUDES = -I$(top_srcdir)/src
++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src
  
  noinst_PROGRAMS = t_vector udp_rcv udp_snd
+ 

[gentoo-commits] repo/gentoo:master commit in: net-misc/portfwd/files/

[David Seifert]

commit: 4e8d2a6e7531b0118afab51e436522c44e2a09d6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Jan 17 17:43:01 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan 18 09:19:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8d2a6e

net-misc/portfwd: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3516

 net-misc/portfwd/files/portfwd-0.28-64bit.patch | 30 -
 1 file changed, 30 deletions(-)

diff --git a/net-misc/portfwd/files/portfwd-0.28-64bit.patch 
b/net-misc/portfwd/files/portfwd-0.28-64bit.patch
deleted file mode 100644
index 8bd1494..
--- a/net-misc/portfwd/files/portfwd-0.28-64bit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
 src/proto_map.cc28 Jan 2004 19:14:10 -  1.4
-+++ src/proto_map.cc1 Feb 2007 06:21:03 -
-@@ -16,11 +16,11 @@
-   map_list   = map_l;
-   fragile= 0; /* false */
- 
--  ftp_actv   = (int) actv;
-+  ftp_actv   =  actv != NULL;
-   if (ftp_actv)
- actv_ip = *actv;
- 
--  ftp_pasv   = (int) pasv;
-+  ftp_pasv   =  pasv != NULL;
-   if (ftp_pasv)
- pasv_ip = *pasv;
- 
 src/proto_map.hpp   28 Jan 2004 19:14:10 -  1.3
-+++ src/proto_map.hpp   1 Feb 2007 06:21:03 -
-@@ -16,8 +16,8 @@
- private:
-   vector   *port_list;
-   vector *map_list;
--  int   ftp_actv;
--  int   ftp_pasv;
-+  bool  ftp_actv;
-+  bool  ftp_pasv;
-   struct ip_addractv_ip;
-   struct ip_addrpasv_ip;
-   int   uid;
-