Skip to contentSkip to conversation

libestr: new package

PATCH Superseded Clayton Shotwell 2 participants 8 messages Mar 11, 2014

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Clayton Shotwell

author
#0 lore raw

PATCH v2 1/4 libestr: new package

Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- No changes.

---
 package/Config.in          |    1 +
 package/libestr/Config.in  |    6 ++++++
 package/libestr/libestr.mk |   13 +++++++++++++
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 package/libestr/Config.in
 create mode 100644 package/libestr/libestr.mk
package/Config.in +1 -0
index 2b76a8e..ab82483 100644
@@ -817,6 +817,7 @@ source "package/enchant/Config.in"
 source "package/icu/Config.in"
 source "package/libedit/Config.in"
 source "package/libenca/Config.in"
+source "package/libestr/Config.in"
 source "package/libfribidi/Config.in"
 source "package/libiconv/Config.in"
 source "package/linenoise/Config.in"
package/libestr/Config.in new file +6 -0
new file mode 100644
index 0000000..b1ca2a5
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBESTR
+	bool "libestr"
+	help
+	  Some essentials for string handling (and a bit more)
+
+	  http://libestr.adiscon.com/
package/libestr/libestr.mk new file +13 -0
new file mode 100644
index 0000000..9efe3b5
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libestr
+#
+################################################################################
+
+LIBESTR_VERSION = 0.1.9
+LIBESTR_SITE = http://libestr.adiscon.com/files/download/
+LIBESTR_LICENSE = LGPLv2.1+
+LIBESTR_LICENSE_FILE = COPYING
+LIBESTR_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.1
author
#1 lore raw

PATCH v2 2/4 libee: new package

Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- Added a select to the configure for libestr (Suggested by Baruch)

---
 package/Config.in       |    1 +
 package/libee/Config.in |   19 +++++++++++++++++++
 package/libee/libee.mk  |   16 ++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 package/libee/Config.in
 create mode 100644 package/libee/libee.mk
package/Config.in +1 -0
index ab82483..42c21d8 100644
@@ -767,6 +767,7 @@ source "package/libcap-ng/Config.in"
 source "package/libcgroup/Config.in"
 source "package/libcofi/Config.in"
 source "package/libdaemon/Config.in"
+source "package/libee/Config.in"
 source "package/libelf/Config.in"
 source "package/libev/Config.in"
 source "package/libevdev/Config.in"
package/libee/Config.in new file +19 -0
new file mode 100644
index 0000000..9a3411e
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBEE
+	bool "libee"
+	select BR2_PACKAGE_LIBESTR
+	help
+	  An Event Expression Library inspired by CEE.
+
+	  CEE is an upcoming standard used to describe network
+	  events in a number of normalized formats. It's goal is
+	  to unify they currently many different representations
+	  that exist in the industry.
+
+	  The core idea of libee is to provide a small but hopefully
+	  convenient API layer above the CEE standard. However, CEE
+	  is not finished. At the time of this writing, CEE is under
+	  heavy development and even some of its core data structures
+	  (like the data dictionary and taxonmy) have not been fully
+	  specified.
+
+	  http://www.libee.org
package/libee/libee.mk new file +16 -0
new file mode 100644
index 0000000..f9894d9
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libee
+#
+################################################################################
+
+LIBEE_VERSION = 0.4.1
+LIBEE_SITE = http://www.libee.org/download/files/download/
+LIBEE_LICENSE = LGPLv2.1+
+LIBEE_LICENSE_FILE = COPYING
+LIBEE_DEPENDENCIES = libestr
+LIBEE_INSTALL_STAGING = YES
+
+LIBEE_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.1
#2 lore raw

PATCH v2 2/4 libee: new package

Hi Clayton,

Quoted 56 lines
Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- Added a select to the configure for libestr (Suggested by Baruch)

---
  package/Config.in       |    1 +
  package/libee/Config.in |   19 +++++++++++++++++++
  package/libee/libee.mk  |   16 ++++++++++++++++
  3 files changed, 36 insertions(+), 0 deletions(-)

create mode 100644 package/libee/Config.in
create mode 100644 package/libee/libee.mk

package/Config.in +1 -0
index ab82483..42c21d8 100644
@@ -767,6 +767,7 @@ source "package/libcap-ng/Config.in"
  source "package/libcgroup/Config.in"
  source "package/libcofi/Config.in"
  source "package/libdaemon/Config.in"
+source "package/libee/Config.in"
  source "package/libelf/Config.in"
  source "package/libev/Config.in"
  source "package/libevdev/Config.in"
package/libee/Config.in new file +19 -0
new file mode 100644
index 0000000..9a3411e
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBEE
+	bool "libee"
+	select BR2_PACKAGE_LIBESTR
+	help
+	  An Event Expression Library inspired by CEE.
+
+	  CEE is an upcoming standard used to describe network
+	  events in a number of normalized formats. It's goal is
+	  to unify they currently many different representations
+	  that exist in the industry.
+
+	  The core idea of libee is to provide a small but hopefully
+	  convenient API layer above the CEE standard. However, CEE
+	  is not finished. At the time of this writing, CEE is under
+	  heavy development and even some of its core data structures
+	  (like the data dictionary and taxonmy) have not been fully
+	  specified.
+
+	  http://www.libee.org
package/libee/libee.mk new file +0 -0
new file mode 100644
index 0000000..f9894d9

package/libee/libee.mk line 10

Quoted 10 lines
package/libee/libee.mk new file +10 -0
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libee
+#
+################################################################################
+
+LIBEE_VERSION = 0.4.1
+LIBEE_SITE = http://www.libee.org/download/files/download/
+LIBEE_LICENSE = LGPLv2.1+
+LIBEE_LICENSE_FILE = COPYING

LIBEE_LICENSE_FILES = COPYING

Regards,
Jerzy

Quoted 6 lines
package/libee/libee.mk new file +6 -0
+LIBEE_DEPENDENCIES = libestr
+LIBEE_INSTALL_STAGING = YES
+
+LIBEE_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))
author
#3 lore raw

PATCH v2 3/4 liblogging: new package

In reply to Clayton Shotwell
Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- No changes.

---
 package/Config.in                |    1 +
 package/liblogging/Config.in     |    8 ++++++++
 package/liblogging/liblogging.mk |   20 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 package/liblogging/Config.in
 create mode 100644 package/liblogging/liblogging.mk
package/Config.in +1 -0
index 42c21d8..caaafa1 100644
@@ -776,6 +776,7 @@ source "package/libffi/Config.in"
 source "package/libglib2/Config.in"
 source "package/libical/Config.in"
 source "package/liblog4c-localtime/Config.in"
+source "package/liblogging/Config.in"
 source "package/libnspr/Config.in"
 source "package/libpfm4/Config.in"
 source "package/libplist/Config.in"
package/liblogging/Config.in new file +8 -0
new file mode 100644
index 0000000..23c3c1a
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBLOGGING
+	bool "liblogging"
+	help
+	  Liblogging is an easy to use library for
+	  logging. It offers an enhanced replacement
+	  for the syslog() call, but retains its ease of use.
+
+	  http://www.liblogging.org/
package/liblogging/liblogging.mk new file +20 -0
new file mode 100644
index 0000000..6b8217a
@@ -0,0 +1,20 @@
+################################################################################
+#
+# liblogging
+#
+################################################################################
+
+LIBLOGGING_VERSION = 1.0.2
+LIBLOGGING_SITE = http://download.rsyslog.com/liblogging
+LIBLOGGING_LICENSE = BSD-2c
+LIBLOGGING_LICENSE_FILE = COPYING
+LIBLOGGING_INSTALL_STAGING = YES
+LIBLOGGING_CONF_OPT = --enable-cached-man-pages
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LIBLOGGING_CONF_OPT += --enable-journal
+else
+LIBLOGGING_CONF_OPT += --disable-journal
+endif
+
+$(eval $(autotools-package))
Signature · 1 line
1.7.1
#4 lore raw

PATCH v2 3/4 liblogging: new package

Hi Clayton,

Quoted 45 lines
Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- No changes.

---
  package/Config.in                |    1 +
  package/liblogging/Config.in     |    8 ++++++++
  package/liblogging/liblogging.mk |   20 ++++++++++++++++++++
  3 files changed, 29 insertions(+), 0 deletions(-)

create mode 100644 package/liblogging/Config.in create mode 100644 package/liblogging/liblogging.mk

package/Config.in +1 -0
index 42c21d8..caaafa1 100644
@@ -776,6 +776,7 @@ source "package/libffi/Config.in"
  source "package/libglib2/Config.in"
  source "package/libical/Config.in"
  source "package/liblog4c-localtime/Config.in"
+source "package/liblogging/Config.in"
  source "package/libnspr/Config.in"
  source "package/libpfm4/Config.in"
  source "package/libplist/Config.in"
package/liblogging/Config.in new file +8 -0
new file mode 100644
index 0000000..23c3c1a
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBLOGGING
+	bool "liblogging"
+	help
+	  Liblogging is an easy to use library for
+	  logging. It offers an enhanced replacement
+	  for the syslog() call, but retains its ease of use.
+
+	  http://www.liblogging.org/
package/liblogging/liblogging.mk new file +0 -0
new file mode 100644
index 0000000..6b8217a

package/liblogging/liblogging.mk line 10

Quoted 10 lines
package/liblogging/liblogging.mk new file +10 -0
@@ -0,0 +1,20 @@
+################################################################################
+#
+# liblogging
+#
+################################################################################
+
+LIBLOGGING_VERSION = 1.0.2
+LIBLOGGING_SITE = http://download.rsyslog.com/liblogging
+LIBLOGGING_LICENSE = BSD-2c
+LIBLOGGING_LICENSE_FILE = COPYING

LIBLOGGING_LICENSE_FILES = COPYING

Regards,
Jerzy

Quoted 10 lines
package/liblogging/liblogging.mk new file +10 -0
+LIBLOGGING_INSTALL_STAGING = YES
+LIBLOGGING_CONF_OPT = --enable-cached-man-pages
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+LIBLOGGING_CONF_OPT += --enable-journal
+else
+LIBLOGGING_CONF_OPT += --disable-journal
+endif
+
+$(eval $(autotools-package))
author
#5 lore raw

PATCH v2 4/4 rsyslog: bump to version 7.6.0

In reply to Clayton Shotwell

Bumping version of rsyslog and adding new dependencies of liblogging and libestr. The first patch has be submitted to the upstream mailing list and the second patch is a backport from the development branch of the upstream.

Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- Upgraded to the latest release (suggested by Ryan)
- Add selects to the required libraries
- Fixing the default rsyslog.config path
- Add a install init sysv step

---
 package/rsyslog/Config.in                          |    8 +++
 ...yslog-0001-libgcrypt-config-path-override.patch |   44 +++++++++++++++++
 ...yslog-0002-backport-json-include-path-fix.patch |   52 ++++++++++++++++++++
 package/rsyslog/rsyslog.mk                         |   28 +++++++++--
 4 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch
 create mode 100644 package/rsyslog/rsyslog-0002-backport-json-include-path-fix.patch
package/rsyslog/Config.in +8 -0
index 2503f71..27af88f 100644
@@ -1,6 +1,14 @@
 config BR2_PACKAGE_RSYSLOG
 	bool "rsyslog"
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBESTR
+	select BR2_PACKAGE_LIBLOGGING
+	select BR2_PACKAGE_JSON_C
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Rsyslog is a powerful and flexible syslog implementation
 
 	  http://www.rsyslog.com
+
+comment "libxmlrpc needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch new file +44 -0

44 lines not on this page · raw message

package/rsyslog/rsyslog-0002-backport-json-include-path-fix.patch new file +52 -0

52 lines not on this page · raw message

package/rsyslog/rsyslog.mk +24 -4
index daae010..5ce3f6b 100644
@@ -4,21 +4,41 @@
 #
 ################################################################################
 
-RSYSLOG_VERSION = 5.8.0
+RSYSLOG_VERSION = 7.6.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog/
-RSYSLOG_DEPENDENCIES = zlib
+RSYSLOG_LICENSE = GPLv3 LGPLv3 Apache-2.0
+RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
+RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c
+RSYSLOG_AUTORECONF = YES
+
+RSYSLOG_CONF_OPT = --disable-testbench \
+		   --enable-cached-man-pages
 
 # Build after Busybox
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 	RSYSLOG_DEPENDENCIES += busybox
 endif
 
-define RSYSLOG_INSTALL_CONF_SCRIPT
+ifeq ($(BR2_PACKAGE_LIBEE),y)
+	RSYSLOG_DEPENDENCIES += libee
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+	RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+	RSYSLOG_CONF_OPT += --enable-libgcrypt=yes
+else
+	RSYSLOG_CONF_OPT += --enable-libgcrypt=no
+endif
+
+define RSYSLOG_INSTALL_INIT_SYSV
 	[ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
 		$(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
 			$(TARGET_DIR)/etc/init.d/S01rsyslog
+endef
+
+define RSYSLOG_INSTALL_CONF_SCRIPT
 	[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
-		$(INSTALL) -m 0644 -D $(@D)/rsyslog.conf \
+		$(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \
 			$(TARGET_DIR)/etc/rsyslog.conf
 	mkdir -p $(TARGET_DIR)/etc/rsyslog.d
 endef
Signature · 1 line
1.7.1
#6 lore raw

PATCH v2 1/4 libestr: new package

In reply to Clayton Shotwell

Hi Clayton,

Quoted 43 lines
Signed-off-by Clayton Shotwell <[email protected]>

---
Changes v1 -> v2:
- No changes.

---
  package/Config.in          |    1 +
  package/libestr/Config.in  |    6 ++++++
  package/libestr/libestr.mk |   13 +++++++++++++
  3 files changed, 20 insertions(+), 0 deletions(-)

create mode 100644 package/libestr/Config.in
create mode 100644 package/libestr/libestr.mk

package/Config.in +1 -0
index 2b76a8e..ab82483 100644
@@ -817,6 +817,7 @@ source "package/enchant/Config.in"
  source "package/icu/Config.in"
  source "package/libedit/Config.in"
  source "package/libenca/Config.in"
+source "package/libestr/Config.in"
  source "package/libfribidi/Config.in"
  source "package/libiconv/Config.in"
  source "package/linenoise/Config.in"
package/libestr/Config.in new file +6 -0
new file mode 100644
index 0000000..b1ca2a5
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBESTR
+	bool "libestr"
+	help
+	  Some essentials for string handling (and a bit more)
+
+	  http://libestr.adiscon.com/
package/libestr/libestr.mk new file +0 -0
new file mode 100644
index 0000000..9efe3b5

package/libestr/libestr.mk line 10

Quoted 10 lines
package/libestr/libestr.mk new file +10 -0
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libestr
+#
+################################################################################
+
+LIBESTR_VERSION = 0.1.9
+LIBESTR_SITE = http://libestr.adiscon.com/files/download/
+LIBESTR_LICENSE = LGPLv2.1+
+LIBESTR_LICENSE_FILE = COPYING

It should be:

LIBESTR_LICENSE_FILES = COPYING

Regards,
Jerzy

Quoted 3 lines
package/libestr/libestr.mk new file +3 -0
+LIBESTR_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
author
#7 lore raw

PATCH v2 1/4 libestr: new package

Jerzy Grzegorek <[email protected]> wrote on 03/11/2014 02:59:20 PM:

Quoted 2 lines

From: Jerzy Grzegorek <[email protected]>
To: Clayton Shotwell <[email protected]>,

buildroot at busybox.net

Quoted 10 lines

Date: 03/11/2014 02:59 PM
Subject: Re: [Buildroot] [PATCH v2 1/4] libestr: new package

package/libestr/libestr.mk line 10

Quoted 4 lines
package/libestr/libestr.mk new file +4 -0
+LIBESTR_VERSION = 0.1.9
+LIBESTR_SITE = http://libestr.adiscon.com/files/download/
+LIBESTR_LICENSE = LGPLv2.1+
+LIBESTR_LICENSE_FILE = COPYING

It should be:

LIBESTR_LICENSE_FILES = COPYING

Thanks for catching that. I'll get that changed in all of my patches and resubmit them.

Thanks,
Clayton

Clayton Shotwell
Software Engineer
clshotwe at rockwellcollins.com
www.rockwellcollins.com