summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-06-15 18:25:28 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2019-06-15 18:25:39 +0100
commitd51d28c951e9be435fa4f5f94871ef6f1e655076 (patch)
tree31cd75257e0654f487632c6b2ad2998a1aeb3f96 /net-analyzer/gspoof/files
parentapp-backup/borgbackup: adding myself as another maintainer. (diff)
downloadgentoo-d51d28c951e9be435fa4f5f94871ef6f1e655076.tar.gz
gentoo-d51d28c951e9be435fa4f5f94871ef6f1e655076.tar.bz2
gentoo-d51d28c951e9be435fa4f5f94871ef6f1e655076.zip
net-analyzer/gspoof: fix on libdir=lib64 systems, bug #678774
./configure script checked manually for /usr/lib/libnet.a presence. That does not work in libdir=lib64 systems like amd64. Let's drop the check intirely. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/678774 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'net-analyzer/gspoof/files')
-rw-r--r--net-analyzer/gspoof/files/gspoof-3.2-icon.patch8
-rw-r--r--net-analyzer/gspoof/files/gspoof-3.2-libdir.patch17
2 files changed, 21 insertions, 4 deletions
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
index df13a08677db..863049e0d2c7 100644
--- a/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
+++ b/net-analyzer/gspoof/files/gspoof-3.2-icon.patch
@@ -1,7 +1,7 @@
Fix icon path and name.
---- gtk.c
-+++ gtk.c
+--- a/gtk.c
++++ b/gtk.c
@@ -24,9 +24,7 @@
gtk_set_locale ();
gtk_init (&_argc, &_argv);
@@ -13,8 +13,8 @@ Fix icon path and name.
MainWin = create_MainWin();
---- interface.c
-+++ interface.c
+--- a/interface.c
++++ b/interface.c
@@ -102,7 +102,7 @@
gtk_widget_set_size_request (MainWin, 640, 480);
gtk_window_set_title (GTK_WINDOW (MainWin), BANNER);
diff --git a/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch b/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch
new file mode 100644
index 000000000000..67674c2f5155
--- /dev/null
+++ b/net-analyzer/gspoof/files/gspoof-3.2-libdir.patch
@@ -0,0 +1,17 @@
+Don't assume that $(libdir) is lib. Rely on linker defaults instead.
+--- a/configure.ac
++++ b/configure.ac
+@@ -55,13 +55,6 @@ AC_ARG_WITH([libnet-prefix],
+ [ LIBNET_PREFIX=$withval ],
+ [ LIBNET_PREFIX=/usr ])
+
+-AC_CHECK_FILE([$LIBNET_PREFIX/lib/libnet.a],
+- [LDFLAGS="-L$LIBNET_PREFIX/lib"
+- CPPFLAGS="-I$LIBNET_PREFIX/include" ],
+- AC_MSG_ERROR([
+-Libnet-1.1.1 Packet Shaping Library is required!
+-Verify to have installed it and pass --with-libnet-prefix to configure.
+-Or download it from http://www.packetfactory.net/libnet ]))
+
+ AC_CHECK_LIB(net, libnet_name2addr4,,
+ AC_MSG_ERROR([