mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-16 23:02:20 +01:00
Merge pull request #622 from ajeddeloh/rm-apps
app-*/*: remove unused packages
This commit is contained in:
commit
79cb52de0a
@ -1,311 +0,0 @@
|
|||||||
# ChangeLog for app-admin/rsyslog
|
|
||||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# (auto-generated from git log)
|
|
||||||
|
|
||||||
*rsyslog-8.9.0 (09 Aug 2015)
|
|
||||||
*rsyslog-8.7.0-r2 (09 Aug 2015)
|
|
||||||
|
|
||||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
+files/8-stable/10-respect_CFLAGS-r1.patch,
|
|
||||||
+files/8-stable/10-respect_CFLAGS.patch, +files/8-stable/50-default.conf, +f
|
|
||||||
iles/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.p
|
|
||||||
atch,
|
|
||||||
+files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch,
|
|
||||||
+files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch,
|
|
||||||
+files/8-stable/README.gentoo, +files/8-stable/rsyslog.conf,
|
|
||||||
+files/8-stable/rsyslog.confd, +files/8-stable/rsyslog.initd,
|
|
||||||
+files/8-stable/rsyslog.logrotate, +metadata.xml, +rsyslog-8.7.0-r2.ebuild,
|
|
||||||
+rsyslog-8.9.0.ebuild:
|
|
||||||
proj/gentoo: Initial commit
|
|
||||||
|
|
||||||
This commit represents a new era for Gentoo:
|
|
||||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
|
||||||
|
|
||||||
This commit is the start of the NEW history.
|
|
||||||
Any historical data is intended to be grafted onto this point.
|
|
||||||
|
|
||||||
Creation process:
|
|
||||||
1. Take final CVS checkout snapshot
|
|
||||||
2. Remove ALL ChangeLog* files
|
|
||||||
3. Transform all Manifests to thin
|
|
||||||
4. Remove empty Manifests
|
|
||||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
|
||||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
|
||||||
|
|
||||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
|
||||||
tests
|
|
||||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
|
||||||
project
|
|
||||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
|
||||||
developer, wrote Git features for the migration
|
|
||||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
|
||||||
cvs2svn
|
|
||||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
|
||||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
|
||||||
work in migration
|
|
||||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
|
||||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
|
||||||
the bikeshed
|
|
||||||
|
|
||||||
*rsyslog-8.12.0 (18 Aug 2015)
|
|
||||||
|
|
||||||
18 Aug 2015; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
+files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch,
|
|
||||||
+rsyslog-8.12.0.ebuild:
|
|
||||||
Version bump.
|
|
||||||
|
|
||||||
Thanks to Whissi for providing the ebuild and to Ultrabug for
|
|
||||||
kindly permitting the commit.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
|
||||||
Use https by default
|
|
||||||
|
|
||||||
Convert all URLs for sites supporting encrypted connections from http to
|
|
||||||
https
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
|
||||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
|
||||||
|
|
||||||
repoman does not yet accept the https version.
|
|
||||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/552720
|
|
||||||
|
|
||||||
*rsyslog-8.12.0-r1 (20 Sep 2015)
|
|
||||||
|
|
||||||
20 Sep 2015; Julian Ospald <hasufell@gentoo.org> metadata.xml,
|
|
||||||
+rsyslog-8.12.0-r1.ebuild:
|
|
||||||
add libressl support
|
|
||||||
|
|
||||||
*rsyslog-8.13.0 (09 Oct 2015)
|
|
||||||
|
|
||||||
09 Oct 2015; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
+files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch,
|
|
||||||
+files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch,
|
|
||||||
+files/8-stable/rsyslog.confd-r1, +files/8-stable/rsyslog.initd-r1,
|
|
||||||
+rsyslog-8.13.0.ebuild:
|
|
||||||
Bump to version 8.13.0
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
09 Oct 2015; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
-files/8-stable/10-respect_CFLAGS.patch, -rsyslog-8.9.0.ebuild,
|
|
||||||
-rsyslog-8.12.0.ebuild:
|
|
||||||
Removed old.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
09 Oct 2015; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
rsyslog-8.12.0-r1.ebuild:
|
|
||||||
Adjusted dependency on dev-libs/liblognorm
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
21 Dec 2015; Jeroen Roovers <jer@gentoo.org> rsyslog-8.13.0.ebuild:
|
|
||||||
Stable for HPPA (bug #565360).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
25 Dec 2015; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.13.0.ebuild:
|
|
||||||
amd64 stable wrt bug #565360
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.24
|
|
||||||
RepoMan-Options: --include-arches="amd64"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
25 Dec 2015; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.13.0.ebuild:
|
|
||||||
x86 stable wrt bug #565360
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.24
|
|
||||||
RepoMan-Options: --include-arches="x86"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
|
||||||
|
|
||||||
*rsyslog-8.16.0 (05 Feb 2016)
|
|
||||||
|
|
||||||
05 Feb 2016; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
+files/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch,
|
|
||||||
+files/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch,
|
|
||||||
+files/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch,
|
|
||||||
+rsyslog-8.16.0.ebuild:
|
|
||||||
Bump to version 8.16.0
|
|
||||||
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
05 Feb 2016; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
-files/8-stable/10-respect_CFLAGS-r1.patch,
|
|
||||||
-files/8-stable/40-rsyslog-fix-parallel-build-issue-479.patch, -files/8-stab
|
|
||||||
le/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.patch,
|
|
||||||
-files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch,
|
|
||||||
-files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch,
|
|
||||||
-files/8-stable/rsyslog.confd, -files/8-stable/rsyslog.initd,
|
|
||||||
-rsyslog-8.7.0-r2.ebuild, -rsyslog-8.12.0-r1.ebuild:
|
|
||||||
Removed old.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.27
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
*rsyslog-8.16.0-r1 (12 Mar 2016)
|
|
||||||
|
|
||||||
12 Mar 2016; Ian Delaney <idella4@gentoo.org>
|
|
||||||
+files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch,
|
|
||||||
+rsyslog-8.16.0-r1.ebuild:
|
|
||||||
Rev bump to fix a leap year issue
|
|
||||||
|
|
||||||
Bug: https://github.com/rsyslog/rsyslog/issues/830
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1034
|
|
||||||
|
|
||||||
12 Mar 2016; Ian Delaney <idella4@gentoo.org> -rsyslog-8.16.0.ebuild:
|
|
||||||
Remove old version affected by leap year issue
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1034
|
|
||||||
|
|
||||||
14 Mar 2016; Patrice Clement <monsieurp@gentoo.org>
|
|
||||||
rsyslog-8.16.0-r1.ebuild:
|
|
||||||
Remove elibtoolize call.
|
|
||||||
|
|
||||||
No need to manually call elibtoolize, eautoreconf already does it.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1048
|
|
||||||
|
|
||||||
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.16.0-r1.ebuild:
|
|
||||||
amd64 stable wrt bug #577494
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
RepoMan-Options: --include-arches="amd64"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.16.0-r1.ebuild:
|
|
||||||
x86 stable wrt bug #577494
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
RepoMan-Options: --include-arches="x86"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
21 Mar 2016; Anthony G. Basile <blueness@gentoo.org> rsyslog-8.13.0.ebuild,
|
|
||||||
rsyslog-8.16.0-r1.ebuild:
|
|
||||||
fix openssl and libressl slots
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
|
|
||||||
20 Apr 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Update postgresql-base -> postgresql
|
|
||||||
|
|
||||||
*rsyslog-8.18.0 (26 Apr 2016)
|
|
||||||
|
|
||||||
26 Apr 2016; Ian Delaney <idella4@gentoo.org>
|
|
||||||
+files/8-stable/50-rsyslog-8.18.0-issue963.patch,
|
|
||||||
+files/8-stable/50-rsyslog-8.18.0-issue964.patch, metadata.xml,
|
|
||||||
+rsyslog-8.18.0.ebuild:
|
|
||||||
Bump to v8.18.0
|
|
||||||
|
|
||||||
Keyword for hppa dropped because of unkeyworded deps
|
|
||||||
Use flag grok p-use masked under:
|
|
||||||
- profiles/arch/arm/package.use.mask
|
|
||||||
- profiles/default/linux/uclibc/arm/package.use.mask
|
|
||||||
|
|
||||||
Gentoo-bug: #577508, #577008, #577510, #581180
|
|
||||||
Signed-off-by: Ian Delaney <idella4@gentoo.org>
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1348
|
|
||||||
Signed-off-by: Ian Delaney <idella4@gentoo.org>
|
|
||||||
|
|
||||||
03 May 2016; Lars Wendler <polynomial-c@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
Fix USE=doc
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/581722
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
|
|
||||||
18 May 2016; Austin English <wizardedit@gentoo.org>
|
|
||||||
files/8-stable/rsyslog.initd-r1:
|
|
||||||
use #!/sbin/openrc-run instead of #!/sbin/runscript
|
|
||||||
|
|
||||||
19 May 2016; Jeroen Roovers <jer@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
Mark ~hppa (bug #577008).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
23 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
bash syntax tidy
|
|
||||||
|
|
||||||
replace POSIX '[' with the bash '[[' in 8.18.0
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1511
|
|
||||||
|
|
||||||
Signed-off-by: Ian Delaney <idella4@gentoo.org>
|
|
||||||
|
|
||||||
23 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
use prune_libtool_files from eutils in 8.18.0
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1511
|
|
||||||
|
|
||||||
Signed-off-by: Ian Delaney <idella4@gentoo.org>
|
|
||||||
|
|
||||||
24 May 2016; Ian Delaney <idella4@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
Revert "app-admin/rsyslog: use prune_libtool_files from eutils in 8.18.0"
|
|
||||||
|
|
||||||
This reverts commit 663fd153682eb51e2a89e87b52d9a3f25f28f742.
|
|
||||||
Change to use of prune_libtool_files in src_install reverted from
|
|
||||||
advice form a qa team member
|
|
||||||
|
|
||||||
26 May 2016; Jeroen Roovers <jer@gentoo.org> rsyslog-8.16.0-r1.ebuild:
|
|
||||||
Stable for HPPA (bug #577494).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org> rsyslog-8.18.0.ebuild:
|
|
||||||
Adjust sub-SLOT dependency
|
|
||||||
|
|
||||||
This commit also re-apply changes from the previous reverted
|
|
||||||
commit 663fd153682eb51e2a89e87b52d9a3f25f28f742:
|
|
||||||
|
|
||||||
The ebuild inherits linux-info eclass which already inherit
|
|
||||||
eutils eclass so we can use prune_libtool_files helper.
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1659
|
|
||||||
|
|
||||||
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
|
|
||||||
|
|
||||||
*rsyslog-8.19.0 (12 Jun 2016)
|
|
||||||
|
|
||||||
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org> +rsyslog-8.19.0.ebuild:
|
|
||||||
Version bump to v8.19.0
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1659
|
|
||||||
|
|
||||||
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
|
|
||||||
|
|
||||||
12 Jun 2016; Patrice Clement <monsieurp@gentoo.org>
|
|
||||||
-files/8-stable/50-rsyslog-8.12.0-fix-re_extract.patch,
|
|
||||||
-files/8-stable/50-rsyslog-8.13.0-lookup-table-reload-bugfix.patch,
|
|
||||||
-rsyslog-8.13.0.ebuild:
|
|
||||||
Remove old
|
|
||||||
|
|
||||||
Package-Manager: portage-2.3.0_rc1
|
|
||||||
Closes: https://github.com/gentoo/gentoo/pull/1659
|
|
||||||
|
|
||||||
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
|
|
||||||
|
|
||||||
@ -1,704 +0,0 @@
|
|||||||
# ChangeLog for app-admin/rsyslog
|
|
||||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.140 2015/04/20 13:06:49 ultrabug Exp $
|
|
||||||
|
|
||||||
*rsyslog-8.9.0 (20 Apr 2015)
|
|
||||||
|
|
||||||
20 Apr 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.4.2.ebuild,
|
|
||||||
+rsyslog-8.9.0.ebuild, metadata.xml:
|
|
||||||
version bump fix #546822 thx to Thomas D., drop old
|
|
||||||
|
|
||||||
19 Apr 2015; Pacho Ramos <pacho@gentoo.org> rsyslog-8.7.0-r2.ebuild:
|
|
||||||
x86 stable wrt bug #536786
|
|
||||||
|
|
||||||
30 Mar 2015; Jeroen Roovers <jer@gentoo.org> rsyslog-8.7.0-r2.ebuild:
|
|
||||||
Stable for HPPA (bug #536786).
|
|
||||||
|
|
||||||
27 Mar 2015; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.7.0-r2.ebuild:
|
|
||||||
Stable for amd64, wrt bug #536786
|
|
||||||
|
|
||||||
27 Mar 2015; Ultrabug <ultrabug@gentoo.org> rsyslog-8.7.0-r2.ebuild,
|
|
||||||
+files/8-stable/50-rsyslog-add-option-to-disable-valgrind-usage-in-testbench.
|
|
||||||
patch:
|
|
||||||
disable failing valgrind test by Thomas D.
|
|
||||||
|
|
||||||
*rsyslog-8.7.0-r2 (26 Mar 2015)
|
|
||||||
|
|
||||||
26 Mar 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.6.0.ebuild,
|
|
||||||
-rsyslog-8.7.0-r1.ebuild, +rsyslog-8.7.0-r2.ebuild,
|
|
||||||
+files/8-stable/50-rsyslog-fix-size-based-legacy-config-statements.patch,
|
|
||||||
+files/8-stable/50-rsyslog-run-queue-persist-test-only-once.patch:
|
|
||||||
stability fixes thx to Thomas D., drop old
|
|
||||||
|
|
||||||
*rsyslog-8.7.0-r1 (23 Mar 2015)
|
|
||||||
|
|
||||||
23 Mar 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.7.0.ebuild,
|
|
||||||
+rsyslog-8.7.0-r1.ebuild:
|
|
||||||
fix some deps and doc building thx to Martin Dummer and Thomas D. fix #542330
|
|
||||||
|
|
||||||
*rsyslog-8.7.0 (23 Feb 2015)
|
|
||||||
|
|
||||||
23 Feb 2015; Ultrabug <ultrabug@gentoo.org> +rsyslog-8.7.0.ebuild:
|
|
||||||
version bump thx to Thomas D. fix #536784
|
|
||||||
|
|
||||||
23 Feb 2015; Ultrabug <ultrabug@gentoo.org> rsyslog-8.6.0.ebuild:
|
|
||||||
fix #533020
|
|
||||||
|
|
||||||
28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> rsyslog-8.4.2.ebuild,
|
|
||||||
rsyslog-8.6.0.ebuild:
|
|
||||||
Rename virtual/postgresql to dev-db/postgresql
|
|
||||||
|
|
||||||
*rsyslog-8.6.0 (16 Dec 2014)
|
|
||||||
|
|
||||||
16 Dec 2014; Ultrabug <ultrabug@gentoo.org> +rsyslog-8.6.0.ebuild,
|
|
||||||
+files/8-stable/10-respect_CFLAGS-r1.patch:
|
|
||||||
version bump wrt #532400 by Thomas D.
|
|
||||||
|
|
||||||
03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> rsyslog-8.4.2.ebuild:
|
|
||||||
Update PostgreSQL dependencies and/or checks to virtual/postgresql.
|
|
||||||
|
|
||||||
17 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> -rsyslog-7.4.4.ebuild,
|
|
||||||
-rsyslog-8.4.1.ebuild, -files/7-stable/50-default.conf,
|
|
||||||
-files/7-stable/rsyslog.conf,
|
|
||||||
-files/7-stable/rsyslog-7.4.3-fix-runtime.patch,
|
|
||||||
-files/7-stable/README.gentoo, -files/7-stable/rsyslog.confd,
|
|
||||||
-files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch,
|
|
||||||
-files/7-stable/bugfix_52.patch, -files/7-stable/rsyslog.confd-r1,
|
|
||||||
-files/7-stable/rsyslog-7.x-mmjsonparse.patch,
|
|
||||||
-files/7-stable/bugfix_73.patch,
|
|
||||||
-files/7-stable/fix-omruleset-default-value.patch,
|
|
||||||
-files/7-stable/rsyslog.initd, -files/7-stable/rsyslog.initd-r1,
|
|
||||||
-files/7-stable/rsyslog.logrotate, -files/7-stable/rsyslog.logrotate-r1,
|
|
||||||
-files/7-stable/rsyslog-gentoo.conf, metadata.xml:
|
|
||||||
Removed old vulnerable versions.
|
|
||||||
|
|
||||||
16 Oct 2014; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.4.1.ebuild:
|
|
||||||
Stable for x86, wrt bug #524058
|
|
||||||
|
|
||||||
16 Oct 2014; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.4.1.ebuild:
|
|
||||||
Stable for amd64, wrt bug #524058
|
|
||||||
|
|
||||||
05 Oct 2014; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.4.2.ebuild:
|
|
||||||
Stable for x86, wrt bug #524290
|
|
||||||
|
|
||||||
05 Oct 2014; Agostino Sarubbo <ago@gentoo.org> rsyslog-8.4.2.ebuild:
|
|
||||||
Stable for amd64, wrt bug #524290
|
|
||||||
|
|
||||||
02 Oct 2014; Jeroen Roovers <jer@gentoo.org> rsyslog-8.4.2.ebuild:
|
|
||||||
Stable for HPPA (bug #524290).
|
|
||||||
|
|
||||||
*rsyslog-8.4.2 (02 Oct 2014)
|
|
||||||
|
|
||||||
02 Oct 2014; Lars Wendler <polynomial-c@gentoo.org> +rsyslog-8.4.2.ebuild,
|
|
||||||
+files/8-stable/10-respect_CFLAGS.patch:
|
|
||||||
Security bump (bug 524290). Remote syslog PRI vulnerability (CVE-2014-3683).
|
|
||||||
|
|
||||||
01 Oct 2014; Jeroen Roovers <jer@gentoo.org> rsyslog-8.4.1.ebuild:
|
|
||||||
Stable for HPPA (bug #524058).
|
|
||||||
|
|
||||||
*rsyslog-8.4.1 (30 Sep 2014)
|
|
||||||
|
|
||||||
30 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -rsyslog-7.2.7.ebuild,
|
|
||||||
-rsyslog-7.4.10.ebuild, -rsyslog-7.6.3-r1.ebuild, +rsyslog-8.4.1.ebuild,
|
|
||||||
-files/6-stable/rsyslog-6.6.0-fix-runtime.patch,
|
|
||||||
+files/8-stable/README.gentoo, +files/8-stable/rsyslog.confd,
|
|
||||||
-files/rsyslog-7.2.5-json-c-pkgconfig.patch, +files/8-stable/50-default.conf,
|
|
||||||
+files/8-stable/rsyslog.conf, +files/8-stable/rsyslog.initd,
|
|
||||||
+files/8-stable/rsyslog.logrotate, metadata.xml:
|
|
||||||
Security bump (bug #524058). Removed old. Remote syslog PRI vulnerability
|
|
||||||
(CVE-2014-3634).
|
|
||||||
|
|
||||||
20 Aug 2014; Jeroen Roovers <jer@gentoo.org> metadata.xml:
|
|
||||||
Add proxy-maint herd.
|
|
||||||
|
|
||||||
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)
|
|
||||||
|
|
||||||
16 Jun 2014; Mike Frysinger <vapier@gentoo.org>
|
|
||||||
+files/7-stable/rsyslog-imuxsock-shrink.patch, +rsyslog-7.6.3-r2.ebuild:
|
|
||||||
Shrink the imuxsock plugin by removing redundant symbols.
|
|
||||||
|
|
||||||
16 Jun 2014; Mike Frysinger <vapier@gentoo.org>
|
|
||||||
files/7-stable/rsyslog.initd-r1, files/7-stable/rsyslog.logrotate,
|
|
||||||
files/7-stable/rsyslog.logrotate-r1:
|
|
||||||
Fix bashisms in /dev/null redirection.
|
|
||||||
|
|
||||||
16 Jun 2014; Mike Frysinger <vapier@gentoo.org> rsyslog-7.6.3-r1.ebuild:
|
|
||||||
Add arm love #511026.
|
|
||||||
|
|
||||||
*rsyslog-7.6.3-r1 (02 Jun 2014)
|
|
||||||
|
|
||||||
02 Jun 2014; Ultrabug <ultrabug@gentoo.org> -rsyslog-7.6.3.ebuild,
|
|
||||||
+rsyslog-7.6.3-r1.ebuild, files/7-stable/rsyslog.initd-r1:
|
|
||||||
fix #511748 thx to consus
|
|
||||||
|
|
||||||
22 May 2014; Jeroen Roovers <jer@gentoo.org> rsyslog-7.6.3.ebuild:
|
|
||||||
Marked ~hppa (bug #511026).
|
|
||||||
|
|
||||||
*rsyslog-7.6.3 (22 May 2014)
|
|
||||||
|
|
||||||
22 May 2014; Ultrabug <ultrabug@gentoo.org> -rsyslog-7.4.3.ebuild,
|
|
||||||
-rsyslog-7.4.6.ebuild, -rsyslog-7.4.7.ebuild, +rsyslog-7.6.3.ebuild,
|
|
||||||
+files/7-stable/50-default.conf, +files/7-stable/README.gentoo,
|
|
||||||
+files/7-stable/bugfix_52.patch, +files/7-stable/bugfix_73.patch,
|
|
||||||
+files/7-stable/fix-omruleset-default-value.patch,
|
|
||||||
+files/7-stable/rsyslog.conf, +files/7-stable/rsyslog.confd-r1,
|
|
||||||
+files/7-stable/rsyslog.initd-r1, +files/7-stable/rsyslog.logrotate-r1,
|
|
||||||
metadata.xml:
|
|
||||||
version bump fix #501988 #501982 #501986 #490744 thx to @Whissi, drop old
|
|
||||||
versions
|
|
||||||
|
|
||||||
16 Apr 2014; Maxim Koltsov <maksbotan@gentoo.org>
|
|
||||||
+files/7-stable/rsyslog-7.x-mmjsonparse.patch, rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.10.ebuild, rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild,
|
|
||||||
rsyslog-7.4.6.ebuild, rsyslog-7.4.7.ebuild:
|
|
||||||
Add upstream patch for >=dev-libs/json-c-0.12, bug #507730. Thanks to Thomas
|
|
||||||
D. <whissi@whissi.de>.
|
|
||||||
|
|
||||||
*rsyslog-7.4.10 (10 Mar 2014)
|
|
||||||
|
|
||||||
10 Mar 2014; Ultrabug <ultrabug@gentoo.org> +rsyslog-7.4.10.ebuild,
|
|
||||||
metadata.xml:
|
|
||||||
version bump fix #501978 thx to Thomas D., add Thomas D. as proxy-maintainer
|
|
||||||
|
|
||||||
01 Mar 2014; Michał Górny <mgorny@gentoo.org> rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild,
|
|
||||||
rsyslog-7.4.7.ebuild:
|
|
||||||
Update libgcrypt dep to use slot :0.
|
|
||||||
|
|
||||||
31 Dec 2013; Markus Meier <maekke@gentoo.org> rsyslog-7.4.7.ebuild:
|
|
||||||
add ~arm, bug #495230
|
|
||||||
|
|
||||||
25 Dec 2013; Jeroen Roovers <jer@gentoo.org> rsyslog-7.4.7.ebuild:
|
|
||||||
Marked ~hppa (bug #495230).
|
|
||||||
|
|
||||||
*rsyslog-7.4.7 (24 Dec 2013)
|
|
||||||
|
|
||||||
24 Dec 2013; Ultrabug <ultrabug@gentoo.org> rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild,
|
|
||||||
+rsyslog-7.4.7.ebuild, metadata.xml:
|
|
||||||
Fix #490992, #494150 thx to Marcin Mirosław & Andrey Volkov. Fix #492442,
|
|
||||||
#494532 using slot operators thx to Thomas D. Add mongodb to IUSE fix #494268
|
|
||||||
thx to Vadim Kuznetsov. Version bump.
|
|
||||||
|
|
||||||
24 Dec 2013; Ultrabug <ultrabug@gentoo.org> rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild:
|
|
||||||
fix #495198 wrt zeromq dependencies thx to Allen Parker
|
|
||||||
|
|
||||||
19 Nov 2013; Jeroen Roovers <jer@gentoo.org> rsyslog-7.4.4.ebuild:
|
|
||||||
Stable for HPPA (bug #475882).
|
|
||||||
|
|
||||||
18 Nov 2013; Ultrabug <ultrabug@gentoo.org> rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild, rsyslog-7.4.6.ebuild:
|
|
||||||
drop curl dependency, fix #485414 thx to Andrey Volkov
|
|
||||||
|
|
||||||
09 Nov 2013; Agostino Sarubbo <ago@gentoo.org> rsyslog-7.4.4.ebuild:
|
|
||||||
Stable for x86, wrt bug #475882
|
|
||||||
|
|
||||||
09 Nov 2013; Agostino Sarubbo <ago@gentoo.org> rsyslog-7.4.4.ebuild:
|
|
||||||
Stable for amd64, wrt bug #475882
|
|
||||||
|
|
||||||
*rsyslog-7.4.6 (08 Nov 2013)
|
|
||||||
|
|
||||||
08 Nov 2013; Ultrabug <ultrabug@gentoo.org> +rsyslog-7.4.6.ebuild:
|
|
||||||
version bump, fix #490469
|
|
||||||
|
|
||||||
11 Sep 2013; Michał Górny <mgorny@gentoo.org> rsyslog-7.2.7.ebuild,
|
|
||||||
rsyslog-7.4.3.ebuild, rsyslog-7.4.4.ebuild:
|
|
||||||
systemd_to_myeconfargs is deprecated, use systemd_with_unitdir instead.
|
|
||||||
|
|
||||||
*rsyslog-7.4.4 (10 Sep 2013)
|
|
||||||
|
|
||||||
10 Sep 2013; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.11.ebuild,
|
|
||||||
-rsyslog-5.8.12.ebuild, -rsyslog-5.10.1.ebuild, -rsyslog-6.6.0.ebuild,
|
|
||||||
+rsyslog-7.4.4.ebuild, -files/5-stable/rsyslog.confd,
|
|
||||||
-files/5-stable/rsyslog.initd, -files/5-stable/rsyslog.logrotate,
|
|
||||||
-files/5-stable/rsyslog-gentoo.conf, -files/6-stable/rsyslog.confd,
|
|
||||||
-files/6-stable/rsyslog.initd, -files/6-stable/rsyslog.logrotate,
|
|
||||||
-files/6-stable/rsyslog-gentoo.conf, -files/6-stable/rsyslog6-zeromq.patch:
|
|
||||||
Version bump, fix #467338, work on #442706 for systemd support, drop old and
|
|
||||||
unsupported versions, cleanup
|
|
||||||
|
|
||||||
16 Aug 2013; Ultrabug <ultrabug@gentoo.org> rsyslog-7.4.3.ebuild:
|
|
||||||
fix #480894 thx to Conway S. Smith
|
|
||||||
|
|
||||||
*rsyslog-7.4.3 (29 Jul 2013)
|
|
||||||
|
|
||||||
29 Jul 2013; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.5.ebuild,
|
|
||||||
-rsyslog-6.2.2.ebuild, -rsyslog-7.2.2-r1.ebuild, -rsyslog-7.2.5.ebuild,
|
|
||||||
+rsyslog-7.4.3.ebuild, +files/7-stable/rsyslog-7.4.3-fix-runtime.patch,
|
|
||||||
+files/7-stable/rsyslog-7.4.3-json-c-pkgconfig.patch:
|
|
||||||
Version bump fix #472484, drop old fix #454564
|
|
||||||
|
|
||||||
27 Jun 2013; Agostino Sarubbo <ago@gentoo.org> rsyslog-7.2.7.ebuild:
|
|
||||||
Stable for x86, wrt bug #472564
|
|
||||||
|
|
||||||
27 Jun 2013; Agostino Sarubbo <ago@gentoo.org> rsyslog-7.2.7.ebuild:
|
|
||||||
Stable for amd64, wrt bug #472564
|
|
||||||
|
|
||||||
08 Jun 2013; Jeroen Roovers <jer@gentoo.org> rsyslog-7.2.7.ebuild:
|
|
||||||
Stable for HPPA (bug #472564).
|
|
||||||
|
|
||||||
05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
|
|
||||||
Add upstream CPE tag (security info) from ChromiumOS.
|
|
||||||
|
|
||||||
28 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
|
|
||||||
files/rsyslog-7.2.5-json-c-pkgconfig.patch:
|
|
||||||
Detect new json-c-0.11. Patch from Thomas D. <whissi@whissi.de>. Fixes bug
|
|
||||||
#467338
|
|
||||||
|
|
||||||
*rsyslog-7.2.7 (18 Apr 2013)
|
|
||||||
|
|
||||||
18 Apr 2013; Ultrabug <ultrabug@gentoo.org> files/7-stable/rsyslog.logrotate,
|
|
||||||
+rsyslog-7.2.7.ebuild:
|
|
||||||
fix logrotate for systemd thx to Enrico Tagliavini and Dennis Lissov #399011,
|
|
||||||
version bump
|
|
||||||
|
|
||||||
12 Feb 2013; Justin Lecher <jlec@gentoo.org> rsyslog-7.2.5.ebuild,
|
|
||||||
+files/rsyslog-7.2.5-json-c-pkgconfig.patch, metadata.xml:
|
|
||||||
Correct buildsystem so that json-c will be detected correctly by pkg-config,
|
|
||||||
#454944
|
|
||||||
|
|
||||||
*rsyslog-7.2.5 (21 Jan 2013)
|
|
||||||
|
|
||||||
21 Jan 2013; Ultrabug <ultrabug@gentoo.org> +rsyslog-7.2.5.ebuild:
|
|
||||||
Version bump fix #451684
|
|
||||||
|
|
||||||
*rsyslog-7.2.2-r1 (27 Nov 2012)
|
|
||||||
|
|
||||||
27 Nov 2012; Ultrabug <ultrabug@gentoo.org> files/7-stable/rsyslog.logrotate,
|
|
||||||
-rsyslog-7.2.2.ebuild, +rsyslog-7.2.2-r1.ebuild:
|
|
||||||
Fix #444774 logrotate script thx to Robin Hill, fix #444754 curl dep thx to
|
|
||||||
Didier Cardoso
|
|
||||||
|
|
||||||
23 Nov 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-6.6.0.ebuild,
|
|
||||||
rsyslog-7.2.2.ebuild:
|
|
||||||
Fix dev-libs/librelp DEP thx to Robin Hill, fix #444139
|
|
||||||
|
|
||||||
20 Nov 2012; Ultrabug <ultrabug@gentoo.org> files/7-stable/rsyslog.logrotate:
|
|
||||||
fix v7 logrotate script
|
|
||||||
|
|
||||||
*rsyslog-7.2.2 (20 Nov 2012)
|
|
||||||
*rsyslog-6.6.0 (20 Nov 2012)
|
|
||||||
*rsyslog-5.10.1 (20 Nov 2012)
|
|
||||||
|
|
||||||
20 Nov 2012; Ultrabug <ultrabug@gentoo.org>
|
|
||||||
+files/6-stable/rsyslog-6.6.0-fix-runtime.patch,
|
|
||||||
+files/7-stable/rsyslog.confd, +files/7-stable/rsyslog.initd,
|
|
||||||
+files/7-stable/rsyslog.logrotate, +files/7-stable/rsyslog-gentoo.conf,
|
|
||||||
+rsyslog-5.10.1.ebuild, +rsyslog-6.6.0.ebuild, +rsyslog-7.2.2.ebuild:
|
|
||||||
Version bump, new 7-stable branch, fix #433595
|
|
||||||
|
|
||||||
29 Oct 2012; Tiziano Müller <dev-zero@gentoo.org> metadata.xml:
|
|
||||||
Removed myself as co-maintainer.
|
|
||||||
|
|
||||||
24 Aug 2012; Ultrabug <ultrabug@gentoo.org> files/5-stable/rsyslog.initd,
|
|
||||||
files/6-stable/rsyslog.initd, -rsyslog-6.2.1.ebuild:
|
|
||||||
Fix init scripts #432548 thx to zunkree. Drop old.
|
|
||||||
|
|
||||||
19 Aug 2012; Raúl Porcel <armin76@gentoo.org> rsyslog-5.8.5.ebuild,
|
|
||||||
rsyslog-5.8.11.ebuild, rsyslog-5.8.12.ebuild:
|
|
||||||
Drop sparc keywords
|
|
||||||
|
|
||||||
23 Jul 2012; Markus Meier <maekke@gentoo.org> rsyslog-6.2.2.ebuild:
|
|
||||||
add ~arm, bug #425526
|
|
||||||
|
|
||||||
12 Jul 2012; Jeroen Roovers <jer@gentoo.org> rsyslog-6.2.2.ebuild:
|
|
||||||
Marked ~hppa (bug #425526).
|
|
||||||
|
|
||||||
09 Jul 2012; Jeroen Roovers <jer@gentoo.org> rsyslog-5.8.11.ebuild:
|
|
||||||
Stable for HPPA (bug #424767).
|
|
||||||
|
|
||||||
05 Jul 2012; Agostino Sarubbo <ago@gentoo.org> rsyslog-5.8.11.ebuild:
|
|
||||||
Stable for amd64, wrt bug #424767
|
|
||||||
|
|
||||||
04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.11.ebuild:
|
|
||||||
marked x86 per bug 424767
|
|
||||||
|
|
||||||
*rsyslog-5.8.12 (04 Jul 2012)
|
|
||||||
|
|
||||||
04 Jul 2012; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.12.ebuild:
|
|
||||||
v5 branch version bump
|
|
||||||
|
|
||||||
*rsyslog-6.2.2 (15 Jun 2012)
|
|
||||||
|
|
||||||
15 Jun 2012; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.8.ebuild,
|
|
||||||
+rsyslog-6.2.2.ebuild:
|
|
||||||
Version bump fix #420999. Drop old.
|
|
||||||
|
|
||||||
02 Jun 2012; Justin Lecher <jlec@gentoo.org> rsyslog-5.8.5.ebuild,
|
|
||||||
rsyslog-5.8.8.ebuild, rsyslog-5.8.11.ebuild, rsyslog-6.2.1.ebuild:
|
|
||||||
Don't run eautoreconf twice
|
|
||||||
|
|
||||||
*rsyslog-6.2.1 (01 Jun 2012)
|
|
||||||
|
|
||||||
01 Jun 2012; Ultrabug <ultrabug@gentoo.org> +files/6-stable/rsyslog.confd,
|
|
||||||
+files/6-stable/rsyslog.initd, +files/6-stable/rsyslog.logrotate,
|
|
||||||
+files/6-stable/rsyslog-gentoo.conf, +files/6-stable/rsyslog6-zeromq.patch,
|
|
||||||
+rsyslog-6.2.1.ebuild:
|
|
||||||
New stable v6 branch bump, fix #398269.
|
|
||||||
|
|
||||||
31 May 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.11.ebuild,
|
|
||||||
rsyslog-5.8.5.ebuild, rsyslog-5.8.8.ebuild:
|
|
||||||
Fix autotools-utils usage wrt #407811 thanks to vapier and mgorny.
|
|
||||||
|
|
||||||
30 May 2012; Zac Medico <zmedico@gentoo.org> rsyslog-5.8.11.ebuild,
|
|
||||||
rsyslog-5.8.5.ebuild, rsyslog-5.8.8.ebuild:
|
|
||||||
Inherit eutils for epatch.
|
|
||||||
|
|
||||||
*rsyslog-5.8.11 (22 May 2012)
|
|
||||||
|
|
||||||
22 May 2012; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild,
|
|
||||||
-rsyslog-5.8.6.ebuild, -rsyslog-5.8.7.ebuild, rsyslog-5.8.8.ebuild,
|
|
||||||
+rsyslog-5.8.11.ebuild:
|
|
||||||
Version bump, fix #408745 thx to Opportunist. Fix ssl/gnutls dependencies wrt
|
|
||||||
#410241 thx to Conrad. Drop old versions.
|
|
||||||
|
|
||||||
10 May 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.8.ebuild:
|
|
||||||
dev-util/pkgconfig -> virtual/pkgconfig
|
|
||||||
|
|
||||||
*rsyslog-5.8.8 (07 May 2012)
|
|
||||||
|
|
||||||
07 May 2012; Justin Lecher <jlec@gentoo.org> +rsyslog-5.8.8.ebuild:
|
|
||||||
Non-maintainer Version Bump, Correct indention of _EOF
|
|
||||||
|
|
||||||
03 May 2012; Jeff Horelick <jdhore@gentoo.org> rsyslog-5.8.5.ebuild,
|
|
||||||
rsyslog-5.8.6.ebuild, rsyslog-5.8.7.ebuild:
|
|
||||||
dev-util/pkgconfig -> virtual/pkgconfig
|
|
||||||
|
|
||||||
*rsyslog-5.8.7 (14 Feb 2012)
|
|
||||||
|
|
||||||
14 Feb 2012; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.7.ebuild:
|
|
||||||
Version bump
|
|
||||||
|
|
||||||
24 Jan 2012; Justin Lecher <jlec@gentoo.org> rsyslog-5.8.6.ebuild:
|
|
||||||
exchange last gnutls to ssl
|
|
||||||
|
|
||||||
16 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org>
|
|
||||||
files/5-stable/rsyslog.initd, rsyslog-5.8.6.ebuild:
|
|
||||||
Fix initscript to not use deprecated opts. Use ssl useflag not gnutls for ssl
|
|
||||||
support as ssl should enable the ssl support and gnutls/openssl respective
|
|
||||||
features if multiple backends are available.
|
|
||||||
|
|
||||||
*rsyslog-5.8.6 (28 Dec 2011)
|
|
||||||
|
|
||||||
28 Dec 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.6.ebuild:
|
|
||||||
Version bump.
|
|
||||||
|
|
||||||
13 Sep 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.5.ebuild,
|
|
||||||
-rsyslog-5.8.3.ebuild:
|
|
||||||
Drop old vulnerable versions wrt #381637
|
|
||||||
|
|
||||||
11 Sep 2011; Markus Meier <maekke@gentoo.org> rsyslog-5.8.5.ebuild:
|
|
||||||
x86 stable, bug #381637
|
|
||||||
|
|
||||||
09 Sep 2011; Tim Harder <radhermit@gentoo.org> rsyslog-5.6.5.ebuild,
|
|
||||||
rsyslog-5.8.3.ebuild, rsyslog-5.8.5.ebuild:
|
|
||||||
Add build dependency on pkgconfig (bug #349924 by matsuu).
|
|
||||||
|
|
||||||
09 Sep 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.8.5.ebuild:
|
|
||||||
Stable for HPPA (bug #381637).
|
|
||||||
|
|
||||||
05 Sep 2011; Tony Vroon <chainsaw@gentoo.org> rsyslog-5.8.5.ebuild:
|
|
||||||
Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo in bug
|
|
||||||
#381637.
|
|
||||||
|
|
||||||
05 Sep 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild:
|
|
||||||
Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Thanks
|
|
||||||
to Agostino Sarubbo.
|
|
||||||
|
|
||||||
05 Sep 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.8.5.ebuild:
|
|
||||||
Multiple ebuild fixes : #381909, #381907, #381905, #381901, #381903. Thanks
|
|
||||||
to Agostino Sarubbo.
|
|
||||||
|
|
||||||
*rsyslog-5.8.5 (05 Sep 2011)
|
|
||||||
|
|
||||||
05 Sep 2011; Ultrabug <ultrabug@gentoo.org> files/5-stable/rsyslog.initd,
|
|
||||||
-rsyslog-5.8.1.ebuild, +rsyslog-5.8.5.ebuild, metadata.xml:
|
|
||||||
Init script handles baselayout 1 & 2, fix #373913 thanks to Martin Dummer for
|
|
||||||
reporting. Version bump wrt #381637 and drop old vulnerable version. Add
|
|
||||||
optional zeromq support to rsyslog.
|
|
||||||
|
|
||||||
*rsyslog-5.8.3 (03 Aug 2011)
|
|
||||||
|
|
||||||
03 Aug 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.8.3.ebuild:
|
|
||||||
Version bump.
|
|
||||||
|
|
||||||
*rsyslog-5.8.1 (23 May 2011)
|
|
||||||
|
|
||||||
23 May 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.0-r1.ebuild,
|
|
||||||
+rsyslog-5.8.1.ebuild:
|
|
||||||
Version bump, drop previous bugged 5.8.x version. Thanks to Opportunist for
|
|
||||||
spotting, fix #368193.
|
|
||||||
|
|
||||||
*rsyslog-5.8.0-r1 (16 May 2011)
|
|
||||||
|
|
||||||
16 May 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.8.0.ebuild,
|
|
||||||
+rsyslog-5.8.0-r1.ebuild:
|
|
||||||
EAPI4 and use of systemd eclass, fix #366179.
|
|
||||||
|
|
||||||
16 May 2011; Ultrabug <ultrabug@gentoo.org> -files/3-stable/rsyslog.conf,
|
|
||||||
-files/3-stable/rsyslog.init, -files/3-stable/rsyslog.logrotate,
|
|
||||||
-rsyslog-3.22.0.ebuild, -files/3-stable/rsyslog-gentoo.conf,
|
|
||||||
-rsyslog-3.22.1.ebuild, -rsyslog-5.6.4.ebuild:
|
|
||||||
Remove obsolete v3 branch. Drop old wrt #361219.
|
|
||||||
|
|
||||||
13 May 2011; Markos Chandras <hwoarang@gentoo.org> rsyslog-5.6.5.ebuild:
|
|
||||||
Stable on amd64 wrt bug #361219
|
|
||||||
|
|
||||||
13 May 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.6.5.ebuild:
|
|
||||||
Stable for HPPA (bug #361219).
|
|
||||||
|
|
||||||
13 May 2011; Thomas Kahle <tomka@gentoo.org> rsyslog-5.6.5.ebuild:
|
|
||||||
x86 stable per bug 361219
|
|
||||||
|
|
||||||
26 Apr 2011; Jeroen Roovers <jer@gentoo.org> rsyslog-5.6.4.ebuild:
|
|
||||||
Stable for HPPA (bug #359765).
|
|
||||||
|
|
||||||
*rsyslog-5.8.0 (26 Apr 2011)
|
|
||||||
|
|
||||||
26 Apr 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-3.20.4.ebuild,
|
|
||||||
+rsyslog-5.8.0.ebuild:
|
|
||||||
version bump wrt #364145. Drop old stable. Thanks to Opportunist for
|
|
||||||
reporting.
|
|
||||||
|
|
||||||
19 Apr 2011; Thomas Kahle <tomka@gentoo.org> rsyslog-5.6.4.ebuild:
|
|
||||||
x86 stable per bug 359765
|
|
||||||
|
|
||||||
16 Apr 2011; Christoph Mende <angelos@gentoo.org> rsyslog-5.6.4.ebuild:
|
|
||||||
Stable on amd64 wrt bug #359765
|
|
||||||
|
|
||||||
07 Apr 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-3.20.4.ebuild,
|
|
||||||
rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild, rsyslog-5.6.4.ebuild,
|
|
||||||
rsyslog-5.6.5.ebuild:
|
|
||||||
migrate ebuilds to new-style virtual, wrt #358881
|
|
||||||
|
|
||||||
30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
|
|
||||||
Drop logrotate useflag description too.
|
|
||||||
|
|
||||||
30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> rsyslog-5.6.4.ebuild,
|
|
||||||
rsyslog-5.6.5.ebuild:
|
|
||||||
Drop logrotate useflag. Fixes bug #344175.
|
|
||||||
|
|
||||||
25 Mar 2011; Ultrabug <ultrabug@gentoo.org> rsyslog-5.6.5.ebuild:
|
|
||||||
add back virtual/logger provider waiting for migration (#358881)
|
|
||||||
|
|
||||||
*rsyslog-5.6.5 (24 Mar 2011)
|
|
||||||
|
|
||||||
24 Mar 2011; Ultrabug <ultrabug@gentoo.org> +rsyslog-5.6.5.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
*rsyslog-5.6.4 (04 Mar 2011)
|
|
||||||
|
|
||||||
04 Mar 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.3.ebuild,
|
|
||||||
+rsyslog-5.6.4.ebuild:
|
|
||||||
version bump. drop old.
|
|
||||||
|
|
||||||
*rsyslog-5.6.3 (07 Feb 2011)
|
|
||||||
|
|
||||||
07 Feb 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.6.2.ebuild,
|
|
||||||
+rsyslog-5.6.3.ebuild:
|
|
||||||
Version bump, drop old
|
|
||||||
|
|
||||||
*rsyslog-5.6.2 (10 Jan 2011)
|
|
||||||
|
|
||||||
10 Jan 2011; Ultrabug <ultrabug@gentoo.org> -rsyslog-5.4.0.ebuild,
|
|
||||||
+rsyslog-5.6.2.ebuild, metadata.xml:
|
|
||||||
Version bump. Fixes bug #343085. Maintainer bump. Thanks to Opportunist and
|
|
||||||
Nebojsa Trpkovic for their help.
|
|
||||||
|
|
||||||
29 Oct 2010; Markus Meier <maekke@gentoo.org> rsyslog-5.4.0.ebuild:
|
|
||||||
readd ~arm, bug #341965
|
|
||||||
|
|
||||||
*rsyslog-5.4.0 (21 Oct 2010)
|
|
||||||
|
|
||||||
21 Oct 2010; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
-files/3-devel/rsyslog.conf, -files/3-devel/rsyslog.init,
|
|
||||||
-files/3-devel/rsyslog.logrotate, -files/3-devel/rsyslog-gentoo.conf,
|
|
||||||
+files/5-stable/rsyslog.confd, +files/5-stable/rsyslog.initd,
|
|
||||||
+files/5-stable/rsyslog.logrotate, +files/5-stable/rsyslog-gentoo.conf,
|
|
||||||
+rsyslog-5.4.0.ebuild, metadata.xml:
|
|
||||||
Version bump (bug #292919), also solves bug #283416 and #339985. Thanks to
|
|
||||||
Ultrabug for the version bump and extensions/fixes and Mike Nerone for
|
|
||||||
testing.
|
|
||||||
|
|
||||||
17 Jun 2010; Patrick Lauer <patrick@gentoo.org> rsyslog-3.20.4.ebuild,
|
|
||||||
rsyslog-3.22.0.ebuild, rsyslog-3.22.1.ebuild:
|
|
||||||
Migrating away from deprecated postgres virtuals
|
|
||||||
|
|
||||||
15 Jan 2010; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.22.1.ebuild:
|
|
||||||
Keyworded ~sparc.
|
|
||||||
|
|
||||||
17 Oct 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
|
|
||||||
remove dbi description as it is global now
|
|
||||||
|
|
||||||
10 Oct 2009; Raúl Porcel <armin76@gentoo.org> rsyslog-3.22.1.ebuild:
|
|
||||||
Add ~arm
|
|
||||||
|
|
||||||
*rsyslog-3.22.1 (14 Aug 2009)
|
|
||||||
|
|
||||||
14 Aug 2009; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.22.1.ebuild:
|
|
||||||
Version bump (bug #281363).
|
|
||||||
|
|
||||||
26 Jul 2009; Thilo Bangert <bangert@gentoo.org> metadata.xml:
|
|
||||||
add <herd> tag
|
|
||||||
|
|
||||||
21 Jul 2009; <chainsaw@gentoo.org> rsyslog-3.22.0.ebuild:
|
|
||||||
Marked stable on AMD64 as requested by Arfrever Frehtes Taifersar Arahesis
|
|
||||||
<arfrever@gentoo.org> in bug #275700.
|
|
||||||
|
|
||||||
30 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
|
|
||||||
rsyslog-3.22.0.ebuild:
|
|
||||||
stable x86, bug 275700
|
|
||||||
|
|
||||||
29 Jun 2009; Jeroen Roovers <jer@gentoo.org> rsyslog-3.22.0.ebuild:
|
|
||||||
Stable for HPPA (bug #275700).
|
|
||||||
|
|
||||||
*rsyslog-3.22.0 (26 May 2009)
|
|
||||||
|
|
||||||
26 May 2009; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.20.2.ebuild,
|
|
||||||
-rsyslog-3.21.10.ebuild, +rsyslog-3.22.0.ebuild:
|
|
||||||
Version bump for stable branch. Dropped old stable-branch and obsolete
|
|
||||||
devel-branch ebuild.
|
|
||||||
|
|
||||||
15 Mar 2009; Markus Meier <maekke@gentoo.org> rsyslog-3.20.4.ebuild:
|
|
||||||
amd64/x86 stable, bug #254287
|
|
||||||
|
|
||||||
*rsyslog-3.21.10 (13 Feb 2009)
|
|
||||||
*rsyslog-3.20.4 (13 Feb 2009)
|
|
||||||
|
|
||||||
13 Feb 2009; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.20.4.ebuild,
|
|
||||||
-rsyslog-3.21.9.ebuild, +rsyslog-3.21.10.ebuild:
|
|
||||||
Version bump.
|
|
||||||
|
|
||||||
*rsyslog-3.21.9 (08 Dec 2008)
|
|
||||||
*rsyslog-3.20.2 (08 Dec 2008)
|
|
||||||
|
|
||||||
08 Dec 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.4.ebuild,
|
|
||||||
+rsyslog-3.20.2.ebuild, -rsyslog-3.21.6.ebuild, +rsyslog-3.21.9.ebuild:
|
|
||||||
Version bump for stable and beta branches, fixes security bug #249878
|
|
||||||
(thanks to Bruno Boss & Crag).
|
|
||||||
|
|
||||||
10 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.21.6.ebuild:
|
|
||||||
Disable building imdiag with USE=debug (bug #240550) since upstream
|
|
||||||
doesn't support it.
|
|
||||||
|
|
||||||
*rsyslog-3.21.6 (10 Nov 2008)
|
|
||||||
|
|
||||||
10 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.21.5.ebuild,
|
|
||||||
+rsyslog-3.21.6.ebuild:
|
|
||||||
Version bump (probably fixes bug #240550).
|
|
||||||
|
|
||||||
*rsyslog-3.21.5 (06 Oct 2008)
|
|
||||||
|
|
||||||
06 Oct 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.21.4.ebuild,
|
|
||||||
+rsyslog-3.21.5.ebuild:
|
|
||||||
Version bump for devel branch
|
|
||||||
|
|
||||||
*rsyslog-3.21.4 (29 Sep 2008)
|
|
||||||
*rsyslog-3.18.4 (29 Sep 2008)
|
|
||||||
|
|
||||||
29 Sep 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.3.ebuild,
|
|
||||||
+rsyslog-3.18.4.ebuild, -rsyslog-3.21.3.ebuild, +rsyslog-3.21.4.ebuild:
|
|
||||||
Version bump for stable and devel branch (changelog says we don't want
|
|
||||||
3.18.3 stable, so dropping it)
|
|
||||||
|
|
||||||
*rsyslog-3.21.3 (22 Aug 2008)
|
|
||||||
*rsyslog-3.18.3 (22 Aug 2008)
|
|
||||||
|
|
||||||
22 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.18.1.ebuild,
|
|
||||||
-rsyslog-3.18.2.ebuild, +rsyslog-3.18.3.ebuild, -rsyslog-3.21.2.ebuild,
|
|
||||||
+rsyslog-3.21.3.ebuild:
|
|
||||||
Version bump. Dropped buggy versions.
|
|
||||||
|
|
||||||
14 Aug 2008; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
files/3-devel/rsyslog.init, files/3-stable/rsyslog.init:
|
|
||||||
Added provide logger to init.d-scripts (thanks to Jon Gerdes, bug
|
|
||||||
#234640).
|
|
||||||
|
|
||||||
12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> rsyslog-3.21.2.ebuild:
|
|
||||||
Removed inherit autotools since unneeded
|
|
||||||
|
|
||||||
*rsyslog-3.21.2 (12 Aug 2008)
|
|
||||||
*rsyslog-3.18.2 (12 Aug 2008)
|
|
||||||
|
|
||||||
12 Aug 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.16.1.ebuild,
|
|
||||||
+rsyslog-3.18.2.ebuild, -rsyslog-3.21.1.ebuild, +rsyslog-3.21.2.ebuild:
|
|
||||||
Version bump for stable and unstable branch. Dropped old versions.
|
|
||||||
|
|
||||||
*rsyslog-3.21.1 (31 Jul 2008)
|
|
||||||
*rsyslog-3.18.1 (31 Jul 2008)
|
|
||||||
|
|
||||||
31 Jul 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.18.1.ebuild,
|
|
||||||
-rsyslog-3.19.7.ebuild, +rsyslog-3.21.1.ebuild:
|
|
||||||
Version bump for stable and unstable branch. Dropped old unstable.
|
|
||||||
|
|
||||||
25 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
|
|
||||||
add GLEP 56 USE flag desc from use.local.desc
|
|
||||||
|
|
||||||
16 Jun 2008; Jeroen Roovers <jer@gentoo.org> rsyslog-3.19.7.ebuild:
|
|
||||||
Marked ~hppa too.
|
|
||||||
|
|
||||||
*rsyslog-3.19.7 (12 Jun 2008)
|
|
||||||
|
|
||||||
12 Jun 2008; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.19.5.ebuild,
|
|
||||||
+rsyslog-3.19.7.ebuild:
|
|
||||||
Version bump for devel-branch
|
|
||||||
|
|
||||||
*rsyslog-3.19.5 (03 Jun 2008)
|
|
||||||
|
|
||||||
03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
-files/3.19.2-as_needed.patch, rsyslog-3.16.1.ebuild,
|
|
||||||
-rsyslog-3.19.2.ebuild, +rsyslog-3.19.5.ebuild:
|
|
||||||
Version bump for devel-branch (upstream included --as-needed patch and
|
|
||||||
fixed tight-loop bug). Added PROVIDES to satisfy virtual/logger.
|
|
||||||
|
|
||||||
*rsyslog-3.19.2 (19 May 2008)
|
|
||||||
*rsyslog-3.16.1 (19 May 2008)
|
|
||||||
|
|
||||||
19 May 2008; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
-files/3.14.1-implicit_declaration.patch, +files/3.19.2-as_needed.patch,
|
|
||||||
-rsyslog-3.14.1.ebuild, -rsyslog-3.16.0.ebuild, +rsyslog-3.16.1.ebuild,
|
|
||||||
-rsyslog-3.17.1.ebuild, +rsyslog-3.19.2.ebuild:
|
|
||||||
Version bump, cleaned up the old versions due to a couple of serious bugs.
|
|
||||||
Added GnuTLS USE flag for the devel-branch. Changed dependency for
|
|
||||||
postgresql to virtual/postgresql-base.
|
|
||||||
|
|
||||||
14 May 2008; Markus Meier <maekke@gentoo.org> rsyslog-3.16.0.ebuild,
|
|
||||||
rsyslog-3.17.1.ebuild:
|
|
||||||
add ~x86, bug #222081
|
|
||||||
|
|
||||||
*rsyslog-3.17.1 (25 Apr 2008)
|
|
||||||
*rsyslog-3.16.0 (25 Apr 2008)
|
|
||||||
|
|
||||||
25 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.16.0.ebuild,
|
|
||||||
-rsyslog-3.17.0.ebuild, +rsyslog-3.17.1.ebuild:
|
|
||||||
Version bump (both stable and testing branches).
|
|
||||||
|
|
||||||
*rsyslog-3.17.0 (09 Apr 2008)
|
|
||||||
*rsyslog-3.14.1 (09 Apr 2008)
|
|
||||||
|
|
||||||
09 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
-files/3.15/rsyslog.conf, -files/3.15/rsyslog.init,
|
|
||||||
-files/3.15/rsyslog.logrotate, -files/3.15/rsyslog-gentoo.conf,
|
|
||||||
+files/3-devel/rsyslog.conf, +files/3-devel/rsyslog.init,
|
|
||||||
+files/3-stable/rsyslog.conf, +files/3.14.1-implicit_declaration.patch,
|
|
||||||
+files/3-devel/rsyslog.logrotate, +files/3-devel/rsyslog-gentoo.conf,
|
|
||||||
+files/3-stable/rsyslog.init, +files/3-stable/rsyslog.logrotate,
|
|
||||||
+files/3-stable/rsyslog-gentoo.conf, +rsyslog-3.14.1.ebuild,
|
|
||||||
-rsyslog-3.15.0.ebuild, +rsyslog-3.17.0.ebuild:
|
|
||||||
Version bump. Added ebuild for stable branch (3.14.x). Reorganized
|
|
||||||
init.d/conf.d/logrotate files to have one set for the stable and one for
|
|
||||||
the devel branch. Is supposed to fix bug #216968.
|
|
||||||
|
|
||||||
*rsyslog-3.15.0 (07 Apr 2008)
|
|
||||||
|
|
||||||
07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
|
|
||||||
+files/3.15/rsyslog.conf, +files/3.15/rsyslog.init,
|
|
||||||
+files/3.15/rsyslog.logrotate, +files/3.15/rsyslog-gentoo.conf,
|
|
||||||
+metadata.xml, +rsyslog-3.15.0.ebuild:
|
|
||||||
Initial commit (ebuild written by me.)
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
DIST rsyslog-8.13.0.tar.gz 2077267 SHA256 b182bd0a7686bef093be570bfb850417191292522fb58e0ad32f2c824f754a33 SHA512 a3245e5b10ae96e6df981291f55a43fa9a8258db213e33a36d7b5a620ea7daaac04a1f93a56304105c4fd10e546f92789831f5b2188b418b4b3b248a4e7795c9 WHIRLPOOL 8473e2c272182d84c629175aafd185cfa6fcafad8a028fd212de118f2e9abf458e062c6065dc5ebb1df27e81546a37387944ad1b3f0d16a38ee25a409b51b1c7
|
|
||||||
DIST rsyslog-8.16.0.tar.gz 2132012 SHA256 4fe4f97c10899086d98b9401d7e8d2bcff61c7c3f7cde8627891e36fc6ec1b76 SHA512 e45acc16078d83937edd7e22f916fe050b62aa057ca4dd980823850f2195213c12db36f759c528b5fe6f1b061a61e2117fca6086245bc248392cc4e61b2383dc WHIRLPOOL 809035873565645cea5896fb19882239a0d70776ea0b948739440f7a28baf6df4bf4e958de7506d289355eadc26e1fba7e9cd8df315339f18f89acaecc462eaa
|
|
||||||
DIST rsyslog-8.18.0.tar.gz 2261731 SHA256 94346237ecfa22c9f78cebc3f18d59056f5d9846eb906c75beaa7e486f02c695 SHA512 6b159ba23100b4675576f5b247d2bf482bab0beaa071c26c692c99e50f202b0b272b7a64ba2b7c726390d663677b7a6d68666b06f73825e35605b13ae0930fc7 WHIRLPOOL 8efa5d7639b2c5978bdbbcf9837ca87d91a1ccf37dfa5b66e5aa05221d4a31ff57093eb5d604d036f3fd7cafb394f25eaf9302cf2143402d2a9255f4fc53b196
|
|
||||||
DIST rsyslog-8.19.0.tar.gz 2279714 SHA256 3379b30f2e6ef05a0f1c7327c73923fa5877a80b984506cdf48ed068c94a575e SHA512 77c40c9d76591ed3561ec76242be2c647848533df5599320ea988cbc200614c47930e0b63f190d31a0c1cec2443d57ca374f07e0909f11eba8a4bd4b8eee0e44 WHIRLPOOL 3f7d7134a0c6a475453828440a87d0fa68e7afc583ef12556f3b60f3e07621011b4f48e8c4dfbe46cef2bf2decee3827c42bd4ba481611e7cb76a695dcec5c7b
|
|
||||||
DIST rsyslog-doc-8.13.0.tar.gz 4147364 SHA256 3da9a1446686d1cfa82c123a610f2c30f4dc1cbfa608f44ded2baf168e86b67b SHA512 6676533b1e4884f18e583be19c5a50b8f12017ecc2c6860d54dcc72d64e7eafe20a2af3a22817226df123a7a193c7090097502f287455488dd8806b7aac0a5cd WHIRLPOOL 1231580f2bf8af42a7dd34f0a88315ff56324eb64d1259a281a5266fdbe7a472f596d66a5b6d1f5cbf19fdb6f76a2083753e0de224a07653454178128de4fead
|
|
||||||
DIST rsyslog-doc-8.16.0.tar.gz 4174347 SHA256 03033d264b29fd791299d5d618bd061853c008ac8087f3b6c4870e1b8f6abc39 SHA512 746e4de102f15ea10085ca21eeed74dd8264742ba7029cb54caf87b72070ab6a73e79af46d97717323be1e68d9d1fa78807d5d4446d15524aa4c565650f7b0d0 WHIRLPOOL ff8dfcc3dd7e87a7316f94a3b8f199cd902cbf99772bb97147b9af37b8c6941f13341438450b3dbf3139d5518488e74df6b77c1eec3182e92a9476ccb951ec5b
|
|
||||||
DIST rsyslog-docs-8.18.0.tar.gz 4269339 SHA256 8de82dece85a9a83d9c1feaf7fdfb883c2bfe5a82d84b846161bec0b9dba22c6 SHA512 c560f6a8c05f951d245b8bf96e3c58f9023761edf0e5e25b4a01dab934c1db8ad74baf7e90bd1139d3c6b5af396fca525a7818e87fcbf161317c21e005aae0b2 WHIRLPOOL 2d133a86d3a2abf5f4e3c57e0b65015ed3ad4770b4dfcd34420395fc11ab7d5752811afcb83a776bc51d665b75729bd76a0d94793d508e28aebeb815884dceff
|
|
||||||
DIST rsyslog-docs-8.19.0.tar.gz 4271094 SHA256 f76958d2fbcbb3a2db531ec3878d6d9a8c4a622e457b9c97b7c7dcca0ddd6512 SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e WHIRLPOOL fc0642eef4e686fc653db6a654f96fd9037e083a02e06d64b7b2a2e0292d745ca6e24821df3b9825e0eba2c4808b2755dfaeb90b62a49662ab22a171ffe2e63b
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
#######################
|
|
||||||
### DEFAULT ACTIONS ###
|
|
||||||
#######################
|
|
||||||
|
|
||||||
auth,authpriv.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/auth.log"
|
|
||||||
FileCreateMode="0600"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
Sync="off"
|
|
||||||
)
|
|
||||||
|
|
||||||
cron.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/cron.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
daemon.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/daemon.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
kern.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/kern.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
lpr.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/lpr.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
mail.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/mail.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
news.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/news.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
user.* action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/user.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
*.=debug;auth,authpriv,news,mail.none action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/debug.log"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
|
|
||||||
type="omfile"
|
|
||||||
File="/var/log/messages"
|
|
||||||
FileOwner="root"
|
|
||||||
FileGroup="adm"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Uncomment the following directive to re-enable the
|
|
||||||
# deprecated "/var/log/syslog" log file (don't forget to re-enable log
|
|
||||||
# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
|
|
||||||
#*.*;auth,authpriv.none action(
|
|
||||||
# type="omfile"
|
|
||||||
# File="/var/log/syslog"
|
|
||||||
# FileOwner="root"
|
|
||||||
# FileGroup="adm"
|
|
||||||
#)
|
|
||||||
|
|
||||||
*.emerg action(
|
|
||||||
type="omusrmsg"
|
|
||||||
Users="*"
|
|
||||||
action.execOnlyOnceEveryInterval="10"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Create an additional socket for the default chroot location
|
|
||||||
# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
|
|
||||||
input(type="imuxsock" Socket="/var/empty/dev/log")
|
|
||||||
@ -1,130 +0,0 @@
|
|||||||
From a88d67df6e55e0a5f484f6aff8aa6e9813c5c31a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Janmejay Singh <singh.janmejay@gmail.com>
|
|
||||||
Date: Mon, 28 Sep 2015 20:38:05 +0530
|
|
||||||
Subject: [PATCH] fixed re_extract bug, which fails the regex-compile for
|
|
||||||
extract as fn-init fails when fn does not have exactly 2 args
|
|
||||||
|
|
||||||
|
|
||||||
Fixes: https://github.com/rsyslog/rsyslog/issues/499
|
|
||||||
|
|
||||||
---
|
|
||||||
grammar/rainerscript.c | 2 +-
|
|
||||||
tests/Makefile.am | 6 ++++++
|
|
||||||
tests/rscript_re_extract.sh | 14 ++++++++++++++
|
|
||||||
tests/rscript_re_match.sh | 14 ++++++++++++++
|
|
||||||
tests/testsuites/rscript_re_extract.conf | 9 +++++++++
|
|
||||||
tests/testsuites/rscript_re_match.conf | 10 ++++++++++
|
|
||||||
6 files changed, 54 insertions(+), 1 deletion(-)
|
|
||||||
create mode 100755 tests/rscript_re_extract.sh
|
|
||||||
create mode 100755 tests/rscript_re_match.sh
|
|
||||||
create mode 100644 tests/testsuites/rscript_re_extract.conf
|
|
||||||
create mode 100644 tests/testsuites/rscript_re_match.conf
|
|
||||||
|
|
||||||
diff --git a/grammar/rainerscript.c b/grammar/rainerscript.c
|
|
||||||
index f02e1fe..17f785e 100644
|
|
||||||
--- a/grammar/rainerscript.c
|
|
||||||
+++ b/grammar/rainerscript.c
|
|
||||||
@@ -3747,7 +3747,7 @@ initFunc_re_match(struct cnffunc *func)
|
|
||||||
regex_t *re;
|
|
||||||
DEFiRet;
|
|
||||||
|
|
||||||
- if(func->nParams != 2) {
|
|
||||||
+ if(func->nParams < 2) {
|
|
||||||
parser_errmsg("rsyslog logic error in line %d of file %s\n",
|
|
||||||
__LINE__, __FILE__);
|
|
||||||
FINALIZE;
|
|
||||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
||||||
index 914d947..d77728a 100644
|
|
||||||
--- a/tests/Makefile.am
|
|
||||||
+++ b/tests/Makefile.am
|
|
||||||
@@ -120,6 +120,8 @@ TESTS += \
|
|
||||||
rscript_replace_complex.sh \
|
|
||||||
rscript_wrap2.sh \
|
|
||||||
rscript_wrap3.sh \
|
|
||||||
+ rscript_re_extract.sh \
|
|
||||||
+ rscript_re_match.sh \
|
|
||||||
rs_optimizer_pri.sh \
|
|
||||||
cee_simple.sh \
|
|
||||||
cee_diskqueue.sh \
|
|
||||||
@@ -854,6 +856,10 @@ EXTRA_DIST= \
|
|
||||||
testsuites/stop_when_array_has_element.conf \
|
|
||||||
key_dereference_on_uninitialized_variable_space.sh \
|
|
||||||
testsuites/key_dereference_on_uninitialized_variable_space.conf \
|
|
||||||
+ rscript_re_extract.sh \
|
|
||||||
+ testsuites/rscript_re_extract.conf \
|
|
||||||
+ rscript_re_match.sh \
|
|
||||||
+ testsuites/rscript_re_match.conf \
|
|
||||||
cfg.sh
|
|
||||||
|
|
||||||
# TODO: re-enable
|
|
||||||
diff --git a/tests/rscript_re_extract.sh b/tests/rscript_re_extract.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..930448c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/rscript_re_extract.sh
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+#!/bin/bash
|
|
||||||
+# added 2015-09-29 by singh.janmejay
|
|
||||||
+# This file is part of the rsyslog project, released under ASL 2.0
|
|
||||||
+echo ===============================================================================
|
|
||||||
+echo \[rscript_re_extract.sh\]: test re_extract rscript-fn
|
|
||||||
+. $srcdir/diag.sh init
|
|
||||||
+. $srcdir/diag.sh startup rscript_re_extract.conf
|
|
||||||
+. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg
|
|
||||||
+echo doing shutdown
|
|
||||||
+. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
+echo wait on shutdown
|
|
||||||
+. $srcdir/diag.sh wait-shutdown
|
|
||||||
+. $srcdir/diag.sh content-check "*Number is 19597*"
|
|
||||||
+. $srcdir/diag.sh exit
|
|
||||||
diff --git a/tests/rscript_re_match.sh b/tests/rscript_re_match.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..d2e212d
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/rscript_re_match.sh
|
|
||||||
@@ -0,0 +1,14 @@
|
|
||||||
+#!/bin/bash
|
|
||||||
+# added 2015-09-29 by singh.janmejay
|
|
||||||
+# This file is part of the rsyslog project, released under ASL 2.0
|
|
||||||
+echo ===============================================================================
|
|
||||||
+echo \[rscript_re_match.sh\]: test re_match rscript-fn
|
|
||||||
+. $srcdir/diag.sh init
|
|
||||||
+. $srcdir/diag.sh startup rscript_re_match.conf
|
|
||||||
+. $srcdir/diag.sh tcpflood -m 1 -I $srcdir/testsuites/date_time_msg
|
|
||||||
+echo doing shutdown
|
|
||||||
+. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
+echo wait on shutdown
|
|
||||||
+. $srcdir/diag.sh wait-shutdown
|
|
||||||
+. $srcdir/diag.sh content-check "*Matched*"
|
|
||||||
+. $srcdir/diag.sh exit
|
|
||||||
diff --git a/tests/testsuites/rscript_re_extract.conf b/tests/testsuites/rscript_re_extract.conf
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..6c71e53
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/testsuites/rscript_re_extract.conf
|
|
||||||
@@ -0,0 +1,9 @@
|
|
||||||
+$IncludeConfig diag-common.conf
|
|
||||||
+template(name="outfmt" type="string" string="*Number is %$.number%*\n")
|
|
||||||
+
|
|
||||||
+module(load="../plugins/imtcp/.libs/imtcp")
|
|
||||||
+input(type="imtcp" port="13514")
|
|
||||||
+
|
|
||||||
+set $.number = re_extract($msg, '.* ([0-9]+)$', 0, 1, 'none');
|
|
||||||
+
|
|
||||||
+action(type="omfile" file="./rsyslog.out.log" template="outfmt")
|
|
||||||
diff --git a/tests/testsuites/rscript_re_match.conf b/tests/testsuites/rscript_re_match.conf
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..3e0f36f
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/testsuites/rscript_re_match.conf
|
|
||||||
@@ -0,0 +1,10 @@
|
|
||||||
+$IncludeConfig diag-common.conf
|
|
||||||
+template(name="outfmt" type="string" string="*Matched*\n")
|
|
||||||
+
|
|
||||||
+module(load="../plugins/imtcp/.libs/imtcp")
|
|
||||||
+input(type="imtcp" port="13514")
|
|
||||||
+
|
|
||||||
+if (re_match($msg, '.* ([0-9]+)$')) then {
|
|
||||||
+ action(type="omfile" file="./rsyslog.out.log" template="outfmt")
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
@ -1,141 +0,0 @@
|
|||||||
From 3a10a78edeef9725f69a24d633bb394e365145f0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Janmejay Singh <singh.janmejay@gmail.com>
|
|
||||||
Date: Wed, 30 Sep 2015 17:24:38 +0530
|
|
||||||
Subject: [PATCH] Fixed lookup-table reload bug, which ignored table-length of
|
|
||||||
reloaded table, resulting in additional entries being invisible while
|
|
||||||
looking-up (binary-search would work with old-table-length). This would be a
|
|
||||||
security-issue or may cause a crash if reloaded table is actually smaller
|
|
||||||
(memory access beyond table).
|
|
||||||
|
|
||||||
---
|
|
||||||
runtime/lookup.c | 1 +
|
|
||||||
tests/Makefile.am | 5 +++++
|
|
||||||
tests/diag.sh | 4 ++++
|
|
||||||
tests/lookup_table.sh | 24 ++++++++++++++++++++++++
|
|
||||||
tests/testsuites/lookup_table.conf | 9 +++++++++
|
|
||||||
tests/testsuites/xlate.lkp_tbl | 5 +++++
|
|
||||||
tests/testsuites/xlate_more.lkp_tbl | 6 ++++++
|
|
||||||
7 files changed, 55 insertions(+)
|
|
||||||
create mode 100755 tests/lookup_table.sh
|
|
||||||
create mode 100644 tests/testsuites/lookup_table.conf
|
|
||||||
create mode 100644 tests/testsuites/xlate.lkp_tbl
|
|
||||||
create mode 100644 tests/testsuites/xlate_more.lkp_tbl
|
|
||||||
|
|
||||||
diff --git a/runtime/lookup.c b/runtime/lookup.c
|
|
||||||
index 096bf09..5aa00b9 100644
|
|
||||||
--- a/runtime/lookup.c
|
|
||||||
+++ b/runtime/lookup.c
|
|
||||||
@@ -203,6 +203,7 @@ lookupReload(lookup_t *pThis)
|
|
||||||
}
|
|
||||||
free(pThis->d.strtab);
|
|
||||||
pThis->d.strtab = newlu.d.strtab; /* hand table AND ALL STRINGS over! */
|
|
||||||
+ pThis->nmemb = newlu.nmemb;
|
|
||||||
pthread_rwlock_unlock(&pThis->rwlock);
|
|
||||||
errmsg.LogError(0, RS_RET_OK, "lookup table '%s' reloaded from file '%s'",
|
|
||||||
pThis->name, pThis->filename);
|
|
||||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
||||||
index d77728a..49cb641 100644
|
|
||||||
--- a/tests/Makefile.am
|
|
||||||
+++ b/tests/Makefile.am
|
|
||||||
@@ -130,6 +130,7 @@ TESTS += \
|
|
||||||
incltest_dir_wildcard.sh \
|
|
||||||
incltest_dir_empty_wildcard.sh \
|
|
||||||
linkedlistqueue.sh \
|
|
||||||
+ lookup_table.sh \
|
|
||||||
key_dereference_on_uninitialized_variable_space.sh
|
|
||||||
|
|
||||||
|
|
||||||
@@ -860,6 +861,10 @@ EXTRA_DIST= \
|
|
||||||
testsuites/rscript_re_extract.conf \
|
|
||||||
rscript_re_match.sh \
|
|
||||||
testsuites/rscript_re_match.conf \
|
|
||||||
+ lookup_table.sh \
|
|
||||||
+ testsuites/lookup_table.conf \
|
|
||||||
+ testsuites/xlate.lkp_tbl \
|
|
||||||
+ testsuites/xlate_more.lkp_tbl \
|
|
||||||
cfg.sh
|
|
||||||
|
|
||||||
# TODO: re-enable
|
|
||||||
diff --git a/tests/diag.sh b/tests/diag.sh
|
|
||||||
index 95d6adb..c489fff 100755
|
|
||||||
--- a/tests/diag.sh
|
|
||||||
+++ b/tests/diag.sh
|
|
||||||
@@ -195,6 +195,10 @@ case $1 in
|
|
||||||
echo WaitMainQueueEmpty | ./diagtalker || . $srcdir/diag.sh error-exit $?
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
+ 'issue-HUP') # shut rsyslogd down when main queue is empty. $2 is the instance.
|
|
||||||
+ kill -HUP `cat rsyslog$2.pid`
|
|
||||||
+ ./msleep 1000
|
|
||||||
+ ;;
|
|
||||||
'shutdown-when-empty') # shut rsyslogd down when main queue is empty. $2 is the instance.
|
|
||||||
if [ "$2" == "2" ]
|
|
||||||
then
|
|
||||||
diff --git a/tests/lookup_table.sh b/tests/lookup_table.sh
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..fae2fab
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/lookup_table.sh
|
|
||||||
@@ -0,0 +1,24 @@
|
|
||||||
+#!/bin/bash
|
|
||||||
+# added 2015-09-30 by singh.janmejay
|
|
||||||
+# This file is part of the rsyslog project, released under ASL 2.0
|
|
||||||
+echo ===============================================================================
|
|
||||||
+echo \[lookup_table_reload.sh\]: test for lookup-table and HUP based reloading of it
|
|
||||||
+. $srcdir/diag.sh init
|
|
||||||
+cp $srcdir/testsuites/xlate.lkp_tbl $srcdir/xlate.lkp_tbl
|
|
||||||
+. $srcdir/diag.sh startup lookup_table.conf
|
|
||||||
+. $srcdir/diag.sh injectmsg 0 3
|
|
||||||
+. $srcdir/diag.sh wait-queueempty
|
|
||||||
+. $srcdir/diag.sh content-check "msgnum:00000000: foo_old"
|
|
||||||
+. $srcdir/diag.sh content-check "msgnum:00000001: bar_old"
|
|
||||||
+. $srcdir/diag.sh assert-content-missing "baz"
|
|
||||||
+cp $srcdir/testsuites/xlate_more.lkp_tbl $srcdir/xlate.lkp_tbl
|
|
||||||
+. $srcdir/diag.sh issue-HUP
|
|
||||||
+. $srcdir/diag.sh injectmsg 0 3
|
|
||||||
+echo doing shutdown
|
|
||||||
+. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
+echo wait on shutdown
|
|
||||||
+. $srcdir/diag.sh wait-shutdown
|
|
||||||
+. $srcdir/diag.sh content-check "msgnum:00000000: foo_new"
|
|
||||||
+. $srcdir/diag.sh content-check "msgnum:00000001: bar_new"
|
|
||||||
+. $srcdir/diag.sh content-check "msgnum:00000002: baz"
|
|
||||||
+. $srcdir/diag.sh exit
|
|
||||||
diff --git a/tests/testsuites/lookup_table.conf b/tests/testsuites/lookup_table.conf
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..29bd805
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/testsuites/lookup_table.conf
|
|
||||||
@@ -0,0 +1,9 @@
|
|
||||||
+$IncludeConfig diag-common.conf
|
|
||||||
+
|
|
||||||
+lookup_table(name="xlate" file="xlate.lkp_tbl")
|
|
||||||
+
|
|
||||||
+template(name="outfmt" type="string" string="- %msg% %$.lkp%\n")
|
|
||||||
+
|
|
||||||
+set $.lkp = lookup("xlate", $msg);
|
|
||||||
+
|
|
||||||
+action(type="omfile" file="./rsyslog.out.log" template="outfmt")
|
|
||||||
diff --git a/tests/testsuites/xlate.lkp_tbl b/tests/testsuites/xlate.lkp_tbl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..30e2796
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/testsuites/xlate.lkp_tbl
|
|
||||||
@@ -0,0 +1,5 @@
|
|
||||||
+{
|
|
||||||
+ "table":[
|
|
||||||
+ {"index":" msgnum:00000000:", "value":"foo_old" },
|
|
||||||
+ {"index":" msgnum:00000001:", "value":"bar_old" }]
|
|
||||||
+}
|
|
||||||
diff --git a/tests/testsuites/xlate_more.lkp_tbl b/tests/testsuites/xlate_more.lkp_tbl
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..2d3f452
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/tests/testsuites/xlate_more.lkp_tbl
|
|
||||||
@@ -0,0 +1,6 @@
|
|
||||||
+{
|
|
||||||
+ "table":[
|
|
||||||
+ {"index":" msgnum:00000000:", "value":"foo_new" },
|
|
||||||
+ {"index":" msgnum:00000001:", "value":"bar_new" },
|
|
||||||
+ {"index":" msgnum:00000002:", "value":"baz" }]
|
|
||||||
+}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
Workaround for https://github.com/rsyslog/rsyslog/issues/746
|
|
||||||
|
|
||||||
--- rsyslog-9999/tests/imfile-readmode2-vg.sh 2016-01-20 12:35:20.368238216 +0100
|
|
||||||
+++ rsyslog-9999/tests/imfile-readmode2-vg.sh 2016-01-20 12:36:14.357031527 +0100
|
|
||||||
@@ -11,7 +11,7 @@ echo 'msgnum:0
|
|
||||||
echo 'msgnum:2' >> rsyslog.input
|
|
||||||
|
|
||||||
# sleep a little to give rsyslog a chance to begin processing
|
|
||||||
-sleep 1
|
|
||||||
+sleep 10
|
|
||||||
|
|
||||||
# write some more lines (see https://github.com/rsyslog/rsyslog/issues/144)
|
|
||||||
echo 'msgnum:3
|
|
||||||
@@ -19,14 +19,14 @@ echo 'msgnum:3
|
|
||||||
echo 'msgnum:5' >> rsyslog.input # this one shouldn't be written to the output file because of ReadMode 2
|
|
||||||
|
|
||||||
# give it time to finish
|
|
||||||
-sleep 1
|
|
||||||
+sleep 10
|
|
||||||
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
|
|
||||||
. $srcdir/diag.sh wait-shutdown-vg # we need to wait until rsyslogd is finished!
|
|
||||||
. $srcdir/diag.sh check-exit-vg
|
|
||||||
|
|
||||||
# give it time to write the output file
|
|
||||||
-sleep 1
|
|
||||||
+sleep 10
|
|
||||||
|
|
||||||
## check if we have the correct number of messages
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
Workaround for https://github.com/rsyslog/rsyslog/issues/688
|
|
||||||
|
|
||||||
--- rsyslog-9999/tests/imtcp-tls-basic-vg.sh 2016-01-20 12:01:44.493617917 +0100
|
|
||||||
+++ rsyslog-9999/tests/imtcp-tls-basic-vg.sh 2016-01-20 12:04:18.394711527 +0100
|
|
||||||
@@ -9,6 +9,7 @@ echo \$DefaultNetstreamDriverCertFile $s
|
|
||||||
echo \$DefaultNetstreamDriverKeyFile $srcdir/tls-certs/key.pem >>rsyslog.conf.tlscert
|
|
||||||
. $srcdir/diag.sh startup-vg-noleak imtcp-tls-basic.conf
|
|
||||||
. $srcdir/diag.sh tcpflood -p13514 -m50000 -Ttls -Z$srcdir/tls-certs/cert.pem -z$srcdir/tls-certs/key.pem
|
|
||||||
+sleep 10
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
|
|
||||||
. $srcdir/diag.sh wait-shutdown-vg
|
|
||||||
. $srcdir/diag.sh check-exit-vg
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
|
||||||
Date: Wed, 2 Mar 2016 11:43:09 +0100
|
|
||||||
Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed
|
|
||||||
|
|
||||||
The problem happened in leap year from March til then end
|
|
||||||
of year and healed itself at the begining of the next year.
|
|
||||||
During the problem period, the timestamp was 24 hours too
|
|
||||||
low.
|
|
||||||
|
|
||||||
This is primarily a simple fix that can also be applied to
|
|
||||||
older rsyslog versions. However, we will see if we can
|
|
||||||
refactor the code to make use of mktime(). Originally, that
|
|
||||||
was not done for some issues seen, which may no longer
|
|
||||||
apply.
|
|
||||||
|
|
||||||
fixes https://github.com/rsyslog/rsyslog/issues/830
|
|
||||||
---
|
|
||||||
runtime/datetime.c | 7 ++++++-
|
|
||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/runtime/datetime.c b/runtime/datetime.c
|
|
||||||
index efb4c81..a07c1b7 100644
|
|
||||||
--- a/runtime/datetime.c
|
|
||||||
+++ b/runtime/datetime.c
|
|
||||||
@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts)
|
|
||||||
MonthInDays = 0; /* any value fits ;) */
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
+ /* adjust for leap years */
|
|
||||||
+ if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) {
|
|
||||||
+ if(ts->month > 2)
|
|
||||||
+ MonthInDays++;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
|
|
||||||
/* 1) Counting how many Years have passed since 1970
|
|
||||||
@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
|
|
||||||
|
|
||||||
NumberOfYears = ts->year - yearInSec_startYear - 1;
|
|
||||||
NumberOfDays = MonthInDays + ts->day - 1;
|
|
||||||
- TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400;
|
|
||||||
+ TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 86400;
|
|
||||||
|
|
||||||
/*Add Hours, minutes and seconds */
|
|
||||||
TimeInUnixFormat += ts->hour*60*60;
|
|
||||||
From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
|
||||||
Date: Wed, 2 Mar 2016 15:58:18 +0100
|
|
||||||
Subject: [PATCH] timestamp handling: guard against invalid dates
|
|
||||||
|
|
||||||
We do not permit dates outside of the year 1970..2100
|
|
||||||
interval. Note that network-receivers do already guard
|
|
||||||
against this, so the new guard only guards against invalid
|
|
||||||
system time. Still good to have (especially when things are
|
|
||||||
extended...)
|
|
||||||
---
|
|
||||||
runtime/datetime.c | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/runtime/datetime.c b/runtime/datetime.c
|
|
||||||
index 9641363..87290c9 100644
|
|
||||||
--- a/runtime/datetime.c
|
|
||||||
+++ b/runtime/datetime.c
|
|
||||||
@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts)
|
|
||||||
int utcOffset;
|
|
||||||
time_t TimeInUnixFormat;
|
|
||||||
|
|
||||||
+ if(ts->year < 1970 || ts->year > 2100) {
|
|
||||||
+ TimeInUnixFormat = 0;
|
|
||||||
+ errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
|
|
||||||
+ "in timestamp - returning 1970-01-01 instead", ts->year);
|
|
||||||
+ goto done;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* Counting how many Days have passed since the 01.01 of the
|
|
||||||
* selected Year (Month level), according to the selected Month*/
|
|
||||||
|
|
||||||
@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
|
|
||||||
if(ts->OffsetMode == '+')
|
|
||||||
utcOffset *= -1; /* if timestamp is ahead, we need to "go back" to UTC */
|
|
||||||
TimeInUnixFormat += utcOffset;
|
|
||||||
+done:
|
|
||||||
return TimeInUnixFormat;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
From b435f4e7d2ece7f2ea0a7b42826498e224be3f23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rainer Gerhards <rgerhards@adiscon.com>
|
|
||||||
Date: Wed, 3 Feb 2016 16:32:07 +0100
|
|
||||||
Subject: [PATCH] bugfix: queue engine can loose one message during queue
|
|
||||||
shutdown
|
|
||||||
|
|
||||||
... due to improper checking of return states.
|
|
||||||
|
|
||||||
closes https://github.com/rsyslog/rsyslog/issues/262
|
|
||||||
---
|
|
||||||
runtime/ruleset.c | 17 +++++++++++------
|
|
||||||
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/runtime/ruleset.c b/runtime/ruleset.c
|
|
||||||
index ae5a9bd..6ca97e8 100644
|
|
||||||
--- a/runtime/ruleset.c
|
|
||||||
+++ b/runtime/ruleset.c
|
|
||||||
@@ -495,6 +495,7 @@ processBatch(batch_t *pBatch, wti_t *pWti)
|
|
||||||
int i;
|
|
||||||
msg_t *pMsg;
|
|
||||||
ruleset_t *pRuleset;
|
|
||||||
+ rsRetVal localRet;
|
|
||||||
DEFiRet;
|
|
||||||
|
|
||||||
DBGPRINTF("processBATCH: batch of %d elements must be processed\n", pBatch->nElem);
|
|
||||||
@@ -506,15 +507,19 @@ processBatch(batch_t *pBatch, wti_t *pWti)
|
|
||||||
pMsg = pBatch->pElem[i].pMsg;
|
|
||||||
DBGPRINTF("processBATCH: next msg %d: %.128s\n", i, pMsg->pszRawMsg);
|
|
||||||
pRuleset = (pMsg->pRuleset == NULL) ? ourConf->rulesets.pDflt : pMsg->pRuleset;
|
|
||||||
- scriptExec(pRuleset->root, pMsg, pWti);
|
|
||||||
- // TODO: think if we need a return state of scriptExec - most probably
|
|
||||||
- // the answer is "no", as we need to process the batch in any case!
|
|
||||||
- // TODO: we must refactor this! flag messages as committed
|
|
||||||
- batchSetElemState(pBatch, i, BATCH_STATE_COMM);
|
|
||||||
+ localRet = scriptExec(pRuleset->root, pMsg, pWti);
|
|
||||||
+ /* the most important case here is that processing may be aborted
|
|
||||||
+ * due to pbShutdownImmediate, in which case we MUST NOT flag this
|
|
||||||
+ * message as committed. If we would do so, the message would
|
|
||||||
+ * potentially be lost.
|
|
||||||
+ */
|
|
||||||
+ if(localRet == RS_RET_OK)
|
|
||||||
+ batchSetElemState(pBatch, i, BATCH_STATE_COMM);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* commit phase */
|
|
||||||
- dbgprintf("END batch execution phase, entering to commit phase\n");
|
|
||||||
+ DBGPRINTF("END batch execution phase, entering to commit phase "
|
|
||||||
+ "[processed %d of %d messages]\n", i, batchNumMsgs(pBatch));
|
|
||||||
actionCommitAllDirect(pWti);
|
|
||||||
|
|
||||||
DBGPRINTF("processBATCH: batch of %d elements has been processed\n", pBatch->nElem);
|
|
||||||
@ -1,482 +0,0 @@
|
|||||||
From b81d6dd36545f79c46e0a3488a9b26d0db75646a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas D.
|
|
||||||
Date: Tue, 19 Apr 2016 02:09:18 +0200
|
|
||||||
Subject: [PATCH 2/2] testbench: Use LD_PRELOAD=libfaketime.so instead of
|
|
||||||
faketime binary
|
|
||||||
|
|
||||||
Fixes: https://github.com/rsyslog/rsyslog/issues/963
|
|
||||||
---
|
|
||||||
tests/faketime_common.sh | 20 +++++++-------------
|
|
||||||
tests/now-utc-casecmp.sh | 2 +-
|
|
||||||
tests/now-utc-ymd.sh | 2 +-
|
|
||||||
tests/now-utc.sh | 2 +-
|
|
||||||
tests/now_family_utc.sh | 2 +-
|
|
||||||
tests/timegenerated-dateordinal-invld.sh | 8 ++++----
|
|
||||||
tests/timegenerated-dateordinal.sh | 28 ++++++++++++++--------------
|
|
||||||
tests/timegenerated-utc-legacy.sh | 2 +-
|
|
||||||
tests/timegenerated-utc.sh | 2 +-
|
|
||||||
tests/timegenerated-uxtimestamp-invld.sh | 8 ++++----
|
|
||||||
tests/timegenerated-uxtimestamp.sh | 26 ++++++++++++--------------
|
|
||||||
tests/timegenerated-ymd.sh | 2 +-
|
|
||||||
12 files changed, 48 insertions(+), 56 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/faketime_common.sh b/tests/faketime_common.sh
|
|
||||||
index 10e0128..432ade6 100644
|
|
||||||
--- a/tests/faketime_common.sh
|
|
||||||
+++ b/tests/faketime_common.sh
|
|
||||||
@@ -4,26 +4,20 @@
|
|
||||||
# faketime is missing or the system isn't year-2038 complaint.
|
|
||||||
# This script can be sourced to prevent duplicated code.
|
|
||||||
|
|
||||||
-if ! hash faketime 2>/dev/null ; then
|
|
||||||
- echo "faketime command missing, skipping test"
|
|
||||||
+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="1991-08-25 20:57:08" TZ=GMT date +%s 2>/dev/null)
|
|
||||||
+if [ ${faketime_testtime} -ne 683153828 ] ; then
|
|
||||||
+ echo "libfaketime.so missing, skipping test"
|
|
||||||
exit 77
|
|
||||||
fi
|
|
||||||
|
|
||||||
-export TZ=UTC+01:00
|
|
||||||
-
|
|
||||||
-faketime -f '2016-03-11 16:00:00' date 1>/dev/null 2>&1
|
|
||||||
-if [ $? -ne 0 ]; then
|
|
||||||
- # Safe-guard -- should never happen!
|
|
||||||
- echo "faketime command not working as expected. Check faketime binary in path!"
|
|
||||||
- exit 1
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-faketime '2040-01-01 16:00:00' date 1>/dev/null 2>&1
|
|
||||||
-if [ $? -ne 0 ]; then
|
|
||||||
+# GMT-1 (POSIX TIME) is GMT+1 in "Human Time"
|
|
||||||
+faketime_testtime=$(LD_PRELOAD=libfaketime.so FAKETIME="2040-01-01 16:00:00" TZ=GMT-1 date +%s 2>/dev/null)
|
|
||||||
+if [ ${faketime_testtime} -eq -1 ]; then
|
|
||||||
# System isn't year-2038 compatible
|
|
||||||
RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE="yes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+export LD_PRELOAD=libfaketime.so
|
|
||||||
|
|
||||||
rsyslog_testbench_require_y2k38_support() {
|
|
||||||
if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
|
|
||||||
diff --git a/tests/now-utc-casecmp.sh b/tests/now-utc-casecmp.sh
|
|
||||||
index 8f8d6a0..26bb7ee 100755
|
|
||||||
--- a/tests/now-utc-casecmp.sh
|
|
||||||
+++ b/tests/now-utc-casecmp.sh
|
|
||||||
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
|
|
||||||
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
|
|
||||||
file="rsyslog.out.log")
|
|
||||||
'
|
|
||||||
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
# what we send actually is irrelevant, as we just use system properties.
|
|
||||||
# but we need to send one message in order to gain output!
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
diff --git a/tests/now-utc-ymd.sh b/tests/now-utc-ymd.sh
|
|
||||||
index c327983..6e2d183 100755
|
|
||||||
--- a/tests/now-utc-ymd.sh
|
|
||||||
+++ b/tests/now-utc-ymd.sh
|
|
||||||
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
|
|
||||||
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
|
|
||||||
file="rsyslog.out.log")
|
|
||||||
'
|
|
||||||
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
# what we send actually is irrelevant, as we just use system properties.
|
|
||||||
# but we need to send one message in order to gain output!
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
diff --git a/tests/now-utc.sh b/tests/now-utc.sh
|
|
||||||
index ed83948..69fd4fd 100755
|
|
||||||
--- a/tests/now-utc.sh
|
|
||||||
+++ b/tests/now-utc.sh
|
|
||||||
@@ -9,7 +9,7 @@ echo \[now-utc\]: test \$NOW-UTC
|
|
||||||
export TZ=TEST-02:00
|
|
||||||
|
|
||||||
. $srcdir/diag.sh init
|
|
||||||
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf
|
|
||||||
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now-utc.conf
|
|
||||||
# what we send actually is irrelevant, as we just use system properties.
|
|
||||||
# but we need to send one message in order to gain output!
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
diff --git a/tests/now_family_utc.sh b/tests/now_family_utc.sh
|
|
||||||
index caba0f9..e791cbf 100755
|
|
||||||
--- a/tests/now_family_utc.sh
|
|
||||||
+++ b/tests/now_family_utc.sh
|
|
||||||
@@ -9,7 +9,7 @@ echo \[now_family_utc\]: test \$NOW family of system properties
|
|
||||||
export TZ=TEST+06:30
|
|
||||||
|
|
||||||
. $srcdir/diag.sh init
|
|
||||||
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf
|
|
||||||
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup now_family_utc.conf
|
|
||||||
# what we send actually is irrelevant, as we just use system properties.
|
|
||||||
# but we need to send one message in order to gain output!
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
diff --git a/tests/timegenerated-dateordinal-invld.sh b/tests/timegenerated-dateordinal-invld.sh
|
|
||||||
index bac5d4e..dc5e14c 100755
|
|
||||||
--- a/tests/timegenerated-dateordinal-invld.sh
|
|
||||||
+++ b/tests/timegenerated-dateordinal-invld.sh
|
|
||||||
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1800-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -40,7 +40,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1960-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -55,7 +55,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2101-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -70,7 +70,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2500-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-dateordinal.sh b/tests/timegenerated-dateordinal.sh
|
|
||||||
index ace1c16..1164e53 100755
|
|
||||||
--- a/tests/timegenerated-dateordinal.sh
|
|
||||||
+++ b/tests/timegenerated-dateordinal.sh
|
|
||||||
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1970-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -39,7 +39,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2000-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -53,7 +53,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -67,7 +67,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-02-29"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -81,7 +81,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -95,7 +95,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-03"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -109,7 +109,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-12-31"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -123,7 +123,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2017-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -137,7 +137,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2020-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -151,7 +151,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2038-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -168,7 +168,7 @@ rsyslog_testbench_require_y2k38_support
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2038-12-31"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2038-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2038-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -182,7 +182,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2040-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -196,7 +196,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2040-12-31"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2040-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2040-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -210,7 +210,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2100-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-utc-legacy.sh b/tests/timegenerated-utc-legacy.sh
|
|
||||||
index f893377..60296d3 100755
|
|
||||||
--- a/tests/timegenerated-utc-legacy.sh
|
|
||||||
+++ b/tests/timegenerated-utc-legacy.sh
|
|
||||||
@@ -26,7 +26,7 @@ template(name="outfmt" type="string"
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-utc.sh b/tests/timegenerated-utc.sh
|
|
||||||
index 651408c..5d32e36 100755
|
|
||||||
--- a/tests/timegenerated-utc.sh
|
|
||||||
+++ b/tests/timegenerated-utc.sh
|
|
||||||
@@ -28,7 +28,7 @@ template(name="outfmt" type="list") {
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-uxtimestamp-invld.sh b/tests/timegenerated-uxtimestamp-invld.sh
|
|
||||||
index 90bcf74..76a353c 100755
|
|
||||||
--- a/tests/timegenerated-uxtimestamp-invld.sh
|
|
||||||
+++ b/tests/timegenerated-uxtimestamp-invld.sh
|
|
||||||
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1800-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1800-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1800-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -40,7 +40,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1960-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1960-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1960-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -55,7 +55,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2101-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2101-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2101-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -70,7 +70,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2500-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2500-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2500-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-uxtimestamp.sh b/tests/timegenerated-uxtimestamp.sh
|
|
||||||
index b24f9c7..0eb2812 100755
|
|
||||||
--- a/tests/timegenerated-uxtimestamp.sh
|
|
||||||
+++ b/tests/timegenerated-uxtimestamp.sh
|
|
||||||
@@ -25,7 +25,7 @@ template(name="outfmt" type="string"
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 1970-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '1970-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='1970-01-01 00:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -40,7 +40,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2000-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2000-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2000-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -55,7 +55,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -70,7 +70,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-02-29"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-02-29 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-02-29 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -85,7 +85,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -100,7 +100,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-03-03"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-03-03 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-03-03 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -115,7 +115,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2016-12-31"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2016-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-12-31 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -130,7 +130,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2017-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2017-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2017-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -145,7 +145,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2020-03-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2020-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2020-03-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -160,7 +160,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2038-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2038-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2038-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -172,13 +172,11 @@ if [ ! $? -eq 0 ]; then
|
|
||||||
exit 1
|
|
||||||
fi;
|
|
||||||
|
|
||||||
-
|
|
||||||
rsyslog_testbench_require_y2k38_support
|
|
||||||
|
|
||||||
-
|
|
||||||
echo "***SUBTEST: check 2040-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2040-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2040-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
@@ -193,7 +191,7 @@ fi;
|
|
||||||
|
|
||||||
echo "***SUBTEST: check 2100-01-01"
|
|
||||||
rm -f rsyslog.out.log # do cleanup of previous subtest
|
|
||||||
-faketime -f '2100-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2100-01-01 12:00:00' $srcdir/diag.sh startup
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
. $srcdir/diag.sh shutdown-when-empty
|
|
||||||
. $srcdir/diag.sh wait-shutdown
|
|
||||||
diff --git a/tests/timegenerated-ymd.sh b/tests/timegenerated-ymd.sh
|
|
||||||
index 66b364b..f5f9213 100755
|
|
||||||
--- a/tests/timegenerated-ymd.sh
|
|
||||||
+++ b/tests/timegenerated-ymd.sh
|
|
||||||
@@ -19,7 +19,7 @@ template(name="outfmt" type="string"
|
|
||||||
:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
|
|
||||||
file="rsyslog.out.log")
|
|
||||||
'
|
|
||||||
-faketime '2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
+FAKETIME='2016-01-01 01:00:00' $srcdir/diag.sh startup
|
|
||||||
# what we send actually is irrelevant, as we just use system properties.
|
|
||||||
# but we need to send one message in order to gain output!
|
|
||||||
. $srcdir/diag.sh tcpflood -m1
|
|
||||||
--
|
|
||||||
2.8.1
|
|
||||||
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From 35b838b13e838cfe81bf565163bc892dd4347f68 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas D.
|
|
||||||
Date: Tue, 19 Apr 2016 00:00:00 +0200
|
|
||||||
Subject: [PATCH 1/2] testbench: Add missing exit calls to
|
|
||||||
{faketime,privdrop}_common.sh
|
|
||||||
|
|
||||||
"diag.sh exit" just cleans up so we still have to end the tests when skipping
|
|
||||||
with a real exit on our own.
|
|
||||||
---
|
|
||||||
tests/faketime_common.sh | 9 +++++----
|
|
||||||
tests/privdrop_common.sh | 1 +
|
|
||||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/faketime_common.sh b/tests/faketime_common.sh
|
|
||||||
index 5e868bc..10e0128 100644
|
|
||||||
--- a/tests/faketime_common.sh
|
|
||||||
+++ b/tests/faketime_common.sh
|
|
||||||
@@ -26,8 +26,9 @@ fi
|
|
||||||
|
|
||||||
|
|
||||||
rsyslog_testbench_require_y2k38_support() {
|
|
||||||
- if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
|
|
||||||
- echo "Skipping further tests because system doesn't support year 2038 ..."
|
|
||||||
- . $srcdir/diag.sh exit
|
|
||||||
- fi
|
|
||||||
+ if [ -n "${RSYSLOG_TESTBENCH_Y2K38_INCOMPATIBLE}" ]; then
|
|
||||||
+ echo "Skipping further tests because system doesn't support year 2038 ..."
|
|
||||||
+ . $srcdir/diag.sh exit
|
|
||||||
+ exit 0
|
|
||||||
+ fi
|
|
||||||
}
|
|
||||||
diff --git a/tests/privdrop_common.sh b/tests/privdrop_common.sh
|
|
||||||
index a0994ec..203a23b 100755
|
|
||||||
--- a/tests/privdrop_common.sh
|
|
||||||
+++ b/tests/privdrop_common.sh
|
|
||||||
@@ -52,6 +52,7 @@ rsyslog_testbench_setup_testuser() {
|
|
||||||
if [ -z "${testgroupname}" ]; then
|
|
||||||
echo "Skipping ... please set RSYSLOG_TESTUSER or make sure the user running the testbench has a primary group!"
|
|
||||||
. $srcdir/diag.sh exit
|
|
||||||
+ exit 0
|
|
||||||
else
|
|
||||||
has_testuser="${EUID}"
|
|
||||||
fi
|
|
||||||
--
|
|
||||||
2.8.1
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
Introduction
|
|
||||||
============
|
|
||||||
|
|
||||||
Since rsyslog version 7.6 we are shipping a new default Gentoo
|
|
||||||
configuration. See bug #501982 to learn more about what we were trying to
|
|
||||||
achieve by rewriting the entire configuration.
|
|
||||||
|
|
||||||
|
|
||||||
Important changes
|
|
||||||
=================
|
|
||||||
|
|
||||||
1. "/var/log/syslog" log file is now deprecated
|
|
||||||
|
|
||||||
Beginning with rsyslog-7.6, the "/var/log/syslog" log file will no
|
|
||||||
longer being written per default. We are considering this file as
|
|
||||||
deprecated/obsolet for the typical user/system.
|
|
||||||
The content from this log file is still availble through other
|
|
||||||
(dedicated) log files, see
|
|
||||||
|
|
||||||
- /var/log/cron.log
|
|
||||||
- /var/log/daemon.log
|
|
||||||
- /var/log/mail.log
|
|
||||||
- /var/log/messages
|
|
||||||
|
|
||||||
If you really need the old "/var/log/syslog" log file, all you have to
|
|
||||||
do is uncommenting the corresponding configuration directive in
|
|
||||||
"/etc/rsyslog.d/50-default.conf".
|
|
||||||
|
|
||||||
If you do so, don't forget to re-enable log rotation in
|
|
||||||
"/etc/logrotate.d/rsyslog", too.
|
|
||||||
|
|
||||||
|
|
||||||
2. An additional input socket in "/var/empty/dev/log" (default chroot
|
|
||||||
location) will be created per default
|
|
||||||
|
|
||||||
See bug #490744 for further details.
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
# /etc/rsyslog.conf
|
|
||||||
#
|
|
||||||
# This configuration is based on RainerScript, the new recommended syntax
|
|
||||||
# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
|
|
||||||
# details.
|
|
||||||
#
|
|
||||||
# But if you don't want to learn something new at moment, don't worry: The
|
|
||||||
# legacy syntax is still supported.
|
|
||||||
#
|
|
||||||
# You may want to use the new RSYSLOG configuration builder to create your
|
|
||||||
# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
|
|
||||||
|
|
||||||
# Check config syntax on startup and abort if unclean (default: off)
|
|
||||||
#$AbortOnUncleanConfig on
|
|
||||||
|
|
||||||
|
|
||||||
###############
|
|
||||||
### MODULES ###
|
|
||||||
###############
|
|
||||||
|
|
||||||
# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
|
|
||||||
module(load="imuxsock")
|
|
||||||
|
|
||||||
# Read messages from the kernel log and submits them to the syslog engine
|
|
||||||
module(load="imklog")
|
|
||||||
|
|
||||||
# Inject "--MARK--" messages every $Interval (seconds)
|
|
||||||
#module(load="immark" Interval="600")
|
|
||||||
|
|
||||||
# Read syslog messages from UDP
|
|
||||||
#module(load="imudp")
|
|
||||||
#input(type="imudp" port="514")
|
|
||||||
|
|
||||||
# Read syslog messages from TCP
|
|
||||||
#module(load="imtcp")
|
|
||||||
#input(type="imtcp" port="514")
|
|
||||||
|
|
||||||
|
|
||||||
#########################
|
|
||||||
### GLOBAL DIRECTIVES ###
|
|
||||||
#########################
|
|
||||||
|
|
||||||
# Where to place spool and state files
|
|
||||||
$WorkDirectory /var/spool/rsyslog
|
|
||||||
|
|
||||||
# Reduce repeating messages (default: off)
|
|
||||||
#$RepeatedMsgReduction on
|
|
||||||
|
|
||||||
# Set defaults for every output file
|
|
||||||
$Umask 0022
|
|
||||||
|
|
||||||
module(
|
|
||||||
load="builtin:omfile"
|
|
||||||
Template="RSYSLOG_TraditionalFileFormat"
|
|
||||||
FileCreateMode="0644"
|
|
||||||
DirCreateMode="0755"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
# Include all conf files in /etc/rsyslog.d/
|
|
||||||
$IncludeConfig /etc/rsyslog.d/*.conf
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
# /etc/conf.d/rsyslog
|
|
||||||
|
|
||||||
# Configuration file
|
|
||||||
#RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
|
|
||||||
|
|
||||||
# PID file
|
|
||||||
# If you should ever change this, remember to update
|
|
||||||
# "/etc/logrotate.d/rsyslog", too.
|
|
||||||
#RSYSLOG_PIDFILE="/run/rsyslogd.pid"
|
|
||||||
|
|
||||||
# You can use this configuration option to pass additional options to the
|
|
||||||
# start-stop-daemon, see start-stop-daemon(8) for more details.
|
|
||||||
# Per default we wait 1000ms after we have started the service to ensure
|
|
||||||
# that the daemon is really up and running.
|
|
||||||
#RSYSLOG_SSDARGS="--wait 1000"
|
|
||||||
|
|
||||||
# The termination timeout (start-stop-daemon parameter "retry") ensures
|
|
||||||
# that the service will be terminated within a given time (60 + 5 seconds
|
|
||||||
# per default) when you are stopping the service.
|
|
||||||
# You need to increase the value when you are working with a large queue.
|
|
||||||
# See http://www.rsyslog.com/doc/queues.html for further information.
|
|
||||||
#RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
|
|
||||||
|
|
||||||
|
|
||||||
# Options to rsyslogd
|
|
||||||
# See rsyslogd(8) for more details
|
|
||||||
# Notes:
|
|
||||||
# * Do not specify another PIDFILE but use the variable above to change the location
|
|
||||||
# * Do not specify another CONFIGFILE but use the variable above to change the location
|
|
||||||
#RSYSLOG_OPTS=""
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
|
|
||||||
RSYSLOG_PIDFILE=${RSYSLOG_PIDFILE:-"/run/rsyslogd.pid"}
|
|
||||||
RSYSLOG_SSDARGS=${RSYSLOG_SSDARGS:-"--wait 1000"}
|
|
||||||
RSYSLOG_TERMTIMEOUT=${RSYSLOG_TERMTIMEOUT:-"TERM/60/KILL/5"}
|
|
||||||
RSYSLOG_OPTS=${RSYSLOG_OPTS:-""}
|
|
||||||
|
|
||||||
command="/usr/sbin/rsyslogd"
|
|
||||||
command_args="${RSYSLOG_OPTS} -f \"${RSYSLOG_CONFIGFILE}\" -i \"${RSYSLOG_PIDFILE}\""
|
|
||||||
start_stop_daemon_args="${RSYSLOG_SSDARGS}"
|
|
||||||
pidfile="${RSYSLOG_PIDFILE}"
|
|
||||||
retry="${RSYSLOG_TERMTIMEOUT}"
|
|
||||||
|
|
||||||
required_files="${RSYSLOG_CONFIGFILE}"
|
|
||||||
|
|
||||||
description="RSYSLOG is the rocket-fast system for log processing (syslog replacement)."
|
|
||||||
|
|
||||||
extra_commands="configtest"
|
|
||||||
extra_started_commands="rotate"
|
|
||||||
|
|
||||||
description_configtest="Run rsyslogd's internal config check."
|
|
||||||
|
|
||||||
description_rotate="Sends rsyslogd a signal to re-open its log files."
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need clock hostname localmount
|
|
||||||
provide logger
|
|
||||||
}
|
|
||||||
|
|
||||||
start_pre() {
|
|
||||||
if [ "${RC_CMD}" != "restart" ]; then
|
|
||||||
configtest || return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_pre() {
|
|
||||||
if [ "${RC_CMD}" = "restart" ]; then
|
|
||||||
configtest || return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
stop_post() {
|
|
||||||
if [ -f "${RSYSLOG_PIDFILE}" ]; then
|
|
||||||
vebegin "Removing stale PID file"
|
|
||||||
rm --force "${RSYSLOG_PIDFILE}"
|
|
||||||
veend $?
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
configtest() {
|
|
||||||
local _command_args="-N 999 -f \"${RSYSLOG_CONFIGFILE}\""
|
|
||||||
local _retval=0
|
|
||||||
|
|
||||||
ebegin "Checking rsyslogd's configuration"
|
|
||||||
eval ${command} ${_command_args} >/dev/null 2>&1
|
|
||||||
_retval=$?
|
|
||||||
|
|
||||||
if [ ${_retval} -ne 0 ]; then
|
|
||||||
eval ${command} ${_command_args}
|
|
||||||
fi
|
|
||||||
|
|
||||||
eend ${_retval} "failed, please correct errors above"
|
|
||||||
}
|
|
||||||
|
|
||||||
rotate() {
|
|
||||||
ebegin "Re-opening rsyslogd logs"
|
|
||||||
start-stop-daemon --signal SIGHUP --pidfile "${RSYSLOG_PIDFILE}"
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
# Uncomment the following directive if you have re-enabled
|
|
||||||
# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
|
|
||||||
#/var/log/syslog
|
|
||||||
#{
|
|
||||||
# rotate 7
|
|
||||||
# daily
|
|
||||||
# missingok
|
|
||||||
# notifempty
|
|
||||||
# delaycompress
|
|
||||||
# compress
|
|
||||||
# postrotate
|
|
||||||
# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
|
|
||||||
# endscript
|
|
||||||
#}
|
|
||||||
|
|
||||||
/var/log/auth.log
|
|
||||||
/var/log/cron.log
|
|
||||||
/var/log/daemon.log
|
|
||||||
/var/log/kern.log
|
|
||||||
/var/log/lpr.log
|
|
||||||
/var/log/mail.log
|
|
||||||
/var/log/news.log
|
|
||||||
/var/log/user.log
|
|
||||||
/var/log/debug.log
|
|
||||||
/var/log/messages
|
|
||||||
{
|
|
||||||
rotate 4
|
|
||||||
weekly
|
|
||||||
missingok
|
|
||||||
notifempty
|
|
||||||
compress
|
|
||||||
delaycompress
|
|
||||||
sharedscripts
|
|
||||||
postrotate
|
|
||||||
test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
|
|
||||||
endscript
|
|
||||||
}
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>ultrabug@gentoo.org</email>
|
|
||||||
<name>Ultrabug</name>
|
|
||||||
<description>Primary Maintainer</description>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>whissi@whissi.de</email>
|
|
||||||
<name>Thomas D. (Whissi)</name>
|
|
||||||
<description>Proxy-Maintainer, CC. bugs</description>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
|
|
||||||
<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
|
||||||
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
|
|
||||||
<flag name="grok">Build the grok modify module (requires <pkg>dev-libs/grok</pkg>)</flag>
|
|
||||||
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
|
|
||||||
<flag name="kafka">Build the Apache Kafka output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
|
|
||||||
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
|
|
||||||
<flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for building the rfc5424hmac modify module (requires rfc5424hmac USE flag)</flag>
|
|
||||||
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
|
|
||||||
<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
|
|
||||||
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
|
|
||||||
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
|
||||||
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
|
|
||||||
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
|
|
||||||
<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
|
|
||||||
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
|
|
||||||
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
|
|
||||||
<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
|
|
||||||
<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/libressl</pkg>)</flag>
|
|
||||||
<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
|
|
||||||
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
|
|
||||||
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
|
|
||||||
<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
|
|
||||||
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
|
|
||||||
<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,423 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
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/"
|
|
||||||
|
|
||||||
BRANCH="8-stable"
|
|
||||||
|
|
||||||
PATCHES=()
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}.git
|
|
||||||
https://github.com/rsyslog/${PN}.git
|
|
||||||
"
|
|
||||||
|
|
||||||
DOC_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}-doc.git
|
|
||||||
https://github.com/rsyslog/${PN}-doc.git
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
else
|
|
||||||
SRC_URI="
|
|
||||||
http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
|
|
||||||
doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
|
|
||||||
"
|
|
||||||
KEYWORDS="amd64 ~arm hppa x86"
|
|
||||||
|
|
||||||
PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.12.0-fix-re_extract.patch )
|
|
||||||
PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.13.0-lookup-table-reload-bugfix.patch )
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-3 LGPL-3 Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof"
|
|
||||||
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test 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:= )
|
|
||||||
jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
|
|
||||||
kerberos? ( virtual/krb5 )
|
|
||||||
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
|
|
||||||
mysql? ( virtual/mysql )
|
|
||||||
normalize? (
|
|
||||||
>=dev-libs/libee-0.4.0
|
|
||||||
>=dev-libs/liblognorm-1.1.2:=
|
|
||||||
)
|
|
||||||
omudpspoof? ( >=net-libs/libnet-1.1.6 )
|
|
||||||
postgres? ( >=dev-db/postgresql-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? (
|
|
||||||
!libressl? ( dev-libs/openssl:0= )
|
|
||||||
libressl? ( dev-libs/libressl:0= )
|
|
||||||
)
|
|
||||||
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"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
|
|
||||||
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
|
|
||||||
DEPEND+=" >=sys-devel/bison-2.4.3"
|
|
||||||
DEPEND+=" >=dev-python/docutils-0.12"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
"${FILESDIR}"/${BRANCH}/README.gentoo
|
|
||||||
)
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
git-r3_fetch
|
|
||||||
git-r3_checkout
|
|
||||||
else
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
local _EGIT_BRANCH=
|
|
||||||
if [ -n "${EGIT_BRANCH}" ]; then
|
|
||||||
# Cannot use rsyslog commits/branches for documentation repository
|
|
||||||
_EGIT_BRANCH=${EGIT_BRANCH}
|
|
||||||
unset EGIT_BRANCH
|
|
||||||
fi
|
|
||||||
|
|
||||||
git-r3_fetch "${DOC_REPO_URI}"
|
|
||||||
git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
|
|
||||||
|
|
||||||
if [ -n "${_EGIT_BRANCH}" ]; then
|
|
||||||
# Restore previous EGIT_BRANCH information
|
|
||||||
EGIT_BRANCH=${_EGIT_BRANCH}
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
local doc_tarball="${PN}-doc-${PV}.tar.gz"
|
|
||||||
|
|
||||||
cd "${S}" || die "Cannot change dir into '$S'"
|
|
||||||
mkdir docs || die "Failed to create docs directory"
|
|
||||||
cd docs || die "Failed to change dir into '${S}/docs'"
|
|
||||||
unpack ${doc_tarball}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
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=(
|
|
||||||
--disable-debug-symbols
|
|
||||||
--disable-generate-man-pages
|
|
||||||
--without-valgrind-testbench
|
|
||||||
$(use_enable test testbench)
|
|
||||||
# Input Plugins without depedencies
|
|
||||||
--enable-imdiag
|
|
||||||
--enable-imfile
|
|
||||||
--enable-impstats
|
|
||||||
--enable-imptcp
|
|
||||||
# Message Modificiation Plugins without depedencies
|
|
||||||
--enable-mmanon
|
|
||||||
--enable-mmaudit
|
|
||||||
--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-pmciscoios
|
|
||||||
--enable-pmcisconames
|
|
||||||
--enable-pmlastmsg
|
|
||||||
--enable-pmsnare
|
|
||||||
# DB
|
|
||||||
$(use_enable dbi libdbi)
|
|
||||||
$(use_enable mongodb ommongodb)
|
|
||||||
$(use_enable mysql)
|
|
||||||
$(use_enable postgres pgsql)
|
|
||||||
$(use_enable redis omhiredis)
|
|
||||||
# Debug
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable debug diagtools)
|
|
||||||
$(use_enable debug memcheck)
|
|
||||||
$(use_enable debug rtinst)
|
|
||||||
$(use_enable debug valgrind)
|
|
||||||
# Misc
|
|
||||||
$(use_enable elasticsearch)
|
|
||||||
$(use_enable gcrypt libgcrypt)
|
|
||||||
$(use_enable jemalloc)
|
|
||||||
$(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_compile() {
|
|
||||||
autotools-utils_src_compile
|
|
||||||
|
|
||||||
if use doc && [[ "${PV}" == "9999" ]]; then
|
|
||||||
einfo "Building documentation ..."
|
|
||||||
local doc_dir="${S}/docs"
|
|
||||||
cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
|
|
||||||
sphinx-build -b html source build || die "Building documentation failed!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
local _has_increased_ulimit=
|
|
||||||
|
|
||||||
# When adding new tests via patches we have to make them executable
|
|
||||||
einfo "Adjusting permissions of test scripts ..."
|
|
||||||
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
|
|
||||||
die "Failed to adjust test scripts permission"
|
|
||||||
|
|
||||||
if ulimit -n 3072; then
|
|
||||||
_has_increased_ulimit="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! emake --jobs 1 check; then
|
|
||||||
eerror "Test suite failed! :("
|
|
||||||
|
|
||||||
if [ -z "${_has_increased_ulimit}" ]; then
|
|
||||||
eerror "Probably because open file limit couldn't be set to 3072."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if has userpriv $FEATURES; then
|
|
||||||
eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
|
|
||||||
"before you submit a bug report."
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
use doc && HTML_DOCS=( "${S}/docs/build/" )
|
|
||||||
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" ${PN}
|
|
||||||
|
|
||||||
if use mysql; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/mysql
|
|
||||||
doins plugins/ommysql/createDB.sql
|
|
||||||
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"
|
|
||||||
}
|
|
||||||
@ -1,432 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools eutils systemd
|
|
||||||
|
|
||||||
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
|
|
||||||
HOMEPAGE="http://www.rsyslog.com/"
|
|
||||||
|
|
||||||
BRANCH="8-stable"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}.git
|
|
||||||
https://github.com/rsyslog/${PN}.git
|
|
||||||
"
|
|
||||||
|
|
||||||
DOC_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}-doc.git
|
|
||||||
https://github.com/rsyslog/${PN}-doc.git
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
else
|
|
||||||
SRC_URI="
|
|
||||||
http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
|
|
||||||
doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
|
|
||||||
"
|
|
||||||
KEYWORDS="amd64 ~arm hppa x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-3 LGPL-3 Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof"
|
|
||||||
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test 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:= )
|
|
||||||
jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
|
|
||||||
kerberos? ( virtual/krb5 )
|
|
||||||
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
|
|
||||||
mysql? ( virtual/mysql )
|
|
||||||
normalize? (
|
|
||||||
>=dev-libs/libee-0.4.0
|
|
||||||
>=dev-libs/liblognorm-1.1.2:=
|
|
||||||
)
|
|
||||||
omudpspoof? ( >=net-libs/libnet-1.1.6 )
|
|
||||||
postgres? ( >=dev-db/postgresql-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? (
|
|
||||||
!libressl? ( dev-libs/openssl:0= )
|
|
||||||
libressl? ( dev-libs/libressl:0= )
|
|
||||||
)
|
|
||||||
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
|
|
||||||
ssl? ( >=net-libs/gnutls-2.12.23:0= )
|
|
||||||
systemd? ( >=sys-apps/systemd-208 )
|
|
||||||
zeromq? ( >=net-libs/czmq-1.2.0 )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
|
|
||||||
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
|
|
||||||
DEPEND+=" >=sys-devel/bison-2.4.3"
|
|
||||||
DEPEND+=" >=dev-python/docutils-0.12"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
"${FILESDIR}"/${BRANCH}/README.gentoo
|
|
||||||
)
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
git-r3_fetch
|
|
||||||
git-r3_checkout
|
|
||||||
else
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
local _EGIT_BRANCH=
|
|
||||||
if [ -n "${EGIT_BRANCH}" ]; then
|
|
||||||
# Cannot use rsyslog commits/branches for documentation repository
|
|
||||||
_EGIT_BRANCH=${EGIT_BRANCH}
|
|
||||||
unset EGIT_BRANCH
|
|
||||||
fi
|
|
||||||
|
|
||||||
git-r3_fetch "${DOC_REPO_URI}"
|
|
||||||
git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
|
|
||||||
|
|
||||||
if [ -n "${_EGIT_BRANCH}" ]; then
|
|
||||||
# Restore previous EGIT_BRANCH information
|
|
||||||
EGIT_BRANCH=${_EGIT_BRANCH}
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
local doc_tarball="${PN}-doc-${PV}.tar.gz"
|
|
||||||
|
|
||||||
cd "${S}" || die "Cannot change dir into '$S'"
|
|
||||||
mkdir docs || die "Failed to create docs directory"
|
|
||||||
cd docs || die "Failed to change dir into '${S}/docs'"
|
|
||||||
unpack ${doc_tarball}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
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=(
|
|
||||||
--disable-debug-symbols
|
|
||||||
--disable-generate-man-pages
|
|
||||||
--without-valgrind-testbench
|
|
||||||
$(use_enable test testbench)
|
|
||||||
# Input Plugins without depedencies
|
|
||||||
--enable-imdiag
|
|
||||||
--enable-imfile
|
|
||||||
--enable-impstats
|
|
||||||
--enable-imptcp
|
|
||||||
# Message Modificiation Plugins without depedencies
|
|
||||||
--enable-mmanon
|
|
||||||
--enable-mmaudit
|
|
||||||
--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
|
|
||||||
--disable-omkafka
|
|
||||||
--enable-pmaixforwardedfrom
|
|
||||||
--enable-pmciscoios
|
|
||||||
--enable-pmcisconames
|
|
||||||
--enable-pmlastmsg
|
|
||||||
--enable-pmsnare
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
# DB
|
|
||||||
$(use_enable dbi libdbi)
|
|
||||||
$(use_enable mongodb ommongodb)
|
|
||||||
$(use_enable mysql)
|
|
||||||
$(use_enable postgres pgsql)
|
|
||||||
$(use_enable redis omhiredis)
|
|
||||||
# Debug
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable debug diagtools)
|
|
||||||
$(use_enable debug memcheck)
|
|
||||||
$(use_enable debug rtinst)
|
|
||||||
$(use_enable debug valgrind)
|
|
||||||
# Misc
|
|
||||||
$(use_enable elasticsearch)
|
|
||||||
$(use_enable gcrypt libgcrypt)
|
|
||||||
$(use_enable jemalloc)
|
|
||||||
$(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)
|
|
||||||
)
|
|
||||||
|
|
||||||
econf ${myeconfargs[@]}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
default
|
|
||||||
|
|
||||||
if use doc && [[ "${PV}" == "9999" ]]; then
|
|
||||||
einfo "Building documentation ..."
|
|
||||||
local doc_dir="${S}/docs"
|
|
||||||
cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
|
|
||||||
sphinx-build -b html source build || die "Building documentation failed!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
local _has_increased_ulimit=
|
|
||||||
|
|
||||||
# When adding new tests via patches we have to make them executable
|
|
||||||
einfo "Adjusting permissions of test scripts ..."
|
|
||||||
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
|
|
||||||
die "Failed to adjust test scripts permission"
|
|
||||||
|
|
||||||
if ulimit -n 3072; then
|
|
||||||
_has_increased_ulimit="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! emake --jobs 1 check; then
|
|
||||||
eerror "Test suite failed! :("
|
|
||||||
|
|
||||||
if [ -z "${_has_increased_ulimit}" ]; then
|
|
||||||
eerror "Probably because open file limit couldn't be set to 3072."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if has userpriv $FEATURES; then
|
|
||||||
eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
|
|
||||||
"before you submit a bug report."
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
|
|
||||||
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" ${PN}
|
|
||||||
|
|
||||||
if use mysql; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/mysql
|
|
||||||
doins plugins/ommysql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use postgres; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/pgsql
|
|
||||||
doins plugins/ompgsql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
use doc && dohtml -r "${S}/docs/build/"
|
|
||||||
}
|
|
||||||
|
|
||||||
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"
|
|
||||||
}
|
|
||||||
@ -1,432 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools eutils systemd
|
|
||||||
|
|
||||||
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
|
|
||||||
HOMEPAGE="http://www.rsyslog.com/"
|
|
||||||
|
|
||||||
BRANCH="8-stable"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
|
|
||||||
"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}.git
|
|
||||||
https://github.com/rsyslog/${PN}.git
|
|
||||||
"
|
|
||||||
|
|
||||||
DOC_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}-doc.git
|
|
||||||
https://github.com/rsyslog/${PN}-doc.git
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
else
|
|
||||||
SRC_URI="
|
|
||||||
http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
|
|
||||||
doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
|
|
||||||
"
|
|
||||||
KEYWORDS="~amd64 ~arm ~hppa ~x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-3 LGPL-3 Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof"
|
|
||||||
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test 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:= )
|
|
||||||
jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
|
|
||||||
kerberos? ( virtual/krb5 )
|
|
||||||
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
|
|
||||||
mysql? ( virtual/mysql )
|
|
||||||
normalize? (
|
|
||||||
>=dev-libs/libee-0.4.0
|
|
||||||
>=dev-libs/liblognorm-1.1.2:=
|
|
||||||
)
|
|
||||||
omudpspoof? ( >=net-libs/libnet-1.1.6 )
|
|
||||||
postgres? ( >=dev-db/postgresql-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? (
|
|
||||||
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
|
|
||||||
libressl? ( dev-libs/libressl:= )
|
|
||||||
)
|
|
||||||
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
|
|
||||||
ssl? ( >=net-libs/gnutls-2.12.23:0= )
|
|
||||||
systemd? ( >=sys-apps/systemd-208 )
|
|
||||||
zeromq? ( >=net-libs/czmq-1.2.0 )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
|
|
||||||
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
|
|
||||||
DEPEND+=" >=sys-devel/bison-2.4.3"
|
|
||||||
DEPEND+=" >=dev-python/docutils-0.12"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 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
|
|
||||||
"${FILESDIR}"/${BRANCH}/README.gentoo
|
|
||||||
)
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
git-r3_fetch
|
|
||||||
git-r3_checkout
|
|
||||||
else
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
local _EGIT_BRANCH=
|
|
||||||
if [ -n "${EGIT_BRANCH}" ]; then
|
|
||||||
# Cannot use rsyslog commits/branches for documentation repository
|
|
||||||
_EGIT_BRANCH=${EGIT_BRANCH}
|
|
||||||
unset EGIT_BRANCH
|
|
||||||
fi
|
|
||||||
|
|
||||||
git-r3_fetch "${DOC_REPO_URI}"
|
|
||||||
git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
|
|
||||||
|
|
||||||
if [ -n "${_EGIT_BRANCH}" ]; then
|
|
||||||
# Restore previous EGIT_BRANCH information
|
|
||||||
EGIT_BRANCH=${_EGIT_BRANCH}
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
local doc_tarball="${PN}-doc-${PV}.tar.gz"
|
|
||||||
|
|
||||||
cd "${S}" || die "Cannot change dir into '$S'"
|
|
||||||
mkdir docs || die "Failed to create docs directory"
|
|
||||||
cd docs || die "Failed to change dir into '${S}/docs'"
|
|
||||||
unpack ${doc_tarball}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
elibtoolize --patch-only
|
|
||||||
}
|
|
||||||
|
|
||||||
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=(
|
|
||||||
--disable-debug-symbols
|
|
||||||
--disable-generate-man-pages
|
|
||||||
--without-valgrind-testbench
|
|
||||||
$(use_enable test testbench)
|
|
||||||
# Input Plugins without depedencies
|
|
||||||
--enable-imdiag
|
|
||||||
--enable-imfile
|
|
||||||
--enable-impstats
|
|
||||||
--enable-imptcp
|
|
||||||
# Message Modificiation Plugins without depedencies
|
|
||||||
--enable-mmanon
|
|
||||||
--enable-mmaudit
|
|
||||||
--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
|
|
||||||
--disable-omkafka
|
|
||||||
--enable-pmaixforwardedfrom
|
|
||||||
--enable-pmciscoios
|
|
||||||
--enable-pmcisconames
|
|
||||||
--enable-pmlastmsg
|
|
||||||
--enable-pmsnare
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
# DB
|
|
||||||
$(use_enable dbi libdbi)
|
|
||||||
$(use_enable mongodb ommongodb)
|
|
||||||
$(use_enable mysql)
|
|
||||||
$(use_enable postgres pgsql)
|
|
||||||
$(use_enable redis omhiredis)
|
|
||||||
# Debug
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable debug diagtools)
|
|
||||||
$(use_enable debug memcheck)
|
|
||||||
$(use_enable debug rtinst)
|
|
||||||
$(use_enable debug valgrind)
|
|
||||||
# Misc
|
|
||||||
$(use_enable elasticsearch)
|
|
||||||
$(use_enable gcrypt libgcrypt)
|
|
||||||
$(use_enable jemalloc)
|
|
||||||
$(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)
|
|
||||||
)
|
|
||||||
|
|
||||||
econf ${myeconfargs[@]}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
default
|
|
||||||
|
|
||||||
if use doc && [[ "${PV}" == "9999" ]]; then
|
|
||||||
einfo "Building documentation ..."
|
|
||||||
local doc_dir="${S}/docs"
|
|
||||||
cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
|
|
||||||
sphinx-build -b html source build || die "Building documentation failed!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
local _has_increased_ulimit=
|
|
||||||
|
|
||||||
# When adding new tests via patches we have to make them executable
|
|
||||||
einfo "Adjusting permissions of test scripts ..."
|
|
||||||
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
|
|
||||||
die "Failed to adjust test scripts permission"
|
|
||||||
|
|
||||||
if ulimit -n 3072; then
|
|
||||||
_has_increased_ulimit="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! emake --jobs 1 check; then
|
|
||||||
eerror "Test suite failed! :("
|
|
||||||
|
|
||||||
if [ -z "${_has_increased_ulimit}" ]; then
|
|
||||||
eerror "Probably because open file limit couldn't be set to 3072."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if has userpriv $FEATURES; then
|
|
||||||
eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
|
|
||||||
"before you submit a bug report."
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
|
|
||||||
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" ${PN}
|
|
||||||
|
|
||||||
if use mysql; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/mysql
|
|
||||||
doins plugins/ommysql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use postgres; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/pgsql
|
|
||||||
doins plugins/ompgsql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
use doc && dohtml -r "${S}/docs/build/"
|
|
||||||
}
|
|
||||||
|
|
||||||
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"
|
|
||||||
}
|
|
||||||
@ -1,463 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools eutils linux-info systemd
|
|
||||||
|
|
||||||
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
|
|
||||||
HOMEPAGE="http://www.rsyslog.com/"
|
|
||||||
|
|
||||||
BRANCH="8-stable"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}.git
|
|
||||||
https://github.com/rsyslog/${PN}.git
|
|
||||||
"
|
|
||||||
|
|
||||||
DOC_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}-doc.git
|
|
||||||
https://github.com/rsyslog/${PN}-doc.git
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
else
|
|
||||||
MY_PV=${PV%_rc*}
|
|
||||||
MY_FILENAME="${PN}-${PV}.tar.gz"
|
|
||||||
MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
|
|
||||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
|
||||||
|
|
||||||
# Upstream URL schema:
|
|
||||||
# RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
|
|
||||||
# http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
|
|
||||||
# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
|
|
||||||
|
|
||||||
MY_URL_PREFIX=
|
|
||||||
if [[ ${PV} = *_rc* ]]; then
|
|
||||||
_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
|
|
||||||
_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
|
|
||||||
if [[ ${_tmp_suffix} = *rc* ]]; then
|
|
||||||
MY_URL_PREFIX="${_tmp_suffix}/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Cleaning up temporary variables
|
|
||||||
unset _tmp_last_index
|
|
||||||
unset _tmp_suffix
|
|
||||||
else
|
|
||||||
KEYWORDS="~amd64 ~arm ~hppa ~x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
SRC_URI="
|
|
||||||
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
|
|
||||||
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
|
|
||||||
"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-3 LGPL-3 Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
|
|
||||||
IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/libfastjson-0.99.2:=
|
|
||||||
>=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:= )
|
|
||||||
grok? ( >=dev-libs/grok-0.9.2 )
|
|
||||||
jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
|
|
||||||
kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
|
|
||||||
kerberos? ( virtual/krb5 )
|
|
||||||
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
|
|
||||||
mysql? ( virtual/mysql )
|
|
||||||
normalize? (
|
|
||||||
>=dev-libs/libee-0.4.0
|
|
||||||
>=dev-libs/liblognorm-1.1.2:=
|
|
||||||
)
|
|
||||||
omhttpfs? ( >=net-misc/curl-7.35.0 )
|
|
||||||
omudpspoof? ( >=net-libs/libnet-1.1.6 )
|
|
||||||
postgres? ( >=dev-db/postgresql-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? (
|
|
||||||
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
|
|
||||||
libressl? ( dev-libs/libressl:= )
|
|
||||||
)
|
|
||||||
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
|
|
||||||
ssl? ( >=net-libs/gnutls-2.12.23:0= )
|
|
||||||
systemd? ( >=sys-apps/systemd-208 )
|
|
||||||
zeromq? (
|
|
||||||
>=net-libs/zeromq-4.1.1:=
|
|
||||||
>=net-libs/czmq-3.0.0
|
|
||||||
)"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig
|
|
||||||
test? ( sys-libs/libfaketime )"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
|
|
||||||
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
|
|
||||||
DEPEND+=" >=sys-devel/bison-2.4.3"
|
|
||||||
DEPEND+=" >=dev-python/docutils-0.12"
|
|
||||||
fi
|
|
||||||
|
|
||||||
CONFIG_CHECK="~INOTIFY_USER"
|
|
||||||
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
git-r3_fetch
|
|
||||||
git-r3_checkout
|
|
||||||
else
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
local _EGIT_BRANCH=
|
|
||||||
if [[ -n "${EGIT_BRANCH}" ]]; then
|
|
||||||
# Cannot use rsyslog commits/branches for documentation repository
|
|
||||||
_EGIT_BRANCH=${EGIT_BRANCH}
|
|
||||||
unset EGIT_BRANCH
|
|
||||||
fi
|
|
||||||
|
|
||||||
git-r3_fetch "${DOC_REPO_URI}"
|
|
||||||
git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
|
|
||||||
|
|
||||||
if [[ -n "${_EGIT_BRANCH}" ]]; then
|
|
||||||
# Restore previous EGIT_BRANCH information
|
|
||||||
EGIT_BRANCH=${_EGIT_BRANCH}
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
cd "${S}" || die "Cannot change dir into '${S}'"
|
|
||||||
mkdir docs || die "Failed to create docs directory"
|
|
||||||
cd docs || die "Failed to change dir into '${S}/docs'"
|
|
||||||
unpack ${MY_FILENAME_DOCS}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
if [[ ! ${PV} == "9999" ]]; then
|
|
||||||
eapply -p1 "${FILESDIR}"/8-stable/50-rsyslog-8.18.0-issue964.patch
|
|
||||||
eapply -p1 "${FILESDIR}"/8-stable/50-rsyslog-8.18.0-issue963.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
default
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
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=(
|
|
||||||
--disable-debug-symbols
|
|
||||||
--disable-generate-man-pages
|
|
||||||
--without-valgrind-testbench
|
|
||||||
$(use_enable test testbench)
|
|
||||||
# Input Plugins without depedencies
|
|
||||||
--enable-imdiag
|
|
||||||
--enable-imfile
|
|
||||||
--enable-impstats
|
|
||||||
--enable-imptcp
|
|
||||||
# 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-pmciscoios
|
|
||||||
--enable-pmcisconames
|
|
||||||
--enable-pmlastmsg
|
|
||||||
--enable-pmsnare
|
|
||||||
# DB
|
|
||||||
$(use_enable dbi libdbi)
|
|
||||||
$(use_enable mongodb ommongodb)
|
|
||||||
$(use_enable mysql)
|
|
||||||
$(use_enable postgres pgsql)
|
|
||||||
$(use_enable redis omhiredis)
|
|
||||||
# Debug
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable debug diagtools)
|
|
||||||
$(use_enable debug memcheck)
|
|
||||||
$(use_enable debug rtinst)
|
|
||||||
$(use_enable debug valgrind)
|
|
||||||
# Misc
|
|
||||||
$(use_enable elasticsearch)
|
|
||||||
$(use_enable gcrypt libgcrypt)
|
|
||||||
$(use_enable jemalloc)
|
|
||||||
$(use_enable kafka omkafka)
|
|
||||||
$(use_enable kerberos gssapi-krb5)
|
|
||||||
$(use_enable normalize mmnormalize)
|
|
||||||
$(use_enable grok mmgrok)
|
|
||||||
$(use_enable omhttpfs)
|
|
||||||
$(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 imczmq)
|
|
||||||
$(use_enable zeromq imzmq3)
|
|
||||||
$(use_enable zeromq omczmq)
|
|
||||||
$(use_enable zeromq omzmq3)
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
)
|
|
||||||
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
default
|
|
||||||
|
|
||||||
if use doc && [[ "${PV}" == "9999" ]]; then
|
|
||||||
einfo "Building documentation ..."
|
|
||||||
local doc_dir="${S}/docs"
|
|
||||||
cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
|
|
||||||
sphinx-build -b html source build || die "Building documentation failed!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
local _has_increased_ulimit=
|
|
||||||
|
|
||||||
# Sometimes tests aren't executable (i.e. when added via patch)
|
|
||||||
einfo "Adjusting permissions of test scripts ..."
|
|
||||||
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
|
|
||||||
die "Failed to adjust test scripts permission"
|
|
||||||
|
|
||||||
if ulimit -n 3072; then
|
|
||||||
_has_increased_ulimit="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! emake --jobs 1 check; then
|
|
||||||
eerror "Test suite failed! :("
|
|
||||||
|
|
||||||
if [[ -z "${_has_increased_ulimit}" ]]; then
|
|
||||||
eerror "Probably because open file limit couldn't be set to 3072."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if has userpriv ${FEATURES}; then
|
|
||||||
eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
|
|
||||||
"before you submit a bug report."
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local DOCS=(
|
|
||||||
AUTHORS
|
|
||||||
ChangeLog
|
|
||||||
"${FILESDIR}"/${BRANCH}/README.gentoo
|
|
||||||
)
|
|
||||||
|
|
||||||
use doc && local HTML_DOCS=( "${S}/docs/build/." )
|
|
||||||
|
|
||||||
default
|
|
||||||
|
|
||||||
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" ${PN}
|
|
||||||
|
|
||||||
if use mysql; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/mysql
|
|
||||||
doins plugins/ommysql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use postgres; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/pgsql
|
|
||||||
doins plugins/ompgsql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
prune_libtool_files --modules
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
local 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"
|
|
||||||
}
|
|
||||||
@ -1,458 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit autotools eutils linux-info systemd
|
|
||||||
|
|
||||||
DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
|
|
||||||
HOMEPAGE="http://www.rsyslog.com/"
|
|
||||||
|
|
||||||
BRANCH="8-stable"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}.git
|
|
||||||
https://github.com/rsyslog/${PN}.git
|
|
||||||
"
|
|
||||||
|
|
||||||
DOC_REPO_URI="
|
|
||||||
git://github.com/rsyslog/${PN}-doc.git
|
|
||||||
https://github.com/rsyslog/${PN}-doc.git
|
|
||||||
"
|
|
||||||
|
|
||||||
inherit git-r3
|
|
||||||
else
|
|
||||||
MY_PV=${PV%_rc*}
|
|
||||||
MY_FILENAME="${PN}-${PV}.tar.gz"
|
|
||||||
MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
|
|
||||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
|
||||||
|
|
||||||
# Upstream URL schema:
|
|
||||||
# RC: http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
|
|
||||||
# http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
|
|
||||||
# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
|
|
||||||
|
|
||||||
MY_URL_PREFIX=
|
|
||||||
if [[ ${PV} = *_rc* ]]; then
|
|
||||||
_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
|
|
||||||
_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
|
|
||||||
if [[ ${_tmp_suffix} = *rc* ]]; then
|
|
||||||
MY_URL_PREFIX="${_tmp_suffix}/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Cleaning up temporary variables
|
|
||||||
unset _tmp_last_index
|
|
||||||
unset _tmp_suffix
|
|
||||||
else
|
|
||||||
KEYWORDS="~amd64 ~arm ~hppa ~x86"
|
|
||||||
fi
|
|
||||||
|
|
||||||
SRC_URI="
|
|
||||||
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
|
|
||||||
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
|
|
||||||
"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="GPL-3 LGPL-3 Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs"
|
|
||||||
IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
>=dev-libs/libfastjson-0.99.2:=
|
|
||||||
>=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:= )
|
|
||||||
grok? ( >=dev-libs/grok-0.9.2 )
|
|
||||||
jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
|
|
||||||
kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
|
|
||||||
kerberos? ( virtual/krb5 )
|
|
||||||
mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
|
|
||||||
mysql? ( virtual/mysql )
|
|
||||||
normalize? (
|
|
||||||
>=dev-libs/libee-0.4.0
|
|
||||||
>=dev-libs/liblognorm-1.1.2:=
|
|
||||||
)
|
|
||||||
omhttpfs? ( >=net-misc/curl-7.35.0 )
|
|
||||||
omudpspoof? ( >=net-libs/libnet-1.1.6 )
|
|
||||||
postgres? ( >=dev-db/postgresql-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? (
|
|
||||||
!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
|
|
||||||
libressl? ( dev-libs/libressl:= )
|
|
||||||
)
|
|
||||||
snmp? ( >=net-analyzer/net-snmp-5.7.2 )
|
|
||||||
ssl? ( >=net-libs/gnutls-2.12.23:0= )
|
|
||||||
systemd? ( >=sys-apps/systemd-208 )
|
|
||||||
zeromq? (
|
|
||||||
>=net-libs/zeromq-4.1.1:=
|
|
||||||
>=net-libs/czmq-3.0.0
|
|
||||||
)"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/pkgconfig
|
|
||||||
test? ( sys-libs/libfaketime )"
|
|
||||||
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
|
|
||||||
DEPEND+=" >=sys-devel/flex-2.5.39-r1"
|
|
||||||
DEPEND+=" >=sys-devel/bison-2.4.3"
|
|
||||||
DEPEND+=" >=dev-python/docutils-0.12"
|
|
||||||
fi
|
|
||||||
|
|
||||||
CONFIG_CHECK="~INOTIFY_USER"
|
|
||||||
WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
git-r3_fetch
|
|
||||||
git-r3_checkout
|
|
||||||
else
|
|
||||||
unpack ${P}.tar.gz
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
if [[ ${PV} == "9999" ]]; then
|
|
||||||
local _EGIT_BRANCH=
|
|
||||||
if [[ -n "${EGIT_BRANCH}" ]]; then
|
|
||||||
# Cannot use rsyslog commits/branches for documentation repository
|
|
||||||
_EGIT_BRANCH=${EGIT_BRANCH}
|
|
||||||
unset EGIT_BRANCH
|
|
||||||
fi
|
|
||||||
|
|
||||||
git-r3_fetch "${DOC_REPO_URI}"
|
|
||||||
git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
|
|
||||||
|
|
||||||
if [[ -n "${_EGIT_BRANCH}" ]]; then
|
|
||||||
# Restore previous EGIT_BRANCH information
|
|
||||||
EGIT_BRANCH=${_EGIT_BRANCH}
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
cd "${S}" || die "Cannot change dir into '${S}'"
|
|
||||||
mkdir docs || die "Failed to create docs directory"
|
|
||||||
cd docs || die "Failed to change dir into '${S}/docs'"
|
|
||||||
unpack ${MY_FILENAME_DOCS}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
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=(
|
|
||||||
--disable-debug-symbols
|
|
||||||
--disable-generate-man-pages
|
|
||||||
--without-valgrind-testbench
|
|
||||||
$(use_enable test testbench)
|
|
||||||
# Input Plugins without depedencies
|
|
||||||
--enable-imdiag
|
|
||||||
--enable-imfile
|
|
||||||
--enable-impstats
|
|
||||||
--enable-imptcp
|
|
||||||
# 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-pmciscoios
|
|
||||||
--enable-pmcisconames
|
|
||||||
--enable-pmlastmsg
|
|
||||||
--enable-pmsnare
|
|
||||||
# DB
|
|
||||||
$(use_enable dbi libdbi)
|
|
||||||
$(use_enable mongodb ommongodb)
|
|
||||||
$(use_enable mysql)
|
|
||||||
$(use_enable postgres pgsql)
|
|
||||||
$(use_enable redis omhiredis)
|
|
||||||
# Debug
|
|
||||||
$(use_enable debug)
|
|
||||||
$(use_enable debug diagtools)
|
|
||||||
$(use_enable debug memcheck)
|
|
||||||
$(use_enable debug rtinst)
|
|
||||||
$(use_enable debug valgrind)
|
|
||||||
# Misc
|
|
||||||
$(use_enable elasticsearch)
|
|
||||||
$(use_enable gcrypt libgcrypt)
|
|
||||||
$(use_enable jemalloc)
|
|
||||||
$(use_enable kafka omkafka)
|
|
||||||
$(use_enable kerberos gssapi-krb5)
|
|
||||||
$(use_enable normalize mmnormalize)
|
|
||||||
$(use_enable grok mmgrok)
|
|
||||||
$(use_enable omhttpfs)
|
|
||||||
$(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 imczmq)
|
|
||||||
$(use_enable zeromq imzmq3)
|
|
||||||
$(use_enable zeromq omczmq)
|
|
||||||
$(use_enable zeromq omzmq3)
|
|
||||||
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
|
|
||||||
)
|
|
||||||
|
|
||||||
econf "${myeconfargs[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
default
|
|
||||||
|
|
||||||
if use doc && [[ "${PV}" == "9999" ]]; then
|
|
||||||
einfo "Building documentation ..."
|
|
||||||
local doc_dir="${S}/docs"
|
|
||||||
cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
|
|
||||||
sphinx-build -b html source build || die "Building documentation failed!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
local _has_increased_ulimit=
|
|
||||||
|
|
||||||
# Sometimes tests aren't executable (i.e. when added via patch)
|
|
||||||
einfo "Adjusting permissions of test scripts ..."
|
|
||||||
find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
|
|
||||||
die "Failed to adjust test scripts permission"
|
|
||||||
|
|
||||||
if ulimit -n 3072; then
|
|
||||||
_has_increased_ulimit="true"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! emake --jobs 1 check; then
|
|
||||||
eerror "Test suite failed! :("
|
|
||||||
|
|
||||||
if [[ -z "${_has_increased_ulimit}" ]]; then
|
|
||||||
eerror "Probably because open file limit couldn't be set to 3072."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if has userpriv ${FEATURES}; then
|
|
||||||
eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
|
|
||||||
"before you submit a bug report."
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
local DOCS=(
|
|
||||||
AUTHORS
|
|
||||||
ChangeLog
|
|
||||||
"${FILESDIR}"/${BRANCH}/README.gentoo
|
|
||||||
)
|
|
||||||
|
|
||||||
use doc && local HTML_DOCS=( "${S}/docs/build/." )
|
|
||||||
|
|
||||||
default
|
|
||||||
|
|
||||||
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" ${PN}
|
|
||||||
|
|
||||||
if use mysql; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/mysql
|
|
||||||
doins plugins/ommysql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use postgres; then
|
|
||||||
insinto /usr/share/doc/${PF}/scripts/pgsql
|
|
||||||
doins plugins/ompgsql/createDB.sql
|
|
||||||
fi
|
|
||||||
|
|
||||||
prune_libtool_files --modules
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
local 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"
|
|
||||||
}
|
|
||||||
@ -1,165 +0,0 @@
|
|||||||
# ChangeLog for app-arch/p7zip
|
|
||||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# (auto-generated from git log)
|
|
||||||
|
|
||||||
*p7zip-9.38.1-r2 (09 Aug 2015)
|
|
||||||
*p7zip-9.20.1-r5 (09 Aug 2015)
|
|
||||||
|
|
||||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
+files/9.04-makefile.patch, +files/p7zip,
|
|
||||||
+files/p7zip-9.20.1-CVE-2015-1038.patch, +files/p7zip-9.20.1-QA.patch,
|
|
||||||
+files/p7zip-9.20.1-execstack.patch, +files/p7zip-9.20.1-long_rar_pwd.patch,
|
|
||||||
+files/p7zip-9.38.1-CVE-2015-1038.patch,
|
|
||||||
+files/p7zip-9.38.1-osversion.patch, +metadata.xml, +p7zip-9.20.1-r5.ebuild,
|
|
||||||
+p7zip-9.38.1-r2.ebuild:
|
|
||||||
proj/gentoo: Initial commit
|
|
||||||
|
|
||||||
This commit represents a new era for Gentoo:
|
|
||||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
|
||||||
|
|
||||||
This commit is the start of the NEW history.
|
|
||||||
Any historical data is intended to be grafted onto this point.
|
|
||||||
|
|
||||||
Creation process:
|
|
||||||
1. Take final CVS checkout snapshot
|
|
||||||
2. Remove ALL ChangeLog* files
|
|
||||||
3. Transform all Manifests to thin
|
|
||||||
4. Remove empty Manifests
|
|
||||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
|
||||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
|
||||||
|
|
||||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
|
||||||
tests
|
|
||||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
|
||||||
project
|
|
||||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
|
||||||
developer, wrote Git features for the migration
|
|
||||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
|
||||||
cvs2svn
|
|
||||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
|
||||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
|
||||||
work in migration
|
|
||||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
|
||||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
|
||||||
the bikeshed
|
|
||||||
|
|
||||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
|
||||||
Use https by default
|
|
||||||
|
|
||||||
Convert all URLs for sites supporting encrypted connections from http to
|
|
||||||
https
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
|
||||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
|
||||||
|
|
||||||
repoman does not yet accept the https version.
|
|
||||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/552720
|
|
||||||
|
|
||||||
*p7zip-9.38.1-r3 (24 Oct 2015)
|
|
||||||
|
|
||||||
24 Oct 2015; Pacho Ramos <pacho@gentoo.org> +p7zip-9.38.1-r3.ebuild:
|
|
||||||
Support wxGTK:3.0
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
|
|
||||||
*p7zip-15.09 (28 Oct 2015)
|
|
||||||
|
|
||||||
28 Oct 2015; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/p7zip-15.09-CVE-2015-1038.patch, +p7zip-15.09.ebuild:
|
|
||||||
Version Bump
|
|
||||||
|
|
||||||
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564266
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
29 Oct 2015; Justin Lecher <jlec@gentoo.org> p7zip-15.09.ebuild:
|
|
||||||
Fix build problems for GUI
|
|
||||||
|
|
||||||
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564332
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.23
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
03 Dec 2015; Justin Lecher <jlec@gentoo.org>
|
|
||||||
files/p7zip-15.09-CVE-2015-1038.patch:
|
|
||||||
Add upstream version of CVE patch
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.25
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
07 Jan 2016; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
|
|
||||||
changing maintainer to myself from jlec
|
|
||||||
|
|
||||||
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
|
||||||
|
|
||||||
*p7zip-15.09-r1 (25 Feb 2016)
|
|
||||||
|
|
||||||
25 Feb 2016; Matthew Thode <prometheanfire@gentoo.org>
|
|
||||||
+p7zip-15.09-r1.ebuild:
|
|
||||||
fixing bug 575622
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
|
|
||||||
*p7zip-15.09-r2 (26 Feb 2016)
|
|
||||||
|
|
||||||
26 Feb 2016; Matthew Thode <prometheanfire@gentoo.org>
|
|
||||||
-p7zip-15.09-r1.ebuild, +p7zip-15.09-r2.ebuild:
|
|
||||||
finishing up bug 575622
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
|
|
||||||
*p7zip-15.14 (14 Mar 2016)
|
|
||||||
|
|
||||||
14 Mar 2016; Matthew Thode <prometheanfire@gentoo.org> +p7zip-15.14.ebuild:
|
|
||||||
bup
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
|
|
||||||
14 Mar 2016; Patrick Lauer <patrick@gentoo.org> p7zip-15.14.ebuild:
|
|
||||||
Remove unneeded/broken patching
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
|
|
||||||
26 Mar 2016; Fabian Groffen <grobian@gentoo.org>
|
|
||||||
+files/p7zip-15.14-darwin.patch, p7zip-15.14.ebuild:
|
|
||||||
fix compilation on Darwin, bug #577344
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28-prefix
|
|
||||||
|
|
||||||
28 Mar 2016; Fabian Groffen <grobian@gentoo.org>
|
|
||||||
files/p7zip-15.14-darwin.patch:
|
|
||||||
fix compilation on OSX El Capitan also, bug #577344
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28-prefix
|
|
||||||
|
|
||||||
*p7zip-15.14.1 (10 Apr 2016)
|
|
||||||
|
|
||||||
10 Apr 2016; Matthew Thode <prometheanfire@gentoo.org>
|
|
||||||
+p7zip-15.14.1.ebuild:
|
|
||||||
bup for bug 579196
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
|
|
||||||
10 Apr 2016; Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
+files/p7zip-15.14.1-darwin.patch:
|
|
||||||
Added missing darwin patch (bug #579482).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
|
||||||
|
|
||||||
13 May 2016; Agostino Sarubbo <ago@gentoo.org> p7zip-15.14.1.ebuild:
|
|
||||||
amd64 stable wrt bug #582364
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
RepoMan-Options: --include-arches="amd64"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
@ -1,695 +0,0 @@
|
|||||||
# ChangeLog for app-arch/p7zip
|
|
||||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/p7zip/ChangeLog,v 1.179 2015/07/30 19:10:41 jlec Exp $
|
|
||||||
|
|
||||||
30 Jul 2015; Justin Lecher <jlec@gentoo.org> -p7zip-9.20.1-r4.ebuild:
|
|
||||||
Drop vulnerable version, bug #536012
|
|
||||||
|
|
||||||
30 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
ia64 stable wrt bug #536012
|
|
||||||
|
|
||||||
24 Jun 2015; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Stable for ppc, wrt bug #536012
|
|
||||||
|
|
||||||
*p7zip-9.38.1-r2 (22 Jun 2015)
|
|
||||||
|
|
||||||
22 Jun 2015; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/p7zip-9.38.1-CVE-2015-1038.patch, +p7zip-9.38.1-r2.ebuild,
|
|
||||||
-p7zip-9.38.1-r1.ebuild:
|
|
||||||
Fix CVE-2015-1038 in latest version, bug #536012
|
|
||||||
|
|
||||||
21 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
alpha stable wrt bug #536012
|
|
||||||
|
|
||||||
20 Jun 2015; Jeroen Roovers <jer@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Stable for PPC64 (bug #536012).
|
|
||||||
|
|
||||||
18 Jun 2015; Jeroen Roovers <jer@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Stable for HPPA (bug #536012).
|
|
||||||
|
|
||||||
17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Stable for sparc, wrt bug #536012
|
|
||||||
|
|
||||||
17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Stable for x86, wrt bug #536012
|
|
||||||
|
|
||||||
16 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
amd64 stable wrt bug #536012
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r5 (16 Jun 2015)
|
|
||||||
|
|
||||||
16 Jun 2015; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/p7zip-9.20.1-CVE-2015-1038.patch, +p7zip-9.20.1-r5.ebuild:
|
|
||||||
Import debian patch for CVE-2015-1038, bug #536012; latest version is still
|
|
||||||
vulnerable
|
|
||||||
|
|
||||||
09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
|
||||||
Updating remote-id in metadata.xml
|
|
||||||
|
|
||||||
*p7zip-9.38.1-r1 (04 May 2015)
|
|
||||||
|
|
||||||
04 May 2015; Justin Lecher <jlec@gentoo.org> +p7zip-9.38.1-r1.ebuild,
|
|
||||||
-p7zip-9.20.1-r5.ebuild, -p7zip-9.38.1.ebuild, p7zip-9.20.1-r4.ebuild:
|
|
||||||
Correctly fix bug #465296, thanks Wadlax figuring this out
|
|
||||||
|
|
||||||
08 Apr 2015; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/p7zip-9.38.1-osversion.patch, p7zip-9.38.1.ebuild:
|
|
||||||
Fix compilation problems on x86, bug #545912
|
|
||||||
|
|
||||||
07 Apr 2015; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild,
|
|
||||||
p7zip-9.20.1-r5.ebuild, p7zip-9.38.1.ebuild:
|
|
||||||
Drop useless Desktop items, bug #465296
|
|
||||||
|
|
||||||
*p7zip-9.38.1 (07 Apr 2015)
|
|
||||||
|
|
||||||
07 Apr 2015; Justin Lecher <jlec@gentoo.org> +p7zip-9.38.1.ebuild:
|
|
||||||
Version Bump, bug #545202
|
|
||||||
|
|
||||||
10 May 2014; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r5.ebuild:
|
|
||||||
Add support for x32, #506602, patch by Luke-Jr
|
|
||||||
|
|
||||||
24 Dec 2013; Tom Wijsman <TomWij@gentoo.org> -files/9.04-kde4.patch,
|
|
||||||
-files/p7zip-9.13-QA.patch:
|
|
||||||
[QA] Remove unused files.
|
|
||||||
|
|
||||||
16 Nov 2013; Ryan Hill <dirtyepic@gentoo.org> p7zip-9.20.1-r4.ebuild,
|
|
||||||
p7zip-9.20.1-r5.ebuild:
|
|
||||||
Remove wxwidgets_pkg_setup call (unnecessary with USE deps).
|
|
||||||
|
|
||||||
19 Sep 2013; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild,
|
|
||||||
p7zip-9.20.1-r5.ebuild:
|
|
||||||
Drop icon extention from icon file, #478706
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r5 (18 Sep 2013)
|
|
||||||
|
|
||||||
18 Sep 2013; Justin Lecher <jlec@gentoo.org> +p7zip-9.20.1-r5.ebuild,
|
|
||||||
+files/p7zip-9.20.1-long_rar_pwd.patch:
|
|
||||||
Patch for long filenames in rar archives, #484970; thanks M.B. preparing the
|
|
||||||
patch
|
|
||||||
|
|
||||||
11 Aug 2013; Justin Lecher <jlec@gentoo.org> -p7zip-9.13.ebuild,
|
|
||||||
-p7zip-9.13-r3.ebuild:
|
|
||||||
Drop old
|
|
||||||
|
|
||||||
04 Aug 2013; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r4.ebuild:
|
|
||||||
Stable for sparc/ia64, wrt to bug #477180
|
|
||||||
|
|
||||||
01 Aug 2013; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r4.ebuild:
|
|
||||||
Drop full path from icon
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r4 (01 Aug 2013)
|
|
||||||
|
|
||||||
01 Aug 2013; Justin Lecher <jlec@gentoo.org> -p7zip-9.20.1-r3.ebuild,
|
|
||||||
+p7zip-9.20.1-r4.ebuild, metadata.xml:
|
|
||||||
Fix icon in desktop file, #478706
|
|
||||||
|
|
||||||
30 Jul 2013; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Stable for alpha, wrt bug #477180
|
|
||||||
|
|
||||||
22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Stable for ppc64, wrt bug #477180
|
|
||||||
|
|
||||||
22 Jul 2013; Agostino Sarubbo <ago@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Stable for ppc, wrt bug #477180
|
|
||||||
|
|
||||||
18 Jul 2013; Sergey Popov <pinkbyte@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Stable on amd64 and x86, wrt bug #477180
|
|
||||||
|
|
||||||
17 Jul 2013; Jeroen Roovers <jer@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Stable for HPPA (bug #477180).
|
|
||||||
|
|
||||||
28 Mar 2013; Mike Frysinger <vapier@gentoo.org> p7zip-9.20.1-r3.ebuild:
|
|
||||||
Add ~s390 love #443914.
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r3 (09 Jun 2012)
|
|
||||||
|
|
||||||
09 Jun 2012; Justin Lecher <jlec@gentoo.org> -p7zip-9.20.1-r2.ebuild,
|
|
||||||
+p7zip-9.20.1-r3.ebuild:
|
|
||||||
Drop -O -pipe from buildsystem, add -- to emake so that -l doesn't get
|
|
||||||
confused by 7z* make targets, #420393
|
|
||||||
|
|
||||||
07 Jun 2012; Julian Ospald <hasufell@gentoo.org> p7zip-9.13.ebuild,
|
|
||||||
p7zip-9.13-r3.ebuild, +files/p7zip-9.13-QA.patch, -p7zip-9.20.1.ebuild,
|
|
||||||
-p7zip-9.20.1-r1.ebuild, p7zip-9.20.1-r2.ebuild,
|
|
||||||
+files/p7zip-9.20.1-QA.patch:
|
|
||||||
fix QA issues wrt bug #420011 and drop old
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r2 (30 May 2012)
|
|
||||||
|
|
||||||
30 May 2012; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1-r1.ebuild,
|
|
||||||
+p7zip-9.20.1-r2.ebuild, +files/p7zip-9.20.1-execstack.patch:
|
|
||||||
Give desktop files better names, #418179; drop in no execstack pacth from
|
|
||||||
fedora
|
|
||||||
|
|
||||||
*p7zip-9.20.1-r1 (23 Apr 2012)
|
|
||||||
|
|
||||||
23 Apr 2012; Justin Lecher <jlec@gentoo.org> +p7zip-9.20.1-r1.ebuild:
|
|
||||||
Bump to EAPI=4, create and install 7zFM binary and create .desktop launcher,
|
|
||||||
thanks Giorgos Anastasiou for the report
|
|
||||||
|
|
||||||
07 Oct 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1.ebuild,
|
|
||||||
metadata.xml:
|
|
||||||
Do only install one .desktop file for compression, #366465
|
|
||||||
|
|
||||||
19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
|
|
||||||
Fix metadata.xml
|
|
||||||
|
|
||||||
19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
|
|
||||||
remove radek from metadata.xml
|
|
||||||
|
|
||||||
17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
|
|
||||||
p7zip-9.20.1.ebuild:
|
|
||||||
keyword ~sparc-solaris
|
|
||||||
|
|
||||||
27 Mar 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.20.1.ebuild:
|
|
||||||
Added missing dep on dev-lang/*asm, #360743
|
|
||||||
|
|
||||||
*p7zip-9.20.1 (26 Mar 2011)
|
|
||||||
|
|
||||||
26 Mar 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.13.ebuild,
|
|
||||||
-p7zip-9.13-r2.ebuild, p7zip-9.13-r3.ebuild, +p7zip-9.20.1.ebuild:
|
|
||||||
Version Bump, #360201
|
|
||||||
|
|
||||||
21 Mar 2011; Justin Lecher <jlec@gentoo.org> p7zip-9.13.ebuild,
|
|
||||||
p7zip-9.13-r2.ebuild, p7zip-9.13-r3.ebuild, metadata.xml:
|
|
||||||
Correcting DEPs from kde-base/konqueror to kde-base/kdelibs
|
|
||||||
|
|
||||||
*p7zip-9.13-r3 (14 Nov 2010)
|
|
||||||
|
|
||||||
14 Nov 2010; Justin Lecher <jlec@gentoo.org> +p7zip-9.13-r3.ebuild:
|
|
||||||
Fix for Native multilib support
|
|
||||||
|
|
||||||
11 Nov 2010; Michael Weber <xmw@gentoo.org> p7zip-9.13.ebuild,
|
|
||||||
p7zip-9.13-r2.ebuild:
|
|
||||||
Added ~arm keyword (bug #344821)
|
|
||||||
|
|
||||||
04 Nov 2010; Justin Lecher <jlec@gentoo.org> -files/4.65-hardlink.patch,
|
|
||||||
-p7zip-4.65-r1.ebuild, -files/4.65-kde4.patch, -p7zip-9.13-r1.ebuild,
|
|
||||||
-files/4.65-makefile.patch, -p7zip-4.58.ebuild:
|
|
||||||
Cleaned old versions
|
|
||||||
|
|
||||||
*p7zip-9.13-r2 (04 Nov 2010)
|
|
||||||
|
|
||||||
04 Nov 2010; Justin Lecher <jlec@gentoo.org> +p7zip-9.13-r2.ebuild:
|
|
||||||
Installing updated version of p7zip wrapper from upstream instead of out
|
|
||||||
own, #344143
|
|
||||||
|
|
||||||
02 Oct 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild:
|
|
||||||
Marked ~x64-macos, bug #333981
|
|
||||||
|
|
||||||
30 Sep 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild:
|
|
||||||
Make fix for bug #338375 partially conditional for USE=rar
|
|
||||||
|
|
||||||
30 Sep 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.13-r1.ebuild:
|
|
||||||
Fix loading of 7z.bundle on Darwin, bug #338375
|
|
||||||
|
|
||||||
*p7zip-9.13-r1 (19 Sep 2010)
|
|
||||||
|
|
||||||
19 Sep 2010; Justin Lecher <jlec@gentoo.org> -p7zip-4.57.ebuild,
|
|
||||||
-p7zip-4.58-r1.ebuild, -p7zip-4.65.ebuild, -p7zip-9.04.ebuild,
|
|
||||||
+p7zip-9.13-r1.ebuild:
|
|
||||||
Added pch USE and do not mix CFLAGS/CXXFLAGS
|
|
||||||
|
|
||||||
13 Aug 2010; Joseph Jezak <josejx@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
Marked ppc stable for bug #326831.
|
|
||||||
|
|
||||||
25 Jul 2010; Raúl Porcel <armin76@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
alpha/ia64/sparc stable wrt #326831
|
|
||||||
|
|
||||||
15 Jul 2010; Markus Meier <maekke@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
x86 stable, bug #326831
|
|
||||||
|
|
||||||
13 Jul 2010; Jeroen Roovers <jer@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
Stable for HPPA (bug #326831).
|
|
||||||
|
|
||||||
09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
ppc64 stable wrt #326831
|
|
||||||
|
|
||||||
04 Jul 2010; Markos Chandras <hwoarang@gentoo.org> p7zip-9.13.ebuild:
|
|
||||||
Stable on amd64 wrt bug #326831
|
|
||||||
|
|
||||||
26 Jun 2010; <nixnut@gentoo.org> p7zip-4.65-r1.ebuild:
|
|
||||||
ppc stable #323025
|
|
||||||
|
|
||||||
16 Jun 2010; Markos Chandras <hwoarang@gentoo.org> p7zip-4.65-r1.ebuild:
|
|
||||||
Stable on amd64 wrt bug #323025
|
|
||||||
|
|
||||||
16 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> p7zip-4.65-r1.ebuild:
|
|
||||||
x86 stable wrt bug #323025
|
|
||||||
|
|
||||||
*p7zip-9.13 (07 Jun 2010)
|
|
||||||
|
|
||||||
07 Jun 2010; Justin Lecher <jlec@gentoo.org> +p7zip-9.13.ebuild:
|
|
||||||
Version Bump
|
|
||||||
|
|
||||||
07 Jun 2010; Justin Lecher <jlec@gentoo.org> p7zip-4.65.ebuild,
|
|
||||||
p7zip-4.65-r1.ebuild, p7zip-9.04.ebuild:
|
|
||||||
removed stupid gui based tests
|
|
||||||
|
|
||||||
13 Apr 2010; Jeremy Olexa <darkside@gentoo.org> p7zip-9.04.ebuild:
|
|
||||||
This sed statement for darwin cannot die because USE=-rar removes one of
|
|
||||||
the two targets. bug 314429
|
|
||||||
|
|
||||||
08 Mar 2010; Fabian Groffen <grobian@gentoo.org> p7zip-9.04.ebuild:
|
|
||||||
Fix issues on Darwin: use correct makefile, patch makefile for rar, bug
|
|
||||||
#305723
|
|
||||||
|
|
||||||
16 Feb 2010; Justin Lecher <jlec@gentoo.org> p7zip-9.04.ebuild:
|
|
||||||
Fix for correct symlinking, 305345
|
|
||||||
|
|
||||||
*p7zip-9.04 (15 Feb 2010)
|
|
||||||
|
|
||||||
15 Feb 2010; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/9.04-kde4.patch, +p7zip-9.04.ebuild, +files/9.04-makefile.patch:
|
|
||||||
Version Bump per 300838
|
|
||||||
|
|
||||||
*p7zip-4.58-r1 (15 Feb 2010)
|
|
||||||
*p7zip-4.65-r1 (15 Feb 2010)
|
|
||||||
|
|
||||||
15 Feb 2010; Justin Lecher <jlec@gentoo.org>
|
|
||||||
+files/4.65-kde4.patch, +p7zip-4.58-r1.ebuild, +p7zip-4.65-r1.ebuild,
|
|
||||||
metadata.xml:
|
|
||||||
added myself as maintainer, Respect multilib enviroments per 282228,
|
|
||||||
Fixes for kde4 per 273566, thanks Chin Yee for the contribution,
|
|
||||||
fixes for compilation with debug version of wxGTK #282079
|
|
||||||
|
|
||||||
15 Jan 2010; Jonathan Callen <abcd@gentoo.org> p7zip-4.65.ebuild:
|
|
||||||
Add prefix keywords
|
|
||||||
|
|
||||||
01 Nov 2009; Jonathan Callen <abcd@gentoo.org> p7zip-4.65.ebuild:
|
|
||||||
Drop kde-base/kdebase-meta from deps
|
|
||||||
|
|
||||||
03 May 2009; Ryan Hill <dirtyepic@gentoo.org> p7zip-4.65.ebuild:
|
|
||||||
Fix build error when wxGTK built with odbc support (bug #267698) and
|
|
||||||
checking wxGTK USE flags even when USE="-wxwidgets" (bug #267803).
|
|
||||||
Also, depend on the correct SLOT.
|
|
||||||
|
|
||||||
01 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
|
|
||||||
p7zip-4.65.ebuild:
|
|
||||||
Rename "wxwindows" USE flag to "wxwidgets".
|
|
||||||
|
|
||||||
01 May 2009; Jeroen Roovers <jer@gentoo.org> p7zip-4.65.ebuild:
|
|
||||||
Restore dropped keywords.
|
|
||||||
|
|
||||||
27 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> p7zip-4.65.ebuild:
|
|
||||||
Few build system updates. Make it work with kde4.
|
|
||||||
|
|
||||||
*p7zip-4.65 (26 Apr 2009)
|
|
||||||
|
|
||||||
26 Apr 2009; Patrick Lauer <patrick@gentoo.org>
|
|
||||||
+files/4.65-hardlink.patch, +files/4.65-makefile.patch, metadata.xml,
|
|
||||||
+p7zip-4.65.ebuild:
|
|
||||||
Bump to 4.65, closes #249780. Based on the ebuild by jlec, incorporating
|
|
||||||
changes from Flameeyes, Sergey Dryabzhinsky, Ilya Kashirin, A.C.Heron and
|
|
||||||
Chi-Thanh Christopher Nguyen.
|
|
||||||
|
|
||||||
25 Jan 2009; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
Removed unnecesary warning as per bug #126722
|
|
||||||
|
|
||||||
27 Dec 2008; Jeremy Olexa <darkside@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
amd64 stable, bug #236591
|
|
||||||
|
|
||||||
05 Dec 2008; Raúl Porcel <armin76@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
x86 stable wrt #236591
|
|
||||||
|
|
||||||
12 Nov 2008; Brent Baude <ranger@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
stable ppc64, bug 236591
|
|
||||||
|
|
||||||
08 Nov 2008; nixnut <nixnut@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
Stable on ppc wrt bug 236591
|
|
||||||
|
|
||||||
07 Nov 2008; Jeroen Roovers <jer@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
Stable for HPPA (bug #236591).
|
|
||||||
|
|
||||||
06 Nov 2008; Ferris McCormick <fmccor@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
Sparc stable, Bug #236591.
|
|
||||||
|
|
||||||
04 Sep 2008; Mike Frysinger <vapier@gentoo.org> p7zip-4.58.ebuild:
|
|
||||||
Use newbin instead of ugly mv && dobin.
|
|
||||||
|
|
||||||
*p7zip-4.58 (20 Jul 2008)
|
|
||||||
|
|
||||||
20 Jul 2008; Hanno Boeck <hanno@gentoo.org> +p7zip-4.58.ebuild:
|
|
||||||
Version bump.
|
|
||||||
|
|
||||||
21 Mar 2008; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
-files/p7zip-4.55-open_lzma_alone.patch, -p7zip-4.55-r1.ebuild:
|
|
||||||
removed old version due to security problems #213889
|
|
||||||
|
|
||||||
16 Mar 2008; nixnut <nixnut@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
Stable on ppc wrt bug 213595
|
|
||||||
|
|
||||||
05 Feb 2008; Markus Rothe <corsair@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
Stable on ppc64
|
|
||||||
|
|
||||||
03 Feb 2008; Dawid Węgliński <cla@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
Remove app-arch/rar-unpacker from postinst() as it's no longer in the tree
|
|
||||||
|
|
||||||
29 Jan 2008; Samuli Suominen <drac@gentoo.org> -p7zip-4.44.ebuild,
|
|
||||||
-p7zip-4.45.ebuild, -p7zip-4.48.ebuild, -p7zip-4.51.ebuild,
|
|
||||||
-p7zip-4.55.ebuild:
|
|
||||||
Remove unused versions.
|
|
||||||
|
|
||||||
29 Jan 2008; Jeroen Roovers <jer@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
Stable for HPPA (bug #207520).
|
|
||||||
|
|
||||||
29 Jan 2008; Richard Freeman <rich0@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
amd64 stable
|
|
||||||
|
|
||||||
26 Jan 2008; Brent Baude <ranger@gentoo.org> p7zip-4.55-r1.ebuild:
|
|
||||||
Marking p7zip-4.55-r1 ppc64 for bug 207520
|
|
||||||
|
|
||||||
26 Jan 2008; Raúl Porcel <armin76@gentoo.org> p7zip-4.57.ebuild:
|
|
||||||
sparc/x86 stable
|
|
||||||
|
|
||||||
14 Jan 2008; Tobias Scherbaum <dertobi123@gentoo.org>
|
|
||||||
p7zip-4.55-r1.ebuild:
|
|
||||||
ppc. stable
|
|
||||||
|
|
||||||
*p7zip-4.57 (25 Dec 2007)
|
|
||||||
|
|
||||||
25 Dec 2007; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.57.ebuild:
|
|
||||||
Version bump and fix for 194354
|
|
||||||
|
|
||||||
05 Dec 2007; Samuli Suominen <drac@gentoo.org> p7zip-4.55-r1.ebuild:
|
|
||||||
amd64 stable as part of bug 198314, file-collision with lzma-utils.
|
|
||||||
|
|
||||||
*p7zip-4.55-r1 (05 Dec 2007)
|
|
||||||
|
|
||||||
05 Dec 2007; Mike Frysinger <vapier@gentoo.org> +p7zip-4.55-r1.ebuild:
|
|
||||||
Do not install /usr/bin/lzma as there are other/dedicated packages that
|
|
||||||
install just the lzma compression utilities #198324.
|
|
||||||
|
|
||||||
01 Dec 2007; Markus Rothe <corsair@gentoo.org> p7zip-4.55.ebuild:
|
|
||||||
Stable on ppc64
|
|
||||||
|
|
||||||
26 Oct 2007; Jeroen Roovers <jer@gentoo.org> p7zip-4.55.ebuild:
|
|
||||||
Stable for HPPA too.
|
|
||||||
|
|
||||||
24 Oct 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.55.ebuild:
|
|
||||||
sparc/x86 stable
|
|
||||||
|
|
||||||
23 Oct 2007; Peter Weller <welp@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
Stable on amd64 wrt bug 193771
|
|
||||||
|
|
||||||
13 Oct 2007; Markus Rothe <corsair@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
Stable on ppc64; bug #193771
|
|
||||||
|
|
||||||
12 Oct 2007; Lars Weiler <pylon@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
stable ppc, bug #193771
|
|
||||||
|
|
||||||
08 Oct 2007; Fabian Groffen <grobian@gentoo.org> p7zip-4.44.ebuild,
|
|
||||||
p7zip-4.45.ebuild, p7zip-4.48.ebuild, p7zip-4.51.ebuild,
|
|
||||||
p7zip-4.55.ebuild:
|
|
||||||
Dropped ppc-macos keyword, see you in prefix
|
|
||||||
|
|
||||||
06 Oct 2007; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.55.ebuild:
|
|
||||||
added quotes for FILESDIR
|
|
||||||
|
|
||||||
25 Sep 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
sparc stable
|
|
||||||
|
|
||||||
*p7zip-4.55 (23 Sep 2007)
|
|
||||||
|
|
||||||
23 Sep 2007; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
+files/p7zip-4.55-open_lzma_alone.patch, +p7zip-4.55.ebuild:
|
|
||||||
version bump with experimental lzma_alone patch
|
|
||||||
|
|
||||||
17 Sep 2007; Jeroen Roovers <jer@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
Stable for HPPA too.
|
|
||||||
|
|
||||||
30 Aug 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.51.ebuild:
|
|
||||||
x86 stable
|
|
||||||
|
|
||||||
29 Aug 2007; Jeroen Roovers <jer@gentoo.org> p7zip-4.48.ebuild:
|
|
||||||
Stable for HPPA too.
|
|
||||||
|
|
||||||
09 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> p7zip-4.48.ebuild:
|
|
||||||
Stable on ppc.
|
|
||||||
|
|
||||||
02 Aug 2007; Christian Birchinger <joker@gentoo.org> p7zip-4.48.ebuild:
|
|
||||||
Added sparc stable keyword
|
|
||||||
|
|
||||||
*p7zip-4.51 (01 Aug 2007)
|
|
||||||
|
|
||||||
01 Aug 2007; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.51.ebuild:
|
|
||||||
version bump, closes #187308, introduces lzma binary.
|
|
||||||
|
|
||||||
01 Aug 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.48.ebuild:
|
|
||||||
x86 stable
|
|
||||||
|
|
||||||
*p7zip-4.48 (01 Jul 2007)
|
|
||||||
|
|
||||||
01 Jul 2007; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
-files/p7zip-4.30-gcc41.diff, -files/7z, -files/7za,
|
|
||||||
-files/p7zip-4.16_x86_static.patch, -p7zip-4.20.ebuild,
|
|
||||||
-p7zip-4.30.ebuild, -p7zip-4.33.ebuild, -p7zip-4.39.ebuild,
|
|
||||||
-p7zip-4.42.ebuild, -p7zip-4.43.ebuild, +p7zip-4.48.ebuild:
|
|
||||||
version bump, and orphaned files cleaning
|
|
||||||
|
|
||||||
12 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> p7zip-4.45.ebuild:
|
|
||||||
Stable on sparc
|
|
||||||
|
|
||||||
11 Jun 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.45.ebuild:
|
|
||||||
x86 stable
|
|
||||||
|
|
||||||
*p7zip-4.45 (15 May 2007)
|
|
||||||
|
|
||||||
15 May 2007; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.45.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
01 Apr 2007; Michael Hanselmann <hansmi@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
Stable on ppc.
|
|
||||||
|
|
||||||
25 Mar 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
Add ~ia64
|
|
||||||
|
|
||||||
17 Mar 2007; Steve Dibb <beandog@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
amd64 stable
|
|
||||||
|
|
||||||
12 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
Stable on sparc
|
|
||||||
|
|
||||||
12 Mar 2007; Raúl Porcel <armin76@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
x86 stable
|
|
||||||
|
|
||||||
09 Mar 2007; Jeroen Roovers <jer@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
Stable for HPPA (xarchiver, perhaps bug #157879).
|
|
||||||
|
|
||||||
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
|
|
||||||
Transition to Manifest2.
|
|
||||||
|
|
||||||
04 Feb 2007; Brent Baude <ranger@gentoo.org> p7zip-4.44.ebuild:
|
|
||||||
Marking p7zip-4.44 ~ppc64 for an xfce4 dep per Drac
|
|
||||||
|
|
||||||
02 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
Stable on sparc
|
|
||||||
|
|
||||||
*p7zip-4.44 (26 Jan 2007)
|
|
||||||
|
|
||||||
26 Jan 2007; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.44.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
04 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> p7zip-4.43.ebuild:
|
|
||||||
Add ~alpha keyword.
|
|
||||||
|
|
||||||
28 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> p7zip-4.43.ebuild:
|
|
||||||
Add ~x86-fbsd keyword.
|
|
||||||
|
|
||||||
21 Oct 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.43.ebuild:
|
|
||||||
QA fix: Leading Space Syntax Error. Line 37
|
|
||||||
|
|
||||||
21 Oct 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.43.ebuild:
|
|
||||||
arghh, wrongly commited stable keywords after version bump. shame on me.
|
|
||||||
|
|
||||||
*p7zip-4.43 (21 Oct 2006)
|
|
||||||
|
|
||||||
21 Oct 2006; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.43.ebuild:
|
|
||||||
version bump, fixes #150498 #137579 #150766
|
|
||||||
|
|
||||||
04 Sep 2006; Saleem Abdulrasool <compnerd@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
stable on x86 (bug #145282)
|
|
||||||
|
|
||||||
29 Aug 2006; Tobias Scherbaum <dertobi123@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
ppc stable, bug #145282
|
|
||||||
|
|
||||||
27 Aug 2006; Jason Wever <weeve@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
Added ~sparc keyword.
|
|
||||||
|
|
||||||
27 Aug 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
THanks to Fabian Groffen, closed #109949
|
|
||||||
|
|
||||||
02 Aug 2006; Patrick McLean <chutzpah@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
Stable on amd64 (bug #142395).
|
|
||||||
|
|
||||||
22 Jun 2006; Simon Stelling <blubb@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
added ~amd64 keyword
|
|
||||||
|
|
||||||
10 Jun 2006; Michael Hanselmann <hansmi@gentoo.org> p7zip-4.39.ebuild:
|
|
||||||
Stable on ppc.
|
|
||||||
|
|
||||||
03 Jun 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.42.ebuild:
|
|
||||||
Cross compilation fix, thanks to Josu Lopez Fernandez #135417
|
|
||||||
|
|
||||||
29 May 2006; Mark Loeser <halcy0n@gentoo.org> p7zip-4.39.ebuild:
|
|
||||||
Stable on x86; bug #134513
|
|
||||||
|
|
||||||
*p7zip-4.42 (28 May 2006)
|
|
||||||
|
|
||||||
28 May 2006; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.42.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
27 May 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.39.ebuild:
|
|
||||||
fixed missing 7zr compilation/installation
|
|
||||||
|
|
||||||
*p7zip-4.39 (16 Apr 2006)
|
|
||||||
|
|
||||||
16 Apr 2006; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.39.ebuild:
|
|
||||||
Version bump. Fixes partially #126722
|
|
||||||
|
|
||||||
22 Mar 2006; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.33.ebuild:
|
|
||||||
removed amd64 keyword due to fPIC bug #126722
|
|
||||||
|
|
||||||
*p7zip-4.33 (18 Mar 2006)
|
|
||||||
|
|
||||||
18 Mar 2006; Radoslaw Stachowiak <radek@gentoo.org> +files/p7zip,
|
|
||||||
-p7zip-4.20-r1.ebuild, -p7zip-4.27.ebuild, +p7zip-4.33.ebuild:
|
|
||||||
version bump to 4.33, not using gcc-4.1 patch anymore
|
|
||||||
removed obsolete versions (4.2*)
|
|
||||||
|
|
||||||
31 Jan 2006; Hanno Boeck <hanno@gentoo.org> +files/p7zip-4.30-gcc41.diff,
|
|
||||||
p7zip-4.30.ebuild:
|
|
||||||
Fix for gcc 4.1.
|
|
||||||
|
|
||||||
*p7zip-4.30 (11 Dec 2005)
|
|
||||||
|
|
||||||
11 Dec 2005; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.30.ebuild:
|
|
||||||
version bump, closes #113670
|
|
||||||
|
|
||||||
04 Oct 2005; Simon Stelling <blubb@gentoo.org> p7zip-4.27.ebuild:
|
|
||||||
fix bug 107166 and make it respect multilib-strict
|
|
||||||
|
|
||||||
25 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> files/7z, files/7za:
|
|
||||||
changed wrapper script to include " around @
|
|
||||||
|
|
||||||
25 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> files/7z, +files/7za,
|
|
||||||
-p7zip-0.91.ebuild, p7zip-4.27.ebuild:
|
|
||||||
fixed bug #107107 with wrong wrapper/symlink usage. removed old version.
|
|
||||||
|
|
||||||
24 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.27.ebuild:
|
|
||||||
Removed ppc-macos keyword due to compilation bug
|
|
||||||
|
|
||||||
*p7zip-4.27 (24 Sep 2005)
|
|
||||||
|
|
||||||
24 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.27.ebuild:
|
|
||||||
changed -O1 to make.conf CFLAGS
|
|
||||||
added plugins compilation and installation (/usr/lib/p7zip) closes #104248
|
|
||||||
version bump
|
|
||||||
|
|
||||||
14 Sep 2005; Fabian Groffen <grobian@gentoo.org> p7zip-4.20-r1.ebuild:
|
|
||||||
Marking ~ppc-macos (bug #105853)
|
|
||||||
|
|
||||||
*p7zip-4.20-r1 (27 Aug 2005)
|
|
||||||
|
|
||||||
27 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> -p7zip-4.16.ebuild,
|
|
||||||
-p7zip-4.18.ebuild, +p7zip-4.20-r1.ebuild:
|
|
||||||
Fixed #103605 thanks to Bruce Guenter.
|
|
||||||
Removed obsoleted versions.
|
|
||||||
|
|
||||||
10 Aug 2005; Luis Medinas <metalgod@gentoo.org> p7zip-4.20.ebuild:
|
|
||||||
Marked Stable on AMD64.
|
|
||||||
|
|
||||||
09 Aug 2005; Joseph Jezak <josejx@gentoo.org> p7zip-4.20.ebuild:
|
|
||||||
Marked ppc stable.
|
|
||||||
|
|
||||||
08 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.20.ebuild:
|
|
||||||
marked stable on x86
|
|
||||||
|
|
||||||
*p7zip-4.20 (06 Jun 2005)
|
|
||||||
|
|
||||||
06 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
-files/p7zip-4.14_x86_static.patch, -p7zip-4.14.ebuild,
|
|
||||||
+p7zip-4.20.ebuild:
|
|
||||||
Removed old 4.14 ebuild.
|
|
||||||
Added new 4.20 (version bump).
|
|
||||||
|
|
||||||
06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> p7zip-4.16.ebuild:
|
|
||||||
amd64 stable
|
|
||||||
|
|
||||||
27 May 2005; Joseph Jezak <josejx@gentoo.org> p7zip-4.16.ebuild:
|
|
||||||
Marked ppc stable.
|
|
||||||
|
|
||||||
*p7zip-4.18 (15 May 2005)
|
|
||||||
|
|
||||||
15 May 2005; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.18.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
15 May 2005; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.16.ebuild:
|
|
||||||
stable on x86
|
|
||||||
|
|
||||||
09 May 2005; David Holm <dholm@gentoo.org> p7zip-4.14.ebuild:
|
|
||||||
Stable on ppc.
|
|
||||||
|
|
||||||
15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
-files/p7zip-4.10_x86_dynamic.patch, -files/p7zip-4.12_x86_static.patch,
|
|
||||||
-files/p7zip-4.13_x86_static.patch, -p7zip-4.10.ebuild,
|
|
||||||
-p7zip-4.10-r1.ebuild, -p7zip-4.12.ebuild, -p7zip-4.13.ebuild,
|
|
||||||
-p7zip-4.14.01.ebuild:
|
|
||||||
removed unnecesary ebuilds.
|
|
||||||
|
|
||||||
*p7zip-4.16 (15 Apr 2005)
|
|
||||||
|
|
||||||
15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
+files/p7zip-4.16_x86_static.patch, +p7zip-4.16.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
11 Mar 2005; David Holm <dholm@gentoo.org> p7zip-4.14.01.ebuild:
|
|
||||||
Added to ~ppc.
|
|
||||||
|
|
||||||
17 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> p7zip-4.14.ebuild:
|
|
||||||
4.14 marked stable (one month in the tree, party time :)
|
|
||||||
|
|
||||||
*p7zip-4.14.01 (17 Feb 2005)
|
|
||||||
|
|
||||||
17 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.14.01.ebuild:
|
|
||||||
version bump.
|
|
||||||
|
|
||||||
16 Jan 2005; Mike Frysinger <vapier@gentoo.org> p7zip-4.14.ebuild:
|
|
||||||
Clean up.
|
|
||||||
|
|
||||||
*p7zip-4.14 (14 Jan 2005)
|
|
||||||
|
|
||||||
14 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.14.ebuild:
|
|
||||||
new version, static patch fixed.
|
|
||||||
|
|
||||||
11 Jan 2005; Malcolm Lashley <malc@gentoo.org> p7zip-4.13.ebuild:
|
|
||||||
Add ~amd64 closes bug #70206
|
|
||||||
|
|
||||||
*p7zip-4.13 (27 Dec 2004)
|
|
||||||
|
|
||||||
27 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.13.ebuild:
|
|
||||||
new version.
|
|
||||||
|
|
||||||
*p7zip-4.12 (04 Dec 2004)
|
|
||||||
|
|
||||||
04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
+files/p7zip-4.12_x86_static.patch, +p7zip-4.12.ebuild:
|
|
||||||
new version from upstream.
|
|
||||||
|
|
||||||
*p7zip-4.10-r1 (11 Nov 2004)
|
|
||||||
|
|
||||||
11 Nov 2004; Radoslaw Stachowiak <radek@gentoo.org>
|
|
||||||
+files/p7zip-4.10_x86_dynamic.patch, +p7zip-4.10-r1.ebuild:
|
|
||||||
Disabled static linkage in default install.
|
|
||||||
if useflag "static" is enabled, links static executable.
|
|
||||||
|
|
||||||
*p7zip-4.10 (25 Oct 2004)
|
|
||||||
|
|
||||||
25 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> +p7zip-4.10.ebuild:
|
|
||||||
Version bump. Now single static binary being installed.
|
|
||||||
|
|
||||||
*p7zip-0.91 (26 Sep 2004)
|
|
||||||
|
|
||||||
26 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> +metadata.xml,
|
|
||||||
+p7zip-0.91.ebuild:
|
|
||||||
Initial release. Ebuild based on work by Dmitry S. Kulyabov and Per Wigren.
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
AUX 9.04-makefile.patch 470 SHA256 c8ef2898ed994929600c04ed0ecfd2dc2b94982d274ee217cbc05234c37750f6 SHA512 2c131e0b42ae6c8cd236125be313ea032b47edf858d1248a8648fd0e794ca4094016a3bb06e15fe65582626dd9d611a08a87ad5789695fff0a2244bb7f3cec3d WHIRLPOOL b2a66b46651a8036808985524b2c6311fa0d7dbceba453f1ac4bb1cc0fef9fbe060b1d4c04e20353c4232915f340cf3bd65d0f7e0ccc3eac8651d3ac15d389db
|
|
||||||
AUX p7zip 1210 SHA256 28d181cd1c43628da0adb485e20f270461b6cf8d743d2187a3380f7799fbc2d5 SHA512 e3f1497cc00669430de336aac1d45a0313831b7f5dc88b9b2ca49e743d8e9e7c73b403d94b4fd9de6cd59875fef47756f9dab9ddf12442ee3fff71e413715553 WHIRLPOOL e14aef0141b8260a5206bd94d22560c927a3ce0e643433ee68d8ade0601655b8a6b7c8ad78f81a0fb97323c7c37eb3fc5483d9e49c2ac259d146b60e678cc973
|
|
||||||
AUX p7zip-15.09-CVE-2015-1038.patch 10079 SHA256 e9116a8a1efdba8037dc58d89eb0b6e3f82cc1e68e786acc3b86c7c156db2f1d SHA512 a58fcf4024643b640ae347b9769238157db353154a870f46c9dbd91dab110375eee05bfa04922af155f2901e9f0bfa25f12915fe0932b6d628c950864c78617b WHIRLPOOL 19a463d7f65188aa1c89423919dae9372cef9e7b47c0bc03c5118f3fda89fa9db808b8e0fe6368651c747b4ff4a32cd4823598fc9e3a0dacb6db022566ffb60f
|
|
||||||
AUX p7zip-15.14-darwin.patch 598 SHA256 c9f3abdcd01d7d5d502660c5ffbcd3bdff3cf2f4b1804d6f6474a158e6200363 SHA512 d9e773571c0d1816e1b882da974446b18fab229deafbba3d38de5c4c5582817d6fb2256c36b755170ae09f552cd568a142f70198dcbe8e6e02be7bcc73d13c34 WHIRLPOOL 1d66fea23e5a5bc5b1002a305bbcaa02c8842e8682b454f4871153ebce9cc4d11c688d164a0331e5c32d15868a4ca6c2356a45481b047f7850e0146c33e055d5
|
|
||||||
AUX p7zip-15.14.1-darwin.patch 242 SHA256 306a36f3caa3b6f5ca3fcf6e14a9d1eef546da7d4d65a73a63e69fd822f12518 SHA512 333f71d5f857b8eacf3074036dc2b61c7860ac6225c9e238dcf5582066066b0f0f839c6f7e8a580a3dd9ab714ec1fcce3ba2e89f131d87750ab6af6605e51387 WHIRLPOOL ab40296a03c8a0b16979614f3c440217a9b3488ed5bdba1dcdf6d7bf065f228fa2b9d5e2afdc4ee69d1b7cab7c3aafe1c4d8800466dd7178c6234bcd21696a93
|
|
||||||
AUX p7zip-9.20.1-CVE-2015-1038.patch 9959 SHA256 99e67592a8d1d578c94a2d4731df36d00aff572e6f09a818e2334d582369fca6 SHA512 c14550d346d7f6aea32d1b076a4ed6006d7f26a1ced5eb7b7e737a7599a384c1e3395820df5b5bdcae3027f1af7aaa520137e72f0b33ac80a6552e1e498c92ff WHIRLPOOL 580b51be849b9cae0bec2d234df9a5daa0cea6e71183b82bbfa3433d7515d77b874b17386d253ec3403836d21ae6df778dc0118acc2e6465a1068d3fd9e50ee3
|
|
||||||
AUX p7zip-9.20.1-QA.patch 650 SHA256 695b6836b13699e3db3e019dbd54275e48a01b59210fd353a2d9e46224c60785 SHA512 b07f8608b973be7c547b226bc23dd064d6cc18f6b1ea70ce72aff72fa098852914eb8d331fe7230b7fdfbb1f0fce59eb3404fd3a5b44d151ea847e87fd2d8f39 WHIRLPOOL 077a4bdf44dcbd66a525e795e082aef41321dc7770415a1cd78716d78aa5b5b2e780afcb4194ea7c2ae2947a596292be18ab8dd3f9bce302e47f8d9cdcc6a046
|
|
||||||
AUX p7zip-9.20.1-execstack.patch 785 SHA256 0725ca42b5ac8d4024a18e2759a12c3ba04b8ea504376c14d8890f7bebba3fb1 SHA512 2b3404554295596dd1113700f72f7149baded7b381e70edea78a2cf66ad69ac6fb03653c490843ecab13e348638a0efaaeb3f5e71a0670255d09a91c70c7977f WHIRLPOOL 4aa1a9632d706c4f9f8b906a9a84929605a56e92c4289a296b767d107e11f85848d40bd58ad4df21c2d87f385318b8e740b71bc7c0467ea3af2bd6c58502d25a
|
|
||||||
AUX p7zip-9.20.1-long_rar_pwd.patch 805 SHA256 5c2fdd7132e5fdceac91d783b1056420537f14a1e3fc7715b75dac698704ebf8 SHA512 0895fec9ec2a0eae960e44f181d2dcac618916d4bf7a5576e234ad7d2fc9417da4eb589c115b0b4040f7c9142cd43637355d8d62e8f43201117c0ee2a6da02cb WHIRLPOOL bd2d339a7356f1b3201005fe6f05ad881b2292e5fadf46a32a28c1667d32fe8b5b555105975e7c69dfa90cc157b415b86a4e153e13dfe0b8bfc4ef095c24fb57
|
|
||||||
AUX p7zip-9.38.1-CVE-2015-1038.patch 8608 SHA256 f88a01760330f4bb70ec09a598c4c0ec45aa3d08d53d4e80e8fae2f3f951b9ba SHA512 bb03e49d2c55f67e2bd0eaea69ae951414779774b3a3c594bdd8e1db035dd47c600e218f4d81fdebc40be8829f0babac94f24de82106260d22c4fc7dd381b886 WHIRLPOOL 7687e91cc5df79d2005bea6469e83b812c7911a3cce2cd87d5fa17548e695e9794cd0b60806b8117e7a28e673a9986dd92fbda0946d46853fb4d58ae40dd6d64
|
|
||||||
AUX p7zip-9.38.1-osversion.patch 838 SHA256 135de03123263910ed99d1afa07ee4a39e471fc257e9dcbe7a8ce0477634cc54 SHA512 28a798a2930552ee940f4f400e66e11cf7ee113c3c0fcf782404c45b95b5774c52b0518520a5f38cc9d7abe795756fce14a0c0e143c31f8da50253bcda423909 WHIRLPOOL 6c6f0e024ba590139fbb6f61ae8f3699e841ac8b00d530e6f7418ccc182aca2f5ffa81925b2bc2b1520cfbd617f0bf8f3c3f95b74222a5300b0f89b10ec19604
|
|
||||||
DIST p7zip_15.09_src_all.tar.bz2 4048481 SHA256 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f SHA512 4f020b13632ef7a85aa8a98586b59bef2dde3c1cbebdbd17e01f1d09b2e13a56ecfe82546d7efc677c45df67456a71cfdb67826b53ebea4c0fb4878f20c2f6dd WHIRLPOOL 71d1cdb9b3b1208197b2c056670d057b00e9a5f80cf08b5914b5d25f2f6756d4cb53e5a000ec76b7b879f82302fca6d012a2cd397e8aa95ae4fc21fd620eb1ab
|
|
||||||
DIST p7zip_15.14.1_src_all.tar.bz2 4147911 SHA256 699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4 SHA512 30d0ef47bd6938cdd5d9d80ec6e7aed972655686a43adb0ae34bb9856ec7cd5a68a05c580352021055cefd6eeceb134ff6402f93686ce46e57f9757798e76abd WHIRLPOOL ace6204d3ab08002b6d5657ae280e22b7e26cdfe0af8099024ad8562a68aa5097a8f09d9d49904a06b9a6942d30fbf3d7a3872661433dd4f76c33dea03ccfb6a
|
|
||||||
DIST p7zip_15.14_src_all.tar.bz2 4147609 SHA256 b9b77450e98859454d39002f55ddc95a0705041ebc0a9bb49733ce2d9a7292d8 SHA512 3053647cbcb3b8efd7f41b6bc122e984b999d31720f9b22387c52ccfe8a71d73899b1fb3a269854fd43bc1ca656c7d53457aca1cb5e2c90a2d0fb8f084bdebc5 WHIRLPOOL 52a397e4ea15cdd4c68156a0c32d449be78469d5704e0d4bb644a813b583422b3d7b0741284974ca22d9ea99a303dfadeccc23d74a77cac0c9b51153bd61e24b
|
|
||||||
DIST p7zip_9.20.1_src_all.tar.bz2 3835235 SHA256 49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782 SHA512 7bb8a276aaefc4a83364e45633c48527de44c6b1205344f3356db570582f30f81d82a94938c99a7ad193587b584cc1c03219c28249de40018bdaee6c3b2a022a WHIRLPOOL cb20f37d3f796931a9b330728aa7148afe98bbf8a49bb91bfd80e4667c16416206b23bf34298e9ec37825e8b43f92a5710f0cea1f974296d5c17aa2c7b0931f3
|
|
||||||
DIST p7zip_9.38.1_src_all.tar.bz2 3917925 SHA256 fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 SHA512 f524ffae54e0d9563a509cc4b243e830d882a925e682eb2e15e2d19cb72c947fddecd72c8507d6c1538b997b240b0827046fc2fb4f5e3f7d49840257c92b9c04 WHIRLPOOL 6bad1cde056ab1e8db4079c0e649665fbc7e6b9a565261188bd0acaec6c583d8bd9425cb26d39315408d0180ba0be0069a77b704633cf05ec855220cb31f1c24
|
|
||||||
EBUILD p7zip-15.09-r2.ebuild 4527 SHA256 7ae72eee3a9df30cf020ea44d019f1160717e6009d1ba2e4c13b75ad589feb5b SHA512 33b63e7af3149d21e0e1cc1dc673baf1a2c4ee0849ceff40915a549c53c3bcb4f5973c0cd36e8792a3a4b83db6facb6071ed424dc99164e2c0dc7f2800e334a2 WHIRLPOOL 8cb662e7d22731fe5c55af62159ef6ef872366c49cae1dbaaf4b3aa02d86e08b5b214777d75f30dc4c69a50ba3e1d8ecbd4acd9aa1012ae26a9b383e81474d0b
|
|
||||||
EBUILD p7zip-15.09.ebuild 4268 SHA256 2885303a068a08131ab68da84a1c4436c67ae9a8588d50066b4eba734a50b299 SHA512 e83281d2afdac80112dd634c69b397b6492b52c159c7a97a4ee6246fa774b86f80504c9a20aa31f5d36232638f287495d44dfe280311b54ef206f5a0576f5eb5 WHIRLPOOL 6271e7f38747d496bee3522623b079ce6c5f7b8df461345969d408e967d9bc09bdfd1006bd094cf6f415a983f7e6f0d57bccd99e2a98a631655b053665cf2f1e
|
|
||||||
EBUILD p7zip-15.14.1.ebuild 4522 SHA256 d8d45f662234aed6d9cf05dbe83e456c8aa9b69b520ba67230b4ca4895b057e2 SHA512 f01adb8bac35e2d8c597e2438b2271c3867249689068e384d792e9e93b746935d382f0f4ac9276d526333423789b9f3ed5ddd78b3ac11b82cc7b4858222a7534 WHIRLPOOL aa3ef230822c8ac7c7cf9b054c3cbf4ab71116188007033cfdbfc93d78cea39bcb3c5ba4d51e9bb8065babb501a6217482e9b73f79b271c2c05af55777b461b1
|
|
||||||
EBUILD p7zip-15.14.ebuild 4523 SHA256 d2dbc6f1bd07efbd25bf59ab9d635eba0b6e36ea3b542824d58e8d9b51aa4c4a SHA512 61e209e0cbf50cb04c0e1be16c731b54b5ff2745cf468c6b4c3594e5ce30260e670697bafc2427def1a548c3a6d6cd2cece2976e6e0a1b7ca0fe0ed6ce7f9e9e WHIRLPOOL 1b291b51f1ed35e0e12d79c6905fa4dc73cf7b690d3a22d1556ee593dc9e835c4be2f5f7e5adf17d1098ae4bfcacdcf135d2840a92b9c6b35de5bee0403745e0
|
|
||||||
EBUILD p7zip-9.20.1-r5.ebuild 4205 SHA256 a0595dc20fcbd1e545c32f4c80480e8bf3af968b579b6c4bced47df6837f2e5c SHA512 298b9c35601b2954eff09ca08df35207bfd14f33778e0498ce8b6eb4070f7551a85e63e630a78fe2014413def27b20d011193e2c6b0f4fc2253b52b5a58d2fcc WHIRLPOOL 93d2f42ca68f2d9887fbddaacd1ed18f202c67e6c86918e224e33fcd3b367e95907115abfaf77a85e3f06f4c6d4a5c2050b3943d68a198ae2cfbb01a5d121713
|
|
||||||
EBUILD p7zip-9.38.1-r2.ebuild 4264 SHA256 88260e250a71380363591fbba14ce2d1c0fef772e8076832e14323c2927d65f2 SHA512 a25a59cd186fffbad1a150a1b2b74ab6fc74ebe2740dd5757f88cd8b90eb10d35b450e9f57ab4b3eb1d79586aed73af9407e9ed310e71a5ebb997d7fb4f9f50a WHIRLPOOL b64e8c3de0be728fec799718d18d18573ddd905759da69ecc4972ff3a767b29c967e94f484cb1adadeba757aff0e3c9c243c2b0f37b20d4be6ec175bc43ffe64
|
|
||||||
EBUILD p7zip-9.38.1-r3.ebuild 4297 SHA256 d545fad12eb3323700691342a35b3754d2a843597e03690831d51cc8ed263eba SHA512 a1c5b92ff0f667ce15f7e5cb43b4521644587bef626e86c4963479360eca89d22ed6687e23597be44157564f53638d51c29219632142c6cadf2fe3515918836c WHIRLPOOL 09c11745173d4f074c0660ce68e0947423fee53b829db4573424d5780721d165e0f01892799ceed5f5b615ce0922feb6eda9a270a8086d188a9f47390f87f918
|
|
||||||
MISC ChangeLog 5256 SHA256 7547851987b70a5a2ce0951d01b1903247e48f44d7fb7823a5172ce3e787db1c SHA512 cf36e985cab119b2b129a60b8f89db9d9a5d45ccd4904e31c27d6847af187a4e6bfeb64ab4cf597098297ae5da745a4f4d751b6c868a34a61b2eef49f44f8a03 WHIRLPOOL 5a9606f1036daffa41b9ff00c2326398feb62cd1c1576007e8db58ed0ef1a50df9ef06f18fbc6a27bc6c853bdb4e5165f7862d3bf30dd02a2ecfb97d3f620a06
|
|
||||||
MISC ChangeLog-2015 23615 SHA256 a54b898b9a62097200726e77e374600fa9b7f8cffadf132d110ca00449d42849 SHA512 e8e2f0cf43f704fa13a88f3febe3647d0521e1055627ba97d717155499e65dc79481752232a484e6264a8001f4bb0e638754b724d3e425e73dde2fb2e1aa92cf WHIRLPOOL f737bd27b70913de90ecbb477ab1aa21e4cba6c4a62cbd47c15b4e727fecd3d15c14de536850f2cd06059d647bd0471f4fc567a5c022fc96dadeaa4fd56fde51
|
|
||||||
MISC metadata.xml 435 SHA256 fb78e893bfe72f7f34a02cdf2fe46cc6074855fb4ce3e327c54ab35584469df4 SHA512 3588bbc28ee0e54a059d88d35ce821596b0dd3b5c1f84490568a3f7d3f67f5ade02c301c699bdaaf4cb653df5d59441cb7383a18708cd15d64d97eb1f0847f1c WHIRLPOOL b53dd7b156271fddd0bd40ad617e1524aa916c0d3f82e28e5ab41cfdf23f7eda46c857385fca3e15b49d9c63284db3999c298824b894c9a390ebe03fe2dd5000
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig 2010-01-04 13:58:54.527887746 +0100
|
|
||||||
+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2010-01-04 13:59:10.290868343 +0100
|
|
||||||
@@ -247,8 +247,6 @@
|
|
||||||
MyAes.o \
|
|
||||||
Pbkdf2HmacSha1.o \
|
|
||||||
RandGen.o \
|
|
||||||
- Rar20Crypto.o \
|
|
||||||
- RarAes.o \
|
|
||||||
Sha1.o \
|
|
||||||
WzAes.o \
|
|
||||||
ZipCrypto.o \
|
|
||||||
@@ -298,7 +296,6 @@
|
|
||||||
$(HFS_OBJS) \
|
|
||||||
$(ISO_OBJS) \
|
|
||||||
$(NSIS_OBJS) \
|
|
||||||
- $(RAR_OBJS) \
|
|
||||||
$(TAR_OBJS) \
|
|
||||||
$(UDF_OBJS) \
|
|
||||||
$(WIM_OBJS) \
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
# gzip-like CLI wrapper for p7zip
|
|
||||||
set -e
|
|
||||||
|
|
||||||
compress=true
|
|
||||||
file=
|
|
||||||
|
|
||||||
usage ()
|
|
||||||
{
|
|
||||||
echo "Usage: $0 [-d] [-h|--help] [file]"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
while [ "$#" != "0" ] ; do
|
|
||||||
case "$1" in
|
|
||||||
-d) compress=false ;;
|
|
||||||
-c) echo "$0: ignoring $1 option (not yet implemented)" ;;
|
|
||||||
-h|--help) usage ;;
|
|
||||||
*)
|
|
||||||
if [ "${file}" = "" ] ; then
|
|
||||||
file="$1"
|
|
||||||
else
|
|
||||||
usage
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
# make sure they're present, before we screw up
|
|
||||||
for i in mktemp 7z rm cat tty ; do
|
|
||||||
if ! which $i > /dev/null ; then
|
|
||||||
echo "$0: $i: command not found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ "${file}" != "" ] ; then
|
|
||||||
if ${compress} ; then
|
|
||||||
7z a ${file}.7z ${file}
|
|
||||||
rm ${file}
|
|
||||||
else
|
|
||||||
case ${file} in
|
|
||||||
*.7z)
|
|
||||||
7z x ${file}
|
|
||||||
rm ${file}
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "$0: ${file}: unknown suffix -- ignored"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
tmp=`mktemp`
|
|
||||||
trap "rm -f ${tmp}" 0
|
|
||||||
|
|
||||||
if ${compress} ; then
|
|
||||||
if tty > /dev/null ; then
|
|
||||||
echo "$0: compressed data not written to a terminal."
|
|
||||||
echo "For help, type: $0 -h"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
rm -f ${tmp}
|
|
||||||
7z a ${tmp} -si >/dev/null
|
|
||||||
cat ${tmp}
|
|
||||||
else
|
|
||||||
cat > ${tmp}
|
|
||||||
7z x ${tmp} -so 2>/dev/null | cat
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f ${tmp}
|
|
||||||
@ -1,290 +0,0 @@
|
|||||||
Author: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Tue, 19 May 2015 02:38:40 +0100
|
|
||||||
Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
|
|
||||||
Bug: http://sourceforge.net/p/p7zip/bugs/147/
|
|
||||||
Bug-Debian: https://bugs.debian.org/774660
|
|
||||||
|
|
||||||
Alexander Cherepanov discovered that 7zip is susceptible to a
|
|
||||||
directory traversal vulnerability. While extracting an archive, it
|
|
||||||
will extract symlinks and then follow them if they are referenced in
|
|
||||||
further entries. This can be exploited by a rogue archive to write
|
|
||||||
files outside the current directory.
|
|
||||||
|
|
||||||
We have to create placeholder files (which we already do) and delay
|
|
||||||
creating symlinks until the end of extraction.
|
|
||||||
|
|
||||||
Due to the possibility of anti-items (deletions) in the archive, it is
|
|
||||||
possible for placeholders to be deleted and replaced before we create
|
|
||||||
the symlinks. It's not clear that this can be used for mischief, but
|
|
||||||
GNU tar guards against similar problems by checking that the placeholder
|
|
||||||
still exists and is the same inode. XXX It also checks 'birth time' but
|
|
||||||
this isn't portable. We can probably get away with comparing ctime
|
|
||||||
since we don't support hard links.
|
|
||||||
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp
|
|
||||||
--- p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp 2015-09-17 20:02:35.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp 2015-12-03 02:22:47.073724194 +0000
|
|
||||||
@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
|
|
||||||
HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
realIndices.Size(), testMode, extractCallback);
|
|
||||||
if (result == S_OK)
|
|
||||||
- result = extractCallbackSpec->SetDirsTimes();
|
|
||||||
+ result = extractCallbackSpec->SetFinalAttribs();
|
|
||||||
return result;
|
|
||||||
COM_TRY_END
|
|
||||||
}
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp
|
|
||||||
--- p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp 2015-10-17 15:52:30.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp 2015-12-03 02:22:47.073724194 +0000
|
|
||||||
@@ -230,8 +230,11 @@ private:
|
|
||||||
COutFileStream *_outFileStreamSpec;
|
|
||||||
CMyComPtr<ISequentialOutStream> _outFileStream;
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
public:
|
|
||||||
void Init(IInArchive *archiveHandler, const FString &directoryPath);
|
|
||||||
+ HRESULT SetFinalAttribs();
|
|
||||||
|
|
||||||
UInt64 NumErrors;
|
|
||||||
bool PasswordIsDefined;
|
|
||||||
@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
}
|
|
||||||
_outFileStream.Release();
|
|
||||||
if (_extractMode && _processedFileInfo.AttribDefined)
|
|
||||||
- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
|
|
||||||
+ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
|
|
||||||
PrintNewLine();
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
+HRESULT CArchiveExtractCallback::SetFinalAttribs()
|
|
||||||
+{
|
|
||||||
+ HRESULT result = S_OK;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ if (!_delayedSymLinks[i].Create())
|
|
||||||
+ result = E_FAIL;
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return result;
|
|
||||||
+}
|
|
||||||
|
|
||||||
STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
|
|
||||||
{
|
|
||||||
@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
|
|
||||||
// extractCallbackSpec->PasswordIsDefined = true;
|
|
||||||
// extractCallbackSpec->Password = L"1";
|
|
||||||
HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
|
|
||||||
+ if (result == S_OK)
|
|
||||||
+ result = extractCallbackSpec->SetFinalAttribs();
|
|
||||||
if (result != S_OK)
|
|
||||||
{
|
|
||||||
PrintError("Extract Error");
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
|
|
||||||
--- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-10-03 09:49:15.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-12-03 02:24:40.444963545 +0000
|
|
||||||
@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
NumFiles++;
|
|
||||||
|
|
||||||
if (!_stdOutMode && _extractMode && _fi.AttribDefined)
|
|
||||||
- SetFileAttrib(_diskFilePath, _fi.Attrib);
|
|
||||||
+ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
|
|
||||||
|
|
||||||
RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
|
|
||||||
|
|
||||||
@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-HRESULT CArchiveExtractCallback::SetDirsTimes()
|
|
||||||
+HRESULT CArchiveExtractCallback::SetFinalAttribs()
|
|
||||||
{
|
|
||||||
+ HRESULT result = S_OK;
|
|
||||||
CRecordVector<CExtrRefSortPair> pairs;
|
|
||||||
pairs.ClearAndSetSize(_extractedFolderPaths.Size());
|
|
||||||
unsigned i;
|
|
||||||
@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs
|
|
||||||
(WriteATime && ATimeDefined) ? &ATime : NULL,
|
|
||||||
(WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
|
|
||||||
}
|
|
||||||
- return S_OK;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ if (!_delayedSymLinks[i].Create())
|
|
||||||
+ result = E_FAIL;
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return result;
|
|
||||||
}
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h
|
|
||||||
--- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-10-03 11:29:09.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-12-03 02:22:47.074724204 +0000
|
|
||||||
@@ -6,6 +6,8 @@
|
|
||||||
#include "../../../Common/MyCom.h"
|
|
||||||
#include "../../../Common/Wildcard.h"
|
|
||||||
|
|
||||||
+#include "../../../Windows/FileDir.h"
|
|
||||||
+
|
|
||||||
#include "../../IPassword.h"
|
|
||||||
|
|
||||||
#include "../../Common/FileStreams.h"
|
|
||||||
@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
|
|
||||||
bool _saclEnabled;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
|
|
||||||
HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
|
|
||||||
HRESULT GetUnpackSize();
|
|
||||||
@@ -330,7 +334,7 @@ public:
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- HRESULT SetDirsTimes();
|
|
||||||
+ HRESULT SetFinalAttribs();
|
|
||||||
};
|
|
||||||
|
|
||||||
bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp
|
|
||||||
--- p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp 2015-09-07 20:47:32.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp 2015-12-03 02:22:47.075724215 +0000
|
|
||||||
@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
|
|
||||||
else
|
|
||||||
result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
|
|
||||||
if (result == S_OK && !options.StdInMode)
|
|
||||||
- result = ecs->SetDirsTimes();
|
|
||||||
+ result = ecs->SetFinalAttribs();
|
|
||||||
return callback->ExtractResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.cpp p7zip_15.09/CPP/Windows/FileDir.cpp
|
|
||||||
--- p7zip_15.09.orig/CPP/Windows/FileDir.cpp 2015-10-10 13:37:41.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/Windows/FileDir.cpp 2015-12-03 02:22:47.075724215 +0000
|
|
||||||
@@ -347,7 +347,8 @@ static int convert_to_symlink(const char
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
|
|
||||||
+bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks)
|
|
||||||
{
|
|
||||||
if (!fileName) {
|
|
||||||
SetLastError(ERROR_PATH_NOT_FOUND);
|
|
||||||
@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
|
|
||||||
stat_info.st_mode = fileAttributes >> 16;
|
|
||||||
#ifdef ENV_HAVE_LSTAT
|
|
||||||
if (S_ISLNK(stat_info.st_mode)) {
|
|
||||||
- if ( convert_to_symlink(name) != 0) {
|
|
||||||
+ if (delayedSymLinks)
|
|
||||||
+ delayedSymLinks->Add(CDelayedSymLink(name));
|
|
||||||
+ else if ( convert_to_symlink(name) != 0) {
|
|
||||||
TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -814,6 +817,43 @@ bool CTempDir::Remove()
|
|
||||||
return !_mustBeDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+
|
|
||||||
+CDelayedSymLink::CDelayedSymLink(const char * source)
|
|
||||||
+ : _source(source)
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (lstat(_source, &st) == 0) {
|
|
||||||
+ _dev = st.st_dev;
|
|
||||||
+ _ino = st.st_ino;
|
|
||||||
+ } else {
|
|
||||||
+ _dev = 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+bool CDelayedSymLink::Create()
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (_dev == 0) {
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ if (lstat(_source, &st) != 0)
|
|
||||||
+ return false;
|
|
||||||
+ if (_dev != st.st_dev || _ino != st.st_ino) {
|
|
||||||
+ // Placeholder file has been overwritten or moved by another
|
|
||||||
+ // symbolic link creation
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return convert_to_symlink(_source) == 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+
|
|
||||||
}}}
|
|
||||||
|
|
||||||
#ifndef _SFX
|
|
||||||
diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.h p7zip_15.09/CPP/Windows/FileDir.h
|
|
||||||
--- p7zip_15.09.orig/CPP/Windows/FileDir.h 2015-06-19 11:52:06.000000000 +0100
|
|
||||||
+++ p7zip_15.09/CPP/Windows/FileDir.h 2015-12-03 02:22:47.075724215 +0000
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
#define __WINDOWS_FILE_DIR_H
|
|
||||||
|
|
||||||
#include "../Common/MyString.h"
|
|
||||||
+#include "../Common/MyVector.h"
|
|
||||||
|
|
||||||
#include "FileIO.h"
|
|
||||||
|
|
||||||
@@ -11,11 +12,14 @@ namespace NWindows {
|
|
||||||
namespace NFile {
|
|
||||||
namespace NDir {
|
|
||||||
|
|
||||||
+class CDelayedSymLink;
|
|
||||||
+
|
|
||||||
bool GetWindowsDir(FString &path);
|
|
||||||
bool GetSystemDir(FString &path);
|
|
||||||
|
|
||||||
bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
|
|
||||||
-bool SetFileAttrib(CFSTR path, DWORD attrib);
|
|
||||||
+bool SetFileAttrib(CFSTR path, DWORD attrib,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
|
|
||||||
bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
|
|
||||||
|
|
||||||
#ifndef UNDER_CE
|
|
||||||
@@ -76,6 +80,31 @@ public:
|
|
||||||
bool Remove();
|
|
||||||
};
|
|
||||||
|
|
||||||
+// Symbolic links must be created last so that they can't be used to
|
|
||||||
+// create or overwrite files above the extraction directory.
|
|
||||||
+class CDelayedSymLink
|
|
||||||
+{
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+ // Where the symlink should be created. The target is specified in
|
|
||||||
+ // the placeholder file.
|
|
||||||
+ AString _source;
|
|
||||||
+
|
|
||||||
+ // Device and inode of the placeholder file. Before creating the
|
|
||||||
+ // symlink, we must check that these haven't been changed by creation
|
|
||||||
+ // of another symlink.
|
|
||||||
+ dev_t _dev;
|
|
||||||
+ ino_t _ino;
|
|
||||||
+
|
|
||||||
+public:
|
|
||||||
+ explicit CDelayedSymLink(const char * source);
|
|
||||||
+ bool Create();
|
|
||||||
+#else // !ENV_UNIX
|
|
||||||
+public:
|
|
||||||
+ CDelayedSymLink(const char * source) {}
|
|
||||||
+ bool Create() { return true; }
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
#if !defined(UNDER_CE)
|
|
||||||
class CCurrentDirRestorer
|
|
||||||
{
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
Darwin has wchar_h and wctypes_h.
|
|
||||||
El Capitan needs <sys/types.h> for ino_t.
|
|
||||||
|
|
||||||
--- CPP/myWindows/config.h
|
|
||||||
+++ CPP/myWindows/config.h
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
#define FILESYSTEM_IS_CASE_SENSITIVE 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- #if !defined(ENV_MACOSX) && !defined(ENV_BEOS)
|
|
||||||
+ #if !defined(ENV_BEOS)
|
|
||||||
|
|
||||||
/* <wchar.h> */
|
|
||||||
/* ENV_HAVE_WCHAR__H and not ENV_HAVE_WCHAR_H to avoid warning with wxWidgets */
|
|
||||||
--- CPP/myWindows/StdAfx.h
|
|
||||||
+++ CPP/myWindows/StdAfx.h
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
-#ifdef __NETWARE__
|
|
||||||
+#if defined(__NETWARE__) || defined(__MACH__)
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- p7zip_15.14.1/CPP/myWindows/StdAfx.h
|
|
||||||
+++ p7zip_15.14.1/CPP/myWindows/StdAfx.h
|
|
||||||
@@ -32,7 +32,7 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
-#ifdef __NETWARE__
|
|
||||||
+#if defined(__NETWARE__) || defined(__MACH__)
|
|
||||||
#include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,315 +0,0 @@
|
|||||||
Author: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Tue, 19 May 2015 02:38:40 +0100
|
|
||||||
Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
|
|
||||||
Bug: http://sourceforge.net/p/p7zip/bugs/147/
|
|
||||||
Bug-Debian: https://bugs.debian.org/774660
|
|
||||||
|
|
||||||
Alexander Cherepanov discovered that 7zip is susceptible to a
|
|
||||||
directory traversal vulnerability. While extracting an archive, it
|
|
||||||
will extract symlinks and then follow them if they are referenced in
|
|
||||||
further entries. This can be exploited by a rogue archive to write
|
|
||||||
files outside the current directory.
|
|
||||||
|
|
||||||
We have to create placeholder files (which we already do) and delay
|
|
||||||
creating symlinks until the end of extraction.
|
|
||||||
|
|
||||||
Due to the possibility of anti-items (deletions) in the archive, it is
|
|
||||||
possible for placeholders to be deleted and replaced before we create
|
|
||||||
the symlinks. It's not clear that this can be used for mischief, but
|
|
||||||
GNU tar guards against similar problems by checking that the placeholder
|
|
||||||
still exists and is the same inode. XXX It also checks 'birth time' but
|
|
||||||
this isn't portable. We can probably get away with comparing ctime
|
|
||||||
since we don't support hard links.
|
|
||||||
|
|
||||||
--- a/CPP/7zip/UI/Agent/Agent.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Agent/Agent.cpp
|
|
||||||
@@ -424,6 +424,8 @@ STDMETHODIMP CAgentFolder::Extract(const
|
|
||||||
CMyComPtr<IArchiveExtractCallback> extractCallback = extractCallbackSpec;
|
|
||||||
UStringVector pathParts;
|
|
||||||
CProxyFolder *currentProxyFolder = _proxyFolderItem;
|
|
||||||
+ HRESULT res;
|
|
||||||
+
|
|
||||||
while (currentProxyFolder->Parent)
|
|
||||||
{
|
|
||||||
pathParts.Insert(0, currentProxyFolder->Name);
|
|
||||||
@@ -445,8 +447,11 @@ STDMETHODIMP CAgentFolder::Extract(const
|
|
||||||
(UInt64)(Int64)-1);
|
|
||||||
CUIntVector realIndices;
|
|
||||||
GetRealIndices(indices, numItems, realIndices);
|
|
||||||
- return _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
+ res = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
realIndices.Size(), testMode, extractCallback);
|
|
||||||
+ if (res == S_OK && !extractCallbackSpec->CreateSymLinks())
|
|
||||||
+ res = E_FAIL;
|
|
||||||
+ return res;
|
|
||||||
COM_TRY_END
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/CPP/7zip/UI/Agent/ArchiveFolder.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Agent/ArchiveFolder.cpp
|
|
||||||
@@ -20,6 +20,8 @@ STDMETHODIMP CAgentFolder::CopyTo(const
|
|
||||||
CMyComPtr<IArchiveExtractCallback> extractCallback = extractCallbackSpec;
|
|
||||||
UStringVector pathParts;
|
|
||||||
CProxyFolder *currentProxyFolder = _proxyFolderItem;
|
|
||||||
+ HRESULT res;
|
|
||||||
+
|
|
||||||
while (currentProxyFolder->Parent)
|
|
||||||
{
|
|
||||||
pathParts.Insert(0, currentProxyFolder->Name);
|
|
||||||
@@ -46,8 +48,11 @@ STDMETHODIMP CAgentFolder::CopyTo(const
|
|
||||||
(UInt64)(Int64)-1);
|
|
||||||
CUIntVector realIndices;
|
|
||||||
GetRealIndices(indices, numItems, realIndices);
|
|
||||||
- return _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
+ res = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
realIndices.Size(), BoolToInt(false), extractCallback);
|
|
||||||
+ if (res == S_OK && !extractCallbackSpec->CreateSymLinks())
|
|
||||||
+ res = E_FAIL;
|
|
||||||
+ return res;
|
|
||||||
COM_TRY_END
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/CPP/7zip/UI/Client7z/Client7z.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
|
|
||||||
@@ -197,8 +197,11 @@ private:
|
|
||||||
COutFileStream *_outFileStreamSpec;
|
|
||||||
CMyComPtr<ISequentialOutStream> _outFileStream;
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDirectory::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
public:
|
|
||||||
void Init(IInArchive *archiveHandler, const UString &directoryPath);
|
|
||||||
+ bool CreateSymLinks();
|
|
||||||
|
|
||||||
UInt64 NumErrors;
|
|
||||||
bool PasswordIsDefined;
|
|
||||||
@@ -392,11 +395,22 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
}
|
|
||||||
_outFileStream.Release();
|
|
||||||
if (_extractMode && _processedFileInfo.AttribDefined)
|
|
||||||
- NFile::NDirectory::MySetFileAttributes(_diskFilePath, _processedFileInfo.Attrib);
|
|
||||||
+ NFile::NDirectory::MySetFileAttributes(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
|
|
||||||
PrintNewLine();
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
+bool CArchiveExtractCallback::CreateSymLinks()
|
|
||||||
+{
|
|
||||||
+ bool success = true;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ success &= _delayedSymLinks[i].Create();
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return success;
|
|
||||||
+}
|
|
||||||
|
|
||||||
STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
|
|
||||||
{
|
|
||||||
--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
|
|
||||||
@@ -453,12 +453,24 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
NumFiles++;
|
|
||||||
|
|
||||||
if (_extractMode && _fi.AttribDefined)
|
|
||||||
- NFile::NDirectory::MySetFileAttributes(_diskFilePath, _fi.Attrib);
|
|
||||||
+ NFile::NDirectory::MySetFileAttributes(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
|
|
||||||
RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted));
|
|
||||||
return S_OK;
|
|
||||||
COM_TRY_END
|
|
||||||
}
|
|
||||||
|
|
||||||
+bool CArchiveExtractCallback::CreateSymLinks()
|
|
||||||
+{
|
|
||||||
+ bool success = true;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ success &= _delayedSymLinks[i].Create();
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return success;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
STDMETHODIMP CArchiveExtractCallback::GetInStream(
|
|
||||||
const wchar_t *name, ISequentialInStream **inStream)
|
|
||||||
--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h
|
|
||||||
+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h
|
|
||||||
@@ -6,6 +6,8 @@
|
|
||||||
#include "Common/MyCom.h"
|
|
||||||
#include "Common/Wildcard.h"
|
|
||||||
|
|
||||||
+#include "Windows/FileDir.h"
|
|
||||||
+
|
|
||||||
#include "../../IPassword.h"
|
|
||||||
|
|
||||||
#include "../../Common/FileStreams.h"
|
|
||||||
@@ -83,6 +85,8 @@ class CArchiveExtractCallback:
|
|
||||||
UInt64 _packTotal;
|
|
||||||
UInt64 _unpTotal;
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDirectory::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
void CreateComplexDirectory(const UStringVector &dirPathParts, UString &fullPath);
|
|
||||||
HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
|
|
||||||
HRESULT GetUnpackSize();
|
|
||||||
@@ -138,6 +142,7 @@ public:
|
|
||||||
const UStringVector &removePathParts,
|
|
||||||
UInt64 packSize);
|
|
||||||
|
|
||||||
+ bool CreateSymLinks();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
--- a/CPP/7zip/UI/Common/Extract.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Common/Extract.cpp
|
|
||||||
@@ -96,6 +96,9 @@ static HRESULT DecompressArchive(
|
|
||||||
else
|
|
||||||
result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, extractCallbackSpec);
|
|
||||||
|
|
||||||
+ if (result == S_OK && !extractCallbackSpec->CreateSymLinks())
|
|
||||||
+ result = E_FAIL;
|
|
||||||
+
|
|
||||||
return callback->ExtractResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/CPP/Windows/FileDir.cpp
|
|
||||||
+++ b/CPP/Windows/FileDir.cpp
|
|
||||||
@@ -453,9 +453,10 @@ bool SetDirTime(LPCWSTR fileName, const
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifndef _UNICODE
|
|
||||||
-bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes)
|
|
||||||
+bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks)
|
|
||||||
{
|
|
||||||
- return MySetFileAttributes(UnicodeStringToMultiByte(fileName, CP_ACP), fileAttributes);
|
|
||||||
+ return MySetFileAttributes(UnicodeStringToMultiByte(fileName, CP_ACP), fileAttributes, delayedSymLinks);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool MyRemoveDirectory(LPCWSTR pathName)
|
|
||||||
@@ -488,7 +489,8 @@ static int convert_to_symlink(const char
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-bool MySetFileAttributes(LPCTSTR fileName, DWORD fileAttributes)
|
|
||||||
+bool MySetFileAttributes(LPCTSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks)
|
|
||||||
{
|
|
||||||
if (!fileName) {
|
|
||||||
SetLastError(ERROR_PATH_NOT_FOUND);
|
|
||||||
@@ -520,7 +522,9 @@ bool MySetFileAttributes(LPCTSTR fileNam
|
|
||||||
stat_info.st_mode = fileAttributes >> 16;
|
|
||||||
#ifdef ENV_HAVE_LSTAT
|
|
||||||
if (S_ISLNK(stat_info.st_mode)) {
|
|
||||||
- if ( convert_to_symlink(name) != 0) {
|
|
||||||
+ if (delayedSymLinks)
|
|
||||||
+ delayedSymLinks->Add(CDelayedSymLink(name));
|
|
||||||
+ else if ( convert_to_symlink(name) != 0) {
|
|
||||||
TRACEN((printf("MySetFileAttributes(%s,%d) : false-3\n",name,fileAttributes)))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -924,4 +928,41 @@ bool CTempDirectory::Create(LPCTSTR pref
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+
|
|
||||||
+CDelayedSymLink::CDelayedSymLink(LPCSTR source)
|
|
||||||
+ : _source(source)
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (lstat(_source, &st) == 0) {
|
|
||||||
+ _dev = st.st_dev;
|
|
||||||
+ _ino = st.st_ino;
|
|
||||||
+ } else {
|
|
||||||
+ _dev = 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+bool CDelayedSymLink::Create()
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (_dev == 0) {
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ if (lstat(_source, &st) != 0)
|
|
||||||
+ return false;
|
|
||||||
+ if (_dev != st.st_dev || _ino != st.st_ino) {
|
|
||||||
+ // Placeholder file has been overwritten or moved by another
|
|
||||||
+ // symbolic link creation
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return convert_to_symlink(_source) == 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+
|
|
||||||
}}}
|
|
||||||
--- a/CPP/Windows/FileDir.h
|
|
||||||
+++ b/CPP/Windows/FileDir.h
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
#define __WINDOWS_FILEDIR_H
|
|
||||||
|
|
||||||
#include "../Common/MyString.h"
|
|
||||||
+#include "../Common/MyVector.h"
|
|
||||||
#include "Defs.h"
|
|
||||||
|
|
||||||
/* GetFullPathName for 7zAES.cpp */
|
|
||||||
@@ -13,11 +14,15 @@ namespace NWindows {
|
|
||||||
namespace NFile {
|
|
||||||
namespace NDirectory {
|
|
||||||
|
|
||||||
+class CDelayedSymLink;
|
|
||||||
+
|
|
||||||
bool SetDirTime(LPCWSTR fileName, const FILETIME *creationTime, const FILETIME *lastAccessTime, const FILETIME *lastWriteTime);
|
|
||||||
|
|
||||||
-bool MySetFileAttributes(LPCTSTR fileName, DWORD fileAttributes);
|
|
||||||
+bool MySetFileAttributes(LPCTSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
|
|
||||||
#ifndef _UNICODE
|
|
||||||
-bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes);
|
|
||||||
+bool MySetFileAttributes(LPCWSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
bool MyMoveFile(LPCTSTR existFileName, LPCTSTR newFileName);
|
|
||||||
@@ -80,6 +85,31 @@ public:
|
|
||||||
bool Remove();
|
|
||||||
};
|
|
||||||
|
|
||||||
+// Symbolic links must be created last so that they can't be used to
|
|
||||||
+// create or overwrite files above the extraction directory.
|
|
||||||
+class CDelayedSymLink
|
|
||||||
+{
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+ // Where the symlink should be created. The target is specified in
|
|
||||||
+ // the placeholder file.
|
|
||||||
+ AString _source;
|
|
||||||
+
|
|
||||||
+ // Device and inode of the placeholder file. Before creating the
|
|
||||||
+ // symlink, we must check that these haven't been changed by creation
|
|
||||||
+ // of another symlink.
|
|
||||||
+ dev_t _dev;
|
|
||||||
+ ino_t _ino;
|
|
||||||
+
|
|
||||||
+public:
|
|
||||||
+ explicit CDelayedSymLink(LPCSTR source);
|
|
||||||
+ bool Create();
|
|
||||||
+#else // !ENV_UNIX
|
|
||||||
+public:
|
|
||||||
+ CDelayedSymLink(LPCSTR source) {}
|
|
||||||
+ bool Create() { return true; }
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
#ifdef _UNICODE
|
|
||||||
typedef CTempFile CTempFileW;
|
|
||||||
#endif
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
From: Julian Ospald <hasufell@gentoo.org>
|
|
||||||
Date: Thu Jun 7 14:31:12 UTC 2012
|
|
||||||
Subject: fix QA warnings
|
|
||||||
|
|
||||||
https://sourceforge.net/tracker/?func=detail&atid=660493&aid=3532590&group_id=111810
|
|
||||||
|
|
||||||
--- CPP/7zip/Archive/NtfsHandler.cpp
|
|
||||||
+++ CPP/7zip/Archive/NtfsHandler.cpp
|
|
||||||
@@ -1280,7 +1280,7 @@
|
|
||||||
if (recSizeLog < Header.SectorSizeLog)
|
|
||||||
return false;
|
|
||||||
numSectorsInRec = 1 << (recSizeLog - Header.SectorSizeLog);
|
|
||||||
- if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, NULL, 0))
|
|
||||||
+ if (!mftRec.Parse(ByteBuf, Header.SectorSizeLog, numSectorsInRec, 0, NULL))
|
|
||||||
return S_FALSE;
|
|
||||||
if (!mftRec.IsFILE())
|
|
||||||
return S_FALSE;
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm
|
|
||||||
--- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm 2008-08-14 11:18:07.000000000 +0200
|
|
||||||
+++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm 2011-07-26 17:43:57.727910278 +0200
|
|
||||||
@@ -101,3 +101,8 @@ _CrcUpdateT8:
|
|
||||||
ret
|
|
||||||
|
|
||||||
end
|
|
||||||
+
|
|
||||||
+%ifidn __OUTPUT_FORMAT__,elf
|
|
||||||
+section .note.GNU-stack noalloc noexec nowrite progbits
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm
|
|
||||||
--- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm 2009-07-14 12:44:15.000000000 +0200
|
|
||||||
+++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm 2011-07-26 17:44:23.938864508 +0200
|
|
||||||
@@ -99,3 +99,8 @@ _CrcUpdateT8:
|
|
||||||
|
|
||||||
|
|
||||||
; end
|
|
||||||
+
|
|
||||||
+%ifidn __OUTPUT_FORMAT__,elf
|
|
||||||
+section .note.GNU-stack noalloc noexec nowrite progbits
|
|
||||||
+%endif
|
|
||||||
+
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
--- ./CPP/7zip/Crypto/Sha1.cpp 2010-10-20 06:56:08.000000000 +0200
|
|
||||||
+++ CPP/7zip/Crypto/Sha1.cpp.new 2013-09-15 09:19:51.000000000 +0200
|
|
||||||
@@ -148,10 +148,10 @@
|
|
||||||
for (int i = 0; i < kBlockSizeInWords; i++)
|
|
||||||
{
|
|
||||||
UInt32 d = _buffer[i];
|
|
||||||
- data[i * 4 + 0 - kBlockSize] = (Byte)(d);
|
|
||||||
- data[i * 4 + 1 - kBlockSize] = (Byte)(d >> 8);
|
|
||||||
- data[i * 4 + 2 - kBlockSize] = (Byte)(d >> 16);
|
|
||||||
- data[i * 4 + 3 - kBlockSize] = (Byte)(d >> 24);
|
|
||||||
+ data[(int)i * 4 + 0 - (int)kBlockSize] = (Byte)(d);
|
|
||||||
+ data[(int)i * 4 + 1 - (int)kBlockSize] = (Byte)(d >> 8);
|
|
||||||
+ data[(int)i * 4 + 2 - (int)kBlockSize] = (Byte)(d >> 16);
|
|
||||||
+ data[(int)i * 4 + 3 - (int)kBlockSize] = (Byte)(d >> 24);
|
|
||||||
}
|
|
||||||
returnRes = rar350Mode;
|
|
||||||
}
|
|
||||||
@ -1,283 +0,0 @@
|
|||||||
Author: Ben Hutchings <ben@decadent.org.uk>
|
|
||||||
Date: Tue, 19 May 2015 02:38:40 +0100
|
|
||||||
Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038)
|
|
||||||
Bug: http://sourceforge.net/p/p7zip/bugs/147/
|
|
||||||
Bug-Debian: https://bugs.debian.org/774660
|
|
||||||
|
|
||||||
Alexander Cherepanov discovered that 7zip is susceptible to a
|
|
||||||
directory traversal vulnerability. While extracting an archive, it
|
|
||||||
will extract symlinks and then follow them if they are referenced in
|
|
||||||
further entries. This can be exploited by a rogue archive to write
|
|
||||||
files outside the current directory.
|
|
||||||
|
|
||||||
We have to create placeholder files (which we already do) and delay
|
|
||||||
creating symlinks until the end of extraction.
|
|
||||||
|
|
||||||
Due to the possibility of anti-items (deletions) in the archive, it is
|
|
||||||
possible for placeholders to be deleted and replaced before we create
|
|
||||||
the symlinks. It's not clear that this can be used for mischief, but
|
|
||||||
GNU tar guards against similar problems by checking that the placeholder
|
|
||||||
still exists and is the same inode. XXX It also checks 'birth time' but
|
|
||||||
this isn't portable. We can probably get away with comparing ctime
|
|
||||||
since we don't support hard links.
|
|
||||||
|
|
||||||
--- a/CPP/7zip/UI/Agent/Agent.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Agent/Agent.cpp
|
|
||||||
@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const
|
|
||||||
HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
|
|
||||||
realIndices.Size(), testMode, extractCallback);
|
|
||||||
if (result == S_OK)
|
|
||||||
- result = extractCallbackSpec->SetDirsTimes();
|
|
||||||
+ result = extractCallbackSpec->SetFinalAttribs();
|
|
||||||
return result;
|
|
||||||
COM_TRY_END
|
|
||||||
}
|
|
||||||
--- a/CPP/7zip/UI/Client7z/Client7z.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Client7z/Client7z.cpp
|
|
||||||
@@ -222,8 +222,11 @@ private:
|
|
||||||
COutFileStream *_outFileStreamSpec;
|
|
||||||
CMyComPtr<ISequentialOutStream> _outFileStream;
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
public:
|
|
||||||
void Init(IInArchive *archiveHandler, const FString &directoryPath);
|
|
||||||
+ HRESULT SetFinalAttribs();
|
|
||||||
|
|
||||||
UInt64 NumErrors;
|
|
||||||
bool PasswordIsDefined;
|
|
||||||
@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
}
|
|
||||||
_outFileStream.Release();
|
|
||||||
if (_extractMode && _processedFileInfo.AttribDefined)
|
|
||||||
- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
|
|
||||||
+ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks);
|
|
||||||
PrintNewLine();
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
+HRESULT CArchiveExtractCallback::SetFinalAttribs()
|
|
||||||
+{
|
|
||||||
+ HRESULT result = S_OK;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ if (!_delayedSymLinks[i].Create())
|
|
||||||
+ result = E_FAIL;
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return result;
|
|
||||||
+}
|
|
||||||
|
|
||||||
STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
|
|
||||||
{
|
|
||||||
@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha
|
|
||||||
// extractCallbackSpec->PasswordIsDefined = true;
|
|
||||||
// extractCallbackSpec->Password = L"1";
|
|
||||||
HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
|
|
||||||
+ if (result == S_OK)
|
|
||||||
+ result = extractCallbackSpec->SetFinalAttribs();
|
|
||||||
if (result != S_OK)
|
|
||||||
{
|
|
||||||
PrintError("Extract Error");
|
|
||||||
--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
|
|
||||||
@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
|
|
||||||
NumFiles++;
|
|
||||||
|
|
||||||
if (_extractMode && _fi.AttribDefined)
|
|
||||||
- SetFileAttrib(_diskFilePath, _fi.Attrib);
|
|
||||||
+ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
|
|
||||||
RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted));
|
|
||||||
return S_OK;
|
|
||||||
COM_TRY_END
|
|
||||||
@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-HRESULT CArchiveExtractCallback::SetDirsTimes()
|
|
||||||
+HRESULT CArchiveExtractCallback::SetFinalAttribs()
|
|
||||||
{
|
|
||||||
+ HRESULT result = S_OK;
|
|
||||||
CRecordVector<CExtrRefSortPair> pairs;
|
|
||||||
pairs.ClearAndSetSize(_extractedFolderPaths.Size());
|
|
||||||
unsigned i;
|
|
||||||
@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs
|
|
||||||
(WriteATime && ATimeDefined) ? &ATime : NULL,
|
|
||||||
(WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
|
|
||||||
}
|
|
||||||
- return S_OK;
|
|
||||||
+
|
|
||||||
+ for (int i = 0; i != _delayedSymLinks.Size(); ++i)
|
|
||||||
+ if (!_delayedSymLinks[i].Create())
|
|
||||||
+ result = E_FAIL;
|
|
||||||
+
|
|
||||||
+ _delayedSymLinks.Clear();
|
|
||||||
+
|
|
||||||
+ return result;
|
|
||||||
}
|
|
||||||
--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h
|
|
||||||
+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h
|
|
||||||
@@ -6,6 +6,8 @@
|
|
||||||
#include "../../../Common/MyCom.h"
|
|
||||||
#include "../../../Common/Wildcard.h"
|
|
||||||
|
|
||||||
+#include "../../../Windows/FileDir.h"
|
|
||||||
+
|
|
||||||
#include "../../IPassword.h"
|
|
||||||
|
|
||||||
#include "../../Common/FileStreams.h"
|
|
||||||
@@ -213,6 +215,8 @@ class CArchiveExtractCallback:
|
|
||||||
bool _saclEnabled;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ CObjectVector<NWindows::NFile::NDir::CDelayedSymLink> _delayedSymLinks;
|
|
||||||
+
|
|
||||||
void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
|
|
||||||
HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
|
|
||||||
HRESULT GetUnpackSize();
|
|
||||||
@@ -293,7 +297,7 @@ public:
|
|
||||||
_baseParentFolder = indexInArc;
|
|
||||||
}
|
|
||||||
|
|
||||||
- HRESULT SetDirsTimes();
|
|
||||||
+ HRESULT SetFinalAttribs();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
--- a/CPP/7zip/UI/Common/Extract.cpp
|
|
||||||
+++ b/CPP/7zip/UI/Common/Extract.cpp
|
|
||||||
@@ -170,7 +170,7 @@ static HRESULT DecompressArchive(
|
|
||||||
else
|
|
||||||
result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
|
|
||||||
if (result == S_OK && !options.StdInMode)
|
|
||||||
- result = ecs->SetDirsTimes();
|
|
||||||
+ result = ecs->SetFinalAttribs();
|
|
||||||
return callback->ExtractResult(result);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- a/CPP/Windows/FileDir.cpp
|
|
||||||
+++ b/CPP/Windows/FileDir.cpp
|
|
||||||
@@ -343,7 +343,8 @@ static int convert_to_symlink(const char
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes)
|
|
||||||
+bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks)
|
|
||||||
{
|
|
||||||
if (!fileName) {
|
|
||||||
SetLastError(ERROR_PATH_NOT_FOUND);
|
|
||||||
@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
|
|
||||||
stat_info.st_mode = fileAttributes >> 16;
|
|
||||||
#ifdef ENV_HAVE_LSTAT
|
|
||||||
if (S_ISLNK(stat_info.st_mode)) {
|
|
||||||
- if ( convert_to_symlink(name) != 0) {
|
|
||||||
+ if (delayedSymLinks)
|
|
||||||
+ delayedSymLinks->Add(CDelayedSymLink(name));
|
|
||||||
+ else if ( convert_to_symlink(name) != 0) {
|
|
||||||
TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
@@ -885,6 +888,43 @@ bool CTempDir::Remove()
|
|
||||||
return !_mustBeDeleted;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+
|
|
||||||
+CDelayedSymLink::CDelayedSymLink(const char * source)
|
|
||||||
+ : _source(source)
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (lstat(_source, &st) == 0) {
|
|
||||||
+ _dev = st.st_dev;
|
|
||||||
+ _ino = st.st_ino;
|
|
||||||
+ } else {
|
|
||||||
+ _dev = 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+bool CDelayedSymLink::Create()
|
|
||||||
+{
|
|
||||||
+ struct stat st;
|
|
||||||
+
|
|
||||||
+ if (_dev == 0) {
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+ if (lstat(_source, &st) != 0)
|
|
||||||
+ return false;
|
|
||||||
+ if (_dev != st.st_dev || _ino != st.st_ino) {
|
|
||||||
+ // Placeholder file has been overwritten or moved by another
|
|
||||||
+ // symbolic link creation
|
|
||||||
+ errno = EPERM;
|
|
||||||
+ return false;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return convert_to_symlink(_source) == 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+
|
|
||||||
}}}
|
|
||||||
|
|
||||||
|
|
||||||
--- a/CPP/Windows/FileDir.h
|
|
||||||
+++ b/CPP/Windows/FileDir.h
|
|
||||||
@@ -4,6 +4,7 @@
|
|
||||||
#define __WINDOWS_FILE_DIR_H
|
|
||||||
|
|
||||||
#include "../Common/MyString.h"
|
|
||||||
+#include "../Common/MyVector.h"
|
|
||||||
|
|
||||||
#include "FileIO.h"
|
|
||||||
|
|
||||||
@@ -11,11 +12,14 @@ namespace NWindows {
|
|
||||||
namespace NFile {
|
|
||||||
namespace NDir {
|
|
||||||
|
|
||||||
+class CDelayedSymLink;
|
|
||||||
+
|
|
||||||
bool GetWindowsDir(FString &path);
|
|
||||||
bool GetSystemDir(FString &path);
|
|
||||||
|
|
||||||
bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime);
|
|
||||||
-bool SetFileAttrib(CFSTR path, DWORD attrib);
|
|
||||||
+bool SetFileAttrib(CFSTR path, DWORD attrib,
|
|
||||||
+ CObjectVector<CDelayedSymLink> *delayedSymLinks = 0);
|
|
||||||
bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
|
|
||||||
|
|
||||||
#ifndef UNDER_CE
|
|
||||||
@@ -69,6 +73,31 @@ public:
|
|
||||||
bool Remove();
|
|
||||||
};
|
|
||||||
|
|
||||||
+// Symbolic links must be created last so that they can't be used to
|
|
||||||
+// create or overwrite files above the extraction directory.
|
|
||||||
+class CDelayedSymLink
|
|
||||||
+{
|
|
||||||
+#ifdef ENV_UNIX
|
|
||||||
+ // Where the symlink should be created. The target is specified in
|
|
||||||
+ // the placeholder file.
|
|
||||||
+ AString _source;
|
|
||||||
+
|
|
||||||
+ // Device and inode of the placeholder file. Before creating the
|
|
||||||
+ // symlink, we must check that these haven't been changed by creation
|
|
||||||
+ // of another symlink.
|
|
||||||
+ dev_t _dev;
|
|
||||||
+ ino_t _ino;
|
|
||||||
+
|
|
||||||
+public:
|
|
||||||
+ explicit CDelayedSymLink(const char * source);
|
|
||||||
+ bool Create();
|
|
||||||
+#else // !ENV_UNIX
|
|
||||||
+public:
|
|
||||||
+ CDelayedSymLink(const char * source) {}
|
|
||||||
+ bool Create() { return true; }
|
|
||||||
+#endif // ENV_UNIX
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
#if !defined(UNDER_CE)
|
|
||||||
class CCurrentDirRestorer
|
|
||||||
{
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp
|
|
||||||
--- old/CPP/7zip/UI/FileManager/FM.cpp 2015-01-18 08:59:09.000000000 -1000
|
|
||||||
+++ new/CPP/7zip/UI/FileManager/FM.cpp 2015-02-09 11:39:55.575712452 -1000
|
|
||||||
@@ -348,24 +348,7 @@
|
|
||||||
|
|
||||||
bool IsLargePageSupported()
|
|
||||||
{
|
|
||||||
- #ifdef _WIN64
|
|
||||||
return true;
|
|
||||||
- #else
|
|
||||||
- OSVERSIONINFO versionInfo;
|
|
||||||
- versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
|
|
||||||
- if (!::GetVersionEx(&versionInfo))
|
|
||||||
- return false;
|
|
||||||
- if (versionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || versionInfo.dwMajorVersion < 5)
|
|
||||||
- return false;
|
|
||||||
- if (versionInfo.dwMajorVersion > 5)
|
|
||||||
- return true;
|
|
||||||
- if (versionInfo.dwMinorVersion < 1)
|
|
||||||
- return false;
|
|
||||||
- if (versionInfo.dwMinorVersion > 1)
|
|
||||||
- return true;
|
|
||||||
- // return IsWow64();
|
|
||||||
- return false;
|
|
||||||
- #endif
|
|
||||||
}
|
|
||||||
|
|
||||||
#if 0 //#ifndef UNDER_CE
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>prometheanfire@gentoo.org</email>
|
|
||||||
<description>maintainer</description>
|
|
||||||
</maintainer>
|
|
||||||
<use>
|
|
||||||
<flag name="rar">Enable support for non-free rar decoder</flag>
|
|
||||||
</use>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="sourceforge">p7zip</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,161 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="3.0"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${P}-CVE-2015-1038.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
|
||||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
|
||||||
[[ ${CHOST} == *64-* ]] \
|
|
||||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
|
||||||
|| cp -f makefile.macosx_32bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
need-wxwidgets unicode
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake -- 7zG
|
|
||||||
# emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
# doexe bin/7z{G,FM}
|
|
||||||
doexe bin/7zG
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
dodir /usr/share/kservices5/ServiceMenus
|
|
||||||
for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
|
|
||||||
item="$(basename ${item})"
|
|
||||||
dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,156 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="3.0"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${P}-CVE-2015-1038.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
|
||||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
|
||||||
[[ ${CHOST} == *64-* ]] \
|
|
||||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
|
||||||
|| cp -f makefile.macosx_32bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
need-wxwidgets unicode
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake -- 7zG
|
|
||||||
# emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
# doexe bin/7z{G,FM}
|
|
||||||
doexe bin/7zG
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="3.0"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-darwin.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU
|
|
||||||
# linker, it doesn't matter so much for bitwidth, for it doesn't
|
|
||||||
# do anything with it
|
|
||||||
cp -f makefile.macosx_llvm_64bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile.list \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
need-wxwidgets unicode
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
|
|
||||||
# emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
# doexe bin/7z{G,FM}
|
|
||||||
doexe bin/7zG
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
dodir /usr/share/kservices5/ServiceMenus
|
|
||||||
for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
|
|
||||||
item="$(basename ${item})"
|
|
||||||
dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="3.0"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/${P}-darwin.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU
|
|
||||||
# linker, it doesn't matter so much for bitwidth, for it doesn't
|
|
||||||
# do anything with it
|
|
||||||
cp -f makefile.macosx_llvm_64bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile.list \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
need-wxwidgets unicode
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX) all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake CC=$(tc-getCC) CXX=$(tc-getCXX) -- 7zG
|
|
||||||
# emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
# make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
# make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
# doexe bin/7z{G,FM}
|
|
||||||
doexe bin/7zG
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
dodir /usr/share/kservices5/ServiceMenus
|
|
||||||
for item in "${D}"/usr/share/kde4/services/ServiceMenus/*.desktop; do
|
|
||||||
item="$(basename ${item})"
|
|
||||||
dosym "/usr/share/kde4/services/ServiceMenus/${item}" "/usr/share/kservices5/ServiceMenus/${item}"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,155 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
|
|
||||||
WX_GTK_VER="2.8"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${P}-execstack.patch \
|
|
||||||
"${FILESDIR}"/${P}-QA.patch \
|
|
||||||
"${FILESDIR}"/${P}-CVE-2015-1038.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-O::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e "/^CC/s:\$(ALLFLAGS):${CFLAGS} \$(ALLFLAGS):g" \
|
|
||||||
-e "/^CXX/s:\$(ALLFLAGS):${CXXFLAGS} \$(ALLFLAGS):g" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed -e '/Rar/d' -i makefile* || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
epatch "${FILESDIR}"/9.04-makefile.patch
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed -i \
|
|
||||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
|
||||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
makefile* || die "changing makefiles"
|
|
||||||
|
|
||||||
if use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
|
||||||
[[ ${CHOST} == *64-* ]] \
|
|
||||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
|
||||||
|| cp -f makefile.macosx_32bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake -- 7zG
|
|
||||||
emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z{G,FM}
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOCS/*.txt
|
|
||||||
dohtml -r DOCS/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,156 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="2.8"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${P}-osversion.patch \
|
|
||||||
"${FILESDIR}"/${P}-CVE-2015-1038.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-O::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
|
||||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile*
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
|
||||||
[[ ${CHOST} == *64-* ]] \
|
|
||||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
|
||||||
|| cp -f makefile.macosx_32bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake -- 7zG
|
|
||||||
emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z{G,FM}
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
WX_GTK_VER="3.0"
|
|
||||||
|
|
||||||
inherit eutils multilib toolchain-funcs wxwidgets
|
|
||||||
|
|
||||||
DESCRIPTION="Port of 7-Zip archiver for Unix"
|
|
||||||
HOMEPAGE="http://p7zip.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
|
|
||||||
|
|
||||||
LICENSE="LGPL-2.1 rar? ( unRAR )"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
|
|
||||||
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
|
|
||||||
|
|
||||||
REQUIRED_USE="kde? ( wxwidgets )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
kde? ( x11-libs/wxGTK:${WX_GTK_VER}[X] kde-base/kdelibs )
|
|
||||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
amd64? ( dev-lang/yasm )
|
|
||||||
abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 )
|
|
||||||
x86? ( dev-lang/nasm )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${PN}_${PV}
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch \
|
|
||||||
"${FILESDIR}"/${P}-osversion.patch \
|
|
||||||
"${FILESDIR}"/${P}-CVE-2015-1038.patch
|
|
||||||
|
|
||||||
if ! use pch; then
|
|
||||||
sed "s:PRE_COMPILED_HEADER=StdAfx.h.gch:PRE_COMPILED_HEADER=:g" -i makefile.* || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
sed \
|
|
||||||
-e 's:-m32 ::g' \
|
|
||||||
-e 's:-m64 ::g' \
|
|
||||||
-e 's:-O::g' \
|
|
||||||
-e 's:-pipe::g' \
|
|
||||||
-e "/^CXX=/s:g++:$(tc-getCXX):" \
|
|
||||||
-e "/^CC=/s:gcc:$(tc-getCC):" \
|
|
||||||
-e '/ALLFLAGS/s:-s ::' \
|
|
||||||
-e "/OPTFLAGS=/s:=.*:=${CXXFLAGS}:" \
|
|
||||||
-i makefile* || die
|
|
||||||
|
|
||||||
# remove non-free RAR codec
|
|
||||||
if use rar; then
|
|
||||||
ewarn "Enabling nonfree RAR decompressor"
|
|
||||||
else
|
|
||||||
sed \
|
|
||||||
-e '/Rar/d' \
|
|
||||||
-e '/RAR/d' \
|
|
||||||
-i makefile* CPP/7zip/Bundles/Format7zFree/makefile || die
|
|
||||||
rm -rf CPP/7zip/Compress/Rar || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use abi_x86_x32; then
|
|
||||||
sed -i -e "/^ASM=/s:amd64:x32:" makefile*
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use amd64; then
|
|
||||||
cp -f makefile.linux_amd64_asm makefile.machine || die
|
|
||||||
elif use x86; then
|
|
||||||
cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
|
|
||||||
elif [[ ${CHOST} == *-darwin* ]] ; then
|
|
||||||
# Mac OS X needs this special makefile, because it has a non-GNU linker
|
|
||||||
[[ ${CHOST} == *64-* ]] \
|
|
||||||
&& cp -f makefile.macosx_64bits makefile.machine \
|
|
||||||
|| cp -f makefile.macosx_32bits makefile.machine
|
|
||||||
# bundles have extension .bundle but don't die because USE=-rar
|
|
||||||
# removes the Rar directory
|
|
||||||
sed -i -e '/strcpy(name/s/\.so/.bundle/' \
|
|
||||||
CPP/Windows/DLL.cpp || die
|
|
||||||
sed -i -e '/^PROG=/s/\.so/.bundle/' \
|
|
||||||
CPP/7zip/Bundles/Format7zFree/makefile \
|
|
||||||
$(use rar && echo CPP/7zip/Compress/Rar/makefile) || die
|
|
||||||
elif use x86-fbsd; then
|
|
||||||
# FreeBSD needs this special makefile, because it hasn't -ldl
|
|
||||||
sed -e 's/-lc_r/-pthread/' makefile.freebsd > makefile.machine
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use static; then
|
|
||||||
sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
need-wxwidgets unicode
|
|
||||||
einfo "Preparing dependency list"
|
|
||||||
emake depend
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake all3
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
emake -- 7zG
|
|
||||||
emake -- 7zFM
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
emake test test_7z test_7zr
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
# this wrappers can not be symlinks, p7zip should be called with full path
|
|
||||||
make_wrapper 7zr "/usr/$(get_libdir)/${PN}/7zr"
|
|
||||||
make_wrapper 7za "/usr/$(get_libdir)/${PN}/7za"
|
|
||||||
make_wrapper 7z "/usr/$(get_libdir)/${PN}/7z"
|
|
||||||
|
|
||||||
if use kde || use wxwidgets; then
|
|
||||||
make_wrapper 7zG "/usr/$(get_libdir)/${PN}/7zG"
|
|
||||||
make_wrapper 7zFM "/usr/$(get_libdir)/${PN}/7zFM"
|
|
||||||
|
|
||||||
make_desktop_entry 7zFM "${PN} FM" ${PN} "GTK;Utility;Archiving;Compression"
|
|
||||||
|
|
||||||
dobin GUI/p7zipForFilemanager
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z{G,FM}
|
|
||||||
|
|
||||||
insinto /usr/$(get_libdir)/${PN}
|
|
||||||
doins -r GUI/{Lang,help}
|
|
||||||
|
|
||||||
insinto /usr/share/icons/hicolor/16x16/apps/
|
|
||||||
newins GUI/p7zip_16_ok.png p7zip.png
|
|
||||||
|
|
||||||
if use kde; then
|
|
||||||
rm GUI/kde4/p7zip_compress.desktop || die
|
|
||||||
insinto /usr/share/kde4/services/ServiceMenus
|
|
||||||
doins GUI/kde4/*.desktop
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
dobin contrib/gzip-like_CLI_wrapper_for_7z/p7zip
|
|
||||||
doman contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1
|
|
||||||
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}
|
|
||||||
doexe bin/7z bin/7za bin/7zr bin/7zCon.sfx
|
|
||||||
doexe bin/*$(get_modname)
|
|
||||||
if use rar; then
|
|
||||||
exeinto /usr/$(get_libdir)/${PN}/Codecs/
|
|
||||||
doexe bin/Codecs/*$(get_modname)
|
|
||||||
fi
|
|
||||||
|
|
||||||
doman man1/7z.1 man1/7za.1 man1/7zr.1
|
|
||||||
dodoc ChangeLog README TODO
|
|
||||||
|
|
||||||
if use doc; then
|
|
||||||
dodoc DOC/*.txt
|
|
||||||
dohtml -r DOC/MANUAL/*
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
# ChangeLog for app-arch/snappy
|
|
||||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# (auto-generated from git log)
|
|
||||||
|
|
||||||
*snappy-1.1.2-r1 (09 Aug 2015)
|
|
||||||
*snappy-1.1.2 (09 Aug 2015)
|
|
||||||
*snappy-1.1.1 (09 Aug 2015)
|
|
||||||
|
|
||||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
|
|
||||||
+snappy-1.1.1.ebuild, +snappy-1.1.2.ebuild, +snappy-1.1.2-r1.ebuild:
|
|
||||||
proj/gentoo: Initial commit
|
|
||||||
|
|
||||||
This commit represents a new era for Gentoo:
|
|
||||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
|
||||||
|
|
||||||
This commit is the start of the NEW history.
|
|
||||||
Any historical data is intended to be grafted onto this point.
|
|
||||||
|
|
||||||
Creation process:
|
|
||||||
1. Take final CVS checkout snapshot
|
|
||||||
2. Remove ALL ChangeLog* files
|
|
||||||
3. Transform all Manifests to thin
|
|
||||||
4. Remove empty Manifests
|
|
||||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
|
||||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
|
||||||
|
|
||||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
|
||||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
|
||||||
tests
|
|
||||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
|
||||||
project
|
|
||||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
|
||||||
developer, wrote Git features for the migration
|
|
||||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
|
||||||
cvs2svn
|
|
||||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
|
||||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
|
||||||
work in migration
|
|
||||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
|
||||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
|
||||||
the bikeshed
|
|
||||||
|
|
||||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml,
|
|
||||||
snappy-1.1.2.ebuild, snappy-1.1.2-r1.ebuild:
|
|
||||||
Use https by default
|
|
||||||
|
|
||||||
Convert all URLs for sites supporting encrypted connections from http to
|
|
||||||
https
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> snappy-1.1.1.ebuild:
|
|
||||||
Convert URIs for googlecode.com to https
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
|
||||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
|
||||||
|
|
||||||
repoman does not yet accept the https version.
|
|
||||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
|
||||||
|
|
||||||
Bug: https://bugs.gentoo.org/552720
|
|
||||||
|
|
||||||
*snappy-1.1.3 (27 Aug 2015)
|
|
||||||
|
|
||||||
27 Aug 2015; Tim Harder <radhermit@gentoo.org> +snappy-1.1.3.ebuild:
|
|
||||||
version bump
|
|
||||||
|
|
||||||
27 Aug 2015; Tim Harder <radhermit@gentoo.org> -snappy-1.1.1.ebuild,
|
|
||||||
-snappy-1.1.2.ebuild:
|
|
||||||
remove old
|
|
||||||
|
|
||||||
28 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
|
||||||
Add missing remote-id entries in metadata.xml
|
|
||||||
|
|
||||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
|
||||||
|
|
||||||
01 Sep 2015; Tobias Klausmann <klausman@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
Fixing HOMEPAGE move due to code.google.com shutdown
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
14 Sep 2015; Jeroen Roovers <jer@gentoo.org> snappy-1.1.3.ebuild:
|
|
||||||
Mark ~hppa (bug #560382).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
15 Sep 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
|
|
||||||
drop myself as maintainer
|
|
||||||
|
|
||||||
21 Sep 2015; Jeroen Roovers <jer@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
Stable for PPC64 (bug #543326).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
29 Sep 2015; Tobias Klausmann <klausman@gentoo.org> snappy-1.1.3.ebuild:
|
|
||||||
add ~alpha keyword
|
|
||||||
|
|
||||||
Gentoo-Bug: 560382
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.22
|
|
||||||
|
|
||||||
06 Oct 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
|
|
||||||
snappy-1.1.3.ebuild:
|
|
||||||
keyword ~amd64-fbsd
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
13 Oct 2015; Ian Delaney <idella4@gentoo.org> metadata.xml:
|
|
||||||
add new maintainer undersys to metadata
|
|
||||||
|
|
||||||
add proxy-maintainers herd, drop defunct remote source"
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
13 Oct 2015; Ian Delaney <idella4@gentoo.org> metadata.xml:
|
|
||||||
correct typo in name
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.20.1
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Replace all herds with appropriate projects (GLEP 67)
|
|
||||||
|
|
||||||
Replace all uses of herd with appropriate project maintainers, or no
|
|
||||||
maintainers in case of herds requested to be disbanded.
|
|
||||||
|
|
||||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
|
||||||
|
|
||||||
27 Jan 2016; Jeroen Roovers <jer@gentoo.org> snappy-1.1.3.ebuild:
|
|
||||||
Stable for HPPA (bug #571868).
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.27
|
|
||||||
RepoMan-Options: --ignore-arches
|
|
||||||
|
|
||||||
30 Jan 2016; Tobias Klausmann <klausman@gentoo.org> snappy-1.1.3.ebuild:
|
|
||||||
add alpha keyword
|
|
||||||
|
|
||||||
Gentoo-Bug: 571868
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.27
|
|
||||||
|
|
||||||
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> snappy-1.1.3.ebuild:
|
|
||||||
ppc stable wrt bug #577458
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.26
|
|
||||||
RepoMan-Options: --include-arches="ppc"
|
|
||||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
|
||||||
|
|
||||||
06 Apr 2016; Ian Delaney <idella4@gentoo.org> metadata.xml:
|
|
||||||
metadata.xml, update
|
|
||||||
|
|
||||||
Add description attribute for user maintainer in metadata.xml
|
|
||||||
|
|
||||||
Package-Manager: portage-2.2.28
|
|
||||||
|
|
||||||
31 May 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Remove the proxied maintainer, on his request
|
|
||||||
|
|
||||||
31 May 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
|
||||||
Add myself as a maintainer
|
|
||||||
|
|
||||||
*snappy-1.1.3-r1 (31 May 2016)
|
|
||||||
|
|
||||||
31 May 2016; Michał Górny <mgorny@gentoo.org> +snappy-1.1.3-r1.ebuild:
|
|
||||||
Clean up the ebuild, bump to EAPI=6
|
|
||||||
|
|
||||||
Replace partial use of deprecated autotools-multilib with correct
|
|
||||||
combination of autotools & multilib-minimal. Clean up the code a bit,
|
|
||||||
and bump it to EAPI=6.
|
|
||||||
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
# ChangeLog for app-arch/snappy
|
|
||||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/snappy/ChangeLog,v 1.22 2015/03/03 05:40:47 dlan Exp $
|
|
||||||
|
|
||||||
02 Mar 2015; Yixun Lan <dlan@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
add arm64 support, tested on A53 board
|
|
||||||
|
|
||||||
15 Nov 2014; Mike Frysinger <vapier@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
Make sure we depend on autotools #529078 by Nikoli.
|
|
||||||
|
|
||||||
30 Oct 2014; Markus Meier <maekke@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
arm stable, bug #526038
|
|
||||||
|
|
||||||
23 Oct 2014; Pacho Ramos <pacho@gentoo.org> snappy-1.1.2-r1.ebuild:
|
|
||||||
amd64/x86 stable, bug #526038
|
|
||||||
|
|
||||||
26 Sep 2014; Patrick Lauer <patrick@gentoo.org> snappy-1.1.1.ebuild,
|
|
||||||
snappy-1.1.2-r1.ebuild, snappy-1.1.2.ebuild:
|
|
||||||
Fix broken default_src_prepare #523760
|
|
||||||
|
|
||||||
11 Aug 2014; Anthony G. Basile <blueness@gentoo.org> snappy-1.1.1.ebuild,
|
|
||||||
snappy-1.1.2-r1.ebuild, snappy-1.1.2.ebuild:
|
|
||||||
Keyword ~ppc, ~ppc64 for bug #519618
|
|
||||||
|
|
||||||
*snappy-1.1.2-r1 (03 Apr 2014)
|
|
||||||
|
|
||||||
03 Apr 2014; Mike Frysinger <vapier@gentoo.org> +snappy-1.1.2-r1.ebuild:
|
|
||||||
Convert to autotools-multilib #504756 by David Heidelberger.
|
|
||||||
|
|
||||||
*snappy-1.1.2 (11 Mar 2014)
|
|
||||||
|
|
||||||
11 Mar 2014; Tim Harder <radhermit@gentoo.org> +snappy-1.1.2.ebuild,
|
|
||||||
metadata.xml:
|
|
||||||
Version bump, add myself as a maintainer.
|
|
||||||
|
|
||||||
11 Mar 2014; Pacho Ramos <pacho@gentoo.org> -snappy-1.0.3.ebuild,
|
|
||||||
-snappy-1.0.4.ebuild, -snappy-1.0.5.ebuild, -snappy-1.1.0.ebuild,
|
|
||||||
metadata.xml:
|
|
||||||
Cleanup due #239126
|
|
||||||
|
|
||||||
24 Feb 2014; Chema Alonso <nimiux@gentoo.org> snappy-1.1.1.ebuild:
|
|
||||||
Stable for amd64 wrt bug #495326
|
|
||||||
|
|
||||||
24 Feb 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> snappy-1.1.1.ebuild:
|
|
||||||
x86 stable wrt bug #495326
|
|
||||||
|
|
||||||
16 Feb 2014; Markus Meier <maekke@gentoo.org> snappy-1.1.1.ebuild:
|
|
||||||
arm stable, bug #495326
|
|
||||||
|
|
||||||
*snappy-1.1.1 (21 Nov 2013)
|
|
||||||
|
|
||||||
21 Nov 2013; Patrick Lauer <patrick@gentoo.org> +snappy-1.1.1.ebuild:
|
|
||||||
Bump
|
|
||||||
|
|
||||||
14 May 2013; Agostino Sarubbo <ago@gentoo.org> snappy-1.1.0.ebuild:
|
|
||||||
Stable for arm, wrt bug #469342
|
|
||||||
|
|
||||||
14 May 2013; Agostino Sarubbo <ago@gentoo.org> snappy-1.1.0.ebuild:
|
|
||||||
Stable for x86, wrt bug #469342
|
|
||||||
|
|
||||||
14 May 2013; Agostino Sarubbo <ago@gentoo.org> snappy-1.1.0.ebuild:
|
|
||||||
Stable for amd64, wrt bug #469342
|
|
||||||
|
|
||||||
26 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> snappy-1.0.5.ebuild,
|
|
||||||
snappy-1.1.0.ebuild:
|
|
||||||
Add ~arm keyword, wrt bug #463308
|
|
||||||
|
|
||||||
*snappy-1.1.0 (26 Mar 2013)
|
|
||||||
|
|
||||||
26 Mar 2013; Patrick Lauer <patrick@gentoo.org> +snappy-1.1.0.ebuild:
|
|
||||||
Bump for #457626
|
|
||||||
|
|
||||||
03 Mar 2013; Sébastien Fabbro <bicatali@gentoo.org> snappy-1.0.5.ebuild:
|
|
||||||
Keyword amd64-linux and x86-linux
|
|
||||||
|
|
||||||
*snappy-1.0.5 (25 Nov 2012)
|
|
||||||
|
|
||||||
25 Nov 2012; Tim Harder <radhermit@gentoo.org> +snappy-1.0.5.ebuild:
|
|
||||||
Version bump (bug #407733).
|
|
||||||
|
|
||||||
*snappy-1.0.4 (21 Nov 2011)
|
|
||||||
|
|
||||||
21 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +snappy-1.0.4.ebuild:
|
|
||||||
Bump to 1.0.4, bug 385275
|
|
||||||
|
|
||||||
*snappy-1.0.3 (14 Jun 2011)
|
|
||||||
|
|
||||||
14 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +snappy-1.0.3.ebuild,
|
|
||||||
+metadata.xml:
|
|
||||||
Add snappy-1.0.3, there seems to be demand for it
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
DIST snappy-1.1.2.tar.gz 1485435 SHA256 f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4 SHA512 da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e WHIRLPOOL a9cf520cc578a0a63ebb7fb127428b50d282cdf2448938ad88349f775e21b3dd27f2c6843f86dd749d66e9df5e29094bc5c67032f0219932fec69f882ec91246
|
|
||||||
DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
|
|
||||||
EBUILD snappy-1.1.2-r1.ebuild 988 SHA256 12d849046e25e556d5e4bfc3679fd21c7bd0ae16ed31bb8495e89580c14df0f7 SHA512 ff7f46efdd09a7238ee43e3b7d1198585e403242c2d14c3612a875591db26f7387426bd41030d67d2c69a2ba1e2388fb57f8ce16e74be798ff691091a045c30b WHIRLPOOL 1f39a46917c666331c7251b481eb3cab77819ee7c0d10050b76f99b25a65e080c8eca29de5cb6b1622fc5d9ea2d9a1075e15aef6be0dba97c5718c4ccee44a93
|
|
||||||
EBUILD snappy-1.1.3-r1.ebuild 980 SHA256 37ab972f912cac77665316964b48d76f86f358a13a2e4b0cd6000c959c237437 SHA512 89c341306acaf2938512c9d7ea18289d04b34c341c62253792b4b7ccbb5b4a6d9b268c12552e64100c7715813388bdd8d41f464ffe380f6cc701f15086cfba90 WHIRLPOOL 8a9ebfc6ed735be98aaad9c2bdcabee58c0699011e202c6d2daf20c0a0a5d28e93d54360f64309a2cd0a0f0b03caea41982029a8995667c5d868bdd3e92a634e
|
|
||||||
EBUILD snappy-1.1.3.ebuild 973 SHA256 6c4468ed8bd3b355f03d5dbf29cc91036c0fddca2e1995e3d2ce572f35a30f92 SHA512 67a2d9de2271f75ac91f27a07e5278d3fa0c594f782ca2eb5f65d546dcb02d73d3718048c105200f07094e47cdf4689e43977d4688391929e42194279c9b3337 WHIRLPOOL ff1edadf460e4f877447860b55ca8bc2f1af8f6343a7cf540e3fac57745f22663ef88c46927d3f4d897e3ec8a0938aa11c34cee583a9c42da5c26e03a4c147af
|
|
||||||
MISC ChangeLog 5587 SHA256 b5f1dbf454ec83b2e92ec6e4298a45f2466781fff069355df95de7509901958a SHA512 2239ec6318fa5a6cbf9a84d06dd585ca6abb08f7997402de763bc39add10b9008cab82a0295e797b02116885d717ef4b63ad6fcf8a889be9214391d4066c9a23 WHIRLPOOL a7ada489af29ff8d339db9bf829df96beaaea1d18b7074da0b2b2c8d5f9a6e4a38f2298ef3096fb879ae36db1c401cef5ec7859aef6b5ab6b73edcbcaa8477ba
|
|
||||||
MISC ChangeLog-2015 3009 SHA256 496f7049cf9169cd876f483f36355d834dae5d53ee5e7d4ea832d94f8a91223b SHA512 16b814e292d70e3d7b8483c2e033810a0c92cdbc2f6916c3804129fbc06b19315dd5fafb0984c1ec34dd269b447465e07e1eb2513a7f2bce2e508f51c3794b38 WHIRLPOOL 89c95a8bf42c4ca793e68599238a4baee414f5537937ac58019410e2740e5aa881cb5a235caf3eecfefec7ca031a1f04d4808c5340bd42edd85547d9d6857664
|
|
||||||
MISC metadata.xml 584 SHA256 f04f34c234737a786878b755c50e60c82f305a916e6540d78d64e4e125163da9 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552 WHIRLPOOL ca57c4d5abcd31ffe119bb9a85653c5addc651846cffe9d0196fa91eb1a0b748589962b580b544501b8af52b57fa89347bf7b0d0056792b89233e202abf03232
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type='person'>
|
|
||||||
<email>mgorny@gentoo.org</email>
|
|
||||||
<name>Michał Górny</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
|
|
||||||
maximum compression, or compatibility with any other compression
|
|
||||||
library; instead, it aims for very high speeds and reasonable
|
|
||||||
compression.</longdescription>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">google/snappy</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
AUTOTOOLS_AUTO_DEPEND="yes"
|
|
||||||
inherit eutils autotools-multilib
|
|
||||||
|
|
||||||
DESCRIPTION="A high-speed compression/decompression library by Google"
|
|
||||||
HOMEPAGE="https://github.com/google/snappy"
|
|
||||||
# upstream uses google drive which has hash-based URLS
|
|
||||||
SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
|
|
||||||
IUSE="static-libs"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Avoid automagic lzo and gzip by not checking for it
|
|
||||||
sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
|
|
||||||
|
|
||||||
# don't install unwanted files
|
|
||||||
sed -i 's/COPYING INSTALL//' Makefile.am || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf \
|
|
||||||
--docdir='$(datarootdir)'/doc/${PF} \
|
|
||||||
--without-gflags \
|
|
||||||
--disable-gtest \
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
prune_libtool_files
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
inherit autotools multilib-minimal
|
|
||||||
|
|
||||||
DESCRIPTION="A high-speed compression/decompression library by Google"
|
|
||||||
HOMEPAGE="https://github.com/google/snappy"
|
|
||||||
SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
|
|
||||||
~amd64-fbsd ~amd64-linux ~x86-linux"
|
|
||||||
IUSE="static-libs"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Avoid automagic lzo and gzip by not checking for it
|
|
||||||
sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
|
|
||||||
|
|
||||||
# don't install unwanted files
|
|
||||||
sed -i 's/COPYING INSTALL//' Makefile.am || die
|
|
||||||
|
|
||||||
default
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local myconf=(
|
|
||||||
--without-gflags
|
|
||||||
--disable-gtest
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
)
|
|
||||||
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf "${myconf[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
find "${ED%/}"/usr/lib* -name '*.la' -delete || die
|
|
||||||
}
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
AUTOTOOLS_AUTO_DEPEND="yes"
|
|
||||||
inherit eutils autotools-multilib
|
|
||||||
|
|
||||||
DESCRIPTION="A high-speed compression/decompression library by Google"
|
|
||||||
HOMEPAGE="https://github.com/google/snappy"
|
|
||||||
SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
|
|
||||||
IUSE="static-libs"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Avoid automagic lzo and gzip by not checking for it
|
|
||||||
sed -i '/^CHECK_EXT_COMPRESSION_LIB/d' configure.ac || die
|
|
||||||
|
|
||||||
# don't install unwanted files
|
|
||||||
sed -i 's/COPYING INSTALL//' Makefile.am || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
ECONF_SOURCE=${S} \
|
|
||||||
econf \
|
|
||||||
--docdir='$(datarootdir)'/doc/${PF} \
|
|
||||||
--without-gflags \
|
|
||||||
--disable-gtest \
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
prune_libtool_files
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
# ChangeLog for app-crypt/efitools
|
|
||||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/ChangeLog,v 1.6 2013/10/03 22:34:09 gregkh Exp $
|
|
||||||
|
|
||||||
*efitools-1.4.2-r1 (03 Oct 2013)
|
|
||||||
|
|
||||||
03 Oct 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +efitools-1.4.2-r1.ebuild:
|
|
||||||
add build dependancy for perl script as per bug #486844
|
|
||||||
|
|
||||||
*efitools-1.4.2 (02 Oct 2013)
|
|
||||||
|
|
||||||
02 Oct 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +efitools-1.4.2.ebuild:
|
|
||||||
Version bump to 1.4.2
|
|
||||||
|
|
||||||
10 Sep 2013; Patrick Lauer <patrick@gentoo.org> efitools-1.4.1-r1.ebuild,
|
|
||||||
efitools-1.4.1-r2.ebuild, efitools-1.4.1.ebuild:
|
|
||||||
Whitespace
|
|
||||||
|
|
||||||
*efitools-1.4.1-r2 (01 Sep 2013)
|
|
||||||
|
|
||||||
01 Sep 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +efitools-1.4.1-r2.ebuild,
|
|
||||||
+files/xxdi.patch:
|
|
||||||
remove vim-core build dependancy by replacing it with a small perl script that
|
|
||||||
has been send upstream.
|
|
||||||
|
|
||||||
*efitools-1.4.1-r1 (30 Aug 2013)
|
|
||||||
|
|
||||||
30 Aug 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +efitools-1.4.1-r1.ebuild:
|
|
||||||
add missing DEPEND packages as per bug #483028
|
|
||||||
|
|
||||||
*pesign-0.108 (29 Aug 2013)
|
|
||||||
|
|
||||||
29 Aug 2013; Greg Kroah-Hartman <gregkh@gentoo.org> +files/destdir.patch,
|
|
||||||
+metadata.xml, +pesign-0.108.ebuild:
|
|
||||||
0.108 pesign added
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
AUX xxdi.patch 3046 SHA256 b2b716d5291529c252daa8ab890521e1f56731818073dcab183d7f6f4d5816cf SHA512 9b3612115ca594b7a1b3a99008650409cb9a90369ff73cd8d602385e77030026a921c510534e44ed7a76fcca2347d016e36f08223b9a49c7ca17518124bdb8ac WHIRLPOOL 4dcfcf930eaec0468cd090a294cf6cf00e6a48a59ce2c84884bec9d4b1fc093d8db48df0090763432b8af2d19263aff92ecfedc5bacf173993156ac439ddaf6c
|
|
||||||
DIST efitools-1.4.1.tar.gz 91444 SHA256 6946e7894118012ca12503a6e55a4f8f17310d0eb02d8f1ab8947d9012ad8b51 SHA512 0994fdd9f934575691f740631dfbcc67f15e56f873cba10657536389d61b5bb955b0de91261f0486bfa5381e27f42b5dd0b6ea55fe3643f8b0dae2f9b1916ef1 WHIRLPOOL 7eb973fd0239fa41d2ff82ccfda526725032c0da64d0cd5223a7d66abf42c951f4ba2d3613c024c3bceebf6e032af88527f6a35eff76f258f19e12431cbac0bd
|
|
||||||
DIST efitools-1.4.2.tar.gz 97303 SHA256 df7b9d7570b2fb85ee060e14b1952233d28e277f5b2f839c225f093890e5d843 SHA512 19433b6ccc95a18649b05376c0090f4325345d1a9ccf2601e9b4818a7a888379ab1bb620022f393498e520073f06e10962f5322632219fc21da390e4e5cd4c9f WHIRLPOOL 43000942f99fdf888bf2d2447eb28ca5eba9440194f5de71fd4532ad61a3735b23a08e4fdef4f89a9fd06e30537e9f6305e5f320e1c27ab60a6c4cb91762d74d
|
|
||||||
EBUILD efitools-1.4.1-r1.ebuild 708 SHA256 f5006ac96ec9089c07c1273b665f9b7b0016e8cde1efa329d7d8d583cd7bdc5b SHA512 59a31c61d656df893030642d5b4dd2578d66abe19beca4a19dcd0e59f317483d2a2313770f5e438d070ff8234c8d38d7993d346984dc2b398a6317c49c8c1d26 WHIRLPOOL db8875b87546e752439b32d7d3b1195a4ef0ba7583638ed2d816a6c99fe197a47b6c75c34e60fb76e267e1fefff75fdb62e581811c1dd979585b04aa2c18e17a
|
|
||||||
EBUILD efitools-1.4.1-r2.ebuild 811 SHA256 16b6dd6c1fa0159630995f3a4eaf3466c38053b2c41aac831b0b0e91ec03525e SHA512 9159ce0945b895f57116142eb6cb66e353e3a4f4eebab5a414a1228dabcb116c0db02fd75d6454de6ba8c0094ee6cbc471c592540e24238a22ef9661b34711fe WHIRLPOOL 6baffa3d0f2547345f957dcae153b77959e08cd85863b438a630371e01860ac6d328c34775b3e0ddde029790e3f004fee87cd024ecd20fd7d1d85fbb16383a0a
|
|
||||||
EBUILD efitools-1.4.1.ebuild 661 SHA256 6a565700ad7a761ae086e18ac3296c3c3fdfb0e8fdc4834cf89b0c55de178faf SHA512 7460cb377b575ea3c2efe244695fe711aae36beb4a11c504a87e05044cd6b0bbef2ab2c354715668c35e6cc5fb5391fab5b77a671553481b8a10024f4d540373 WHIRLPOOL 4d9a351860795439530fa40fca3e2303fb7cd1638ab11f9a6782e1dd5f2c4e2e66305e05b2a062709c900a12725f6ea68c7f518cda12476d47c0af9ad2518c1d
|
|
||||||
EBUILD efitools-1.4.2-r1.ebuild 682 SHA256 38b9d1d8d35a2bef63c034830b1f54db8bdd89cf1fd0879406cdf3979943d044 SHA512 534f38e511758ece618859937cd340a65dd8ec99ebeb40534965ded404fa3e6c376bc7ad45a8fd9594897ef0d060ec2ccf0d2f884862498eadb90e5cb8e1f344 WHIRLPOOL cb4c59921cf2a73197f8e809ac4811f8ca60206deabef35806e82440cebc53c4d357f580abe625a1e2c0cfcdb9c0c6416a4ae2870916c9a95d45d21fdf8dc148
|
|
||||||
EBUILD efitools-1.4.2.ebuild 658 SHA256 dfe973cb20ef8cc4f1ad82eb6b6c5fcc75fec97c05e1aa56814993ffd3611f9d SHA512 7d3a7911d5e24ce1d46bb90b071186d364795eab3f4e7538ba02076db992a02d842e82a59f4d855d80c452cfa6d8da75688282119fcb9257802f704d656aec44 WHIRLPOOL 92f8b043f48fd8d3df7793367ca41b0069ea729337cd7a5f69a9b96d2be2f7e3117b7873212ee3655c1043de1fbb66008156601ecb9c9173703eeaae20194a2e
|
|
||||||
MISC ChangeLog 1232 SHA256 66fa1a585006255202e5ec736217588b8697fc178eb17b9de4d044609de0a5ec SHA512 8d3dd5272f62d39672c01972a41fd13afa2b08903feb61018519c0b57e5f5b99e08b87b329398758af0a5f38749709254b63866ff6224349ab68d974d80f6a88 WHIRLPOOL cc7e264e10e57453646c983b30f2feb1a2848e966d90fb997f4740caa0d5ae7d1eb9790d8cece020993f9133664f651eabaa01eecb8aec266ab76c5aff9c46ac
|
|
||||||
MISC metadata.xml 240 SHA256 218f6016b45c0a0d55b04630266085c44107606f2b79024c15a9797b4b828bd5 SHA512 659a6ebd2024aefd2989e9c412b7bb10271a5d6b12f291dcc8dbdfb3568e8eddb8dfa674cf6befa80eb8036e222e434276d36ba5b164733cfc934e4e7a3ae101 WHIRLPOOL 252a9a3addb2a1ecf3b3734a5e65c097d3c6d032f18b05d33458298fbeb36b7cb6147830c85d4d80764e05653bc7a4bb48ec070662d28b148799cad42ecd05d0
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.1-r1.ebuild,v 1.2 2013/09/10 03:42:19 patrick Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
|
||||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
|
||||||
SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="dev-libs/openssl
|
|
||||||
sys-apps/util-linux"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
app-editors/vim-core
|
|
||||||
app-crypt/sbsigntool
|
|
||||||
virtual/pkgconfig"
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.1-r2.ebuild,v 1.2 2013/09/10 03:42:19 patrick Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
inherit eutils
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
|
||||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
|
||||||
SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="dev-libs/openssl
|
|
||||||
sys-apps/util-linux"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
dev-perl/File-Slurp
|
|
||||||
app-crypt/sbsigntool
|
|
||||||
virtual/pkgconfig"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/xxdi.patch
|
|
||||||
chmod 755 "${WORKDIR}/${P}/xxdi.pl"
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.1.ebuild,v 1.2 2013/09/10 03:42:19 patrick Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
|
||||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
|
||||||
SRC_URI="https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="dev-libs/openssl
|
|
||||||
sys-apps/util-linux"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
virtual/pkgconfig"
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.2-r1.ebuild,v 1.1 2013/10/03 22:34:09 gregkh Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
|
||||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
|
||||||
SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="dev-libs/openssl
|
|
||||||
sys-apps/util-linux"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
app-crypt/sbsigntool
|
|
||||||
virtual/pkgconfig
|
|
||||||
dev-perl/File-Slurp"
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
# Copyright 1999-2013 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/efitools/efitools-1.4.2.ebuild,v 1.1 2013/10/02 23:49:35 gregkh Exp $
|
|
||||||
|
|
||||||
EAPI="4"
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating UEFI secure boot platforms"
|
|
||||||
HOMEPAGE="git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"
|
|
||||||
SRC_URI="http://blog.hansenpartnership.com/wp-uploads/2013/efitools-${PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
RDEPEND="dev-libs/openssl
|
|
||||||
sys-apps/util-linux"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
app-crypt/sbsigntool
|
|
||||||
virtual/pkgconfig"
|
|
||||||
@ -1,110 +0,0 @@
|
|||||||
From gregkh@linuxfoundation.org Sun Sep 1 14:55:47 2013
|
|
||||||
Date: Sun, 1 Sep 2013 14:58:15 -0700
|
|
||||||
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
To: James Bottomley <James.Bottomley@HansenPartnership.com>
|
|
||||||
Cc: JBottomley@Parallels.com, greg@kroah.com
|
|
||||||
Subject: [efitools PATCH] Makefile/Make.rules: don't rely on vim-core
|
|
||||||
Message-ID: <20130901215815.GA8749@kroah.com>
|
|
||||||
|
|
||||||
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
|
|
||||||
Subject: Makefile/Make.rules: don't rely on vim-core
|
|
||||||
|
|
||||||
This adds the xxdi.pl script to replace the call to 'xxd -i', removing a
|
|
||||||
build dependancy on vim-core, which some distros don't really want to
|
|
||||||
have (i.e. Gentoo and its build derivatives like ChromeOS and CoreOS.)
|
|
||||||
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
Make.rules | 2 +-
|
|
||||||
Makefile | 2 +-
|
|
||||||
xxdi.pl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
3 files changed, 52 insertions(+), 2 deletions(-)
|
|
||||||
create mode 100755 xxdi.pl
|
|
||||||
|
|
||||||
diff --git a/Make.rules b/Make.rules
|
|
||||||
index 419b3b9..309b231 100644
|
|
||||||
--- a/Make.rules
|
|
||||||
+++ b/Make.rules
|
|
||||||
@@ -38,7 +38,7 @@ endif
|
|
||||||
nm -D $@ | grep ' U ' && exit 1 || exit 0
|
|
||||||
|
|
||||||
%.h: %.auth
|
|
||||||
- xxd -i $< > $@
|
|
||||||
+ ./xxdi.pl $< > $@
|
|
||||||
|
|
||||||
%.hash: %.efi hash-to-efi-sig-list
|
|
||||||
./hash-to-efi-sig-list $< $@
|
|
||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 52f4551..a39cafe 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -62,7 +62,7 @@ DB.auth: DB.esl KEK.crt sign-efi-sig-list
|
|
||||||
|
|
||||||
hashlist.h: HashTool.hash
|
|
||||||
cat $^ > /tmp/tmp.hash
|
|
||||||
- xxd -i /tmp/tmp.hash > $@
|
|
||||||
+ ./xxdi.pl /tmp/tmp.hash > $@
|
|
||||||
rm -f /tmp/tmp.hash
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/xxdi.pl b/xxdi.pl
|
|
||||||
new file mode 100755
|
|
||||||
index 0000000..acc974c
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/xxdi.pl
|
|
||||||
@@ -0,0 +1,50 @@
|
|
||||||
+#!/usr/bin/env perl
|
|
||||||
+#
|
|
||||||
+# xxdi.pl - perl implementation of 'xxd -i' mode
|
|
||||||
+#
|
|
||||||
+# Copyright 2013 Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
+# Copyright 2013 Linux Foundation
|
|
||||||
+#
|
|
||||||
+# Released under the GPLv2.
|
|
||||||
+#
|
|
||||||
+# Implements the "basic" functionality of 'xxd -i' in perl to keep build
|
|
||||||
+# systems from having to build/install/rely on vim-core, which not all
|
|
||||||
+# distros want to do. But everyone has perl, so use it instead.
|
|
||||||
+#
|
|
||||||
+
|
|
||||||
+use strict;
|
|
||||||
+use warnings;
|
|
||||||
+use File::Slurp qw(slurp);
|
|
||||||
+
|
|
||||||
+my $indata = slurp(@ARGV ? $ARGV[0] : \*STDIN);
|
|
||||||
+my $len_data = length($indata);
|
|
||||||
+my $num_digits_per_line = 12;
|
|
||||||
+my $var_name;
|
|
||||||
+my $outdata;
|
|
||||||
+
|
|
||||||
+# Use the variable name of the file we read from, converting '/' and '.
|
|
||||||
+# to '_', or, if this is stdin, just use "stdin" as the name.
|
|
||||||
+if (@ARGV) {
|
|
||||||
+ $var_name = $ARGV[0];
|
|
||||||
+ $var_name =~ s/\//_/g;
|
|
||||||
+ $var_name =~ s/\./_/g;
|
|
||||||
+} else {
|
|
||||||
+ $var_name = "stdin";
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+$outdata .= "unsigned char $var_name\[] = {";
|
|
||||||
+
|
|
||||||
+# trailing ',' is acceptable, so instead of duplicating the logic for
|
|
||||||
+# just the last character, live with the extra ','.
|
|
||||||
+for (my $key= 0; $key < $len_data; $key++) {
|
|
||||||
+ if ($key % $num_digits_per_line == 0) {
|
|
||||||
+ $outdata .= "\n\t";
|
|
||||||
+ }
|
|
||||||
+ $outdata .= sprintf("0x%.2x, ", ord(substr($indata, $key, 1)));
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+$outdata .= "\n};\nunsigned int $var_name\_len = $len_data;\n";
|
|
||||||
+
|
|
||||||
+binmode STDOUT;
|
|
||||||
+print {*STDOUT} $outdata;
|
|
||||||
+
|
|
||||||
--
|
|
||||||
1.8.4.6.g82e253f.dirty
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer>
|
|
||||||
<email>gregkh@gentoo.org</email>
|
|
||||||
<description>do whatever</description>
|
|
||||||
</maintainer>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
AUX destdir.patch 249 SHA256 75aae3e3b4c009ab5ac039203cd6cfb382d2c8d0e670df62b6a8c64a34971449 SHA512 dc35c71d6143c164d17723bfbb5f899c863abb4ca46a96356054e46fcedf9d708f9f4ef3345bd5966b9e492cbfa9dd5e3e85545853799859315ed57640c03ee4 WHIRLPOOL bf0fc9403299166fe9dfebe46628417e069697e261c0bd17b74043497b1bc1e5b27662725980b3108da63ddbbf3adaca5a859bd93f728d60f47d76c29ca42404
|
|
||||||
AUX pesign-0.112-fix-cli-opts.patch 2228 SHA256 387de650336376a8b5edb2cdc4097114c75231b52c5dc4fe4408d606f51cdbfd SHA512 62d2ec0059ff518b576b6399a217f47b1f361c41292055b8a7326e81cda30190b4a62dad7dd8150855b2025af1ad25458a2cbbfd3ae89ca6c870067224662695 WHIRLPOOL 59d6308b157fc42da606b61b9c27097039c4cab9b15d9ecbe3f6b4db3f44a7cbfc9b75b88122fe3593532674f8556278d352bca4a3977d6a239b6ccddcd5948f
|
|
||||||
AUX pesign-0.112-fix-initializer.patch 388 SHA256 417d2a19d929627a0dec093767bbd19f0c7774184e0f5e607ef90a789e9b630b SHA512 1b76c6dfe7ddc76a2051038894b7e2da72c01ebc05a46d4b6ebc05a092a55d699161e04c4df73d1afb7752e6a138ed8c9c28eda55897c82934ca852be42dae84 WHIRLPOOL 05d5c1a34ff01767ca211545922c9e13208f5ec9fab99738da307465838f78111152adc18d952ca3ea7fcd35a4a8077c33b4cce77583bb98c9c9c09c0d52850f
|
|
||||||
DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
|
|
||||||
DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
|
|
||||||
EBUILD pesign-0.108.ebuild 1187 SHA256 3512d04b3631b3e03f9b3f93d1348903c9ae7cba86e339c4d68ed630a2c77499 SHA512 3d5c8f3b393bbfe24aa0622e9d641674f1b8e5b3f1aa20d6641b2d17d29c4824ebedabfbb5239916d46fe090f2abf5e654f9e1729f32628cd097f8f3ddf3dcfe WHIRLPOOL 59607edc0472cefd7696a42b5421f38b6e25e68ded895868131feb9734d7b4880b283ac6caba6858737711efa096519df12269660a3562edc707e501846cb05e
|
|
||||||
EBUILD pesign-0.112.ebuild 1007 SHA256 00c5b745c07108ce8a5f841222fcf610bb8504df3800e496db214f1072263aee SHA512 713b6b493080dfac5c2468b2462c263d7ec01f37dfecb9f63d31a201bca5ab2bb4205761d809a39d3289fabd5c833c42306240ba6fe8fe3024e7d722ffd15780 WHIRLPOOL 6b076a89c9bc779771188b9b24e522ccc2ec7cb27b88d8723dc056c14d3c3f45ead8a8a920e9eedd8becd94441397451f23cb99c45af225bad14a464658a8c0b
|
|
||||||
MISC ChangeLog 2454 SHA256 f5c5d6fa0fad7b3b0c0c691d91f52a97156350b9ab9afb72d8f23c2ef6c6db0c SHA512 c0e8166c72bdd47be814ac780c46f33d2eb7b15666a686aed4c8c568a0c0fda1bd4eabc5f2b2a04d49644e7e16199487668715a783390ee1a1470e5791f33d82 WHIRLPOOL f644d83492550f0293c5b304a2d629f6f8e744d34dece049c2cd3f5603eb87431ab8ec39a88dab0bb7809d7d7603f6cfe4fa165b6e8d5186416e97212c86cc7e
|
|
||||||
MISC ChangeLog-2015 1045 SHA256 c4b1ea3c1832dbd4f460aa346974789fb65824cbd69aacb24dc3a8834377e6be SHA512 970be07aec9815faf2ffbf9855c8331c07eabec884c70d7382d980fc1f376f7f77977f6e653c20e820073db5b001539132a38cc0586ae4db43d036c641d4ab3e WHIRLPOOL 1c9b8f75019201c42ebabb79f89313eb144b2fb33a56cf17857973b8284c0078c337c46194a27ff17ff163ba2fbd268f873993f5e0bdfe87fdc8aed3c31460c2
|
|
||||||
MISC metadata.xml 466 SHA256 ed83ff7c2420eafe66aed4da117b1869c3dfb4f4a29865b4b18ca5ca6ccc9e28 SHA512 cffb289b804411ba72b52113ac4784e2873c0c0730496eb3b29a35c2d2a8891031f579e70cb7a64f0da685fedbcf3f0787ed2c630664cb6c363ddbd66e0d1364 WHIRLPOOL 22ad17121a5743d51a59b78837933e65de31de9032bf9da4e92d28655d4568dcb2f186f8f196bff9be901ccb4923afdda989dab0646c96ba08910ce58bfa713d
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
diff --git a/Make.defaults b/Make.defaults
|
|
||||||
index 864f98b..e2c967b 100644
|
|
||||||
--- a/Make.defaults
|
|
||||||
+++ b/Make.defaults
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-INSTALLROOT:= /
|
|
||||||
+INSTALLROOT:= $(DESTDIR)
|
|
||||||
PREFIX := /usr
|
|
||||||
|
|
||||||
HOSTARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
|
|
||||||
@ -1,73 +0,0 @@
|
|||||||
From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Julien Cristau <jcristau@debian.org>
|
|
||||||
Date: Thu, 9 Jun 2016 14:30:37 +0200
|
|
||||||
Subject: [PATCH 2/2] Fix command line parsing
|
|
||||||
|
|
||||||
The gettext translation domain should be passed as .arg, not .descrip,
|
|
||||||
otherwise popt won't process any of the command line options (it stops
|
|
||||||
looping over the struct poptOption array when an entry has unset
|
|
||||||
longName, shortName and arg).
|
|
||||||
|
|
||||||
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
|
||||||
---
|
|
||||||
src/client.c | 2 +-
|
|
||||||
src/efikeygen.c | 2 +-
|
|
||||||
src/efisiglist.c | 2 +-
|
|
||||||
src/pesigcheck.c | 2 +-
|
|
||||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/client.c b/src/client.c
|
|
||||||
index 028419f..575c873 100644
|
|
||||||
--- a/src/client.c
|
|
||||||
+++ b/src/client.c
|
|
||||||
@@ -555,7 +555,7 @@ main(int argc, char *argv[])
|
|
||||||
|
|
||||||
struct poptOption options[] = {
|
|
||||||
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
|
||||||
- .descrip = "pesign" },
|
|
||||||
+ .arg = "pesign" },
|
|
||||||
{.longName = "token",
|
|
||||||
.shortName = 't',
|
|
||||||
.argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,
|
|
||||||
diff --git a/src/efikeygen.c b/src/efikeygen.c
|
|
||||||
index 6278849..8a515a5 100644
|
|
||||||
--- a/src/efikeygen.c
|
|
||||||
+++ b/src/efikeygen.c
|
|
||||||
@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
|
|
||||||
poptContext optCon;
|
|
||||||
struct poptOption options[] = {
|
|
||||||
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
|
||||||
- .descrip = "pesign" },
|
|
||||||
+ .arg = "pesign" },
|
|
||||||
/* global nss-ish things */
|
|
||||||
{.longName = "dbdir",
|
|
||||||
.shortName = 'd',
|
|
||||||
diff --git a/src/efisiglist.c b/src/efisiglist.c
|
|
||||||
index cd3f1ae..40d6a93 100644
|
|
||||||
--- a/src/efisiglist.c
|
|
||||||
+++ b/src/efisiglist.c
|
|
||||||
@@ -126,7 +126,7 @@ main(int argc, char *argv[])
|
|
||||||
|
|
||||||
struct poptOption options[] = {
|
|
||||||
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
|
||||||
- .descrip = "pesign" },
|
|
||||||
+ .arg = "pesign" },
|
|
||||||
{.longName = "infile",
|
|
||||||
.shortName = 'i',
|
|
||||||
.argInfo = POPT_ARG_STRING,
|
|
||||||
diff --git a/src/pesigcheck.c b/src/pesigcheck.c
|
|
||||||
index 1328fe9..0d49c1a 100644
|
|
||||||
--- a/src/pesigcheck.c
|
|
||||||
+++ b/src/pesigcheck.c
|
|
||||||
@@ -214,7 +214,7 @@ main(int argc, char *argv[])
|
|
||||||
poptContext optCon;
|
|
||||||
struct poptOption options[] = {
|
|
||||||
{.argInfo = POPT_ARG_INTL_DOMAIN,
|
|
||||||
- .descrip = "pesign" },
|
|
||||||
+ .arg = "pesign" },
|
|
||||||
{.longName = "dbfile",
|
|
||||||
.shortName = 'D',
|
|
||||||
.argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
|
|
||||||
--
|
|
||||||
2.9.2
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
This addresses a -Werror=missing-braces build failure from GCC bug #53119.
|
|
||||||
|
|
||||||
--- a/libdpe/pe_allocspace.c
|
|
||||||
+++ b/libdpe/pe_allocspace.c
|
|
||||||
@@ -61,7 +61,7 @@
|
|
||||||
struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
|
|
||||||
|
|
||||||
Pe_Scn *scn = NULL;
|
|
||||||
- struct section_header shdr = { 0, }, tmp_shdr;
|
|
||||||
+ struct section_header shdr = { { 0, } }, tmp_shdr;
|
|
||||||
if (pehdr->sections < 1)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>david.michael@coreos.com</email>
|
|
||||||
<name>David Michael</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="project">
|
|
||||||
<email>proxy-maint@gentoo.org</email>
|
|
||||||
<name>Proxy Maintainers</name>
|
|
||||||
</maintainer>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">vathpela/pesign</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
# Copyright 1999-2016 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
inherit eutils multilib
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
|
|
||||||
HOMEPAGE="https://github.com/vathpela/pesign"
|
|
||||||
SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="libressl"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/nspr
|
|
||||||
!libressl? ( dev-libs/openssl:0= )
|
|
||||||
libressl? ( dev-libs/libressl:0= )
|
|
||||||
sys-apps/util-linux
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}"/destdir.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
|
|
||||||
# remove some files that don't make sense for Gentoo installs
|
|
||||||
rm -rf "${ED}/etc/" "${ED}/usr/share/doc/pesign/" || die
|
|
||||||
|
|
||||||
# create .so symlink
|
|
||||||
ln -s libdpe.so "${ED}/usr/$(get_libdir)/libdpe.so.0"
|
|
||||||
}
|
|
||||||
#
|
|
||||||
#src_prepare() {
|
|
||||||
# local iarch
|
|
||||||
# case ${ARCH} in
|
|
||||||
# ia64) iarch=ia64 ;;
|
|
||||||
# x86) iarch=ia32 ;;
|
|
||||||
# amd64) iarch=x86_64 ;;
|
|
||||||
# *) die "unsupported architecture: ${ARCH}" ;;
|
|
||||||
# esac
|
|
||||||
# sed -i "/^EFI_ARCH=/s:=.*:=${iarch}:" configure || die
|
|
||||||
# sed -i 's/-m64$/& -march=x86-64/' tests/Makefile.in || die
|
|
||||||
#}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
# Copyright 1999-2017 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
inherit eutils toolchain-funcs
|
|
||||||
|
|
||||||
DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
|
|
||||||
HOMEPAGE="https://github.com/vathpela/pesign"
|
|
||||||
SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="libressl"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/nspr
|
|
||||||
!libressl? ( dev-libs/openssl:0= )
|
|
||||||
libressl? ( dev-libs/libressl:0= )
|
|
||||||
sys-apps/util-linux
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
sys-apps/help2man
|
|
||||||
sys-boot/gnu-efi
|
|
||||||
sys-libs/efivar
|
|
||||||
virtual/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch
|
|
||||||
"${FILESDIR}"/${PN}-0.112-fix-initializer.patch
|
|
||||||
)
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
emake CC="$(tc-getCC)"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${ED}" VERSION="${PVR}" install
|
|
||||||
einstalldocs
|
|
||||||
|
|
||||||
# remove some files that don't make sense for Gentoo installs
|
|
||||||
rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
|
|
||||||
"${ED%/}/usr/share/doc/${PF}/COPYING" || die
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile config configure install postinst prepare test unpack
|
|
||||||
DEPEND=>=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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
|
|
||||||
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://www.rsyslog.com/
|
|
||||||
IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
|
|
||||||
KEYWORDS=amd64 ~arm hppa x86
|
|
||||||
LICENSE=GPL-3 LGPL-3 Apache-2.0
|
|
||||||
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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) 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 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.13.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.13.0.tar.gz )
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=ad7430950157292d17d6558a007430ff
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile config configure install postinst prepare test unpack
|
|
||||||
DEPEND=>=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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
|
|
||||||
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.rsyslog.com/
|
|
||||||
IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
|
|
||||||
KEYWORDS=~amd64 ~arm ~hppa ~x86
|
|
||||||
LICENSE=GPL-3 LGPL-3 Apache-2.0
|
|
||||||
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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.16.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.16.0.tar.gz )
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=f8aaf4498ceed5bc5d855e5eca94b381
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile config configure install postinst prepare test unpack
|
|
||||||
DEPEND=>=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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
|
|
||||||
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.rsyslog.com/
|
|
||||||
IUSE=dbi debug doc elasticsearch +gcrypt jemalloc kerberos libressl mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
|
|
||||||
KEYWORDS=amd64 ~arm hppa x86
|
|
||||||
LICENSE=GPL-3 LGPL-3 Apache-2.0
|
|
||||||
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:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1 ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/czmq-1.2.0 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.16.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.16.0.tar.gz )
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=f2b66e41ab56e1fa3b0250ad10d12c0c
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
|
|
||||||
DEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 ) virtual/pkgconfig test? ( sys-libs/libfaketime ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
|
|
||||||
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.rsyslog.com/
|
|
||||||
IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
|
|
||||||
KEYWORDS=~amd64 ~arm ~hppa ~x86
|
|
||||||
LICENSE=GPL-3 LGPL-3 Apache-2.0
|
|
||||||
RDEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz -> rsyslog-8.18.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.18.0.tar.gz -> rsyslog-docs-8.18.0.tar.gz )
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
|
||||||
_md5_=d1e752b52246fe99c16668d40bc569d3
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
|
|
||||||
DEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 ) virtual/pkgconfig test? ( sys-libs/libfaketime ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
|
|
||||||
DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=http://www.rsyslog.com/
|
|
||||||
IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
|
|
||||||
KEYWORDS=~amd64 ~arm ~hppa ~x86
|
|
||||||
LICENSE=GPL-3 LGPL-3 Apache-2.0
|
|
||||||
RDEPEND=>=dev-libs/libfastjson-0.99.2:= >=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:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-1.1.2:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-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? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.19.0.tar.gz -> rsyslog-8.19.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.19.0.tar.gz -> rsyslog-docs-8.19.0.tar.gz )
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d linux-info ca370deef9d44125d829f2eb6ebc83e0 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
|
||||||
_md5_=f54fe041ceb597b2e85f331c13b84022
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_15.09_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=d4d6fd21ae280c228050e65f74876aa6
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_15.09_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=126302fd16d053a449702c9d9df3f910
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_15.14_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=79803eb4c5cbe66c078a99870c9674a9
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_15.14.1_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=4002094286aac594abe2ef0db60765e8
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets
|
|
||||||
KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=a7610ec1860b9d0fc38d1a89609b96ca
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:2.8[X,-odbc] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_9.38.1_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=11afbb60c318a0aad1b55fcb3dba6eb5
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install prepare test
|
|
||||||
DEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] ) amd64? ( dev-lang/yasm ) abi_x86_x32? ( >=dev-lang/yasm-1.2.0-r1 ) x86? ( dev-lang/nasm )
|
|
||||||
DESCRIPTION=Port of 7-Zip archiver for Unix
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=http://p7zip.sourceforge.net/
|
|
||||||
IUSE=doc kde rar +pch static wxwidgets abi_x86_x32
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
|
|
||||||
LICENSE=LGPL-2.1 rar? ( unRAR )
|
|
||||||
RDEPEND=kde? ( x11-libs/wxGTK:3.0[X] kde-base/kdelibs ) wxwidgets? ( x11-libs/wxGTK:3.0[X] )
|
|
||||||
REQUIRED_USE=kde? ( wxwidgets )
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=mirror://sourceforge/p7zip/p7zip_9.38.1_src_all.tar.bz2
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
|
|
||||||
_md5_=bf7516d19a25d1baaf0c88a9fbefd032
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare test
|
|
||||||
DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
|
||||||
DESCRIPTION=A high-speed compression/decompression library by Google
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=https://github.com/google/snappy
|
|
||||||
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
|
||||||
KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux
|
|
||||||
LICENSE=BSD
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://dev.gentoo.org/~radhermit/dist/snappy-1.1.2.tar.gz
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=f804c93de3352dddb46f2fff9dc6ed1e
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare test
|
|
||||||
DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
|
||||||
DESCRIPTION=A high-speed compression/decompression library by Google
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=https://github.com/google/snappy
|
|
||||||
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
|
||||||
KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
|
|
||||||
LICENSE=BSD
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://github.com/google/snappy/releases/download/1.1.3/snappy-1.1.3.tar.gz
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=b918f28c54662ce7538897f00ca0a0f6
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=compile configure install prepare test
|
|
||||||
DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
|
||||||
DESCRIPTION=A high-speed compression/decompression library by Google
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=https://github.com/google/snappy
|
|
||||||
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
|
||||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
|
|
||||||
LICENSE=BSD
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://github.com/google/snappy/releases/download/1.1.3/snappy-1.1.3.tar.gz
|
|
||||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=225a271f7296e76c8e2ab324a7ef7bd5
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
DEFINED_PHASES=-
|
|
||||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating UEFI secure boot platforms
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-1.4.1.tar.gz
|
|
||||||
_md5_=de3f4e1fd123f9e3651721a6035668fe
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
DEFINED_PHASES=-
|
|
||||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi app-editors/vim-core app-crypt/sbsigntool virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating UEFI secure boot platforms
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-1.4.1.tar.gz
|
|
||||||
_md5_=504a1dadebbc64654af8ace9cc4739ab
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
DEFINED_PHASES=prepare
|
|
||||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi dev-perl/File-Slurp app-crypt/sbsigntool virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating UEFI secure boot platforms
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://build.opensuse.org/package/rawsourcefile/home:jejb1:UEFI/efitools/efitools-1.4.1.tar.gz
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=c8843eeac3b2bd156f58bd5ebb94b40c
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
DEFINED_PHASES=-
|
|
||||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi app-crypt/sbsigntool virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating UEFI secure boot platforms
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://blog.hansenpartnership.com/wp-uploads/2013/efitools-1.4.2.tar.gz
|
|
||||||
_md5_=9aea2f2c3c4215960e113ada423d9d2f
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
DEFINED_PHASES=-
|
|
||||||
DEPEND=dev-libs/openssl sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi app-crypt/sbsigntool virtual/pkgconfig dev-perl/File-Slurp
|
|
||||||
DESCRIPTION=Tools for manipulating UEFI secure boot platforms
|
|
||||||
EAPI=4
|
|
||||||
HOMEPAGE=git://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/openssl sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=http://blog.hansenpartnership.com/wp-uploads/2013/efitools-1.4.2.tar.gz
|
|
||||||
_md5_=1de757a12573db9b81fdf3c72c171b43
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=install prepare
|
|
||||||
DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating signed PE-COFF binaries
|
|
||||||
EAPI=5
|
|
||||||
HOMEPAGE=https://github.com/vathpela/pesign
|
|
||||||
IUSE=libressl
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://github.com/vathpela/pesign/archive/0.108.tar.gz -> pesign-0.108.tar.gz
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=8311442311bed24572e8d9ed430c9b6b
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
DEFINED_PHASES=compile install
|
|
||||||
DEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux sys-apps/help2man sys-boot/gnu-efi sys-libs/efivar virtual/pkgconfig
|
|
||||||
DESCRIPTION=Tools for manipulating signed PE-COFF binaries
|
|
||||||
EAPI=6
|
|
||||||
HOMEPAGE=https://github.com/vathpela/pesign
|
|
||||||
IUSE=libressl
|
|
||||||
KEYWORDS=~amd64 ~x86
|
|
||||||
LICENSE=GPL-2
|
|
||||||
RDEPEND=dev-libs/nspr !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-apps/util-linux
|
|
||||||
SLOT=0
|
|
||||||
SRC_URI=https://github.com/vathpela/pesign/archive/0.112.tar.gz -> pesign-0.112.tar.gz
|
|
||||||
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
|
|
||||||
_md5_=55093dd8d11644b0a9c626ac699b3958
|
|
||||||
Loading…
x
Reference in New Issue
Block a user