* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liblognorm/files/, dev-libs/liblognorm/
@ 2015-10-09 14:12 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2015-10-09 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 3027e7c1fcea0709ad9bebfbe14387ef52837c62
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 9 13:10:39 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 9 14:11:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3027e7c1
dev-libs/liblognorm: Revbump to remove semi-broken pcre functionality
and add an upstream patch.
Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/liblognorm-1.1.2-issue_135.patch | 110 +++++++++++++++++++++
dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild | 57 +++++++++++
2 files changed, 167 insertions(+)
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
new file mode 100644
index 0000000..4b4a063
--- /dev/null
+++ b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
@@ -0,0 +1,110 @@
+From 4b35ca1e6fff50f47eb5419b879b287f49dcf1d8 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Mon, 24 Aug 2015 09:05:52 +0200
+Subject: [PATCH] "fix": process last line if it misses the terminating LF
+
+This problem occurs with the very last line of a rulebase (at EOF).
+If it is not properly terminated (LF missing), it is silently ignored.
+Previous versions did obviously process lines in this case. While
+technically this is invalid input, we can't outrule that such rulebases
+exist. For example, they do in the rsyslog testbench, which made
+us aware of the problem (see https://github.com/rsyslog/rsyslog/issues/489 ).
+
+I think the proper way of addressing this is to process such lines without
+termination, as many other tools do as well.
+
+closes https://github.com/rsyslog/liblognorm/issues/135
+---
+ src/samp.c | 5 ++++-
+ tests/Makefile.am | 2 ++
+ tests/field_mac48.sh | 1 -
+ tests/missing_line_ending.rb | 1 +
+ tests/missing_line_ending.sh | 25 +++++++++++++++++++++++++
+ 5 files changed, 32 insertions(+), 2 deletions(-)
+ create mode 100644 tests/missing_line_ending.rb
+ create mode 100755 tests/missing_line_ending.sh
+
+diff --git a/src/samp.c b/src/samp.c
+index ef57047..0a9ae0a 100644
+--- a/src/samp.c
++++ b/src/samp.c
+@@ -801,7 +801,10 @@ ln_sampRead(ln_ctx ctx, FILE *const __restrict__ repo, int *const __restrict__ i
+ int c = fgetc(repo);
+ if(c == EOF) {
+ *isEof = 1;
+- goto done;
++ if(i == 0)
++ goto done;
++ else
++ done = 1; /* last line missing LF, still process it! */
+ } else if(c == '\n') {
+ ++linenbr;
+ if(!inParser && i != 0)
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index a3a3842..cfcf010 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,6 +13,7 @@ user_test_LDFLAGS = -no-install
+ TESTS_SHELLSCRIPTS = \
+ parser_whitespace.sh \
+ parser_LF.sh \
++ missing_line_ending.sh \
+ field_hexnumber.sh \
+ field_mac48.sh \
+ field_name_value.sh \
+@@ -54,6 +55,7 @@ REGEXP_TESTS = \
+ field_regex_while_regex_support_is_disabled.sh
+
+ EXTRA_DIST = exec.sh \
++ missing_line_ending.rb \
+ $(TESTS_SHELLSCRIPTS) \
+ $(REGEXP_TESTS) \
+ $(json_eq_self_sources) \
+diff --git a/tests/field_mac48.sh b/tests/field_mac48.sh
+index bd2898e..0f17166 100755
+--- a/tests/field_mac48.sh
++++ b/tests/field_mac48.sh
+@@ -21,4 +21,3 @@ assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f
+
+
+ cleanup_tmp_files
+-
+diff --git a/tests/missing_line_ending.rb b/tests/missing_line_ending.rb
+new file mode 100644
+index 0000000..b252483
+--- /dev/null
++++ b/tests/missing_line_ending.rb
+@@ -0,0 +1 @@
++rule=:%field:mac48%
+\ No newline at end of file
+diff --git a/tests/missing_line_ending.sh b/tests/missing_line_ending.sh
+new file mode 100755
+index 0000000..18f4d2c
+--- /dev/null
++++ b/tests/missing_line_ending.sh
+@@ -0,0 +1,25 @@
++# added 2015-05-05 by Rainer Gerhards
++# This file is part of the liblognorm project, released under ASL 2.0
++. $srcdir/exec.sh
++
++test_def $0 "dmac48 syntax"
++# we need to use a canned file, as we cannot easily reproduce the
++# malformed lines
++cp missing_line_ending.rb $(rulebase_file_name)
++
++execute 'f0:f6:1c:5f:cc:a2'
++assert_output_json_eq '{"field": "f0:f6:1c:5f:cc:a2"}'
++
++execute 'f0-f6-1c-5f-cc-a2'
++assert_output_json_eq '{"field": "f0-f6-1c-5f-cc-a2"}'
++
++# things that need to NOT match
++
++execute 'f0-f6:1c:5f:cc-a2'
++assert_output_json_eq '{ "originalmsg": "f0-f6:1c:5f:cc-a2", "unparsed-data": "f0-f6:1c:5f:cc-a2" }'
++
++execute 'f0:f6:1c:xf:cc:a2'
++assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f0:f6:1c:xf:cc:a2" }'
++
++
++#cleanup_tmp_files
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
new file mode 100644
index 0000000..066a0c4
--- /dev/null
+++ b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF="yes"
+
+inherit autotools-utils
+
+DESCRIPTION="Fast samples-based log normalization library"
+HOMEPAGE="http://www.liblognorm.com"
+SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
+IUSE="debug doc static-libs test"
+
+RDEPEND="
+ >=dev-libs/libestr-0.1.3
+ >=dev-libs/json-c-0.11:=
+"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+ doc? ( >=dev-python/sphinx-1.2.2 )
+"
+
+DOCS=( ChangeLog )
+
+PATCHES=(
+ "${FILESDIR}"/respect_CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.1.2-issue_135.patch
+)
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc docs)
+ $(use_enable test testbench)
+ $(use_enable debug)
+ --disable-regexp
+ )
+
+ autotools-utils_src_configure
+}
+
+src_test() {
+ # When adding new tests via patches we have to make them executable
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ emake --jobs 1 check
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liblognorm/files/, dev-libs/liblognorm/
@ 2018-05-21 19:02 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2018-05-21 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 9a41908293252bf540130b8f8c5e8ff26b2835a2
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 18:59:18 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 21 18:59:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a419082
dev-libs/liblognorm: drop old
Package-Manager: Portage-2.3.38, Repoman-2.3.9
dev-libs/liblognorm/Manifest | 5 -
.../files/liblognorm-1.1.0-fix-enable-docs.patch | 41 --------
.../files/liblognorm-1.1.2-issue_135.patch | 110 ---------------------
dev-libs/liblognorm/files/respect_CFLAGS.patch | 11 ---
dev-libs/liblognorm/liblognorm-1.1.0.ebuild | 47 ---------
dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild | 56 -----------
dev-libs/liblognorm/liblognorm-2.0.1.ebuild | 72 --------------
dev-libs/liblognorm/liblognorm-2.0.2.ebuild | 72 --------------
dev-libs/liblognorm/liblognorm-2.0.3.ebuild | 72 --------------
9 files changed, 486 deletions(-)
diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index af8a577bee1..60c3b29e2a9 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,7 +1,2 @@
-DIST liblognorm-1.1.0.tar.gz 499355 BLAKE2B 4cde6d42a3eb82b160722c64110e71d0962d1f590b6bf62a328af6cb71a36b6a608cac79a75e0e1f564b2423d5a8069282764158d08ce3d1294677e9f39717cd SHA512 f694d47c8e60871f0f3ce1fe8092b2596850beea618760c289d9cec6068fb8e8e260f4abb3faf20b931864d91ed18f640c65235fd693f6c67ce232fa11006107
-DIST liblognorm-1.1.2.tar.gz 547224 BLAKE2B babe23a73cfaf6275ac0bd81ed0248bdd600323d65bf152254a006533fe6bb1dd7fe1f270d4844985f587d76b61980bdca275b86b35e50d130b572e7d1886bb1 SHA512 d0dc206ac2f34174ec1a7e05ae4f84520ae67f49b5540bf9b957378418d6e32384fddd40aaa26dfbdec868a6e7d7a0b677af5201dcbf4f0d4b177934a260ff00
-DIST liblognorm-2.0.1.tar.gz 657390 BLAKE2B afdec1d1afbf0cfae7a317a4bdfd109457f3149dc3051d5497b23d9957092f37191fb6a0d58e50225d67b61d29e6be082977cb6a102d5a560f5f06cd7186c4e2 SHA512 557ba4180d764c04edabe6292a44f5340c5b1f7ac2390a4068711be4ad6da7429e651bc2230d6ff9cc6c58cd6a6c59149f20083de8cf4d8239d95f86db39565f
-DIST liblognorm-2.0.2.tar.gz 658976 BLAKE2B 44a928ca4d8934f9b6f0b81610315a7de1f0968d2d62fddf9e919699c2fa10d1bce94f0a46a40ff9bf6521ae7dc7a88440febd1b770af9dc3983d13e5a10e188 SHA512 7cb1e20c895859072b9d6f0b3c2dd89874192dce6d11878a4c3eb0b0d9f1691d97205a61290e9cd07deeaa71c58f5fb6a4c1f14bd206119d690cf84c107ccbe4
-DIST liblognorm-2.0.3.tar.gz 660680 BLAKE2B d5da4386026faae43dbcbe36aacc47687ef8636be2223a596a9915adee731535083016e5d680c9169cb8d4262a7f3d2342a9e6af566108a635f9d49fcf2cfec5 SHA512 8f343f3029c506a9c060b1b55e478da9ceedc1fbf27ca53a991ffbddb397383adfee2d79beb174a6c997599ee3c0fa4bbc9925fa850e5bf4f4d7b181ddae7cdb
DIST liblognorm-2.0.4.tar.gz 665898 BLAKE2B 80bcd114d2be81f8eea847e699b7e8ade9ca37d4376f64af81bfaba1a440e1efbab579235aba775c46a9d011e930453d2c001de525577b7775784e7152b3e700 SHA512 3c7cbf0c8c320708615218009354d198ba0893632ca464a07270f59d137753dfc7ad6dae66b565660f14e9285f9c8964824d36070b1872b6c633589b4996ba02
DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch b/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch
deleted file mode 100644
index 3bffe5ec74f..00000000000
--- a/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-[PATCH] Turn --disable-docs into --enable-docs and make it work
-
-See upstream issue #16 for more details.
----
- configure.ac | 22 ++++++++++++++--------
- 1 file changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 547908c..26a2f96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -96,15 +96,21 @@ fi
-
- # docs (html) build settings
- AC_ARG_ENABLE(docs,
-- [AS_HELP_STRING([--disable-docs],[Disable building HTML docs (requires Sphinx)])],
-- [enable_docs="no"],
-- [enable_docs="yes"]
-+ [AS_HELP_STRING([--enable-docs],[Enable building HTML docs (requires Sphinx) @<:@default=no@:>@])],
-+ [case "${enableval}" in
-+ yes) enable_docs="yes" ;;
-+ no) enable_docs="no" ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;;
-+ esac],
-+ [enable_docs="no"]
- )
--AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
--AS_IF([test "$enable_docs" = "yes" -a "x$SPHINXBUILD" = xno],
-- [AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])]
--)
--AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = yes])
-+if test "$enable_docs" = "yes"; then
-+ AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
-+ if test "$SPHINXBUILD" = "no"; then
-+ AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])
-+ fi
-+fi
-+AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = "yes"])
-
- AC_ARG_ENABLE(testbench,
- [AS_HELP_STRING([--enable-testbench],[testbench enabled @<:@default=no@:>@])],
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
deleted file mode 100644
index 4b4a063cf18..00000000000
--- a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 4b35ca1e6fff50f47eb5419b879b287f49dcf1d8 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Mon, 24 Aug 2015 09:05:52 +0200
-Subject: [PATCH] "fix": process last line if it misses the terminating LF
-
-This problem occurs with the very last line of a rulebase (at EOF).
-If it is not properly terminated (LF missing), it is silently ignored.
-Previous versions did obviously process lines in this case. While
-technically this is invalid input, we can't outrule that such rulebases
-exist. For example, they do in the rsyslog testbench, which made
-us aware of the problem (see https://github.com/rsyslog/rsyslog/issues/489 ).
-
-I think the proper way of addressing this is to process such lines without
-termination, as many other tools do as well.
-
-closes https://github.com/rsyslog/liblognorm/issues/135
----
- src/samp.c | 5 ++++-
- tests/Makefile.am | 2 ++
- tests/field_mac48.sh | 1 -
- tests/missing_line_ending.rb | 1 +
- tests/missing_line_ending.sh | 25 +++++++++++++++++++++++++
- 5 files changed, 32 insertions(+), 2 deletions(-)
- create mode 100644 tests/missing_line_ending.rb
- create mode 100755 tests/missing_line_ending.sh
-
-diff --git a/src/samp.c b/src/samp.c
-index ef57047..0a9ae0a 100644
---- a/src/samp.c
-+++ b/src/samp.c
-@@ -801,7 +801,10 @@ ln_sampRead(ln_ctx ctx, FILE *const __restrict__ repo, int *const __restrict__ i
- int c = fgetc(repo);
- if(c == EOF) {
- *isEof = 1;
-- goto done;
-+ if(i == 0)
-+ goto done;
-+ else
-+ done = 1; /* last line missing LF, still process it! */
- } else if(c == '\n') {
- ++linenbr;
- if(!inParser && i != 0)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a3a3842..cfcf010 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,6 +13,7 @@ user_test_LDFLAGS = -no-install
- TESTS_SHELLSCRIPTS = \
- parser_whitespace.sh \
- parser_LF.sh \
-+ missing_line_ending.sh \
- field_hexnumber.sh \
- field_mac48.sh \
- field_name_value.sh \
-@@ -54,6 +55,7 @@ REGEXP_TESTS = \
- field_regex_while_regex_support_is_disabled.sh
-
- EXTRA_DIST = exec.sh \
-+ missing_line_ending.rb \
- $(TESTS_SHELLSCRIPTS) \
- $(REGEXP_TESTS) \
- $(json_eq_self_sources) \
-diff --git a/tests/field_mac48.sh b/tests/field_mac48.sh
-index bd2898e..0f17166 100755
---- a/tests/field_mac48.sh
-+++ b/tests/field_mac48.sh
-@@ -21,4 +21,3 @@ assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f
-
-
- cleanup_tmp_files
--
-diff --git a/tests/missing_line_ending.rb b/tests/missing_line_ending.rb
-new file mode 100644
-index 0000000..b252483
---- /dev/null
-+++ b/tests/missing_line_ending.rb
-@@ -0,0 +1 @@
-+rule=:%field:mac48%
-\ No newline at end of file
-diff --git a/tests/missing_line_ending.sh b/tests/missing_line_ending.sh
-new file mode 100755
-index 0000000..18f4d2c
---- /dev/null
-+++ b/tests/missing_line_ending.sh
-@@ -0,0 +1,25 @@
-+# added 2015-05-05 by Rainer Gerhards
-+# This file is part of the liblognorm project, released under ASL 2.0
-+. $srcdir/exec.sh
-+
-+test_def $0 "dmac48 syntax"
-+# we need to use a canned file, as we cannot easily reproduce the
-+# malformed lines
-+cp missing_line_ending.rb $(rulebase_file_name)
-+
-+execute 'f0:f6:1c:5f:cc:a2'
-+assert_output_json_eq '{"field": "f0:f6:1c:5f:cc:a2"}'
-+
-+execute 'f0-f6-1c-5f-cc-a2'
-+assert_output_json_eq '{"field": "f0-f6-1c-5f-cc-a2"}'
-+
-+# things that need to NOT match
-+
-+execute 'f0-f6:1c:5f:cc-a2'
-+assert_output_json_eq '{ "originalmsg": "f0-f6:1c:5f:cc-a2", "unparsed-data": "f0-f6:1c:5f:cc-a2" }'
-+
-+execute 'f0:f6:1c:xf:cc:a2'
-+assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f0:f6:1c:xf:cc:a2" }'
-+
-+
-+#cleanup_tmp_files
diff --git a/dev-libs/liblognorm/files/respect_CFLAGS.patch b/dev-libs/liblognorm/files/respect_CFLAGS.patch
deleted file mode 100644
index 6e8d28099ee..00000000000
--- a/dev-libs/liblognorm/files/respect_CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.new 2014-03-20 10:56:14.777901140 +0200
-+++ configure.ac 2014-03-20 10:56:50.154143106 +0200
-@@ -12,7 +12,7 @@
- AC_PROG_CC
- AM_PROG_CC_C_O
- if test "$GCC" = "yes"
--then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
-+then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute"
- fi
-
- AC_PROG_LIBTOOL
diff --git a/dev-libs/liblognorm/liblognorm-1.1.0.ebuild b/dev-libs/liblognorm/liblognorm-1.1.0.ebuild
deleted file mode 100644
index 061fec8a898..00000000000
--- a/dev-libs/liblognorm/liblognorm-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-IUSE="debug doc pcre static-libs test"
-
-RDEPEND="
- >=dev-libs/libestr-0.1.3
- >=dev-libs/json-c-0.11:=
- pcre? ( >=dev-libs/libpcre-8.35 )
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}"/respect_CFLAGS.patch
- "${FILESDIR}"/${PN}-1.1.0-fix-enable-docs.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable debug)
- $(use_enable doc docs)
- $(use_enable pcre regexp)
- $(use_enable test testbench)
- )
-
- autotools-utils_src_configure
-}
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
deleted file mode 100644
index 8db2881ff38..00000000000
--- a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm hppa x86 ~amd64-linux"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
- >=dev-libs/libestr-0.1.3
- >=dev-libs/json-c-0.11:=
-"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
- "${FILESDIR}"/respect_CFLAGS.patch
- "${FILESDIR}"/${PN}-1.1.2-issue_135.patch
-)
-
-src_configure() {
- local myeconfargs=(
- $(use_enable doc docs)
- $(use_enable test testbench)
- $(use_enable debug)
- --disable-regexp
- )
-
- autotools-utils_src_configure
-}
-
-src_test() {
- # When adding new tests via patches we have to make them executable
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- emake --jobs 1 check
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.1.ebuild b/dev-libs/liblognorm/liblognorm-2.0.1.ebuild
deleted file mode 100644
index 8a15d6a6e44..00000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- inherit git-r3
-else
- SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
- KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.0.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
- >=dev-libs/libestr-0.1.3
- >=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
- ${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.04
- virtual/pkgconfig
- doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- # regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
- local myeconfargs=(
- --enable-compile-warnings=yes
- --disable-Werror
- $(use_enable doc docs)
- $(use_enable test testbench)
- $(use_enable debug)
- $(use_enable static-libs static)
- --disable-regexp
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # When adding new tests via patches we have to make them executable
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- emake --jobs 1 check
-}
-
-src_install() {
- default
-
- find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.2.ebuild b/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
deleted file mode 100644
index 8a15d6a6e44..00000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- inherit git-r3
-else
- SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
- KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.0.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
- >=dev-libs/libestr-0.1.3
- >=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
- ${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.04
- virtual/pkgconfig
- doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- # regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
- local myeconfargs=(
- --enable-compile-warnings=yes
- --disable-Werror
- $(use_enable doc docs)
- $(use_enable test testbench)
- $(use_enable debug)
- $(use_enable static-libs static)
- --disable-regexp
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # When adding new tests via patches we have to make them executable
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- emake --jobs 1 check
-}
-
-src_install() {
- default
-
- find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.3.ebuild b/dev-libs/liblognorm/liblognorm-2.0.3.ebuild
deleted file mode 100644
index 4d1ce9af4f4..00000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
- inherit git-r3
-else
- SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.1.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
- >=dev-libs/libestr-0.1.3
- >=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
- ${RDEPEND}
- >=sys-devel/autoconf-archive-2015.02.04
- virtual/pkgconfig
- doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- # regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
- local myeconfargs=(
- --enable-compile-warnings=yes
- --disable-Werror
- $(use_enable doc docs)
- $(use_enable test testbench)
- $(use_enable debug)
- $(use_enable static-libs static)
- --disable-regexp
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # When adding new tests via patches we have to make them executable
- einfo "Adjusting permissions of test scripts ..."
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
- die "Failed to adjust test scripts permission"
-
- emake --jobs 1 check
-}
-
-src_install() {
- default
-
- find "${ED}"usr/lib* -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/liblognorm/files/, dev-libs/liblognorm/
@ 2022-11-22 23:42 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-11-22 23:42 UTC (permalink / raw
To: gentoo-commits
commit: e1a3128b6ca82ec6f9632448200afb8a2a5bd495
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 23:33:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 23:33:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a3128b
dev-libs/liblognorm: fix configure w/ clang 16
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/liblognorm-2.0.6-configure-clang16.patch | 21 +++++++++++++++++++++
...norm-2.0.6.ebuild => liblognorm-2.0.6-r1.ebuild} | 14 +++++++-------
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch b/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch
new file mode 100644
index 000000000000..3ba63017e18a
--- /dev/null
+++ b/dev-libs/liblognorm/files/liblognorm-2.0.6-configure-clang16.patch
@@ -0,0 +1,21 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=2141801
+https://src.fedoraproject.org/rpms/liblognorm/c/cdaf4de866002343f4011bb05c71f764258948a7?branch=rawhide
+
+"""
+Submitted to Adiscon via ticket system. See:
+
+ <https://bugzilla.redhat.com/show_bug.cgi?id=2141801>
+"""
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,7 @@ m4_ifdef([AX_IS_RELEASE], [
+ # Checks for libraries.
+ save_LIBS=$LIBS
+ LIBS=
+-AC_SEARCH_LIBS(clock_getm4_defn([AC_AUTOCONF_VERSION]), [2.68]time, rt)
++AC_SEARCH_LIBS(clock_gettime, rt)
+ LIBS=$save_LIBS
+
+ # Checks for header files.
+
+
diff --git a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
similarity index 89%
rename from dev-libs/liblognorm/liblognorm-2.0.6.ebuild
rename to dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
index 63346c79252e..f3648a4f4e3d 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.6.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.6-r1.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
inherit autotools
DESCRIPTION="Fast samples-based log normalization library"
HOMEPAGE="https://www.liblognorm.com"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
inherit git-r3
@@ -26,9 +26,8 @@ RDEPEND="
>=dev-libs/libestr-0.1.3
>=dev-libs/libfastjson-0.99.2:=
"
-
-DEPEND="
- ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=sys-devel/autoconf-archive-2015.02.04
virtual/pkgconfig
doc? ( >=dev-python/sphinx-1.2.2 )
@@ -38,6 +37,7 @@ DOCS=( ChangeLog )
PATCHES=(
"${FILESDIR}/${P}-sphinx-5.patch"
+ "${FILESDIR}/${P}-configure-clang16.patch"
)
src_prepare() {
@@ -67,11 +67,11 @@ src_test() {
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
die "Failed to adjust test scripts permission"
- emake --jobs 1 check
+ emake -j1 check
}
src_install() {
default
- find "${ED}"usr/lib* -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-22 23:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-22 23:42 [gentoo-commits] repo/gentoo:master commit in: dev-libs/liblognorm/files/, dev-libs/liblognorm/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2018-05-21 19:02 Thomas Deutschmann
2015-10-09 14:12 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox