commit: 540b57daa55d5d65fce313c2113be914c968246d
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 5 02:32:42 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Apr 5 02:32:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=540b57da
app-admin/rsyslog: sync with tree/clean up patches
The alpine patch was out of date (only GLOB_BRACE needs to be defined)
Also remove the queue.h patch and instead depend on sys-libs/queue.
Add latest stable version.
app-admin/rsyslog/Manifest | 10 +-
.../8-stable/50-rsyslog-8.18.0-musl-fix.patch | 11 +-
.../50-rsyslog-8.18.0-musl-imptcp-queue.patch | 594 ---------------------
app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 | 1 -
...g-8.25.0-r2.ebuild => rsyslog-8.24.0-r2.ebuild} | 8 +-
app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild | 2 +-
6 files changed, 14 insertions(+), 612 deletions(-)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index e8088c6..b496a5c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,13 +1,15 @@
AUX 8-stable/50-default.conf 1701 SHA256
61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512
33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9
WHIRLPOOL
d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311
-AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 300 SHA256
5b8420570bef57aeba55965bbbddb29f966b60a33ef9e7fc5f921820274080b0 SHA512
20967235e8233588210071a7157a81fe02a1e88d7c7f55855fcc2fe34295269a6e3e3bfccb3d4dd83a6a48da28948c92d6ce47a0c5d817f6b6a4030635f4f896
WHIRLPOOL
e8a07737f7e282905bf92112b2d94303605cb2f8da0d5c0598f41bdb8d060a18f5d6f2b70a8f5f3feec5cb0a24109fdf4f2e1ebd0517e8063d72c763e345501f
-AUX 8-stable/50-rsyslog-8.18.0-musl-imptcp-queue.patch 20588 SHA256
8d6dda439c79dffac2a5d17e3d9a28355cfb8fc264175a871e27304ace259daa SHA512
de8b82781af2dfef67b2215782721cca2ee5db9d08ed3260f4e3390353a59bf4bd76701df682c4bf537ce817eabf79b062c4b2a3e20e4175e7d77ca08c5a700f
WHIRLPOOL
cf1d3c2e434c7843e9874b8138ecb3777cc4e384477b2c3936b9d5c10e13e2493461c433c58760a35ba20638c5acd1e03c7fae718f5d2a6b0017ea34e66b0a67
+AUX 8-stable/50-rsyslog-8.18.0-musl-fix.patch 168 SHA256
5806738195b8155bbb19e3fb0db84f59668f5cf0c303d0f3c1e15a4ac31f8997 SHA512
8ab680645e59392ce164e8b46b3c6b64def1fa08f83fca3feb1065d0f1a663f5cf34600aec86190edcd06d364399efaa04b372310f76f263d11cb179e3a840fa
WHIRLPOOL
e70fededf8f540d77628d26b9d28512ee7b1b6ca6bd0e13b644c6f7665c2a91c85a6602e7b22e5a404e758caf6a71393d0abfff3b2a6e98519ffa2399c1ec778
AUX 8-stable/README.gentoo 1126 SHA256
29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512
46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
WHIRLPOOL
a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e
AUX 8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch 4660 SHA256
f50685f76004298a8a77ee6eb88868ff0f8fb8eb7ca5ce0f6809c4db9c42474d SHA512
231030532a126dade0fa2c98d9bd8ef610d3059210cabfc6b0a51adfb610b61eb57b7926a2a51f01f196d196a9134b4c1db7105aeedc4d35eb70abac97301378
WHIRLPOOL
88a9ebe6e3dbeca7b55e16192e6be6d862241a17402c2abf0bcdad4f16fed5fa11f7c140ac0de1655a52d43ad18eaa493b3e2426e1b3c80d1be119dffdc9cd15
AUX 8-stable/rsyslog.conf 1562 SHA256
fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512
1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
WHIRLPOOL
97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba
AUX 8-stable/rsyslog.confd-r1 1145 SHA256
0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6 SHA512
a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
WHIRLPOOL
05079ab1a55aca9b68c81c8b7da66ff029f72c7168bd15faebf7d7172dddc69f6ffb2864e1fcd8c1f2dbb51416bea89fab3667a34ed7295b3abafc6a93883d3e
-AUX 8-stable/rsyslog.initd-r1 1765 SHA256
2c8800c31b8411899b49036bd51ed58a625ee8b7bd523b18d6ad8b7399da0324 SHA512
07a73ddd6e50b9d4ae7d9633c71b6e96e86f3348e242506d9f6a86a0f367e6bc671bed559f9d69232096e7dce7a062be7107794fc2564829d53f42d4d30d8daf
WHIRLPOOL
734780723ae73f573c3104c35460e8ef9e5915433012c1a2ca987bea7de37a3a423315ca6f1da06dbf0af6fabc14051c89f7e682592d6ccaa1e39432d5648477
+AUX 8-stable/rsyslog.initd-r1 1758 SHA256
93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343 SHA512
0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
WHIRLPOOL
14918404976219e379f80d67fe47a0f6e9d51938061c9f5d205bbcd7cedbda96825f75fd64f2fcc446d96292710a5ea375e117f621c33c9df7352e27286c91ae
AUX 8-stable/rsyslog.logrotate 682 SHA256
89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512
6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912
WHIRLPOOL
9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
+DIST rsyslog-8.24.0.tar.gz 2374240 SHA256
37f32ce33e32a88e1bea0511e8e557d90b7378b81520e3236a9af5ba6ea993d7 SHA512
b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
WHIRLPOOL
c5895d50143c21d446d760f5179b47fdae4ec34867711c942cd671b88789588e7244fb8511745efdb701954f7bc390403d30736a1e54af13dca4876f989928df
DIST rsyslog-8.25.0.tar.gz 2386720 SHA256
c756f16a083e5d4081fb9bfb236303a839cdca0a2c00017bd770b2e2e9677427 SHA512
0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
WHIRLPOOL
2c4925fda01e49f95ed3d2f43898cdf8f6d679ace5c2a1d1d330dfc422936ae7751cfefa480359b26d2cb782a8217865336f5e04e65e81ffce565b3388c2ff01
+DIST rsyslog-docs-8.24.0.tar.gz 4344877 SHA256
f5e3c27c5b65abdd600b8ad8d99d1f2fe9f0ffca02d6af3c12db5fc10dd889b2 SHA512
b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
WHIRLPOOL
e8b2d10b0de3c33189f859f08db58e319730e709e5a5008909f2166a061952290b0bf96163cdf6e0b3829896916f712ba5d8a2a98f02d796e9174d8919190f8d
DIST rsyslog-docs-8.25.0.tar.gz 4359583 SHA256
3fa96f85ca31b09b16dcc4b184f9beeb5fb06ba463b0ced7046ec2a471b7d3ad SHA512
e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
WHIRLPOOL
8c2ae0afe5fb1f81b33ecb83df420a7bbc8c147eac5854a57ba1c5341bb42d9dd4a3976a472445d19a45eb09258bc3be1b9065d79fd679095cbf24cbfddb1756
-EBUILD rsyslog-8.25.0-r2.ebuild 12699 SHA256
fda57ebf418514858933efbee7fd118fc94d300ce0aa4a96c5011fd34c09ace5 SHA512
4c8d2e377d9627b665308c7dd5d9e361d3f15859913dfda436528e32f009ad405b8d75797e651007b0bbd488b6b7776c3081877c4d9ae7f1ebee13cd472725e6
WHIRLPOOL
f249eddf6183791e6dd6597e57d759c67fc21b65ab7f0ab0fcfa0008606ba949d378c73c9415724b73e84826409405b02b6a318a2e90a5af9a79effb14f6b091
+EBUILD rsyslog-8.24.0-r2.ebuild 12575 SHA256
7725f8cf5aed2092ecc4d7534d4491dd6a28ec84c3e3a3d60b9dd0e87cf395c3 SHA512
de77eaa59232ad924fdc059ee287448196e0a750a92e783ecc7fe29656f09a1110e4e47c78b8ebfff085b34838d1f23a5fccd79aaea50998a5c33497a9220e7a
WHIRLPOOL
53d1532b60e73032df6938873ce43ffbf692f42abbd39bc3e3b9596360dd6c9dd0a6d030251ceabec20493a282ee153a036c1481537394e601ad9dd7c83c54cb
+EBUILD rsyslog-8.25.0-r2.ebuild 12666 SHA256
20574ebc2e7ed7a5ad65118f6b6611a4f43e21f6b221aa9daef67fb77f798011 SHA512
cacf7a2ef497e15b42158a32acd6d638b6d377f441c5b2e6e6bb40c7a9e1eefb0d9cb57e70067afd9d80e8182469f18c272474109bc3595c63b37bcbe69e7f47
WHIRLPOOL
41308e20598e5b962e5f961d9afaafb0c00397ce9b52e9e4984f9898c18ec9a7035b0060193882a67c710230c3d8071307d23851c39331d117fccf91fe173742
MISC metadata.xml 3329 SHA256
c757c77e3d9c766d901ac9737ea16ecd4bc836585df84c745d9ab2b160baebce SHA512
a128d327fdd7e46e9fc22605589d0a05462dce15870e3a9371a83d47e2616eb0ea4e54c6f813eb7c87d24ad8cc456883a145c73425e6bd9483f4dfd82c4377cd
WHIRLPOOL
921eb979cdf8efdf2bb0fab33e6b4d774a870a86e243af21b73a127376d843bf1400007d1f72026713f344ce1ee67456d5a7d1f182d8f5ef59679debc178a357
diff --git a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch
index bfd20b5..3c5681d 100644
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-fix.patch
@@ -1,13 +1,10 @@
---- rsyslog-8.16.0/runtime/rsyslog.h
-+++ rsyslog-8.16.0-musl/runtime/rsyslog.h
-@@ -643,3 +643,10 @@
+--- a/runtime/rsyslog.h
++++ b/runtime/rsyslog.h
+@@ -643,3 +643,7 @@
#endif
#endif /* multi-include protection */
+
-+/* musl patches for alpine */
-+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
++#ifndef GLOB_BRACE
+#define GLOB_BRACE 0
-+#ifndef WAIT_ANY
-+#define WAIT_ANY (-1)
+#endif
diff --git
a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-imptcp-queue.patch
b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-imptcp-queue.patch
deleted file mode 100644
index 863fbd2..0000000
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.18.0-musl-imptcp-queue.patch
+++ /dev/null
@@ -1,594 +0,0 @@
---- rsyslog-8.18.0/plugins/imptcp/imptcp.c
-+++ rsyslog-8.18.0-b/plugins/imptcp/imptcp.c
-@@ -50,13 +50,13 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/epoll.h>
--#include <sys/queue.h>
- #include <netinet/tcp.h>
- #include <stdint.h>
- #include <zlib.h>
- #if HAVE_FCNTL_H
- #include <fcntl.h>
- #endif
-+#include "queue.h"
- #include "rsyslog.h"
- #include "cfsysline.h"
- #include "prop.h"
---- /dev/null
-+++ rsyslog-8.18.0-b/plugins/imptcp/queue.h
-@@ -0,0 +1,574 @@
-+/*
-+ * Copyright (c) 1991, 1993
-+ * The Regents of the University of California. All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * @(#)queue.h 8.5 (Berkeley) 8/20/94
-+ */
-+
-+#ifndef _SYS_QUEUE_H_
-+#define _SYS_QUEUE_H_
-+
-+/*
-+ * This file defines five types of data structures: singly-linked lists,
-+ * lists, simple queues, tail queues, and circular queues.
-+ *
-+ * A singly-linked list is headed by a single forward pointer. The
-+ * elements are singly linked for minimum space and pointer manipulation
-+ * overhead at the expense of O(n) removal for arbitrary elements. New
-+ * elements can be added to the list after an existing element or at the
-+ * head of the list. Elements being removed from the head of the list
-+ * should use the explicit macro for this purpose for optimum
-+ * efficiency. A singly-linked list may only be traversed in the forward
-+ * direction. Singly-linked lists are ideal for applications with large
-+ * datasets and few or no removals or for implementing a LIFO queue.
-+ *
-+ * A list is headed by a single forward pointer (or an array of forward
-+ * pointers for a hash table header). The elements are doubly linked
-+ * so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before
-+ * or after an existing element or at the head of the list. A list
-+ * may only be traversed in the forward direction.
-+ *
-+ * A simple queue is headed by a pair of pointers, one the head of the
-+ * list and the other to the tail of the list. The elements are singly
-+ * linked to save space, so elements can only be removed from the
-+ * head of the list. New elements can be added to the list after
-+ * an existing element, at the head of the list, or at the end of the
-+ * list. A simple queue may only be traversed in the forward direction.
-+ *
-+ * A tail queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or
-+ * after an existing element, at the head of the list, or at the end of
-+ * the list. A tail queue may be traversed in either direction.
-+ *
-+ * A circle queue is headed by a pair of pointers, one to the head of the
-+ * list and the other to the tail of the list. The elements are doubly
-+ * linked so that an arbitrary element can be removed without a need to
-+ * traverse the list. New elements can be added to the list before or after
-+ * an existing element, at the head of the list, or at the end of the list.
-+ * A circle queue may be traversed in either direction, but has a more
-+ * complex end of list detection.
-+ *
-+ * For details on the use of these macros, see the queue(3) manual page.
-+ */
-+
-+/*
-+ * List definitions.
-+ */
-+#define LIST_HEAD(name, type)
\
-+struct name { \
-+ struct type *lh_first; /* first element */ \
-+}
-+
-+#define LIST_HEAD_INITIALIZER(head)
\
-+ { NULL }
-+
-+#define LIST_ENTRY(type)
\
-+struct { \
-+ struct type *le_next; /* next element */ \
-+ struct type **le_prev; /* address of previous next element */ \
-+}
-+
-+/*
-+ * List functions.
-+ */
-+#define LIST_INIT(head) do {
\
-+ (head)->lh_first = NULL; \
-+} while (/*CONSTCOND*/0)
-+
-+#define LIST_INSERT_AFTER(listelm, elm, field) do {
\
-+ if (((elm)->field.le_next = (listelm)->field.le_next) != NULL) \
-+ (listelm)->field.le_next->field.le_prev = \
-+ &(elm)->field.le_next; \
-+ (listelm)->field.le_next = (elm); \
-+ (elm)->field.le_prev = &(listelm)->field.le_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define LIST_INSERT_BEFORE(listelm, elm, field) do {
\
-+ (elm)->field.le_prev = (listelm)->field.le_prev; \
-+ (elm)->field.le_next = (listelm); \
-+ *(listelm)->field.le_prev = (elm); \
-+ (listelm)->field.le_prev = &(elm)->field.le_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define LIST_INSERT_HEAD(head, elm, field) do {
\
-+ if (((elm)->field.le_next = (head)->lh_first) != NULL) \
-+ (head)->lh_first->field.le_prev = &(elm)->field.le_next;\
-+ (head)->lh_first = (elm); \
-+ (elm)->field.le_prev = &(head)->lh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define LIST_REMOVE(elm, field) do {
\
-+ if ((elm)->field.le_next != NULL) \
-+ (elm)->field.le_next->field.le_prev = \
-+ (elm)->field.le_prev; \
-+ *(elm)->field.le_prev = (elm)->field.le_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define LIST_FOREACH(var, head, field)
\
-+ for ((var) = ((head)->lh_first); \
-+ (var); \
-+ (var) = ((var)->field.le_next))
-+
-+/*
-+ * List access methods.
-+ */
-+#define LIST_EMPTY(head) ((head)->lh_first == NULL)
-+#define LIST_FIRST(head) ((head)->lh_first)
-+#define LIST_NEXT(elm, field) ((elm)->field.le_next)
-+
-+
-+/*
-+ * Singly-linked List definitions.
-+ */
-+#define SLIST_HEAD(name, type)
\
-+struct name { \
-+ struct type *slh_first; /* first element */ \
-+}
-+
-+#define SLIST_HEAD_INITIALIZER(head)
\
-+ { NULL }
-+
-+#define SLIST_ENTRY(type)
\
-+struct { \
-+ struct type *sle_next; /* next element */ \
-+}
-+
-+/*
-+ * Singly-linked List functions.
-+ */
-+#define SLIST_INIT(head) do {
\
-+ (head)->slh_first = NULL; \
-+} while (/*CONSTCOND*/0)
-+
-+#define SLIST_INSERT_AFTER(slistelm, elm, field) do {
\
-+ (elm)->field.sle_next = (slistelm)->field.sle_next; \
-+ (slistelm)->field.sle_next = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define SLIST_INSERT_HEAD(head, elm, field) do {
\
-+ (elm)->field.sle_next = (head)->slh_first; \
-+ (head)->slh_first = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define SLIST_REMOVE_HEAD(head, field) do {
\
-+ (head)->slh_first = (head)->slh_first->field.sle_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define SLIST_REMOVE(head, elm, type, field) do {
\
-+ if ((head)->slh_first == (elm)) { \
-+ SLIST_REMOVE_HEAD((head), field); \
-+ } \
-+ else { \
-+ struct type *curelm = (head)->slh_first; \
-+ while(curelm->field.sle_next != (elm)) \
-+ curelm = curelm->field.sle_next; \
-+ curelm->field.sle_next = \
-+ curelm->field.sle_next->field.sle_next; \
-+ } \
-+} while (/*CONSTCOND*/0)
-+
-+#define SLIST_FOREACH(var, head, field)
\
-+ for((var) = (head)->slh_first; (var); (var) = (var)->field.sle_next)
-+
-+/*
-+ * Singly-linked List access methods.
-+ */
-+#define SLIST_EMPTY(head) ((head)->slh_first == NULL)
-+#define SLIST_FIRST(head) ((head)->slh_first)
-+#define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
-+
-+
-+/*
-+ * Singly-linked Tail queue declarations.
-+ */
-+#define STAILQ_HEAD(name, type) \
-+struct name { \
-+ struct type *stqh_first; /* first element */
\
-+ struct type **stqh_last; /* addr of last next element */
\
-+}
-+
-+#define STAILQ_HEAD_INITIALIZER(head)
\
-+ { NULL, &(head).stqh_first }
-+
-+#define STAILQ_ENTRY(type)
\
-+struct { \
-+ struct type *stqe_next; /* next element */ \
-+}
-+
-+/*
-+ * Singly-linked Tail queue functions.
-+ */
-+#define STAILQ_INIT(head) do {
\
-+ (head)->stqh_first = NULL; \
-+ (head)->stqh_last = &(head)->stqh_first;
\
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_INSERT_HEAD(head, elm, field) do {
\
-+ if (((elm)->field.stqe_next = (head)->stqh_first) == NULL) \
-+ (head)->stqh_last = &(elm)->field.stqe_next; \
-+ (head)->stqh_first = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_INSERT_TAIL(head, elm, field) do {
\
-+ (elm)->field.stqe_next = NULL; \
-+ *(head)->stqh_last = (elm); \
-+ (head)->stqh_last = &(elm)->field.stqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_INSERT_AFTER(head, listelm, elm, field) do {
\
-+ if (((elm)->field.stqe_next = (listelm)->field.stqe_next) == NULL)\
-+ (head)->stqh_last = &(elm)->field.stqe_next; \
-+ (listelm)->field.stqe_next = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_REMOVE_HEAD(head, field) do {
\
-+ if (((head)->stqh_first = (head)->stqh_first->field.stqe_next) == NULL)
\
-+ (head)->stqh_last = &(head)->stqh_first;
\
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_REMOVE(head, elm, type, field) do {
\
-+ if ((head)->stqh_first == (elm)) { \
-+ STAILQ_REMOVE_HEAD((head), field); \
-+ } else { \
-+ struct type *curelm = (head)->stqh_first; \
-+ while (curelm->field.stqe_next != (elm))
\
-+ curelm = curelm->field.stqe_next; \
-+ if ((curelm->field.stqe_next = \
-+ curelm->field.stqe_next->field.stqe_next) == NULL) \
-+ (head)->stqh_last = &(curelm)->field.stqe_next; \
-+ } \
-+} while (/*CONSTCOND*/0)
-+
-+#define STAILQ_FOREACH(var, head, field)
\
-+ for ((var) = ((head)->stqh_first); \
-+ (var); \
-+ (var) = ((var)->field.stqe_next))
-+
-+#define STAILQ_CONCAT(head1, head2) do {
\
-+ if (!STAILQ_EMPTY((head2))) { \
-+ *(head1)->stqh_last = (head2)->stqh_first; \
-+ (head1)->stqh_last = (head2)->stqh_last; \
-+ STAILQ_INIT((head2)); \
-+ } \
-+} while (/*CONSTCOND*/0)
-+
-+/*
-+ * Singly-linked Tail queue access methods.
-+ */
-+#define STAILQ_EMPTY(head) ((head)->stqh_first == NULL)
-+#define STAILQ_FIRST(head) ((head)->stqh_first)
-+#define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
-+
-+
-+/*
-+ * Simple queue definitions.
-+ */
-+#define SIMPLEQ_HEAD(name, type)
\
-+struct name { \
-+ struct type *sqh_first; /* first element */ \
-+ struct type **sqh_last; /* addr of last next element */ \
-+}
-+
-+#define SIMPLEQ_HEAD_INITIALIZER(head)
\
-+ { NULL, &(head).sqh_first }
-+
-+#define SIMPLEQ_ENTRY(type)
\
-+struct { \
-+ struct type *sqe_next; /* next element */ \
-+}
-+
-+/*
-+ * Simple queue functions.
-+ */
-+#define SIMPLEQ_INIT(head) do {
\
-+ (head)->sqh_first = NULL; \
-+ (head)->sqh_last = &(head)->sqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_INSERT_HEAD(head, elm, field) do {
\
-+ if (((elm)->field.sqe_next = (head)->sqh_first) == NULL) \
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+ (head)->sqh_first = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_INSERT_TAIL(head, elm, field) do {
\
-+ (elm)->field.sqe_next = NULL; \
-+ *(head)->sqh_last = (elm); \
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_INSERT_AFTER(head, listelm, elm, field) do {
\
-+ if (((elm)->field.sqe_next = (listelm)->field.sqe_next) == NULL)\
-+ (head)->sqh_last = &(elm)->field.sqe_next; \
-+ (listelm)->field.sqe_next = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_REMOVE_HEAD(head, field) do {
\
-+ if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
-+ (head)->sqh_last = &(head)->sqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_REMOVE(head, elm, type, field) do {
\
-+ if ((head)->sqh_first == (elm)) { \
-+ SIMPLEQ_REMOVE_HEAD((head), field); \
-+ } else { \
-+ struct type *curelm = (head)->sqh_first; \
-+ while (curelm->field.sqe_next != (elm)) \
-+ curelm = curelm->field.sqe_next; \
-+ if ((curelm->field.sqe_next = \
-+ curelm->field.sqe_next->field.sqe_next) == NULL) \
-+ (head)->sqh_last = &(curelm)->field.sqe_next; \
-+ } \
-+} while (/*CONSTCOND*/0)
-+
-+#define SIMPLEQ_FOREACH(var, head, field)
\
-+ for ((var) = ((head)->sqh_first); \
-+ (var); \
-+ (var) = ((var)->field.sqe_next))
-+
-+/*
-+ * Simple queue access methods.
-+ */
-+#define SIMPLEQ_EMPTY(head) ((head)->sqh_first == NULL)
-+#define SIMPLEQ_FIRST(head) ((head)->sqh_first)
-+#define SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next)
-+
-+
-+/*
-+ * Tail queue definitions.
-+ */
-+#define _TAILQ_HEAD(name, type, qual)
\
-+struct name { \
-+ qual type *tqh_first; /* first element */ \
-+ qual type *qual *tqh_last; /* addr of last next element */ \
-+}
-+#define TAILQ_HEAD(name, type) _TAILQ_HEAD(name, struct type,)
-+
-+#define TAILQ_HEAD_INITIALIZER(head)
\
-+ { NULL, &(head).tqh_first }
-+
-+#define _TAILQ_ENTRY(type, qual)
\
-+struct { \
-+ qual type *tqe_next; /* next element */ \
-+ qual type *qual *tqe_prev; /* address of previous next element */\
-+}
-+#define TAILQ_ENTRY(type) _TAILQ_ENTRY(struct type,)
-+
-+/*
-+ * Tail queue functions.
-+ */
-+#define TAILQ_INIT(head) do {
\
-+ (head)->tqh_first = NULL; \
-+ (head)->tqh_last = &(head)->tqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_HEAD(head, elm, field) do {
\
-+ if (((elm)->field.tqe_next = (head)->tqh_first) != NULL) \
-+ (head)->tqh_first->field.tqe_prev = \
-+ &(elm)->field.tqe_next; \
-+ else \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+ (head)->tqh_first = (elm); \
-+ (elm)->field.tqe_prev = &(head)->tqh_first; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_TAIL(head, elm, field) do {
\
-+ (elm)->field.tqe_next = NULL; \
-+ (elm)->field.tqe_prev = (head)->tqh_last; \
-+ *(head)->tqh_last = (elm); \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_AFTER(head, listelm, elm, field) do {
\
-+ if (((elm)->field.tqe_next = (listelm)->field.tqe_next) != NULL)\
-+ (elm)->field.tqe_next->field.tqe_prev = \
-+ &(elm)->field.tqe_next; \
-+ else \
-+ (head)->tqh_last = &(elm)->field.tqe_next; \
-+ (listelm)->field.tqe_next = (elm); \
-+ (elm)->field.tqe_prev = &(listelm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_INSERT_BEFORE(listelm, elm, field) do {
\
-+ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \
-+ (elm)->field.tqe_next = (listelm); \
-+ *(listelm)->field.tqe_prev = (elm); \
-+ (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_REMOVE(head, elm, field) do {
\
-+ if (((elm)->field.tqe_next) != NULL) \
-+ (elm)->field.tqe_next->field.tqe_prev = \
-+ (elm)->field.tqe_prev; \
-+ else \
-+ (head)->tqh_last = (elm)->field.tqe_prev; \
-+ *(elm)->field.tqe_prev = (elm)->field.tqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define TAILQ_FOREACH(var, head, field)
\
-+ for ((var) = ((head)->tqh_first); \
-+ (var); \
-+ (var) = ((var)->field.tqe_next))
-+
-+#define TAILQ_FOREACH_REVERSE(var, head, headname, field)
\
-+ for ((var) = (*(((struct headname *)((head)->tqh_last))->tqh_last));
\
-+ (var); \
-+ (var) = (*(((struct headname
*)((var)->field.tqe_prev))->tqh_last)))
-+
-+#define TAILQ_CONCAT(head1, head2, field) do {
\
-+ if (!TAILQ_EMPTY(head2)) { \
-+ *(head1)->tqh_last = (head2)->tqh_first; \
-+ (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \
-+ (head1)->tqh_last = (head2)->tqh_last; \
-+ TAILQ_INIT((head2)); \
-+ } \
-+} while (/*CONSTCOND*/0)
-+
-+/*
-+ * Tail queue access methods.
-+ */
-+#define TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-+#define TAILQ_FIRST(head) ((head)->tqh_first)
-+#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-+
-+#define TAILQ_LAST(head, headname) \
-+ (*(((struct headname *)((head)->tqh_last))->tqh_last))
-+#define TAILQ_PREV(elm, headname, field) \
-+ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-+
-+
-+/*
-+ * Circular queue definitions.
-+ */
-+#define CIRCLEQ_HEAD(name, type)
\
-+struct name { \
-+ struct type *cqh_first; /* first element */ \
-+ struct type *cqh_last; /* last element */ \
-+}
-+
-+#define CIRCLEQ_HEAD_INITIALIZER(head)
\
-+ { (void *)&head, (void *)&head }
-+
-+#define CIRCLEQ_ENTRY(type)
\
-+struct { \
-+ struct type *cqe_next; /* next element */ \
-+ struct type *cqe_prev; /* previous element */ \
-+}
-+
-+/*
-+ * Circular queue functions.
-+ */
-+#define CIRCLEQ_INIT(head) do {
\
-+ (head)->cqh_first = (void *)(head); \
-+ (head)->cqh_last = (void *)(head); \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_INSERT_AFTER(head, listelm, elm, field) do {
\
-+ (elm)->field.cqe_next = (listelm)->field.cqe_next; \
-+ (elm)->field.cqe_prev = (listelm); \
-+ if ((listelm)->field.cqe_next == (void *)(head)) \
-+ (head)->cqh_last = (elm); \
-+ else \
-+ (listelm)->field.cqe_next->field.cqe_prev = (elm); \
-+ (listelm)->field.cqe_next = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_INSERT_BEFORE(head, listelm, elm, field) do {
\
-+ (elm)->field.cqe_next = (listelm); \
-+ (elm)->field.cqe_prev = (listelm)->field.cqe_prev; \
-+ if ((listelm)->field.cqe_prev == (void *)(head)) \
-+ (head)->cqh_first = (elm); \
-+ else \
-+ (listelm)->field.cqe_prev->field.cqe_next = (elm); \
-+ (listelm)->field.cqe_prev = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_INSERT_HEAD(head, elm, field) do {
\
-+ (elm)->field.cqe_next = (head)->cqh_first; \
-+ (elm)->field.cqe_prev = (void *)(head); \
-+ if ((head)->cqh_last == (void *)(head)) \
-+ (head)->cqh_last = (elm); \
-+ else \
-+ (head)->cqh_first->field.cqe_prev = (elm); \
-+ (head)->cqh_first = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_INSERT_TAIL(head, elm, field) do {
\
-+ (elm)->field.cqe_next = (void *)(head); \
-+ (elm)->field.cqe_prev = (head)->cqh_last; \
-+ if ((head)->cqh_first == (void *)(head)) \
-+ (head)->cqh_first = (elm); \
-+ else \
-+ (head)->cqh_last->field.cqe_next = (elm); \
-+ (head)->cqh_last = (elm); \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_REMOVE(head, elm, field) do {
\
-+ if ((elm)->field.cqe_next == (void *)(head)) \
-+ (head)->cqh_last = (elm)->field.cqe_prev; \
-+ else \
-+ (elm)->field.cqe_next->field.cqe_prev = \
-+ (elm)->field.cqe_prev; \
-+ if ((elm)->field.cqe_prev == (void *)(head)) \
-+ (head)->cqh_first = (elm)->field.cqe_next; \
-+ else \
-+ (elm)->field.cqe_prev->field.cqe_next = \
-+ (elm)->field.cqe_next; \
-+} while (/*CONSTCOND*/0)
-+
-+#define CIRCLEQ_FOREACH(var, head, field)
\
-+ for ((var) = ((head)->cqh_first); \
-+ (var) != (const void *)(head); \
-+ (var) = ((var)->field.cqe_next))
-+
-+#define CIRCLEQ_FOREACH_REVERSE(var, head, field)
\
-+ for ((var) = ((head)->cqh_last); \
-+ (var) != (const void *)(head); \
-+ (var) = ((var)->field.cqe_prev))
-+
-+/*
-+ * Circular queue access methods.
-+ */
-+#define CIRCLEQ_EMPTY(head) ((head)->cqh_first == (void
*)(head))
-+#define CIRCLEQ_FIRST(head) ((head)->cqh_first)
-+#define CIRCLEQ_LAST(head) ((head)->cqh_last)
-+#define CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next)
-+#define CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev)
-+
-+#define CIRCLEQ_LOOP_NEXT(head, elm, field) \
-+ (((elm)->field.cqe_next == (void *)(head)) \
-+ ? ((head)->cqh_first) \
-+ : (elm->field.cqe_next))
-+#define CIRCLEQ_LOOP_PREV(head, elm, field) \
-+ (((elm)->field.cqe_prev == (void *)(head)) \
-+ ? ((head)->cqh_last) \
-+ : (elm->field.cqe_prev))
-+
-+#endif /* sys/queue.h */
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
index b0355cf..7d7aa4b 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
+++ b/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
similarity index 98%
copy from app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
copy to app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
index 1a86c82..e1c37f8 100644
--- a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild
@@ -45,7 +45,7 @@ else
unset _tmp_last_index
unset _tmp_suffix
else
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+ KEYWORDS="amd64 arm ~arm64 hppa x86"
fi
SRC_URI="
@@ -56,13 +56,12 @@ else
PATCHES=(
"${FILESDIR}/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch"
"${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-imptcp-queue.patch"
)
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos
libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos
libressl mongodb mysql normalize omhttpfs"
IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl
systemd test usertools +uuid zeromq"
RDEPEND="
@@ -77,7 +76,6 @@ RDEPEND="
jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
kerberos? ( virtual/krb5 )
- mdblookup? ( dev-libs/libmaxminddb:= )
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
mysql? ( virtual/mysql )
normalize? (
@@ -106,6 +104,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=sys-devel/autoconf-archive-2015.02.24
virtual/pkgconfig
+ elibc_musl? ( sys-libs/queue )
test? ( sys-libs/libfaketime )"
if [[ ${PV} == "9999" ]]; then
@@ -224,7 +223,6 @@ src_configure() {
$(use_enable kafka omkafka)
$(use_enable kerberos gssapi-krb5)
$(use_enable normalize mmnormalize)
- $(use_enable mdblookup mmdblookup)
$(use_enable grok mmgrok)
$(use_enable omhttpfs)
$(use_enable omudpspoof)
diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
index 1a86c82..3187176 100644
--- a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild
@@ -56,7 +56,6 @@ else
PATCHES=(
"${FILESDIR}/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch"
"${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-fix.patch"
- "${FILESDIR}/8-stable/50-${PN}-8.18.0-musl-imptcp-queue.patch"
)
fi
@@ -106,6 +105,7 @@ RDEPEND="
DEPEND="${RDEPEND}
>=sys-devel/autoconf-archive-2015.02.24
virtual/pkgconfig
+ elibc_musl? ( sys-libs/queue )
test? ( sys-libs/libfaketime )"
if [[ ${PV} == "9999" ]]; then
