Patchwork [1/1] Added package definitions for - knock: a port knocking daemon - pyzmq: python language bindings for zeromq

login
register
mail settings
Submitter Michael Rommel
Date Aug. 30, 2013, 7:09 p.m.
Message ID <1377889768-32471-1-git-send-email-rommel@layer-7.net>
Download mbox | patch
Permalink /patch/271403/
State Superseded
Headers show

Comments

Michael Rommel - Aug. 30, 2013, 7:09 p.m.
Hi,

this is my first patch for buildroot. I don't know if/how I should have separated the two added packages, could not find anything about this in the documentation. I stuck to the recommendations given in chapter 10.1.

Please note that the reason for the hardcoded version number in the python-pyzmq package is due to the following dilemma:
- the setup.py script tries to compile a test C program and runs it, to retrieve a version string
- if the cross compiler links it together, the result cannot be run, due to different architectures
- if the host compiler would compile/link it, it would not link with the library version inside buildroot

If anybody has a recipe, how to deal with that, I am more than happy to change the patch!

Thanks,

 Michael.


Signed-off-by: Michael Rommel <rommel@layer-7.net>
---
 package/Config.in                |    2 ++
 package/knock/Config.in          |   12 ++++++++++
 package/knock/knock.mk           |   17 +++++++++++++
 package/python-pyzmq/Config.in   |   12 ++++++++++
 package/python-pyzmq/pyzmq.mk    |   49 ++++++++++++++++++++++++++++++++++++++
 package/python-pyzmq/pyzmq.patch |   28 ++++++++++++++++++++++
 6 files changed, 120 insertions(+)
 create mode 100644 package/knock/Config.in
 create mode 100644 package/knock/knock.mk
 create mode 100644 package/python-pyzmq/Config.in
 create mode 100644 package/python-pyzmq/pyzmq.mk
 create mode 100644 package/python-pyzmq/pyzmq.patch

Patch

diff --git a/package/Config.in b/package/Config.in
index 97cd7da..2f636b6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -363,6 +363,7 @@  source "package/python-protobuf/Config.in"
 source "package/python-pygame/Config.in"
 source "package/python-pyparsing/Config.in"
 source "package/python-pyro/Config.in"
+source "package/python-pyzmq/Config.in"
 source "package/python-serial/Config.in"
 source "package/python-setuptools/Config.in"
 source "package/python-thrift/Config.in"
@@ -754,6 +755,7 @@  source "package/ipset/Config.in"
 source "package/iptables/Config.in"
 source "package/iw/Config.in"
 source "package/kismet/Config.in"
+source "package/knock/Config.in"
 source "package/lighttpd/Config.in"
 source "package/linknx/Config.in"
 source "package/links/Config.in"
diff --git a/package/knock/Config.in b/package/knock/Config.in
new file mode 100644
index 0000000..8dc61bb
--- /dev/null
+++ b/package/knock/Config.in
@@ -0,0 +1,12 @@ 
+config BR2_PACKAGE_KNOCK
+	bool "knock"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  A port knocking implementation.
+	  Provides a daemon and a user application. Port knocking can be used
+	  to run an arbitrary application, once the daemon detects a predefined
+	  sequence of incoming TCP/UDP packets on a network interface. This can 
+	  be used, e.g. to open up ports in a firewall.
+
+	  See also: http://www.zeroflux.org/projects/knock
+
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
new file mode 100644
index 0000000..ad322e8
--- /dev/null
+++ b/package/knock/knock.mk
@@ -0,0 +1,17 @@ 
+##########################################
+#
+# knock
+#
+##########################################
+
+KNOCK_VERSION = 0.6
+#KNOCK_SOURCE = knock-$(KNOCK_VERSION).tar.gz
+#KNOCK_SITE = http://www.zeroflux.org/proj/knock/files
+KNOCK_VERSION=7666f2e86e18d482eaad5fe1fea46d87d80b0555
+KNOCK_SITE=https://github.com/jvinet/knock/tarball/master
+KNOCK_LICENSE = GPLv2
+KNOCK_AUTORECONF = YES
+KNOCK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-sbinPROGRAMS
+
+$(eval $(autotools-package))
+
diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
new file mode 100644
index 0000000..bf982e1
--- /dev/null
+++ b/package/python-pyzmq/Config.in
@@ -0,0 +1,12 @@ 
+config BR2_PACKAGE_PYZMQ
+	bool "pyzmq"
+	select BR2_PACKAGE_ZEROMQ
+        select BR2_PACKAGE_PYTHON
+	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU
+	help
+	  This package contains the python language binding for zeromq.
+	  This package is hardcoded to provide the bindings for ZeroMQ version 3.2.3
+
+	  See also: http://zeromq.org/bindings:python
+
diff --git a/package/python-pyzmq/pyzmq.mk b/package/python-pyzmq/pyzmq.mk
new file mode 100644
index 0000000..312dfdf
--- /dev/null
+++ b/package/python-pyzmq/pyzmq.mk
@@ -0,0 +1,49 @@ 
+##########################################
+#
+# pyzmq
+#
+##########################################
+
+PYZMQ_VERSION = 13.0.2
+PYZMQ_ZMQ_VERSION = 3.2.3
+PYZMQ_SOURCE = pyzmq-$(PYZMQ_VERSION).tar.gz
+PYZMQ_SITE = https://pypi.python.org/packages/source/p/pyzmq/
+PYZMQ_LICENSE = LGPLv3
+PYZMQ_INSTALL_TARGET = YES
+
+define PYZMQ_POST_PATCH_FIXUP
+        (cd $(@D); \
+		cat buildutils/detect.py | \
+		sed -e "s/##PYZMQ_ZMQ_VERSION##/$(PYZMQ_ZMQ_VERSION)/" \
+		  >buildutils/detect.py.new; \
+		cp buildutils/detect.py.new buildutils/detect.py)
+endef
+
+PYZMQ_POST_PATCH_HOOKS += PYZMQ_POST_PATCH_FIXUP
+
+define PYZMQ_CONFIGURE_CMDS
+        (cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+                LDSHARED="$(TARGET_CROSS)gcc -shared" \
+                CROSS_COMPILING=yes \
+                _python_sysroot=$(STAGING_DIR) \
+                _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
+                _python_prefix=/usr \
+                _python_exec_prefix=/usr \
+                $(HOST_DIR)/usr/bin/python setup.py configure \
+		--zmq=$(@D)/../../staging/usr)
+endef
+
+define PYZMQ_INSTALL_TARGET_CMDS
+        (cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+                LDSHARED="$(TARGET_CROSS)gcc -shared" \
+                CROSS_COMPILING=yes \
+                _python_sysroot=$(STAGING_DIR) \
+                _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
+                _python_prefix=/usr \
+                _python_exec_prefix=/usr \
+                $(HOST_DIR)/usr/bin/python setup.py install \
+		--prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))
+
diff --git a/package/python-pyzmq/pyzmq.patch b/package/python-pyzmq/pyzmq.patch
new file mode 100644
index 0000000..c660457
--- /dev/null
+++ b/package/python-pyzmq/pyzmq.patch
@@ -0,0 +1,28 @@ 
+--- pyzmq-13.0.2/buildutils/detect.py.orig	2013-08-10 00:49:28.242557978 +0200
++++ pyzmq-13.0.2/buildutils/detect.py	2013-08-10 00:44:35.197572704 +0200
+@@ -118,15 +118,17 @@ def detect_zmq(basedir, compiler=None, *
+             
+     efile = test_compilation(cfile, compiler=compiler, **compiler_attrs)
+     
+-    result = Popen(efile, stdout=PIPE, stderr=PIPE)
+-    so, se = result.communicate()
++    # result = Popen(efile, stdout=PIPE, stderr=PIPE)
++    # so, se = result.communicate()
+     # for py3k:
+-    so = so.decode()
+-    se = se.decode()
+-    if result.returncode:
+-        msg = "Error running version detection script:\n%s\n%s" % (so,se)
+-        logging.error(msg)
+-        raise IOError(msg)
++    #so = so.decode()
++    #se = se.decode()
++    #if result.returncode:
++    #    msg = "Error running version detection script:\n%s\n%s" % (so,se)
++    #    logging.error(msg)
++    #    raise IOError(msg)
++
++    so = "vers: ##PYZMQ_ZMQ_VERSION##"
+ 
+     handlers = {'vers':  lambda val: tuple(int(v) for v in val.split('.'))}
+