Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ee167d992ede32000fa62424a4cc9d0290f0f954)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ee167d992ede32000fa62424a4cc9d0290f0f954)
  • Date: Mon, 4 Jun 2012 15:10:39 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/libpcap/BUILD | 3 +++
net/libpcap/DEPENDS | 11 ++++++++++-
net/libpcap/HISTORY | 6 ++++++
net/libpcap/PRE_BUILD | 6 ++++++
net/libpcap/libnl-3.patch | 21 +++++++++++++++++++++
5 files changed, 46 insertions(+), 1 deletion(-)

New commits:
commit ee167d992ede32000fa62424a4cc9d0290f0f954
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libpcap: fixed libnl support

diff --git a/net/libpcap/BUILD b/net/libpcap/BUILD
new file mode 100755
index 0000000..6f9ce09
--- /dev/null
+++ b/net/libpcap/BUILD
@@ -0,0 +1,3 @@
+CFLAGS="-I$INSTALL_ROOT/usr/include/libnl3 $CFLAGS" &&
+
+default_build
diff --git a/net/libpcap/DEPENDS b/net/libpcap/DEPENDS
index 46f3a98..1d85d08 100755
--- a/net/libpcap/DEPENDS
+++ b/net/libpcap/DEPENDS
@@ -1,3 +1,12 @@
depends flex &&
depends bison &&
-optional_depends libnl '' '--without-libnl' 'nettlink support'
+
+optional_depends BLUEZ \
+ "--enable-bluetooth" \
+ "--disable-bluetooth" \
+ "for Bluetooth support" &&
+
+optional_depends libnl \
+ "--with-libnl" \
+ "--without-libnl" \
+ "for netlink support"
diff --git a/net/libpcap/HISTORY b/net/libpcap/HISTORY
index 7b5d9cb..2b3a32b 100644
--- a/net/libpcap/HISTORY
+++ b/net/libpcap/HISTORY
@@ -1,3 +1,9 @@
+2012-06-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: added, for missing flags
+ * DEPENDS: added optional depends on BLUEZ; corrected flags
+ * PRE_BUILD: added, to apply the patch
+ * libnl-3.patch: added, to make libnl dependency actually work
+
2012-01-03 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.2.1

diff --git a/net/libpcap/PRE_BUILD b/net/libpcap/PRE_BUILD
new file mode 100755
index 0000000..8a3b86d
--- /dev/null
+++ b/net/libpcap/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/libnl-3.patch" &&
+
+autoconf
diff --git a/net/libpcap/libnl-3.patch b/net/libpcap/libnl-3.patch
new file mode 100644
index 0000000..2ce5936
--- /dev/null
+++ b/net/libpcap/libnl-3.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig 2012-01-02 04:47:37.000000000 +0400
++++ configure.in 2012-06-04 23:41:10.871001151 +0400
+@@ -431,14 +431,14 @@
+
+ if test x$with_libnl != xno ; then
+ #
+- # Try libnl 2.x first.
++ # Try libnl 3.x first.
+ #
+- AC_CHECK_LIB(nl, nl_socket_alloc,
++ AC_CHECK_LIB(nl-3, nl_socket_alloc,
+ [
+ #
+- # Yes, we have libnl 2.x.
++ # Yes, we have libnl 3.x.
+ #
+- LIBS="-lnl-genl -lnl $LIBS"
++ LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is
version 2.x])
+ ],



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ee167d992ede32000fa62424a4cc9d0290f0f954), Vlad Glagolev, 06/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page