| 1 |
commit: 0103e8a3df3a22408e0987b12aab01fac47eae62 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 4 01:11:18 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 4 01:50:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0103e8a3 |
| 7 |
|
| 8 |
app-admin/rsyslog: Cleanup old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
| 11 |
|
| 12 |
app-admin/rsyslog/Manifest | 16 - |
| 13 |
...og-8.24.0-fix-tcpflood-without-librelp-r1.patch | 160 -------- |
| 14 |
.../rsyslog-8.26.0-fix-zmq3-format-security.patch | 39 -- |
| 15 |
...hostname-detection-when-getaddrinfo-fails.patch | 27 -- |
| 16 |
.../rsyslog-8.27.0-fix-librdkafka-detection.patch | 43 -- |
| 17 |
.../8-stable/rsyslog-8.30.0-fix-kerberos.patch | 22 - |
| 18 |
app-admin/rsyslog/rsyslog-8.19.0.ebuild | 444 -------------------- |
| 19 |
app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild | 448 -------------------- |
| 20 |
app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild | 450 -------------------- |
| 21 |
app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild | 452 -------------------- |
| 22 |
app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild | 456 -------------------- |
| 23 |
app-admin/rsyslog/rsyslog-8.28.0.ebuild | 10 +- |
| 24 |
app-admin/rsyslog/rsyslog-8.29.0.ebuild | 451 -------------------- |
| 25 |
app-admin/rsyslog/rsyslog-8.30.0.ebuild | 451 -------------------- |
| 26 |
app-admin/rsyslog/rsyslog-8.31.0.ebuild | 457 --------------------- |
| 27 |
app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild | 6 +- |
| 28 |
app-admin/rsyslog/rsyslog-8.33.1.ebuild | 6 +- |
| 29 |
17 files changed, 11 insertions(+), 3927 deletions(-) |
| 30 |
|
| 31 |
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest |
| 32 |
index fec19775007..7818558481f 100644 |
| 33 |
--- a/app-admin/rsyslog/Manifest |
| 34 |
+++ b/app-admin/rsyslog/Manifest |
| 35 |
@@ -1,24 +1,8 @@ |
| 36 |
-DIST rsyslog-8.19.0.tar.gz 2279714 BLAKE2B ae736b72e00ba6ba338476d8fc349f2b958f0c8f8b08417ed6cc192fcb17182f4c95018fbe973355b90833fab723211d653f4ac2a0fe9ef385ebe6d34251e4de SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 |
| 37 |
-DIST rsyslog-8.24.0.tar.gz 2374240 BLAKE2B a708ed52dcc0182acbfb6d7adee8f1670c60e65e87b2240f88330622b515dbe1cc45a2bb3233cb630be4658b8cae394bab7839167808dd41d75632c76932a77e SHA512 b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d |
| 38 |
-DIST rsyslog-8.25.0.tar.gz 2386720 BLAKE2B 192f0084b0aa9588606c458494634d6f1445598371de4ce160ade647b44abdbd6456125060f46fc62bbaa8f981c31247a91b8dedd41f89e83a4ee021c9828dad SHA512 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f |
| 39 |
-DIST rsyslog-8.26.0.tar.gz 2393148 BLAKE2B 660853aae1f0853b0df66755cb64c569692b849816b92d41421c3650502eab069163d65445fe49e7c005a7bba9ead6cfe36b125a715b4fd8cd24a78dae7d2484 SHA512 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19 |
| 40 |
-DIST rsyslog-8.27.0.tar.gz 2435123 BLAKE2B ebd95d5995d604a16495c2c760bfc65348a2b696a2aec838ba06d2eac379627d2b8495f03177aa8813d012d6163073cde71d442a63fe2da173bdcb55c90f458a SHA512 dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753 |
| 41 |
DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1 |
| 42 |
-DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952 |
| 43 |
-DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0 |
| 44 |
-DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7 |
| 45 |
DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac |
| 46 |
DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0 |
| 47 |
DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e |
| 48 |
-DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e |
| 49 |
-DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b |
| 50 |
-DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71 |
| 51 |
-DIST rsyslog-docs-8.26.0.tar.gz 4381345 BLAKE2B d90a4af06b3b48e5bab75751e0bd06564b6a846068ce324aa9e9b26c1e5e1d40841f573806444f290d3227e31d1fb498265437341be946badfe35c8455427352 SHA512 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8 |
| 52 |
-DIST rsyslog-docs-8.27.0.tar.gz 4411093 BLAKE2B 67f6e3cf77973b07c9a19816beb16c9cce4b32b4609ab458501e7b0be9795c2138a83756d9590f03b0acde23f8b762df1c308c0ab7210a24122476ad14860770 SHA512 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c |
| 53 |
DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d |
| 54 |
-DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc |
| 55 |
-DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d |
| 56 |
-DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa |
| 57 |
DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce |
| 58 |
DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5 |
| 59 |
DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4 |
| 60 |
|
| 61 |
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch |
| 62 |
deleted file mode 100644 |
| 63 |
index a03a6562722..00000000000 |
| 64 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.24.0-fix-tcpflood-without-librelp-r1.patch |
| 65 |
+++ /dev/null |
| 66 |
@@ -1,160 +0,0 @@ |
| 67 |
-Patch to allow building of tcpflood without librelp |
| 68 |
- |
| 69 |
-Cherry pick of |
| 70 |
-https://github.com/rsyslog/rsyslog/commit/73e3b7ab2f8a3974d31844b492ad02d61ed5727f |
| 71 |
-https://github.com/rsyslog/rsyslog/pull/1493 |
| 72 |
- |
| 73 |
- |
| 74 |
-Gentoo-Bug: https://bugs.gentoo.org/613264 |
| 75 |
-Gentoo-Bug: https://bugs.gentoo.org/614424 |
| 76 |
- |
| 77 |
-diff -u b/tests/tcpflood.c b/tests/tcpflood.c |
| 78 |
---- b/tests/tcpflood.c |
| 79 |
-+++ b/tests/tcpflood.c |
| 80 |
-@@ -96,7 +96,9 @@ |
| 81 |
- #include <string.h> |
| 82 |
- #include <netinet/in.h> |
| 83 |
- #include <pthread.h> |
| 84 |
-+#ifdef ENABLE_RELP |
| 85 |
- #include <librelp.h> |
| 86 |
-+#endif |
| 87 |
- #include <sys/resource.h> |
| 88 |
- #include <sys/time.h> |
| 89 |
- #include <errno.h> |
| 90 |
-@@ -149,7 +151,9 @@ |
| 91 |
- static int numConnections = 1; /* number of connections to create */ |
| 92 |
- static int softLimitConnections = 0; /* soft connection limit, see -c option description */ |
| 93 |
- static int *sockArray; /* array of sockets to use */ |
| 94 |
-+#ifdef ENABLE_RELP |
| 95 |
- static relpClt_t **relpCltArray; /* array of sockets to use */ |
| 96 |
-+#endif |
| 97 |
- static int msgNum = 0; /* initial message number to start with */ |
| 98 |
- static int bShowProgress = 1; /* show progress messages */ |
| 99 |
- static int bSilent = 0; /* completely silent operation */ |
| 100 |
-@@ -216,6 +220,7 @@ |
| 101 |
- static int sendTLS(int i, char *buf, int lenBuf); |
| 102 |
- static void closeTLSSess(int __attribute__((unused)) i); |
| 103 |
- |
| 104 |
-+#ifdef ENABLE_RELP |
| 105 |
- /* RELP subsystem */ |
| 106 |
- #pragma GCC diagnostic push |
| 107 |
- #pragma GCC diagnostic ignored "-Wformat-security" |
| 108 |
-@@ -235,6 +240,7 @@ |
| 109 |
- CHKRELP(relpEngineSetEnableCmd(pRelpEngine, (unsigned char*)"syslog", |
| 110 |
- eRelpCmdState_Required)); |
| 111 |
- } |
| 112 |
-+#endif /* #ifdef ENABLE_RELP */ |
| 113 |
- |
| 114 |
- /* prepare send subsystem for UDP send */ |
| 115 |
- static int |
| 116 |
-@@ -273,6 +279,7 @@ |
| 117 |
- port = targetPort; |
| 118 |
- } |
| 119 |
- if(transport == TP_RELP_PLAIN) { |
| 120 |
-+ #ifdef ENABLE_RELP |
| 121 |
- relpRetVal relp_r; |
| 122 |
- relpClt_t *relpClt; |
| 123 |
- char relpPort[16]; |
| 124 |
-@@ -286,6 +293,7 @@ |
| 125 |
- return(1); |
| 126 |
- } |
| 127 |
- *fd = 1; /* mimic "all ok" state */ |
| 128 |
-+ #endif |
| 129 |
- } else { /* TCP, with or without TLS */ |
| 130 |
- if((sock=socket(AF_INET, SOCK_STREAM, 0))==-1) { |
| 131 |
- perror("\nsocket()"); |
| 132 |
-@@ -336,8 +344,10 @@ |
| 133 |
- sessArray = calloc(numConnections, sizeof(gnutls_session_t)); |
| 134 |
- # endif |
| 135 |
- sockArray = calloc(numConnections, sizeof(int)); |
| 136 |
-+ #ifdef ENABLE_RELP |
| 137 |
- if(transport == TP_RELP_PLAIN) |
| 138 |
- relpCltArray = calloc(numConnections, sizeof(relpClt_t*)); |
| 139 |
-+ #endif |
| 140 |
- for(i = 0 ; i < numConnections ; ++i) { |
| 141 |
- if(i % 10 == 0) { |
| 142 |
- if(bShowProgress) |
| 143 |
-@@ -356,8 +366,10 @@ |
| 144 |
- * at least something. |
| 145 |
- */ |
| 146 |
- if(transport == TP_RELP_PLAIN) { |
| 147 |
-+ #ifdef ENABLE_RELP |
| 148 |
- CHKRELP(relpEngineCltDestruct(pRelpEngine, |
| 149 |
- relpCltArray+i)); |
| 150 |
-+ #endif |
| 151 |
- } else { /* TCP and TLS modes */ |
| 152 |
- if(transport == TP_TLS) |
| 153 |
- closeTLSSess(i); |
| 154 |
-@@ -403,14 +415,13 @@ |
| 155 |
- |
| 156 |
- if(bShowProgress) |
| 157 |
- if(write(1, " close connections", sizeof(" close connections")-1)){} |
| 158 |
-- //if(transport == TP_RELP_PLAIN) |
| 159 |
-- //sleep(10); /* we need to let librelp settle a bit */ |
| 160 |
- for(i = 0 ; i < numConnections ; ++i) { |
| 161 |
- if(i % 10 == 0 && bShowProgress) { |
| 162 |
- lenMsg = sprintf(msgBuf, "\r%5.5d", i); |
| 163 |
- if(write(1, msgBuf, lenMsg)){} |
| 164 |
- } |
| 165 |
- if(transport == TP_RELP_PLAIN) { |
| 166 |
-+ #ifdef ENABLE_RELP |
| 167 |
- relpRetVal relpr; |
| 168 |
- if(sockArray[i] != -1) { |
| 169 |
- relpr = relpEngineCltDestruct(pRelpEngine, relpCltArray+i); |
| 170 |
-@@ -419,6 +430,7 @@ |
| 171 |
- } |
| 172 |
- sockArray[i] = -1; |
| 173 |
- } |
| 174 |
-+ #endif |
| 175 |
- } else { /* TCP and TLS modes */ |
| 176 |
- if(sockArray[i] != -1) { |
| 177 |
- /* we try to not overrun the receiver by trying to flush buffers |
| 178 |
-@@ -610,6 +622,7 @@ |
| 179 |
- offsSendBuf = lenBuf; |
| 180 |
- } |
| 181 |
- } else if(transport == TP_RELP_PLAIN) { |
| 182 |
-+ #ifdef ENABLE_RELP |
| 183 |
- relpRetVal relp_ret; |
| 184 |
- if(sockArray[socknum] == -1) { |
| 185 |
- /* connection was dropped, need to re-establish */ |
| 186 |
-@@ -627,6 +640,7 @@ |
| 187 |
- printf("\nrelpCltSendSyslog() failed with relp error code %d\n", |
| 188 |
- relp_ret); |
| 189 |
- } |
| 190 |
-+ #endif |
| 191 |
- } |
| 192 |
- if(lenSend != lenBuf) { |
| 193 |
- printf("\r%5.5d\n", i); |
| 194 |
-@@ -1106,7 +1120,9 @@ |
| 195 |
- transport = TP_RELP_PLAIN; |
| 196 |
- # else |
| 197 |
- fprintf(stderr, "compiled without RELP support: " |
| 198 |
-- "\"-Trelp-plain\" not supported!\n"); |
| 199 |
-+ "\"-Trelp-plain\" not supported!\n" |
| 200 |
-+ "(add --enable-relp to ./configure options " |
| 201 |
-+ "if desired)\n"); |
| 202 |
- exit(1); |
| 203 |
- # endif |
| 204 |
- } else { |
| 205 |
-@@ -1168,7 +1184,9 @@ |
| 206 |
- if(transport == TP_TLS) { |
| 207 |
- initTLS(); |
| 208 |
- } else if(transport == TP_RELP_PLAIN) { |
| 209 |
-+ #ifdef ENABLE_RELP |
| 210 |
- initRELP_PLAIN(); |
| 211 |
-+ #endif |
| 212 |
- } |
| 213 |
- |
| 214 |
- if(openConnections() != 0) { |
| 215 |
-@@ -1183,9 +1201,11 @@ |
| 216 |
- |
| 217 |
- closeConnections(); /* this is important so that we do not finish too early! */ |
| 218 |
- |
| 219 |
-+ #ifdef ENABLE_RELP |
| 220 |
- if(transport == TP_RELP_PLAIN) { |
| 221 |
- CHKRELP(relpEngineDestruct(&pRelpEngine)); |
| 222 |
- } |
| 223 |
-+ #endif |
| 224 |
- |
| 225 |
- if(nConnDrops > 0 && !bSilent) |
| 226 |
- printf("-D option initiated %ld connection closures\n", nConnDrops); |
| 227 |
|
| 228 |
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch |
| 229 |
deleted file mode 100644 |
| 230 |
index b285798bfe4..00000000000 |
| 231 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.26.0-fix-zmq3-format-security.patch |
| 232 |
+++ /dev/null |
| 233 |
@@ -1,39 +0,0 @@ |
| 234 |
---- a/contrib/imzmq3/imzmq3.c |
| 235 |
-+++ b/contrib/imzmq3/imzmq3.c |
| 236 |
-@@ -403,7 +403,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { |
| 237 |
- |
| 238 |
- /* Do the bind/connect... */ |
| 239 |
- if (info->action==ACTION_CONNECT) { |
| 240 |
-- rv = zsocket_connect(*sock, info->description); |
| 241 |
-+ rv = zsocket_connect(*sock, "%s", info->description); |
| 242 |
- if (rv == -1) { |
| 243 |
- errmsg.LogError(0, |
| 244 |
- RS_RET_INVALID_PARAMS, |
| 245 |
-@@ -413,7 +413,7 @@ static rsRetVal createSocket(instanceConf_t* info, void** sock) { |
| 246 |
- } |
| 247 |
- DBGPRINTF("imzmq3: connect for %s successful\n",info->description); |
| 248 |
- } else { |
| 249 |
-- rv = zsocket_bind(*sock, info->description); |
| 250 |
-+ rv = zsocket_bind(*sock, "%s", info->description); |
| 251 |
- if (rv == -1) { |
| 252 |
- errmsg.LogError(0, |
| 253 |
- RS_RET_INVALID_PARAMS, |
| 254 |
---- a/contrib/omzmq3/omzmq3.c |
| 255 |
-+++ b/contrib/omzmq3/omzmq3.c |
| 256 |
-@@ -242,14 +242,14 @@ static rsRetVal initZMQ(instanceData* pData) { |
| 257 |
- if (pData->action == ACTION_BIND) { |
| 258 |
- /* bind asserts, so no need to test return val here |
| 259 |
- which isn't the greatest api -- oh well */ |
| 260 |
-- if(-1 == zsocket_bind(pData->socket, (char*)pData->description)) { |
| 261 |
-+ if(-1 == zsocket_bind(pData->socket, "%s", (char*)pData->description)) { |
| 262 |
- errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: bind failed for %s: %s", |
| 263 |
- pData->description, zmq_strerror(errno)); |
| 264 |
- ABORT_FINALIZE(RS_RET_NO_ERRCODE); |
| 265 |
- } |
| 266 |
- DBGPRINTF("omzmq3: bind to %s successful\n",pData->description); |
| 267 |
- } else { |
| 268 |
-- if(-1 == zsocket_connect(pData->socket, (char*)pData->description)) { |
| 269 |
-+ if(-1 == zsocket_connect(pData->socket, "%s", (char*)pData->description)) { |
| 270 |
- errmsg.LogError(0, RS_RET_NO_ERRCODE, "omzmq3: connect failed for %s: %s", |
| 271 |
- pData->description, zmq_strerror(errno)); |
| 272 |
- ABORT_FINALIZE(RS_RET_NO_ERRCODE); |
| 273 |
|
| 274 |
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch |
| 275 |
deleted file mode 100644 |
| 276 |
index a9470ccf4b6..00000000000 |
| 277 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch |
| 278 |
+++ /dev/null |
| 279 |
@@ -1,27 +0,0 @@ |
| 280 |
-From 1a7d3a088969b47798bc1da712ca2772f91a7c02 Mon Sep 17 00:00:00 2001 |
| 281 |
-From: Jiri Vymazal <jvymazal@××××××.com> |
| 282 |
-Date: Wed, 31 May 2017 16:26:56 +0200 |
| 283 |
-Subject: [PATCH] Ignoring NONAME error from getaddrinfo so we have hostname |
| 284 |
- set even without working network |
| 285 |
- |
| 286 |
---- |
| 287 |
- runtime/net.c | 6 +++++- |
| 288 |
- 1 file changed, 5 insertions(+), 1 deletion(-) |
| 289 |
- |
| 290 |
-diff --git a/runtime/net.c b/runtime/net.c |
| 291 |
-index 2d8de9429..edffc677a 100644 |
| 292 |
---- a/runtime/net.c |
| 293 |
-+++ b/runtime/net.c |
| 294 |
-@@ -1188,7 +1188,11 @@ getLocalHostname(uchar **ppName) |
| 295 |
- memset(&flags, 0, sizeof(flags)); |
| 296 |
- flags.ai_flags = AI_CANONNAME; |
| 297 |
- int error = getaddrinfo((char*)hnbuf, NULL, &flags, &res); |
| 298 |
-- if (error != 0) { |
| 299 |
-+ if (error != 0 && |
| 300 |
-+ error != EAI_NONAME && error != EAI_AGAIN && error != EAI_FAIL) { |
| 301 |
-+ /* If we get one of errors above, network is probably |
| 302 |
-+ * not working yet, so we fall back to local hostname below |
| 303 |
-+ */ |
| 304 |
- dbgprintf("getaddrinfo: %s\n", gai_strerror(error)); |
| 305 |
- ABORT_FINALIZE(RS_RET_IO_ERROR); |
| 306 |
- } |
| 307 |
|
| 308 |
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch |
| 309 |
deleted file mode 100644 |
| 310 |
index 366c0afaca8..00000000000 |
| 311 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-librdkafka-detection.patch |
| 312 |
+++ /dev/null |
| 313 |
@@ -1,43 +0,0 @@ |
| 314 |
---- a/configure.ac |
| 315 |
-+++ b/configure.ac |
| 316 |
-@@ -1695,12 +1695,14 @@ AM_CONDITIONAL(ENABLE_KAFKA_TESTS, test x$enable_kafka_tests = xyes) |
| 317 |
- |
| 318 |
- # omkafka works with older library |
| 319 |
- if test "x$enable_omkafka" = "xyes"; then |
| 320 |
-- PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [ |
| 321 |
-- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ |
| 322 |
-- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) |
| 323 |
-- LIBRDKAFKA_LIBS=-lrdkafka |
| 324 |
-- ], [ |
| 325 |
-- AC_MSG_ERROR([could not find rdkafka library]) |
| 326 |
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka],, [ |
| 327 |
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [librdkafka],, [ |
| 328 |
-+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ |
| 329 |
-+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) |
| 330 |
-+ LIBRDKAFKA_LIBS=-lrdkafka |
| 331 |
-+ ], [ |
| 332 |
-+ AC_MSG_ERROR([could not find rdkafka library]) |
| 333 |
-+ ]) |
| 334 |
- ]) |
| 335 |
- ]) |
| 336 |
- AC_CHECK_HEADERS([librdkafka/rdkafka.h]) |
| 337 |
-@@ -1708,12 +1710,13 @@ fi |
| 338 |
- |
| 339 |
- # imkafka needs newer library |
| 340 |
- if test "x$enable_imkafka" = "xyes"; then |
| 341 |
-- PKG_CHECK_MODULES(LIBRDKAFKA, rdkafka >= 0.9.1) |
| 342 |
-- AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ |
| 343 |
-- AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) |
| 344 |
-- LIBRDKAFKA_LIBS=-lrdkafka |
| 345 |
-- ], [ |
| 346 |
-- AC_MSG_ERROR([could not find rdkafka library]) |
| 347 |
-+ PKG_CHECK_MODULES([LIBRDKAFKA], [rdkafka >= 0.9.1],, [ |
| 348 |
-+ AC_CHECK_LIB([rdkafka], [rd_kafka_produce], [ |
| 349 |
-+ AC_MSG_WARN([librdkafka is missing but library present, using -lrdkafka]) |
| 350 |
-+ LIBRDKAFKA_LIBS=-lrdkafka |
| 351 |
-+ ], [ |
| 352 |
-+ AC_MSG_ERROR([could not find rdkafka library]) |
| 353 |
-+ ]) |
| 354 |
- ]) |
| 355 |
- AC_CHECK_HEADERS([librdkafka/rdkafka.h]) |
| 356 |
- fi |
| 357 |
|
| 358 |
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch |
| 359 |
deleted file mode 100644 |
| 360 |
index a202e633c89..00000000000 |
| 361 |
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.30.0-fix-kerberos.patch |
| 362 |
+++ /dev/null |
| 363 |
@@ -1,22 +0,0 @@ |
| 364 |
-https://github.com/rsyslog/rsyslog/issues/1838 |
| 365 |
- |
| 366 |
---- a/plugins/imgssapi/imgssapi.c |
| 367 |
-+++ b/plugins/imgssapi/imgssapi.c |
| 368 |
-@@ -291,7 +291,7 @@ finalize_it: |
| 369 |
- |
| 370 |
- |
| 371 |
- static rsRetVal |
| 372 |
--doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) |
| 373 |
-+doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd, int *const oserr) |
| 374 |
- { |
| 375 |
- DEFiRet; |
| 376 |
- int allowedMethods; |
| 377 |
-@@ -307,7 +307,7 @@ doRcvData(tcps_sess_t *pSess, char *buf, size_t lenBuf, ssize_t *piLenRcvd) |
| 378 |
- CHKiRet(TCPSessGSSRecv(pSess, buf, lenBuf, piLenRcvd)); |
| 379 |
- } else { |
| 380 |
- *piLenRcvd = lenBuf; |
| 381 |
-- CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd) != RS_RET_OK); |
| 382 |
-+ CHKiRet(netstrm.Rcv(pSess->pStrm, (uchar*) buf, piLenRcvd, oserr)); |
| 383 |
- } |
| 384 |
- |
| 385 |
- finalize_it: |
| 386 |
|
| 387 |
diff --git a/app-admin/rsyslog/rsyslog-8.19.0.ebuild b/app-admin/rsyslog/rsyslog-8.19.0.ebuild |
| 388 |
deleted file mode 100644 |
| 389 |
index 931d37209cb..00000000000 |
| 390 |
--- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild |
| 391 |
+++ /dev/null |
| 392 |
@@ -1,444 +0,0 @@ |
| 393 |
-# Copyright 1999-2017 Gentoo Foundation |
| 394 |
-# Distributed under the terms of the GNU General Public License v2 |
| 395 |
- |
| 396 |
-EAPI=6 |
| 397 |
- |
| 398 |
-inherit autotools eutils linux-info systemd |
| 399 |
- |
| 400 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 401 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 402 |
- |
| 403 |
-BRANCH="8-stable" |
| 404 |
- |
| 405 |
-if [[ ${PV} == "9999" ]]; then |
| 406 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 407 |
- |
| 408 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 409 |
- |
| 410 |
- inherit git-r3 |
| 411 |
-else |
| 412 |
- MY_PV=${PV%_rc*} |
| 413 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 414 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 415 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 416 |
- |
| 417 |
- # Upstream URL schema: |
| 418 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 419 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 420 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 421 |
- |
| 422 |
- MY_URL_PREFIX= |
| 423 |
- if [[ ${PV} = *_rc* ]]; then |
| 424 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 425 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 426 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 427 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 428 |
- fi |
| 429 |
- |
| 430 |
- # Cleaning up temporary variables |
| 431 |
- unset _tmp_last_index |
| 432 |
- unset _tmp_suffix |
| 433 |
- else |
| 434 |
- KEYWORDS="amd64 arm ~arm64 hppa x86" |
| 435 |
- fi |
| 436 |
- |
| 437 |
- SRC_URI=" |
| 438 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 439 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 440 |
- " |
| 441 |
-fi |
| 442 |
- |
| 443 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 444 |
-SLOT="0" |
| 445 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" |
| 446 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 447 |
- |
| 448 |
-RDEPEND=" |
| 449 |
- >=dev-libs/libfastjson-0.99.2:= |
| 450 |
- >=dev-libs/libestr-0.1.9 |
| 451 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 452 |
- >=sys-libs/zlib-1.2.5 |
| 453 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 454 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 455 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 456 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 457 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 458 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 459 |
- kerberos? ( virtual/krb5 ) |
| 460 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 461 |
- mysql? ( virtual/mysql ) |
| 462 |
- normalize? ( |
| 463 |
- >=dev-libs/libee-0.4.0 |
| 464 |
- >=dev-libs/liblognorm-2.0.1:= |
| 465 |
- ) |
| 466 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 467 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 468 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 469 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 470 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 471 |
- relp? ( >=dev-libs/librelp-1.2.5:= ) |
| 472 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 473 |
- rfc5424hmac? ( |
| 474 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 475 |
- libressl? ( dev-libs/libressl:= ) |
| 476 |
- ) |
| 477 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 478 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 479 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 480 |
- uuid? ( sys-apps/util-linux:0= ) |
| 481 |
- zeromq? ( |
| 482 |
- >=net-libs/zeromq-4.1.1:= |
| 483 |
- >=net-libs/czmq-3.0.0 |
| 484 |
- )" |
| 485 |
-DEPEND="${RDEPEND} |
| 486 |
- virtual/pkgconfig |
| 487 |
- test? ( sys-libs/libfaketime )" |
| 488 |
- |
| 489 |
-if [[ ${PV} == "9999" ]]; then |
| 490 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 491 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 492 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 493 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 494 |
-fi |
| 495 |
- |
| 496 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 497 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 498 |
- |
| 499 |
-src_unpack() { |
| 500 |
- if [[ ${PV} == "9999" ]]; then |
| 501 |
- git-r3_fetch |
| 502 |
- git-r3_checkout |
| 503 |
- else |
| 504 |
- unpack ${P}.tar.gz |
| 505 |
- fi |
| 506 |
- |
| 507 |
- if use doc; then |
| 508 |
- if [[ ${PV} == "9999" ]]; then |
| 509 |
- local _EGIT_BRANCH= |
| 510 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 511 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 512 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 513 |
- unset EGIT_BRANCH |
| 514 |
- fi |
| 515 |
- |
| 516 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 517 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 518 |
- |
| 519 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 520 |
- # Restore previous EGIT_BRANCH information |
| 521 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 522 |
- fi |
| 523 |
- else |
| 524 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 525 |
- mkdir docs || die "Failed to create docs directory" |
| 526 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 527 |
- unpack ${MY_FILENAME_DOCS} |
| 528 |
- fi |
| 529 |
- fi |
| 530 |
-} |
| 531 |
- |
| 532 |
-src_prepare() { |
| 533 |
- default |
| 534 |
- |
| 535 |
- eautoreconf |
| 536 |
-} |
| 537 |
- |
| 538 |
-src_configure() { |
| 539 |
- # Maintainer notes: |
| 540 |
- # * Guardtime support is missing because libgt isn't yet available |
| 541 |
- # in portage. |
| 542 |
- # * Hadoop's HDFS file system output module is currently not |
| 543 |
- # supported in Gentoo because nobody is able to test it |
| 544 |
- # (JAVA dependency). |
| 545 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 546 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 547 |
- # variables because rsyslog's build system depends on pkg-config. |
| 548 |
- |
| 549 |
- if use redis; then |
| 550 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 551 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 552 |
- fi |
| 553 |
- |
| 554 |
- local myeconfargs=( |
| 555 |
- --disable-debug-symbols |
| 556 |
- --disable-generate-man-pages |
| 557 |
- --without-valgrind-testbench |
| 558 |
- $(use_enable test testbench) |
| 559 |
- # Input Plugins without depedencies |
| 560 |
- --enable-imdiag |
| 561 |
- --enable-imfile |
| 562 |
- --enable-impstats |
| 563 |
- --enable-imptcp |
| 564 |
- # Message Modificiation Plugins without depedencies |
| 565 |
- --enable-mmanon |
| 566 |
- --enable-mmaudit |
| 567 |
- --enable-mmcount |
| 568 |
- --enable-mmfields |
| 569 |
- --enable-mmjsonparse |
| 570 |
- --enable-mmpstrucdata |
| 571 |
- --enable-mmsequence |
| 572 |
- --enable-mmutf8fix |
| 573 |
- # Output Modification Plugins without dependencies |
| 574 |
- --enable-mail |
| 575 |
- --enable-omprog |
| 576 |
- --enable-omruleset |
| 577 |
- --enable-omstdout |
| 578 |
- --enable-omuxsock |
| 579 |
- # Misc |
| 580 |
- --enable-pmaixforwardedfrom |
| 581 |
- --enable-pmciscoios |
| 582 |
- --enable-pmcisconames |
| 583 |
- --enable-pmlastmsg |
| 584 |
- --enable-pmsnare |
| 585 |
- # DB |
| 586 |
- $(use_enable dbi libdbi) |
| 587 |
- $(use_enable mongodb ommongodb) |
| 588 |
- $(use_enable mysql) |
| 589 |
- $(use_enable postgres pgsql) |
| 590 |
- $(use_enable redis omhiredis) |
| 591 |
- # Debug |
| 592 |
- $(use_enable debug) |
| 593 |
- $(use_enable debug diagtools) |
| 594 |
- $(use_enable debug memcheck) |
| 595 |
- $(use_enable debug rtinst) |
| 596 |
- $(use_enable debug valgrind) |
| 597 |
- # Misc |
| 598 |
- $(use_enable elasticsearch) |
| 599 |
- $(use_enable gcrypt libgcrypt) |
| 600 |
- $(use_enable jemalloc) |
| 601 |
- $(use_enable kafka omkafka) |
| 602 |
- $(use_enable kerberos gssapi-krb5) |
| 603 |
- $(use_enable normalize mmnormalize) |
| 604 |
- $(use_enable grok mmgrok) |
| 605 |
- $(use_enable omhttpfs) |
| 606 |
- $(use_enable omudpspoof) |
| 607 |
- $(use_enable rabbitmq omrabbitmq) |
| 608 |
- $(use_enable relp) |
| 609 |
- $(use_enable rfc3195) |
| 610 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 611 |
- $(use_enable snmp) |
| 612 |
- $(use_enable snmp mmsnmptrapd) |
| 613 |
- $(use_enable ssl gnutls) |
| 614 |
- $(use_enable systemd imjournal) |
| 615 |
- $(use_enable systemd omjournal) |
| 616 |
- $(use_enable usertools) |
| 617 |
- $(use_enable uuid) |
| 618 |
- $(use_enable zeromq imczmq) |
| 619 |
- $(use_enable zeromq imzmq3) |
| 620 |
- $(use_enable zeromq omczmq) |
| 621 |
- $(use_enable zeromq omzmq3) |
| 622 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 623 |
- ) |
| 624 |
- |
| 625 |
- econf "${myeconfargs[@]}" |
| 626 |
-} |
| 627 |
- |
| 628 |
-src_compile() { |
| 629 |
- default |
| 630 |
- |
| 631 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 632 |
- einfo "Building documentation ..." |
| 633 |
- local doc_dir="${S}/docs" |
| 634 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 635 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 636 |
- fi |
| 637 |
-} |
| 638 |
- |
| 639 |
-src_test() { |
| 640 |
- local _has_increased_ulimit= |
| 641 |
- |
| 642 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 643 |
- einfo "Adjusting permissions of test scripts ..." |
| 644 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 645 |
- die "Failed to adjust test scripts permission" |
| 646 |
- |
| 647 |
- if ulimit -n 3072; then |
| 648 |
- _has_increased_ulimit="true" |
| 649 |
- fi |
| 650 |
- |
| 651 |
- if ! emake --jobs 1 check; then |
| 652 |
- eerror "Test suite failed! :(" |
| 653 |
- |
| 654 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 655 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 656 |
- fi |
| 657 |
- |
| 658 |
- if has userpriv ${FEATURES}; then |
| 659 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 660 |
- "before you submit a bug report." |
| 661 |
- fi |
| 662 |
- |
| 663 |
- fi |
| 664 |
-} |
| 665 |
- |
| 666 |
-src_install() { |
| 667 |
- local DOCS=( |
| 668 |
- AUTHORS |
| 669 |
- ChangeLog |
| 670 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 671 |
- ) |
| 672 |
- |
| 673 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 674 |
- |
| 675 |
- default |
| 676 |
- |
| 677 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 678 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 679 |
- |
| 680 |
- keepdir /var/empty/dev |
| 681 |
- keepdir /var/spool/${PN} |
| 682 |
- keepdir /etc/ssl/${PN} |
| 683 |
- keepdir /etc/${PN}.d |
| 684 |
- |
| 685 |
- insinto /etc |
| 686 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 687 |
- |
| 688 |
- insinto /etc/rsyslog.d/ |
| 689 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
| 690 |
- |
| 691 |
- insinto /etc/logrotate.d/ |
| 692 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 693 |
- |
| 694 |
- if use mysql; then |
| 695 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 696 |
- doins plugins/ommysql/createDB.sql |
| 697 |
- fi |
| 698 |
- |
| 699 |
- if use postgres; then |
| 700 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 701 |
- doins plugins/ompgsql/createDB.sql |
| 702 |
- fi |
| 703 |
- |
| 704 |
- prune_libtool_files --modules |
| 705 |
-} |
| 706 |
- |
| 707 |
-pkg_postinst() { |
| 708 |
- local advertise_readme=0 |
| 709 |
- |
| 710 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 711 |
- # This is a new installation |
| 712 |
- |
| 713 |
- advertise_readme=1 |
| 714 |
- |
| 715 |
- if use mysql || use postgres; then |
| 716 |
- echo |
| 717 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 718 |
- elog " /usr/share/doc/${PF}/scripts" |
| 719 |
- fi |
| 720 |
- |
| 721 |
- if use ssl; then |
| 722 |
- echo |
| 723 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 724 |
- elog " emerge --config =${PF}" |
| 725 |
- elog "on your logging server. You can run it several times," |
| 726 |
- elog "once for each logging client. The client certificates will be signed" |
| 727 |
- elog "using the CA certificate generated during the first run." |
| 728 |
- fi |
| 729 |
- fi |
| 730 |
- |
| 731 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 732 |
- # We need to show the README file location |
| 733 |
- |
| 734 |
- echo "" |
| 735 |
- elog "Please read" |
| 736 |
- elog "" |
| 737 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 738 |
- elog "" |
| 739 |
- elog "for more details." |
| 740 |
- fi |
| 741 |
-} |
| 742 |
- |
| 743 |
-pkg_config() { |
| 744 |
- if ! use ssl ; then |
| 745 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 746 |
- einfo "used USE=ssl to build it." |
| 747 |
- return 0 |
| 748 |
- fi |
| 749 |
- |
| 750 |
- # Make sure the certificates directory exists |
| 751 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 752 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 753 |
- mkdir "${CERTDIR}" || die |
| 754 |
- fi |
| 755 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 756 |
- |
| 757 |
- # Create a default CA if needed |
| 758 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 759 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 760 |
- certtool --generate-privkey \ |
| 761 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 762 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 763 |
- |
| 764 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 765 |
- cn = Portage automated CA |
| 766 |
- ca |
| 767 |
- cert_signing_key |
| 768 |
- expiration_days = 3650 |
| 769 |
- _EOF |
| 770 |
- |
| 771 |
- certtool --generate-self-signed \ |
| 772 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 773 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 774 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 775 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 776 |
- |
| 777 |
- # Create the server certificate |
| 778 |
- echo |
| 779 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 780 |
- read -r CN |
| 781 |
- |
| 782 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 783 |
- certtool --generate-privkey \ |
| 784 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 785 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 786 |
- |
| 787 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 788 |
- cn = ${CN} |
| 789 |
- tls_www_server |
| 790 |
- dns_name = ${CN} |
| 791 |
- expiration_days = 3650 |
| 792 |
- _EOF |
| 793 |
- |
| 794 |
- certtool --generate-certificate \ |
| 795 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 796 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 797 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 798 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 799 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 800 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 801 |
- |
| 802 |
- else |
| 803 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 804 |
- fi |
| 805 |
- |
| 806 |
- # Create a client certificate |
| 807 |
- echo |
| 808 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 809 |
- read -r CN |
| 810 |
- |
| 811 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 812 |
- certtool --generate-privkey \ |
| 813 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 814 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 815 |
- |
| 816 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 817 |
- cn = ${CN} |
| 818 |
- tls_www_client |
| 819 |
- dns_name = ${CN} |
| 820 |
- expiration_days = 3650 |
| 821 |
- _EOF |
| 822 |
- |
| 823 |
- certtool --generate-certificate \ |
| 824 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 825 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 826 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 827 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 828 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 829 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 830 |
- |
| 831 |
- rm -f "${T}/${PF}.$$" |
| 832 |
- |
| 833 |
- echo |
| 834 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 835 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 836 |
-} |
| 837 |
|
| 838 |
diff --git a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild |
| 839 |
deleted file mode 100644 |
| 840 |
index 988544873b7..00000000000 |
| 841 |
--- a/app-admin/rsyslog/rsyslog-8.24.0-r2.ebuild |
| 842 |
+++ /dev/null |
| 843 |
@@ -1,448 +0,0 @@ |
| 844 |
-# Copyright 1999-2017 Gentoo Foundation |
| 845 |
-# Distributed under the terms of the GNU General Public License v2 |
| 846 |
- |
| 847 |
-EAPI="6" |
| 848 |
- |
| 849 |
-inherit autotools eutils linux-info systemd |
| 850 |
- |
| 851 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 852 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 853 |
- |
| 854 |
-BRANCH="8-stable" |
| 855 |
- |
| 856 |
-if [[ ${PV} == "9999" ]]; then |
| 857 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 858 |
- |
| 859 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 860 |
- |
| 861 |
- inherit git-r3 |
| 862 |
-else |
| 863 |
- MY_PV=${PV%_rc*} |
| 864 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 865 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 866 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 867 |
- |
| 868 |
- # Upstream URL schema: |
| 869 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 870 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 871 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 872 |
- |
| 873 |
- MY_URL_PREFIX= |
| 874 |
- if [[ ${PV} = *_rc* ]]; then |
| 875 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 876 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 877 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 878 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 879 |
- fi |
| 880 |
- |
| 881 |
- # Cleaning up temporary variables |
| 882 |
- unset _tmp_last_index |
| 883 |
- unset _tmp_suffix |
| 884 |
- else |
| 885 |
- KEYWORDS="amd64 arm ~arm64 hppa x86" |
| 886 |
- fi |
| 887 |
- |
| 888 |
- SRC_URI=" |
| 889 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 890 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 891 |
- " |
| 892 |
- |
| 893 |
- PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch ) |
| 894 |
-fi |
| 895 |
- |
| 896 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 897 |
-SLOT="0" |
| 898 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs" |
| 899 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 900 |
- |
| 901 |
-RDEPEND=" |
| 902 |
- >=dev-libs/libfastjson-0.99.3:= |
| 903 |
- >=dev-libs/libestr-0.1.9 |
| 904 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 905 |
- >=sys-libs/zlib-1.2.5 |
| 906 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 907 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 908 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 909 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 910 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 911 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 912 |
- kerberos? ( virtual/krb5 ) |
| 913 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 914 |
- mysql? ( virtual/mysql ) |
| 915 |
- normalize? ( |
| 916 |
- >=dev-libs/libee-0.4.0 |
| 917 |
- >=dev-libs/liblognorm-2.0.1:= |
| 918 |
- ) |
| 919 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 920 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 921 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 922 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 923 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 924 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
| 925 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 926 |
- rfc5424hmac? ( |
| 927 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 928 |
- libressl? ( dev-libs/libressl:= ) |
| 929 |
- ) |
| 930 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 931 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 932 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 933 |
- uuid? ( sys-apps/util-linux:0= ) |
| 934 |
- zeromq? ( |
| 935 |
- >=net-libs/zeromq-4.1.1:= |
| 936 |
- >=net-libs/czmq-3.0.0 |
| 937 |
- )" |
| 938 |
-DEPEND="${RDEPEND} |
| 939 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 940 |
- virtual/pkgconfig |
| 941 |
- test? ( sys-libs/libfaketime )" |
| 942 |
- |
| 943 |
-if [[ ${PV} == "9999" ]]; then |
| 944 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 945 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 946 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 947 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 948 |
-fi |
| 949 |
- |
| 950 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 951 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 952 |
- |
| 953 |
-src_unpack() { |
| 954 |
- if [[ ${PV} == "9999" ]]; then |
| 955 |
- git-r3_fetch |
| 956 |
- git-r3_checkout |
| 957 |
- else |
| 958 |
- unpack ${P}.tar.gz |
| 959 |
- fi |
| 960 |
- |
| 961 |
- if use doc; then |
| 962 |
- if [[ ${PV} == "9999" ]]; then |
| 963 |
- local _EGIT_BRANCH= |
| 964 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 965 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 966 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 967 |
- unset EGIT_BRANCH |
| 968 |
- fi |
| 969 |
- |
| 970 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 971 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 972 |
- |
| 973 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 974 |
- # Restore previous EGIT_BRANCH information |
| 975 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 976 |
- fi |
| 977 |
- else |
| 978 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 979 |
- mkdir docs || die "Failed to create docs directory" |
| 980 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 981 |
- unpack ${MY_FILENAME_DOCS} |
| 982 |
- fi |
| 983 |
- fi |
| 984 |
-} |
| 985 |
- |
| 986 |
-src_prepare() { |
| 987 |
- default |
| 988 |
- |
| 989 |
- eautoreconf |
| 990 |
-} |
| 991 |
- |
| 992 |
-src_configure() { |
| 993 |
- # Maintainer notes: |
| 994 |
- # * Guardtime support is missing because libgt isn't yet available |
| 995 |
- # in portage. |
| 996 |
- # * Hadoop's HDFS file system output module is currently not |
| 997 |
- # supported in Gentoo because nobody is able to test it |
| 998 |
- # (JAVA dependency). |
| 999 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 1000 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 1001 |
- # variables because rsyslog's build system depends on pkg-config. |
| 1002 |
- |
| 1003 |
- if use redis; then |
| 1004 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 1005 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 1006 |
- fi |
| 1007 |
- |
| 1008 |
- local myeconfargs=( |
| 1009 |
- --disable-debug-symbols |
| 1010 |
- --disable-generate-man-pages |
| 1011 |
- --without-valgrind-testbench |
| 1012 |
- $(use_enable test testbench) |
| 1013 |
- # Input Plugins without depedencies |
| 1014 |
- --enable-imdiag |
| 1015 |
- --enable-imfile |
| 1016 |
- --enable-impstats |
| 1017 |
- --enable-imptcp |
| 1018 |
- # Message Modificiation Plugins without depedencies |
| 1019 |
- --enable-mmanon |
| 1020 |
- --enable-mmaudit |
| 1021 |
- --enable-mmcount |
| 1022 |
- --enable-mmfields |
| 1023 |
- --enable-mmjsonparse |
| 1024 |
- --enable-mmpstrucdata |
| 1025 |
- --enable-mmrm1stspace |
| 1026 |
- --enable-mmsequence |
| 1027 |
- --enable-mmutf8fix |
| 1028 |
- # Output Modification Plugins without dependencies |
| 1029 |
- --enable-mail |
| 1030 |
- --enable-omprog |
| 1031 |
- --enable-omruleset |
| 1032 |
- --enable-omstdout |
| 1033 |
- --enable-omuxsock |
| 1034 |
- # Misc |
| 1035 |
- --enable-pmaixforwardedfrom |
| 1036 |
- --enable-pmciscoios |
| 1037 |
- --enable-pmcisconames |
| 1038 |
- --enable-pmlastmsg |
| 1039 |
- --enable-pmsnare |
| 1040 |
- # DB |
| 1041 |
- $(use_enable dbi libdbi) |
| 1042 |
- $(use_enable mongodb ommongodb) |
| 1043 |
- $(use_enable mysql) |
| 1044 |
- $(use_enable postgres pgsql) |
| 1045 |
- $(use_enable redis omhiredis) |
| 1046 |
- # Debug |
| 1047 |
- $(use_enable debug) |
| 1048 |
- $(use_enable debug diagtools) |
| 1049 |
- $(use_enable debug memcheck) |
| 1050 |
- $(use_enable debug rtinst) |
| 1051 |
- $(use_enable debug valgrind) |
| 1052 |
- # Misc |
| 1053 |
- $(use_enable elasticsearch) |
| 1054 |
- $(use_enable gcrypt libgcrypt) |
| 1055 |
- $(use_enable jemalloc) |
| 1056 |
- $(use_enable kafka omkafka) |
| 1057 |
- $(use_enable kerberos gssapi-krb5) |
| 1058 |
- $(use_enable normalize mmnormalize) |
| 1059 |
- $(use_enable grok mmgrok) |
| 1060 |
- $(use_enable omhttpfs) |
| 1061 |
- $(use_enable omudpspoof) |
| 1062 |
- $(use_enable rabbitmq omrabbitmq) |
| 1063 |
- $(use_enable relp) |
| 1064 |
- $(use_enable rfc3195) |
| 1065 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 1066 |
- $(use_enable snmp) |
| 1067 |
- $(use_enable snmp mmsnmptrapd) |
| 1068 |
- $(use_enable ssl gnutls) |
| 1069 |
- $(use_enable systemd imjournal) |
| 1070 |
- $(use_enable systemd omjournal) |
| 1071 |
- $(use_enable usertools) |
| 1072 |
- $(use_enable uuid) |
| 1073 |
- $(use_enable zeromq imczmq) |
| 1074 |
- $(use_enable zeromq imzmq3) |
| 1075 |
- $(use_enable zeromq omczmq) |
| 1076 |
- $(use_enable zeromq omzmq3) |
| 1077 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 1078 |
- ) |
| 1079 |
- |
| 1080 |
- econf "${myeconfargs[@]}" |
| 1081 |
-} |
| 1082 |
- |
| 1083 |
-src_compile() { |
| 1084 |
- default |
| 1085 |
- |
| 1086 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 1087 |
- einfo "Building documentation ..." |
| 1088 |
- local doc_dir="${S}/docs" |
| 1089 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 1090 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 1091 |
- fi |
| 1092 |
-} |
| 1093 |
- |
| 1094 |
-src_test() { |
| 1095 |
- local _has_increased_ulimit= |
| 1096 |
- |
| 1097 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 1098 |
- einfo "Adjusting permissions of test scripts ..." |
| 1099 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 1100 |
- die "Failed to adjust test scripts permission" |
| 1101 |
- |
| 1102 |
- if ulimit -n 3072; then |
| 1103 |
- _has_increased_ulimit="true" |
| 1104 |
- fi |
| 1105 |
- |
| 1106 |
- if ! emake --jobs 1 check; then |
| 1107 |
- eerror "Test suite failed! :(" |
| 1108 |
- |
| 1109 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 1110 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 1111 |
- fi |
| 1112 |
- |
| 1113 |
- if has userpriv ${FEATURES}; then |
| 1114 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 1115 |
- "before you submit a bug report." |
| 1116 |
- fi |
| 1117 |
- |
| 1118 |
- fi |
| 1119 |
-} |
| 1120 |
- |
| 1121 |
-src_install() { |
| 1122 |
- local DOCS=( |
| 1123 |
- AUTHORS |
| 1124 |
- ChangeLog |
| 1125 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 1126 |
- ) |
| 1127 |
- |
| 1128 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 1129 |
- |
| 1130 |
- default |
| 1131 |
- |
| 1132 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 1133 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 1134 |
- |
| 1135 |
- keepdir /var/empty/dev |
| 1136 |
- keepdir /var/spool/${PN} |
| 1137 |
- keepdir /etc/ssl/${PN} |
| 1138 |
- keepdir /etc/${PN}.d |
| 1139 |
- |
| 1140 |
- insinto /etc |
| 1141 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 1142 |
- |
| 1143 |
- insinto /etc/rsyslog.d/ |
| 1144 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
| 1145 |
- |
| 1146 |
- insinto /etc/logrotate.d/ |
| 1147 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 1148 |
- |
| 1149 |
- if use mysql; then |
| 1150 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 1151 |
- doins plugins/ommysql/createDB.sql |
| 1152 |
- fi |
| 1153 |
- |
| 1154 |
- if use postgres; then |
| 1155 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 1156 |
- doins plugins/ompgsql/createDB.sql |
| 1157 |
- fi |
| 1158 |
- |
| 1159 |
- prune_libtool_files --modules |
| 1160 |
-} |
| 1161 |
- |
| 1162 |
-pkg_postinst() { |
| 1163 |
- local advertise_readme=0 |
| 1164 |
- |
| 1165 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 1166 |
- # This is a new installation |
| 1167 |
- |
| 1168 |
- advertise_readme=1 |
| 1169 |
- |
| 1170 |
- if use mysql || use postgres; then |
| 1171 |
- echo |
| 1172 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 1173 |
- elog " /usr/share/doc/${PF}/scripts" |
| 1174 |
- fi |
| 1175 |
- |
| 1176 |
- if use ssl; then |
| 1177 |
- echo |
| 1178 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 1179 |
- elog " emerge --config =${PF}" |
| 1180 |
- elog "on your logging server. You can run it several times," |
| 1181 |
- elog "once for each logging client. The client certificates will be signed" |
| 1182 |
- elog "using the CA certificate generated during the first run." |
| 1183 |
- fi |
| 1184 |
- fi |
| 1185 |
- |
| 1186 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 1187 |
- # We need to show the README file location |
| 1188 |
- |
| 1189 |
- echo "" |
| 1190 |
- elog "Please read" |
| 1191 |
- elog "" |
| 1192 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 1193 |
- elog "" |
| 1194 |
- elog "for more details." |
| 1195 |
- fi |
| 1196 |
-} |
| 1197 |
- |
| 1198 |
-pkg_config() { |
| 1199 |
- if ! use ssl ; then |
| 1200 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 1201 |
- einfo "used USE=ssl to build it." |
| 1202 |
- return 0 |
| 1203 |
- fi |
| 1204 |
- |
| 1205 |
- # Make sure the certificates directory exists |
| 1206 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 1207 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 1208 |
- mkdir "${CERTDIR}" || die |
| 1209 |
- fi |
| 1210 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 1211 |
- |
| 1212 |
- # Create a default CA if needed |
| 1213 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 1214 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 1215 |
- certtool --generate-privkey \ |
| 1216 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 1217 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 1218 |
- |
| 1219 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1220 |
- cn = Portage automated CA |
| 1221 |
- ca |
| 1222 |
- cert_signing_key |
| 1223 |
- expiration_days = 3650 |
| 1224 |
- _EOF |
| 1225 |
- |
| 1226 |
- certtool --generate-self-signed \ |
| 1227 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1228 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1229 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1230 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 1231 |
- |
| 1232 |
- # Create the server certificate |
| 1233 |
- echo |
| 1234 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 1235 |
- read -r CN |
| 1236 |
- |
| 1237 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 1238 |
- certtool --generate-privkey \ |
| 1239 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 1240 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 1241 |
- |
| 1242 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1243 |
- cn = ${CN} |
| 1244 |
- tls_www_server |
| 1245 |
- dns_name = ${CN} |
| 1246 |
- expiration_days = 3650 |
| 1247 |
- _EOF |
| 1248 |
- |
| 1249 |
- certtool --generate-certificate \ |
| 1250 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 1251 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 1252 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1253 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1254 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1255 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 1256 |
- |
| 1257 |
- else |
| 1258 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 1259 |
- fi |
| 1260 |
- |
| 1261 |
- # Create a client certificate |
| 1262 |
- echo |
| 1263 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 1264 |
- read -r CN |
| 1265 |
- |
| 1266 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 1267 |
- certtool --generate-privkey \ |
| 1268 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 1269 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 1270 |
- |
| 1271 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1272 |
- cn = ${CN} |
| 1273 |
- tls_www_client |
| 1274 |
- dns_name = ${CN} |
| 1275 |
- expiration_days = 3650 |
| 1276 |
- _EOF |
| 1277 |
- |
| 1278 |
- certtool --generate-certificate \ |
| 1279 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 1280 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 1281 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1282 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1283 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1284 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 1285 |
- |
| 1286 |
- rm -f "${T}/${PF}.$$" |
| 1287 |
- |
| 1288 |
- echo |
| 1289 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 1290 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 1291 |
-} |
| 1292 |
|
| 1293 |
diff --git a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild |
| 1294 |
deleted file mode 100644 |
| 1295 |
index d6c48ae2a63..00000000000 |
| 1296 |
--- a/app-admin/rsyslog/rsyslog-8.25.0-r2.ebuild |
| 1297 |
+++ /dev/null |
| 1298 |
@@ -1,450 +0,0 @@ |
| 1299 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1300 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1301 |
- |
| 1302 |
-EAPI="6" |
| 1303 |
- |
| 1304 |
-inherit autotools eutils linux-info systemd |
| 1305 |
- |
| 1306 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 1307 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 1308 |
- |
| 1309 |
-BRANCH="8-stable" |
| 1310 |
- |
| 1311 |
-if [[ ${PV} == "9999" ]]; then |
| 1312 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 1313 |
- |
| 1314 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 1315 |
- |
| 1316 |
- inherit git-r3 |
| 1317 |
-else |
| 1318 |
- MY_PV=${PV%_rc*} |
| 1319 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 1320 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 1321 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 1322 |
- |
| 1323 |
- # Upstream URL schema: |
| 1324 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 1325 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 1326 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 1327 |
- |
| 1328 |
- MY_URL_PREFIX= |
| 1329 |
- if [[ ${PV} = *_rc* ]]; then |
| 1330 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 1331 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 1332 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 1333 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 1334 |
- fi |
| 1335 |
- |
| 1336 |
- # Cleaning up temporary variables |
| 1337 |
- unset _tmp_last_index |
| 1338 |
- unset _tmp_suffix |
| 1339 |
- else |
| 1340 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
| 1341 |
- fi |
| 1342 |
- |
| 1343 |
- SRC_URI=" |
| 1344 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 1345 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 1346 |
- " |
| 1347 |
- |
| 1348 |
- PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.24.0-fix-tcpflood-without-librelp-r1.patch ) |
| 1349 |
-fi |
| 1350 |
- |
| 1351 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 1352 |
-SLOT="0" |
| 1353 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 1354 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 1355 |
- |
| 1356 |
-RDEPEND=" |
| 1357 |
- >=dev-libs/libfastjson-0.99.3:= |
| 1358 |
- >=dev-libs/libestr-0.1.9 |
| 1359 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 1360 |
- >=sys-libs/zlib-1.2.5 |
| 1361 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 1362 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 1363 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 1364 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 1365 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 1366 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 1367 |
- kerberos? ( virtual/krb5 ) |
| 1368 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 1369 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 1370 |
- mysql? ( virtual/mysql ) |
| 1371 |
- normalize? ( |
| 1372 |
- >=dev-libs/libee-0.4.0 |
| 1373 |
- >=dev-libs/liblognorm-2.0.1:= |
| 1374 |
- ) |
| 1375 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 1376 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 1377 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 1378 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 1379 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 1380 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
| 1381 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 1382 |
- rfc5424hmac? ( |
| 1383 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 1384 |
- libressl? ( dev-libs/libressl:= ) |
| 1385 |
- ) |
| 1386 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 1387 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 1388 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 1389 |
- uuid? ( sys-apps/util-linux:0= ) |
| 1390 |
- zeromq? ( |
| 1391 |
- >=net-libs/zeromq-4.1.1:= |
| 1392 |
- >=net-libs/czmq-3.0.0 |
| 1393 |
- )" |
| 1394 |
-DEPEND="${RDEPEND} |
| 1395 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 1396 |
- virtual/pkgconfig |
| 1397 |
- test? ( sys-libs/libfaketime )" |
| 1398 |
- |
| 1399 |
-if [[ ${PV} == "9999" ]]; then |
| 1400 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 1401 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 1402 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 1403 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 1404 |
-fi |
| 1405 |
- |
| 1406 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 1407 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 1408 |
- |
| 1409 |
-src_unpack() { |
| 1410 |
- if [[ ${PV} == "9999" ]]; then |
| 1411 |
- git-r3_fetch |
| 1412 |
- git-r3_checkout |
| 1413 |
- else |
| 1414 |
- unpack ${P}.tar.gz |
| 1415 |
- fi |
| 1416 |
- |
| 1417 |
- if use doc; then |
| 1418 |
- if [[ ${PV} == "9999" ]]; then |
| 1419 |
- local _EGIT_BRANCH= |
| 1420 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 1421 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 1422 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 1423 |
- unset EGIT_BRANCH |
| 1424 |
- fi |
| 1425 |
- |
| 1426 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 1427 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 1428 |
- |
| 1429 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 1430 |
- # Restore previous EGIT_BRANCH information |
| 1431 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 1432 |
- fi |
| 1433 |
- else |
| 1434 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 1435 |
- mkdir docs || die "Failed to create docs directory" |
| 1436 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 1437 |
- unpack ${MY_FILENAME_DOCS} |
| 1438 |
- fi |
| 1439 |
- fi |
| 1440 |
-} |
| 1441 |
- |
| 1442 |
-src_prepare() { |
| 1443 |
- default |
| 1444 |
- |
| 1445 |
- eautoreconf |
| 1446 |
-} |
| 1447 |
- |
| 1448 |
-src_configure() { |
| 1449 |
- # Maintainer notes: |
| 1450 |
- # * Guardtime support is missing because libgt isn't yet available |
| 1451 |
- # in portage. |
| 1452 |
- # * Hadoop's HDFS file system output module is currently not |
| 1453 |
- # supported in Gentoo because nobody is able to test it |
| 1454 |
- # (JAVA dependency). |
| 1455 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 1456 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 1457 |
- # variables because rsyslog's build system depends on pkg-config. |
| 1458 |
- |
| 1459 |
- if use redis; then |
| 1460 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 1461 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 1462 |
- fi |
| 1463 |
- |
| 1464 |
- local myeconfargs=( |
| 1465 |
- --disable-debug-symbols |
| 1466 |
- --disable-generate-man-pages |
| 1467 |
- --without-valgrind-testbench |
| 1468 |
- $(use_enable test testbench) |
| 1469 |
- # Input Plugins without depedencies |
| 1470 |
- --enable-imdiag |
| 1471 |
- --enable-imfile |
| 1472 |
- --enable-impstats |
| 1473 |
- --enable-imptcp |
| 1474 |
- # Message Modificiation Plugins without depedencies |
| 1475 |
- --enable-mmanon |
| 1476 |
- --enable-mmaudit |
| 1477 |
- --enable-mmcount |
| 1478 |
- --enable-mmfields |
| 1479 |
- --enable-mmjsonparse |
| 1480 |
- --enable-mmpstrucdata |
| 1481 |
- --enable-mmrm1stspace |
| 1482 |
- --enable-mmsequence |
| 1483 |
- --enable-mmutf8fix |
| 1484 |
- # Output Modification Plugins without dependencies |
| 1485 |
- --enable-mail |
| 1486 |
- --enable-omprog |
| 1487 |
- --enable-omruleset |
| 1488 |
- --enable-omstdout |
| 1489 |
- --enable-omuxsock |
| 1490 |
- # Misc |
| 1491 |
- --enable-pmaixforwardedfrom |
| 1492 |
- --enable-pmciscoios |
| 1493 |
- --enable-pmcisconames |
| 1494 |
- --enable-pmlastmsg |
| 1495 |
- --enable-pmsnare |
| 1496 |
- # DB |
| 1497 |
- $(use_enable dbi libdbi) |
| 1498 |
- $(use_enable mongodb ommongodb) |
| 1499 |
- $(use_enable mysql) |
| 1500 |
- $(use_enable postgres pgsql) |
| 1501 |
- $(use_enable redis omhiredis) |
| 1502 |
- # Debug |
| 1503 |
- $(use_enable debug) |
| 1504 |
- $(use_enable debug diagtools) |
| 1505 |
- $(use_enable debug memcheck) |
| 1506 |
- $(use_enable debug rtinst) |
| 1507 |
- $(use_enable debug valgrind) |
| 1508 |
- # Misc |
| 1509 |
- $(use_enable elasticsearch) |
| 1510 |
- $(use_enable gcrypt libgcrypt) |
| 1511 |
- $(use_enable jemalloc) |
| 1512 |
- $(use_enable kafka omkafka) |
| 1513 |
- $(use_enable kerberos gssapi-krb5) |
| 1514 |
- $(use_enable normalize mmnormalize) |
| 1515 |
- $(use_enable mdblookup mmdblookup) |
| 1516 |
- $(use_enable grok mmgrok) |
| 1517 |
- $(use_enable omhttpfs) |
| 1518 |
- $(use_enable omudpspoof) |
| 1519 |
- $(use_enable rabbitmq omrabbitmq) |
| 1520 |
- $(use_enable relp) |
| 1521 |
- $(use_enable rfc3195) |
| 1522 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 1523 |
- $(use_enable snmp) |
| 1524 |
- $(use_enable snmp mmsnmptrapd) |
| 1525 |
- $(use_enable ssl gnutls) |
| 1526 |
- $(use_enable systemd imjournal) |
| 1527 |
- $(use_enable systemd omjournal) |
| 1528 |
- $(use_enable usertools) |
| 1529 |
- $(use_enable uuid) |
| 1530 |
- $(use_enable zeromq imczmq) |
| 1531 |
- $(use_enable zeromq imzmq3) |
| 1532 |
- $(use_enable zeromq omczmq) |
| 1533 |
- $(use_enable zeromq omzmq3) |
| 1534 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 1535 |
- ) |
| 1536 |
- |
| 1537 |
- econf "${myeconfargs[@]}" |
| 1538 |
-} |
| 1539 |
- |
| 1540 |
-src_compile() { |
| 1541 |
- default |
| 1542 |
- |
| 1543 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 1544 |
- einfo "Building documentation ..." |
| 1545 |
- local doc_dir="${S}/docs" |
| 1546 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 1547 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 1548 |
- fi |
| 1549 |
-} |
| 1550 |
- |
| 1551 |
-src_test() { |
| 1552 |
- local _has_increased_ulimit= |
| 1553 |
- |
| 1554 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 1555 |
- einfo "Adjusting permissions of test scripts ..." |
| 1556 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 1557 |
- die "Failed to adjust test scripts permission" |
| 1558 |
- |
| 1559 |
- if ulimit -n 3072; then |
| 1560 |
- _has_increased_ulimit="true" |
| 1561 |
- fi |
| 1562 |
- |
| 1563 |
- if ! emake --jobs 1 check; then |
| 1564 |
- eerror "Test suite failed! :(" |
| 1565 |
- |
| 1566 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 1567 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 1568 |
- fi |
| 1569 |
- |
| 1570 |
- if has userpriv ${FEATURES}; then |
| 1571 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 1572 |
- "before you submit a bug report." |
| 1573 |
- fi |
| 1574 |
- |
| 1575 |
- fi |
| 1576 |
-} |
| 1577 |
- |
| 1578 |
-src_install() { |
| 1579 |
- local DOCS=( |
| 1580 |
- AUTHORS |
| 1581 |
- ChangeLog |
| 1582 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 1583 |
- ) |
| 1584 |
- |
| 1585 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 1586 |
- |
| 1587 |
- default |
| 1588 |
- |
| 1589 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 1590 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 1591 |
- |
| 1592 |
- keepdir /var/empty/dev |
| 1593 |
- keepdir /var/spool/${PN} |
| 1594 |
- keepdir /etc/ssl/${PN} |
| 1595 |
- keepdir /etc/${PN}.d |
| 1596 |
- |
| 1597 |
- insinto /etc |
| 1598 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 1599 |
- |
| 1600 |
- insinto /etc/rsyslog.d/ |
| 1601 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
| 1602 |
- |
| 1603 |
- insinto /etc/logrotate.d/ |
| 1604 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 1605 |
- |
| 1606 |
- if use mysql; then |
| 1607 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 1608 |
- doins plugins/ommysql/createDB.sql |
| 1609 |
- fi |
| 1610 |
- |
| 1611 |
- if use postgres; then |
| 1612 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 1613 |
- doins plugins/ompgsql/createDB.sql |
| 1614 |
- fi |
| 1615 |
- |
| 1616 |
- prune_libtool_files --modules |
| 1617 |
-} |
| 1618 |
- |
| 1619 |
-pkg_postinst() { |
| 1620 |
- local advertise_readme=0 |
| 1621 |
- |
| 1622 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 1623 |
- # This is a new installation |
| 1624 |
- |
| 1625 |
- advertise_readme=1 |
| 1626 |
- |
| 1627 |
- if use mysql || use postgres; then |
| 1628 |
- echo |
| 1629 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 1630 |
- elog " /usr/share/doc/${PF}/scripts" |
| 1631 |
- fi |
| 1632 |
- |
| 1633 |
- if use ssl; then |
| 1634 |
- echo |
| 1635 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 1636 |
- elog " emerge --config =${PF}" |
| 1637 |
- elog "on your logging server. You can run it several times," |
| 1638 |
- elog "once for each logging client. The client certificates will be signed" |
| 1639 |
- elog "using the CA certificate generated during the first run." |
| 1640 |
- fi |
| 1641 |
- fi |
| 1642 |
- |
| 1643 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 1644 |
- # We need to show the README file location |
| 1645 |
- |
| 1646 |
- echo "" |
| 1647 |
- elog "Please read" |
| 1648 |
- elog "" |
| 1649 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 1650 |
- elog "" |
| 1651 |
- elog "for more details." |
| 1652 |
- fi |
| 1653 |
-} |
| 1654 |
- |
| 1655 |
-pkg_config() { |
| 1656 |
- if ! use ssl ; then |
| 1657 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 1658 |
- einfo "used USE=ssl to build it." |
| 1659 |
- return 0 |
| 1660 |
- fi |
| 1661 |
- |
| 1662 |
- # Make sure the certificates directory exists |
| 1663 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 1664 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 1665 |
- mkdir "${CERTDIR}" || die |
| 1666 |
- fi |
| 1667 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 1668 |
- |
| 1669 |
- # Create a default CA if needed |
| 1670 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 1671 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 1672 |
- certtool --generate-privkey \ |
| 1673 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 1674 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 1675 |
- |
| 1676 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1677 |
- cn = Portage automated CA |
| 1678 |
- ca |
| 1679 |
- cert_signing_key |
| 1680 |
- expiration_days = 3650 |
| 1681 |
- _EOF |
| 1682 |
- |
| 1683 |
- certtool --generate-self-signed \ |
| 1684 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1685 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1686 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1687 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 1688 |
- |
| 1689 |
- # Create the server certificate |
| 1690 |
- echo |
| 1691 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 1692 |
- read -r CN |
| 1693 |
- |
| 1694 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 1695 |
- certtool --generate-privkey \ |
| 1696 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 1697 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 1698 |
- |
| 1699 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1700 |
- cn = ${CN} |
| 1701 |
- tls_www_server |
| 1702 |
- dns_name = ${CN} |
| 1703 |
- expiration_days = 3650 |
| 1704 |
- _EOF |
| 1705 |
- |
| 1706 |
- certtool --generate-certificate \ |
| 1707 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 1708 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 1709 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1710 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1711 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1712 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 1713 |
- |
| 1714 |
- else |
| 1715 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 1716 |
- fi |
| 1717 |
- |
| 1718 |
- # Create a client certificate |
| 1719 |
- echo |
| 1720 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 1721 |
- read -r CN |
| 1722 |
- |
| 1723 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 1724 |
- certtool --generate-privkey \ |
| 1725 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 1726 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 1727 |
- |
| 1728 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 1729 |
- cn = ${CN} |
| 1730 |
- tls_www_client |
| 1731 |
- dns_name = ${CN} |
| 1732 |
- expiration_days = 3650 |
| 1733 |
- _EOF |
| 1734 |
- |
| 1735 |
- certtool --generate-certificate \ |
| 1736 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 1737 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 1738 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 1739 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 1740 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 1741 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 1742 |
- |
| 1743 |
- rm -f "${T}/${PF}.$$" |
| 1744 |
- |
| 1745 |
- echo |
| 1746 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 1747 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 1748 |
-} |
| 1749 |
|
| 1750 |
diff --git a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild |
| 1751 |
deleted file mode 100644 |
| 1752 |
index fe40592d194..00000000000 |
| 1753 |
--- a/app-admin/rsyslog/rsyslog-8.26.0-r1.ebuild |
| 1754 |
+++ /dev/null |
| 1755 |
@@ -1,452 +0,0 @@ |
| 1756 |
-# Copyright 1999-2017 Gentoo Foundation |
| 1757 |
-# Distributed under the terms of the GNU General Public License v2 |
| 1758 |
- |
| 1759 |
-EAPI="6" |
| 1760 |
- |
| 1761 |
-inherit autotools eutils linux-info systemd |
| 1762 |
- |
| 1763 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 1764 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 1765 |
- |
| 1766 |
-BRANCH="8-stable" |
| 1767 |
- |
| 1768 |
-if [[ ${PV} == "9999" ]]; then |
| 1769 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 1770 |
- |
| 1771 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 1772 |
- |
| 1773 |
- inherit git-r3 |
| 1774 |
-else |
| 1775 |
- MY_PV=${PV%_rc*} |
| 1776 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 1777 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 1778 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 1779 |
- |
| 1780 |
- # Upstream URL schema: |
| 1781 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 1782 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 1783 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 1784 |
- |
| 1785 |
- MY_URL_PREFIX= |
| 1786 |
- if [[ ${PV} = *_rc* ]]; then |
| 1787 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 1788 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 1789 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 1790 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 1791 |
- fi |
| 1792 |
- |
| 1793 |
- # Cleaning up temporary variables |
| 1794 |
- unset _tmp_last_index |
| 1795 |
- unset _tmp_suffix |
| 1796 |
- else |
| 1797 |
- KEYWORDS="amd64 ~arm ~arm64 hppa x86" |
| 1798 |
- fi |
| 1799 |
- |
| 1800 |
- SRC_URI=" |
| 1801 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 1802 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 1803 |
- " |
| 1804 |
- |
| 1805 |
- PATCHES=( |
| 1806 |
- "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch |
| 1807 |
- ) |
| 1808 |
-fi |
| 1809 |
- |
| 1810 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 1811 |
-SLOT="0" |
| 1812 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 1813 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 1814 |
- |
| 1815 |
-RDEPEND=" |
| 1816 |
- >=dev-libs/libfastjson-0.99.3:= |
| 1817 |
- >=dev-libs/libestr-0.1.9 |
| 1818 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 1819 |
- >=sys-libs/zlib-1.2.5 |
| 1820 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 1821 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 1822 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 1823 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 1824 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 1825 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 1826 |
- kerberos? ( virtual/krb5 ) |
| 1827 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 1828 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 1829 |
- mysql? ( virtual/mysql ) |
| 1830 |
- normalize? ( |
| 1831 |
- >=dev-libs/libee-0.4.0 |
| 1832 |
- >=dev-libs/liblognorm-2.0.3:= |
| 1833 |
- ) |
| 1834 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 1835 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 1836 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 1837 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 1838 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 1839 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
| 1840 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 1841 |
- rfc5424hmac? ( |
| 1842 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 1843 |
- libressl? ( dev-libs/libressl:= ) |
| 1844 |
- ) |
| 1845 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 1846 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 1847 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 1848 |
- uuid? ( sys-apps/util-linux:0= ) |
| 1849 |
- zeromq? ( |
| 1850 |
- >=net-libs/zeromq-4.1.1:= |
| 1851 |
- >=net-libs/czmq-3.0.0 |
| 1852 |
- )" |
| 1853 |
-DEPEND="${RDEPEND} |
| 1854 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 1855 |
- virtual/pkgconfig |
| 1856 |
- test? ( sys-libs/libfaketime )" |
| 1857 |
- |
| 1858 |
-if [[ ${PV} == "9999" ]]; then |
| 1859 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 1860 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 1861 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 1862 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 1863 |
-fi |
| 1864 |
- |
| 1865 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 1866 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 1867 |
- |
| 1868 |
-src_unpack() { |
| 1869 |
- if [[ ${PV} == "9999" ]]; then |
| 1870 |
- git-r3_fetch |
| 1871 |
- git-r3_checkout |
| 1872 |
- else |
| 1873 |
- unpack ${P}.tar.gz |
| 1874 |
- fi |
| 1875 |
- |
| 1876 |
- if use doc; then |
| 1877 |
- if [[ ${PV} == "9999" ]]; then |
| 1878 |
- local _EGIT_BRANCH= |
| 1879 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 1880 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 1881 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 1882 |
- unset EGIT_BRANCH |
| 1883 |
- fi |
| 1884 |
- |
| 1885 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 1886 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 1887 |
- |
| 1888 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 1889 |
- # Restore previous EGIT_BRANCH information |
| 1890 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 1891 |
- fi |
| 1892 |
- else |
| 1893 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 1894 |
- mkdir docs || die "Failed to create docs directory" |
| 1895 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 1896 |
- unpack ${MY_FILENAME_DOCS} |
| 1897 |
- fi |
| 1898 |
- fi |
| 1899 |
-} |
| 1900 |
- |
| 1901 |
-src_prepare() { |
| 1902 |
- default |
| 1903 |
- |
| 1904 |
- eautoreconf |
| 1905 |
-} |
| 1906 |
- |
| 1907 |
-src_configure() { |
| 1908 |
- # Maintainer notes: |
| 1909 |
- # * Guardtime support is missing because libgt isn't yet available |
| 1910 |
- # in portage. |
| 1911 |
- # * Hadoop's HDFS file system output module is currently not |
| 1912 |
- # supported in Gentoo because nobody is able to test it |
| 1913 |
- # (JAVA dependency). |
| 1914 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 1915 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 1916 |
- # variables because rsyslog's build system depends on pkg-config. |
| 1917 |
- |
| 1918 |
- if use redis; then |
| 1919 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 1920 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 1921 |
- fi |
| 1922 |
- |
| 1923 |
- local myeconfargs=( |
| 1924 |
- --disable-debug-symbols |
| 1925 |
- --disable-generate-man-pages |
| 1926 |
- --without-valgrind-testbench |
| 1927 |
- $(use_enable test testbench) |
| 1928 |
- # Input Plugins without depedencies |
| 1929 |
- --enable-imdiag |
| 1930 |
- --enable-imfile |
| 1931 |
- --enable-impstats |
| 1932 |
- --enable-imptcp |
| 1933 |
- # Message Modificiation Plugins without depedencies |
| 1934 |
- --enable-mmanon |
| 1935 |
- --enable-mmaudit |
| 1936 |
- --enable-mmcount |
| 1937 |
- --enable-mmfields |
| 1938 |
- --enable-mmjsonparse |
| 1939 |
- --enable-mmpstrucdata |
| 1940 |
- --enable-mmrm1stspace |
| 1941 |
- --enable-mmsequence |
| 1942 |
- --enable-mmutf8fix |
| 1943 |
- # Output Modification Plugins without dependencies |
| 1944 |
- --enable-mail |
| 1945 |
- --enable-omprog |
| 1946 |
- --enable-omruleset |
| 1947 |
- --enable-omstdout |
| 1948 |
- --enable-omuxsock |
| 1949 |
- # Misc |
| 1950 |
- --enable-pmaixforwardedfrom |
| 1951 |
- --enable-pmciscoios |
| 1952 |
- --enable-pmcisconames |
| 1953 |
- --enable-pmlastmsg |
| 1954 |
- --enable-pmsnare |
| 1955 |
- # DB |
| 1956 |
- $(use_enable dbi libdbi) |
| 1957 |
- $(use_enable mongodb ommongodb) |
| 1958 |
- $(use_enable mysql) |
| 1959 |
- $(use_enable postgres pgsql) |
| 1960 |
- $(use_enable redis omhiredis) |
| 1961 |
- # Debug |
| 1962 |
- $(use_enable debug) |
| 1963 |
- $(use_enable debug diagtools) |
| 1964 |
- $(use_enable debug memcheck) |
| 1965 |
- $(use_enable debug rtinst) |
| 1966 |
- $(use_enable debug valgrind) |
| 1967 |
- # Misc |
| 1968 |
- $(use_enable elasticsearch) |
| 1969 |
- $(use_enable gcrypt libgcrypt) |
| 1970 |
- $(use_enable jemalloc) |
| 1971 |
- $(use_enable kafka omkafka) |
| 1972 |
- $(use_enable kerberos gssapi-krb5) |
| 1973 |
- $(use_enable normalize mmnormalize) |
| 1974 |
- $(use_enable mdblookup mmdblookup) |
| 1975 |
- $(use_enable grok mmgrok) |
| 1976 |
- $(use_enable omhttpfs) |
| 1977 |
- $(use_enable omudpspoof) |
| 1978 |
- $(use_enable rabbitmq omrabbitmq) |
| 1979 |
- $(use_enable relp) |
| 1980 |
- $(use_enable rfc3195) |
| 1981 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 1982 |
- $(use_enable snmp) |
| 1983 |
- $(use_enable snmp mmsnmptrapd) |
| 1984 |
- $(use_enable ssl gnutls) |
| 1985 |
- $(use_enable systemd imjournal) |
| 1986 |
- $(use_enable systemd omjournal) |
| 1987 |
- $(use_enable usertools) |
| 1988 |
- $(use_enable uuid) |
| 1989 |
- $(use_enable zeromq imczmq) |
| 1990 |
- $(use_enable zeromq imzmq3) |
| 1991 |
- $(use_enable zeromq omczmq) |
| 1992 |
- $(use_enable zeromq omzmq3) |
| 1993 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 1994 |
- ) |
| 1995 |
- |
| 1996 |
- econf "${myeconfargs[@]}" |
| 1997 |
-} |
| 1998 |
- |
| 1999 |
-src_compile() { |
| 2000 |
- default |
| 2001 |
- |
| 2002 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 2003 |
- einfo "Building documentation ..." |
| 2004 |
- local doc_dir="${S}/docs" |
| 2005 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 2006 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 2007 |
- fi |
| 2008 |
-} |
| 2009 |
- |
| 2010 |
-src_test() { |
| 2011 |
- local _has_increased_ulimit= |
| 2012 |
- |
| 2013 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 2014 |
- einfo "Adjusting permissions of test scripts ..." |
| 2015 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 2016 |
- die "Failed to adjust test scripts permission" |
| 2017 |
- |
| 2018 |
- if ulimit -n 3072; then |
| 2019 |
- _has_increased_ulimit="true" |
| 2020 |
- fi |
| 2021 |
- |
| 2022 |
- if ! emake --jobs 1 check; then |
| 2023 |
- eerror "Test suite failed! :(" |
| 2024 |
- |
| 2025 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 2026 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 2027 |
- fi |
| 2028 |
- |
| 2029 |
- if has userpriv ${FEATURES}; then |
| 2030 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 2031 |
- "before you submit a bug report." |
| 2032 |
- fi |
| 2033 |
- |
| 2034 |
- fi |
| 2035 |
-} |
| 2036 |
- |
| 2037 |
-src_install() { |
| 2038 |
- local DOCS=( |
| 2039 |
- AUTHORS |
| 2040 |
- ChangeLog |
| 2041 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 2042 |
- ) |
| 2043 |
- |
| 2044 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 2045 |
- |
| 2046 |
- default |
| 2047 |
- |
| 2048 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 2049 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 2050 |
- |
| 2051 |
- keepdir /var/empty/dev |
| 2052 |
- keepdir /var/spool/${PN} |
| 2053 |
- keepdir /etc/ssl/${PN} |
| 2054 |
- keepdir /etc/${PN}.d |
| 2055 |
- |
| 2056 |
- insinto /etc |
| 2057 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 2058 |
- |
| 2059 |
- insinto /etc/rsyslog.d/ |
| 2060 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
| 2061 |
- |
| 2062 |
- insinto /etc/logrotate.d/ |
| 2063 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 2064 |
- |
| 2065 |
- if use mysql; then |
| 2066 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 2067 |
- doins plugins/ommysql/createDB.sql |
| 2068 |
- fi |
| 2069 |
- |
| 2070 |
- if use postgres; then |
| 2071 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 2072 |
- doins plugins/ompgsql/createDB.sql |
| 2073 |
- fi |
| 2074 |
- |
| 2075 |
- prune_libtool_files --modules |
| 2076 |
-} |
| 2077 |
- |
| 2078 |
-pkg_postinst() { |
| 2079 |
- local advertise_readme=0 |
| 2080 |
- |
| 2081 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 2082 |
- # This is a new installation |
| 2083 |
- |
| 2084 |
- advertise_readme=1 |
| 2085 |
- |
| 2086 |
- if use mysql || use postgres; then |
| 2087 |
- echo |
| 2088 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 2089 |
- elog " /usr/share/doc/${PF}/scripts" |
| 2090 |
- fi |
| 2091 |
- |
| 2092 |
- if use ssl; then |
| 2093 |
- echo |
| 2094 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 2095 |
- elog " emerge --config =${PF}" |
| 2096 |
- elog "on your logging server. You can run it several times," |
| 2097 |
- elog "once for each logging client. The client certificates will be signed" |
| 2098 |
- elog "using the CA certificate generated during the first run." |
| 2099 |
- fi |
| 2100 |
- fi |
| 2101 |
- |
| 2102 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 2103 |
- # We need to show the README file location |
| 2104 |
- |
| 2105 |
- echo "" |
| 2106 |
- elog "Please read" |
| 2107 |
- elog "" |
| 2108 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 2109 |
- elog "" |
| 2110 |
- elog "for more details." |
| 2111 |
- fi |
| 2112 |
-} |
| 2113 |
- |
| 2114 |
-pkg_config() { |
| 2115 |
- if ! use ssl ; then |
| 2116 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 2117 |
- einfo "used USE=ssl to build it." |
| 2118 |
- return 0 |
| 2119 |
- fi |
| 2120 |
- |
| 2121 |
- # Make sure the certificates directory exists |
| 2122 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 2123 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 2124 |
- mkdir "${CERTDIR}" || die |
| 2125 |
- fi |
| 2126 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 2127 |
- |
| 2128 |
- # Create a default CA if needed |
| 2129 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 2130 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 2131 |
- certtool --generate-privkey \ |
| 2132 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 2133 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 2134 |
- |
| 2135 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2136 |
- cn = Portage automated CA |
| 2137 |
- ca |
| 2138 |
- cert_signing_key |
| 2139 |
- expiration_days = 3650 |
| 2140 |
- _EOF |
| 2141 |
- |
| 2142 |
- certtool --generate-self-signed \ |
| 2143 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2144 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2145 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2146 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 2147 |
- |
| 2148 |
- # Create the server certificate |
| 2149 |
- echo |
| 2150 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 2151 |
- read -r CN |
| 2152 |
- |
| 2153 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 2154 |
- certtool --generate-privkey \ |
| 2155 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 2156 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 2157 |
- |
| 2158 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2159 |
- cn = ${CN} |
| 2160 |
- tls_www_server |
| 2161 |
- dns_name = ${CN} |
| 2162 |
- expiration_days = 3650 |
| 2163 |
- _EOF |
| 2164 |
- |
| 2165 |
- certtool --generate-certificate \ |
| 2166 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 2167 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 2168 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2169 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2170 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2171 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 2172 |
- |
| 2173 |
- else |
| 2174 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 2175 |
- fi |
| 2176 |
- |
| 2177 |
- # Create a client certificate |
| 2178 |
- echo |
| 2179 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 2180 |
- read -r CN |
| 2181 |
- |
| 2182 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 2183 |
- certtool --generate-privkey \ |
| 2184 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 2185 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 2186 |
- |
| 2187 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2188 |
- cn = ${CN} |
| 2189 |
- tls_www_client |
| 2190 |
- dns_name = ${CN} |
| 2191 |
- expiration_days = 3650 |
| 2192 |
- _EOF |
| 2193 |
- |
| 2194 |
- certtool --generate-certificate \ |
| 2195 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 2196 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 2197 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2198 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2199 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2200 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 2201 |
- |
| 2202 |
- rm -f "${T}/${PF}.$$" |
| 2203 |
- |
| 2204 |
- echo |
| 2205 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 2206 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 2207 |
-} |
| 2208 |
|
| 2209 |
diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild |
| 2210 |
deleted file mode 100644 |
| 2211 |
index 129f495b9e7..00000000000 |
| 2212 |
--- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild |
| 2213 |
+++ /dev/null |
| 2214 |
@@ -1,456 +0,0 @@ |
| 2215 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2216 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2217 |
- |
| 2218 |
-EAPI="6" |
| 2219 |
- |
| 2220 |
-inherit autotools eutils linux-info systemd |
| 2221 |
- |
| 2222 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 2223 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 2224 |
- |
| 2225 |
-BRANCH="8-stable" |
| 2226 |
- |
| 2227 |
-if [[ ${PV} == "9999" ]]; then |
| 2228 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 2229 |
- |
| 2230 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 2231 |
- |
| 2232 |
- inherit git-r3 |
| 2233 |
-else |
| 2234 |
- MY_PV=${PV%_rc*} |
| 2235 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 2236 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 2237 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 2238 |
- |
| 2239 |
- # Upstream URL schema: |
| 2240 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 2241 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 2242 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 2243 |
- |
| 2244 |
- MY_URL_PREFIX= |
| 2245 |
- if [[ ${PV} = *_rc* ]]; then |
| 2246 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 2247 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 2248 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 2249 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 2250 |
- fi |
| 2251 |
- |
| 2252 |
- # Cleaning up temporary variables |
| 2253 |
- unset _tmp_last_index |
| 2254 |
- unset _tmp_suffix |
| 2255 |
- else |
| 2256 |
- KEYWORDS="amd64 ~arm ~arm64 ~hppa x86" |
| 2257 |
- fi |
| 2258 |
- |
| 2259 |
- SRC_URI=" |
| 2260 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 2261 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 2262 |
- " |
| 2263 |
- |
| 2264 |
- PATCHES=( |
| 2265 |
- "${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch |
| 2266 |
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch |
| 2267 |
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch |
| 2268 |
- "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch |
| 2269 |
- ) |
| 2270 |
-fi |
| 2271 |
- |
| 2272 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 2273 |
-SLOT="0" |
| 2274 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 2275 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 2276 |
- |
| 2277 |
-RDEPEND=" |
| 2278 |
- >=dev-libs/libfastjson-0.99.3:= |
| 2279 |
- >=dev-libs/libestr-0.1.9 |
| 2280 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 2281 |
- >=sys-libs/zlib-1.2.5 |
| 2282 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 2283 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 2284 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 2285 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 2286 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 2287 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 2288 |
- kerberos? ( virtual/krb5 ) |
| 2289 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 2290 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 2291 |
- mysql? ( virtual/mysql ) |
| 2292 |
- normalize? ( |
| 2293 |
- >=dev-libs/libee-0.4.0 |
| 2294 |
- >=dev-libs/liblognorm-2.0.3:= |
| 2295 |
- ) |
| 2296 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 2297 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 2298 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 2299 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 2300 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 2301 |
- relp? ( >=dev-libs/librelp-1.2.12:= ) |
| 2302 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 2303 |
- rfc5424hmac? ( |
| 2304 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 2305 |
- libressl? ( dev-libs/libressl:= ) |
| 2306 |
- ) |
| 2307 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 2308 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 2309 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 2310 |
- uuid? ( sys-apps/util-linux:0= ) |
| 2311 |
- zeromq? ( |
| 2312 |
- >=net-libs/zeromq-4.1.1:= |
| 2313 |
- >=net-libs/czmq-3.0.0 |
| 2314 |
- )" |
| 2315 |
-DEPEND="${RDEPEND} |
| 2316 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 2317 |
- virtual/pkgconfig |
| 2318 |
- test? ( sys-libs/libfaketime )" |
| 2319 |
- |
| 2320 |
-if [[ ${PV} == "9999" ]]; then |
| 2321 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 2322 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 2323 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 2324 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 2325 |
-fi |
| 2326 |
- |
| 2327 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 2328 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 2329 |
- |
| 2330 |
-src_unpack() { |
| 2331 |
- if [[ ${PV} == "9999" ]]; then |
| 2332 |
- git-r3_fetch |
| 2333 |
- git-r3_checkout |
| 2334 |
- else |
| 2335 |
- unpack ${P}.tar.gz |
| 2336 |
- fi |
| 2337 |
- |
| 2338 |
- if use doc; then |
| 2339 |
- if [[ ${PV} == "9999" ]]; then |
| 2340 |
- local _EGIT_BRANCH= |
| 2341 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 2342 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 2343 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 2344 |
- unset EGIT_BRANCH |
| 2345 |
- fi |
| 2346 |
- |
| 2347 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 2348 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 2349 |
- |
| 2350 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 2351 |
- # Restore previous EGIT_BRANCH information |
| 2352 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 2353 |
- fi |
| 2354 |
- else |
| 2355 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 2356 |
- mkdir docs || die "Failed to create docs directory" |
| 2357 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 2358 |
- unpack ${MY_FILENAME_DOCS} |
| 2359 |
- fi |
| 2360 |
- fi |
| 2361 |
-} |
| 2362 |
- |
| 2363 |
-src_prepare() { |
| 2364 |
- default |
| 2365 |
- |
| 2366 |
- eautoreconf |
| 2367 |
-} |
| 2368 |
- |
| 2369 |
-src_configure() { |
| 2370 |
- # Maintainer notes: |
| 2371 |
- # * Guardtime support is missing because libgt isn't yet available |
| 2372 |
- # in portage. |
| 2373 |
- # * Hadoop's HDFS file system output module is currently not |
| 2374 |
- # supported in Gentoo because nobody is able to test it |
| 2375 |
- # (JAVA dependency). |
| 2376 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 2377 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 2378 |
- # variables because rsyslog's build system depends on pkg-config. |
| 2379 |
- |
| 2380 |
- if use redis; then |
| 2381 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 2382 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 2383 |
- fi |
| 2384 |
- |
| 2385 |
- local myeconfargs=( |
| 2386 |
- --disable-debug-symbols |
| 2387 |
- --disable-generate-man-pages |
| 2388 |
- --without-valgrind-testbench |
| 2389 |
- $(use_enable test testbench) |
| 2390 |
- # Input Plugins without depedencies |
| 2391 |
- --enable-imdiag |
| 2392 |
- --enable-imfile |
| 2393 |
- --enable-impstats |
| 2394 |
- --enable-imptcp |
| 2395 |
- # Message Modificiation Plugins without depedencies |
| 2396 |
- --enable-mmanon |
| 2397 |
- --enable-mmaudit |
| 2398 |
- --enable-mmcount |
| 2399 |
- --enable-mmfields |
| 2400 |
- --enable-mmjsonparse |
| 2401 |
- --enable-mmpstrucdata |
| 2402 |
- --enable-mmrm1stspace |
| 2403 |
- --enable-mmsequence |
| 2404 |
- --enable-mmutf8fix |
| 2405 |
- # Output Modification Plugins without dependencies |
| 2406 |
- --enable-mail |
| 2407 |
- --enable-omprog |
| 2408 |
- --enable-omruleset |
| 2409 |
- --enable-omstdout |
| 2410 |
- --enable-omuxsock |
| 2411 |
- # Misc |
| 2412 |
- --enable-pmaixforwardedfrom |
| 2413 |
- --enable-pmciscoios |
| 2414 |
- --enable-pmcisconames |
| 2415 |
- --enable-pmlastmsg |
| 2416 |
- --enable-pmsnare |
| 2417 |
- # DB |
| 2418 |
- $(use_enable dbi libdbi) |
| 2419 |
- $(use_enable mongodb ommongodb) |
| 2420 |
- $(use_enable mysql) |
| 2421 |
- $(use_enable postgres pgsql) |
| 2422 |
- $(use_enable redis omhiredis) |
| 2423 |
- # Debug |
| 2424 |
- $(use_enable debug) |
| 2425 |
- $(use_enable debug diagtools) |
| 2426 |
- $(use_enable debug memcheck) |
| 2427 |
- $(use_enable debug rtinst) |
| 2428 |
- $(use_enable debug valgrind) |
| 2429 |
- # Misc |
| 2430 |
- $(use_enable elasticsearch) |
| 2431 |
- $(use_enable gcrypt libgcrypt) |
| 2432 |
- $(use_enable jemalloc) |
| 2433 |
- $(use_enable kafka imkafka) |
| 2434 |
- $(use_enable kafka omkafka) |
| 2435 |
- $(use_enable kerberos gssapi-krb5) |
| 2436 |
- $(use_enable normalize mmnormalize) |
| 2437 |
- $(use_enable mdblookup mmdblookup) |
| 2438 |
- $(use_enable grok mmgrok) |
| 2439 |
- $(use_enable omhttpfs) |
| 2440 |
- $(use_enable omudpspoof) |
| 2441 |
- $(use_enable rabbitmq omrabbitmq) |
| 2442 |
- $(use_enable relp) |
| 2443 |
- $(use_enable rfc3195) |
| 2444 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 2445 |
- $(use_enable snmp) |
| 2446 |
- $(use_enable snmp mmsnmptrapd) |
| 2447 |
- $(use_enable ssl gnutls) |
| 2448 |
- $(use_enable systemd imjournal) |
| 2449 |
- $(use_enable systemd omjournal) |
| 2450 |
- $(use_enable usertools) |
| 2451 |
- $(use_enable uuid) |
| 2452 |
- $(use_enable zeromq imczmq) |
| 2453 |
- $(use_enable zeromq imzmq3) |
| 2454 |
- $(use_enable zeromq omczmq) |
| 2455 |
- $(use_enable zeromq omzmq3) |
| 2456 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 2457 |
- ) |
| 2458 |
- |
| 2459 |
- econf "${myeconfargs[@]}" |
| 2460 |
-} |
| 2461 |
- |
| 2462 |
-src_compile() { |
| 2463 |
- default |
| 2464 |
- |
| 2465 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 2466 |
- einfo "Building documentation ..." |
| 2467 |
- local doc_dir="${S}/docs" |
| 2468 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 2469 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 2470 |
- fi |
| 2471 |
-} |
| 2472 |
- |
| 2473 |
-src_test() { |
| 2474 |
- local _has_increased_ulimit= |
| 2475 |
- |
| 2476 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 2477 |
- einfo "Adjusting permissions of test scripts ..." |
| 2478 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 2479 |
- die "Failed to adjust test scripts permission" |
| 2480 |
- |
| 2481 |
- if ulimit -n 3072; then |
| 2482 |
- _has_increased_ulimit="true" |
| 2483 |
- fi |
| 2484 |
- |
| 2485 |
- if ! emake --jobs 1 check; then |
| 2486 |
- eerror "Test suite failed! :(" |
| 2487 |
- |
| 2488 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 2489 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 2490 |
- fi |
| 2491 |
- |
| 2492 |
- if has userpriv ${FEATURES}; then |
| 2493 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 2494 |
- "before you submit a bug report." |
| 2495 |
- fi |
| 2496 |
- |
| 2497 |
- fi |
| 2498 |
-} |
| 2499 |
- |
| 2500 |
-src_install() { |
| 2501 |
- local DOCS=( |
| 2502 |
- AUTHORS |
| 2503 |
- ChangeLog |
| 2504 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 2505 |
- ) |
| 2506 |
- |
| 2507 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 2508 |
- |
| 2509 |
- default |
| 2510 |
- |
| 2511 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 2512 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 2513 |
- |
| 2514 |
- keepdir /var/empty/dev |
| 2515 |
- keepdir /var/spool/${PN} |
| 2516 |
- keepdir /etc/ssl/${PN} |
| 2517 |
- keepdir /etc/${PN}.d |
| 2518 |
- |
| 2519 |
- insinto /etc |
| 2520 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 2521 |
- |
| 2522 |
- insinto /etc/rsyslog.d/ |
| 2523 |
- doins "${FILESDIR}/${BRANCH}/50-default.conf" |
| 2524 |
- |
| 2525 |
- insinto /etc/logrotate.d/ |
| 2526 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 2527 |
- |
| 2528 |
- if use mysql; then |
| 2529 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 2530 |
- doins plugins/ommysql/createDB.sql |
| 2531 |
- fi |
| 2532 |
- |
| 2533 |
- if use postgres; then |
| 2534 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 2535 |
- doins plugins/ompgsql/createDB.sql |
| 2536 |
- fi |
| 2537 |
- |
| 2538 |
- prune_libtool_files --modules |
| 2539 |
-} |
| 2540 |
- |
| 2541 |
-pkg_postinst() { |
| 2542 |
- local advertise_readme=0 |
| 2543 |
- |
| 2544 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 2545 |
- # This is a new installation |
| 2546 |
- |
| 2547 |
- advertise_readme=1 |
| 2548 |
- |
| 2549 |
- if use mysql || use postgres; then |
| 2550 |
- echo |
| 2551 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 2552 |
- elog " /usr/share/doc/${PF}/scripts" |
| 2553 |
- fi |
| 2554 |
- |
| 2555 |
- if use ssl; then |
| 2556 |
- echo |
| 2557 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 2558 |
- elog " emerge --config =${PF}" |
| 2559 |
- elog "on your logging server. You can run it several times," |
| 2560 |
- elog "once for each logging client. The client certificates will be signed" |
| 2561 |
- elog "using the CA certificate generated during the first run." |
| 2562 |
- fi |
| 2563 |
- fi |
| 2564 |
- |
| 2565 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 2566 |
- # We need to show the README file location |
| 2567 |
- |
| 2568 |
- echo "" |
| 2569 |
- elog "Please read" |
| 2570 |
- elog "" |
| 2571 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 2572 |
- elog "" |
| 2573 |
- elog "for more details." |
| 2574 |
- fi |
| 2575 |
-} |
| 2576 |
- |
| 2577 |
-pkg_config() { |
| 2578 |
- if ! use ssl ; then |
| 2579 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 2580 |
- einfo "used USE=ssl to build it." |
| 2581 |
- return 0 |
| 2582 |
- fi |
| 2583 |
- |
| 2584 |
- # Make sure the certificates directory exists |
| 2585 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 2586 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 2587 |
- mkdir "${CERTDIR}" || die |
| 2588 |
- fi |
| 2589 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 2590 |
- |
| 2591 |
- # Create a default CA if needed |
| 2592 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 2593 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 2594 |
- certtool --generate-privkey \ |
| 2595 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 2596 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 2597 |
- |
| 2598 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2599 |
- cn = Portage automated CA |
| 2600 |
- ca |
| 2601 |
- cert_signing_key |
| 2602 |
- expiration_days = 3650 |
| 2603 |
- _EOF |
| 2604 |
- |
| 2605 |
- certtool --generate-self-signed \ |
| 2606 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2607 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2608 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2609 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 2610 |
- |
| 2611 |
- # Create the server certificate |
| 2612 |
- echo |
| 2613 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 2614 |
- read -r CN |
| 2615 |
- |
| 2616 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 2617 |
- certtool --generate-privkey \ |
| 2618 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 2619 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 2620 |
- |
| 2621 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2622 |
- cn = ${CN} |
| 2623 |
- tls_www_server |
| 2624 |
- dns_name = ${CN} |
| 2625 |
- expiration_days = 3650 |
| 2626 |
- _EOF |
| 2627 |
- |
| 2628 |
- certtool --generate-certificate \ |
| 2629 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 2630 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 2631 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2632 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2633 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2634 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 2635 |
- |
| 2636 |
- else |
| 2637 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 2638 |
- fi |
| 2639 |
- |
| 2640 |
- # Create a client certificate |
| 2641 |
- echo |
| 2642 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 2643 |
- read -r CN |
| 2644 |
- |
| 2645 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 2646 |
- certtool --generate-privkey \ |
| 2647 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 2648 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 2649 |
- |
| 2650 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 2651 |
- cn = ${CN} |
| 2652 |
- tls_www_client |
| 2653 |
- dns_name = ${CN} |
| 2654 |
- expiration_days = 3650 |
| 2655 |
- _EOF |
| 2656 |
- |
| 2657 |
- certtool --generate-certificate \ |
| 2658 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 2659 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 2660 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 2661 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 2662 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 2663 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 2664 |
- |
| 2665 |
- rm -f "${T}/${PF}.$$" |
| 2666 |
- |
| 2667 |
- echo |
| 2668 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 2669 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 2670 |
-} |
| 2671 |
|
| 2672 |
diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild |
| 2673 |
index 82440812ddf..22d4d8904fc 100644 |
| 2674 |
--- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild |
| 2675 |
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild |
| 2676 |
@@ -1,4 +1,4 @@ |
| 2677 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2678 |
+# Copyright 1999-2018 Gentoo Foundation |
| 2679 |
# Distributed under the terms of the GNU General Public License v2 |
| 2680 |
|
| 2681 |
EAPI="6" |
| 2682 |
@@ -6,7 +6,7 @@ EAPI="6" |
| 2683 |
inherit autotools eutils linux-info systemd |
| 2684 |
|
| 2685 |
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 2686 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 2687 |
+HOMEPAGE="https://www.rsyslog.com/" |
| 2688 |
|
| 2689 |
BRANCH="8-stable" |
| 2690 |
|
| 2691 |
@@ -39,12 +39,12 @@ else |
| 2692 |
unset _tmp_last_index |
| 2693 |
unset _tmp_suffix |
| 2694 |
else |
| 2695 |
- KEYWORDS="amd64 ~arm ~arm64 hppa x86" |
| 2696 |
+ KEYWORDS="hppa" |
| 2697 |
fi |
| 2698 |
|
| 2699 |
SRC_URI=" |
| 2700 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 2701 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 2702 |
+ https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 2703 |
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 2704 |
" |
| 2705 |
|
| 2706 |
PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) |
| 2707 |
|
| 2708 |
diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild |
| 2709 |
deleted file mode 100644 |
| 2710 |
index d8b4b91b033..00000000000 |
| 2711 |
--- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild |
| 2712 |
+++ /dev/null |
| 2713 |
@@ -1,451 +0,0 @@ |
| 2714 |
-# Copyright 1999-2017 Gentoo Foundation |
| 2715 |
-# Distributed under the terms of the GNU General Public License v2 |
| 2716 |
- |
| 2717 |
-EAPI="6" |
| 2718 |
- |
| 2719 |
-inherit autotools eutils linux-info systemd |
| 2720 |
- |
| 2721 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 2722 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 2723 |
- |
| 2724 |
-BRANCH="8-stable" |
| 2725 |
- |
| 2726 |
-if [[ ${PV} == "9999" ]]; then |
| 2727 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 2728 |
- |
| 2729 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 2730 |
- |
| 2731 |
- inherit git-r3 |
| 2732 |
-else |
| 2733 |
- MY_PV=${PV%_rc*} |
| 2734 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 2735 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 2736 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 2737 |
- |
| 2738 |
- # Upstream URL schema: |
| 2739 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 2740 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 2741 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 2742 |
- |
| 2743 |
- MY_URL_PREFIX= |
| 2744 |
- if [[ ${PV} = *_rc* ]]; then |
| 2745 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 2746 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 2747 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 2748 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 2749 |
- fi |
| 2750 |
- |
| 2751 |
- # Cleaning up temporary variables |
| 2752 |
- unset _tmp_last_index |
| 2753 |
- unset _tmp_suffix |
| 2754 |
- else |
| 2755 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
| 2756 |
- fi |
| 2757 |
- |
| 2758 |
- SRC_URI=" |
| 2759 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 2760 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 2761 |
- " |
| 2762 |
- |
| 2763 |
- PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch ) |
| 2764 |
-fi |
| 2765 |
- |
| 2766 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 2767 |
-SLOT="0" |
| 2768 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 2769 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 2770 |
- |
| 2771 |
-RDEPEND=" |
| 2772 |
- >=dev-libs/libfastjson-0.99.3:= |
| 2773 |
- >=dev-libs/libestr-0.1.9 |
| 2774 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 2775 |
- >=sys-libs/zlib-1.2.5 |
| 2776 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 2777 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 2778 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 2779 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 2780 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 2781 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 2782 |
- kerberos? ( virtual/krb5 ) |
| 2783 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 2784 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 2785 |
- mysql? ( virtual/mysql ) |
| 2786 |
- normalize? ( |
| 2787 |
- >=dev-libs/libee-0.4.0 |
| 2788 |
- >=dev-libs/liblognorm-2.0.3:= |
| 2789 |
- ) |
| 2790 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 2791 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 2792 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 2793 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 2794 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 2795 |
- relp? ( >=dev-libs/librelp-1.2.14:= ) |
| 2796 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 2797 |
- rfc5424hmac? ( |
| 2798 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 2799 |
- libressl? ( dev-libs/libressl:= ) |
| 2800 |
- ) |
| 2801 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 2802 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 2803 |
- systemd? ( >=sys-apps/systemd-208 ) |
| 2804 |
- uuid? ( sys-apps/util-linux:0= ) |
| 2805 |
- zeromq? ( |
| 2806 |
- >=net-libs/zeromq-4.1.1:= |
| 2807 |
- >=net-libs/czmq-3.0.0 |
| 2808 |
- )" |
| 2809 |
-DEPEND="${RDEPEND} |
| 2810 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 2811 |
- virtual/pkgconfig |
| 2812 |
- test? ( sys-libs/libfaketime )" |
| 2813 |
- |
| 2814 |
-if [[ ${PV} == "9999" ]]; then |
| 2815 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 2816 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 2817 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 2818 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 2819 |
-fi |
| 2820 |
- |
| 2821 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 2822 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 2823 |
- |
| 2824 |
-src_unpack() { |
| 2825 |
- if [[ ${PV} == "9999" ]]; then |
| 2826 |
- git-r3_fetch |
| 2827 |
- git-r3_checkout |
| 2828 |
- else |
| 2829 |
- unpack ${P}.tar.gz |
| 2830 |
- fi |
| 2831 |
- |
| 2832 |
- if use doc; then |
| 2833 |
- if [[ ${PV} == "9999" ]]; then |
| 2834 |
- local _EGIT_BRANCH= |
| 2835 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 2836 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 2837 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 2838 |
- unset EGIT_BRANCH |
| 2839 |
- fi |
| 2840 |
- |
| 2841 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 2842 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 2843 |
- |
| 2844 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 2845 |
- # Restore previous EGIT_BRANCH information |
| 2846 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 2847 |
- fi |
| 2848 |
- else |
| 2849 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 2850 |
- mkdir docs || die "Failed to create docs directory" |
| 2851 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 2852 |
- unpack ${MY_FILENAME_DOCS} |
| 2853 |
- fi |
| 2854 |
- fi |
| 2855 |
-} |
| 2856 |
- |
| 2857 |
-src_prepare() { |
| 2858 |
- default |
| 2859 |
- |
| 2860 |
- eautoreconf |
| 2861 |
-} |
| 2862 |
- |
| 2863 |
-src_configure() { |
| 2864 |
- # Maintainer notes: |
| 2865 |
- # * Guardtime support is missing because libgt isn't yet available |
| 2866 |
- # in portage. |
| 2867 |
- # * Hadoop's HDFS file system output module is currently not |
| 2868 |
- # supported in Gentoo because nobody is able to test it |
| 2869 |
- # (JAVA dependency). |
| 2870 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 2871 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 2872 |
- # variables because rsyslog's build system depends on pkg-config. |
| 2873 |
- |
| 2874 |
- if use redis; then |
| 2875 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 2876 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 2877 |
- fi |
| 2878 |
- |
| 2879 |
- local myeconfargs=( |
| 2880 |
- --disable-debug-symbols |
| 2881 |
- --disable-generate-man-pages |
| 2882 |
- --without-valgrind-testbench |
| 2883 |
- $(use_enable test testbench) |
| 2884 |
- # Input Plugins without depedencies |
| 2885 |
- --enable-imdiag |
| 2886 |
- --enable-imfile |
| 2887 |
- --enable-impstats |
| 2888 |
- --enable-imptcp |
| 2889 |
- # Message Modificiation Plugins without depedencies |
| 2890 |
- --enable-mmanon |
| 2891 |
- --enable-mmaudit |
| 2892 |
- --enable-mmcount |
| 2893 |
- --enable-mmfields |
| 2894 |
- --enable-mmjsonparse |
| 2895 |
- --enable-mmpstrucdata |
| 2896 |
- --enable-mmrm1stspace |
| 2897 |
- --enable-mmsequence |
| 2898 |
- --enable-mmutf8fix |
| 2899 |
- # Output Modification Plugins without dependencies |
| 2900 |
- --enable-mail |
| 2901 |
- --enable-omprog |
| 2902 |
- --enable-omruleset |
| 2903 |
- --enable-omstdout |
| 2904 |
- --enable-omuxsock |
| 2905 |
- # Misc |
| 2906 |
- --enable-pmaixforwardedfrom |
| 2907 |
- --enable-pmciscoios |
| 2908 |
- --enable-pmcisconames |
| 2909 |
- --enable-pmlastmsg |
| 2910 |
- --enable-pmsnare |
| 2911 |
- # DB |
| 2912 |
- $(use_enable dbi libdbi) |
| 2913 |
- $(use_enable mongodb ommongodb) |
| 2914 |
- $(use_enable mysql) |
| 2915 |
- $(use_enable postgres pgsql) |
| 2916 |
- $(use_enable redis omhiredis) |
| 2917 |
- # Debug |
| 2918 |
- $(use_enable debug) |
| 2919 |
- $(use_enable debug diagtools) |
| 2920 |
- $(use_enable debug memcheck) |
| 2921 |
- $(use_enable debug rtinst) |
| 2922 |
- $(use_enable debug valgrind) |
| 2923 |
- # Misc |
| 2924 |
- $(use_enable elasticsearch) |
| 2925 |
- $(use_enable gcrypt libgcrypt) |
| 2926 |
- $(use_enable jemalloc) |
| 2927 |
- $(use_enable kafka imkafka) |
| 2928 |
- $(use_enable kafka omkafka) |
| 2929 |
- $(use_enable kerberos gssapi-krb5) |
| 2930 |
- $(use_enable normalize mmnormalize) |
| 2931 |
- $(use_enable mdblookup mmdblookup) |
| 2932 |
- $(use_enable grok mmgrok) |
| 2933 |
- $(use_enable omhttpfs) |
| 2934 |
- $(use_enable omudpspoof) |
| 2935 |
- $(use_enable rabbitmq omrabbitmq) |
| 2936 |
- $(use_enable relp) |
| 2937 |
- $(use_enable rfc3195) |
| 2938 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 2939 |
- $(use_enable snmp) |
| 2940 |
- $(use_enable snmp mmsnmptrapd) |
| 2941 |
- $(use_enable ssl gnutls) |
| 2942 |
- $(use_enable systemd imjournal) |
| 2943 |
- $(use_enable systemd omjournal) |
| 2944 |
- $(use_enable usertools) |
| 2945 |
- $(use_enable uuid) |
| 2946 |
- $(use_enable zeromq imczmq) |
| 2947 |
- $(use_enable zeromq imzmq3) |
| 2948 |
- $(use_enable zeromq omczmq) |
| 2949 |
- $(use_enable zeromq omzmq3) |
| 2950 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 2951 |
- ) |
| 2952 |
- |
| 2953 |
- econf "${myeconfargs[@]}" |
| 2954 |
-} |
| 2955 |
- |
| 2956 |
-src_compile() { |
| 2957 |
- default |
| 2958 |
- |
| 2959 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 2960 |
- einfo "Building documentation ..." |
| 2961 |
- local doc_dir="${S}/docs" |
| 2962 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 2963 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 2964 |
- fi |
| 2965 |
-} |
| 2966 |
- |
| 2967 |
-src_test() { |
| 2968 |
- local _has_increased_ulimit= |
| 2969 |
- |
| 2970 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 2971 |
- einfo "Adjusting permissions of test scripts ..." |
| 2972 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 2973 |
- die "Failed to adjust test scripts permission" |
| 2974 |
- |
| 2975 |
- if ulimit -n 3072; then |
| 2976 |
- _has_increased_ulimit="true" |
| 2977 |
- fi |
| 2978 |
- |
| 2979 |
- if ! emake --jobs 1 check; then |
| 2980 |
- eerror "Test suite failed! :(" |
| 2981 |
- |
| 2982 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 2983 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 2984 |
- fi |
| 2985 |
- |
| 2986 |
- if has userpriv ${FEATURES}; then |
| 2987 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 2988 |
- "before you submit a bug report." |
| 2989 |
- fi |
| 2990 |
- |
| 2991 |
- fi |
| 2992 |
-} |
| 2993 |
- |
| 2994 |
-src_install() { |
| 2995 |
- local DOCS=( |
| 2996 |
- AUTHORS |
| 2997 |
- ChangeLog |
| 2998 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 2999 |
- ) |
| 3000 |
- |
| 3001 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 3002 |
- |
| 3003 |
- default |
| 3004 |
- |
| 3005 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 3006 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 3007 |
- |
| 3008 |
- keepdir /var/empty/dev |
| 3009 |
- keepdir /var/spool/${PN} |
| 3010 |
- keepdir /etc/ssl/${PN} |
| 3011 |
- keepdir /etc/${PN}.d |
| 3012 |
- |
| 3013 |
- insinto /etc |
| 3014 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 3015 |
- |
| 3016 |
- insinto /etc/rsyslog.d/ |
| 3017 |
- newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf |
| 3018 |
- |
| 3019 |
- insinto /etc/logrotate.d/ |
| 3020 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 3021 |
- |
| 3022 |
- if use mysql; then |
| 3023 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 3024 |
- doins plugins/ommysql/createDB.sql |
| 3025 |
- fi |
| 3026 |
- |
| 3027 |
- if use postgres; then |
| 3028 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 3029 |
- doins plugins/ompgsql/createDB.sql |
| 3030 |
- fi |
| 3031 |
- |
| 3032 |
- prune_libtool_files --modules |
| 3033 |
-} |
| 3034 |
- |
| 3035 |
-pkg_postinst() { |
| 3036 |
- local advertise_readme=0 |
| 3037 |
- |
| 3038 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 3039 |
- # This is a new installation |
| 3040 |
- |
| 3041 |
- advertise_readme=1 |
| 3042 |
- |
| 3043 |
- if use mysql || use postgres; then |
| 3044 |
- echo |
| 3045 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 3046 |
- elog " /usr/share/doc/${PF}/scripts" |
| 3047 |
- fi |
| 3048 |
- |
| 3049 |
- if use ssl; then |
| 3050 |
- echo |
| 3051 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 3052 |
- elog " emerge --config =${PF}" |
| 3053 |
- elog "on your logging server. You can run it several times," |
| 3054 |
- elog "once for each logging client. The client certificates will be signed" |
| 3055 |
- elog "using the CA certificate generated during the first run." |
| 3056 |
- fi |
| 3057 |
- fi |
| 3058 |
- |
| 3059 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 3060 |
- # We need to show the README file location |
| 3061 |
- |
| 3062 |
- echo "" |
| 3063 |
- elog "Please read" |
| 3064 |
- elog "" |
| 3065 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 3066 |
- elog "" |
| 3067 |
- elog "for more details." |
| 3068 |
- fi |
| 3069 |
-} |
| 3070 |
- |
| 3071 |
-pkg_config() { |
| 3072 |
- if ! use ssl ; then |
| 3073 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 3074 |
- einfo "used USE=ssl to build it." |
| 3075 |
- return 0 |
| 3076 |
- fi |
| 3077 |
- |
| 3078 |
- # Make sure the certificates directory exists |
| 3079 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 3080 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 3081 |
- mkdir "${CERTDIR}" || die |
| 3082 |
- fi |
| 3083 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 3084 |
- |
| 3085 |
- # Create a default CA if needed |
| 3086 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 3087 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 3088 |
- certtool --generate-privkey \ |
| 3089 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 3090 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 3091 |
- |
| 3092 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3093 |
- cn = Portage automated CA |
| 3094 |
- ca |
| 3095 |
- cert_signing_key |
| 3096 |
- expiration_days = 3650 |
| 3097 |
- _EOF |
| 3098 |
- |
| 3099 |
- certtool --generate-self-signed \ |
| 3100 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3101 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3102 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3103 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 3104 |
- |
| 3105 |
- # Create the server certificate |
| 3106 |
- echo |
| 3107 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 3108 |
- read -r CN |
| 3109 |
- |
| 3110 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 3111 |
- certtool --generate-privkey \ |
| 3112 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 3113 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 3114 |
- |
| 3115 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3116 |
- cn = ${CN} |
| 3117 |
- tls_www_server |
| 3118 |
- dns_name = ${CN} |
| 3119 |
- expiration_days = 3650 |
| 3120 |
- _EOF |
| 3121 |
- |
| 3122 |
- certtool --generate-certificate \ |
| 3123 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 3124 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 3125 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3126 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3127 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3128 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 3129 |
- |
| 3130 |
- else |
| 3131 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 3132 |
- fi |
| 3133 |
- |
| 3134 |
- # Create a client certificate |
| 3135 |
- echo |
| 3136 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 3137 |
- read -r CN |
| 3138 |
- |
| 3139 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 3140 |
- certtool --generate-privkey \ |
| 3141 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 3142 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 3143 |
- |
| 3144 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3145 |
- cn = ${CN} |
| 3146 |
- tls_www_client |
| 3147 |
- dns_name = ${CN} |
| 3148 |
- expiration_days = 3650 |
| 3149 |
- _EOF |
| 3150 |
- |
| 3151 |
- certtool --generate-certificate \ |
| 3152 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 3153 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 3154 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3155 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3156 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3157 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 3158 |
- |
| 3159 |
- rm -f "${T}/${PF}.$$" |
| 3160 |
- |
| 3161 |
- echo |
| 3162 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 3163 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 3164 |
-} |
| 3165 |
|
| 3166 |
diff --git a/app-admin/rsyslog/rsyslog-8.30.0.ebuild b/app-admin/rsyslog/rsyslog-8.30.0.ebuild |
| 3167 |
deleted file mode 100644 |
| 3168 |
index db0da41604d..00000000000 |
| 3169 |
--- a/app-admin/rsyslog/rsyslog-8.30.0.ebuild |
| 3170 |
+++ /dev/null |
| 3171 |
@@ -1,451 +0,0 @@ |
| 3172 |
-# Copyright 1999-2017 Gentoo Foundation |
| 3173 |
-# Distributed under the terms of the GNU General Public License v2 |
| 3174 |
- |
| 3175 |
-EAPI="6" |
| 3176 |
- |
| 3177 |
-inherit autotools eutils linux-info systemd |
| 3178 |
- |
| 3179 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 3180 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 3181 |
- |
| 3182 |
-BRANCH="8-stable" |
| 3183 |
- |
| 3184 |
-if [[ ${PV} == "9999" ]]; then |
| 3185 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 3186 |
- |
| 3187 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 3188 |
- |
| 3189 |
- inherit git-r3 |
| 3190 |
-else |
| 3191 |
- MY_PV=${PV%_rc*} |
| 3192 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 3193 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 3194 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 3195 |
- |
| 3196 |
- # Upstream URL schema: |
| 3197 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 3198 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 3199 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 3200 |
- |
| 3201 |
- MY_URL_PREFIX= |
| 3202 |
- if [[ ${PV} = *_rc* ]]; then |
| 3203 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 3204 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 3205 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 3206 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 3207 |
- fi |
| 3208 |
- |
| 3209 |
- # Cleaning up temporary variables |
| 3210 |
- unset _tmp_last_index |
| 3211 |
- unset _tmp_suffix |
| 3212 |
- else |
| 3213 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
| 3214 |
- fi |
| 3215 |
- |
| 3216 |
- SRC_URI=" |
| 3217 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 3218 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 3219 |
- " |
| 3220 |
- |
| 3221 |
- PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.30.0-fix-kerberos.patch ) |
| 3222 |
-fi |
| 3223 |
- |
| 3224 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 3225 |
-SLOT="0" |
| 3226 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 3227 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 3228 |
- |
| 3229 |
-RDEPEND=" |
| 3230 |
- >=dev-libs/libfastjson-0.99.7:= |
| 3231 |
- >=dev-libs/libestr-0.1.9 |
| 3232 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 3233 |
- >=sys-libs/zlib-1.2.5 |
| 3234 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 3235 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 3236 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 3237 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 3238 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 3239 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 3240 |
- kerberos? ( virtual/krb5 ) |
| 3241 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 3242 |
- mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) |
| 3243 |
- mysql? ( virtual/mysql ) |
| 3244 |
- normalize? ( |
| 3245 |
- >=dev-libs/libee-0.4.0 |
| 3246 |
- >=dev-libs/liblognorm-2.0.3:= |
| 3247 |
- ) |
| 3248 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 3249 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 3250 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 3251 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 3252 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 3253 |
- relp? ( >=dev-libs/librelp-1.2.14:= ) |
| 3254 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 3255 |
- rfc5424hmac? ( |
| 3256 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 3257 |
- libressl? ( dev-libs/libressl:= ) |
| 3258 |
- ) |
| 3259 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 3260 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 3261 |
- systemd? ( >=sys-apps/systemd-234 ) |
| 3262 |
- uuid? ( sys-apps/util-linux:0= ) |
| 3263 |
- zeromq? ( |
| 3264 |
- >=net-libs/zeromq-4.1.1:= |
| 3265 |
- >=net-libs/czmq-3.0.0 |
| 3266 |
- )" |
| 3267 |
-DEPEND="${RDEPEND} |
| 3268 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 3269 |
- virtual/pkgconfig |
| 3270 |
- test? ( sys-libs/libfaketime )" |
| 3271 |
- |
| 3272 |
-if [[ ${PV} == "9999" ]]; then |
| 3273 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 3274 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 3275 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 3276 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 3277 |
-fi |
| 3278 |
- |
| 3279 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 3280 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 3281 |
- |
| 3282 |
-src_unpack() { |
| 3283 |
- if [[ ${PV} == "9999" ]]; then |
| 3284 |
- git-r3_fetch |
| 3285 |
- git-r3_checkout |
| 3286 |
- else |
| 3287 |
- unpack ${P}.tar.gz |
| 3288 |
- fi |
| 3289 |
- |
| 3290 |
- if use doc; then |
| 3291 |
- if [[ ${PV} == "9999" ]]; then |
| 3292 |
- local _EGIT_BRANCH= |
| 3293 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 3294 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 3295 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 3296 |
- unset EGIT_BRANCH |
| 3297 |
- fi |
| 3298 |
- |
| 3299 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 3300 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 3301 |
- |
| 3302 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 3303 |
- # Restore previous EGIT_BRANCH information |
| 3304 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 3305 |
- fi |
| 3306 |
- else |
| 3307 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 3308 |
- mkdir docs || die "Failed to create docs directory" |
| 3309 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 3310 |
- unpack ${MY_FILENAME_DOCS} |
| 3311 |
- fi |
| 3312 |
- fi |
| 3313 |
-} |
| 3314 |
- |
| 3315 |
-src_prepare() { |
| 3316 |
- default |
| 3317 |
- |
| 3318 |
- eautoreconf |
| 3319 |
-} |
| 3320 |
- |
| 3321 |
-src_configure() { |
| 3322 |
- # Maintainer notes: |
| 3323 |
- # * Guardtime support is missing because libgt isn't yet available |
| 3324 |
- # in portage. |
| 3325 |
- # * Hadoop's HDFS file system output module is currently not |
| 3326 |
- # supported in Gentoo because nobody is able to test it |
| 3327 |
- # (JAVA dependency). |
| 3328 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 3329 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 3330 |
- # variables because rsyslog's build system depends on pkg-config. |
| 3331 |
- |
| 3332 |
- if use redis; then |
| 3333 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 3334 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 3335 |
- fi |
| 3336 |
- |
| 3337 |
- local myeconfargs=( |
| 3338 |
- --disable-debug-symbols |
| 3339 |
- --disable-generate-man-pages |
| 3340 |
- --without-valgrind-testbench |
| 3341 |
- $(use_enable test testbench) |
| 3342 |
- # Input Plugins without depedencies |
| 3343 |
- --enable-imdiag |
| 3344 |
- --enable-imfile |
| 3345 |
- --enable-impstats |
| 3346 |
- --enable-imptcp |
| 3347 |
- # Message Modificiation Plugins without depedencies |
| 3348 |
- --enable-mmanon |
| 3349 |
- --enable-mmaudit |
| 3350 |
- --enable-mmcount |
| 3351 |
- --enable-mmfields |
| 3352 |
- --enable-mmjsonparse |
| 3353 |
- --enable-mmpstrucdata |
| 3354 |
- --enable-mmrm1stspace |
| 3355 |
- --enable-mmsequence |
| 3356 |
- --enable-mmutf8fix |
| 3357 |
- # Output Modification Plugins without dependencies |
| 3358 |
- --enable-mail |
| 3359 |
- --enable-omprog |
| 3360 |
- --enable-omruleset |
| 3361 |
- --enable-omstdout |
| 3362 |
- --enable-omuxsock |
| 3363 |
- # Misc |
| 3364 |
- --enable-pmaixforwardedfrom |
| 3365 |
- --enable-pmciscoios |
| 3366 |
- --enable-pmcisconames |
| 3367 |
- --enable-pmlastmsg |
| 3368 |
- --enable-pmsnare |
| 3369 |
- # DB |
| 3370 |
- $(use_enable dbi libdbi) |
| 3371 |
- $(use_enable mongodb ommongodb) |
| 3372 |
- $(use_enable mysql) |
| 3373 |
- $(use_enable postgres pgsql) |
| 3374 |
- $(use_enable redis omhiredis) |
| 3375 |
- # Debug |
| 3376 |
- $(use_enable debug) |
| 3377 |
- $(use_enable debug diagtools) |
| 3378 |
- $(use_enable debug memcheck) |
| 3379 |
- $(use_enable debug rtinst) |
| 3380 |
- $(use_enable debug valgrind) |
| 3381 |
- # Misc |
| 3382 |
- $(use_enable elasticsearch) |
| 3383 |
- $(use_enable gcrypt libgcrypt) |
| 3384 |
- $(use_enable jemalloc) |
| 3385 |
- $(use_enable kafka imkafka) |
| 3386 |
- $(use_enable kafka omkafka) |
| 3387 |
- $(use_enable kerberos gssapi-krb5) |
| 3388 |
- $(use_enable normalize mmnormalize) |
| 3389 |
- $(use_enable mdblookup mmdblookup) |
| 3390 |
- $(use_enable grok mmgrok) |
| 3391 |
- $(use_enable omhttpfs) |
| 3392 |
- $(use_enable omudpspoof) |
| 3393 |
- $(use_enable rabbitmq omrabbitmq) |
| 3394 |
- $(use_enable relp) |
| 3395 |
- $(use_enable rfc3195) |
| 3396 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 3397 |
- $(use_enable snmp) |
| 3398 |
- $(use_enable snmp mmsnmptrapd) |
| 3399 |
- $(use_enable ssl gnutls) |
| 3400 |
- $(use_enable systemd imjournal) |
| 3401 |
- $(use_enable systemd omjournal) |
| 3402 |
- $(use_enable usertools) |
| 3403 |
- $(use_enable uuid) |
| 3404 |
- $(use_enable zeromq imczmq) |
| 3405 |
- $(use_enable zeromq imzmq3) |
| 3406 |
- $(use_enable zeromq omczmq) |
| 3407 |
- $(use_enable zeromq omzmq3) |
| 3408 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 3409 |
- ) |
| 3410 |
- |
| 3411 |
- econf "${myeconfargs[@]}" |
| 3412 |
-} |
| 3413 |
- |
| 3414 |
-src_compile() { |
| 3415 |
- default |
| 3416 |
- |
| 3417 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 3418 |
- einfo "Building documentation ..." |
| 3419 |
- local doc_dir="${S}/docs" |
| 3420 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 3421 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 3422 |
- fi |
| 3423 |
-} |
| 3424 |
- |
| 3425 |
-src_test() { |
| 3426 |
- local _has_increased_ulimit= |
| 3427 |
- |
| 3428 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 3429 |
- einfo "Adjusting permissions of test scripts ..." |
| 3430 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 3431 |
- die "Failed to adjust test scripts permission" |
| 3432 |
- |
| 3433 |
- if ulimit -n 3072; then |
| 3434 |
- _has_increased_ulimit="true" |
| 3435 |
- fi |
| 3436 |
- |
| 3437 |
- if ! emake --jobs 1 check; then |
| 3438 |
- eerror "Test suite failed! :(" |
| 3439 |
- |
| 3440 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 3441 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 3442 |
- fi |
| 3443 |
- |
| 3444 |
- if has userpriv ${FEATURES}; then |
| 3445 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 3446 |
- "before you submit a bug report." |
| 3447 |
- fi |
| 3448 |
- |
| 3449 |
- fi |
| 3450 |
-} |
| 3451 |
- |
| 3452 |
-src_install() { |
| 3453 |
- local DOCS=( |
| 3454 |
- AUTHORS |
| 3455 |
- ChangeLog |
| 3456 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 3457 |
- ) |
| 3458 |
- |
| 3459 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 3460 |
- |
| 3461 |
- default |
| 3462 |
- |
| 3463 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 3464 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 3465 |
- |
| 3466 |
- keepdir /var/empty/dev |
| 3467 |
- keepdir /var/spool/${PN} |
| 3468 |
- keepdir /etc/ssl/${PN} |
| 3469 |
- keepdir /etc/${PN}.d |
| 3470 |
- |
| 3471 |
- insinto /etc |
| 3472 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 3473 |
- |
| 3474 |
- insinto /etc/rsyslog.d/ |
| 3475 |
- newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf |
| 3476 |
- |
| 3477 |
- insinto /etc/logrotate.d/ |
| 3478 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 3479 |
- |
| 3480 |
- if use mysql; then |
| 3481 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 3482 |
- doins plugins/ommysql/createDB.sql |
| 3483 |
- fi |
| 3484 |
- |
| 3485 |
- if use postgres; then |
| 3486 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 3487 |
- doins plugins/ompgsql/createDB.sql |
| 3488 |
- fi |
| 3489 |
- |
| 3490 |
- prune_libtool_files --modules |
| 3491 |
-} |
| 3492 |
- |
| 3493 |
-pkg_postinst() { |
| 3494 |
- local advertise_readme=0 |
| 3495 |
- |
| 3496 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 3497 |
- # This is a new installation |
| 3498 |
- |
| 3499 |
- advertise_readme=1 |
| 3500 |
- |
| 3501 |
- if use mysql || use postgres; then |
| 3502 |
- echo |
| 3503 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 3504 |
- elog " /usr/share/doc/${PF}/scripts" |
| 3505 |
- fi |
| 3506 |
- |
| 3507 |
- if use ssl; then |
| 3508 |
- echo |
| 3509 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 3510 |
- elog " emerge --config =${PF}" |
| 3511 |
- elog "on your logging server. You can run it several times," |
| 3512 |
- elog "once for each logging client. The client certificates will be signed" |
| 3513 |
- elog "using the CA certificate generated during the first run." |
| 3514 |
- fi |
| 3515 |
- fi |
| 3516 |
- |
| 3517 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 3518 |
- # We need to show the README file location |
| 3519 |
- |
| 3520 |
- echo "" |
| 3521 |
- elog "Please read" |
| 3522 |
- elog "" |
| 3523 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 3524 |
- elog "" |
| 3525 |
- elog "for more details." |
| 3526 |
- fi |
| 3527 |
-} |
| 3528 |
- |
| 3529 |
-pkg_config() { |
| 3530 |
- if ! use ssl ; then |
| 3531 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 3532 |
- einfo "used USE=ssl to build it." |
| 3533 |
- return 0 |
| 3534 |
- fi |
| 3535 |
- |
| 3536 |
- # Make sure the certificates directory exists |
| 3537 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 3538 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 3539 |
- mkdir "${CERTDIR}" || die |
| 3540 |
- fi |
| 3541 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 3542 |
- |
| 3543 |
- # Create a default CA if needed |
| 3544 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 3545 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 3546 |
- certtool --generate-privkey \ |
| 3547 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 3548 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 3549 |
- |
| 3550 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3551 |
- cn = Portage automated CA |
| 3552 |
- ca |
| 3553 |
- cert_signing_key |
| 3554 |
- expiration_days = 3650 |
| 3555 |
- _EOF |
| 3556 |
- |
| 3557 |
- certtool --generate-self-signed \ |
| 3558 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3559 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3560 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3561 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 3562 |
- |
| 3563 |
- # Create the server certificate |
| 3564 |
- echo |
| 3565 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 3566 |
- read -r CN |
| 3567 |
- |
| 3568 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 3569 |
- certtool --generate-privkey \ |
| 3570 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 3571 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 3572 |
- |
| 3573 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3574 |
- cn = ${CN} |
| 3575 |
- tls_www_server |
| 3576 |
- dns_name = ${CN} |
| 3577 |
- expiration_days = 3650 |
| 3578 |
- _EOF |
| 3579 |
- |
| 3580 |
- certtool --generate-certificate \ |
| 3581 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 3582 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 3583 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3584 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3585 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3586 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 3587 |
- |
| 3588 |
- else |
| 3589 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 3590 |
- fi |
| 3591 |
- |
| 3592 |
- # Create a client certificate |
| 3593 |
- echo |
| 3594 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 3595 |
- read -r CN |
| 3596 |
- |
| 3597 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 3598 |
- certtool --generate-privkey \ |
| 3599 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 3600 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 3601 |
- |
| 3602 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 3603 |
- cn = ${CN} |
| 3604 |
- tls_www_client |
| 3605 |
- dns_name = ${CN} |
| 3606 |
- expiration_days = 3650 |
| 3607 |
- _EOF |
| 3608 |
- |
| 3609 |
- certtool --generate-certificate \ |
| 3610 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 3611 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 3612 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 3613 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 3614 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 3615 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 3616 |
- |
| 3617 |
- rm -f "${T}/${PF}.$$" |
| 3618 |
- |
| 3619 |
- echo |
| 3620 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 3621 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 3622 |
-} |
| 3623 |
|
| 3624 |
diff --git a/app-admin/rsyslog/rsyslog-8.31.0.ebuild b/app-admin/rsyslog/rsyslog-8.31.0.ebuild |
| 3625 |
deleted file mode 100644 |
| 3626 |
index 6dbc3b10175..00000000000 |
| 3627 |
--- a/app-admin/rsyslog/rsyslog-8.31.0.ebuild |
| 3628 |
+++ /dev/null |
| 3629 |
@@ -1,457 +0,0 @@ |
| 3630 |
-# Copyright 1999-2017 Gentoo Foundation |
| 3631 |
-# Distributed under the terms of the GNU General Public License v2 |
| 3632 |
- |
| 3633 |
-EAPI="6" |
| 3634 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 3635 |
- |
| 3636 |
-inherit autotools eutils linux-info python-any-r1 systemd |
| 3637 |
- |
| 3638 |
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 3639 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 3640 |
- |
| 3641 |
-BRANCH="8-stable" |
| 3642 |
- |
| 3643 |
-if [[ ${PV} == "9999" ]]; then |
| 3644 |
- EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" |
| 3645 |
- |
| 3646 |
- DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" |
| 3647 |
- |
| 3648 |
- inherit git-r3 |
| 3649 |
-else |
| 3650 |
- MY_PV=${PV%_rc*} |
| 3651 |
- MY_FILENAME="${PN}-${PV}.tar.gz" |
| 3652 |
- MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz" |
| 3653 |
- S="${WORKDIR}/${PN}-${MY_PV}" |
| 3654 |
- |
| 3655 |
- # Upstream URL schema: |
| 3656 |
- # RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz |
| 3657 |
- # http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz |
| 3658 |
- # Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz |
| 3659 |
- |
| 3660 |
- MY_URL_PREFIX= |
| 3661 |
- if [[ ${PV} = *_rc* ]]; then |
| 3662 |
- _tmp_last_index=$(($(get_last_version_component_index ${PV})+1)) |
| 3663 |
- _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV}) |
| 3664 |
- if [[ ${_tmp_suffix} = *rc* ]]; then |
| 3665 |
- MY_URL_PREFIX="${_tmp_suffix}/" |
| 3666 |
- fi |
| 3667 |
- |
| 3668 |
- # Cleaning up temporary variables |
| 3669 |
- unset _tmp_last_index |
| 3670 |
- unset _tmp_suffix |
| 3671 |
- else |
| 3672 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" |
| 3673 |
- fi |
| 3674 |
- |
| 3675 |
- SRC_URI=" |
| 3676 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 3677 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 3678 |
- " |
| 3679 |
- |
| 3680 |
- PATCHES=() |
| 3681 |
-fi |
| 3682 |
- |
| 3683 |
-LICENSE="GPL-3 LGPL-3 Apache-2.0" |
| 3684 |
-SLOT="0" |
| 3685 |
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs" |
| 3686 |
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq" |
| 3687 |
- |
| 3688 |
-RDEPEND=" |
| 3689 |
- >=dev-libs/libfastjson-0.99.7:= |
| 3690 |
- >=dev-libs/libestr-0.1.9 |
| 3691 |
- >=dev-libs/liblogging-1.0.1:=[stdlog] |
| 3692 |
- >=sys-libs/zlib-1.2.5 |
| 3693 |
- dbi? ( >=dev-db/libdbi-0.8.3 ) |
| 3694 |
- elasticsearch? ( >=net-misc/curl-7.35.0 ) |
| 3695 |
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) |
| 3696 |
- grok? ( >=dev-libs/grok-0.9.2 ) |
| 3697 |
- jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) |
| 3698 |
- kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) |
| 3699 |
- kerberos? ( virtual/krb5 ) |
| 3700 |
- mdblookup? ( dev-libs/libmaxminddb:= ) |
| 3701 |
- mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) |
| 3702 |
- mysql? ( virtual/mysql ) |
| 3703 |
- normalize? ( |
| 3704 |
- >=dev-libs/libee-0.4.0 |
| 3705 |
- >=dev-libs/liblognorm-2.0.3:= |
| 3706 |
- ) |
| 3707 |
- omhttpfs? ( >=net-misc/curl-7.35.0 ) |
| 3708 |
- omudpspoof? ( >=net-libs/libnet-1.1.6 ) |
| 3709 |
- postgres? ( >=dev-db/postgresql-8.4.20:= ) |
| 3710 |
- rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) |
| 3711 |
- redis? ( >=dev-libs/hiredis-0.11.0:= ) |
| 3712 |
- relp? ( >=dev-libs/librelp-1.2.14:= ) |
| 3713 |
- rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) |
| 3714 |
- rfc5424hmac? ( |
| 3715 |
- !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) |
| 3716 |
- libressl? ( dev-libs/libressl:= ) |
| 3717 |
- ) |
| 3718 |
- snmp? ( >=net-analyzer/net-snmp-5.7.2 ) |
| 3719 |
- ssl? ( >=net-libs/gnutls-2.12.23:0= ) |
| 3720 |
- systemd? ( >=sys-apps/systemd-234 ) |
| 3721 |
- uuid? ( sys-apps/util-linux:0= ) |
| 3722 |
- zeromq? ( |
| 3723 |
- >=net-libs/czmq-3.0.2 |
| 3724 |
- )" |
| 3725 |
-DEPEND="${RDEPEND} |
| 3726 |
- >=sys-devel/autoconf-archive-2015.02.24 |
| 3727 |
- virtual/pkgconfig |
| 3728 |
- test? ( |
| 3729 |
- jemalloc? ( <sys-libs/libfaketime-0.9.7 ) |
| 3730 |
- !jemalloc? ( sys-libs/libfaketime ) |
| 3731 |
- ${PYTHON_DEPS} |
| 3732 |
- )" |
| 3733 |
- |
| 3734 |
-if [[ ${PV} == "9999" ]]; then |
| 3735 |
- DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )" |
| 3736 |
- DEPEND+=" >=sys-devel/flex-2.5.39-r1" |
| 3737 |
- DEPEND+=" >=sys-devel/bison-2.4.3" |
| 3738 |
- DEPEND+=" >=dev-python/docutils-0.12" |
| 3739 |
-fi |
| 3740 |
- |
| 3741 |
-CONFIG_CHECK="~INOTIFY_USER" |
| 3742 |
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!" |
| 3743 |
- |
| 3744 |
-pkg_setup() { |
| 3745 |
- use test && python-any-r1_pkg_setup |
| 3746 |
-} |
| 3747 |
- |
| 3748 |
-src_unpack() { |
| 3749 |
- if [[ ${PV} == "9999" ]]; then |
| 3750 |
- git-r3_fetch |
| 3751 |
- git-r3_checkout |
| 3752 |
- else |
| 3753 |
- unpack ${P}.tar.gz |
| 3754 |
- fi |
| 3755 |
- |
| 3756 |
- if use doc; then |
| 3757 |
- if [[ ${PV} == "9999" ]]; then |
| 3758 |
- local _EGIT_BRANCH= |
| 3759 |
- if [[ -n "${EGIT_BRANCH}" ]]; then |
| 3760 |
- # Cannot use rsyslog commits/branches for documentation repository |
| 3761 |
- _EGIT_BRANCH=${EGIT_BRANCH} |
| 3762 |
- unset EGIT_BRANCH |
| 3763 |
- fi |
| 3764 |
- |
| 3765 |
- git-r3_fetch "${DOC_REPO_URI}" |
| 3766 |
- git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs |
| 3767 |
- |
| 3768 |
- if [[ -n "${_EGIT_BRANCH}" ]]; then |
| 3769 |
- # Restore previous EGIT_BRANCH information |
| 3770 |
- EGIT_BRANCH=${_EGIT_BRANCH} |
| 3771 |
- fi |
| 3772 |
- else |
| 3773 |
- cd "${S}" || die "Cannot change dir into '${S}'" |
| 3774 |
- mkdir docs || die "Failed to create docs directory" |
| 3775 |
- cd docs || die "Failed to change dir into '${S}/docs'" |
| 3776 |
- unpack ${MY_FILENAME_DOCS} |
| 3777 |
- fi |
| 3778 |
- fi |
| 3779 |
-} |
| 3780 |
- |
| 3781 |
-src_prepare() { |
| 3782 |
- default |
| 3783 |
- |
| 3784 |
- eautoreconf |
| 3785 |
-} |
| 3786 |
- |
| 3787 |
-src_configure() { |
| 3788 |
- # Maintainer notes: |
| 3789 |
- # * Guardtime support is missing because libgt isn't yet available |
| 3790 |
- # in portage. |
| 3791 |
- # * Hadoop's HDFS file system output module is currently not |
| 3792 |
- # supported in Gentoo because nobody is able to test it |
| 3793 |
- # (JAVA dependency). |
| 3794 |
- # * dev-libs/hiredis doesn't provide pkg-config (see #504614, |
| 3795 |
- # upstream PR 129 and 136) so we need to export HIREDIS_* |
| 3796 |
- # variables because rsyslog's build system depends on pkg-config. |
| 3797 |
- |
| 3798 |
- if use redis; then |
| 3799 |
- export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" |
| 3800 |
- export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" |
| 3801 |
- fi |
| 3802 |
- |
| 3803 |
- local myeconfargs=( |
| 3804 |
- --disable-debug-symbols |
| 3805 |
- --disable-generate-man-pages |
| 3806 |
- --without-valgrind-testbench |
| 3807 |
- $(use_enable test testbench) |
| 3808 |
- # Input Plugins without depedencies |
| 3809 |
- --enable-imdiag |
| 3810 |
- --enable-imfile |
| 3811 |
- --enable-impstats |
| 3812 |
- --enable-imptcp |
| 3813 |
- # Message Modificiation Plugins without depedencies |
| 3814 |
- --enable-mmanon |
| 3815 |
- --enable-mmaudit |
| 3816 |
- --enable-mmcount |
| 3817 |
- --enable-mmfields |
| 3818 |
- --enable-mmjsonparse |
| 3819 |
- --enable-mmpstrucdata |
| 3820 |
- --enable-mmrm1stspace |
| 3821 |
- --enable-mmsequence |
| 3822 |
- --enable-mmutf8fix |
| 3823 |
- # Output Modification Plugins without dependencies |
| 3824 |
- --enable-mail |
| 3825 |
- --enable-omprog |
| 3826 |
- --enable-omruleset |
| 3827 |
- --enable-omstdout |
| 3828 |
- --enable-omuxsock |
| 3829 |
- # Misc |
| 3830 |
- --enable-pmaixforwardedfrom |
| 3831 |
- --enable-pmciscoios |
| 3832 |
- --enable-pmcisconames |
| 3833 |
- --enable-pmlastmsg |
| 3834 |
- --enable-pmsnare |
| 3835 |
- # DB |
| 3836 |
- $(use_enable dbi libdbi) |
| 3837 |
- $(use_enable mongodb ommongodb) |
| 3838 |
- $(use_enable mysql) |
| 3839 |
- $(use_enable postgres pgsql) |
| 3840 |
- $(use_enable redis omhiredis) |
| 3841 |
- # Debug |
| 3842 |
- $(use_enable debug) |
| 3843 |
- $(use_enable debug diagtools) |
| 3844 |
- $(use_enable debug memcheck) |
| 3845 |
- $(use_enable debug rtinst) |
| 3846 |
- $(use_enable debug valgrind) |
| 3847 |
- # Misc |
| 3848 |
- $(use_enable elasticsearch) |
| 3849 |
- $(use_enable gcrypt libgcrypt) |
| 3850 |
- $(use_enable jemalloc) |
| 3851 |
- $(use_enable kafka imkafka) |
| 3852 |
- $(use_enable kafka omkafka) |
| 3853 |
- $(use_enable kerberos gssapi-krb5) |
| 3854 |
- $(use_enable normalize mmnormalize) |
| 3855 |
- $(use_enable mdblookup mmdblookup) |
| 3856 |
- $(use_enable grok mmgrok) |
| 3857 |
- $(use_enable omhttpfs) |
| 3858 |
- $(use_enable omudpspoof) |
| 3859 |
- $(use_enable rabbitmq omrabbitmq) |
| 3860 |
- $(use_enable relp) |
| 3861 |
- $(use_enable rfc3195) |
| 3862 |
- $(use_enable rfc5424hmac mmrfc5424addhmac) |
| 3863 |
- $(use_enable snmp) |
| 3864 |
- $(use_enable snmp mmsnmptrapd) |
| 3865 |
- $(use_enable ssl gnutls) |
| 3866 |
- $(use_enable systemd imjournal) |
| 3867 |
- $(use_enable systemd omjournal) |
| 3868 |
- $(use_enable usertools) |
| 3869 |
- $(use_enable uuid) |
| 3870 |
- $(use_enable zeromq imczmq) |
| 3871 |
- $(use_enable zeromq omczmq) |
| 3872 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
| 3873 |
- ) |
| 3874 |
- |
| 3875 |
- econf "${myeconfargs[@]}" |
| 3876 |
-} |
| 3877 |
- |
| 3878 |
-src_compile() { |
| 3879 |
- default |
| 3880 |
- |
| 3881 |
- if use doc && [[ "${PV}" == "9999" ]]; then |
| 3882 |
- einfo "Building documentation ..." |
| 3883 |
- local doc_dir="${S}/docs" |
| 3884 |
- cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" |
| 3885 |
- sphinx-build -b html source build || die "Building documentation failed!" |
| 3886 |
- fi |
| 3887 |
-} |
| 3888 |
- |
| 3889 |
-src_test() { |
| 3890 |
- local _has_increased_ulimit= |
| 3891 |
- |
| 3892 |
- # Sometimes tests aren't executable (i.e. when added via patch) |
| 3893 |
- einfo "Adjusting permissions of test scripts ..." |
| 3894 |
- find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \ |
| 3895 |
- die "Failed to adjust test scripts permission" |
| 3896 |
- |
| 3897 |
- if ulimit -n 3072; then |
| 3898 |
- _has_increased_ulimit="true" |
| 3899 |
- fi |
| 3900 |
- |
| 3901 |
- if ! emake --jobs 1 check; then |
| 3902 |
- eerror "Test suite failed! :(" |
| 3903 |
- |
| 3904 |
- if [[ -z "${_has_increased_ulimit}" ]]; then |
| 3905 |
- eerror "Probably because open file limit couldn't be set to 3072." |
| 3906 |
- fi |
| 3907 |
- |
| 3908 |
- if has userpriv ${FEATURES}; then |
| 3909 |
- eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \ |
| 3910 |
- "before you submit a bug report." |
| 3911 |
- fi |
| 3912 |
- |
| 3913 |
- fi |
| 3914 |
-} |
| 3915 |
- |
| 3916 |
-src_install() { |
| 3917 |
- local DOCS=( |
| 3918 |
- AUTHORS |
| 3919 |
- ChangeLog |
| 3920 |
- "${FILESDIR}"/${BRANCH}/README.gentoo |
| 3921 |
- ) |
| 3922 |
- |
| 3923 |
- use doc && local HTML_DOCS=( "${S}/docs/build/." ) |
| 3924 |
- |
| 3925 |
- default |
| 3926 |
- |
| 3927 |
- newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} |
| 3928 |
- newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} |
| 3929 |
- |
| 3930 |
- keepdir /var/empty/dev |
| 3931 |
- keepdir /var/spool/${PN} |
| 3932 |
- keepdir /etc/ssl/${PN} |
| 3933 |
- keepdir /etc/${PN}.d |
| 3934 |
- |
| 3935 |
- insinto /etc |
| 3936 |
- newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf |
| 3937 |
- |
| 3938 |
- insinto /etc/rsyslog.d/ |
| 3939 |
- newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf |
| 3940 |
- |
| 3941 |
- insinto /etc/logrotate.d/ |
| 3942 |
- newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN} |
| 3943 |
- |
| 3944 |
- if use mysql; then |
| 3945 |
- insinto /usr/share/doc/${PF}/scripts/mysql |
| 3946 |
- doins plugins/ommysql/createDB.sql |
| 3947 |
- fi |
| 3948 |
- |
| 3949 |
- if use postgres; then |
| 3950 |
- insinto /usr/share/doc/${PF}/scripts/pgsql |
| 3951 |
- doins plugins/ompgsql/createDB.sql |
| 3952 |
- fi |
| 3953 |
- |
| 3954 |
- prune_libtool_files --modules |
| 3955 |
-} |
| 3956 |
- |
| 3957 |
-pkg_postinst() { |
| 3958 |
- local advertise_readme=0 |
| 3959 |
- |
| 3960 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 3961 |
- # This is a new installation |
| 3962 |
- |
| 3963 |
- advertise_readme=1 |
| 3964 |
- |
| 3965 |
- if use mysql || use postgres; then |
| 3966 |
- echo |
| 3967 |
- elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" |
| 3968 |
- elog " /usr/share/doc/${PF}/scripts" |
| 3969 |
- fi |
| 3970 |
- |
| 3971 |
- if use ssl; then |
| 3972 |
- echo |
| 3973 |
- elog "To create a default CA and certificates for your server and clients, run:" |
| 3974 |
- elog " emerge --config =${PF}" |
| 3975 |
- elog "on your logging server. You can run it several times," |
| 3976 |
- elog "once for each logging client. The client certificates will be signed" |
| 3977 |
- elog "using the CA certificate generated during the first run." |
| 3978 |
- fi |
| 3979 |
- fi |
| 3980 |
- |
| 3981 |
- if [[ ${advertise_readme} -gt 0 ]]; then |
| 3982 |
- # We need to show the README file location |
| 3983 |
- |
| 3984 |
- echo "" |
| 3985 |
- elog "Please read" |
| 3986 |
- elog "" |
| 3987 |
- elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" |
| 3988 |
- elog "" |
| 3989 |
- elog "for more details." |
| 3990 |
- fi |
| 3991 |
-} |
| 3992 |
- |
| 3993 |
-pkg_config() { |
| 3994 |
- if ! use ssl ; then |
| 3995 |
- einfo "There is nothing to configure for rsyslog unless you" |
| 3996 |
- einfo "used USE=ssl to build it." |
| 3997 |
- return 0 |
| 3998 |
- fi |
| 3999 |
- |
| 4000 |
- # Make sure the certificates directory exists |
| 4001 |
- local CERTDIR="${EROOT}/etc/ssl/${PN}" |
| 4002 |
- if [[ ! -d "${CERTDIR}" ]]; then |
| 4003 |
- mkdir "${CERTDIR}" || die |
| 4004 |
- fi |
| 4005 |
- einfo "Your certificates will be stored in ${CERTDIR}" |
| 4006 |
- |
| 4007 |
- # Create a default CA if needed |
| 4008 |
- if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then |
| 4009 |
- einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." |
| 4010 |
- certtool --generate-privkey \ |
| 4011 |
- --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null |
| 4012 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 4013 |
- |
| 4014 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 4015 |
- cn = Portage automated CA |
| 4016 |
- ca |
| 4017 |
- cert_signing_key |
| 4018 |
- expiration_days = 3650 |
| 4019 |
- _EOF |
| 4020 |
- |
| 4021 |
- certtool --generate-self-signed \ |
| 4022 |
- --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 4023 |
- --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 4024 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 4025 |
- chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" |
| 4026 |
- |
| 4027 |
- # Create the server certificate |
| 4028 |
- echo |
| 4029 |
- einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " |
| 4030 |
- read -r CN |
| 4031 |
- |
| 4032 |
- einfo "Creating private key and certificate for server ${CN}..." |
| 4033 |
- certtool --generate-privkey \ |
| 4034 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 4035 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 4036 |
- |
| 4037 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 4038 |
- cn = ${CN} |
| 4039 |
- tls_www_server |
| 4040 |
- dns_name = ${CN} |
| 4041 |
- expiration_days = 3650 |
| 4042 |
- _EOF |
| 4043 |
- |
| 4044 |
- certtool --generate-certificate \ |
| 4045 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 4046 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 4047 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 4048 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 4049 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 4050 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 4051 |
- |
| 4052 |
- else |
| 4053 |
- einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." |
| 4054 |
- fi |
| 4055 |
- |
| 4056 |
- # Create a client certificate |
| 4057 |
- echo |
| 4058 |
- einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " |
| 4059 |
- read -r CN |
| 4060 |
- |
| 4061 |
- einfo "Creating private key and certificate for client ${CN}..." |
| 4062 |
- certtool --generate-privkey \ |
| 4063 |
- --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null |
| 4064 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" |
| 4065 |
- |
| 4066 |
- cat > "${T}/${PF}.$$" <<- _EOF |
| 4067 |
- cn = ${CN} |
| 4068 |
- tls_www_client |
| 4069 |
- dns_name = ${CN} |
| 4070 |
- expiration_days = 3650 |
| 4071 |
- _EOF |
| 4072 |
- |
| 4073 |
- certtool --generate-certificate \ |
| 4074 |
- --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ |
| 4075 |
- --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ |
| 4076 |
- --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ |
| 4077 |
- --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ |
| 4078 |
- --template "${T}/${PF}.$$" &>/dev/null |
| 4079 |
- chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" |
| 4080 |
- |
| 4081 |
- rm -f "${T}/${PF}.$$" |
| 4082 |
- |
| 4083 |
- echo |
| 4084 |
- einfo "Here is the documentation on how to encrypt your log traffic:" |
| 4085 |
- einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" |
| 4086 |
-} |
| 4087 |
|
| 4088 |
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 4089 |
index ed1912a926d..5fb845591e3 100644 |
| 4090 |
--- a/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 4091 |
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r3.ebuild |
| 4092 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 4093 |
inherit autotools eutils linux-info python-any-r1 systemd |
| 4094 |
|
| 4095 |
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 4096 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 4097 |
+HOMEPAGE="https://www.rsyslog.com/" |
| 4098 |
|
| 4099 |
BRANCH="8-stable" |
| 4100 |
|
| 4101 |
@@ -44,8 +44,8 @@ else |
| 4102 |
fi |
| 4103 |
|
| 4104 |
SRC_URI=" |
| 4105 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 4106 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 4107 |
+ https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 4108 |
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 4109 |
" |
| 4110 |
|
| 4111 |
PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch ) |
| 4112 |
|
| 4113 |
diff --git a/app-admin/rsyslog/rsyslog-8.33.1.ebuild b/app-admin/rsyslog/rsyslog-8.33.1.ebuild |
| 4114 |
index 7dafd1e2920..96f0fa8a919 100644 |
| 4115 |
--- a/app-admin/rsyslog/rsyslog-8.33.1.ebuild |
| 4116 |
+++ b/app-admin/rsyslog/rsyslog-8.33.1.ebuild |
| 4117 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 4118 |
inherit autotools eutils linux-info python-any-r1 systemd |
| 4119 |
|
| 4120 |
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" |
| 4121 |
-HOMEPAGE="http://www.rsyslog.com/" |
| 4122 |
+HOMEPAGE="https://www.rsyslog.com/" |
| 4123 |
|
| 4124 |
BRANCH="8-stable" |
| 4125 |
|
| 4126 |
@@ -44,8 +44,8 @@ else |
| 4127 |
fi |
| 4128 |
|
| 4129 |
SRC_URI=" |
| 4130 |
- http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 4131 |
- doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 4132 |
+ https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME} |
| 4133 |
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} ) |
| 4134 |
" |
| 4135 |
fi |
Archives