All of lore.kernel.org
 help / color / mirror / Atom feed
* [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet
@ 2011-04-20  8:57 Michael Lippautz
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below) Michael Lippautz
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Michael Lippautz @ 2011-04-20  8:57 UTC (permalink / raw)
  To: openembedded-devel

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 <michael.lippautz@gmail.com>
---


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

-- 
1.7.3.4




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below)
  2011-04-20  8:57 [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Michael Lippautz
@ 2011-04-20  8:57 ` Michael Lippautz
  2011-04-20  9:31   ` Paul Menzel
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 2/3] eventlog: Clean and update to 0.2.12 Michael Lippautz
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Michael Lippautz @ 2011-04-20  8:57 UTC (permalink / raw)
  To: openembedded-devel

* 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 <michael.lippautz@gmail.com>
---
 .../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

diff --git a/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch b/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
new file mode 100644
index 0000000..4d8697d
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libnet/libnet-1.1.5/fix-endianess-test.patch
@@ -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)
diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
new file mode 100644
index 0000000..ec426a5
--- /dev/null
+++ b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
@@ -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
+}
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [oe-meta][PATCHv2] 2/3] eventlog: Clean and update to 0.2.12
  2011-04-20  8:57 [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Michael Lippautz
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below) Michael Lippautz
@ 2011-04-20  8:57 ` Michael Lippautz
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 3/3] syslog-ng: Update to 3.2.2 Michael Lippautz
  2011-04-20  9:08 ` [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Koen Kooi
  3 siblings, 0 replies; 7+ messages in thread
From: Michael Lippautz @ 2011-04-20  8:57 UTC (permalink / raw)
  To: openembedded-devel

* Added LIC_FILES_CHKSUM
* Move to version 0.2.12

Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>
---
 .../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

diff --git a/meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb b/meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb
new file mode 100644
index 0000000..1dbac29
--- /dev/null
+++ b/meta-oe/recipes-support/eventlog/eventlog_0.2.12.bb
@@ -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"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [oe-meta][PATCHv2] 3/3] syslog-ng: Update to 3.2.2
  2011-04-20  8:57 [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Michael Lippautz
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below) Michael Lippautz
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 2/3] eventlog: Clean and update to 0.2.12 Michael Lippautz
@ 2011-04-20  8:57 ` Michael Lippautz
  2011-04-20  9:08 ` [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Koen Kooi
  3 siblings, 0 replies; 7+ messages in thread
From: Michael Lippautz @ 2011-04-20  8:57 UTC (permalink / raw)
  To: openembedded-devel

* 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 <michael.lippautz@gmail.com>
---
 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

diff --git a/meta-oe/recipes-support/syslog-ng/files/initscript b/meta-oe/recipes-support/syslog-ng/files/initscript
new file mode 100644
index 0000000..b95e8ad
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/initscript
@@ -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
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
new file mode 100644
index 0000000..5dcf065
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf
@@ -0,0 +1,338 @@
+#
+# Configuration file for syslog-ng under Debian
+#
+# attempts at reproducing default syslog behavior
+
+# the standard syslog levels are (in descending order of priority):
+# emerg alert crit err warning notice info debug
+# the aliases "error", "panic", and "warn" are deprecated
+# the "none" priority found in the original syslogd configuration is
+# only used in internal messages created by syslogd
+
+
+######
+# options
+
+options {
+        # disable the chained hostname format in logs
+        # (default is enabled)
+        chain_hostnames(0);
+
+        # the time to wait before a died connection is re-established
+        # (default is 60)
+        time_reopen(10);
+
+        # the time to wait before an idle destination file is closed
+        # (default is 60)
+        time_reap(360);
+
+        # the number of lines buffered before written to file
+        # you might want to increase this if your disk isn't catching with
+        # all the log messages you get or if you want less disk activity
+        # (say on a laptop)
+        # (default is 0)
+        #sync(0);
+
+        # the number of lines fitting in the output queue
+        log_fifo_size(2048);
+
+        # enable or disable directory creation for destination files
+        create_dirs(yes);
+
+        # default owner, group, and permissions for log files
+        # (defaults are 0, 0, 0600)
+        #owner(root);
+        group(adm);
+        perm(0640);
+
+        # default owner, group, and permissions for created directories
+        # (defaults are 0, 0, 0700)
+        #dir_owner(root);
+        #dir_group(root);
+        dir_perm(0755);
+
+        # enable or disable DNS usage
+        # syslog-ng blocks on DNS queries, so enabling DNS may lead to
+        # a Denial of Service attack
+        # (default is yes)
+        use_dns(no);
+
+        # maximum length of message in bytes
+        # this is only limited by the program listening on the /dev/log Unix
+        # socket, glibc can handle arbitrary length log messages, but -- for
+        # example -- syslogd accepts only 1024 bytes
+        # (default is 2048)
+        #log_msg_size(2048);
+};
+
+
+######
+# sources
+
+# all known message sources
+source s_all {
+        # message generated by Syslog-NG
+        internal();
+        # standard Linux log source (this is the default place for the syslog()
+        # function to send logs to)
+        unix-stream("/dev/log");
+        # messages from the kernel
+        file("/proc/kmsg" log_prefix("kernel: "));
+        # use the following line if you want to receive remote UDP logging messages
+        # (this is equivalent to the "-r" syslogd flag)
+        # udp();
+};
+
+
+######
+# destinations
+
+# some standard log files
+destination df_auth { file("/var/log/auth.log"); };
+destination df_syslog { file("/var/log/syslog"); };
+destination df_cron { file("/var/log/cron.log"); };
+destination df_daemon { file("/var/log/daemon.log"); };
+destination df_kern { file("/var/log/kern.log"); };
+destination df_lpr { file("/var/log/lpr.log"); };
+destination df_mail { file("/var/log/mail.log"); };
+destination df_user { file("/var/log/user.log"); };
+destination df_uucp { file("/var/log/uucp.log"); };
+
+# these files are meant for the mail system log files
+# and provide re-usable destinations for {mail,cron,...}.info,
+# {mail,cron,...}.notice, etc.
+destination df_facility_dot_info { file("/var/log/$FACILITY.info"); };
+destination df_facility_dot_notice { file("/var/log/$FACILITY.notice"); };
+destination df_facility_dot_warn { file("/var/log/$FACILITY.warn"); };
+destination df_facility_dot_err { file("/var/log/$FACILITY.err"); };
+destination df_facility_dot_crit { file("/var/log/$FACILITY.crit"); };
+
+# these files are meant for the news system, and are kept separated
+# because they should be owned by "news" instead of "root"
+destination df_news_dot_notice { file("/var/log/news/news.notice" owner("news")); };
+destination df_news_dot_err { file("/var/log/news/news.err" owner("news")); };
+destination df_news_dot_crit { file("/var/log/news/news.crit" owner("news")); };
+
+# some more classical and useful files found in standard syslog configurations
+destination df_debug { file("/var/log/debug"); };
+destination df_messages { file("/var/log/messages"); };
+
+# pipes
+# a console to view log messages under X
+destination dp_xconsole { pipe("/dev/xconsole"); };
+
+# consoles
+# this will send messages to everyone logged in
+destination du_all { usertty("*"); };
+
+
+######
+# filters
+
+# all messages from the auth and authpriv facilities
+filter f_auth { facility(auth, authpriv); };
+
+# all messages except from the auth and authpriv facilities
+filter f_syslog { not facility(auth, authpriv); };
+
+# respectively: messages from the cron, daemon, kern, lpr, mail, news, user,
+# and uucp facilities
+filter f_cron { facility(cron); };
+filter f_daemon { facility(daemon); };
+filter f_kern { facility(kern); };
+filter f_lpr { facility(lpr); };
+filter f_mail { facility(mail); };
+filter f_news { facility(news); };
+filter f_user { facility(user); };
+filter f_uucp { facility(uucp); };
+
+# some filters to select messages of priority greater or equal to info, warn,
+# and err
+# (equivalents of syslogd's *.info, *.warn, and *.err)
+filter f_at_least_info { level(info..emerg); };
+filter f_at_least_notice { level(notice..emerg); };
+filter f_at_least_warn { level(warn..emerg); };
+filter f_at_least_err { level(err..emerg); };
+filter f_at_least_crit { level(crit..emerg); };
+
+# all messages of priority debug not coming from the auth, authpriv, news, and
+# mail facilities
+filter f_debug { level(debug) and not facility(auth, authpriv, news, mail); };
+
+# all messages of info, notice, or warn priority not coming form the auth,
+# authpriv, cron, daemon, mail, and news facilities
+filter f_messages {
+        level(info,notice,warn)
+            and not facility(auth,authpriv,cron,daemon,mail,news);
+};
+
+# messages with priority emerg
+filter f_emerg { level(emerg); };
+
+# complex filter for messages usually sent to the xconsole
+filter f_xconsole {
+    facility(daemon,mail)
+        or level(debug,info,notice,warn)
+        or (facility(news)
+                and level(crit,err,notice));
+};
+
+
+######
+# logs
+# order matters if you use "flags(final);" to mark the end of processing in a
+# "log" statement
+
+# these rules provide the same behavior as the commented original syslogd rules
+
+# auth,authpriv.*                 /var/log/auth.log
+log {
+        source(s_all);
+        filter(f_auth);
+        destination(df_auth);
+};
+
+# *.*;auth,authpriv.none          -/var/log/syslog
+log {
+        source(s_all);
+        filter(f_syslog);
+        destination(df_syslog);
+};
+
+# this is commented out in the default syslog.conf
+# cron.*                         /var/log/cron.log
+#log {
+#        source(s_all);
+#        filter(f_cron);
+#        destination(df_cron);
+#};
+
+# daemon.*                        -/var/log/daemon.log
+log {
+        source(s_all);
+        filter(f_daemon);
+        destination(df_daemon);
+};
+
+# kern.*                          -/var/log/kern.log
+log {
+        source(s_all);
+        filter(f_kern);
+        destination(df_kern);
+};
+
+# lpr.*                           -/var/log/lpr.log
+log {
+        source(s_all);
+        filter(f_lpr);
+        destination(df_lpr);
+};
+
+# mail.*                          -/var/log/mail.log
+log {
+        source(s_all);
+        filter(f_mail);
+        destination(df_mail);
+};
+
+# user.*                          -/var/log/user.log
+log {
+        source(s_all);
+        filter(f_user);
+        destination(df_user);
+};
+
+# uucp.*                          /var/log/uucp.log
+log {
+        source(s_all);
+        filter(f_uucp);
+        destination(df_uucp);
+};
+
+# mail.info                       -/var/log/mail.info
+log {
+        source(s_all);
+        filter(f_mail);
+        filter(f_at_least_info);
+        destination(df_facility_dot_info);
+};
+
+# mail.warn                       -/var/log/mail.warn
+log {
+        source(s_all);
+        filter(f_mail);
+        filter(f_at_least_warn);
+        destination(df_facility_dot_warn);
+};
+
+# mail.err                        /var/log/mail.err
+log {
+        source(s_all);
+        filter(f_mail);
+        filter(f_at_least_err);
+        destination(df_facility_dot_err);
+};
+
+# news.crit                       /var/log/news/news.crit
+log {
+        source(s_all);
+        filter(f_news);
+        filter(f_at_least_crit);
+        destination(df_news_dot_crit);
+};
+
+# news.err                        /var/log/news/news.err
+log {
+        source(s_all);
+        filter(f_news);
+        filter(f_at_least_err);
+        destination(df_news_dot_err);
+};
+
+# news.notice                     /var/log/news/news.notice
+log {
+        source(s_all);
+        filter(f_news);
+        filter(f_at_least_notice);
+        destination(df_news_dot_notice);
+};
+
+
+# *.=debug;\
+#         auth,authpriv.none;\
+#         news.none;mail.none     -/var/log/debug
+log {
+        source(s_all);
+        filter(f_debug);
+        destination(df_debug);
+};
+
+
+# *.=info;*.=notice;*.=warn;\
+#         auth,authpriv.none;\
+#         cron,daemon.none;\
+#         mail,news.none          -/var/log/messages
+log {
+        source(s_all);
+        filter(f_messages);
+        destination(df_messages);
+};
+
+# *.emerg                         *
+log {
+        source(s_all);
+        filter(f_emerg);
+        destination(du_all);
+};
+
+
+# daemon.*;mail.*;\
+#         news.crit;news.err;news.notice;\
+#         *.=debug;*.=info;\
+#         *.=notice;*.=warn       |/dev/xconsole
+log {
+        source(s_all);
+        filter(f_xconsole);
+        destination(dp_xconsole);
+};
+
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
new file mode 100644
index 0000000..38bcfb0
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -0,0 +1,78 @@
+DESCRIPTION = "Alternative system logger daemon"
+DEPENDS = "libol flex eventlog glib-2.0"
+LICENSE = "GPL LGPL"
+LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5"
+
+# syslog initscript is handled explicitly because order of
+# update-rc.d and update-alternatives is important
+RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+
+INC_PR = "r5"
+
+inherit autotools
+
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz"
+
+noipv6 = "${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6', d)}"
+
+EXTRA_OECONF = " \
+  --with-libnet=${STAGING_BINDIR_CROSS} \
+  --enable-dynamic-linking \
+  ${noipv6} \
+  --enable-ssl \
+  --disable-sub-streams \
+  --disable-pacct \
+  --disable-linux-caps \
+  --disable-pcre \
+  --disable-sql \
+"
+
+do_configure_prepend() {
+	eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}"
+}
+
+do_install_append() {
+        install -d ${D}/${sysconfdir}/${PN}
+        install ${WORKDIR}/syslog-ng.conf ${D}${sysconfdir}/${PN}.conf
+        install -d ${D}/${sysconfdir}/init.d
+        install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN}
+}
+
+CONFFILES_${PN} = "${sysconfdir}/${PN}.conf"
+
+pkg_postinst_${PN} () {
+        update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 200
+
+        if test "x$D" != "x"; then
+                OPT="-r $D"
+        else
+                OPT="-s"
+        fi
+        # remove all rc.d-links potentially created from alternative
+        # syslog packages before creating new ones
+        update-rc.d $OPT -f syslog remove
+        update-rc.d $OPT syslog start 20 2 3 4 5 . stop 90 0 1 6 .
+}
+
+pkg_prerm_${PN} () {
+        if test "x$D" = "x"; then
+                if test "$1" = "upgrade" -o "$1" = "remove"; then
+                        /etc/init.d/syslog stop
+                fi
+        fi
+
+        update-alternatives --remove syslog-init syslog.${PN}
+}
+
+pkg_postrm_${PN} () {
+        if test "x$D" != "x"; then
+                OPT="-r $D"
+        else
+                OPT=""
+        fi
+        if test "$1" = "remove" -o "$1" = "purge"; then
+                if ! test -e "/etc/init.d/syslog"; then
+                        update-rc.d $OPT syslog remove
+                fi
+        fi
+}
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
new file mode 100644
index 0000000..b988279
--- /dev/null
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.2.bb
@@ -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"
-- 
1.7.3.4




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet
  2011-04-20  8:57 [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Michael Lippautz
                   ` (2 preceding siblings ...)
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 3/3] syslog-ng: Update to 3.2.2 Michael Lippautz
@ 2011-04-20  9:08 ` Koen Kooi
  3 siblings, 0 replies; 7+ messages in thread
From: Koen Kooi @ 2011-04-20  9:08 UTC (permalink / raw)
  To: openembedded-devel

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

On 20-04-11 10:57, Michael Lippautz wrote:
> 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 <michael.lippautz@gmail.com>

Thanks, merged

> ---
> 
> 
> 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
> 

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

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




^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below)
  2011-04-20  8:57 ` [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below) Michael Lippautz
@ 2011-04-20  9:31   ` Paul Menzel
  2011-04-20  9:46     ` Michael Lippautz
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Menzel @ 2011-04-20  9:31 UTC (permalink / raw)
  To: openembedded-devel

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

Dear Michael,


thank you for your patches.

Am Mittwoch, den 20.04.2011, 10:57 +0200 schrieb Michael Lippautz:
> * 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 <michael.lippautz@gmail.com>
> ---
>  .../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

[…]

> diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
> new file mode 100644
> index 0000000..ec426a5
> --- /dev/null
> +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
> @@ -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].

> +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.

> +
> +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

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below)
  2011-04-20  9:31   ` Paul Menzel
@ 2011-04-20  9:46     ` Michael Lippautz
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Lippautz @ 2011-04-20  9:46 UTC (permalink / raw)
  To: openembedded-devel

2011/4/20 Paul Menzel <paulepanter@users.sourceforge.net>:
> Dear Michael,
>
>
> thank you for your patches.
>
> Am Mittwoch, den 20.04.2011, 10:57 +0200 schrieb Michael Lippautz:
>> * 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 <michael.lippautz@gmail.com>
>> ---
>>  .../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
>
> […]
>
>> diff --git a/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
>> new file mode 100644
>> index 0000000..ec426a5
>> --- /dev/null
>> +++ b/meta-oe/recipes-connectivity/libnet/libnet_1.1.5.bb
>> @@ -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?

>
>> +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.

>
>> +
>> +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
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> 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



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-04-20  9:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-20  8:57 [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Michael Lippautz
2011-04-20  8:57 ` [oe-meta][PATCHv2] 1/3] libnet: Clean and upgrade (see below) Michael Lippautz
2011-04-20  9:31   ` Paul Menzel
2011-04-20  9:46     ` Michael Lippautz
2011-04-20  8:57 ` [oe-meta][PATCHv2] 2/3] eventlog: Clean and update to 0.2.12 Michael Lippautz
2011-04-20  8:57 ` [oe-meta][PATCHv2] 3/3] syslog-ng: Update to 3.2.2 Michael Lippautz
2011-04-20  9:08 ` [oe-meta][PATCHv2] 0/3] Pull request v2: syslog-ng, eventlog, libnet Koen Kooi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.