* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2017-10-06 2:09 Richard Farina
0 siblings, 0 replies; 9+ messages in thread
From: Richard Farina @ 2017-10-06 2:09 UTC (permalink / raw
To: gentoo-commits
commit: 246731f578e6095b9c7866e1342a1667e580d4bd
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 02:07:30 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 02:08:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246731f5
net-wireless/kismet: drop very old kismet
Package-Manager: Portage-2.3.11, Repoman-2.3.3
net-wireless/kismet/Manifest | 1 -
.../kismet/files/kismet-2013.03.1-tinfo.patch | 11 --
net-wireless/kismet/files/ruby19_fixes.patch | 85 ----------
.../kismet/files/update-kismet_shootout.patch | 103 ------------
net-wireless/kismet/kismet-2013.03.1-r2.ebuild | 173 ---------------------
5 files changed, 373 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 713fb4a1c1c..5531097630c 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1 @@
-DIST kismet-2013-03-R1.tar.gz 899372 SHA256 1c1e9f6b550de1f248363d4c9ce1d24fdc20d041ead5a53cec88eb1b07353082 SHA512 7e992f5ef3db4c5fa298bd4aabfe216668baade948b83996850c010c6c92bfa2fea37d7006a532eb6bace015624f536cc45ed8b3b3ed4a6a1cac7a137ac86d36 WHIRLPOOL 694796f7dd0f4ffd70e64d67eba30bf7b206189dadb8e773a302af9f417a8219b45e547bfcaf59db3f502e0f5ab18af6d642e66dbe8277d8af48daeb35b40843
DIST kismet-2016-07-R1.tar.xz 709364 SHA256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237 SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416 WHIRLPOOL 33bbe6e3353c87907e2a58326ccd84ff973e474a884c29f01c29439de673d2050c50348bf001799da25f0b156c3527d3c5f93cdcdccfd830c9e2eb40cce9aa8b
diff --git a/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch b/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
deleted file mode 100644
index ac1a3900447..00000000000
--- a/net-wireless/kismet/files/kismet-2013.03.1-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -423,6 +423,8 @@
- foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
- fi
-
-+ AC_SEARCH_LIBS([stdscr], tinfo ncurses,curseaux="$curseaux $ac_res")
-+
- if test "$foundlcurses" != "yes"; then
- AC_MSG_ERROR(Failed to find libcurses or libncurses. Install them or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)
- fi
diff --git a/net-wireless/kismet/files/ruby19_fixes.patch b/net-wireless/kismet/files/ruby19_fixes.patch
deleted file mode 100644
index 28b704d03c6..00000000000
--- a/net-wireless/kismet/files/ruby19_fixes.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-commit 09b5076e4cd8338d3b45a760662fc7347f8d93bf
-Author: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
-Date: Tue Apr 23 10:33:07 2013 -0400
-
- Ruby 1.9 removed '.' from search path, use require_relative; also remove
- spurious 'break' in tx code
-
-diff --git a/ruby/kismet.rb b/ruby/kismet.rb
-index 5b18b23..7eab708 100755
---- a/ruby/kismet.rb
-+++ b/ruby/kismet.rb
-@@ -61,8 +61,6 @@ class Kismet
- rescue Exception => e
- pp e
-
-- break if @die
--
- puts "write error: #{$!}"
- end
- end
-diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
-index 057a514..d3ae968 100755
---- a/ruby/kismet_addsource.rb
-+++ b/ruby/kismet_addsource.rb
-@@ -20,7 +20,7 @@
-
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
-
-diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
-index 6969247..27373a9 100755
---- a/ruby/kismet_alert_syslog.rb
-+++ b/ruby/kismet_alert_syslog.rb
-@@ -20,7 +20,7 @@
-
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require 'syslog'
-diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
-index ec8f0f9..7adffe6 100755
---- a/ruby/kismet_list.rb
-+++ b/ruby/kismet_list.rb
-@@ -20,7 +20,7 @@
-
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
-
- def bssidcb(proto, fields)
- puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
-diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
-index accda7e..931360f 100755
---- a/ruby/kismet_shootout.rb
-+++ b/ruby/kismet_shootout.rb
-@@ -21,7 +21,7 @@
-
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
-
-diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
-index 9fe581d..b878979 100755
---- a/ruby/kismet_sql.rb
-+++ b/ruby/kismet_sql.rb
-@@ -22,7 +22,7 @@
-
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require "sqlite3"
diff --git a/net-wireless/kismet/files/update-kismet_shootout.patch b/net-wireless/kismet/files/update-kismet_shootout.patch
deleted file mode 100644
index 57ff69f7bec..00000000000
--- a/net-wireless/kismet/files/update-kismet_shootout.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 0ee73bd14c71e44ce53bc1016b871dcb6965e443 Mon Sep 17 00:00:00 2001
-From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
-Date: Tue, 17 Mar 2015 12:57:16 -0400
-Subject: [PATCH] update kismet_shootout
-
-make a little more detailed, 100.00 instead of 100.
-also extend space for name now that wlan0mon is a common interface name
----
- ruby/kismet_shootout.rb | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
-index 931360f..61f70b0 100755
---- a/ruby/kismet_shootout.rb
-+++ b/ruby/kismet_shootout.rb
-@@ -48,7 +48,7 @@ $lines_per_header = 10
- $num_printed = 10
-
- # output type (std, pretty, csv)
--$output_type = "std"
-+$output_type = "pretty"
-
- def sourcecb(proto, fields)
- if fields["error"] != "0"
-@@ -102,11 +102,11 @@ def sourcecb(proto, fields)
- hstr = ""
-
- if $output_type == "pretty"
-- hstr = sprintf("%s %6.6s %5.5s %8.8s %4.4s", hstr, "", "PPS", "Packets", "Pcnt")
-+ hstr = sprintf("%s %8.8s %5.5s %8.8s %7.7s", hstr, "Name", "PPS", "Packets", "Percent")
-
- else
- $cards.each { |c|
-- hstr = sprintf("%s %6.6s %5.5s %8.8s %4.4s", hstr, c, "PPS", "Total", "Pcnt")
-+ hstr = sprintf("%s %8.8s %5.5s %8.8s %7.7s", hstr, c, "PPS", "Total", "Percent")
- }
- end
-
-@@ -141,7 +141,7 @@ def sourcecb(proto, fields)
- $card_records.each { |cr|
- cr[1]["printed"] = 1
-
-- printf(" %6.6s %5.5s %8.8s %3d%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
-+ printf(" %8.8s %5.5s %8.8s %6.2f%%\n", cr[1]["interface"], cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
- }
-
- t = Time.now.to_i - $start_time
-@@ -163,7 +163,7 @@ def sourcecb(proto, fields)
- tu += "#{t}s"
- end
-
-- printf(" %6.6s %5.5s %8.8s %4.4s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu)
-+ printf(" %8.8s %5.5s %8.8s %7.7s %6.6s %6.6s\n", "", "", "", "", total - lasttotal, tu)
- else
- $card_records.each { |cr|
- cr[1]["printed"] = 1
-@@ -171,7 +171,7 @@ def sourcecb(proto, fields)
- cname = ""
- cname = cr[1]["interface"] if $output_type == "pretty"
-
-- str = sprintf("%s %6.6s %5.5s %8.8s %3d%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
-+ str = sprintf("%s %8.8s %5.5s %8.8s %6.2f%%", str, cname, cr[1]["packets"] - cr[1]["last_packets"], cr[1]["packets"], (cr[1]["packets"].to_f / best.to_f) * 100)
- }
-
- t = Time.now.to_i - $start_time
-@@ -282,10 +282,18 @@ OptionParser.new do |opts|
- options[:channel] = c
- end
-
-- opts.on("--pretty", "Format output with pretty ANSI codes") do
-+ opts.on("--pretty", "Format output with pretty ANSI codes (default)") do
- options[:pretty] = true
- end
-
-+ opts.on("--std", "Do not format output with pretty ANSI codes") do
-+ options[:std] = true
-+ end
-+
-+ #opts.on("--csv", "Format output as comma separated values") do
-+ # options[:csv] = true
-+ #end
-+
- end.parse!
-
- if options[:host]
-@@ -315,6 +323,14 @@ if options[:pretty]
- $output_type = "pretty"
- end
-
-+if options[:std]
-+ $output_type = "std"
-+end
-+
-+if options[:csv]
-+ $output_type = "csv"
-+end
-+
- $cards = ARGV
-
- puts "INFO: Kismet NIC Shootout"
---
-2.0.5
-
diff --git a/net-wireless/kismet/kismet-2013.03.1-r2.ebuild b/net-wireless/kismet/kismet-2013.03.1-r2.ebuild
deleted file mode 100644
index 10019bae314..00000000000
--- a/net-wireless/kismet/kismet-2013.03.1-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
- SRC_URI=""
- inherit git-2
- KEYWORDS=""
-else
- SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.gz"
- KEYWORDS="amd64 arm ~ppc x86"
-fi
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="http://www.kismetwireless.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
-
-CDEPEND="net-wireless/wireless-tools
- kernel_linux? ( sys-libs/libcap
- dev-libs/libnl:3
- net-libs/libpcap
- )
- pcre? ( dev-libs/libpcre )
- suid? ( sys-libs/libcap )
- client? ( sys-libs/ncurses )
- !arm? ( speech? ( app-accessibility/flite ) )
- ruby? ( dev-lang/ruby:* )
- plugin-btscan? ( net-wireless/bluez )
- plugin-dot15d4? ( virtual/libusb:0 )
- plugin-spectools? ( net-wireless/spectools )
-"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-tinfo.patch
- epatch "${FILESDIR}"/ruby19_fixes.patch
- epatch "${FILESDIR}"/update-kismet_shootout.patch
- mv configure.in configure.ac
-
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet.conf.in || die
-
- # Don't strip and set correct mangrp
- sed -i -e 's| -s||g' \
- -e 's|@mangrp@|root|g' Makefile.in || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable client) \
- $(use_enable pcre)
-}
-
-src_compile() {
- emake
-
- if use plugin-autowep; then
- cd "${S}"/restricted-plugin-autowep
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-btscan; then
- cd "${S}"/plugin-btscan
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-dot15d4; then
- cd "${S}"/plugin-dot15d4
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-ptw; then
- cd "${S}"/restricted-plugin-ptw
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-spectools; then
- cd "${S}"/plugin-spectools
- KIS_SRC_DIR="${S}" emake
- fi
- if use plugin-syslog; then
- cd "${S}"/plugin-syslog
- KIS_SRC_DIR="${S}" emake
- fi
-}
-
-src_install() {
- if use plugin-autowep; then
- cd "${S}"/restricted-plugin-autowep
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-btscan; then
- cd "${S}"/plugin-btscan
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-dot15d4; then
- cd "${S}"/plugin-dot15d4
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-ptw; then
- cd "${S}"/restricted-plugin-ptw
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-spectools; then
- cd "${S}"/plugin-spectools
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use plugin-syslog; then
- cd "${S}"/plugin-syslog
- KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
- fi
- if use ruby; then
- cd "${S}"/ruby
- dobin *.rb
- fi
-
- cd "${S}"
- emake DESTDIR="${D}" commoninstall
-
- ##dragorn would prefer I set fire to my head than do this, but it works
- ##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
- ##is there an automatic way to force this?
- # install headers for external plugins
- insinto /usr/include/kismet
- doins *.h
- doins Makefile.inc
- #todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
- dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
- newinitd "${FILESDIR}"/${PN}.initd kismet
- newconfd "${FILESDIR}"/${PN}.confd kismet
-
- insinto /etc
- doins conf/kismet{,_drone}.conf
-
- if use suid; then
- dobin kismet_capture
- fi
-}
-
-pkg_preinst() {
- if use suid; then
- enewgroup kismet
- fowners root:kismet /usr/bin/kismet_capture
- # Need to set the permissions after chowning.
- # See chown(2)
- fperms 4550 /usr/bin/kismet_capture
- elog "Kismet has been installed with a setuid-root helper binary"
- elog "to enable minimal-root operation. Users need to be part of"
- elog "the 'kismet' group to perform captures from physical devices."
- fi
- if ! use suid; then
- ewarn "It is highly discouraged to run a sniffer as root,"
- ewarn "Please consider enabling the suid use flag and adding"
- ewarn "your user to the kismet group."
- fi
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2024-04-07 6:17 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-04-07 6:17 UTC (permalink / raw
To: gentoo-commits
commit: 55ba652f60fdd2504542f71b0b3ebcec3c8e0723
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 5 06:17:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 7 06:16:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55ba652f
net-wireless/kismet: Add patch to fix bashisms in configure
Submitted upstream. Not added to live ebuild because I hope it will soon
be integrated...
Closes: https://bugs.gentoo.org/890020
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...c-bashism-fix-critical-existence-failure-.patch | 280 +++++++++++++++++++++
net-wireless/kismet/kismet-2023.07.1.ebuild | 10 +-
2 files changed, 286 insertions(+), 4 deletions(-)
diff --git a/net-wireless/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch b/net-wireless/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch
new file mode 100644
index 000000000000..3cf4ed8cff85
--- /dev/null
+++ b/net-wireless/kismet/files/0001-configure.ac-bashism-fix-critical-existence-failure-.patch
@@ -0,0 +1,280 @@
+From d3732f93cbdc9edf39d31c7c50b72cc6a79be0dc Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Fri, 5 Apr 2024 00:42:29 -0400
+Subject: [PATCH] configure.ac: bashism: fix critical existence failure on
+ systems with dash
+
+Remove the consistent use of bashisms. An autoconf generated script is
+designed to work with POSIX sh, and contains a /bin/sh shebang. As a
+result, it *cannot* assume it will be run with bash, as it won't be.
+
+The bashism in question is the double equals (`==`) operator for the
+test command. It is actually a bash-specific alias for the single equals
+operator. It behaves exactly the same, except more confusing. It
+contains no added functionality and no behavior changes, it is merely an
+additional alternate spelling. In exchange for doing nothing whatsoever,
+even in bash, it breaks muscle memory when writing POSIX sh scripts and
+tricks developers into writing the wrong thing.
+
+It is terrible and should never be used under any circumstances.
+Ideally it would be removed altogether from GNU bash.
+
+Fixes the following warnings when running configure:
+
+```
+./configure: 5011: test: x: unexpected operator
+./configure: 5014: test: x: unexpected operator
+./configure: 5017: test: x: unexpected operator
+./configure: 8056: test: nox: unexpected operator
+./configure: 8109: test: yesx: unexpected operator
+./configure: 8120: test: 3: unexpected operator
+./configure: 8144: test: unexpected operator
+./configure: 9089: test: stdc++x: unexpected operator
+./configure: 9937: test: 0: unexpected operator
+./configure: 10084: test: 0: unexpected operator
+./configure: 10207: test: 0: unexpected operator
+./configure: 10283: test: 0: unexpected operator
+./configure: 11363: test: x: unexpected operator
+./configure: 11561: test: x: unexpected operator
+./configure: 11634: test: xno: unexpected operator
+./configure: 11663: test: xno: unexpected operator
+./configure: 12490: test: 3: unexpected operator
+./configure: 13150: test: no: unexpected operator
+./configure: 13167: test: no: unexpected operator
+```
+
+And the following fatal errors when trying to compile, since the
+resulting conditionals failed to define $(PROTOCBIN):
+
+```
+make -j8
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/kismet.proto
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/http.proto
+/bin/sh: 1: -I: not found
+make: [Makefile:808: protobuf_cpp/kismet.pb.h] Error 127 (ignored)
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/datasource.proto
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/linuxbluetooth.proto
+/bin/sh: 1: -I: not found
+make: [Makefile:808: protobuf_cpp/http.pb.h] Error 127 (ignored)
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/eventbus.proto
+/bin/sh: 1: -I: not found
+make: [Makefile:808: protobuf_cpp/linuxbluetooth.pb.h] Error 127 (ignored)
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/kismet.proto
+/bin/sh: 1: -I: not found
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/http.proto
+/bin/sh: 1: -I: not found
+/bin/sh: 1: -I: not found
+make: [Makefile:808: protobuf_cpp/datasource.pb.h] Error 127 (ignored)
+make: [Makefile:808: protobuf_cpp/eventbus.pb.h] Error 127 (ignored)
+make: [Makefile:806: protobuf_cpp/kismet.pb.cc] Error 127 (ignored)
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/datasource.proto
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/linuxbluetooth.proto
+cpp_out=./protobuf_cpp/ -I protobuf_definitions/ protobuf_definitions/eventbus.proto
+/bin/sh: 1: -I: not found
+```
+
+For extra interest, the failing command begins with `--flag` i.e. a flag
+passed to protoc, which Make then interprets as "ignore errors for this
+command", which means output files are not created but the build then
+continues and produces significantly more confusing errors such as:
+
+```
+kis_external.h:51:10: fatal error: protobuf_cpp/kismet.pb.h: No such file or directory
+```
+
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ configure.ac | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a967e3418..d3c961821 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -179,13 +179,13 @@ else
+ GCC_MINOR=$(echo $GCC_VERSION | cut -s -d'.' -f2)
+ GCC_PATCH=$(echo $GCC_VERSION | cut -s -d'.' -f3)
+
+- if test "$GCC_MAJOR"x == x; then
++ if test "$GCC_MAJOR"x = x; then
+ GCC_MAJOR=$GCC_VERSION
+ fi
+- if test "$GCC_MINOR"x == x; then
++ if test "$GCC_MINOR"x = x; then
+ GCC_MINOR=0
+ fi
+- if test "$GCC_PATCH"x == x; then
++ if test "$GCC_PATCH"x = x; then
+ GCC_PATCH=0
+ fi
+
+@@ -318,7 +318,7 @@ AC_ARG_ENABLE([element-typesafety],
+ esac],
+ [want_te_typesafety=no]
+ )
+-if test "$want_te_typesafety"x == "yes"x; then
++if test "$want_te_typesafety"x = "yes"x; then
+ AC_DEFINE(TE_TYPE_SAFETY, 1, Enforce runtime type safety)
+ else
+ AC_DEFINE(TE_TYPE_SAFETY, 0, Do not enforce runtime type safety)
+@@ -357,7 +357,7 @@ AS_IF([test "x$with_python_interpreter" != "x"],
+ []
+ )
+
+-if test "$want_python"x == "no"x; then
++if test "$want_python"x = "no"x; then
+ BUILD_PYTHON_MODULES=0
+ BUILD_CAPTURE_SDR_RTL433=0
+ BUILD_CAPTURE_SDR_RTLAMR=0
+@@ -367,11 +367,11 @@ if test "$want_python"x == "no"x; then
+ BUILD_CAPTURE_PROXY_ADSB=0
+ AC_MSG_WARN([Disabling Python and Python-related tools])
+ else
+- if test "$PYTHON_VERSION" == 3; then
++ if test "$PYTHON_VERSION" = 3; then
+ AC_PYTHON3_MODULE(setuptools)
+ fi
+
+- if test "$HAVE_PYMOD_SETUPTOOLS" == "no"; then
++ if test "$HAVE_PYMOD_SETUPTOOLS" = "no"; then
+ AC_MSG_ERROR([Missing python setuptools, if you would like to build without python entirely, use --disable-python-tools, otherwise install python setuptools for your python version])
+ else
+ DATASOURCE_BINS="$DATASOURCE_BINS \$(CAPTURE_SDR_RTL433) \$(CAPTURE_SDR_RTLAMR) \$(CAPTURE_SDR_RTLADSB) \$(CAPTURE_FREAKLABS_ZIGBEE)"
+@@ -675,7 +675,7 @@ CC="$CXX"
+ AC_CHECK_LIB([stdc++], [main],
+ foundcxxl="stdc++" CXXLIBS="$CXXLIBS -lstdc++")
+
+-if test "$foundcxxl"x == "x" -a "$caponly" != 1; then
++if test "$foundcxxl"x = "x" -a "$caponly" != 1; then
+ AC_MSG_ERROR(No standard stdc++ libraries found.)
+ fi
+ CC="$oCC"
+@@ -939,7 +939,7 @@ if test "${wantpcre}x" = "nox" -a "${needpcre2}x" = "yesx"; then
+ AC_MSG_ERROR([Can not combine --disable-pcre and --enable-require-pcre2])
+ fi
+
+-if test "$caponly" == 0; then
++if test "$caponly" = 0; then
+ if test "$HAVE_CXX17" = "1"; then
+ AC_MSG_CHECKING([Checking C++17 parallel functions])
+
+@@ -1017,7 +1017,7 @@ if test "$caponly" == 0; then
+ fi
+
+ # Dont' check pcre if we're only building datasources
+-if test "$caponly" == 0; then
++if test "$caponly" = 0; then
+ if test "$wantpcre" = "yes"; then
+ # Check for pcre2 first
+
+@@ -1046,22 +1046,22 @@ if test "$caponly" == 0; then
+ LIBS="$OLIBS"
+
+ if test "$pcre2" != "yes"; then
+- if test "${needpcre2}x" == "yesx"; then
++ if test "${needpcre2}x" = "yesx"; then
+ AC_MSG_ERROR([Could not find libpcre2 and --enable-require-pcre2 selected])
+ fi
+
+ AC_CHECK_LIB([pcre], [pcre_compile], pcre1=yes, pcre1=no)
+
+- if test "$pcre1" == "yes"; then
++ if test "$pcre1" = "yes"; then
+ AC_CHECK_HEADER([pcre.h], pcre1=yes, pcre1=no)
+ fi
+
+ fi
+
+- if test "$pcre2" == "yes"; then
++ if test "$pcre2" = "yes"; then
+ AC_DEFINE(HAVE_LIBPCRE2, 1, libpcre2 regex support)
+ LIBS="$LIBS -lpcre2-8"
+- elif test "$pcre1" == "yes"; then
++ elif test "$pcre1" = "yes"; then
+ AC_DEFINE(HAVE_LIBPCRE, 1, libpcre1 regex support)
+ LIBS="$LIBS -lpcre"
+ else
+@@ -1071,7 +1071,7 @@ if test "$caponly" == 0; then
+ fi
+
+ # Don't check for sqlite3 if we're only building datasources
+-if test "$caponly" == 0; then
++if test "$caponly" = 0; then
+ # Check for sqlite3
+ sql3l=no
+ AC_CHECK_LIB([sqlite3], [sqlite3_libversion], sql3l=yes, sql3l=no)
+@@ -1098,7 +1098,7 @@ if test "$caponly" == 0; then
+ fi # caponly
+
+ # don't check for openssl if we're only building datasources
+-if test "$caponly" == 0; then
++if test "$caponly" = 0; then
+ AX_CHECK_OPENSSL(AC_DEFINE(HAVE_OPENSSL, 1, openssl library present),
+ AC_MSG_ERROR(Failed to find OpenSSL library))
+ fi # caponly
+@@ -1212,7 +1212,7 @@ if test "$caponly" = 0 || test "$want_python" = "yes"; then
+ [ --with-protoc[=PATH] Custom location of the protoc protobuf compiler],
+ [ ])
+
+- if test x"$with_protoc" == "x"; then
++ if test x"$with_protoc" = "x"; then
+ PROTOCBIN=protoc
+ AC_CHECK_PROG(protoc, [protoc], yes)
+ if test x"$protoc" != x"yes"; then
+@@ -1254,7 +1254,7 @@ AC_ARG_WITH(protocc,
+ [ --with-protocc[=PATH] Custom location of the protoc protobuf compiler],
+ [ PROTOCCBIN=$withval ]
+ )
+-if test x"$with_protocc" == "x"; then
++if test x"$with_protocc" = "x"; then
+ PROTOCCBIN="protoc-c"
+ AC_CHECK_PROG(protocc, [protoc-c], yes)
+ if test x"$protocc" != x"yes"; then
+@@ -1282,7 +1282,7 @@ AC_ARG_ENABLE(btgeiger,
+ [want_btgeiger=no]
+ )
+
+-AS_IF([test "x$want_btgeiger" == "xyes"], [
++AS_IF([test "x$want_btgeiger" = "xyes"], [
+ AS_IF([test "x$want_python" != "xyes"], [
+ AC_MSG_ERROR([Can not enable btgeiger without enabling python])
+ ])
+@@ -1301,7 +1301,7 @@ AC_ARG_ENABLE(bladerf,
+ [want_bladerf=no]
+ )
+
+-AS_IF([test "x$want_bladerf" == "xyes"], [
++AS_IF([test "x$want_bladerf" = "xyes"], [
+ PKG_CHECK_MODULES([libbladeRF], [libbladeRF],
+ [
+ ],
+@@ -1529,7 +1529,7 @@ if test "$havenetlink" = "yes"; then
+ fi
+
+ if test "$nlname" != ""; then
+- if test "$picked_nl" == "tiny"; then
++ if test "$picked_nl" = "tiny"; then
+ NLLIBS="-lnl-tiny"
+ else
+ NLLIBS=`pkg-config --libs $nlname`
+@@ -1837,7 +1837,7 @@ AC_ARG_ENABLE(asan,
+ esac],
+ [want_asan=no]
+ )
+-if test "$want_asan" == "yes"; then
++if test "$want_asan" = "yes"; then
+ CPPFLAGS="$CPPFLAGS -fsanitize=address -fno-omit-frame-pointer"
+ LDFLAGS="$LDFLAGS -fsanitize=address"
+ fi
+@@ -1850,7 +1850,7 @@ AC_ARG_ENABLE(tsan,
+ esac],
+ [want_tsan=no]
+ )
+-if test "$want_tsan" == "yes"; then
++if test "$want_tsan" = "yes"; then
+ CPPFLAGS="$CPPFLAGS -fsanitize=thread -fno-omit-frame-pointer"
+ LDFLAGS="$LDFLAGS -fsanitize=thread"
+ fi
+--
+2.43.2
+
diff --git a/net-wireless/kismet/kismet-2023.07.1.ebuild b/net-wireless/kismet/kismet-2023.07.1.ebuild
index eef68f223f44..5e84c3b22723 100644
--- a/net-wireless/kismet/kismet-2023.07.1.ebuild
+++ b/net-wireless/kismet/kismet-2023.07.1.ebuild
@@ -26,7 +26,11 @@ else
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${COMMIT}"
- PATCHES=( "${DISTDIR}/${P}-stdint-fix.patch" )
+ PATCHES=(
+ "${DISTDIR}/${P}-stdint-fix.patch"
+ # https://github.com/kismetwireless/kismet/pull/517
+ "${FILESDIR}"/0001-configure.ac-bashism-fix-critical-existence-failure-.patch
+ )
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
fi
@@ -108,9 +112,7 @@ src_prepare() {
default
- if [ "${PV}" = "9999" ]; then
- eautoreconf
- fi
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2023-02-22 20:44 Rick Farina
0 siblings, 0 replies; 9+ messages in thread
From: Rick Farina @ 2023-02-22 20:44 UTC (permalink / raw
To: gentoo-commits
commit: eac4803723e269b65bed0847b3e57924d347d340
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 20:42:30 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 20:44:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac48037
net-wireless/kismet: fixup deps
Adjust deps per qa tools
Remove do nothing sed lines
Use bundled libfmt
Closes: https://bugs.gentoo.org/872608
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../files/kismet-2022.08.1-sandbox-fix.patch | 147 +++++++++++++++++++++
...smet-9999.ebuild => kismet-2022.08.1-r2.ebuild} | 35 ++---
net-wireless/kismet/kismet-9999.ebuild | 32 ++---
3 files changed, 180 insertions(+), 34 deletions(-)
diff --git a/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch
new file mode 100644
index 000000000000..358475cbc194
--- /dev/null
+++ b/net-wireless/kismet/files/kismet-2022.08.1-sandbox-fix.patch
@@ -0,0 +1,147 @@
+From 8264835a935de9c754c0ff28c632695103b2dc2f Mon Sep 17 00:00:00 2001
+From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
+Date: Fri, 6 Jan 2023 15:22:52 -0500
+Subject: [PATCH] python: Merge patch from Rick Farina / Zero_Chaos to make
+ gentoo not complain about python build parameters
+
+---
+ capture_bt_geiger/Makefile.in | 4 +++-
+ capture_freaklabs_zigbee/Makefile.in | 4 +++-
+ capture_proxy_adsb/Makefile.in | 4 +++-
+ capture_sdr_rtl433/Makefile.in | 4 +++-
+ capture_sdr_rtladsb/Makefile.in | 4 +++-
+ capture_sdr_rtlamr/Makefile.in | 4 +++-
+ 6 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/capture_bt_geiger/Makefile.in b/capture_bt_geiger/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_bt_geiger/Makefile.in
++++ b/capture_bt_geiger/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_proxy_adsb/Makefile.in b/capture_proxy_adsb/Makefile.in
+index d16ba601f..96ba6ceca 100644
+--- a/capture_proxy_adsb/Makefile.in
++++ b/capture_proxy_adsb/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
+index d16ba601f..96ba6ceca 100644
+--- a/capture_sdr_rtladsb/Makefile.in
++++ b/capture_sdr_rtladsb/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -22,7 +24,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
+diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
+index 646069fed..4f644535b 100644
+--- a/capture_sdr_rtlamr/Makefile.in
++++ b/capture_sdr_rtlamr/Makefile.in
+@@ -2,6 +2,8 @@ KIS_SRC_DIR ?= ..
+
+ include $(KIS_SRC_DIR)/Makefile.inc
+
++DESTDIR ?= /
++
+ DATASOURCE_NAME := $(shell $(PYTHON) setup.py --name)
+
+ PROTOBUF_DIR = $(KIS_SRC_DIR)/protobuf_definitions
+@@ -19,7 +21,7 @@ $(DATASOURCE_NAME)/kismetexternal/%_pb2.py: $(PROTOBUF_DIR)/%.proto
+ sed -i -E 's/^import kismet_/from . import kismet_/' $@
+
+ install:
+- $(PYTHON) setup.py install --root="/$(DESTDIR)" --prefix="$(prefix)"
++ $(PYTHON) setup.py install --root="$(DESTDIR)" --prefix="$(prefix)"
+
+ clean:
+ @-$(PYTHON) setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
similarity index 91%
copy from net-wireless/kismet/kismet-9999.ebuild
copy to net-wireless/kismet/kismet-2022.08.1-r2.ebuild
index c9e0a62e9649..fe8f8bc10d3c 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-2022.08.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools python-single-r1 udev systemd
@@ -40,13 +40,11 @@ CDEPEND="
${PYTHON_DEPS}
acct-user/kismet
acct-group/kismet
- networkmanager? ( net-misc/networkmanager:= )
- dev-libs/glib:=
- dev-libs/elfutils:=
- dev-libs/openssl:=
+ networkmanager? ( net-misc/networkmanager )
+ dev-libs/glib:2
+ dev-libs/elfutils
sys-libs/zlib:=
- dev-db/sqlite:=
- net-libs/libmicrohttpd:=
+ dev-db/sqlite:3
net-libs/libwebsockets:=[client,lejp]
kernel_linux? ( sys-libs/libcap
dev-libs/libnl:3
@@ -59,7 +57,6 @@ CDEPEND="
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/websockets[${PYTHON_USEDEP}]
')
- sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors:= )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
@@ -77,15 +74,22 @@ RDEPEND="${CDEPEND}
)
selinux? ( sec-policy/selinux-kismet )
"
+#switched back to bundled libfmt-8
+#https://bugs.gentoo.org/895252
+#<dev-libs/libfmt-9
DEPEND="${CDEPEND}
dev-libs/boost
- <dev-libs/libfmt-9
+ sys-libs/libcap
"
BDEPEND="virtual/pkgconfig"
+# https://bugs.gentoo.org/872608
+# drop after 2022.08*
+PATCHES=( "${FILESDIR}/${P}-sandbox-fix.patch" )
+
src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet_logging.conf || die
+ #sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+ # conf/kismet_logging.conf || die
#this was added to quiet macosx builds but it makes gcc builds noisier
sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
@@ -93,7 +97,9 @@ src_prepare() {
#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
rm -r boost || die
- rm -r fmt || die
+ #switched back to bundled libfmt-8
+ #https://bugs.gentoo.org/895252
+ #rm -r fmt || die
#dev-libs/jsoncpp
#rm -r json || die
@@ -107,11 +113,9 @@ src_prepare() {
eapply_user
if [ "${PV}" = "9999" ]; then
- sed -i -e 's|@mangrp@|root|g' Makefile.inc.in || die
eautoreconf
- else
- sed -i -e 's|@mangrp@|root|g' Makefile.inc || die
fi
+ # drop after 2022.08*
# VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
# https://github.com/kismetwireless/kismet/issues/427
# https://bugs.gentoo.org/864298
@@ -121,7 +125,6 @@ src_prepare() {
src_configure() {
econf \
$(use_enable libusb libusb) \
- $(use_enable libusb wifi-coconut) \
$(use_enable pcre) \
$(use_enable lm-sensors lmsensors) \
$(use_enable networkmanager libnm) \
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index c9e0a62e9649..913097640161 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit autotools python-single-r1 udev systemd
@@ -40,13 +40,12 @@ CDEPEND="
${PYTHON_DEPS}
acct-user/kismet
acct-group/kismet
- networkmanager? ( net-misc/networkmanager:= )
- dev-libs/glib:=
- dev-libs/elfutils:=
+ networkmanager? ( net-misc/networkmanager )
+ dev-libs/glib:2
+ dev-libs/elfutils
dev-libs/openssl:=
sys-libs/zlib:=
- dev-db/sqlite:=
- net-libs/libmicrohttpd:=
+ dev-db/sqlite:3
net-libs/libwebsockets:=[client,lejp]
kernel_linux? ( sys-libs/libcap
dev-libs/libnl:3
@@ -59,7 +58,6 @@ CDEPEND="
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/websockets[${PYTHON_USEDEP}]
')
- sys-libs/ncurses:=
lm-sensors? ( sys-apps/lm-sensors:= )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
@@ -77,15 +75,18 @@ RDEPEND="${CDEPEND}
)
selinux? ( sec-policy/selinux-kismet )
"
+#switched back to bundled libfmt-8
+#https://bugs.gentoo.org/895252
+#<dev-libs/libfmt-9
DEPEND="${CDEPEND}
dev-libs/boost
- <dev-libs/libfmt-9
+ sys-libs/libcap
"
BDEPEND="virtual/pkgconfig"
src_prepare() {
- sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
- conf/kismet_logging.conf || die
+ #sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+ # conf/kismet_logging.conf || die
#this was added to quiet macosx builds but it makes gcc builds noisier
sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
@@ -93,7 +94,9 @@ src_prepare() {
#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
rm -r boost || die
- rm -r fmt || die
+ #switched back to bundled libfmt-8
+ #https://bugs.gentoo.org/895252
+ #rm -r fmt || die
#dev-libs/jsoncpp
#rm -r json || die
@@ -107,15 +110,8 @@ src_prepare() {
eapply_user
if [ "${PV}" = "9999" ]; then
- sed -i -e 's|@mangrp@|root|g' Makefile.inc.in || die
eautoreconf
- else
- sed -i -e 's|@mangrp@|root|g' Makefile.inc || die
fi
- # VERSION was incorrectly removed in 4e490cf0b49a287e964df9c5e5c4067f6918909e upstream
- # https://github.com/kismetwireless/kismet/issues/427
- # https://bugs.gentoo.org/864298
- echo "${PV}" > VERSION
}
src_configure() {
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2019-07-25 18:21 Rick Farina
0 siblings, 0 replies; 9+ messages in thread
From: Rick Farina @ 2019-07-25 18:21 UTC (permalink / raw
To: gentoo-commits
commit: cd9f57bb69091c6675fcd77730e1fec31cf98b9d
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 18:20:46 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 18:21:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9f57bb
net-wireless/kismet: new init script
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/files/kismet.initd-r3 | 11 +++++++++++
net-wireless/kismet/kismet-9999.ebuild | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-wireless/kismet/files/kismet.initd-r3 b/net-wireless/kismet/files/kismet.initd-r3
new file mode 100644
index 00000000000..dce3158973f
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r3
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="kismet"
+command="/usr/bin/kismet"
+command_args="--no-ncurses ${KISMET_SERVER_OPTIONS}"
+supervisor="supervise-daemon"
+output_log="/var/log/kismet.log"
+error_log="${output_log}"
+pidfile="/run/kismet.pid"
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 77ae6098f3e..72387056e69 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -104,7 +104,7 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
+ newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2019-07-22 1:23 Rick Farina
0 siblings, 0 replies; 9+ messages in thread
From: Rick Farina @ 2019-07-22 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 7cd670c33d7845a89c0dcc8dc9b3f49be00ce571
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 22 01:22:48 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jul 22 01:23:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd670c3
net-wireless/kismet: bump and fixes
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/Manifest | 1 +
.../files/{kismet.initd-r1 => kismet.initd-r2} | 16 +++------
...{kismet-9999.ebuild => kismet-2019.07.2.ebuild} | 37 ++++++++++++++++++--
net-wireless/kismet/kismet-9999.ebuild | 39 +++++++++++++++++++---
4 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index ead4cd763dc..2ad9f0bf6e7 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1,3 @@
DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
+DIST kismet-2019-07-R2.tar.xz 3022928 BLAKE2B 8f7e26ea9374dfd7689b9e03603432b0aaf9e9b0c82ce848220a1c249e67f08afc07595e86d232e1b99e84ea5cd4fec328118d1e84a917363a60879f4abf5349 SHA512 442becf849cad06447023f9cff7a5547c681a36a34a125e617651a3ffe38b4da9fdf04b9a9d9d1ff045f43ea18324a328cee7515d7508f40ab2119d3f8adeee9
diff --git a/net-wireless/kismet/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r2
similarity index 58%
rename from net-wireless/kismet/files/kismet.initd-r1
rename to net-wireless/kismet/files/kismet.initd-r2
index 4c189161196..bc4374e6801 100644
--- a/net-wireless/kismet/files/kismet.initd-r1
+++ b/net-wireless/kismet/files/kismet.initd-r2
@@ -2,25 +2,17 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-checkconfig() {
- if [ ! -e /etc/kismet.conf ]; then
- eerror "Configuration file /etc/kismet.conf not found"
- return 1
- fi
-}
-
start() {
- checkconfig || return 1
-
- ebegin "Starting kismet server"
+ ebegin "Starting kismet"
start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
--background --make-pidfile --exec /usr/bin/kismet \
- -- ${KISMET_SERVER_OPTIONS}
+ -1 /var/log/kismet.log -2 /var/log/kismet.log \
+ -- --no-ncurses ${KISMET_SERVER_OPTIONS}
eend ${?}
}
stop() {
- ebegin "Stopping kismet server"
+ ebegin "Stopping kismet"
start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
eend ${?}
}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-2019.07.2.ebuild
similarity index 72%
copy from net-wireless/kismet/kismet-9999.ebuild
copy to net-wireless/kismet/kismet-2019.07.2.ebuild
index 9361c44b179..67e7039b561 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-2019.07.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PYTHON_COMPAT=( python2_7 )
@@ -25,7 +25,7 @@ else
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${COMMIT}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc x86"
fi
DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
$(use_enable lm_sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
+ --sysconfdir=/etc/kismet \
--disable-optimization
}
@@ -103,7 +104,7 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
+ newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
}
@@ -128,3 +129,33 @@ pkg_preinst() {
ewarn "your user to the kismet group."
fi
}
+
+migrate_config() {
+ einfo "Kismet Configuration files are now read from /etc/kismet/"
+ if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+ ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+ ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+ fi
+ if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+ mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+ ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+ elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+ ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+ ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+ fi
+}
+
+pkg_postinst() {
+ if [ -n "${REPLACING_VERSIONS}" ]; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test ${v} -lt 2019.07.2 ; then
+ migrate_config
+ break
+ fi
+ if ver_test ${v} -eq 9999 ; then
+ migrate_config
+ break
+ fi
+ done
+ fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9361c44b179..c436f6bff40 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
inherit autotools eutils multilib user python-single-r1
@@ -25,7 +25,7 @@ else
#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
#S="${WORKDIR}/${PN}-${COMMIT}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ppc x86"
fi
DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
$(use_enable lm_sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
+ --sysconfdir=/etc/kismet \
--disable-optimization
}
@@ -103,7 +104,7 @@ src_install() {
#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
dodoc CHANGELOG README*
- newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
+ newinitd "${FILESDIR}"/${PN}.initd-r2 kismet
newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
}
@@ -128,3 +129,33 @@ pkg_preinst() {
ewarn "your user to the kismet group."
fi
}
+
+migrate_config() {
+ einfo "Kismet Configuration files are now read from /etc/kismet/"
+ if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+ ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+ ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+ fi
+ if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+ mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+ ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+ elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+ ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+ ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+ fi
+}
+
+pkg_postinst() {
+ if [ -n "${REPLACING_VERSIONS}" ]; then
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test ${v} -lt 2019.07.2 ; then
+ migrate_config
+ break
+ fi
+ if ver_test ${v} -eq 9999 ; then
+ migrate_config
+ break
+ fi
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2019-01-07 19:45 Rick Farina
0 siblings, 0 replies; 9+ messages in thread
From: Rick Farina @ 2019-01-07 19:45 UTC (permalink / raw
To: gentoo-commits
commit: a9cddb7888fc5e917b7aeec7508b3f392ff20216
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 17:27:26 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 19:44:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cddb78
net-wireless/kismet: new beta
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/kismet/Manifest | 1 +
net-wireless/kismet/files/fix-setuptools4.patch | 91 ++++++++++++++++++++++
...met-9999.ebuild => kismet-2019.01_beta2.ebuild} | 15 ++--
net-wireless/kismet/kismet-9999.ebuild | 15 ++--
4 files changed, 104 insertions(+), 18 deletions(-)
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index fc94567a992..2e98cbd22de 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,2 +1,3 @@
DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
DIST kismet-2018-08-BETA1.tar.xz 2043136 BLAKE2B f24af4250bb0238073380514413d9501e449cf40507d7a96ac868d76acb34af81b9bf4a49c9b6197b6b903ab33e2318bb5efa22876cc2070e3878ebf030d592c SHA512 09eab9d648f011c95b8632c666990d79f9998465b051a65357f53af19a135a5d58df3025ec60f9ef9a7b7d9b5622d2332bb2defbffd21ca0e25e2e4090ceae2f
+DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a895fae0012ccb7a9cf03a700c96562a5ae62530b1138f509df5f0af91362a9658eae7916a9c643cef6e1630fe616d949017 SHA512 1384630ea0ba12c157928696aab502406c5e521765e420459ab049e3205e7d7bfb472c6a1a88c1268fd8235b24b615a03ce4b91f0974adc24f47d00709ef9d4b
diff --git a/net-wireless/kismet/files/fix-setuptools4.patch b/net-wireless/kismet/files/fix-setuptools4.patch
new file mode 100644
index 00000000000..c2db673529e
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools4.patch
@@ -0,0 +1,91 @@
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index cfbf99b0..c2e68453 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+
+ clean:
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index e33f7de5..e1be587d 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ # These are now part of the setup.py install
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+diff --git a/capture_sdr_rtladsb/Makefile.in b/capture_sdr_rtladsb/Makefile.in
+index 8a4f7647..8239f434 100644
+--- a/capture_sdr_rtladsb/Makefile.in
++++ b/capture_sdr_rtladsb/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) aircraft_db.csv $(ETC)/kismet_aircraft_db.csv
+ # These are now part of the setup.py install
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+diff --git a/capture_sdr_rtlamr/Makefile.in b/capture_sdr_rtlamr/Makefile.in
+index 1b780be1..3548adc5 100644
+--- a/capture_sdr_rtlamr/Makefile.in
++++ b/capture_sdr_rtlamr/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ # These are now part of the setup.py install
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ # $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
+index 036541a0..fc660dfe 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ protobuf:
+ $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON2) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-2019.01_beta2.ebuild
similarity index 93%
copy from net-wireless/kismet/kismet-9999.ebuild
copy to net-wireless/kismet/kismet-2019.01_beta2.ebuild
index 9eecff37a2f..5823d5c776b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-2019.01_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,18 +7,15 @@ PYTHON_COMPAT=( python2_7 )
inherit autotools eutils multilib user python-single-r1
-MY_P=${P/\./-}
-MY_P=${MY_P/_beta/-BETA}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
- SRC_URI=""
inherit git-r3
- KEYWORDS=""
RESTRICT="strip"
else
+ MY_P=${P/\./-}
+ MY_P=${MY_P/_beta/-BETA}
+ MY_P=${MY_P/./-R}
+ S=${WORKDIR}/${MY_P/BETA/beta}
SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
fi
@@ -67,7 +64,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
- eapply "${FILESDIR}"/fix-setuptools3.patch
+ eapply "${FILESDIR}"/fix-setuptools4.patch
eapply_user
if [ "${PV}" = "9999" ]; then
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9eecff37a2f..5823d5c776b 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,18 +7,15 @@ PYTHON_COMPAT=( python2_7 )
inherit autotools eutils multilib user python-single-r1
-MY_P=${P/\./-}
-MY_P=${MY_P/_beta/-BETA}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://www.kismetwireless.net/${PN}.git"
- SRC_URI=""
inherit git-r3
- KEYWORDS=""
RESTRICT="strip"
else
+ MY_P=${P/\./-}
+ MY_P=${MY_P/_beta/-BETA}
+ MY_P=${MY_P/./-R}
+ S=${WORKDIR}/${MY_P/BETA/beta}
SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
fi
@@ -67,7 +64,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
- eapply "${FILESDIR}"/fix-setuptools3.patch
+ eapply "${FILESDIR}"/fix-setuptools4.patch
eapply_user
if [ "${PV}" = "9999" ]; then
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2018-05-29 19:14 Richard Farina
0 siblings, 0 replies; 9+ messages in thread
From: Richard Farina @ 2018-05-29 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 6fb408c56cf0aec0187cef4534b0974e6e140d7a
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 19:14:20 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May 29 19:14:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb408c5
net-wireless/kismet: upstream re-broke setuptools
Package-Manager: Portage-2.3.38, Repoman-2.3.9
net-wireless/kismet/files/fix-setuptools.patch | 73 ++++++++++++++++++++++++++
net-wireless/kismet/kismet-9999.ebuild | 1 +
2 files changed, 74 insertions(+)
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
new file mode 100644
index 00000000000..a86f66b4447
--- /dev/null
+++ b/net-wireless/kismet/files/fix-setuptools.patch
@@ -0,0 +1,73 @@
+commit e31263b50acd960f7bb0c34c0396383319d7da30
+Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
+Date: Tue Apr 24 11:38:17 2018 -0400
+
+ make setuptools respect DESTDIR
+
+ thanks to mgorny for pointint it out
+
+diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
+index 75c85da9..980c417a 100644
+--- a/capture_freaklabs_zigbee/Makefile.in
++++ b/capture_freaklabs_zigbee/Makefile.in
+@@ -6,7 +6,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+
+ clean:
+diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
+index 23446edc..babc63f4 100644
+--- a/capture_sdr_rtl433/Makefile.in
++++ b/capture_sdr_rtl433/Makefile.in
+@@ -7,7 +7,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
+ $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
+
+diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
+index 036541a0..fc660dfe 100644
+--- a/python_modules/KismetExternal/Makefile
++++ b/python_modules/KismetExternal/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ protobuf:
+ $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
+diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetLog/Makefile
++++ b/python_modules/KismetLog/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON2) ./setup.py clean
+diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
+index d0d6f784..60e1eac1 100644
+--- a/python_modules/KismetRest/Makefile
++++ b/python_modules/KismetRest/Makefile
+@@ -4,7 +4,7 @@ all:
+ $(PYTHON2) ./setup.py build
+
+ install:
+- $(PYTHON2) ./setup.py install
++ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
+
+ clean:
+ @-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 8005063ea99..2a6321ed512 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,6 +67,7 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
+ epatch "${FILESDIR}"/fix-setuptools.patch
eapply_user
eautoreconf
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2018-04-26 14:29 Richard Farina
0 siblings, 0 replies; 9+ messages in thread
From: Richard Farina @ 2018-04-26 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 2fe3f3b61d88db7871e6f265e0af6172adcef7ff
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 14:28:53 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 14:28:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe3f3b6
net-wireless/kismet: upstream fixed setuptools
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-wireless/kismet/files/fix-setuptools.patch | 73 --------------------------
net-wireless/kismet/kismet-9999.ebuild | 1 -
2 files changed, 74 deletions(-)
diff --git a/net-wireless/kismet/files/fix-setuptools.patch b/net-wireless/kismet/files/fix-setuptools.patch
deleted file mode 100644
index a86f66b4447..00000000000
--- a/net-wireless/kismet/files/fix-setuptools.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit e31263b50acd960f7bb0c34c0396383319d7da30
-Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Date: Tue Apr 24 11:38:17 2018 -0400
-
- make setuptools respect DESTDIR
-
- thanks to mgorny for pointint it out
-
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index 75c85da9..980c417a 100644
---- a/capture_freaklabs_zigbee/Makefile.in
-+++ b/capture_freaklabs_zigbee/Makefile.in
-@@ -6,7 +6,7 @@ all:
- $(PYTHON2) ./setup.py build
-
- install:
-- $(PYTHON2) ./setup.py install
-+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
-
- clean:
-diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
-index 23446edc..babc63f4 100644
---- a/capture_sdr_rtl433/Makefile.in
-+++ b/capture_sdr_rtl433/Makefile.in
-@@ -7,7 +7,7 @@ all:
- $(PYTHON2) ./setup.py build
-
- install:
-- $(PYTHON2) ./setup.py install
-+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
-
-diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
-index 036541a0..fc660dfe 100644
---- a/python_modules/KismetExternal/Makefile
-+++ b/python_modules/KismetExternal/Makefile
-@@ -4,7 +4,7 @@ all:
- $(PYTHON2) ./setup.py build
-
- install:
-- $(PYTHON2) ./setup.py install
-+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
-
- protobuf:
- $(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
-diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetLog/Makefile
-+++ b/python_modules/KismetLog/Makefile
-@@ -4,7 +4,7 @@ all:
- $(PYTHON2) ./setup.py build
-
- install:
-- $(PYTHON2) ./setup.py install
-+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
-
- clean:
- @-$(PYTHON2) ./setup.py clean
-diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetRest/Makefile
-+++ b/python_modules/KismetRest/Makefile
-@@ -4,7 +4,7 @@ all:
- $(PYTHON2) ./setup.py build
-
- install:
-- $(PYTHON2) ./setup.py install
-+ $(PYTHON2) ./setup.py install --root=$(DESTDIR)
-
- clean:
- @-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 60b19468d9e..3579b817443 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -67,7 +67,6 @@ src_prepare() {
sed -i -e 's| -s||g' \
-e 's|@mangrp@|root|g' Makefile.in
- eapply "${FILESDIR}/fix-setuptools.patch"
eapply_user
eautoreconf
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/
@ 2016-03-20 9:54 David Seifert
0 siblings, 0 replies; 9+ messages in thread
From: David Seifert @ 2016-03-20 9:54 UTC (permalink / raw
To: gentoo-commits
commit: f131b7d4161f3fee9daade60847ee86f1325f49d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 09:53:54 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 09:54:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f131b7d4
net-wireless/kismet: Fix ncurses linking by using PKG_CHECK_MODULES
* Also fix missing 'm4/ax_pthread.m4' by including in patch
Package-Manager: portage-2.2.28
.../kismet/files/kismet-2016.01.1-tinfo.patch | 404 ++++++++++++++++++++-
net-wireless/kismet/kismet-2016.01.1.ebuild | 7 +-
2 files changed, 398 insertions(+), 13 deletions(-)
diff --git a/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch b/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch
index 6294c80..cd09037 100644
--- a/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch
+++ b/net-wireless/kismet/files/kismet-2016.01.1-tinfo.patch
@@ -1,11 +1,397 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -423,6 +423,8 @@
- foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
- fi
+--- kismet-2016-01-R1/configure.ac
++++ kismet-2016-01-R1/configure.ac
+@@ -416,48 +416,21 @@
+ AC_SUBST(wantclient)
-+ AC_SEARCH_LIBS([stdscr], tinfo ncurses,curseaux="$curseaux $ac_res")
+ # Add additional cflags since some distros bury panel.h
+-CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+
+ termcontrol="none";
+
+ if test "$wantclient" = "yes"; then
+- OLIBS="$LIBS"
+- AC_CHECK_LIB([ncurses], [initscr],
+- AC_DEFINE(HAVE_LIBNCURSES, 1, NCurses terminal lib) \
+- foundlcurses=yes curseaux="-lncurses" termcontrol="ncurses" )
+-
+- if test "$foundlcurses" != "yes"; then
+- AC_CHECK_LIB([curses], [initscr],
+- AC_DEFINE(HAVE_LIBCURSES, 1, Curses terminal lib) \
+- foundlcurses=yes curseaux="-lcurses" termcontrol="curses" )
+- fi
+-
+- if test "$foundlcurses" != "yes"; then
+- AC_MSG_ERROR(Failed to find libcurses or libncurses. Install them or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)
+- fi
+-
+- if test "$termcontrol" = "ncurses"; then
+- AC_CHECK_HEADER([ncurses.h], [foundhcurses=yes])
+- else
+- AC_CHECK_HEADER([curses.h], [foundhcurses=yes])
+- fi
+-
+- if test "$foundhcurses" != "yes"; then
+- AC_MSG_ERROR(Failed to find curses.h or ncurses.h. You probably need to install the curses-devel package from your distribution)
+- fi
+-
+- LIBS="$LIBS $curseaux"
+- AC_CHECK_LIB([panel], [new_panel],
+- AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib)
+- curseaux="$curseaux -lpanel",
+- AC_MSG_ERROR(Failed to find libpanel extension to curses/ncurses. Install it, or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.))
+-
+- AC_CHECK_HEADER([panel.h], [foundhpanel=yes])
+- if test "$foundhpanel" != "yes"; then
+- AC_MSG_ERROR(Failed to find panel.h curses extension header. You probably need to install the curses-devel or panel-devel package from your distribution.)
+- fi
+-
+- LIBS="$OLIBS"
++ PKG_CHECK_MODULES([NCURSES],[ncurses],[AC_DEFINE([HAVE_LIBNCURSES],[1],[Ncurses terminal library])])
++ foundlcurses=yes
++ curseaux="${NCURSES_LIBS}"
++ termcontrol="ncurses"
++ foundhcurses=yes
++ CPPFLAGS="$CPPFLAGS ${NCURSES_CFLAGS}"
++
++ PKG_CHECK_MODULES([PANEL],[panel],[AC_DEFINE([HAVE_LIBPANEL],[1],[Panel terminal lib])])
++ curseaux="$curseaux ${PANEL_LIBS}"
++ foundhpanel=yes
++ CPPFLAGS="$CPPFLAGS ${PANEL_CFLAGS}"
+
+ CLIENTCLIBS="$CLIENTCLIBS $curseaux"
+ fi
+--- kismet-2016-01-R1/m4/ax_pthread.m4
++++ kismet-2016-01-R1/m4/ax_pthread.m4
+@@ -0,0 +1,332 @@
++# ===========================================================================
++# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++# This macro figures out how to build C programs using POSIX threads. It
++# sets the PTHREAD_LIBS output variable to the threads library and linker
++# flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++# flags that are needed. (The user can also force certain compiler
++# flags/libs to be tested by setting these environment variables.)
++#
++# Also sets PTHREAD_CC to any special C compiler that is needed for
++# multi-threaded programs (defaults to the value of CC otherwise). (This
++# is necessary on AIX to use the special cc_r compiler alias.)
++#
++# NOTE: You are assumed to not only compile your program with these flags,
++# but also link it with them as well. e.g. you should link with
++# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++# If you are only building threads programs, you may wish to use these
++# variables in your default LIBS, CFLAGS, and CC:
++#
++# LIBS="$PTHREAD_LIBS $LIBS"
++# CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++# CC="$PTHREAD_CC"
++#
++# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++# (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++# PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++# PTHREAD_CFLAGS.
++#
++# ACTION-IF-FOUND is a list of shell commands to run if a threads library
++# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++# is not found. If ACTION-IF-FOUND is not specified, the default action
++# will define HAVE_PTHREAD.
++#
++# Please let the authors know if this macro fails on any platform, or if
++# you have any other suggestions or comments. This macro was based on work
++# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++# Alejandro Forero Cuervo to the autoconf macro repository. We are also
++# grateful for the helpful feedback of numerous users.
++#
++# Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++# This program is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License as published by the
++# Free Software Foundation, either version 3 of the License, or (at your
++# option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++# Public License for more details.
++#
++# You should have received a copy of the GNU General Public License along
++# with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++# As a special exception, the respective Autoconf Macro's copyright owner
++# gives unlimited permission to copy, distribute and modify the configure
++# scripts that are the output of Autoconf when processing the Macro. You
++# need not follow the terms of the GNU General Public License when using
++# or distributing such scripts, even though portions of the text of the
++# Macro appear in them. The GNU General Public License (GPL) does govern
++# all other use of the material that constitutes the Autoconf Macro.
++#
++# This special exception to the GPL applies to versions of the Autoconf
++# Macro released by the Autoconf Archive. When you make and distribute a
++# modified version of the Autoconf Macro, you may extend this special
++# exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++ save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++ save_LIBS="$LIBS"
++ LIBS="$PTHREAD_LIBS $LIBS"
++ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++ AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++ AC_MSG_RESULT([$ax_pthread_ok])
++ if test x"$ax_pthread_ok" = xno; then
++ PTHREAD_LIBS=""
++ PTHREAD_CFLAGS=""
++ fi
++ LIBS="$save_LIBS"
++ CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try. Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important. Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++# other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++# doesn't hurt to check since this sometimes defines pthreads too;
++# also defines -D_REENTRANT)
++# ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++ solaris*)
++
++ # On Solaris (at least, for some versions), libc contains stubbed
++ # (non-functional) versions of the pthreads routines, so link-based
++ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
++ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
++ # a function called by this macro, so we could check for that, but
++ # who knows whether they'll stub that too in a future libc.) So,
++ # we'll just look for -pthreads and -lpthread first:
++
++ ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++ ;;
++
++ darwin*)
++ ax_pthread_flags="-pthread $ax_pthread_flags"
++ ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++ [AC_MSG_RESULT([yes])],
++ [ax_pthread_extra_flags=
++ AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++ case $flag in
++ none)
++ AC_MSG_CHECKING([whether pthreads work without any flags])
++ ;;
++
++ -*)
++ AC_MSG_CHECKING([whether pthreads work with $flag])
++ PTHREAD_CFLAGS="$flag"
++ ;;
++
++ pthread-config)
++ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++ if test x"$ax_pthread_config" = xno; then continue; fi
++ PTHREAD_CFLAGS="`pthread-config --cflags`"
++ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++ ;;
++
++ *)
++ AC_MSG_CHECKING([for the pthreads library -l$flag])
++ PTHREAD_LIBS="-l$flag"
++ ;;
++ esac
++
++ save_LIBS="$LIBS"
++ save_CFLAGS="$CFLAGS"
++ LIBS="$PTHREAD_LIBS $LIBS"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++ # Check for various functions. We must include pthread.h,
++ # since some functions may be macros. (On the Sequent, we
++ # need a special flag -Kthread to make this header compile.)
++ # We check for pthread_join because it is in -lpthread on IRIX
++ # while pthread_create is in libc. We check for pthread_attr_init
++ # due to DEC craziness with -lpthreads. We check for
++ # pthread_cleanup_push because it is one of the few pthread
++ # functions on Solaris that doesn't have a non-functional libc stub.
++ # We try pthread_create on general principles.
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++ static void routine(void *a) { a = 0; }
++ static void *start_routine(void *a) { return a; }],
++ [pthread_t th; pthread_attr_t attr;
++ pthread_create(&th, 0, start_routine, 0);
++ pthread_join(th, 0);
++ pthread_attr_init(&attr);
++ pthread_cleanup_push(routine, 0);
++ pthread_cleanup_pop(0) /* ; */])],
++ [ax_pthread_ok=yes],
++ [])
++
++ LIBS="$save_LIBS"
++ CFLAGS="$save_CFLAGS"
++
++ AC_MSG_RESULT([$ax_pthread_ok])
++ if test "x$ax_pthread_ok" = xyes; then
++ break;
++ fi
++
++ PTHREAD_LIBS=""
++ PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++ save_LIBS="$LIBS"
++ LIBS="$PTHREAD_LIBS $LIBS"
++ save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++ AC_MSG_CHECKING([for joinable pthread attribute])
++ attr_name=unknown
++ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++ [int attr = $attr; return attr /* ; */])],
++ [attr_name=$attr; break],
++ [])
++ done
++ AC_MSG_RESULT([$attr_name])
++ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++ AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++ [Define to necessary symbol if this constant
++ uses a non-standard name on your system.])
++ fi
++
++ AC_MSG_CHECKING([if more special flags are required for pthreads])
++ flag=no
++ case ${host_os} in
++ aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++ osf* | hpux*) flag="-D_REENTRANT";;
++ solaris*)
++ if test "$GCC" = "yes"; then
++ flag="-D_REENTRANT"
++ else
++ # TODO: What about Clang on Solaris?
++ flag="-mt -D_REENTRANT"
++ fi
++ ;;
++ esac
++ AC_MSG_RESULT([$flag])
++ if test "x$flag" != xno; then
++ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++ fi
++
++ AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++ [ax_cv_PTHREAD_PRIO_INHERIT], [
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++ [[int i = PTHREAD_PRIO_INHERIT;]])],
++ [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++ [ax_cv_PTHREAD_PRIO_INHERIT=no])
++ ])
++ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++ LIBS="$save_LIBS"
++ CFLAGS="$save_CFLAGS"
++
++ # More AIX lossage: compile with *_r variant
++ if test "x$GCC" != xyes; then
++ case $host_os in
++ aix*)
++ AS_CASE(["x/$CC"],
++ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++ [#handle absolute path differently from PATH based program lookup
++ AS_CASE(["x$CC"],
++ [x/*],
++ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++ ;;
++ esac
++ fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
+
- if test "$foundlcurses" != "yes"; then
- AC_MSG_ERROR(Failed to find libcurses or libncurses. Install them or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)
- fi
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++ :
++else
++ ax_pthread_ok=no
++ $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
diff --git a/net-wireless/kismet/kismet-2016.01.1.ebuild b/net-wireless/kismet/kismet-2016.01.1.ebuild
index 8b4db9a..f46bb29 100644
--- a/net-wireless/kismet/kismet-2016.01.1.ebuild
+++ b/net-wireless/kismet/kismet-2016.01.1.ebuild
@@ -34,7 +34,7 @@ CDEPEND="net-wireless/wireless-tools
)
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
- client? ( sys-libs/ncurses:= )
+ client? ( sys-libs/ncurses:0= )
!arm? ( speech? ( app-accessibility/flite ) )
ruby? ( dev-lang/ruby:* )
plugin-btscan? ( net-wireless/bluez )
@@ -51,9 +51,8 @@ RDEPEND="${CDEPEND}
"
src_prepare() {
- #aclocal-1.15: error: configure.ac:4: file 'm4/ax_pthread.m4' does not exist
- #epatch "${FILESDIR}"/${P}-tinfo.patch
- #eautoreconf
+ epatch -p1 "${FILESDIR}"/${P}-tinfo.patch
+ eautoreconf
sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
conf/kismet.conf.in
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-04-07 6:17 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-06 2:09 [gentoo-commits] repo/gentoo:master commit in: net-wireless/kismet/, net-wireless/kismet/files/ Richard Farina
-- strict thread matches above, loose matches on Subject: below --
2024-04-07 6:17 Sam James
2023-02-22 20:44 Rick Farina
2019-07-25 18:21 Rick Farina
2019-07-22 1:23 Rick Farina
2019-01-07 19:45 Rick Farina
2018-05-29 19:14 Richard Farina
2018-04-26 14:29 Richard Farina
2016-03-20 9:54 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox