[meta-networking][PATCH 00/11] More networking recipes

[meta-networking][PATCH 00/11] More networking recipes

[Paul Eggleton]

These are updated, rebased and extended versions of patches originally
submitted by Vladimir Redzhepoff and Yauhen Kharuzhy, now applied to
meta-networking after discussion with them. This series also moves
libnfnetlink to meta-networking and adds some additional netfilter
library recipes needed for current versions of the netfilter suite.

Note that the original patch for pure-ftpd said that it was an updated
version of a recipe from OE-Classic; there was no such recipe in
OE-Classic however so I have commented it as a new recipe.
The libnetfilter-queue recipe was written from scratch as I did not
notice it was in OE-Classic; neither version has anything particularly
interesting in it and this version is more up-to-date.


The following changes since commit 85ab35f4edac91ecc180161e97c6698f1c10928b:

  netperf: Correct license flags (2012-11-30 11:49:56 -0500)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib paule/networking2
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/networking2

Paul Eggleton (11):
  netcat: add from OE-Classic
  libnfnetlink: move to meta-networking and update to 1.0.1
  libmnl: add new recipe for version 1.0.3
  libnetfilter-conntrack: add from OE-Classic and update
  libnetfilter-cttimeout: add new recipe for version 1.0.0
  libnetfilter-cthelper: add new recipe for version 1.0.0
  libnetfilter-queue: add new recipe for version 1.0.2
  conntrack-tools: add from OE-Classic, update and tidy up
  ebtables: add from OE-Classic, update and tidy up
  pure-ftpd: add new recipe for 1.0.36
  pptp-linux: add from OE-Classic, update and tidy up

 ...coded-usr-local-includes-from-configure.a.patch |   38 ++++
 .../pure-ftpd/pure-ftpd/nostrip.patch              |   30 ++++
 .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb  |   19 ++
 .../conntrack-tools/conntrack-tools_1.4.0.bb       |   33 ++++
 .../conntrack-tools/files/conntrack-failover       |   77 ++++++++
 .../recipes-filter/conntrack-tools/files/init      |   87 +++++++++
 .../ebtables-2.0.10-4/01debian_defaultconfig.patch |   50 ++++++
 .../ebtables/ebtables-2.0.10-4/ebtables.init       |  186 ++++++++++++++++++++
 .../ebtables-2.0.10-4/installnonroot.patch         |   43 +++++
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |   52 ++++++
 .../recipes-filter/libmnl/libmnl_1.0.3.bb          |   12 ++
 .../libnetfilter/libnetfilter-conntrack_1.0.2.bb   |   14 ++
 .../libnetfilter/libnetfilter-cthelper_1.0.0.bb    |   14 ++
 .../libnetfilter/libnetfilter-cttimeout_1.0.0.bb   |   13 ++
 .../libnetfilter/libnetfilter-queue_1.0.2.bb       |   14 ++
 .../libnfnetlink/libnfnetlink_1.0.1.bb             |   11 +-
 .../pptp-linux/pptp-linux-1.7.2/options.pptp       |   30 ++++
 .../pptp-linux/pptp-linux_1.7.2.bb                 |   29 +++
 .../recipes-support/netcat/netcat_0.7.1.bb         |   21 +++
 19 files changed, 768 insertions(+), 5 deletions(-)
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/init
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
 create mode 100755 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
 create mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
 rename meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb => meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb (60%)
 create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
 create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
 create mode 100644 meta-networking/recipes-support/netcat/netcat_0.7.1.bb

-- 
1.7.10.4

[meta-networking][PATCH 01/11] netcat: add from OE-Classic

[Paul Eggleton]

Changes from the OE-Classic recipe:
* Use ALTERNATIVE_${PN} instead of ALTERNATIVE_NAME
* Add LIC_FILES_CHKSUM
* Move SRC_URI checksums underneath SRC_URI

Based on a patch by Vladimir Redzhepoff <vladimir.redzhepoff@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-support/netcat/netcat_0.7.1.bb         |   21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 meta-networking/recipes-support/netcat/netcat_0.7.1.bb

diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
new file mode 100644
index 0000000..c5ab85d
--- /dev/null
+++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNU Netcat"
+HOMEPAGE = "http://netcat.sourceforge.net"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
+
+SRC_URI[md5sum] = "0a29eff1736ddb5effd0b1ec1f6fe0ef"
+SRC_URI[sha256sum] = "b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb"
+
+inherit autotools update-alternatives gettext
+
+do_install_append() {
+	mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
+}
+
+ALTERNATIVE_${PN} = "nc"
+ALTERNATIVE_PRIORITY = "100"
-- 
1.7.10.4

[meta-networking][PATCH 02/11] libnfnetlink: move to meta-networking and update to 1.0.1

[Paul Eggleton]

* Fix SRC_URI checksum to not be version-specific
* Refer to new COPYING file in LIC_FILES_CHKSUM (previously none was
  distributed)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb       |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb => meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb (60%)

diff --git a/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
similarity index 60%
rename from meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb
rename to meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
index f4a65f0..036366a 100644
--- a/meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb
+++ b/meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb
@@ -1,3 +1,4 @@
+SUMMARY = "Low-level library for netfilter related kernel/userspace communication"
 DESCRIPTION = "libnfnetlink is the low-level library for netfilter related \
 kernel/userspace communication. It provides a generic messaging \
 infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log, \
@@ -7,12 +8,12 @@ HOMEPAGE = "http://www.netfilter.org/projects/libnfnetlink/index.html"
 SECTION = "devel/libs"
 LICENSE = "GPLv2+"
 
-PR = "r1"
+PR = "r0"
 
-LIC_FILES_CHKSUM = "file://src/libnfnetlink.c;beginline=3;endline=11;md5=28bd3bf7f60a78101491eef6b9bb9eba"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 
-SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=libnfnetlink-${PV}"
-SRC_URI[libnfnetlink-1.0.0.md5sum] = "016fdec8389242615024c529acc1adb8"
-SRC_URI[libnfnetlink-1.0.0.sha256sum] = "3752b03a4c09821ee9a2528d69289423a01e7171f1a22dfdd11d5459e03972fb"
+SRC_URI = "http://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "98927583d2016a9fb1936fed992e2c5e"
+SRC_URI[tar.sha256sum] = "f270e19de9127642d2a11589ef2ec97ef90a649a74f56cf9a96306b04817b51a"
 
 inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 03/11] libmnl: add new recipe for version 1.0.3

[Paul Eggleton]

This library is required by recent versions of some the libnetfilter*
libraries.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb |   12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb

diff --git a/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb b/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
new file mode 100644
index 0000000..369aaa9
--- /dev/null
+++ b/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
@@ -0,0 +1,12 @@
+SUMMARY = "Minimalistic user-space Netlink utility library"
+DESCRIPTION = "Minimalistic user-space library oriented to Netlink developers, providing \
+ functions for common tasks in parsing, validating, and constructing both the Netlink header and TLVs."
+HOMEPAGE = "http://www.netfilter.org/projects/libmnl/index.html"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://www.netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "7d95fc3bea3365bc03c48e484224f65f"
+SRC_URI[tar.sha256sum] = "6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de"
+
+inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 04/11] libnetfilter-conntrack: add from OE-Classic and update

[Paul Eggleton]

* Update to version 1.0.2
* Add SUMMARY and tweak DESCRIPTION
* Add HOMEPAGE
* Add dependency on libmnl

Based on a patch by Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../libnetfilter/libnetfilter-conntrack_1.0.2.bb         |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb

diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
new file mode 100644
index 0000000..fb915ab
--- /dev/null
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Netfilter connection tracking library"
+DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter connection tracking state table"
+HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_conntrack/index.html"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "libnfnetlink libmnl"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "447114b5d61bb9a9617ead3217c3d3ff"
+SRC_URI[tar.sha256sum] = "a0bd747dd58ae1513586b43c7125b41e6325f97eb95ac63d53cf5aeb33254d12"
+
+S = "${WORKDIR}/libnetfilter_conntrack-${PV}"
+
+inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 05/11] libnetfilter-cttimeout: add new recipe for version 1.0.0

[Paul Eggleton]

This library is needed by recent versions of conntrack-tools.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../libnetfilter/libnetfilter-cttimeout_1.0.0.bb          |   13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb

diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
new file mode 100644
index 0000000..2f25852
--- /dev/null
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Netfilter connection tracking timeout library"
+DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter fine-grain connection tracking timeout infrastructure"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "libmnl"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "7697437fc9ebb6f6b83df56a633db7f9"
+SRC_URI[tar.sha256sum] = "aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba"
+
+S = "${WORKDIR}/libnetfilter_cttimeout-${PV}"
+
+inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 06/11] libnetfilter-cthelper: add new recipe for version 1.0.0

[Paul Eggleton]

This library is needed by recent versions of conntrack-tools.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../libnetfilter/libnetfilter-cthelper_1.0.0.bb          |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb

diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
new file mode 100644
index 0000000..405e8bf
--- /dev/null
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Netfilter connection tracking helper library"
+DESCRIPTION = "Userspace library providing a programming interface (API) to the Linux kernel netfilter user-space helper infrastructure"
+HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_cthelper/index.html"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "libmnl"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "b2efab1a3a198a5add448960ba011acd"
+SRC_URI[tar.sha256sum] = "07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d"
+
+S = "${WORKDIR}/libnetfilter_cthelper-${PV}"
+
+inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 07/11] libnetfilter-queue: add new recipe for version 1.0.2

[Paul Eggleton]

This library is needed by recent versions of conntrack-tools.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../libnetfilter/libnetfilter-queue_1.0.2.bb             |   14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb

diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
new file mode 100644
index 0000000..7276f5c
--- /dev/null
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
@@ -0,0 +1,14 @@
+SUMMARY = "Netfilter packet queue access library"
+DESCRIPTION = "Userspace library providing a programming interface (API) to access the Linux kernel netfilter packet queue"
+HOMEPAGE = "http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "libnfnetlink"
+
+SRC_URI = "http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${PV}.tar.bz2;name=tar"
+SRC_URI[tar.md5sum] = "df09befac35cb215865b39a36c96a3fa"
+SRC_URI[tar.sha256sum] = "838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32"
+
+S = "${WORKDIR}/libnetfilter_queue-${PV}"
+
+inherit autotools pkgconfig
-- 
1.7.10.4

[meta-networking][PATCH 08/11] conntrack-tools: add from OE-Classic, update and tidy up

[Paul Eggleton]

* Update to version 1.4.0 and add additional dependencies
* Handle hardcoded paths in initscripts
* Add LSB header to initscript
* Make LICENSE more specific
* Add LIC_FILES_CHKSUM
* Set SUMMARY (which sets DESCRIPTION)

Based on a patch by Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../conntrack-tools/conntrack-tools_1.4.0.bb       |   33 ++++++++
 .../conntrack-tools/files/conntrack-failover       |   77 +++++++++++++++++
 .../recipes-filter/conntrack-tools/files/init      |   87 ++++++++++++++++++++
 3 files changed, 197 insertions(+)
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
 create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/init

diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
new file mode 100644
index 0000000..9938e24
--- /dev/null
+++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
@@ -0,0 +1,33 @@
+SUMMARY = "Connection tracking userspace tools for Linux"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \
+           libnetfilter-cthelper libnetfilter-queue"
+
+PR = "r0"
+
+SRC_URI = " \
+	http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${PV}.tar.bz2;name=tar \
+	file://conntrack-failover \
+	file://init \
+	"
+SRC_URI[tar.md5sum] = "ee737c774e01349f75e935228a2d851b"
+SRC_URI[tar.sha256sum] = "036b032a5c4d180aad686df21399d74506b9b3d3000794eb13ac313482e24896"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "conntrackd"
+
+do_install_append() {
+	install -d ${D}/${sysconfdir}/conntrackd
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0644 doc/sync/ftfw/conntrackd.conf ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
+	install -m 0755 ${WORKDIR}/conntrack-failover ${D}/${sysconfdir}/init.d/conntrack-failover
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/conntrackd
+
+	# Fix hardcoded paths in scripts
+	sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
+	sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd
+	sed -i 's!/var/!${localstatedir}/!g' ${D}/${sysconfdir}/init.d/conntrack-failover ${D}/${sysconfdir}/init.d/conntrackd ${D}/${sysconfdir}/conntrackd/conntrackd.conf.sample
+	sed -i 's!^export PATH=.*!export PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}/${sysconfdir}/init.d/conntrackd
+}
diff --git a/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover b/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
new file mode 100644
index 0000000..6d92e63
--- /dev/null
+++ b/meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
@@ -0,0 +1,77 @@
+#!/bin/sh
+# 
+# (C) 2008 by Pablo Neira Ayuso <pablo@netfilter.org>
+# (C) 2009 Roman I Khimov <khimov@altell.ru>
+#
+# This software may be used and distributed according to the terms
+# of the GNU General Public License, incorporated herein by reference.
+#
+# Description:
+#
+# This is the script for primary-backup setups for keepalived
+# (http://www.keepalived.org). You may adapt it to make it work with other
+# high-availability managers.
+#
+# Do not forget to include the required modifications to your keepalived.conf
+# file to invoke this script during keepalived's state transitions.
+#
+# Contributions to improve this script are welcome :).
+#
+## Modified to work as init.d script under pacemaker control
+
+CONNTRACKD_BIN=/usr/sbin/conntrackd
+CONNTRACKD_LOCK=/var/lock/conntrack.lock
+CONNTRACKD_CONFIG=/etc/conntrackd/conntrackd.conf
+
+case "$1" in
+  start)
+    #
+    # commit the external cache into the kernel table
+    #
+    $CONNTRACKD_BIN -C $CONNTRACKD_CONFIG -c
+    if [ $? -eq 1 ]
+    then
+        logger "ERROR: failed to invoke conntrackd -c"
+    fi
+
+    #
+    # flush the internal and the external caches
+    #
+    $CONNTRACKD_BIN -C $CONNTRACKD_CONFIG -f
+    if [ $? -eq 1 ]
+    then
+    	logger "ERROR: failed to invoke conntrackd -f"
+    fi
+
+    #
+    # resynchronize my internal cache to the kernel table
+    #
+    $CONNTRACKD_BIN -C $CONNTRACKD_CONFIG -R
+    if [ $? -eq 1 ]
+    then
+    	logger "ERROR: failed to invoke conntrackd -R"
+    fi
+
+    #
+    # send a bulk update to backups 
+    #
+    $CONNTRACKD_BIN -C $CONNTRACKD_CONFIG -B
+    if [ $? -eq 1 ]
+    then
+        logger "ERROR: failed to invoke conntrackd -B"
+    fi
+    ;;
+  stop)
+	$CONNTRACKD_BIN -t
+	$CONNTRACKD_BIN -n
+	;;
+  status)
+	;;
+  *)
+    logger "ERROR: unknown command"
+    echo "Usage: conntrack-failover {start|stop|status}"
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/meta-networking/recipes-filter/conntrack-tools/files/init b/meta-networking/recipes-filter/conntrack-tools/files/init
new file mode 100644
index 0000000..bce2075
--- /dev/null
+++ b/meta-networking/recipes-filter/conntrack-tools/files/init
@@ -0,0 +1,87 @@
+#!/bin/sh
+#
+# /etc/init.d/conntrackd
+#
+# Maximilian Wilhelm <max@rfc2324.org>
+#  -- Mon, 06 Nov 2006 18:39:07 +0100
+#
+# Roman I Khimov <khimov@altell.ru>
+#  -- Tue, 27 Oct 2009 14:34:00 +0300
+
+### BEGIN INIT INFO
+# Provides:          conntrackd
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description: Starts conntrackd
+# short-description: Starts conntrackd
+### END INIT INFO
+
+export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+NAME="conntrackd"
+DAEMON="/usr/sbin/conntrackd"
+CONFIG="/etc/conntrackd/conntrackd.conf"
+PIDFILE="/var/run/${NAME}.pid"
+
+
+# Gracefully exit if there is no daemon (debian way of life)
+if [ ! -x "${DAEMON}" ]; then
+	exit 0
+fi
+
+# Check for config file
+if [ ! -f /etc/conntrackd/conntrackd.conf ]; then
+	echo "Error: There is no config file for $NAME" >&2
+	exit 1;
+fi
+
+case "$1" in
+  start)
+        echo -n "Starting $NAME: "
+	for i in nf_conntrack_netlink nf_conntrack_netbios_ns nf_conntrack_proto_dccp nf_conntrack_tftp \
+		nf_conntrack_sane nf_conntrack_pptp nf_conntrack_irc nf_conntrack_amanda nf_conntrack_h323 \
+		nf_conntrack_proto_udplite nf_conntrack_proto_gre nf_conntrack_proto_sctp nf_conntrack_ftp \
+		nf_conntrack_sip; do
+		modprobe $i >/dev/null 2>/dev/null &
+	done
+	start-stop-daemon --start --quiet --make-pidfile --pidfile "/var/run/${NAME}.pid" --background --exec "${DAEMON}"
+	RET=$?
+	if [ "$?" = "0" ]; then
+		sleep 2
+		# Sync with other server
+		conntrackd -n
+		echo "done."
+	else
+		echo "FAILED!"
+	fi
+	exit $RET
+	;;
+  stop)
+        echo -n "Stopping $NAME:"
+	start-stop-daemon --stop --quiet --oknodo --pidfile "/var/run/${NAME}.pid" && echo "done." || echo "FAILED!"
+	;;
+  status)
+	echo -n "conntrackd "
+	start-stop-daemon -q -K -t -x $DAEMON
+	RET=$?
+	if [ "$RET" = "0" ]; then
+                PID=`cat $PIDFILE`
+		echo "($PID) is running"
+	else
+		echo "is not running"
+		exit $RET
+	fi
+	;;
+  restart)
+	$0 stop
+	$0 start
+	;;
+
+  *)
+	echo "Usage: /etc/init.d/conntrackd {start|stop|restart}"
+	exit 1
+esac
+
+exit 0
-- 
1.7.10.4

[meta-networking][PATCH 09/11] ebtables: add from OE-Classic, update and tidy up

[Paul Eggleton]

* Update to 2.0.10-4
* Handle hardcoded paths in initscript
* Add LIC_FILES_CHKSUM
* Set SUMMARY (which sets DESCRIPTION)
* Drop PRIORITY
* Minor formatting/ordering tweaks

Based on a patch by Vladimir Redzhepoff <vladimir.redzhepoff@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../ebtables-2.0.10-4/01debian_defaultconfig.patch |   50 ++++++
 .../ebtables/ebtables-2.0.10-4/ebtables.init       |  186 ++++++++++++++++++++
 .../ebtables-2.0.10-4/installnonroot.patch         |   43 +++++
 .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |   52 ++++++
 4 files changed, 331 insertions(+)
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
 create mode 100755 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
 create mode 100644 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb

diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
new file mode 100644
index 0000000..c260403
--- /dev/null
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debian_defaultconfig.dpatch by  <hesso@pool.math.tu-berlin.de>
+##
+## DP: Debian enhancements to the ebtables "sysconfig" default settings.
+
+@DPATCH@
+
+--- ebtables-2.0.8.1.orig/ebtables-config
++++ ebtables-2.0.8.1/ebtables-config
+@@ -1,17 +1,3 @@
+-# Save (and possibly restore) in text format.
+-#   Value: yes|no,  default: yes
+-# Save the firewall rules in text format to __SYSCONFIG__/ebtables
+-# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules
+-# is done using this text format.
+-EBTABLES_TEXT_FORMAT="yes"
+-
+-# Save (and restore) in binary format.
+-#   Value: yes|no,  default: yes
+-# Save (and restore) the firewall rules in binary format to (and from)
+-# __SYSCONFIG__/ebtables.<chain>. Enabling this option will make
+-# firewall initialisation a lot faster.
+-EBTABLES_BINARY_FORMAT="yes"
+-
+ # Unload modules on restart and stop
+ #   Value: yes|no,  default: yes
+ # This option has to be 'yes' to get to a sane state for a firewall
+@@ -19,6 +5,12 @@
+ # modules.
+ EBTABLES_MODULES_UNLOAD="yes"
+ 
++# Load firewall rules on system startup.
++#   Value: yes|no,  default: no
++# Restores the ebtables rulesets from the last saved state when the
++# system boots up.
++EBTABLES_LOAD_ON_START="no"
++
+ # Save current firewall rules on stop.
+ #   Value: yes|no,  default: no
+ # Saves all firewall rules if firewall gets stopped
+@@ -35,3 +27,9 @@
+ # Save rule counters when saving a kernel table to a file. If the
+ # rule counters were saved, they will be restored when restoring the table.
+ EBTABLES_SAVE_COUNTER="no"
++
++# Backup suffix for ruleset save files.
++#   Value: <string>,  default: "~"
++# Keep one backup level of saved rules.
++# Set this variable to the empty string to disable backups.
++EBTABLES_BACKUP_SUFFIX="~"
diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
new file mode 100755
index 0000000..0044e98
--- /dev/null
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
@@ -0,0 +1,186 @@
+#!/bin/sh
+#
+# init script for the Ethernet Bridge filter tables
+#
+# Written by Dag Wieers <dag@wieers.com>
+# Modified by Rok Papez <rok.papez@arnes.si>
+#	     Bart De Schuymer <bdschuym@pandora.be>
+# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
+# Adapted to OpenEmbedded by Roman I Khimov <khimov@altell.ru>
+#
+# chkconfig: - 15 85
+# description: Ethernet Bridge filtering tables
+#
+### BEGIN INIT INFO
+# Provides:		ebtables
+# Required-Start:	
+# Required-Stop:	
+# Should-Start:		$local_fs
+# Should-Stop:		$local_fs
+# Default-Start:	S
+# Default-Stop:		0 6
+# Short-Description:	ebtables ruleset management
+# Description:		Saves and restores the state of the ebtables rulesets.
+### END INIT INFO
+
+[ -x /sbin/ebtables ] || exit 1
+
+EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump
+
+RETVAL=0
+prog="ebtables"
+desc="Ethernet bridge filtering"
+umask 0077
+
+#default configuration
+EBTABLES_MODULES_UNLOAD="yes"
+EBTABLES_LOAD_ON_START="no"
+EBTABLES_SAVE_ON_STOP="no"
+EBTABLES_SAVE_ON_RESTART="no"
+EBTABLES_SAVE_COUNTER="no"
+EBTABLES_BACKUP_SUFFIX="~"
+
+config=/etc/default/$prog
+[ -f "$config" ] && . "$config"
+
+function get_supported_tables() {
+	EBTABLES_SUPPORTED_TABLES=
+	/sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
+	if [ $? -eq 0 ]; then
+		echo "Error: insufficient privileges to access the ebtables rulesets."
+		exit 1
+	fi
+	for table in filter nat broute; do
+		/sbin/ebtables -t $table -L &> /dev/null
+		if [ $? -eq 0 ]; then
+			EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table"
+		fi
+	done
+}
+
+function load() {
+	RETVAL=0
+	get_supported_tables
+	echo -n "Restoring ebtables rulesets: "
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		echo -n "$table "
+		if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then
+			/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit
+			RET=$?
+			if [ $RET -ne 0 ]; then
+				echo -n "(failed) "
+				RETVAL=$RET
+			fi
+		else
+			echo -n "(no saved state) "
+		fi
+	done
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		echo -n "no kernel support. "
+	else
+		echo -n "done. "
+	fi
+	if [ $RETVAL -eq 0 ]; then
+		echo "ok"
+	else
+		echo "fail"
+	fi
+}
+
+function clear() {
+	RETVAL=0
+	get_supported_tables
+	echo -n "Clearing ebtables rulesets: "
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		echo -n "$table "
+		/sbin/ebtables -t $table --init-table
+	done
+
+	if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
+		for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do
+			rmmod $mod 2> /dev/null
+		done
+	fi
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		echo -n "no kernel support. "
+	else
+		echo -n "done. "
+	fi
+	if [ $RETVAL -eq 0 ]; then
+		echo "ok"
+	else
+		echo "fail"
+	fi
+}
+
+function save() {
+	RETVAL=0
+	get_supported_tables
+	echo -n "Saving ebtables rulesets: "
+	for table in $EBTABLES_SUPPORTED_TABLES; do
+		echo -n "$table "
+		[ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \
+		  mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX
+		/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save
+		RET=$?
+		if [ $RET -ne 0 ]; then
+			echo -n "(failed) "
+			RETVAL=$RET
+		else
+			if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
+				/sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z
+			fi
+		fi
+	done
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		echo -n "no kernel support. "
+	else
+		echo -n "done. "
+	fi
+	if [ $RETVAL -eq 0 ]; then
+		echo "ok"
+	else
+		echo "fail"
+	fi
+}
+
+case "$1" in
+  start)
+	[ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
+	;;
+  stop)
+	[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
+	clear
+	;;
+  restart|reload|force-reload)
+	[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
+	clear
+	[ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
+	;;
+  load)
+	load
+	;;
+  save)
+	save
+	;;
+  status)
+	get_supported_tables
+	if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
+		echo "No kernel support for ebtables."
+		RETVAL=1
+	else
+		echo -n "Ebtables support available, number of installed rules: "
+		for table in $EBTABLES_SUPPORTED_TABLES; do
+			COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 ))
+			echo -n "$table($COUNT) "
+		done
+		echo ok
+		RETVAL=0
+	fi
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2
+	RETVAL=1
+esac
+
+exit $RETVAL
diff --git a/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
new file mode 100644
index 0000000..bcd9bed
--- /dev/null
+++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile b/Makefile
+index c1106a4..7ea6b7a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\//\\\//g')
+ scripts: ebtables-save ebtables.sysv ebtables-config
+ 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+-	install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
++	install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
+ 	cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
+ 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi
+-	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
++	if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi
+ 	cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
+ 	if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi
+-	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
++	if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi
+ 	rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
+ 
+ tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g')
+ $(MANDIR)/man8/ebtables.8: ebtables.8
+ 	mkdir -p $(DESTDIR)$(@D)
+ 	sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_
+-	install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
++	install -m 0644 ebtables.8_ $(DESTDIR)$@
+ 	rm -f ebtables.8_
+ 
+ $(DESTDIR)$(ETHERTYPESFILE): ethertypes
+ 	mkdir -p $(@D)
+-	install -m 0644 -o root -g root $< $@
++	install -m 0644 $< $@
+ 
+ .PHONY: exec
+ exec: ebtables ebtables-restore
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+-	install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
+-	install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
++	install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
++	install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
+ 
+ .PHONY: install
+ install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts
diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
new file mode 100644
index 0000000..e3476da
--- /dev/null
+++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
@@ -0,0 +1,52 @@
+SUMMARY = "Utility for basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e"
+SECTION = "console/network"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
+           file://installnonroot.patch \
+           file://01debian_defaultconfig.patch \
+           file://ebtables.init \
+           "
+
+SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"
+SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"
+
+S = "${WORKDIR}/ebtables-v${PV}"
+
+inherit update-rc.d
+
+EXTRA_OEMAKE = " \
+        BINDIR=${base_sbindir} \
+        MANDIR=${mandir} \
+        ETHERTYPESPATH=${sysconfdir} \
+        INITDIR=${sysconfdir}/init.d \
+        SYSCONFIGDIR=${sysconfdir}/default \
+        LIBDIR=${base_libdir}/ebtables \
+        'CC=${CC}' \
+        'CFLAGS=${CFLAGS}' \
+        'LDFLAGS=${LDFLAGS} -Wl,--no-as-needed' \
+        'LD=${LD}' \
+        "
+
+do_install () {
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${sysconfdir}/ebtables
+	oe_runmake DESTDIR='${D}' install
+	install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables
+	mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables
+
+	# Fix hardcoded paths in scripts
+	sed -i 's!/sbin/!${base_sbindir}/!g' ${D}/${sysconfdir}/init.d/ebtables
+	sed -i 's!/etc/!${sysconfdir}/!g' ${D}/${sysconfdir}/init.d/ebtables
+}
+
+CONFFILES_${PN} += "${sysconfdir}/default/ebtables"
+
+INITSCRIPT_NAME = "ebtables"
+INITSCRIPT_PARAMS = "start 41 S . stop 41 6 ."
+
+FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug"
+FILES_${PN} += "${base_libdir}/ebtables/*.so"
-- 
1.7.10.4

[meta-networking][PATCH 10/11] pure-ftpd: add new recipe for 1.0.36

[Paul Eggleton]

Based on a patch by Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 ...coded-usr-local-includes-from-configure.a.patch |   38 ++++++++++++++++++++
 .../pure-ftpd/pure-ftpd/nostrip.patch              |   30 ++++++++++++++++
 .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb  |   19 ++++++++++
 3 files changed, 87 insertions(+)
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
 create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb

diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
new file mode 100644
index 0000000..54088b0
--- /dev/null
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
@@ -0,0 +1,38 @@
+From cffca7cb7c055f82ced316ddee90bb701b85b92d Mon Sep 17 00:00:00 2001
+From: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
+Date: Tue, 10 Jan 2012 19:15:25 +0300
+Subject: [PATCH] Remove hardcoded /usr/local includes from configure.ac
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
+---
+ configure.ac |   12 ------------
+ 1 files changed, 0 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ae00c08..9ba6d8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,18 +67,6 @@ AC_ARG_VAR(PYTHON,local path to the python interpreter)
+ python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin"
+ AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path)
+ 
+-if test -d /usr/local/include; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-if test -d /usr/kerberos/include; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+-fi
+-
+-if test -d /usr/local/lib; then
+-  LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-fi
+-
+ if uname | fgrep SunOS > /dev/null 2> /dev/null ; then
+   CPPFLAGS="$CPPFLAGS -D_XPG4_2=1"
+ fi
+-- 
+1.7.7.3
+
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
new file mode 100644
index 0000000..5cbbc5f
--- /dev/null
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
@@ -0,0 +1,30 @@
+From 45eb89d1a6fde65caaf2d6e1a5d527f1ae7beb9c Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Mon, 3 Dec 2012 17:12:11 +0000
+Subject: [PATCH] Don't mess with CFLAGS and LDFLAGS when --with-minimal is specified
+
+We especially don't want stripping enabled.
+
+Upstream-Status: Inappropriate [config]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+---
+ configure.ac |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d59409..6836c0e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -413,8 +413,6 @@ AC_ARG_WITH(minimal,
+     AC_DEFINE(NO_FTP_USERS)
+     AC_DEFINE(WITHOUT_ASCII)    
+     AC_DEFINE(BORING_MODE)
+-    CFLAGS="$CFLAGS -Os -fomit-frame-pointer -fgcse -falign-functions=2 -falign-jumps=2 -fno-unroll-loops "
+-    LDFLAGS="$LDFLAGS -s "
+   fi ])
+ 
+ AC_ARG_WITH(paranoidmsg,
+-- 
+1.7.1
+
diff --git a/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
new file mode 100644
index 0000000..871ab6e
--- /dev/null
+++ b/meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Pure-FTPd is a free (BSD), secure, production-quality and standard-conformant FTP server"
+HOMEPAGE = "http://www.pureftpd.org/project/pure-ftpd"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ae9e161311a5a0768c333b537a40e332"
+
+DEPENDS = "libcap"
+
+PR = "r0"
+
+SRC_URI = "http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${PV}.tar.gz \
+           file://0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch \
+	   file://nostrip.patch \
+           "
+SRC_URI[md5sum] = "bbcb48e8aa6ec1abff9775b89f84af91"
+SRC_URI[sha256sum] = "90fb63b1a9d448076aa9f3e3c74b298965f98e03c824e9a4d241fffe8eb3a130"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-minimal"
-- 
1.7.10.4

[meta-networking][PATCH 11/11] pptp-linux: add from OE-Classic, update and tidy up

[Paul Eggleton]

* Update to 1.7.2
* Drop unnecessary override of do_compile
* Make LICENSE more accurate
* Add LIC_FILES_CHKSUM
* Add SUMMARY
* Minor formatting/ordering tweaks

Based on a patch by Vladimir Redzhepoff <vladimir.redzhepoff@promwad.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../pptp-linux/pptp-linux-1.7.2/options.pptp       |   30 ++++++++++++++++++++
 .../pptp-linux/pptp-linux_1.7.2.bb                 |   29 +++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
 create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb

diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
new file mode 100644
index 0000000..f446e22
--- /dev/null
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
@@ -0,0 +1,30 @@
+#
+# Lock the port
+#
+lock
+
+#
+# We don't need the tunnel server to authenticate itself
+#
+noauth
+
+#
+# Turn off transmission protocols we know won't be used
+#
+nobsdcomp
+nodeflate
+
+#
+# We want MPPE
+# (option naming specific to ppp 2.4.0 with unofficial patch)
+#
+#mppe-40
+mppe-128
+#mppe-stateless
+
+#
+# We want a sane mtu/mru 
+# (ppp 2.4.0 with unofficial patch)
+#
+#mtu 1000
+#mru 1000
diff --git a/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
new file mode 100644
index 0000000..ac3f8f6
--- /dev/null
+++ b/meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
@@ -0,0 +1,29 @@
+SUMMARY = "Client for Microsoft PPTP VPNs"
+DESCRIPTION = "PPTP Client is a Linux, FreeBSD, NetBSD \
+ and OpenBSD client for the proprietary Microsoft Point-to-Point \
+ Tunneling Protocol, PPTP. Allows connection to a PPTP based \
+ Virtual Private Network (VPN) as used by employers and some \
+ cable and ADSL internet service providers."
+HOMEPAGE = "http://pptpclient.sourceforge.net"
+SECTION = "network"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sourceforge/pptpclient/pptp-${PV}.tar.gz \
+           file://options.pptp"
+
+SRC_URI[md5sum] = "4c3d19286a37459a632c7128c92a9857"
+SRC_URI[sha256sum] = "e98ae0065d2a39fa3131654ff28cb7070e996f668ed6d0e7d9a445b8d37694bc"
+
+S = "${WORKDIR}/pptp-${PV}"
+
+do_install() {
+        install -d ${D}${sbindir} ${D}${sysconfdir}/ppp ${D}${mandir}/man8
+        install -m 555 pptp ${D}${sbindir}
+        install -m 644 pptp.8 ${D}${mandir}/man8
+        install -m 644 ${WORKDIR}/options.pptp ${D}${sysconfdir}/ppp
+}
+
+RDEPENDS_${PN} = "ppp"
-- 
1.7.10.4

Re: [meta-networking][PATCH 00/11] More networking recipes

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 5190 bytes --]

Taking this out for a spin now, looks reasonable to me, though.

-J.

[[oe] [meta-networking][PATCH 00/11] More networking recipes] On 12.12.03 (Mon 17:44) Paul Eggleton wrote:

> These are updated, rebased and extended versions of patches originally
> submitted by Vladimir Redzhepoff and Yauhen Kharuzhy, now applied to
> meta-networking after discussion with them. This series also moves
> libnfnetlink to meta-networking and adds some additional netfilter
> library recipes needed for current versions of the netfilter suite.
> 
> Note that the original patch for pure-ftpd said that it was an updated
> version of a recipe from OE-Classic; there was no such recipe in
> OE-Classic however so I have commented it as a new recipe.
> The libnetfilter-queue recipe was written from scratch as I did not
> notice it was in OE-Classic; neither version has anything particularly
> interesting in it and this version is more up-to-date.
> 
> 
> The following changes since commit 85ab35f4edac91ecc180161e97c6698f1c10928b:
> 
>   netperf: Correct license flags (2012-11-30 11:49:56 -0500)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib paule/networking2
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/networking2
> 
> Paul Eggleton (11):
>   netcat: add from OE-Classic
>   libnfnetlink: move to meta-networking and update to 1.0.1
>   libmnl: add new recipe for version 1.0.3
>   libnetfilter-conntrack: add from OE-Classic and update
>   libnetfilter-cttimeout: add new recipe for version 1.0.0
>   libnetfilter-cthelper: add new recipe for version 1.0.0
>   libnetfilter-queue: add new recipe for version 1.0.2
>   conntrack-tools: add from OE-Classic, update and tidy up
>   ebtables: add from OE-Classic, update and tidy up
>   pure-ftpd: add new recipe for 1.0.36
>   pptp-linux: add from OE-Classic, update and tidy up
> 
>  ...coded-usr-local-includes-from-configure.a.patch |   38 ++++
>  .../pure-ftpd/pure-ftpd/nostrip.patch              |   30 ++++
>  .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb  |   19 ++
>  .../conntrack-tools/conntrack-tools_1.4.0.bb       |   33 ++++
>  .../conntrack-tools/files/conntrack-failover       |   77 ++++++++
>  .../recipes-filter/conntrack-tools/files/init      |   87 +++++++++
>  .../ebtables-2.0.10-4/01debian_defaultconfig.patch |   50 ++++++
>  .../ebtables/ebtables-2.0.10-4/ebtables.init       |  186 ++++++++++++++++++++
>  .../ebtables-2.0.10-4/installnonroot.patch         |   43 +++++
>  .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |   52 ++++++
>  .../recipes-filter/libmnl/libmnl_1.0.3.bb          |   12 ++
>  .../libnetfilter/libnetfilter-conntrack_1.0.2.bb   |   14 ++
>  .../libnetfilter/libnetfilter-cthelper_1.0.0.bb    |   14 ++
>  .../libnetfilter/libnetfilter-cttimeout_1.0.0.bb   |   13 ++
>  .../libnetfilter/libnetfilter-queue_1.0.2.bb       |   14 ++
>  .../libnfnetlink/libnfnetlink_1.0.1.bb             |   11 +-
>  .../pptp-linux/pptp-linux-1.7.2/options.pptp       |   30 ++++
>  .../pptp-linux/pptp-linux_1.7.2.bb                 |   29 +++
>  .../recipes-support/netcat/netcat_0.7.1.bb         |   21 +++
>  19 files changed, 768 insertions(+), 5 deletions(-)
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/init
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
>  create mode 100755 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
>  create mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
>  rename meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb => meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb (60%)
>  create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
>  create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
>  create mode 100644 meta-networking/recipes-support/netcat/netcat_0.7.1.bb
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [meta-networking][PATCH 00/11] More networking recipes

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 5166 bytes --]

Merged from your contrib tree.  Thanks.

-J.

[[oe] [meta-networking][PATCH 00/11] More networking recipes] On 12.12.03 (Mon 17:44) Paul Eggleton wrote:

> These are updated, rebased and extended versions of patches originally
> submitted by Vladimir Redzhepoff and Yauhen Kharuzhy, now applied to
> meta-networking after discussion with them. This series also moves
> libnfnetlink to meta-networking and adds some additional netfilter
> library recipes needed for current versions of the netfilter suite.
> 
> Note that the original patch for pure-ftpd said that it was an updated
> version of a recipe from OE-Classic; there was no such recipe in
> OE-Classic however so I have commented it as a new recipe.
> The libnetfilter-queue recipe was written from scratch as I did not
> notice it was in OE-Classic; neither version has anything particularly
> interesting in it and this version is more up-to-date.
> 
> 
> The following changes since commit 85ab35f4edac91ecc180161e97c6698f1c10928b:
> 
>   netperf: Correct license flags (2012-11-30 11:49:56 -0500)
> 
> are available in the git repository at:
> 
>   git://git.openembedded.org/meta-openembedded-contrib paule/networking2
>   http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/networking2
> 
> Paul Eggleton (11):
>   netcat: add from OE-Classic
>   libnfnetlink: move to meta-networking and update to 1.0.1
>   libmnl: add new recipe for version 1.0.3
>   libnetfilter-conntrack: add from OE-Classic and update
>   libnetfilter-cttimeout: add new recipe for version 1.0.0
>   libnetfilter-cthelper: add new recipe for version 1.0.0
>   libnetfilter-queue: add new recipe for version 1.0.2
>   conntrack-tools: add from OE-Classic, update and tidy up
>   ebtables: add from OE-Classic, update and tidy up
>   pure-ftpd: add new recipe for 1.0.36
>   pptp-linux: add from OE-Classic, update and tidy up
> 
>  ...coded-usr-local-includes-from-configure.a.patch |   38 ++++
>  .../pure-ftpd/pure-ftpd/nostrip.patch              |   30 ++++
>  .../recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb  |   19 ++
>  .../conntrack-tools/conntrack-tools_1.4.0.bb       |   33 ++++
>  .../conntrack-tools/files/conntrack-failover       |   77 ++++++++
>  .../recipes-filter/conntrack-tools/files/init      |   87 +++++++++
>  .../ebtables-2.0.10-4/01debian_defaultconfig.patch |   50 ++++++
>  .../ebtables/ebtables-2.0.10-4/ebtables.init       |  186 ++++++++++++++++++++
>  .../ebtables-2.0.10-4/installnonroot.patch         |   43 +++++
>  .../recipes-filter/ebtables/ebtables_2.0.10-4.bb   |   52 ++++++
>  .../recipes-filter/libmnl/libmnl_1.0.3.bb          |   12 ++
>  .../libnetfilter/libnetfilter-conntrack_1.0.2.bb   |   14 ++
>  .../libnetfilter/libnetfilter-cthelper_1.0.0.bb    |   14 ++
>  .../libnetfilter/libnetfilter-cttimeout_1.0.0.bb   |   13 ++
>  .../libnetfilter/libnetfilter-queue_1.0.2.bb       |   14 ++
>  .../libnfnetlink/libnfnetlink_1.0.1.bb             |   11 +-
>  .../pptp-linux/pptp-linux-1.7.2/options.pptp       |   30 ++++
>  .../pptp-linux/pptp-linux_1.7.2.bb                 |   29 +++
>  .../recipes-support/netcat/netcat_0.7.1.bb         |   21 +++
>  19 files changed, 768 insertions(+), 5 deletions(-)
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/0001-Remove-hardcoded-usr-local-includes-from-configure.a.patch
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd/nostrip.patch
>  create mode 100644 meta-networking/recipes-daemons/pure-ftpd/pure-ftpd_1.0.36.bb
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/conntrack-failover
>  create mode 100644 meta-networking/recipes-filter/conntrack-tools/files/init
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/01debian_defaultconfig.patch
>  create mode 100755 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/ebtables.init
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/installnonroot.patch
>  create mode 100644 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb
>  create mode 100644 meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-conntrack_1.0.2.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cthelper_1.0.0.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-cttimeout_1.0.0.bb
>  create mode 100644 meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.2.bb
>  rename meta-oe/recipes-connectivity/libnfnetlink/libnfnetlink_1.0.0.bb => meta-networking/recipes-filter/libnfnetlink/libnfnetlink_1.0.1.bb (60%)
>  create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux-1.7.2/options.pptp
>  create mode 100644 meta-networking/recipes-protocols/pptp-linux/pptp-linux_1.7.2.bb
>  create mode 100644 meta-networking/recipes-support/netcat/netcat_0.7.1.bb
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]