Skip to contentSkip to conversation

0/3] Pull request v2: syslog-ng, eventlog, libnet

PATCH In review Michael Lippautz 3 participants 7 messages Apr 20, 2011

lore
Share & tools
lore

Michael Lippautz

author
#0 lore raw

PATCH v2 1/1 0/3] Pull request v2: syslog-ng, eventlog, libnet

Corrected (PR) and squashed version

Pull URL: git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/master

Thanks,
Michael Lippautz <[email protected]>
---

Michael Lippautz (3):
libnet: Clean and upgrade (see below)
eventlog: Clean and update to 0.2.12
syslog-ng: Update to 3.2.2

 .../libnet/libnet-1.1.5/fix-endianess-test.patch   |   38 +++
 .../recipes-connectivity/libnet/libnet_1.1.5.bb    |   24 ++
 .../recipes-support/eventlog/eventlog_0.2.12.bb    |   11 +
 meta-oe/recipes-support/syslog-ng/files/initscript |   45 +++
 .../recipes-support/syslog-ng/files/syslog-ng.conf |  338 ++++++++++++++++++++
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   78 +++++
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |   10 +
 7 files changed, 544 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
 create mode 100644 meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/initscript
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng.inc
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH v2 1/1 1/3] libnet: Clean and upgrade (see below)

* libbnet upstream on packetfactor is dead
using https://github.com/sam-github/libnet instead
* Move to version 1.1.5
* Dropped patches (not needed): support-uclibc, new-autotools
* Added LIC_FILES_CHKSUM
* Removed useless do_install_append, works automatically
* Not building statically anymore
* Should be compatible with old v1.1 versions

Signed-off-by Michael Lippautz <[email protected]>
---
 .../libnet/libnet-1.1.5/fix-endianess-test.patch   |   38 ++++++++++++++++++++
 .../recipes-connectivity/libnet/libnet_1.1.5.bb    |   24 ++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch new file +38 -0
new file mode 100644
index 0000000..4d8697d
@@ -0,0 +1,38 @@
+Use autoconf's endian check instead of the locally defined check
+so that we can determine the endianess without having to compile
+a program.
+
+Idea from http://www.security-lists.org/lists/libnet/2003/03/00001.html
+
+Also remove the old test from aclocal.m4.
+
+Rebased for libnet-1.1.5 on 2011/04/19.
+
+--- a/configure.in	2010-11-03 00:59:21.000000000 +0100
++++ b/configure.in	2011-04-19 17:08:47.087712604 +0200
+@@ -6,6 +6,7 @@
+ dnl
+ dnl Process this file with autoconf to produce a configure script.
+ 
++AC_PREREQ(2.52)
+ AC_INIT(libnet, 1.1.5)
+ AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
+ AC_CANONICAL_SYSTEM
+@@ -39,7 +40,16 @@
+ dnl And some custom things
+ dnl
+ 
+-AC_LIBNET_ENDIAN_CHECK
++AC_C_BIGENDIAN([
++ AC_DEFINE(LIBNET_BIG_ENDIAN)
++ ENDIANESS="LIBNET_BIG_ENDIAN"
++ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN"
++],[
++ AC_DEFINE(LIBNET_LIL_ENDIAN)
++ ENDIANESS="LIBNET_LIL_ENDIAN"
++ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
++], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no)) 
++
+ dnl AC_LBL_LIBRARY_NET
+ 
+ AC_SUBST(ENDIANESS)
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +24 -0
new file mode 100644
index 0000000..ec426a5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A packet dissection and creation library"
+# libnet at packetfactory.net is dead
+HOMEPAGE = "https://github.com/sam-github/libnet"
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://README;md5=533bea47338d490e86744c6a0c5692e7"
+DEPENDS = "libpcap"
+# There are major API changes beween libnet v1.0 and libnet v1.1
+PROVIDES = "libnet-1.1"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${PN}-${PV}.tar.gz \
+           file://fix-endianess-test.patch"
+
+SRC_URI[md5sum] = "a9bc1d75a610efcfee200d3e28d8eb8f"
+SRC_URI[sha256sum] = "75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d"
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools binconfig
+
+do_configure_prepend() {
+        rm -f aclocal.m4 Makefile.am ltmain.sh
+}
Signature · 1 line
1.7.3.4
#2 lore raw

Re: [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below)

Dear Michael,

thank you for your patches.

Am Mittwoch, den 20.04.2011, 10:57 +0200 schrieb Michael Lippautz:

Quoted 16 lines

* libbnet upstream on packetfactor is dead
using https://github.com/sam-github/libnet instead
* Move to version 1.1.5
* Dropped patches (not needed): support-uclibc, new-autotools
* Added LIC_FILES_CHKSUM
* Removed useless do_install_append, works automatically
* Not building statically anymore
* Should be compatible with old v1.1 versions

Signed-off-by Michael Lippautz <[email protected]>
---
 .../libnet/libnet-1.1.5/fix-endianess-test.patch   |   38 ++++++++++++++++++++
 .../recipes-connectivity/libnet/libnet_1.1.5.bb    |   24 ++++++++++++
 2 files changed, 62 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb

[…]

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 6

Quoted 12 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +6 -0
new file mode 100644
index 0000000..ec426a5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A packet dissection and creation library"
+# libnet at packetfactory.net is dead
+HOMEPAGE = "https://github.com/sam-github/libnet"
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://README;md5=533bea47338d490e86744c6a0c5692e7"

What does the README have to do with the license? I thought if there is not file COPYING – maybe one should be sent upstream – one takes the header of the source files as for example libnet_asn1.c [1].

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 18

Quoted 12 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +12 -0
+DEPENDS = "libpcap"
+# There are major API changes beween libnet v1.0 and libnet v1.1
+PROVIDES = "libnet-1.1"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${PN}-${PV}.tar.gz \
+           file://fix-endianess-test.patch"
+
+SRC_URI[md5sum] = "a9bc1d75a610efcfee200d3e28d8eb8f"
+SRC_URI[sha256sum] = "75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d"
+
+S = "${WORKDIR}/${PN}-${PV}"

This is the default [2] and should be dropped.

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 24

Quoted 6 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +6 -0
+
+inherit autotools binconfig
+
+do_configure_prepend() {
+        rm -f aclocal.m4 Makefile.am ltmain.sh
+}

Thanks,

Paul

[1] https://github.com/sam-github/libnet/blob/master/libnet/src/libnet_asn1.c
[2] http://docs.openembedded.org/usermanual/usermanual.html#id327409

author
#3 lore raw

Re: [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below)

2011/4/20 Paul Menzel <[email protected]>:

Quoted 25 lines

Dear Michael,

thank you for your patches.

Am Mittwoch, den 20.04.2011, 10:57 +0200 schrieb Michael Lippautz:

Quoted 16 lines

* libbnet upstream on packetfactor is dead
  using https://github.com/sam-github/libnet instead
* Move to version 1.1.5
* Dropped patches (not needed): support-uclibc, new-autotools
* Added LIC_FILES_CHKSUM
* Removed useless do_install_append, works automatically
* Not building statically anymore
* Should be compatible with old v1.1 versions

Signed-off-by Michael Lippautz <[email protected]>

---
 .../libnet/libnet-1.1.5/fix-endianess-test.patch   |   38 ++++++++++++++++++++ .../recipes-connectivity/libnet/libnet_1.1.5.bb    |   24 ++++++++++++

 2 files changed, 62 insertions(+), 0 deletions(-)

 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb

[…]

Quoted 16 lines

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 6

Quoted 12 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +6 -0
new file mode 100644
index 0000000..ec426a5
@@ -0,0 +1,24 @@
+DESCRIPTION = "A packet dissection and creation library"
+# libnet at packetfactory.net is dead
+HOMEPAGE = "https://github.com/sam-github/libnet"
+SECTION = "libs"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://README;md5=533bea47338d490e86744c6a0c5692e7"

What does the README have to do with the license? I thought if there is not file COPYING – maybe one should be sent upstream – one takes the header of the source files as for example libnet_asn1.c [1].

Thats true, but there are different headers (see your [1] against [3]), and the README describes the overall situation. But there's no licensing informating in it, thats true. Any ideas regarding the different headers?

Quoted 15 lines

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 18

Quoted 13 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +12 -0
+DEPENDS = "libpcap"
+# There are major API changes beween libnet v1.0 and libnet v1.1
+PROVIDES = "libnet-1.1"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${PN}-${PV}.tar.gz \
+           file://fix-endianess-test.patch"
+
+SRC_URI[md5sum] = "a9bc1d75a610efcfee200d3e28d8eb8f"
+SRC_URI[sha256sum] = "75588f8d1232e1df34eccf2dba5e66be197b345a07fae80d8275db994496a20d"
+
+S = "${WORKDIR}/${PN}-${PV}"

This is the default [2] and should be dropped.

Sorry for that, I can fix that when adding the licensing information.

Quoted 14 lines

meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb line 24

Quoted 7 lines
meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb new file +6 -0
+
+inherit autotools binconfig
+
+do_configure_prepend() {
+        rm -f aclocal.m4 Makefile.am ltmain.sh
+}

Thanks,

Paul

Quoted 9 lines

[1] https://github.com/sam-github/libnet/blob/master/libnet/src/libnet_asn1.c
[2] http://docs.openembedded.org/usermanual/usermanual.html#id327409

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

[3] https://github.com/sam-github/libnet/blob/master/libnet/src/libnet_build_802.2.c

regargs,
Michael

author
#4 lore raw

PATCH v2 1/1 2/3] eventlog: Clean and update to 0.2.12

In reply to Michael Lippautz

* Added LIC_FILES_CHKSUM
* Move to version 0.2.12

Signed-off-by Michael Lippautz <[email protected]>
---
 .../recipes-support/eventlog/eventlog_0.2.12.bb    |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb
meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb new file +11 -0
new file mode 100644
index 0000000..1dbac29
@@ -0,0 +1,11 @@
+DESCRIPTION = "Replacement syslog API"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b8ba8e77bcda9a53fac0fe39fe957767"
+PR = "r0"
+
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.2/source/${PN}_${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+SRC_URI[md5sum] = "f9c32814f78ea2629850f0440de5ff34"
+SRC_URI[sha256sum] = "f78c218faa6b6b378f25c640a5d1188b1ecbd57d3a527432263fd44b17bbd1c9"
Signature · 1 line
1.7.3.4
author
#5 lore raw

PATCH v2 1/1 3/3] syslog-ng: Update to 3.2.2

In reply to Michael Lippautz

* Re-import from org.oe.dev
* Adapt EXTRA_OECONF (disable most auto-detections)
* Add LIC_FILES_CHKSUM
* Move syslog-ng dl to .inc

Signed-off-by Michael Lippautz <[email protected]>
---
 meta-oe/recipes-support/syslog-ng/files/initscript |   45 +++
 .../recipes-support/syslog-ng/files/syslog-ng.conf |  338 ++++++++++++++++++++
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   78 +++++
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |   10 +
 4 files changed, 471 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/initscript
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng.inc
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
meta-oe/recipes-support/syslog-ng/files/initscript new file +45 -0
new file mode 100644
index 0000000..b95e8ad
@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/syslog-ng and type
+# > update-rc.d syslog-ng defaults 5
+#
+
+
+syslog_ng=/usr/sbin/syslog-ng
+test -x "$syslog_ng" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting syslog-ng:"
+    start-stop-daemon --start --quiet --exec $syslog_ng
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping syslog-ng:"
+    start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+    echo "."
+    ;;
+  reload|force-reload)
+    start-stop-daemon --stop --quiet --signal 1 --exec $syslog_ng
+    ;;
+  restart)
+    echo "Stopping syslog-ng:"
+    start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+    echo -n "Waiting for syslog-ng to die off"
+    for i in 1 2 3 ;
+    do
+        sleep 1
+        echo -n "."
+    done
+    echo ""
+    echo -n "Starting syslog-ng:"
+    start-stop-daemon --start --quiet --exec $syslog_ng
+    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/syslog-ng {start|stop|reload|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf new file +338 -0

338 lines not on this page · raw message

meta-oe/recipes-support/syslog-ng/syslog-ng.inc new file +78 -0

78 lines not on this page · raw message

meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb new file +10 -0
new file mode 100644
index 0000000..b988279
@@ -0,0 +1,10 @@
+require syslog-ng.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += " \
+  file://syslog-ng.conf \
+  file://initscript \
+"
+
+SRC_URI[md5sum] = "ed8ebe559d52a63fb61e3e2db566643f"
+SRC_URI[sha256sum] = "fa5abd4d99acee8fff8217061fb2407698a5bc89804d69f3ae97bffc72fcce48"
Signature · 1 line
1.7.3.4
#6 lore raw
In reply to Michael Lippautz

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 8 lines · Michael Lippautz

Corrected (PR) and squashed version

Pull URL: git://gitorious.org/oe-zoid/meta-openembedded.git
Branch: master
Browse: http://gitorious.org/oe-zoid/meta-openembedded/commits/master

Thanks,
Michael Lippautz <[email protected]>

Thanks, merged

Quoted 8 lines

---

Michael Lippautz (3):
libnet: Clean and upgrade (see below)
eventlog: Clean and update to 0.2.12
syslog-ng: Update to 3.2.2

Quoted 16 lines
 .../libnet/libnet-1.1.5/fix-endianess-test.patch   |   38 +++
 .../recipes-connectivity/libnet/libnet_1.1.5.bb    |   24 ++
 .../recipes-support/eventlog/eventlog_0.2.12.bb    |   11 +
 meta-oe/recipes-support/syslog-ng/files/initscript |   45 +++
 .../recipes-support/syslog-ng/files/syslog-ng.conf |  338 ++++++++++++++++++++
 meta-oe/recipes-support/syslog-ng/syslog-ng.inc    |   78 +++++
 .../recipes-support/syslog-ng/syslog-ng_3.2.2.bb   |   10 +
 7 files changed, 544 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
 create mode 100644 meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
 create mode 100644 meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/initscript
 create mode 100644 meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng.inc
 create mode 100644 meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNrqJ2MkyGM64RGpERApmVAKC2b2aGYS78jdvQ703YT9Zl23QBAwCgl11z aJu2dqMZxJTKt5GckYvE9oY=
=fu04
-----END PGP SIGNATURE-----