diff options
author | 2014-06-18 01:19:49 +0000 | |
---|---|---|
committer | 2014-06-18 01:19:49 +0000 | |
commit | 920a6f3bd9f92b2b5c5c3ef855d4805131d7d26d (patch) | |
tree | 89c7dae726c7dd497bd65c0e21b082ff1f247e7a /app-admin/rsyslog | |
parent | Automated update. (diff) | |
download | historical-920a6f3bd9f92b2b5c5c3ef855d4805131d7d26d.tar.gz historical-920a6f3bd9f92b2b5c5c3ef855d4805131d7d26d.tar.bz2 historical-920a6f3bd9f92b2b5c5c3ef855d4805131d7d26d.zip |
Drop shrinkage patch as it is slightly broken, and to make it work requires more hacks. Will continue to try and sort out a way forward in upstream.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'app-admin/rsyslog')
-rw-r--r-- | app-admin/rsyslog/ChangeLog | 7 | ||||
-rw-r--r-- | app-admin/rsyslog/Manifest | 30 | ||||
-rw-r--r-- | app-admin/rsyslog/files/7-stable/rsyslog-imuxsock-shrink.patch | 13 | ||||
-rw-r--r-- | app-admin/rsyslog/rsyslog-7.6.3-r2.ebuild | 328 |
4 files changed, 20 insertions, 358 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index 2bbb39ef9811..5fab149f1003 100644 --- a/app-admin/rsyslog/ChangeLog +++ b/app-admin/rsyslog/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/rsyslog # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.117 2014/06/16 04:17:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.118 2014/06/18 01:19:47 vapier Exp $ + + 18 Jun 2014; Mike Frysinger <vapier@gentoo.org> + -files/7-stable/rsyslog-imuxsock-shrink.patch, -rsyslog-7.6.3-r2.ebuild: + Drop shrinkage patch as it is slightly broken, and to make it work requires + more hacks. Will continue to try and sort out a way forward in upstream. *rsyslog-7.6.3-r2 (16 Jun 2014) diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index 87f9f7cc417b..702591904918 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -11,7 +11,6 @@ AUX 7-stable/rsyslog-7.4.3-fix-runtime.patch 1066 SHA256 d03db0a4f5c3a23cb38f0ad AUX 7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch 4179 SHA256 f23a6b927b9444ba82fb0dc775a9b1b826f86395da43d406c948b82d7e9b6d38 SHA512 e67632dbc87ba3805c75e6fb49ec6ef9f75c323dd9e6044ddf11d0232291214692663fc35543cb64230e6e6059f2b49373191f85669de1d206406b8716989c95 WHIRLPOOL 0b255ddfecb78234f6e37b4c5195286c7055703058add10846f51fbfd80a03350104178f916aa34156c732760b6cdbe2a8205340cef44b39321977ef6bb15d66 AUX 7-stable/rsyslog-7.x-mmjsonparse.patch 952 SHA256 8db6b4c0001ae53306ceb685ef245c6978e143c71c9642e634cbed98e6d2dde8 SHA512 4446349f75ff5726d1bffe261f607dd8710c31d1254925928ffcc825a0f86d96b281962150bfa8e85846b94610d0a15f0932ef6b041d390bd4402657ad0f47b7 WHIRLPOOL 1ba7a6db2cb753953f0ae8e701a9b7150b99bf553b653ba2b82c6f6d1bf76461efa1cbfb1d026e5e459069cbfc6e868d46743e38c9a01583b1ff4f7a4225ed69 AUX 7-stable/rsyslog-gentoo.conf 2630 SHA256 9b390cfffef39d3b5c6f845c6285e23fddce7405397b94abfa4145e998a97845 SHA512 41c5729c357099f1d58e80b13c889d4ee797dea69b9e427e61cfaf390ee16a7ec83d1d4a9b5fc1ee7812a8545d9bf1e1c6df0a636c2dbc8c400c7f5bd81516b5 WHIRLPOOL e9d03e579658e95b33ca77d99bfebb531f1975b5c7f0ee09cc718aaa5505c5aebb8dc3ab9492033933c8522f28f26ad4b847808c23668ffacb3173cb90abad94 -AUX 7-stable/rsyslog-imuxsock-shrink.patch 509 SHA256 9120f7ce91c9dae27db80ef015ef148a596b3cbcb16f9e988a66484fb92055cf SHA512 3acf2c4239dc1205a52e2241575038d4faa75f3fa2e2e1b4f8d0589d8fa15e6c50222a0e9ab6f23c3b22f69cc722ff4bb3643e24df86f458a7f959e6e3fc1231 WHIRLPOOL 94db8b475d7620fb97121db210eb16c0f70ac9c33247f80db3e3691c77608883740f306ef7485294eb33382d3deb69d12f2b6d7283c0c1592582f675cecdd0b1 AUX 7-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5683bcb7451d16e65a2f5b0 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a WHIRLPOOL 97cf3fdee62a9339b412ebe93b71b2d6804df60aad9cb7e71779fcaddb01d489e38bbb353557864ea38aba384e664e6da636812c3c078ed9e22e261ed7b78cba AUX 7-stable/rsyslog.confd 583 SHA256 ff2634927d3208ac2c82d352f0a7dc9fef1d0ee098d18f818d4417ac04516e9c SHA512 d7cdfd5eab63877ca2a4776c24b2810aee600c2590f10b598d9feee08a5fcedd9c33cdd2a8e1f89b869474b66ab22e7f96126a5b52e6e66760f742407ae81301 WHIRLPOOL f53744ca0177d2f52e1f070eed6927afddbd38c9b6f3fe889b4652cd8b3f0dd625abfe434253e73fbdbf7a14169c7ace5038dc8322ca4b3f97abf893125cedec AUX 7-stable/rsyslog.confd-r1 1140 SHA256 f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4 SHA512 8501be8d0abc166994863db61afa5a4ef120aaec601d86fb71711b557741d39b29b96a4d688e7af6ad8d5d15a1257821ca299c5f7391f2ce66cd95e33ea2ff7c WHIRLPOOL 0a3617defa10acfa693a3339e1f7ec69c9272b44aac6fda30b49452f32ea7037743acfd871cea025f1e584639725588286056db6e17663c2806ed47088600d35 @@ -28,23 +27,22 @@ EBUILD rsyslog-7.2.7.ebuild 7242 SHA256 b78a4318a93c2d6ce36d2e51ad216f5fa21797eb EBUILD rsyslog-7.4.10.ebuild 7286 SHA256 bf809c04b622fac07835c50022d08080f4996991807a55f594c9225dedfcbc29 SHA512 fa80b702e69d281ad60c304dfc76af7aa103f92d41c873ec88209311b23cc78d62bcfa5c1cff331d0a52d33d5e2db91c047a079f0867048af766976847eaa967 WHIRLPOOL 3ac67652764549ec67d390a9e2f7d6a505ca6f9a68c1e00cd33f4d942c92a878f708bf2710a04f4b0ffd4b0606303698bd79e5ca6ec9f98b1187ec1eea550c0e EBUILD rsyslog-7.4.4.ebuild 7068 SHA256 5fd6b6681b9fb7677ed00541237ce6e1b1eede86c9ac4ecfff56a1ccd2aae4a1 SHA512 e979da21fde67ce6d759273cdc0cfd138d2fd4dd7550650d7a467ca5484f0eac4ce0832e13fef7ffe638f005b91eed940037e8784fc7772b1d46823c62554c3a WHIRLPOOL dfa887210559f405484b59ad0f22015dc9a832f474af108652a9defddc8ab4329e8855322904b110fc2e0cbe65805839772d6dd00ef5d1db283d2cd6b83d864f EBUILD rsyslog-7.6.3-r1.ebuild 9312 SHA256 9105b6dd1f6aba6e2232263e56679ad7d10d8437a7e9f319088e47615e19086f SHA512 4ff1846b77b9efda8c0271eaac334d23a44eae8d5faf330163672635d3b4752e01f92eed13f88a454263a0b2640eec640ddece652b0582a69325a93a12abf3df WHIRLPOOL ad93935860bb21b34850e06d2a2d388fddd6ef84b1925aa9f51a1409c651871c43daf68369ba7ebafd7a2ccb4be1e7ae024c1446f6aa9b1476e25cd14995ab7c -EBUILD rsyslog-7.6.3-r2.ebuild 9365 SHA256 35ec884a0b3248ecc2c9cb13d8a1d5800cce0b5c98b7b6a23a834ebe009b38e7 SHA512 935bb7af82c6a2bc1686da5badf912e5109224123d773235b87d6f50bfb7ca454d3d0a111bd14b271e2fe637cfdca9916a6450195e0a4ebe8035f3de9a8b135a WHIRLPOOL e1552028a3a4a1c32b58be06b0a84f11042984d2d0dca1dd854240027a85219b6d9838c8db5acb435d965cdce2fc6c51cf27bbd65f51fca2cd2453e0ff130fbe -MISC ChangeLog 22253 SHA256 d3ee83c77d7c8904d0f7b8513e90e92d2cbc2630d2110a944e24bc1fae9a3504 SHA512 25fc2be966dca2516e44a48571cf6581157c380a880562f8ab1284952ee6cc61547ca67358639a982acf62cc78a79753177e19fdb137c7efae87596dbdd1a112 WHIRLPOOL 53523bccc675a6bc5045015ea97f48cdaa12d8098689755e21ca88f84aee8c827b85fa3e31df2d574d1f8f6ab162f4403f2a20a19ff929d153ac6619e049f72a +MISC ChangeLog 22533 SHA256 a1bc335ce94e6ec84c2d95667237b81e8a54854b503b5e6cc87c644c5c17651e SHA512 9461004e893c1183785d510ab81577192db663b92587844db5469c23a99357597fbe482e873712c7f977f62fdb7a50cc9f931eb94aadcabcdbf7376886e16ea4 WHIRLPOOL e23606273b5e70d6829e866eaab3d9b9367290d9279954257daebb64f34197dc063643bb3d8132794f22506810fd94dec1ded9930be8f4f94c70ba7cda3ac963 MISC metadata.xml 2941 SHA256 3d75473e17679907bf3170ec29f377f6eac2ee67408685015de41584713a68c1 SHA512 57b479b75864889ce2b143921c7e717229ba88f1eb470db0c6d2b151a5061b2b6fc5138b50c6e96c1d715ac0d05d48ed4c34375d42c0ea9cc3703c4f92625c44 WHIRLPOOL 70bfd3127b8f630e009d5226de5fc39b42a6f188069f68aead8986661516b171879bccb82cf1d444c150dd004cddddf9402e60e2d3ce43f1108171ffe84ec304 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTnm/EAAoJEPGu1DbS6WIAMa4P/jkTYXY7FZ3RM7xCZ8SjfBGG -t6psleddp1KWAoZ8HyE+qTql4mX8RLUeNRVZOD2R/F2IPkfhjobnn5tEWCo92cbl -Eqp0c5qTT0LRIBYBkWJ97zKzxrPCwjjMQSdBB/ppFTQWOSlxqeOog+6A2bYRhK5n -HfxPl205xAiDcKY5/e0fLq1NeTW5q7ZdhAWJVYo55r73fxXXjRqsRp6XyCHJ3EnN -+PgxUgMI9867NqWmPS+0wx36QlKkE3FXVROxKwe6EM/muEIQA87e9SC7OK3+kX5d -J6LKcmTwIvwaIyRBkUQIQLvehLaLRrkOrIDQdi9LlrgfCC2sz92UTQZsgznPjEaa -f/Xxy+AzXOq86sKUZLVEaBNk3iILLrcVbOKO5z8JI/r8kGQv9eHq8RlKEWwDPCsJ -qZfsvGeNjVgG05BOon9k91UV7Dg9ETu22h3HbZ4TDvl8qBcHJ+6tPEbSXny8qRik -N5KOwb2iqwBUw7Qxj161dg2jMrodlwIDj8fQy2uKAxTPqhF8R/eTRpAUymaV1hO5 -JlnG48NerwQYBeuYBDYn5/fRe9CP1jgQcfzdoHTyBxrAYzuXAlZ4fXxMixYltppt -u6XOAYSQnmKOZ9RoWmgYBs/AV+fy6jn/pmReCU1seHHTDfYQqcNF1u8DLL5XPJZ1 -bLNlBPNj3lKLbaazAw6o -=I2Zu +iQIcBAEBCAAGBQJToOk6AAoJEPGu1DbS6WIAUDEQAITq0NNqFdobH7lh2EKqUFba +kQ4praMj/bjQfmwFmj/q5Eu4a0QtETyABoH0YZZvD9xD5bPgowwsKbTRVVpJ1Eqo +9rgUScLn1f7JiFkGRyrBK6UgjCaZXMJWE0X38t0NbDdYStbyQk6aiFFvYM6VAi7g +3U/kZ9dE4+nj6FhSxBgPYC4hmX38IEynFgohvpwekUwiEWSnV9ljP1j794rEybe8 +8vkpv4UNCiTkpCy5RQ63Hk4ex4F55dNHzfE8CeODViW1z24nYKaorDb501BRtrKG +jB9No+MOc6vMxfidjUEsRBTisBIM03m1XBY1eLmIXMtPp0efXrE4BhT7oJdmpMEy +BwYqvS7muws3QAM01NC0BB0PRbzvL9MXZu9YhJDO7JmpvfLBouOJS+KADRniP0/o +44Wtinu0dYJCe/d6AeOv7c3vVkCAXikQLQo+cMfgrrP2X6Y+sBgxWH6Avtsy0tVu +0jlwzjwWgqWxU+G3LuGAvGmQ83NrlWWeAfl+ACkNEexav2JspPnXE7T3pc8Xxdsd +Fv+pNWxoLQ2p1ooWBMOzoORwDgOjXiOyn/wW/PsrOHBeYCPpJLzWhS3vj8ygp2en +a3XS0X/ApOilvXWMw6W/+xhjIMY2y7isj1YOPBK8E5whqmMW+ExSSWhit4xWOY3e +g3TN4xdLHgZdkVhlPLGD +=eUNp -----END PGP SIGNATURE----- diff --git a/app-admin/rsyslog/files/7-stable/rsyslog-imuxsock-shrink.patch b/app-admin/rsyslog/files/7-stable/rsyslog-imuxsock-shrink.patch deleted file mode 100644 index 60b6453e482a..000000000000 --- a/app-admin/rsyslog/files/7-stable/rsyslog-imuxsock-shrink.patch +++ /dev/null @@ -1,13 +0,0 @@ -the symbols provided by RSRT_LIBS are in the main rsyslog binary already, -and this plugin is only loaded by rsyslog, so no need to double link them. - -patch by Alex Deymo <deymo@chromium.org> - ---- a/plugins/imuxsock/Makefile.am -+++ b/plugins/imuxsock/Makefile.am -@@ -3,4 +3,4 @@ - imuxsock_la_SOURCES = imuxsock.c - imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) - imuxsock_la_LDFLAGS = -module -avoid-version --imuxsock_la_LIBADD = $(RSRT_LIBS) -+imuxsock_la_LIBADD = diff --git a/app-admin/rsyslog/rsyslog-7.6.3-r2.ebuild b/app-admin/rsyslog/rsyslog-7.6.3-r2.ebuild deleted file mode 100644 index 91e7a53111d8..000000000000 --- a/app-admin/rsyslog/rsyslog-7.6.3-r2.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-7.6.3-r2.ebuild,v 1.1 2014/06/16 04:17:00 vapier Exp $ - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils eutils systemd - -DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" -HOMEPAGE="http://www.rsyslog.com/" -SRC_URI="http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz" - -LICENSE="GPL-3 LGPL-3 Apache-2.0" -KEYWORDS="~amd64 ~arm ~hppa ~x86" -SLOT="0" -IUSE="dbi debug doc elasticsearch +gcrypt kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq" - -RDEPEND=" - >=dev-libs/json-c-0.11:= - >=dev-libs/libestr-0.1.9 - >=dev-libs/liblogging-1.0.1:=[stdlog] - >=sys-libs/zlib-1.2.5 - dbi? ( >=dev-db/libdbi-0.8.3 ) - elasticsearch? ( >=net-misc/curl-7.35.0 ) - gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) - kerberos? ( virtual/krb5 ) - mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) - mysql? ( virtual/mysql ) - normalize? ( - >=dev-libs/libee-0.4.0 - >=dev-libs/liblognorm-0.3.1:= - !>=dev-libs/liblognorm-1.0.0 - ) - omudpspoof? ( >=net-libs/libnet-1.1.6 ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.2 ) - postgres? ( >=dev-db/postgresql-base-8.4.20 ) - rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 ) - redis? ( >=dev-libs/hiredis-0.11.0 ) - relp? ( >=dev-libs/librelp-1.2.5 ) - rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) - rfc5424hmac? ( >=dev-libs/openssl-0.9.8y ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 ) - ssl? ( >=net-libs/gnutls-2.12.23 ) - systemd? ( >=sys-apps/systemd-208 ) - zeromq? ( >=net-libs/czmq-1.2.0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -BRANCH="7-stable" - -# Test suite requires a special setup or will always fail -RESTRICT="test" - -# Maitainer note : open a bug to upstream -# showing that building in a separate dir fails -AUTOTOOLS_IN_SOURCE_BUILD=1 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules" - -DOCS=( - AUTHORS - ChangeLog - doc/rsyslog-example.conf - "${FILESDIR}"/${BRANCH}/README.gentoo -) - -PATCHES=( - "${FILESDIR}"/${BRANCH}/${PN}-7.x-mmjsonparse.patch - "${FILESDIR}"/${BRANCH}/fix-omruleset-default-value.patch - "${FILESDIR}"/${BRANCH}/bugfix_52.patch - "${FILESDIR}"/${BRANCH}/bugfix_73.patch - "${FILESDIR}"/${BRANCH}/${PN}-imuxsock-shrink.patch -) - -src_configure() { - # Maintainer notes: - # * Guardtime support is missing because libgt isn't yet available - # in portage. - # * Hadoop's HDFS file system output module is currently not - # supported in Gentoo because nobody is able to test it - # (JAVA dependency). - # * dev-libs/hiredis doesn't provide pkg-config (see #504614, - # upstream PR 129 and 136) so we need to export HIREDIS_* - # variables because rsyslog's build system depends on pkg-config. - - if use redis; then - export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis" - export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include" - fi - - local myeconfargs=( - # Input Plugins without depedencies - --enable-imfile - --enable-impstats - --enable-imptcp - --enable-imttcp - # Message Modificiation Plugins without depedencies - --enable-mmanon - --enable-mmaudit - --enable-mmcount - --enable-mmfields - --enable-mmjsonparse - --enable-mmpstrucdata - --enable-mmsequence - --enable-mmutf8fix - # Output Modification Plugins without dependencies - --enable-mail - --enable-omprog - --enable-omruleset - --enable-omstdout - --enable-omuxsock - # Misc - --enable-pmaixforwardedfrom - --enable-pmcisconames - --enable-pmlastmsg - --enable-pmrfc3164sd - --enable-pmsnare - --enable-sm_cust_bindcdr - # DB - $(use_enable dbi libdbi) - $(use_enable mongodb ommongodb) - $(use_enable mysql) - $(use_enable oracle) - $(use_enable postgres pgsql) - $(use_enable redis omhiredis) - # Debug - $(use_enable debug) - $(use_enable debug diagtools) - $(use_enable debug imdiag) - $(use_enable debug memcheck) - $(use_enable debug rtinst) - $(use_enable debug valgrind) - # Misc - $(use_enable elasticsearch) - $(use_enable gcrypt libgcrypt) - $(use_enable kerberos gssapi-krb5) - $(use_enable normalize mmnormalize) - $(use_enable omudpspoof) - $(use_enable rabbitmq omrabbitmq) - $(use_enable relp) - $(use_enable rfc3195) - $(use_enable rfc5424hmac mmrfc5424addhmac) - $(use_enable snmp) - $(use_enable snmp mmsnmptrapd) - $(use_enable ssl gnutls) - $(use_enable systemd imjournal) - $(use_enable systemd omjournal) - $(use_enable usertools) - $(use_enable zeromq imzmq3) - $(use_enable zeromq omzmq3) - "$(systemd_with_unitdir)" - ) - - autotools-utils_src_configure -} - -src_install() { - use doc && HTML_DOCS=( "${S}"/doc/ ) - autotools-utils_src_install - - newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN} - newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN} - - keepdir /var/empty/dev - keepdir /var/spool/${PN} - keepdir /etc/ssl/${PN} - keepdir /etc/${PN}.d - - insinto /etc - newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf - - insinto /etc/rsyslog.d/ - doins "${FILESDIR}/${BRANCH}/50-default.conf" - - insinto /etc/logrotate.d/ - newins "${FILESDIR}/${BRANCH}/${PN}.logrotate-r1" ${PN} - - if use mysql; then - insinto /usr/share/doc/${PF}/scripts/mysql - doins plugins/ommysql/{createDB.sql,contrib/delete_mysql} - fi - - if use postgres; then - insinto /usr/share/doc/${PF}/scripts/pgsql - doins plugins/ompgsql/createDB.sql - fi -} - -pkg_postinst() { - local advertise_readme=0 - - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - - advertise_readme=1 - - if use mysql || use postgres; then - echo - elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:" - elog " /usr/share/doc/${PF}/scripts" - fi - - if use ssl; then - echo - elog "To create a default CA and certificates for your server and clients, run:" - elog " emerge --config =${PF}" - elog "on your logging server. You can run it several times," - elog "once for each logging client. The client certificates will be signed" - elog "using the CA certificate generated during the first run." - fi - fi - - if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then - # Show this message until rsyslog-8.x - echo - elog "Since ${PN}-7.6.3 we no longer use the catch-all log target" - elog "\"/var/log/syslog\" due to its redundancy to the other log targets." - - advertise_readme=1 - fi - - if [[ ${advertise_readme} -gt 0 ]]; then - # We need to show the README file location - - echo "" - elog "Please read" - elog "" - elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - elog "" - elog "for more details." - fi -} - -pkg_config() { - if ! use ssl ; then - einfo "There is nothing to configure for rsyslog unless you" - einfo "used USE=ssl to build it." - return 0 - fi - - # Make sure the certificates directory exists - CERTDIR="${EROOT}/etc/ssl/${PN}" - if [ ! -d "${CERTDIR}" ]; then - mkdir "${CERTDIR}" || die - fi - einfo "Your certificates will be stored in ${CERTDIR}" - - # Create a default CA if needed - if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then - einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = Portage automated CA - ca - cert_signing_key - expiration_days = 3650 - _EOF - - certtool --generate-self-signed \ - --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" - - # Create the server certificate - echo - einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for server ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_server - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - else - einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." - fi - - # Create a client certificate - echo - einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " - read -r CN - - einfo "Creating private key and certificate for client ${CN}..." - certtool --generate-privkey \ - --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" - - cat > "${T}/${PF}.$$" <<- _EOF - cn = ${CN} - tls_www_client - dns_name = ${CN} - expiration_days = 3650 - _EOF - - certtool --generate-certificate \ - --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ - --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ - --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ - --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ - --template "${T}/${PF}.$$" &>/dev/null - chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" - - rm -f "${T}/${PF}.$$" - - echo - einfo "Here is the documentation on how to encrypt your log traffic:" - einfo " http://www.rsyslog.com/doc/rsyslog_tls.html" -} |