root
5 years ago
parent
34312ff1e9
commit
03ac0a500c
@ -1,23 +1,23 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
MANIFEST Manifest.files.gz 28825 BLAKE2B cc3bef91ecce3f472f8933787c80d4631d1a2b71775848f45c72e9aa31796617bb93bf09ea188af79ff4711a70c47b5650ee63cbcc3ed8e83cb71319efd57d9a SHA512 c84b0efa1f37e3541ba2080f2cd9d4884a24f4b93643c694f28fd6adf8a8238ed69eb784cdb1906137498119e2dbf516888a750d1fcf1157d2107c71fd38b11c
|
||||
TIMESTAMP 2018-12-31T23:38:39Z
|
||||
MANIFEST Manifest.files.gz 28813 BLAKE2B 05ea31a4151536c5b10a91e1999ae80fa4054790a5404a428d99bcd60e26feb5b32637da01754a891bbd6da4e50b3664722fd26d360dba6697f37d8d5a8b28ca SHA512 deb1f01c48ed544467bb9be02a8859b002cea76439806b937bf919abe84588957f53293b1907900058f6ab3c33e1dcf977f998884ffd3cf2f5a3ec6b6273f79a
|
||||
TIMESTAMP 2019-01-04T10:38:43Z
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwqqH9fFIAAAAAALgAo
|
||||
iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlwvN7NfFIAAAAAALgAo
|
||||
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
|
||||
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
|
||||
klCMdQ/+I66xw6jROyMbvwFcfJKkbdW4d/ffGmN2RMO4tPpRGR04Mfy1fW4fZbPr
|
||||
yE22LvyRxUGL0GcL+/oS4i1ViJ1nd5kFiy2eJLVIIRWnCtKh9pZ2+HzUjZDyBR5P
|
||||
ZW3ufIltc595C2j10z5Sp0EobOTz0bawUbDLTCiAlZSp8Tx77Y6immaIzbtjvIQ7
|
||||
QdBQVsw7IpJti/M9nYW3XxbWvr2X2F89CumrObwyxfqjkAq5HsLut/tX/hK6Mhfi
|
||||
63oA9JZTkeHHuftUBMisaFKVMNSCYOotsGrjOJbjVOgleT5FNfk/kAgx8NuwLZgM
|
||||
scXPON6VYk5mIY5qkStOwYQmjsUSs3SD2Op9Pctzrc9Me3oXgM8QV3B9fUWJuZIj
|
||||
S5g6ty51309yWb+juU6raZjqgaapLhJJAwVyOjaqx9PG3DmmJVVJuukcd2vA/AOP
|
||||
uBeXlLM7bxDM/stVac/qphRW/ed/WkWsefoTa4mJTSOKhqSwai29XUhLL8AE9Em0
|
||||
MoMkh+uJNC94pKx/YpGjJ3L1NmZKnZY3jwtMONWZ9t86C23lAnSks1tOtOpT0F2l
|
||||
4wZF6QsqwCxuQyJ3kZY2db4Prhr7oXVfqQpjACDgqCNrLUShOL6Bt305ZNkQGj81
|
||||
hzhJBoS9qC6ECcH/3UviJIlMk0j09esF0ss3rW+ELbYf8VZiLKs=
|
||||
=abVb
|
||||
klDlBA/+PZahpmGwYVVur5u27uSOKByanHDsqjIfLBBRL4mJhmycWuNurDYGCsii
|
||||
k5tKZtaunJNTn1750i/wrH2VbxhlyFeIyvBeziA3cItziDC79VmVprvSPQSwtEQD
|
||||
3GQghnRuiPZzEBsl1u/u8Q2gEQ0xn/9XgnNMbBUJa/4WjDQAJMLIgKIYcPpKuuQz
|
||||
FoQJWLOcD6XODtBaXsyE+0E8lkwVcOIeSGj9kjgy12RI+Ff/4Sc3hgwt1IaUBV46
|
||||
unE6kKR2GBu8eTJ9byn43mK2308zsqpfe6pZNdL1+rT/APPwpAG+obrWray7J+Mu
|
||||
Pgs5NrNpCrb0EzBIiA6pjutG64wKt9CayCT7MtaYHSigxwoo2cuVQwvptRS+IsVN
|
||||
+ffzToFfYBPe97a7EqRLVbNfs2dGuTiifPgDLj7NBi8sbPl5pBIdZabC4mMiyueR
|
||||
VqQk/cld9s+ZaTxEAgF2WOgsoqAM0+knCUF8rL0Oasfxu1nWGEx2FIR2J7OSN578
|
||||
7HBPGKpRM0GWpOp4pQqPOLMZu8htENaHVC5dKeDphXE8Ln+7JWW0YJj+K6/QpVcR
|
||||
h/Zkm7yzPISmkpwYlmu5e5cEgfDB5ow/vhBjrMdf8mEBNcg4CeMO5fgnqrRwVaGV
|
||||
Tk2aCcswK3yWH0M8KFYIALtVxNIW2eM42f8nQxu0oVcYkw0bNew=
|
||||
=GdwR
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,59 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGO_PN="github.com/aquasecurity/kube-bench"
|
||||
|
||||
EGO_VENDOR=(
|
||||
"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
|
||||
"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
|
||||
"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
|
||||
"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
|
||||
"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
|
||||
"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
|
||||
"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
|
||||
"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
|
||||
"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
|
||||
"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
|
||||
"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
|
||||
"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
|
||||
"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
|
||||
"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
|
||||
"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
|
||||
"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
|
||||
"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
|
||||
"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
|
||||
"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
|
||||
"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
|
||||
"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
|
||||
"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
|
||||
)
|
||||
|
||||
inherit golang-build golang-vcs-snapshot bash-completion-r1
|
||||
|
||||
ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
${EGO_VENDOR_URI}"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
|
||||
HOMEPAGE="https://github.com/aquasecurity/kube-bench"
|
||||
SRC_URI="${ARCHIVE_URI}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_compile() {
|
||||
pushd src/${EGO_PN} || die
|
||||
GOPATH="${S}" go build -o ${PN} . || die
|
||||
popd || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin src/${EGO_PN}/${PN}
|
||||
insinto /etc/kube-bench
|
||||
doins -r src/${EGO_PN}/cfg
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="protects hosts from brute force attacks against ssh"
|
||||
HOMEPAGE="https://www.sshguard.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
"
|
||||
RDEPEND="
|
||||
virtual/logger
|
||||
"
|
||||
DOCS=(
|
||||
CHANGELOG.rst
|
||||
CONTRIBUTING.rst
|
||||
README.rst
|
||||
examples/net.sshguard.plist
|
||||
examples/sshguard.service
|
||||
examples/whitelistfile.example
|
||||
)
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.0-conf.patch
|
||||
)
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
|
||||
insinto /etc
|
||||
newins examples/sshguard.conf.sample sshguard.conf
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit autotools git-r3
|
||||
|
||||
DESCRIPTION="protects hosts from brute force attacks against ssh"
|
||||
HOMEPAGE="https://www.sshguard.net/"
|
||||
EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS=""
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
"
|
||||
RDEPEND="
|
||||
virtual/logger
|
||||
"
|
||||
DOCS=(
|
||||
CHANGELOG.rst
|
||||
CONTRIBUTING.rst
|
||||
README.rst
|
||||
examples/net.sshguard.plist
|
||||
examples/sshguard.service
|
||||
examples/whitelistfile.example
|
||||
)
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.1.0-conf.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
|
||||
insinto /etc
|
||||
newins examples/sshguard.conf.sample sshguard.conf
|
||||
}
|
||||
Binary file not shown.
@ -1,6 +1,10 @@
|
||||
AUX rmt 263 BLAKE2B 7535dd27d5ba367066cd519dee06f053cde9d4f1e86728059935fb80e9a9880e7a934076949af54e47ee7de3f91452f2c642780e7d56619f166574633d1e4759 SHA512 2f1a9d3a522fc1f0d5385d1ea4c27da88a1c9357b866340432c6310604c01d3e328e33080ed1e951c0da6f025c3ee2a0c9f170d4b86a1d235ebb56be48fef152
|
||||
AUX tar-1.30-CVE-2018-20482.patch 5083 BLAKE2B 7076e270d559e354d78112762d4032abbc8b79e77ae7b66756180287b0c88fbd2cfd6df6ac0ad930d97fcd93e2990432b7689430499b6cc4d941c403b0961409 SHA512 18dcc31c12feca519004791d9226e1bee112cec5d7b5576abd4dd83124b991df370ad08de7df2e413b8f4687db9a85853ae3748283f6ae37941de5dfd0b566c7
|
||||
AUX tar-1.30-fix-test-117-and-118.patch 3109 BLAKE2B d547dfb115d6cdbdf565c93dcdc70c9d2d0cde70228f58763e74d4cf5df7d621a5fccea375c3e103f8dcc04a19b3318b227384db2dc983cec5876eed8861cece SHA512 d104bbd88dafc0c3bb0308fbfb1dfb39b6c26fed14a316c30c2355d57ebe16172c0dde8ed6c91696b90f37622a43b5b1d70f397f7de521b9bd1552a5af78bb14
|
||||
AUX tar-1.30-fix-test-92.patch 257 BLAKE2B ee4fe8420f56191a8e4d9edefd109c948eb693532e2c3bb2073a8d55631aed142ab9c3adfa64d6461eb1aa9221a1aca6ec5086f15b3b9154effdb8e7128a8601 SHA512 aa1c80edbf1c846e23aa34ed343ffebad969b26fed9d4ccdc779f3df5bc384bb44d6c78044c385dbb7c01e68462568b941e8ec1060eb97bf36606d7beb790c1c
|
||||
DIST tar-1.30.tar.bz2 2858639 BLAKE2B 82a8b1fbf1eb5c0347b2f8cf35854498e2955eb85eaf041ec44a38bbd9bc82cc7184d5cb858f9905f503c9178ec6d0ed50be2dc27be9933b29e0a18b8e6c0b8f SHA512 07a1157430898fee1a2c6fd3853d59d4ae13998db685669c8c702f73d2466eeb9892f84a5f0495bfe088c8190a643a99ac9f2cb16b85c9fe3ae0d83cc0f338e8
|
||||
DIST tar-1.31.tar.bz2 2946047 BLAKE2B c85c17740e4cd3e8c93d10d93b070cd80629b7f052d020c0513cdddd377f3f90e229a6fa10dfbb43e1006f8202c674f2df854b864c0947f49339a52964d65c1c SHA512 0f4d00e08d56a8f8c32aac0afa2845397efb8ad72eaa6af47334cef9612adb1a4b91406bdc2c3a2cf1b9cc8b92c12735a331e0d137b24f66703f6af6219464f6
|
||||
EBUILD tar-1.30-r1.ebuild 2256 BLAKE2B 14041fd4a3c198894c8d470869d52eb94c332cc227fc6f7786145b569f299bc50021c9736dcc4c0b17d7b634b98c2f3318010e53ef6a7e8fa42b2719eee44e67 SHA512 bc06e1350a7df2b30c05d14a78e3de305382206de857b83ec98cd0e376fc832af37d3a2ce0c9ced072da45a6cb981e0438e36d610d63475db1c65cc7c71dd778
|
||||
EBUILD tar-1.30.ebuild 2187 BLAKE2B cb952591e27678df72ad53da254bb901d355bf9af7dbe0e22b59a92d3b49fc90c20a9f170154a3ff77bc5aa3cbb2962930cf9258feb5f0f11de3b4dbe2d76f7c SHA512 89fa12ce7849917a85402d98e6532205b294a1793f8f563af952736f282a13ac52f982c0ed87d55a65c7e04f2d150ce5a348bd178ff10512eab822401cee81b2
|
||||
EBUILD tar-1.31.ebuild 2098 BLAKE2B 94819c626a385d95573a3cd10fb1d254c999b2a48afe292ebea617a39f1577ec89e11fa7a2aa39c34619b2c03901312ae2a7eb5683c89a21eceaecce8c4d5a93 SHA512 986ef6e8f1b1630564ff1a799a222381578f724add93e71ff0b98bfd3cdaa985d590e064c30b01d6acd9a49a90cbf50cd585565606e36f8b1bd57de90dd9feba
|
||||
MISC metadata.xml 387 BLAKE2B 6d37d364bd888503b868af168aa496d57abf7bac5c4c69f4c02933b5715312ec65f43babb347d34c665873247e4feaa9b9de2d3bb2d224e1751922c159f2fa87 SHA512 e5bce64bc18a7c6313d0818182941f49ea7e89617c97338fff29297bb2bfc2f4e56a9c124aa97fcb5f2a3a54e0e7cfd209bce09c2ced40a398381b7970c08cf7
|
||||
|
||||
@ -0,0 +1,146 @@
|
||||
From c15c42ccd1e2377945fd0414eca1a49294bff454 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Poznyakoff <gray@gnu.org>
|
||||
Date: Thu, 27 Dec 2018 17:48:57 +0200
|
||||
Subject: Fix CVE-2018-20482
|
||||
|
||||
* src/sparse.c (sparse_dump_region): Handle short read condition.
|
||||
(sparse_extract_region,check_data_region): Fix dumped_size calculation.
|
||||
Handle short read condition.
|
||||
(pax_decode_header): Fix dumped_size calculation.
|
||||
|
||||
diff --git a/src/sparse.c b/src/sparse.c
|
||||
index d41c0ea..f611200 100644
|
||||
--- a/src/sparse.c
|
||||
+++ b/src/sparse.c
|
||||
@@ -1,6 +1,6 @@
|
||||
/* Functions for dealing with sparse files
|
||||
|
||||
- Copyright 2003-2007, 2010, 2013-2017 Free Software Foundation, Inc.
|
||||
+ Copyright 2003-2007, 2010, 2013-2018 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
@@ -427,6 +427,30 @@ sparse_dump_region (struct tar_sparse_file *file, size_t i)
|
||||
bufsize);
|
||||
return false;
|
||||
}
|
||||
+ else if (bytes_read == 0)
|
||||
+ {
|
||||
+ char buf[UINTMAX_STRSIZE_BOUND];
|
||||
+ struct stat st;
|
||||
+ size_t n;
|
||||
+ if (fstat (file->fd, &st) == 0)
|
||||
+ n = file->stat_info->stat.st_size - st.st_size;
|
||||
+ else
|
||||
+ n = file->stat_info->stat.st_size
|
||||
+ - (file->stat_info->sparse_map[i].offset
|
||||
+ + file->stat_info->sparse_map[i].numbytes
|
||||
+ - bytes_left);
|
||||
+
|
||||
+ WARNOPT (WARN_FILE_SHRANK,
|
||||
+ (0, 0,
|
||||
+ ngettext ("%s: File shrank by %s byte; padding with zeros",
|
||||
+ "%s: File shrank by %s bytes; padding with zeros",
|
||||
+ n),
|
||||
+ quotearg_colon (file->stat_info->orig_file_name),
|
||||
+ STRINGIFY_BIGINT (n, buf)));
|
||||
+ if (! ignore_failed_read_option)
|
||||
+ set_exit_status (TAREXIT_DIFFERS);
|
||||
+ return false;
|
||||
+ }
|
||||
|
||||
memset (blk->buffer + bytes_read, 0, BLOCKSIZE - bytes_read);
|
||||
bytes_left -= bytes_read;
|
||||
@@ -464,9 +488,9 @@ sparse_extract_region (struct tar_sparse_file *file, size_t i)
|
||||
return false;
|
||||
}
|
||||
set_next_block_after (blk);
|
||||
+ file->dumped_size += BLOCKSIZE;
|
||||
count = blocking_write (file->fd, blk->buffer, wrbytes);
|
||||
write_size -= count;
|
||||
- file->dumped_size += count;
|
||||
mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
|
||||
file->offset += count;
|
||||
if (count != wrbytes)
|
||||
@@ -598,6 +622,12 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
|
||||
rdsize);
|
||||
return false;
|
||||
}
|
||||
+ else if (bytes_read == 0)
|
||||
+ {
|
||||
+ report_difference (file->stat_info, _("Size differs"));
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
if (!zero_block_p (diff_buffer, bytes_read))
|
||||
{
|
||||
char begbuf[INT_BUFSIZE_BOUND (off_t)];
|
||||
@@ -609,6 +639,7 @@ check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end)
|
||||
|
||||
beg += bytes_read;
|
||||
}
|
||||
+
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -635,6 +666,7 @@ check_data_region (struct tar_sparse_file *file, size_t i)
|
||||
return false;
|
||||
}
|
||||
set_next_block_after (blk);
|
||||
+ file->dumped_size += BLOCKSIZE;
|
||||
bytes_read = safe_read (file->fd, diff_buffer, rdsize);
|
||||
if (bytes_read == SAFE_READ_ERROR)
|
||||
{
|
||||
@@ -645,7 +677,11 @@ check_data_region (struct tar_sparse_file *file, size_t i)
|
||||
rdsize);
|
||||
return false;
|
||||
}
|
||||
- file->dumped_size += bytes_read;
|
||||
+ else if (bytes_read == 0)
|
||||
+ {
|
||||
+ report_difference (¤t_stat_info, _("Size differs"));
|
||||
+ return false;
|
||||
+ }
|
||||
size_left -= bytes_read;
|
||||
mv_size_left (file->stat_info->archive_file_size - file->dumped_size);
|
||||
if (memcmp (blk->buffer, diff_buffer, rdsize))
|
||||
@@ -1213,7 +1249,8 @@ pax_decode_header (struct tar_sparse_file *file)
|
||||
union block *blk;
|
||||
char *p;
|
||||
size_t i;
|
||||
-
|
||||
+ off_t start;
|
||||
+
|
||||
#define COPY_BUF(b,buf,src) do \
|
||||
{ \
|
||||
char *endp = b->buffer + BLOCKSIZE; \
|
||||
@@ -1229,7 +1266,6 @@ pax_decode_header (struct tar_sparse_file *file)
|
||||
if (src == endp) \
|
||||
{ \
|
||||
set_next_block_after (b); \
|
||||
- file->dumped_size += BLOCKSIZE; \
|
||||
b = find_next_block (); \
|
||||
src = b->buffer; \
|
||||
endp = b->buffer + BLOCKSIZE; \
|
||||
@@ -1240,8 +1276,8 @@ pax_decode_header (struct tar_sparse_file *file)
|
||||
dst[-1] = 0; \
|
||||
} while (0)
|
||||
|
||||
+ start = current_block_ordinal ();
|
||||
set_next_block_after (current_header);
|
||||
- file->dumped_size += BLOCKSIZE;
|
||||
blk = find_next_block ();
|
||||
p = blk->buffer;
|
||||
COPY_BUF (blk,nbuf,p);
|
||||
@@ -1278,6 +1314,8 @@ pax_decode_header (struct tar_sparse_file *file)
|
||||
sparse_add_map (file->stat_info, &sp);
|
||||
}
|
||||
set_next_block_after (blk);
|
||||
+
|
||||
+ file->dumped_size += BLOCKSIZE * (current_block_ordinal () - start);
|
||||
}
|
||||
|
||||
return true;
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="Use this to make tarballs :)"
|
||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
||||
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
|
||||
mirror://gnu-alpha/tar/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
|
||||
|
||||
RDEPEND="acl? ( virtual/acl )
|
||||
selinux? ( sys-libs/libselinux )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( >=sys-devel/gettext-0.10.35 )
|
||||
xattr? ( elibc_glibc? ( sys-apps/attr ) )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-test-92.patch
|
||||
"${FILESDIR}"/${P}-fix-test-117-and-118.patch
|
||||
"${FILESDIR}"/${P}-CVE-2018-20482.patch #674210
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if ! use userland_GNU ; then
|
||||
sed -i \
|
||||
-e 's:/backup\.sh:/gbackup.sh:' \
|
||||
scripts/{backup,dump-remind,restore}.in \
|
||||
|| die "sed non-GNU"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
local myeconfargs=(
|
||||
--bindir="${EPREFIX%/}"/bin
|
||||
--enable-backup-scripts
|
||||
--libexecdir="${EPREFIX%/}"/usr/sbin
|
||||
$(usex userland_GNU "" "--program-prefix=g")
|
||||
$(use_with acl posix-acls)
|
||||
$(use_enable nls)
|
||||
$(use_with selinux)
|
||||
$(use_with xattr xattrs)
|
||||
)
|
||||
FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local p=$(usex userland_GNU "" "g")
|
||||
if [[ -z ${p} ]] ; then
|
||||
# a nasty yet required piece of baggage
|
||||
exeinto /etc
|
||||
doexe "${FILESDIR}"/rmt
|
||||
fi
|
||||
|
||||
# autoconf looks for gtar before tar (in configure scripts), hence
|
||||
# in Prefix it is important that it is there, otherwise, a gtar from
|
||||
# the host system (FreeBSD, Solaris, Darwin) will be found instead
|
||||
# of the Prefix provided (GNU) tar
|
||||
if use prefix ; then
|
||||
dosym tar /bin/gtar
|
||||
fi
|
||||
|
||||
mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
|
||||
mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
|
||||
|
||||
if use minimal ; then
|
||||
find "${ED%/}"/etc "${ED%/}"/*bin/ "${ED%/}"/usr/*bin/ \
|
||||
-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
|
||||
-delete || die
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
DESCRIPTION="Use this to make tarballs :)"
|
||||
HOMEPAGE="https://www.gnu.org/software/tar/"
|
||||
SRC_URI="mirror://gnu/tar/${P}.tar.bz2
|
||||
mirror://gnu-alpha/tar/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
|
||||
|
||||
RDEPEND="acl? ( virtual/acl )
|
||||
selinux? ( sys-libs/libselinux )"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( >=sys-devel/gettext-0.10.35 )
|
||||
xattr? ( elibc_glibc? ( sys-apps/attr ) )"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if ! use userland_GNU ; then
|
||||
sed -i \
|
||||
-e 's:/backup\.sh:/gbackup.sh:' \
|
||||
scripts/{backup,dump-remind,restore}.in \
|
||||
|| die "sed non-GNU"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && append-ldflags -static
|
||||
local myeconfargs=(
|
||||
--bindir="${EPREFIX}"/bin
|
||||
--enable-backup-scripts
|
||||
--libexecdir="${EPREFIX}"/usr/sbin
|
||||
$(usex userland_GNU "" "--program-prefix=g")
|
||||
$(use_with acl posix-acls)
|
||||
$(use_enable nls)
|
||||
$(use_with selinux)
|
||||
$(use_with xattr xattrs)
|
||||
)
|
||||
FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local p=$(usex userland_GNU "" "g")
|
||||
if [[ -z ${p} ]] ; then
|
||||
# a nasty yet required piece of baggage
|
||||
exeinto /etc
|
||||
doexe "${FILESDIR}"/rmt
|
||||
fi
|
||||
|
||||
# autoconf looks for gtar before tar (in configure scripts), hence
|
||||
# in Prefix it is important that it is there, otherwise, a gtar from
|
||||
# the host system (FreeBSD, Solaris, Darwin) will be found instead
|
||||
# of the Prefix provided (GNU) tar
|
||||
if use prefix ; then
|
||||
dosym tar /bin/gtar
|
||||
fi
|
||||
|
||||
mv "${ED%/}"/usr/sbin/${p}backup{,-tar} || die
|
||||
mv "${ED%/}"/usr/sbin/${p}restore{,-tar} || die
|
||||
|
||||
if use minimal ; then
|
||||
find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
|
||||
-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
|
||||
-delete || die
|
||||
fi
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
|
||||
DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
|
||||
DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
|
||||
EBUILD wimlib-1.12.0.ebuild 1454 BLAKE2B 67e5bc2760f9a0aaae9de8d761ab2eb5eac2888cd5d84c1bb65c0725d3e19e28a1b547e2fb9daacfdce740a8a8bc5028c9c4f7e5f45b208518a86d0ccf18a7e8 SHA512 1c4d848b98c34678efe2479efa1deec3365fc210b3c7c53dbfbdc43a52aeb21cb9de38104e0b47accd999a61fd886c3dc41c704fdfa3cb22809c60da608d456c
|
||||
EBUILD wimlib-1.13.0.ebuild 1454 BLAKE2B 60a51c4acbaefd3a2e626ed17c0c1b8808ef8eedd28c14e25a48d2ed7bfd6e7f54121fac41415843f7c34a99f2d35e22fc2dc05a9fea968ca18852342a40c4e7 SHA512 1bec01f388af7f97506572f1df2007c50e420ad37d745ca896015c43bb27850a65a5201c82864a9f29cd5bf2f7aec77f5a75c971ecb8cb14c16839708fc130e1
|
||||
MISC metadata.xml 684 BLAKE2B bc45d2b67f015842912d4fa5043bf31f2eb2ae59b29a9104987c6041282730491470fefd065be7ab49de230ea26dc10f64d4fd85591a1df6aec5a6ab408752dd SHA512 999d8b7bd11c22193d1e87e73b70fd750404e92c26b7916a4405c0bdd930a103ef8b809259e0c3ddfb73281f2622b284bd20ea73dff409cc8063406cf41a7724
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools pax-utils
|
||||
if [[ -z ${PV%%*9999} ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://wimlib.net/${PN}"
|
||||
else
|
||||
inherit vcs-snapshot
|
||||
MY_PV="${PV/_/-}"
|
||||
MY_PV="${MY_PV^^}"
|
||||
SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
RESTRICT="primaryuri"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The open source Windows Imaging (WIM) library"
|
||||
HOMEPAGE="https://wimlib.net/"
|
||||
|
||||
LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
|
||||
SLOT="0"
|
||||
IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
|
||||
REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
|
||||
|
||||
PATCHES=( "${FILESDIR}/syslinux-path.patch" )
|
||||
|
||||
RDEPEND="
|
||||
dev-libs/libxml2:2
|
||||
ntfs? ( sys-fs/ntfs3g )
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
openssl? ( dev-libs/openssl:0 )
|
||||
iso? (
|
||||
app-arch/cabextract
|
||||
app-cdr/cdrtools
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
cpu_flags_x86_ssse3? (
|
||||
yasm? ( dev-lang/yasm )
|
||||
!yasm? ( dev-lang/nasm )
|
||||
)
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_with ntfs ntfs-3g)
|
||||
$(use_with fuse)
|
||||
$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
|
||||
$(use_with openssl libcrypto)
|
||||
$(use_enable threads multithreaded-compression)
|
||||
)
|
||||
has test ${FEATURES} && myeconfargs+=( --enable-test-support )
|
||||
ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
pax-mark m "${S}"/.libs/wimlib-imagex
|
||||
}
|
||||
@ -1,6 +1,8 @@
|
||||
AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9a9f27b51a61b12cfad5e30d51c69df312ccf82fdb036541117c377347e5956cb7d3c6a3ae2756feacccce SHA512 fd04b8552c85b0a4c40283b691746ef2a40aef17aa30ed697b8e1f83e10caa2e21b4c000197192e98a1ddcffd745a37ab592193eaa5120a7048b861ed1036c89
|
||||
AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377
|
||||
AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
|
||||
AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
|
||||
DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
|
||||
EBUILD xar-1.8-r1.ebuild 1205 BLAKE2B 296674ef4169aa92ff3eb40203ddce1463fa495196e9ddd1048fa2f5859acbb8ee724a50ebcc398668a723b15dfe1af8aa27199019502d4023d17205c9c3c78b SHA512 68c48ec7b162b4cbd3ac1147e500ccf84b54b80cfc27e50063fc0d0030c8f05fb02868ee8d71a463fc23c2c71eca306ce88ea44eb0bbcd923cd66b7c08aa3b64
|
||||
EBUILD xar-1.8-r2.ebuild 1465 BLAKE2B 1aeeda746b6c7a3830fac3f2df548dd034a894442167301eea2b77513685c58373d68a01e0e5e669e6657007c545686ecee8d9f24485c69b2ff584b90e1095bd SHA512 682c965cb54d9e5f6b09580be8648340db3eec37f8a11e612d2d99532ce495e6c9047b748d24d593745e54cdc8ef8f0d78f1a838183b82b26659acfd10120d50
|
||||
MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
lib/hash.c: fix compilation with OpenSSL-1.1+
|
||||
|
||||
EVP_MD_CTX has become an anonymous struct now, so can't allocate size
|
||||
for it anymore.
|
||||
|
||||
--- a/lib/hash.c 2015-06-09 03:22:07.000000000 +0000
|
||||
+++ b/lib/hash.c 2019-01-01 14:37:01.487775958 +0000
|
||||
@@ -102,7 +102,7 @@
|
||||
#ifdef __APPLE__
|
||||
CCDigestRef digest;
|
||||
#else
|
||||
- EVP_MD_CTX digest;
|
||||
+ EVP_MD_CTX *digest;
|
||||
const EVP_MD *type;
|
||||
#endif
|
||||
unsigned int length;
|
||||
@@ -123,7 +123,8 @@
|
||||
#else
|
||||
OpenSSL_add_all_digests();
|
||||
HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name);
|
||||
- EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
|
||||
+ HASH_CTX(hash)->digest = EVP_MD_CTX_create();
|
||||
+ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type);
|
||||
#endif
|
||||
|
||||
HASH_CTX(hash)->digest_name = strdup(digest_name);
|
||||
@@ -143,7 +143,7 @@
|
||||
#ifdef __APPLE__
|
||||
CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
|
||||
#else
|
||||
- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte);
|
||||
+ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -160,7 +160,8 @@
|
||||
CCDigestFinal(HASH_CTX(hash)->digest, buffer);
|
||||
CCDigestDestroy(HASH_CTX(hash)->digest);
|
||||
#else
|
||||
- EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
|
||||
+ EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length);
|
||||
+ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest);
|
||||
#endif
|
||||
|
||||
*nbyte = HASH_CTX(hash)->length;
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit flag-o-matic multilib-minimal ltprune
|
||||
|
||||
APPLE_PV=400
|
||||
DESCRIPTION="An easily extensible archive format"
|
||||
HOMEPAGE="https://opensource.apple.com/source/xar/"
|
||||
SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="libressl kernel_Darwin"
|
||||
|
||||
DEPEND="
|
||||
!kernel_Darwin? (
|
||||
!kernel_SunOS? ( virtual/acl )
|
||||
!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
|
||||
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
|
||||
)
|
||||
app-arch/bzip2[${MULTILIB_USEDEP}]
|
||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
||||
dev-libs/libxml2[${MULTILIB_USEDEP}]
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.6.1-ext2.patch
|
||||
"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
|
||||
"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
|
||||
"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
|
||||
)
|
||||
|
||||
S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
|
||||
|
||||
multilib_src_configure() {
|
||||
use kernel_Darwin || append-libs $(pkg-config --libs openssl)
|
||||
ECONF_SOURCE=${S} \
|
||||
econf \
|
||||
--disable-static
|
||||
# botched check, fix it up
|
||||
if use kernel_SunOS ; then
|
||||
sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -1,3 +1,5 @@
|
||||
DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
|
||||
DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
|
||||
EBUILD xarchiver-0.5.4.13.ebuild 1449 BLAKE2B 6987905ac1c6f92380978e4ca884f9a0f6b8238b5f14ef39cc2a1b586a10a0125d7b1ff3b3514c0b31f08fbb76df547dec706fcbb914e899b134abfed6ac2851 SHA512 0c5bdacea1aeba2d187932a61a3eff4c1b93aebfaa098cfdba75968c37a64764cc20235c739b991507806958bf4d57ae1c8b5f2d0d3d6d0b66b403f920823d67
|
||||
EBUILD xarchiver-0.5.4.14.ebuild 1455 BLAKE2B 63c2192535c53c0150934aaf3c5c81cdef713887782082bfdef11ed6ebf8251792d0966a90e44ae21be803c0c3c62c9ebd1c3bed77f8253aca5eed9336b651fe SHA512 d356929f099d9831c2d0b60040051ccf17c87a75473b403d231bc45f5be4ad0d59477684b70d20da6f73fb8b36245d4bff5148684c9e71ae2b627b7663b7dbe2
|
||||
MISC metadata.xml 447 BLAKE2B 3ac670facb7c0034e1f079622c8c14e04a131e359e1cdbbc18b7cdd111a673651a97a7e35a430d13d80c1cf35e87f4aec0738836b60dd2837e4a77ff4e9485a3 SHA512 ccccc741a75658963153a71810ea9d8c25bfe49765f90a4aa5558ef8fef2abdd1e17d1c9ffb604a78deafeda1e5032b671c8f85a8189e6c89cf3f057dfec9a4a
|
||||
|
||||
@ -0,0 +1,62 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit autotools gnome2-utils xdg-utils
|
||||
|
||||
DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
|
||||
HOMEPAGE="https://github.com/ib/xarchiver"
|
||||
SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="doc"
|
||||
|
||||
# older pigz versions have incompatible command-line processing
|
||||
# https://bugs.gentoo.org/661464
|
||||
RDEPEND=">=dev-libs/glib-2:=
|
||||
x11-libs/gtk+:3=
|
||||
!!<app-arch/pigz-2.4[symlink]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-text/docbook-xml-dtd
|
||||
app-text/docbook-xsl-stylesheets
|
||||
dev-libs/libxml2
|
||||
dev-libs/libxslt
|
||||
)"
|
||||
|
||||
src_prepare() {
|
||||
sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
$(use_enable doc)
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
|
||||
elog "You need external programs for some formats, including:"
|
||||
elog "7zip - app-arch/p7zip"
|
||||
elog "arj - app-arch/unarj app-arch/arj"
|
||||
elog "lha - app-arch/lha"
|
||||
elog "lzop - app-arch/lzop"
|
||||
elog "rar - app-arch/unrar app-arch/rar"
|
||||
elog "zip - app-arch/unzip app-arch/zip"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a
|
||||
DIST gpgme-1.12.0.tar.bz2 1658803 BLAKE2B 630646af597074c06a99c1170c4f8170ad0fe4ba643a27a87a61dd8df681ca14f023b07817657bb049eaeaef01df3975bd1fe1b75a026634a62f832c6c311b56 SHA512 c228b3df28377df882be536ada56dc9c73150048a58e591aa4495f89c854af95820152cd60139840f994c249e9c7df50d8b89eb9d6dc4ce02aa80bbfebcdd014
|
||||
EBUILD gpgme-1.11.1.ebuild 2876 BLAKE2B 4ebc8efd4405dbb3aeb68591f4736879785baf3429a871bc3a4206be1e1efc871a1a9076d2c930d4a1552cfff123cf0a56c426c0f9e2f0753280a6f6be7e8f4a SHA512 9c77decd7a6635eb4299cc98b4100969aa941d063687b2181ba808e5ef6002a4e1ccf53e6cd13deff7e14b38ae30b5473f753171fcf7711ee372661b2a10018c
|
||||
EBUILD gpgme-1.11.1.ebuild 2872 BLAKE2B cb6c595f8424e43cd318f65b213ed768a7d055554b7b4b7af65d7dc84af4d1216f5f777ad3d53541838fefd99e2db38151ede5d79dbfd3becb588599c33f657e SHA512 c7218db05ea51baa786bb7e800eb95ad367c21470505f9ea14bcffe38e61c13ce6c46bbfd80e3a9b70fde757bdf761fc9a01b43fa5c34ff8c69c714df1c961d7
|
||||
EBUILD gpgme-1.12.0.ebuild 2881 BLAKE2B 6e171e8cbfd00804f334dfebe888d13759c7da8ef6478ead0725c8b51cb2f8da6dc6edf911aede93f92666e974a8d2a57057d311d27ba2dab69e1edbebf81a92 SHA512 6b052e328ed378263b29e148bba84791d533fac820defd17812428821ef129b6864b662691da0db4895839393bcfc34f8881f08d04a862efd6203d74a6e37967
|
||||
MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
|
||||
|
||||
@ -0,0 +1,8 @@
|
||||
DIST cc-1.0.25.crate 43191 BLAKE2B 2f715c36150ea81406ac34224ebc5e0b95ba1bc5f80d36e78af6e6f4027521bd5e163c3ff0f08dac8b0791b797e1498c8a1151dfbc72a8a8008546e0b44ecf83 SHA512 0ae0d47c9ceb67aa0ec25b7b98ab4d378bd7a58fb7bbcd9bcc804a0deadcfae904f9353c218d63b8e7046b388c67d5316248accf1f8b69822c0f58ff465652a3
|
||||
DIST hid-0.4.1.crate 4121 BLAKE2B 8af6af754c129f3eeaaa35e3b03361fd2a658cdee017701573e79ed40e86900e137ae6a10c844f90ce8c29ecb577d892a8a9b065520eb360734c9bf52bcae6ce SHA512 5529be48d9c0cfb7bdafee029a45fe471cd8996cabe7d584615ccbfea244700a1cf7d78cdaaf8f36ac3d6ddca466d36569fb12e1c1eaaa45091899e57a1d21ce
|
||||
DIST hidapi-sys-0.1.4.crate 2391 BLAKE2B 5d8309bad190bdba91aee84239bb0965fdc0093a16a835b99ddfc13633dff6568c66f13c917d9e20cd4e1e453b3dd46ff071f729aba3ea1d99de8388997b193e SHA512 4e2c0a7ee48cb7c7c8bdaaf7c3fd22f58f8995ea2b14caab0cb03efef64711fbe35b435c9f4132e35fb02ea27ee77788be11b3c459f5a290e7297f4d0f9426ac
|
||||
DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
|
||||
DIST nitrocli-0.1.3.crate 23497 BLAKE2B a61cbf26ae5503a77c534efcfffadcd56a1ea15dc34fcfff50765fcee1c22b64f54b76d9cf23ce9ec58d37132be13e313e643379f1330e9d43b2e7492fa627db SHA512 43880b6cb9bb152a1179d02b4290ff6c4dbbdae3c5cb46c0c5cdc382d2a5d8322de97d94b1842b6e93bba97bc3d451bc8946da6d6c0b66fb7d9ed8936df2c263
|
||||
DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
|
||||
EBUILD nitrocli-0.1.3.ebuild 948 BLAKE2B 86abae2029cee3e94851333b46dfdead6f9a6999dda733f8a133110049778a9e3fa6c245fe0859461b133e3686442cdea885e16df597a5e6f74ce0bad01579db SHA512 1203513b9633a1e84cf907d0877cfb1507ea0bea674b1751aceda583b8970f999b09938234a0efc0f8087dfe731d1338464fdb7467204fe1b26f9787fce9a8e3
|
||||
MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
|
||||
@ -0,0 +1,20 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>deso@posteo.net</email>
|
||||
<name>Daniel Müller</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
nitrocli is a command line application that interacts with Nitrokey
|
||||
Pro and Storage devices (see https://www.nitrokey.com/).
|
||||
</longdescription>
|
||||
<upstream>
|
||||
<remote-id type="github">d-e-s-o/nitrocli</remote-id>
|
||||
<bugs-to>https://github.com/d-e-s-o/nitrocli/issues</bugs-to>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CRATES="
|
||||
cc-1.0.25
|
||||
hid-0.4.1
|
||||
hidapi-sys-0.1.4
|
||||
libc-0.2.45
|
||||
nitrocli-0.1.3
|
||||
pkg-config-0.3.14
|
||||
"
|
||||
|
||||
inherit cargo
|
||||
|
||||
DESCRIPTION="A command line tool for interacting with the Nitrokey Storage"
|
||||
HOMEPAGE="https://github.com/d-e-s-o/nitrocli"
|
||||
SRC_URI="$(cargo_crate_uris ${CRATES})"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
BDEPEND="
|
||||
>=dev-lang/rust-1.31.0
|
||||
"
|
||||
DEPEND="
|
||||
dev-libs/hidapi
|
||||
"
|
||||
# We require gnupg for /usr/bin/gpg-connect-agent.
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
app-crypt/gnupg
|
||||
"
|
||||
|
||||
# Requires a Nitrokey in pristine configuration.
|
||||
RESTRICT="test"
|
||||
QA_FLAGS_IGNORED="/usr/bin/nitrocli"
|
||||
|
||||
src_install() {
|
||||
cargo install -j $(makeopts_jobs) --path=. --root="${D}/usr" $(usex debug --debug "") \
|
||||
|| die "cargo install failed"
|
||||
rm "${D}/usr/.crates.toml" || die "failed to remove .crates.toml"
|
||||
|
||||
einstalldocs
|
||||
doman "${S}/doc/nitrocli.1"
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
|
||||
DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
|
||||
DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
|
||||
EBUILD openpgp-keys-gentoo-release-20180706.ebuild 1145 BLAKE2B 937f2632087e94da638b49d8eda2af8344d1bfc9599b53450159bf6310e5a3ccb779d54ee7b692168a4e23568f148af275eb4fde4d907f0f69c8b80220cb4672 SHA512 d288fbfa00b490fa833ac744fd58ff3ed2219b5d5c69c9d23efe548cf0629ab4afb3925f907080083fb6d8205424c15477e029ec99df81aa279530a560cfa028
|
||||
EBUILD openpgp-keys-gentoo-release-20190102.ebuild 1145 BLAKE2B 02ca7151e5e751d7faa255f8ee136780f0be8034662bb3002d0538d64d035d18d92408377cefce36b7e91d7878e0582a3a8f2ecc01d024211fad659a5da9b3b6 SHA512 00925cec194574662a545d8e7753605055c48206850b2431eb51bcd48a1b9916d249d41e60e7cea0e2e19b7e2469e642775256211d0b39e6bca5f241da816ea8
|
||||
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
|
||||
HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
|
||||
SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
|
||||
test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( app-crypt/gnupg )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
src_test() {
|
||||
local old_umask=$(umask)
|
||||
umask 077
|
||||
|
||||
local -x GNUPGHOME=${T}/.gnupg
|
||||
mkdir "${GNUPGHOME}" || die
|
||||
einfo "Importing keys ..."
|
||||
gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
|
||||
|
||||
local f
|
||||
for f in gentoo-release-test-sigs*/*.asc; do
|
||||
einfo "Testing ${f##*/} ..."
|
||||
gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
|
||||
done
|
||||
|
||||
umask "${old_umask}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/openpgp-keys
|
||||
newins "gentoo-release.asc.${PV}" gentoo-release.asc
|
||||
}
|
||||
@ -1,3 +1,4 @@
|
||||
AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
|
||||
DIST tpm2-tools-3.1.3.tar.gz 544098 BLAKE2B 4c22ae98ed444b7d5b5f99e6a7d4cc37fcf9d46979669a2225b6f2abf8ccaaff203ccc8c816169be215c6160ce2480e4c9a0197040764013ab362dd060c29bec SHA512 37edf59e47168c42ffc66e948722753334ae3e00f3e258d9e801dffd259a763a1bf4f63b3feecf7728b4dade69ca5da15d631e1a606f68e10f7d314a1a757bdc
|
||||
EBUILD tpm2-tools-3.1.3.ebuild 634 BLAKE2B 7a79635d19aee0774d05675b1cd793b08696948405c04de215e9778ea3706be681d9d968a16d2c6e07e3e487f08afbd301e86083633415e4a7c96a661bbd4a81 SHA512 f7d0d985ffcb2d66c1eae57673028643941270660a5aa05864626ca503a37365c4fa0dedb41a206184211c45b5a961813c974dcea2c86c9f4b5f41d461cf8311
|
||||
EBUILD tpm2-tools-3.1.3.ebuild 682 BLAKE2B e8cdeba71654b6c0cd36f1362a1846eb5c7c0fc0b1a0bbfc0b9d7a524b9be1e5d1f7c2bc86a473ecd7e1f74baf811598ca6bda19657cffc8f581581a9f7a390b SHA512 85af6624609561725be46ca88a8d277cd578c840b3820d6ba23a9ed38c05bd70918e956c3742e09aed866fae721604bff839b876f7f3ebf941eaeabcabf8440b
|
||||
MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
|
||||
|
||||
@ -0,0 +1,81 @@
|
||||
From a3447989483e09638e6ebeab7eabe6273aa5f3db Mon Sep 17 00:00:00 2001
|
||||
From: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Date: Fri, 4 Jan 2019 10:33:15 +0200
|
||||
Subject: [PATCH] build: fixup libressl support and add libressl-2.7
|
||||
|
||||
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
Backport: 5d4cc4ee
|
||||
---
|
||||
lib/conversion.c | 6 +++++-
|
||||
lib/tpm_kdfa.c | 10 +++++++---
|
||||
2 files changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lib/conversion.c b/lib/conversion.c
|
||||
index ce0f5b3..f55af6f 100644
|
||||
--- a/lib/conversion.c
|
||||
+++ b/lib/conversion.c
|
||||
@@ -45,6 +45,10 @@
|
||||
#include "tpm2_alg_util.h"
|
||||
#include "tpm2_util.h"
|
||||
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
|
||||
+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
|
||||
+#endif
|
||||
+
|
||||
static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, const char *path);
|
||||
|
||||
pubkey_format tpm2_parse_pubkey_format(const char *label) {
|
||||
@@ -134,7 +138,7 @@ static bool tpm2_convert_pubkey_ssl(TPMT_PUBLIC *public, pubkey_format format, c
|
||||
goto error;
|
||||
}
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
|
||||
+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
|
||||
ssl_rsa_key->e = e;
|
||||
ssl_rsa_key->n = n;
|
||||
#else
|
||||
diff --git a/lib/tpm_kdfa.c b/lib/tpm_kdfa.c
|
||||
index 3d1ed50..fc03af8 100644
|
||||
--- a/lib/tpm_kdfa.c
|
||||
+++ b/lib/tpm_kdfa.c
|
||||
@@ -34,6 +34,10 @@
|
||||
#include "log.h"
|
||||
#include "tpm2_util.h"
|
||||
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) /* OpenSSL 1.1.0 */
|
||||
+#define LIB_TPM2_OPENSSL_OPENSSL_PRE11
|
||||
+#endif
|
||||
+
|
||||
static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
|
||||
|
||||
switch(algorithm) {
|
||||
@@ -54,7 +58,7 @@ static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) {
|
||||
static HMAC_CTX *hmac_alloc()
|
||||
{
|
||||
HMAC_CTX *ctx;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL /* OpenSSL 1.1.0 */
|
||||
+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
|
||||
ctx = malloc(sizeof(*ctx));
|
||||
#else
|
||||
ctx = HMAC_CTX_new();
|
||||
@@ -62,7 +66,7 @@ static HMAC_CTX *hmac_alloc()
|
||||
if (!ctx)
|
||||
return NULL;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
|
||||
+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
|
||||
HMAC_CTX_init(ctx);
|
||||
#endif
|
||||
|
||||
@@ -71,7 +75,7 @@ static HMAC_CTX *hmac_alloc()
|
||||
|
||||
static void hmac_del(HMAC_CTX *ctx)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x1010000fL
|
||||
+#if defined(LIB_TPM2_OPENSSL_OPENSSL_PRE11)
|
||||
HMAC_CTX_cleanup(ctx);
|
||||
free(ctx);
|
||||
#else
|
||||
--
|
||||
2.19.2
|
||||
|
||||
Binary file not shown.
@ -1,6 +1,8 @@
|
||||
DIST kicad-doc-4.0.7.tar.gz 54384893 BLAKE2B c38342ebb9b5a14f3bc2a6cffb870bf4238fe1010b611525992a4e109a215b5db15d60637aecea14c090d9fe23fd7928fedff587e34a088f3843002a0433a58e SHA512 c1f58ca04dff2afb7c8c23a81a4b54f91e310342e741cc92fe6168417252b76ee009651a6845924302651d4183ca3e58620b0655aea1ee8afa40581f62e5272a
|
||||
DIST kicad-doc-5.0.0.tar.gz 68834628 BLAKE2B af6cf42fbabbf3dcd1a00b1bf94633d1cc09a5c6457bd20631f4049a0c7051b74e33cb62911e3df7cc8cfa6c50738276c17ba834923295538d88d9898cf24f73 SHA512 0fb266ada47303af41f3f5438894d66800644252bee898467522a7e6e86c372c7701768c34ac2260f0e6d76af669bf4bab33c41598037d6005ecc4ed6d31b419
|
||||
DIST kicad-doc-5.0.1.tar.gz 68998124 BLAKE2B 89c89f76ea17fd95dc8657b415675f5665a4d4bcb8c29eb5bf43f3216c59f38f38904d2d30242ebf3c4bb02197d6e04557af6b7b03b17c13ed9d051c7ed0c134 SHA512 f500be02417bbe3105ece434ca594c7a8cfe3d937a9a835b49b238569f40a8e8cc360d3970d38262b1ae0b702203de942feeae8c48cd2068aec90bf81e3e5a88
|
||||
EBUILD kicad-doc-4.0.7-r1.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
|
||||
EBUILD kicad-doc-4.0.7.ebuild 1187 BLAKE2B 44eb1d3012c24f431f255b4203109398c3cbb4de0e068c81bad2034c866b9f00b8bf91e9941e8dbe23857359d72e9948d561cbc66dcfb1d8162da23f08950ff4 SHA512 9d36ba68ac9dcc0be7ea28832a424288e46b2226bda91d2b13318323789b8479eee913f5a793fda3ef47bec6877cbabccac607c1c5d648a4621df82faab39405
|
||||
EBUILD kicad-doc-5.0.0.ebuild 1288 BLAKE2B d559b2035c7827010881bcc814581a10837739e0c9b4d2245730038d3f22940da893758d9c46af30ae4a77fd6f837d1a50e8b723737e0b1072b43b3203e9c744 SHA512 c5795696a764d9236e0175642580e318e27644a067cdd4a1ad3dcf8194f356b1a5b87665b16f90304aaa1083b82af0c4b925a581b81042689948480c90bab6bd
|
||||
EBUILD kicad-doc-5.0.1.ebuild 1328 BLAKE2B e56c2322b73ee6b26061e101c4c2009e5b1dc77b6c5f932d29ffa8ad38640190ef3090c349b9f79b23d9bf3f4eb68c3e4df313ace2a5d6ff80d6e75685f1da7e SHA512 1e2f70d80663fabf9e7129205658d5eb36dc3e928a3dcb23bf07394d9e3003509f64a8af945bcb3b9fe781069c7b7ffca396e9f0799bc00ceca028620b5cc836
|
||||
MISC metadata.xml 821 BLAKE2B 631ca1c015a9e76858685a08e77512ad495bd6a95c41e307363bceee3fa48cb627eea89d004f2ddf293785452535f468f6fd9a717440e0ff022673a8fbbc3929 SHA512 07b69d4deccfa4edcc50e6652ff5f8af8fe265dd8887996c1c1d3d02691d578a139c3ba7b81e63eedc257664d32e1d74e4d24175e5d73ac2ac4f62fdee9531bb
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Electronic Schematic and PCB design tools manuals"
|
||||
HOMEPAGE="http://www.kicad-pcb.org/"
|
||||
SRC_URI="https://github.com/KiCad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="html +pdf"
|
||||
LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl"
|
||||
IUSE+=${LANG_USE}
|
||||
REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
|
||||
unset LANG_USE
|
||||
|
||||
DEPEND="
|
||||
>=app-text/asciidoc-8.6.9
|
||||
>=app-text/dblatex-0.3.10
|
||||
>=app-text/po4a-0.45
|
||||
>=sys-devel/gettext-0.18
|
||||
dev-perl/Unicode-LineBreak
|
||||
dev-util/source-highlight
|
||||
l10n_ca? ( dev-texlive/texlive-langspanish )
|
||||
l10n_de? ( dev-texlive/texlive-langgerman )
|
||||
l10n_en? ( dev-texlive/texlive-langenglish )
|
||||
l10n_es? ( dev-texlive/texlive-langspanish )
|
||||
l10n_fr? ( dev-texlive/texlive-langfrench )
|
||||
l10n_it? ( dev-texlive/texlive-langitalian )
|
||||
l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
|
||||
l10n_pl? ( dev-texlive/texlive-langpolish )"
|
||||
RDEPEND=""
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_FORMATS="$(usev html);$(usev pdf)"
|
||||
-DSINGLE_LANGUAGE="${L10N}"
|
||||
-DKICAD_DOC_PATH="/usr/share/doc/${P}/help"
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,105 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
EGIT_COMMIT="e8a2525c2e7f5ab057d5a2b5f1950be5643d8053"
|
||||
EGO_PN="github.com/kubernetes-sigs/${PN}"
|
||||
|
||||
inherit golang-vcs-snapshot systemd
|
||||
|
||||
DESCRIPTION="OCI-based implementation of Kubernetes Container Runtime Interface"
|
||||
HOMEPAGE="http://cri-o.io/"
|
||||
SRC_URI="https://github.com/kubernetes-sigs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="btrfs +device-mapper ostree seccomp selinux"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-crypt/gpgme:=
|
||||
app-emulation/runc
|
||||
dev-libs/glib:=
|
||||
dev-libs/libassuan:=
|
||||
dev-libs/libgpg-error:=
|
||||
net-firewall/conntrack-tools
|
||||
net-firewall/iptables
|
||||
net-misc/cni-plugins
|
||||
net-misc/socat
|
||||
sys-apps/iproute2
|
||||
btrfs? ( sys-fs/btrfs-progs )
|
||||
device-mapper? ( sys-fs/lvm2:= )
|
||||
ostree? ( dev-util/ostree )
|
||||
seccomp? ( sys-libs/libseccomp:= )
|
||||
selinux? ( sys-libs/libselinux:= )"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
dev-go/go-md2man"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
S="${WORKDIR}/${P}/src/${EGO_PN}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -e '/^GIT_.*/d' \
|
||||
-e 's/$(GO) build/$(GO) build -v -work -x/' \
|
||||
-e 's/\${GIT_COMMIT}/'${EGIT_COMMIT}'/' \
|
||||
-i Makefile || die
|
||||
|
||||
sed -e 's:/usr/local/bin:/usr/bin:' \
|
||||
-i contrib/systemd/* || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
[[ -f hack/btrfs_installed_tag.sh ]] || die
|
||||
use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
|
||||
hack/btrfs_installed_tag.sh || die; }
|
||||
|
||||
[[ -f hack/libdm_installed.sh ]] || die
|
||||
use device-mapper || { echo -e "#!/bin/sh\necho exclude_graphdriver_devicemapper" > \
|
||||
hack/libdm_installed.sh || die; }
|
||||
|
||||
[[ -f hack/ostree_tag.sh ]] || die
|
||||
use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
|
||||
hack/ostree_tag.sh || die; }
|
||||
|
||||
[[ -f hack/seccomp_tag.sh ]] || die
|
||||
use seccomp || { echo -e "#!/bin/sh\ntrue" > \
|
||||
hack/seccomp_tag.sh || die; }
|
||||
|
||||
[[ -f hack/selinux_tag.sh ]] || die
|
||||
use selinux || { echo -e "#!/bin/sh\ntrue" > \
|
||||
hack/selinux_tag.sh || die; }
|
||||
|
||||
mkdir -p bin || die
|
||||
GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" \
|
||||
emake binaries docs
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" PREFIX="${D}${EPREFIX}/usr" install.bin install.man
|
||||
|
||||
keepdir /etc/crio
|
||||
insinto /etc/crio
|
||||
use seccomp && doins seccomp.json
|
||||
|
||||
"${ED}"/usr/bin/crio --config="" config --default > "${T}"/crio.conf.example || die
|
||||
doins "${T}/crio.conf.example"
|
||||
|
||||
newinitd "${FILESDIR}/crio.initd" crio
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
|
||||
# Suppress crio log error messages triggered if these don't exist.
|
||||
keepdir /etc/containers/oci/hooks.d
|
||||
keepdir /usr/share/containers/oci/hooks.d
|
||||
|
||||
# Suppress crio "Missing CNI default network" log message.
|
||||
keepdir /etc/cni/net.d
|
||||
insinto /etc/cni/net.d
|
||||
doins contrib/cni/99-loopback.conf
|
||||
|
||||
systemd_dounit contrib/systemd/*
|
||||
}
|
||||
@ -1,8 +1,6 @@
|
||||
AUX lxc-templates-3.0.1-no-cache-dir.patch 241 BLAKE2B ba9fc4fe3d663384a64600977de1c5aba413e876e6ca43464b5f5986d21d5e01729c82eb1e6ea03b087644611b9fc7bf083436e467bc69e2b3779020ca287984 SHA512 504721074d9aa4c1d71e5fb5f59c8179cbb0247b6d56d7622a68a7c55a5fdd5fa25cb92199e5400457f1bf2e4bc8e2d91d5169fb02180688c7bbca655881bdb5
|
||||
DIST lxc-templates-3.0.1.tar.gz 256074 BLAKE2B 8a5dab2d69fbc29e0246a0853690726c07d24e0fe6d4e761d8ec8b4559cdf285a82e17c8f4d2a6bf2355896c667000d4341511b3c5f1805a55849b4812eb7efe SHA512 cae47b670654dc6c143827d196f0477c5354cb6d81ae4028192622fb73912e8bb3b62a0a68786e9212885bb52b593c6e742cfbfefb70ec33260d599e5d5c8290
|
||||
DIST lxc-templates-3.0.2.tar.gz 255721 BLAKE2B 6f3a09982833ae832623bf448a0cc8a5c3c6639606a1cd8e306e41fa86a1135eae5490cd93043c397e5be727b12b0fdae48709a5ff3e3dd2e590bc6aa7154f34 SHA512 1e4b271c86d3cc382a6c4cc5ad8a44362f731325b4657fbee29542837a2684ee7274b92985da1a2f8aa0f808e263bf50d682ee969ba137229e54528fa529f77f
|
||||
DIST lxc-templates-3.0.3.tar.gz 257085 BLAKE2B b53a057e1da23997318c2bcee095fbffb97c37b656eec9643e5a5ac2e7bdfeb9599710a8ccfb5d61aaf523d754f1dbbe7748c4cd1990205c6e28a17cd5e61ee0 SHA512 3e9d5304f5e06580eeb766570ddfebb0c80061c2d7e47c9ea37d834fe0cf4fabe7eedd667e4937df3f2451bc3e7aa1e98a1b386f3b19964dc218ff0e21011632
|
||||
EBUILD lxc-templates-3.0.1.ebuild 513 BLAKE2B 15749a19b3c24df787d3d4eb8d7f6ebf902cff1c22fe0ee4bed0eafb8b5eb53860b5ff20d54e9775ef659f4ad46e160fccbd95bc2331a3f8b167c6332585aed0 SHA512 428a61af6aba82737427a699275522f992f6aba3eb870719e298f1b7b4a24842a21a33af2b7dfbd2a0e05f78b8316224f907ddaedfa2984d0117a67f0e064025
|
||||
EBUILD lxc-templates-3.0.2.ebuild 518 BLAKE2B 8e652807a3046688671a7ae6564bd8f0a50ebf1ac28a38eec49e7ac3485572dd3ca48acb1a49a36edf8ff05d05d1f01ea38e660be7a8430596daa83d25ff81a1 SHA512 96dc903516a5efb4ad3169e0e3f3c92ddb70c085994857e6cc2d339e84dc83392f4cadb1088e20ca215eee944faa8c6ca5b94b05f60f99124b98275d0083e04d
|
||||
EBUILD lxc-templates-3.0.3.ebuild 520 BLAKE2B 68d70ab9a40c33d6776da2765225d49e07f1b672d71d90062efd8415adb3965e84065d33977af67261932ef80dd295ef7dc207477e1c3bbf691ae2bd484ea3bc SHA512 90796dd4d82507cb4f0c0ee6d8749bec6d0df076d6cec37d15c29a1f3eccc2b651a0b0a02b9b8b4dd280708efaf37cf8152bae16ae1850661d2bbef681babc7b
|
||||
EBUILD lxc-templates-3.0.3.ebuild 518 BLAKE2B aa309cd9e6a8dc4670c193e63eff1b2b981132ce9d68bc11fe0ed176425a9a20b245bc58d3fe2489cc66143a006dffd47b2f61d0b90a2ad21df8a927f541d12e SHA512 ba87e581293aadf136e071ed32571219134aabce9612f1c4d44772d702a95a3e5bbcfe75a291b6e351682c3a8058e5a311aa8c41305e44881f3e875f46edaf77
|
||||
MISC metadata.xml 446 BLAKE2B d0b14eed14b0882b35ddb982ba432f6a5a3b63fdf8bb1c926c9d0db7b9cf7757c78cccca1244cd039d0db7e52c360e99c3fc0a2e915653543d5416054fec62af SHA512 473e0a28d72d39643f91e17910481331b1732b07e4cd74bac024c8a5a933e40a838948d5a8b0bef808332eac751422f7f88ec91501f63b779763606b71696acc
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Old style template scripts for LXC"
|
||||
HOMEPAGE="https://linuxcontainers.org/"
|
||||
SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
|
||||
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="
|
||||
>=app-emulation/lxc-3.0"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-3.0.1-no-cache-dir.patch" )
|
||||
DOCS=()
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
|
||||
DIST eselect-postgresql-2.4.tbz2 4518 BLAKE2B 726c59f0511b2e27493cceb9b9a7b3c58e7d7bb0cba2fef705eef9190ef384c3116c42079566d8761192b9c288ef57c550f659a0398ba90fa069f6be335550ff SHA512 4eed12905e97a45420a299cc9232be62a1ac88257a047d9d16ef7d8c8a0e0ddbd4177415797defe352cc82cd87b7777907a51a8cadfdb28064faa78a28e0099d
|
||||
EBUILD eselect-postgresql-2.3.ebuild 923 BLAKE2B 337e9da82b5732a0f824577dc5ee291c4949808018ea94316af850893a80bbc45eea52ea1ff7ad1db02fc4eeb388023ba3c923a4993ad196d4e9870fe4366ea0 SHA512 3342c576a6f4672ab3289a02c5ad00bf4075de3ba7e3148dd30ab99e9ee9fa345cfc0c0b9f81c2931293f8a209205ccd06f1019a21e9b2a78567c075ada6ebca
|
||||
EBUILD eselect-postgresql-2.4.ebuild 1019 BLAKE2B 1b647fd427c11727ac1874e1eb4bf9eba0c7d8cc94dc456091478032c1b1d7ed8aad535262dffedaf254a8a63aeeeeb96ae5b0f70e1e71a9eec1f715b3474562 SHA512 53bd05b8dba327ab59059028137c0a772be66173ba9d818a224571fcbd82182b641a8c2c9547773cedd3a9e37acd9d105d79696e1ef23633e91a956a5f57efec
|
||||
EBUILD eselect-postgresql-2.4.ebuild 1014 BLAKE2B 2e7cf46268a8f60c47b72f070e7dc50420f51187fab3c26c43cda809d039a5db11d7ed7eadc6d1a3fb88ec69e4851d19cd649a8c14e2bcfe5a9d25d9a4278c53 SHA512 ede0d06f9f2891baa39963b58af561cb804a7e8228560faafea1497fc96c892bdc4d94468d3dc7483f11c1146a37c3361ee22fad9b8302ddaf42094781b9e486
|
||||
MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
|
||||
|
||||
Binary file not shown.
@ -1,11 +1,3 @@
|
||||
DIST afl-2.35b.tgz 829515 BLAKE2B 5f03d00b21ec8e2169b78757c9be7ca57d35a66c42c169c4a14a554f8ecb9cdacd0bbb99da63e7007731377dd6e815e7ea886ac8b9623cd1be80976ffc51bdaf SHA512 77f286d0008055770812b7429a671caed54adb2355cd88e1cbdd13f9e739763f46ed6f3e25ddfbe7aa2679e0a71c9b1af9767d1c367df1778338fcf260bc38c5
|
||||
DIST afl-2.39b.tgz 830897 BLAKE2B cc03e3864b75f6bae232bafb3fc66c80be18b00e05982c1124ce7de7e8df9c54a66273985472507e64a927485ba8121ded565fe4021350a2e8caab7a4c9a3178 SHA512 0df37fc8dea65d4130bc0fc8aaa23525bde4832c7202efb78ebe740d661546adee575b48fb94d851ef26293ca28a6ff818ab1dfd643c8e688aceb520e11229d0
|
||||
DIST afl-2.46b.tgz 834265 BLAKE2B d292d4c1686c123af7ddee57d9d44d4d8618a49f57985493ed0017fdda88d95cca4b270c139416f95c21476c9aeea3bcbde0be737fcc1f2c38ef0b17379f2b46 SHA512 01e150f05a023277f6fbf165f1ee0799f9a330efae562d67725cf87b456f4104e086162796634fcfdd7c68aa33a38ef7df9ac5931f8893c14364d270b864d059
|
||||
DIST afl-2.51b.tgz 835611 BLAKE2B 6fb4fb60e2fd1d1a18caee84568bee98c4224b54bc55454c53d3c3b753274d183816c8fe229be84303722c7fc31e29bc244a149718ae7507f127e994c5b6e663 SHA512 fd67cf44b7336175041c2efa42b122e91f887f4a293618a59ea1e145ef47b9c0fab9fc274e4b94499c523bec950ff5a704050c3f4260e890ad97774c365a358c
|
||||
DIST afl-2.52b.tgz 835907 BLAKE2B 6df8b8f97a0b1ccb22466492bf15f054e7a05f77f2827c6555572fd610cbed24c903ae188e2242ba6ffec302e154e319adb627626a7927f17ffa5ab00cef604f SHA512 30d4526440cff109ef2a014278f52a04b1b33560b6ab7d7f59e1516655858ffb36dac81963d2d8f214984776742ca9a7942c27c8fb61f7eb70b5b35cd029008f
|
||||
EBUILD afl-2.35b.ebuild 974 BLAKE2B e06ad315bc94f79cb7f6075937c82ed8455b4b64bbc895707a951201e01dc33de550a46bf81c36a90c1d324de2804b9d65b4f2e2951f6131eb05951f3a0d1735 SHA512 e566e9be5989102921e019a44c6bbe7e05ff731c52d7c86387215c5c30b4e1385cef86e9535bfc0005b0ff45477c0dab5993642cfba3c8b75e57ab1190eee8c8
|
||||
EBUILD afl-2.39b.ebuild 974 BLAKE2B e06ad315bc94f79cb7f6075937c82ed8455b4b64bbc895707a951201e01dc33de550a46bf81c36a90c1d324de2804b9d65b4f2e2951f6131eb05951f3a0d1735 SHA512 e566e9be5989102921e019a44c6bbe7e05ff731c52d7c86387215c5c30b4e1385cef86e9535bfc0005b0ff45477c0dab5993642cfba3c8b75e57ab1190eee8c8
|
||||
EBUILD afl-2.46b.ebuild 981 BLAKE2B 25901d86a0626475e30a486ebf6afc5f515c2fac1c57e3fee978a5736ac33d4f9a48d5fbea9180ab513d714d89cde464db7abe608cdcb1009a91e80702bc4fdc SHA512 49858f57889193e9c571d5eacc3bec9489b4131135219e408355b821d2b5bdb3c1f29a1a937d6374c56e09a3d10f0a30729b321114648c7b2c7d17486b0816dc
|
||||
EBUILD afl-2.51b.ebuild 981 BLAKE2B 61d28b2b89faea3a6303dce3ba85e69b25ec7b4665d49b7dfa80e2a7fa90d4e1843e9d35917ff1afcc74de60b301189d4d0f42a171faa142d0d988ac570effc3 SHA512 c95e4d31469cd6ce8b54cf2d183838248ac483f7ecc4bd9ba5be17a884124f37316e87815ad85ea755075a2ce9157d20d6792d5f28236aefcc148e287d900f29
|
||||
EBUILD afl-2.52b.ebuild 981 BLAKE2B 61d28b2b89faea3a6303dce3ba85e69b25ec7b4665d49b7dfa80e2a7fa90d4e1843e9d35917ff1afcc74de60b301189d4d0f42a171faa142d0d988ac570effc3 SHA512 c95e4d31469cd6ce8b54cf2d183838248ac483f7ecc4bd9ba5be17a884124f37316e87815ad85ea755075a2ce9157d20d6792d5f28236aefcc148e287d900f29
|
||||
EBUILD afl-2.52b.ebuild 978 BLAKE2B d5b4be62f952d7f68caaf2536d7ed04843b8d601d6aacb3faab8d649b5205b32193c74b2dad994cc741ea3e291085e54bfb18a37d7e2309321c67903afb6adf4 SHA512 66a43106a86dcf3bbab29425a3a81e607c94549fd18e84ff22f2c7c413cbc3189197a72dfc3744c57e30d404a839be96e671b5473a3a30c23a2a6176dca34126
|
||||
MISC metadata.xml 220 BLAKE2B 6601e9f3a5547335d518f5dfdcfe850d40df68e10f8c121a4c1bcc30ce7f1e8381ca318654391d9801bbe11226542742c7ba488f64d4b35804baa11e6cb3de46 SHA512 d9edbf422ea6f698d0b8de45ce3855e0d0f410d0f346ee85da825ad9f720fdaa367b7790027de2c7cc7ea70d51074eec76ca72ff6528be1ef490e0dcef2c640c
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib toolchain-funcs flag-o-matic
|
||||
|
||||
DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
|
||||
HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
|
||||
SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
DEPEND="sys-devel/gcc:*
|
||||
sys-devel/clang:*"
|
||||
RDEPEND="${DEPEND}"
|
||||
QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
CC="clang" CXX="clang++" strip-unsupported-flags
|
||||
cd llvm_mode
|
||||
emake \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}" \
|
||||
install
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib toolchain-funcs flag-o-matic
|
||||
|
||||
DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
|
||||
HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
|
||||
SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
DEPEND="sys-devel/gcc:*
|
||||
sys-devel/clang:*"
|
||||
RDEPEND="${DEPEND}"
|
||||
QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
CC="clang" CXX="clang++" strip-unsupported-flags
|
||||
cd llvm_mode
|
||||
emake \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}" \
|
||||
install
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib toolchain-funcs flag-o-matic
|
||||
|
||||
DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
|
||||
HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
|
||||
SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
DEPEND="sys-devel/gcc:*
|
||||
sys-devel/clang:*"
|
||||
RDEPEND="${DEPEND}"
|
||||
QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
CC="clang" CXX="clang++" strip-unsupported-flags
|
||||
cd llvm_mode || die
|
||||
emake \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}" \
|
||||
install
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib toolchain-funcs flag-o-matic
|
||||
|
||||
DESCRIPTION="american fuzzy lop - compile-time instrumentation fuzzer"
|
||||
HOMEPAGE="http://lcamtuf.coredump.cx/afl/"
|
||||
SRC_URI="http://lcamtuf.coredump.cx/afl/releases/${P}.tgz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
DEPEND="sys-devel/gcc:*
|
||||
sys-devel/clang:*"
|
||||
RDEPEND="${DEPEND}"
|
||||
QA_PREBUILT="/usr/share/afl/testcases/others/elf/small_exec.elf"
|
||||
|
||||
src_compile() {
|
||||
emake CC="$(tc-getCC)" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
CC="clang" CXX="clang++" strip-unsupported-flags
|
||||
cd llvm_mode || die
|
||||
emake \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
PREFIX="/usr" \
|
||||
HELPER_PATH="/usr/$(get_libdir)/afl" \
|
||||
DOC_PATH="/usr/share/doc/${PF}" \
|
||||
install
|
||||
}
|
||||
Binary file not shown.
@ -1,5 +1,8 @@
|
||||
AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
|
||||
AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
|
||||
AUX ckermit-9.0.302-cleanup.patch 2870 BLAKE2B 6fc0d26cfb1715d92a5e718e6e4d1771a38ebbfd52c601c1e0c18497e677e53a5c4c608c97054da8c14c8af3e1caf7d32bb59dd3d89999b5af22d31bc67dda90 SHA512 c99a47ecdadc27d4a8dca2d917e20e84683e1729ceb8ab07f1818eeffd0ee7d9ca87531862000866a74e7d3b3b3cf977255b8f584f3828ab3443b684a6195b7f
|
||||
DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
|
||||
DIST cku302.tar.gz 3122219 BLAKE2B 9f63261da2dc2b0fceb0af0fa81da63c87e68b7bf713037cf8675abeb81716fd0dd4cd1f84324562698d9b9126f26b8a651dc79deec37a056fa1047af2d9966e SHA512 2cfc264e5262d29618fdf218fd3407fd9049b16110972cdddb03d114703b7a0ea13c4b0a354f50c2a9f70d4727732fe4d1920b5c656f969bc56c1eb9dc3c43fa
|
||||
EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
|
||||
EBUILD ckermit-9.0.302.ebuild 1976 BLAKE2B f67332691f13b68cbcb4bef52519c7058addb97a7212647e64f2d6fc0c71a6065bfbd4d2b28918e4e46481352ad31b7673ca05cb5e8192fe4dd5106a476e57d4 SHA512 4d4b0ce68adb41e1d36c768c04534f21886a29fb17f584e46edd70b7ad388814b34baea737f960b9a0b7015917c1bcdcd73c34cfbe6005da478f77123f28d07b
|
||||
MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit flag-o-matic toolchain-funcs
|
||||
|
||||
# Columbia University only uses the third component, e.g. cku211.tar.gz for
|
||||
# what we would call 8.0.211.
|
||||
MY_P="cku$(ver_cut 3)"
|
||||
|
||||
DESCRIPTION="combined serial and network communication software package"
|
||||
SRC_URI="ftp://kermit.columbia.edu/kermit/archives/${MY_P}.tar.gz"
|
||||
HOMEPAGE="http://www.kermitproject.org/"
|
||||
|
||||
LICENSE="Kermit"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE="ncurses"
|
||||
|
||||
DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
|
||||
RDEPEND="${DEPEND}
|
||||
net-dialup/lrzsz"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-cleanup.patch
|
||||
"${FILESDIR}"/${PN}-8.0.211-build-wart.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
tc-export_build_env BUILD_CC
|
||||
sed -i -r \
|
||||
-e 's:"(CC2?) = gcc":"\1=$(CC)":g' \
|
||||
-e 's:"CFLAGS = -O:"CFLAGS = $(CFLAGS):' \
|
||||
makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# we don't enable any of the telnet/ftp authentication stuff
|
||||
# since there are other packages which do these things better
|
||||
# USE="kerberos pam shadow ssl zlib"
|
||||
append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
|
||||
|
||||
if use ncurses; then
|
||||
append-cppflags "-DCK_NCURSES"
|
||||
append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
|
||||
append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
|
||||
fi
|
||||
|
||||
append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
|
||||
append-cppflags -DHAVE_CRYPT_H -DHAVE_OPENPTY
|
||||
append-cppflags -DNOARROWKEYS # bug #669332
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
KFLAGS="${CPPFLAGS}" \
|
||||
LIBS="-lcrypt -lresolv -lutil ${LIBS}" \
|
||||
LNKFLAGS="${LDFLAGS}" \
|
||||
linuxa
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" prefix=/usr manroot=/usr/share install
|
||||
dodoc *.txt
|
||||
|
||||
# make the correct symlink
|
||||
rm "${ED}"/usr/bin/kermit-sshsub || die
|
||||
dosym kermit /usr/bin/kermit-sshsub
|
||||
|
||||
# the ckermit.ini script is calling the wrong kermit binary --
|
||||
# the one from ${D}
|
||||
sed -i "s:${D}::g" "${ED}"/usr/bin/ckermit.ini
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
Various clean-ups and fix makefile dir creation.
|
||||
|
||||
--- cku302/ckcmai.c
|
||||
+++ cku302/ckcmai.c
|
||||
@@ -561,6 +561,8 @@
|
||||
#include "ckntap.h"
|
||||
#endif /* NT */
|
||||
|
||||
+#include <time.h>
|
||||
+
|
||||
#ifndef NOSERVER
|
||||
/* Text message definitions.. each should be 256 chars long, or less. */
|
||||
#ifdef MINIX
|
||||
--- cku302/ckuus5.c
|
||||
+++ cku302/ckuus5.c
|
||||
@@ -7853,7 +7853,7 @@
|
||||
printf(" --bannerfile=%s\n",bannerfile ? bannerfile : "(null)");
|
||||
printf(" --cdfile:%s\n",cdmsgstr ? cdmsgstr : "(null)");
|
||||
printf(" --cdmessage:%d\n",srvcdmsg);
|
||||
- printf(" --helpfile:%d\n",helpfile);
|
||||
+ printf(" --helpfile:%s\n",helpfile ? helpfile : "(null)");
|
||||
if (inserver) {
|
||||
printf("\n");
|
||||
break;
|
||||
--- cku302/ckuusx.c
|
||||
+++ cku302/ckuusx.c
|
||||
@@ -57,7 +57,6 @@
|
||||
#include <termcap.h>
|
||||
#endif /* NOHTERMCAP */
|
||||
#endif /* BSD44 */
|
||||
-#else /* !BSD44 */
|
||||
#ifdef linux
|
||||
#include <term.h>
|
||||
#endif /* linux */
|
||||
--- cku302/makefile
|
||||
+++ cku302/makefile
|
||||
@@ -1047,7 +1047,7 @@
|
||||
else\
|
||||
echo "Creating $(DESTDIR)...";\
|
||||
DESTDIR=`echo $(DESTDIR) | sed 's!/*$$!!'`;\
|
||||
- mkdir $$DESTDIR || exit 1;\
|
||||
+ mkdir -p $$DESTDIR || exit 1;\
|
||||
fi;\
|
||||
chmod 755 $(DESTDIR) || exit 1;\
|
||||
fi;\
|
||||
@@ -1066,7 +1066,7 @@
|
||||
echo "$(DESTDIR)$(BINDIR) exists...";\
|
||||
else\
|
||||
echo "Creating $(DESTDIR)$(BINDIR)/...";\
|
||||
- mkdir $(DESTDIR)$(BINDIR) || exit 1;\
|
||||
+ mkdir -p $(DESTDIR)$(BINDIR) || exit 1;\
|
||||
chmod 755 $(DESTDIR)$(BINDIR);\
|
||||
fi;\
|
||||
rm -f $(DESTDIR)$(BINDIR)/kermit;\
|
||||
@@ -1104,9 +1104,9 @@
|
||||
if test -d $(DESTDIR)$(MANDIR); then\
|
||||
echo "$(DESTDIR)$(MANDIR) exists...";\
|
||||
else\
|
||||
- echo "Creating $(MANDIR)...";\
|
||||
- mkdir $(MANDIR) || exit 1;\
|
||||
- chmod 755 $(MANDIR) || exit 1;\
|
||||
+ echo "Creating $(DESTDIR)$(MANDIR)...";\
|
||||
+ mkdir -p $(DESTDIR)$(MANDIR) || exit 1;\
|
||||
+ chmod 755 $(DESTDIR)$(MANDIR) || exit 1;\
|
||||
fi;\
|
||||
rm -f $(DESTDIR)$(MANDIR)/kermit.$(MANEXT);\
|
||||
cp ckuker.nr $(DESTDIR)$(MANDIR)/kermit.$(MANEXT) || exit 1;\
|
||||
@@ -1125,7 +1125,7 @@
|
||||
echo "$(CERTDIR) exists...";\
|
||||
else\
|
||||
echo "Creating $(CERTDIR)...";\
|
||||
- mkdir $(CERTDIR) || exit 1;\
|
||||
+ mkdir -p $(CERTDIR) || exit 1;\
|
||||
chmod 755 $(CERTDIR) || exit 1;\
|
||||
fi;\
|
||||
echo "Installing certificates file...";\
|
||||
@@ -1146,7 +1146,7 @@
|
||||
echo "$(DESTDIR)$(SRCDIR) exists...";\
|
||||
else\
|
||||
echo "Creating $(DESTDIR)$(SRCDIR)/...";\
|
||||
- mkdir $(DESTDIR)$(SRCDIR) || exit 1;\
|
||||
+ mkdir -p $(DESTDIR)$(SRCDIR) || exit 1;\
|
||||
chmod 755 $(DESTDIR)$(SRCDIR);\
|
||||
fi;\
|
||||
echo "Copying source files to $(DESTDIR)$(SRCDIR)...";\
|
||||
@@ -1168,7 +1168,7 @@
|
||||
echo "$(DESTDIR)$(INFODIR) exists...";\
|
||||
else\
|
||||
echo "Creating $(DESTDIR)$(INFODIR)/...";\
|
||||
- mkdir $(DESTDIR)$(INFODIR) || exit 1;\
|
||||
+ mkdir -p $(DESTDIR)$(INFODIR) || exit 1;\
|
||||
chmod 755 $(DESTDIR)$(INFODIR);\
|
||||
fi;\
|
||||
echo "Copying text files to $(DESTDIR)$(INFODIR)...";\
|
||||
@ -0,0 +1,93 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic
|
||||
|
||||
MY_P=${P/_/-}
|
||||
|
||||
DESCRIPTION="GNU Midnight Commander is a text based file manager"
|
||||
HOMEPAGE="https://www.midnight-commander.org"
|
||||
SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
|
||||
IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
|
||||
|
||||
REQUIRED_USE="spell? ( edit )"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.26.0:2
|
||||
gpm? ( sys-libs/gpm )
|
||||
kernel_linux? ( sys-fs/e2fsprogs )
|
||||
samba? ( net-fs/samba )
|
||||
sftp? ( net-libs/libssh2 )
|
||||
slang? ( >=sys-libs/slang-2 )
|
||||
!slang? ( sys-libs/ncurses:0=[unicode?] )
|
||||
spell? ( app-text/aspell )
|
||||
X? ( x11-libs/libX11
|
||||
x11-libs/libICE
|
||||
x11-libs/libXau
|
||||
x11-libs/libXdmcp
|
||||
x11-libs/libSM )"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/xz-utils
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
test? ( dev-libs/check )
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_pretend() {
|
||||
if use slang && use unicode ; then
|
||||
ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
|
||||
|
||||
local myeconfargs=(
|
||||
--disable-dependency-tracking
|
||||
--disable-silent-rules
|
||||
--enable-charset
|
||||
--enable-vfs
|
||||
--with-homedir=$(usex xdg 'XDG' '.mc')
|
||||
--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
|
||||
$(use_enable kernel_linux vfs-undelfs)
|
||||
$(use_enable mclib)
|
||||
$(use_enable nls)
|
||||
$(use_enable samba vfs-smb)
|
||||
$(use_enable sftp vfs-sftp)
|
||||
$(use_enable spell aspell)
|
||||
$(use_enable test tests)
|
||||
$(use_with gpm gpm-mouse)
|
||||
$(use_with X x)
|
||||
$(use_with edit internal-edit)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
dodoc AUTHORS README NEWS
|
||||
|
||||
# fix bug #334383
|
||||
if use kernel_linux && [[ ${EUID} == 0 ]] ; then
|
||||
fowners root:tty /usr/libexec/mc/cons.saver
|
||||
fperms g+s /usr/libexec/mc/cons.saver
|
||||
fi
|
||||
|
||||
if ! use xdg ; then
|
||||
sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
|
||||
-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "To enable exiting to latest working directory,"
|
||||
elog "put this into your ~/.bashrc:"
|
||||
elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
|
||||
}
|
||||
Binary file not shown.
@ -1,9 +1,13 @@
|
||||
AUX calligra-3.1.0-doc.patch 323 BLAKE2B 56a886a5b4a4f371eebe3c4f72d5a4817b2fa19af29e55ee0af1f84751a84ec28df8794b8cb7ceb026c701843356ef83d0310dfc2454815d09c95edbb93a0c08 SHA512 6254828157896b44ba77ae36f99876a2806dd917e65a36fdf25ee75e1a6683678ef1dd4275d6712d4f25f808d53dcb20bc3787bb4217e77054e9797bf0ccef72
|
||||
AUX calligra-3.1.0-no-arch-detection.patch 436 BLAKE2B 117544b6089912f34b3c4cb3ee7837fb4f4377cdc0edc8a6de91156fb99ce010bc857752cf683f7f57ca604dd6393b36eeb807a6007e59bf589e404d02d0cef1 SHA512 f8f747279eabb165da68fe83300223a2bd49a530116c04c9a31de2a32f9f2b3eb46f7866ce194c91d9fcb0ab77fde628574dc9a55e6a08c327e2716849a0da8d
|
||||
AUX calligra-3.1.0-no-webkit.patch 2587 BLAKE2B 9c5de12f3fe100060ec89eec8190ac2d5e97cc0e3f6e97e8b5e6f9c6c46f80e49b1e85e052dc16831aaf0a2b70abd9ecb4fa787bcefdeb2685c72dc59f2ea0ef SHA512 582d5e532ab237ee3f4bb87b12e47272d27f8c57448056a8900df7a76b38e8831dd2d352e0d4a3eb6bd1d651c5a34a7714a307c32ed218ce225ac17723615479
|
||||
AUX calligra-3.1.0-plan-qt-5.11.patch 3818 BLAKE2B 1a1f619a491cbc3440ec8db091a1a0775c56f37ebb0be1a4ea0815ced8b6d22598b985e1a419bb572edb430c253d3fd5d0194d6f264ed4ac59c10d8d811cbc72 SHA512 fc375a35f5e29efc404f3546b995568f3c0a9cd3fb94e3c98085a897f9e9d08a1ea41ad1359665392b2f7449e552dead236c3617a4462d94ad4fa2689538150d
|
||||
AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d00eab1f2c71f876eea08feb8d9057f33b3ff5dbf69abe10984aa15717ef505522b07153341e846ace24a5f80f175dfed4600 SHA512 b408f1333af40c7270a2f14fa5f9069ec16baeceac7e2b91be2e9759d095d6df92a16b33e0b7c6897dbb15f01ae789436f8864cd1dd38ff009c1a77501e32083
|
||||
AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917
|
||||
AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
|
||||
AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
|
||||
DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
|
||||
DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
|
||||
EBUILD calligra-3.1.0-r2.ebuild 6841 BLAKE2B 08d6ba5579bec64f7fe865ecd47678cec0d85829063f4e8578792bf79a5a288943a6bd42fead2a557c8dc594676a8c04afe07f75762b40bc6de12957a9b3072b SHA512 1e0fdf8cc1a2b75320671be47eea2982aefaf108d158fa998d1b1a3a07e1e3332bd671075df281aa0ae34eb22fd2bc8c55f591f49fc7dec3f8b78b58555273f1
|
||||
EBUILD calligra-3.1.0-r3.ebuild 5680 BLAKE2B 20fe9c323fef5b68906fb79518b73d76ac6d596eb21ab1755eb616163d15c749c26278ed2af6431802a05f8a0eb1cd1c33b8329b0e3900e782f4d77fbebe74dd SHA512 69c5d4b920a2cd5bf0f6c369b22bc4f8cd0427b39ac7368caabe9188301fd3f78c7729afde1859fd7c694dfdce6aa40102e878cd81fe52ac5f6827eba8c243f9
|
||||
MISC metadata.xml 1108 BLAKE2B 266bc6539219906527f6e8692cfac1a4c894164466e01bd3ddc290ed665d19af6419ae1a8939002a4ccc719826def4038264ecdd65fca3aef8627106114c804b SHA512 61655e86072fdb828475b721492c3029b834931126af3cd015b2de87f3e7d56a866707d04b04dc36319f45f77fe5f3b650131c1e82a4e65d094288d8effe1893
|
||||
|
||||
@ -0,0 +1,201 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
CHECKREQS_DISK_BUILD="4G"
|
||||
KDE_DOC_DIR="xxx" # contains no language subdirs
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
KDE_TEST="forceoptional"
|
||||
inherit check-reqs kde5
|
||||
|
||||
DESCRIPTION="KDE Office Suite"
|
||||
HOMEPAGE="https://www.calligra.org/"
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
CAL_FTS=( karbon sheets stage words )
|
||||
|
||||
IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf
|
||||
phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
|
||||
|
||||
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
|
||||
# Required for the matlab/octave formula tool
|
||||
COMMON_DEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kcmutils)
|
||||
$(add_frameworks_dep kcodecs)
|
||||
$(add_frameworks_dep kcompletion)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kdelibs4support)
|
||||
$(add_frameworks_dep kemoticons)
|
||||
$(add_frameworks_dep kglobalaccel)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep kitemmodels)
|
||||
$(add_frameworks_dep kitemviews)
|
||||
$(add_frameworks_dep kjobwidgets)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep knotifyconfig)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep kross)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwallet)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_frameworks_dep sonnet)
|
||||
$(add_qt_dep designer)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtdeclarative)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork)
|
||||
$(add_qt_dep qtprintsupport)
|
||||
$(add_qt_dep qtscript)
|
||||
$(add_qt_dep qtsvg)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
dev-lang/perl
|
||||
sys-libs/zlib
|
||||
virtual/libiconv
|
||||
activities? ( $(add_frameworks_dep kactivities) )
|
||||
crypt? ( app-crypt/qca:2[qt5(+)] )
|
||||
fontconfig? ( media-libs/fontconfig )
|
||||
gemini? ( $(add_qt_dep qtdeclarative 'widgets') )
|
||||
gsl? ( sci-libs/gsl )
|
||||
import-filter? (
|
||||
$(add_frameworks_dep khtml)
|
||||
app-text/libetonyek
|
||||
app-text/libodfgen
|
||||
app-text/libwpd:*
|
||||
app-text/libwpg:*
|
||||
>=app-text/libwps-0.4
|
||||
dev-libs/librevenge
|
||||
media-libs/libvisio
|
||||
)
|
||||
lcms? (
|
||||
media-libs/ilmbase:=
|
||||
media-libs/lcms:2
|
||||
)
|
||||
openexr? ( media-libs/openexr )
|
||||
pdf? ( >=app-text/poppler-0.64:=[qt5] )
|
||||
phonon? ( media-libs/phonon[qt5(+)] )
|
||||
pim? ( $(add_kdeapps_dep kcalcore) )
|
||||
spacenav? ( dev-libs/libspnav )
|
||||
truetype? ( media-libs/freetype:2 )
|
||||
X? (
|
||||
$(add_qt_dep qtx11extras)
|
||||
x11-libs/libX11
|
||||
)
|
||||
calligra_features_sheets? ( dev-cpp/eigen:3 )
|
||||
calligra_features_stage? ( okular? ( $(add_kdeapps_dep okular) ) )
|
||||
calligra_features_words? (
|
||||
dev-libs/libxslt
|
||||
okular? ( $(add_kdeapps_dep okular) )
|
||||
)
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/boost
|
||||
sys-devel/gettext
|
||||
x11-misc/shared-mime-info
|
||||
test? ( $(add_frameworks_dep threadweaver) )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
|
||||
!app-office/calligra:4
|
||||
!app-office/calligra-l10n:4
|
||||
"
|
||||
RESTRICT+=" test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-no-arch-detection.patch
|
||||
"${FILESDIR}"/${P}-doc.patch
|
||||
"${FILESDIR}"/${P}-qt-5.11.patch
|
||||
"${FILESDIR}"/${P}-stage-qt-5.11.patch
|
||||
"${FILESDIR}"/${P}-poppler-0.69.patch
|
||||
"${FILESDIR}"/${P}-poppler-0.71.patch
|
||||
"${FILESDIR}"/${P}-no-webkit.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
kde5_pkg_setup
|
||||
check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
kde5_src_prepare
|
||||
|
||||
if ! use test; then
|
||||
sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
|
||||
-i libs/pigment/CMakeLists.txt || die
|
||||
fi
|
||||
|
||||
# Unconditionally disable deprecated deps (required by QtQuick1)
|
||||
punt_bogus_dep Qt5 Declarative
|
||||
punt_bogus_dep Qt5 OpenGL
|
||||
|
||||
# Hack around the excessive use of CMake macros
|
||||
if use okular && ! use calligra_features_words; then
|
||||
sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
|
||||
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
|
||||
fi
|
||||
|
||||
if use okular && ! use calligra_features_stage; then
|
||||
sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
|
||||
extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local cal_ft myproducts
|
||||
|
||||
# applications
|
||||
for cal_ft in ${CAL_FTS[@]}; do
|
||||
use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
|
||||
done
|
||||
|
||||
use lcms && myproducts+=( PLUGIN_COLORENGINES )
|
||||
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
|
||||
|
||||
local mycmakeargs=(
|
||||
-DPACKAGERS_BUILD=OFF
|
||||
-DRELEASE_BUILD=ON
|
||||
-DWITH_Iconv=ON
|
||||
-DPRODUCTSET="${myproducts[*]}"
|
||||
$(cmake-utils_use_find_package activities KF5Activities)
|
||||
-DWITH_Qca-qt5=$(usex crypt)
|
||||
-DWITH_Fontconfig=$(usex fontconfig)
|
||||
$(cmake-utils_use_find_package gemini Libgit2)
|
||||
$(cmake-utils_use_find_package gemini Qt5QuickWidgets)
|
||||
-DWITH_GSL=$(usex gsl)
|
||||
-DWITH_LibEtonyek=$(usex import-filter)
|
||||
-DWITH_LibOdfGen=$(usex import-filter)
|
||||
-DWITH_LibRevenge=$(usex import-filter)
|
||||
-DWITH_LibVisio=$(usex import-filter)
|
||||
-DWITH_LibWpd=$(usex import-filter)
|
||||
-DWITH_LibWpg=$(usex import-filter)
|
||||
-DWITH_LibWps=$(usex import-filter)
|
||||
$(cmake-utils_use_find_package phonon Phonon4Qt5)
|
||||
$(cmake-utils_use_find_package pim KF5CalendarCore)
|
||||
-DWITH_LCMS2=$(usex lcms)
|
||||
-DWITH_Okular5=$(usex okular)
|
||||
-DWITH_OpenEXR=$(usex openexr)
|
||||
-DWITH_Poppler=$(usex pdf)
|
||||
-DWITH_Eigen3=$(usex calligra_features_sheets)
|
||||
-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
|
||||
-ENABLE_CSTESTER_TESTING=$(usex test)
|
||||
-DWITH_Freetype=$(usex truetype)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001
|
||||
From: Dag Andersen <danders@get2net.dk>
|
||||
Date: Mon, 22 Oct 2018 09:41:53 +0200
|
||||
Subject: Stage does not use WebKit, so remove
|
||||
|
||||
---
|
||||
CMakeLists.txt | 21 +--------------------
|
||||
stage/part/CMakeLists.txt | 1 -
|
||||
2 files changed, 1 insertion(+), 21 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8b148c0..1e29140 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
|
||||
Quick
|
||||
QuickWidgets
|
||||
Sql
|
||||
- WebKit
|
||||
-# WebKitWidgets
|
||||
-)
|
||||
-message("**********************************************************************************************************************")
|
||||
-message("**********************************************************************************************************************")
|
||||
-message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.")
|
||||
-message("**********************************************************************************************************************")
|
||||
-message("**********************************************************************************************************************")
|
||||
+)
|
||||
|
||||
# Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
|
||||
# Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
|
||||
@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES
|
||||
PURPOSE "Required for Braindump's Web shape"
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
-set_package_properties(Qt5WebKitWidget PROPERTIES
|
||||
- PURPOSE "Required for Stage"
|
||||
- TYPE RECOMMENDED
|
||||
-)
|
||||
-
|
||||
-if(Qt5WebKit_FOUND)
|
||||
- add_definitions( -DCAN_USE_QTWEBKIT )
|
||||
-endif()
|
||||
|
||||
set(HAVE_OPENGL ${Qt5OpenGL_FOUND})
|
||||
|
||||
@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF
|
||||
Soprano_FOUND "Soprano not found"
|
||||
)
|
||||
|
||||
-# calligra_drop_product_on_bad_condition( PART_STAGE
|
||||
-# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found"
|
||||
-# )
|
||||
-
|
||||
calligra_drop_product_on_bad_condition( PART_SHEETS
|
||||
EIGEN3_FOUND "Eigen devel not found"
|
||||
)
|
||||
diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt
|
||||
index d6000a1..9bdc840 100644
|
||||
--- a/stage/part/CMakeLists.txt
|
||||
+++ b/stage/part/CMakeLists.txt
|
||||
@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate
|
||||
KF5::IconThemes
|
||||
KF5::Completion
|
||||
Qt5::Svg
|
||||
-# Qt5::WebKitWidgets
|
||||
)
|
||||
if(HAVE_OPENGL)
|
||||
target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL)
|
||||
--
|
||||
cgit v1.1
|
||||
@ -0,0 +1,83 @@
|
||||
From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Wed, 24 Oct 2018 08:28:00 +0200
|
||||
Subject: Fix build with poppler>=0.69
|
||||
|
||||
Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D16388
|
||||
---
|
||||
filters/karbon/pdf/PdfImport.cpp | 3 ---
|
||||
filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
|
||||
filters/karbon/pdf/SvgOutputDev.h | 2 +-
|
||||
3 files changed, 5 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
|
||||
index c3e96b0..48b08df 100644
|
||||
--- a/filters/karbon/pdf/PdfImport.cpp
|
||||
+++ b/filters/karbon/pdf/PdfImport.cpp
|
||||
@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
delete globalParams;
|
||||
globalParams = 0;
|
||||
|
||||
- // check for memory leaks
|
||||
- Object::memCheck(stderr);
|
||||
-
|
||||
return KoFilter::OK;
|
||||
}
|
||||
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
index 931917a..7901317 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix)
|
||||
.arg(matrix.dx()) .arg(matrix.dy());
|
||||
}
|
||||
|
||||
-QString SvgOutputDev::convertMatrix(double * matrix)
|
||||
+QString SvgOutputDev::convertMatrix(const double * matrix)
|
||||
{
|
||||
return QString("matrix(%1 %2 %3 %4 %5 %6)")
|
||||
.arg(matrix[0]).arg(matrix[1])
|
||||
@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
|
||||
QString str;
|
||||
|
||||
- char * p = s->getCString();
|
||||
+ const char * p = s->getCString();
|
||||
int len = s->getLength();
|
||||
CharCode code;
|
||||
Unicode *u = nullptr;
|
||||
@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
double x = state->getCurX();
|
||||
double y = state->getCurY();
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
|
||||
|
||||
QMatrix mirror;
|
||||
@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
|
||||
return;
|
||||
}
|
||||
|
||||
- double * ctm = state->getCTM();
|
||||
+ const double * ctm = state->getCTM();
|
||||
QMatrix m;
|
||||
m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
|
||||
|
||||
diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
|
||||
index 85fe55d..2a44908 100644
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.h
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.h
|
||||
@@ -84,7 +84,7 @@ public:
|
||||
private:
|
||||
QString convertPath(GfxPath *path);
|
||||
QString convertMatrix(const QMatrix &matrix);
|
||||
- QString convertMatrix(double * matrix);
|
||||
+ QString convertMatrix(const double * matrix);
|
||||
QString printFill();
|
||||
QString printStroke();
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
@ -0,0 +1,202 @@
|
||||
From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Thu, 25 Oct 2018 23:04:39 +0200
|
||||
Subject: Mark the functions as override
|
||||
|
||||
So when poppler API breaks (as it often does) it stops compiling and
|
||||
someone has to fix it
|
||||
|
||||
From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Thu, 25 Oct 2018 23:06:34 +0200
|
||||
Subject: GBool -> bool
|
||||
|
||||
It was just a typedef in poppler and it'll die in next versions
|
||||
|
||||
From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Rojas <arojas@archlinux.org>
|
||||
Date: Fri, 2 Nov 2018 21:23:13 +0100
|
||||
Subject: Fix build with poppler 0.71
|
||||
|
||||
Port away from removed API
|
||||
|
||||
diff -u a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
{
|
||||
public:
|
||||
Private(const QString &fname)
|
||||
- : svgFile(fname), defs(0), body(0), state(gTrue)
|
||||
+ : svgFile(fname), defs(0), body(0), state(true)
|
||||
, brush(Qt::SolidPattern) {}
|
||||
|
||||
~Private() {
|
||||
@@ -52,7 +52,7 @@
|
||||
QString defsData;
|
||||
QTextStream * defs;
|
||||
QTextStream * body;
|
||||
- GBool state;
|
||||
+ bool state;
|
||||
QSizeF pageSize;
|
||||
QPen pen;
|
||||
QBrush brush;
|
||||
@@ -62,7 +62,7 @@
|
||||
: d(new Private(fileName))
|
||||
{
|
||||
if (! d->svgFile.open(QIODevice::WriteOnly)) {
|
||||
- d->state = gFalse;
|
||||
+ d->state = false;
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -75,24 +75,24 @@
|
||||
delete d;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::isOk()
|
||||
+bool SvgOutputDev::isOk()
|
||||
{
|
||||
return d->state;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::upsideDown()
|
||||
+bool SvgOutputDev::upsideDown()
|
||||
{
|
||||
- return gTrue;
|
||||
+ return true;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::useDrawChar()
|
||||
+bool SvgOutputDev::useDrawChar()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
-GBool SvgOutputDev::interpretType3Chars()
|
||||
+bool SvgOutputDev::interpretType3Chars()
|
||||
{
|
||||
- return gFalse;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
|
||||
@@ -387,7 +387,7 @@
|
||||
return stroke;
|
||||
}
|
||||
|
||||
-void SvgOutputDev::drawString(GfxState * state, GooString * s)
|
||||
+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
|
||||
{
|
||||
int render = state->getRender();
|
||||
// check for invisible text -- this is used by Acrobat Capture
|
||||
@@ -476,7 +476,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
|
||||
|
||||
void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool /*inlineImg*/)
|
||||
+ bool /*interpolate*/, int *maskColors, bool inlineImg)
|
||||
{
|
||||
ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
|
||||
imgStr->reset();
|
||||
@@ -550,7 +549,0 @@
|
||||
-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
|
||||
-{
|
||||
- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
|
||||
-}
|
||||
-
|
||||
|
||||
--- a/filters/karbon/pdf/SvgOutputDev.h
|
||||
+++ b/filters/karbon/pdf/SvgOutputDev.h
|
||||
@@ -20,11 +20,6 @@
|
||||
#ifndef SVGOUTPUTDEV_H
|
||||
#define SVGOUTPUTDEV_H
|
||||
|
||||
-// Don't show this warning: it's an issue in poppler
|
||||
-#ifdef __GNUC__
|
||||
-#pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
-#endif
|
||||
-
|
||||
#include <poppler/Object.h>
|
||||
#include <poppler/OutputDev.h>
|
||||
|
||||
@@ -44,40 +44,37 @@
|
||||
explicit SvgOutputDev(const QString &fileName);
|
||||
virtual ~SvgOutputDev();
|
||||
|
||||
- GBool isOk();
|
||||
+ bool isOk();
|
||||
|
||||
- virtual GBool upsideDown();
|
||||
- virtual GBool useDrawChar();
|
||||
- virtual GBool interpretType3Chars();
|
||||
- virtual void startPage(int pageNum, GfxState *state, XRef *xref);
|
||||
- virtual void endPage();
|
||||
+ bool upsideDown() override;
|
||||
+ bool useDrawChar() override;
|
||||
+ bool interpretType3Chars() override;
|
||||
+ void startPage(int pageNum, GfxState *state, XRef *xref) override;
|
||||
+ void endPage() override;
|
||||
|
||||
// path painting
|
||||
- virtual void stroke(GfxState * state);
|
||||
- virtual void fill(GfxState * state);
|
||||
- virtual void eoFill(GfxState *state);
|
||||
+ void stroke(GfxState * state) override;
|
||||
+ void fill(GfxState * state) override;
|
||||
+ void eoFill(GfxState *state) override;
|
||||
|
||||
// text
|
||||
- virtual void drawString(GfxState * state, GooString * s);
|
||||
+ void drawString(GfxState * state, const GooString * s) override;
|
||||
|
||||
// images
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
+ void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
int width, int height, GfxImageColorMap *colorMap,
|
||||
- int *maskColors, GBool inlineImg);
|
||||
- virtual void drawImage(GfxState *state, Object *ref, Stream *str,
|
||||
- int width, int height, GfxImageColorMap *colorMap,
|
||||
- GBool interpolate, int *maskColors, GBool inlineImg);
|
||||
+ bool interpolate, int *maskColors, bool inlineImg) override;
|
||||
|
||||
// styles
|
||||
- virtual void updateAll(GfxState *state);
|
||||
- virtual void updateFillColor(GfxState *state);
|
||||
- virtual void updateStrokeColor(GfxState *state);
|
||||
- virtual void updateFillOpacity(GfxState *state);
|
||||
- virtual void updateStrokeOpacity(GfxState *state);
|
||||
- virtual void updateLineJoin(GfxState *state);
|
||||
- virtual void updateLineCap(GfxState *state);
|
||||
- virtual void updateMiterLimit(GfxState *state);
|
||||
- virtual void updateLineWidth(GfxState *state);
|
||||
+ void updateAll(GfxState *state) override;
|
||||
+ void updateFillColor(GfxState *state) override;
|
||||
+ void updateStrokeColor(GfxState *state) override;
|
||||
+ void updateFillOpacity(GfxState *state) override;
|
||||
+ void updateStrokeOpacity(GfxState *state) override;
|
||||
+ void updateLineJoin(GfxState *state) override;
|
||||
+ void updateLineCap(GfxState *state) override;
|
||||
+ void updateMiterLimit(GfxState *state) override;
|
||||
+ void updateLineWidth(GfxState *state) override;
|
||||
|
||||
/// Dumps content to svg file
|
||||
void dumpContent();
|
||||
--- a/filters/karbon/pdf/PdfImport.cpp
|
||||
+++ b/filters/karbon/pdf/PdfImport.cpp
|
||||
@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt
|
||||
SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
|
||||
if (dev->isOk()) {
|
||||
int rotate = 0;
|
||||
- GBool useMediaBox = gTrue;
|
||||
- GBool crop = gFalse;
|
||||
- GBool printing = gFalse;
|
||||
+ bool useMediaBox = true;
|
||||
+ bool crop = false;
|
||||
+ bool printing = false;
|
||||
pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
|
||||
dev->dumpContent();
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c
|
||||
AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10
|
||||
DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
|
||||
EBUILD calligraplan-3.1.0.ebuild 2733 BLAKE2B fab64b817ba416775901ffa2615a7c9917b4105b9753fdaf2ed02da7f597e7c840173093db27fa31556cead1f6bf2590aab3d6f5c11be63adffc5e10c86bc07c SHA512 d134ca1bee68974627e8bf1ec9259cbdc62ab164801c2895a1c2532ff2a30f64723bf5fbe5051b4d4da6e53c7181c9d637f4139edfb13abbb3a1202ec8a2b4dc
|
||||
MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02
|
||||
@ -0,0 +1,105 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
KDE_TEST="forceoptional"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Project management application"
|
||||
HOMEPAGE="https://www.calligra.org/"
|
||||
SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="activities +holidays kwallet pim X"
|
||||
|
||||
# FIXME: Disabled by upstream for good reason
|
||||
# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
|
||||
# $(add_kdeapps_dep akonadi)
|
||||
# $(add_kdeapps_dep akonadi-contacts)
|
||||
# Currently upstream-disabled in plan
|
||||
# =dev-libs/kproperty-3.0*:5
|
||||
# =dev-libs/kreport-3.0*:5
|
||||
DEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kdbusaddons)
|
||||
$(add_frameworks_dep kglobalaccel)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep khtml)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep kitemviews)
|
||||
$(add_frameworks_dep kjobwidgets)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep kservice)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_qt_dep designer)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtprintsupport)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
dev-lang/perl
|
||||
dev-libs/kdiagram:5
|
||||
sys-libs/zlib
|
||||
activities? ( $(add_frameworks_dep kactivities) )
|
||||
holidays? ( $(add_frameworks_dep kholidays) )
|
||||
kwallet? (
|
||||
$(add_frameworks_dep kwallet)
|
||||
app-crypt/qca:2[qt5(+)]
|
||||
)
|
||||
pim? (
|
||||
$(add_kdeapps_dep kcalcore)
|
||||
$(add_kdeapps_dep kcontacts)
|
||||
)
|
||||
X? (
|
||||
$(add_qt_dep qtx11extras)
|
||||
x11-libs/libX11
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
!app-office/calligra[calligra_features_plan(-)]
|
||||
!app-office/calligra-l10n:4
|
||||
$(add_qt_dep qtsvg)
|
||||
"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-qt-5.11.patch
|
||||
"${FILESDIR}"/${P}-qca.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
kde5_src_prepare
|
||||
# Unconditionally disable deprecated deps
|
||||
punt_bogus_dep Qt5 OpenGL
|
||||
# FIXME: disable bogus deps
|
||||
punt_bogus_dep KF5 KCMUtils
|
||||
punt_bogus_dep Qt5 Network
|
||||
punt_bogus_dep Qt5 Svg
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package activities KF5Activities)
|
||||
$(cmake-utils_use_find_package holidays KF5Holidays)
|
||||
$(cmake-utils_use_find_package pim KF5CalendarCore)
|
||||
$(cmake-utils_use_find_package pim KF5Contacts)
|
||||
$(cmake-utils_use_find_package kwallet Qca-qt5)
|
||||
$(cmake-utils_use_find_package kwallet KF5Wallet)
|
||||
)
|
||||
# Qt5DBus can't be disabled because of KF5DBusAddons dependency
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
@ -0,0 +1,127 @@
|
||||
From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Tue, 1 Jan 2019 19:19:19 +0100
|
||||
Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
|
||||
optional
|
||||
|
||||
---
|
||||
CMakeLists.txt | 18 +++++++++++++++++-
|
||||
src/libs/store/CMakeLists.txt | 15 +++++++--------
|
||||
2 files changed, 24 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index eed9d3c..3cb4b63 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
|
||||
Parts
|
||||
# Sonnet
|
||||
TextWidgets
|
||||
- Wallet
|
||||
WidgetsAddons
|
||||
WindowSystem
|
||||
XmlGui
|
||||
@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
|
||||
TYPE REQUIRED
|
||||
)
|
||||
|
||||
+##
|
||||
+## Test for QCA2
|
||||
+##
|
||||
+macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
|
||||
+set_package_properties(Qca-qt5 PROPERTIES
|
||||
+ DESCRIPTION "Qt Cryptographic Architecture"
|
||||
+ URL "https:/download.kde.org/stable/qca-qt5"
|
||||
+ PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
|
||||
+ TYPE OPTIONAL
|
||||
+)
|
||||
+
|
||||
+find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
|
||||
+
|
||||
+if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
|
||||
+ add_definitions( -DQCA2 )
|
||||
+endif()
|
||||
+
|
||||
find_package(Perl REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
|
||||
diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
|
||||
index 2c96fa7..f998264 100644
|
||||
--- a/src/libs/store/CMakeLists.txt
|
||||
+++ b/src/libs/store/CMakeLists.txt
|
||||
@@ -4,14 +4,8 @@ endif()
|
||||
|
||||
########### libkostore ###############
|
||||
|
||||
-if( Qca-qt5_FOUND )
|
||||
- add_definitions( -DQCA2 )
|
||||
-endif()
|
||||
-
|
||||
set(kostore_LIB_SRCS
|
||||
KoDirectoryStore.cpp
|
||||
- KoEncryptedStore.cpp
|
||||
- KoEncryptionChecker.cpp
|
||||
KoLZF.cpp
|
||||
KoStore.cpp
|
||||
KoStoreDevice.cpp
|
||||
@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
|
||||
StoreDebug.cpp
|
||||
KoNetAccess.cpp # temporary while porting
|
||||
)
|
||||
+if( Qca-qt5_FOUND )
|
||||
+ set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
|
||||
+ KoEncryptedStore.cpp
|
||||
+ KoEncryptionChecker.cpp
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
add_library(planstore SHARED ${kostore_LIB_SRCS})
|
||||
generate_export_header(planstore BASE_NAME kostore)
|
||||
@@ -35,12 +35,11 @@ target_link_libraries(planstore
|
||||
PRIVATE
|
||||
Qt5::Gui
|
||||
KF5::Archive
|
||||
- KF5::Wallet
|
||||
KF5::KIOWidgets
|
||||
KF5::I18n
|
||||
)
|
||||
if( Qca-qt5_FOUND )
|
||||
- target_link_libraries(planstore PRIVATE qca-qt5)
|
||||
+ target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
|
||||
endif()
|
||||
|
||||
set_target_properties(planstore PROPERTIES
|
||||
diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
|
||||
index 1615a61..55e2c32 100644
|
||||
--- a/src/libs/widgets/KoDocumentInfoDlg.cpp
|
||||
+++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
|
||||
@@ -26,7 +26,9 @@
|
||||
#include "KoDocumentInfo.h"
|
||||
#include "KoDocumentBase.h"
|
||||
#include "KoGlobal.h"
|
||||
+#ifdef QCA2
|
||||
#include <KoEncryptionChecker.h>
|
||||
+#endif
|
||||
#include "KoPageWidgetItem.h"
|
||||
//#include <KoDocumentRdfBase.h>
|
||||
#include <KoIcon.h>
|
||||
@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
|
||||
d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
|
||||
QWidget *infodlg = new QWidget();
|
||||
d->aboutUi->setupUi(infodlg);
|
||||
+#ifdef QCA2
|
||||
if (!KoEncryptionChecker::isEncryptionSupported()) {
|
||||
+#endif
|
||||
d->aboutUi->lblEncryptedDesc->setVisible(false);
|
||||
d->aboutUi->lblEncrypted->setVisible(false);
|
||||
d->aboutUi->pbEncrypt->setVisible(false);
|
||||
d->aboutUi->lblEncryptedPic->setVisible(false);
|
||||
+#ifdef QCA2
|
||||
}
|
||||
+#endif
|
||||
d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
|
||||
d->aboutUi->cbLanguage->setCurrentIndex(-1);
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -0,0 +1,124 @@
|
||||
From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
|
||||
Date: Sun, 18 Mar 2018 11:56:57 +0100
|
||||
Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
|
||||
|
||||
Reviewers: #calligra:_3.0
|
||||
|
||||
Tags: #calligra:_3.0
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D11454
|
||||
---
|
||||
src/kptview.h | 1 +
|
||||
src/kptviewlist.cpp | 1 +
|
||||
src/libs/ui/kptaccountseditor.cpp | 1 +
|
||||
src/libs/ui/kptdocumentspanel.h | 1 +
|
||||
src/libs/ui/kptitemviewsettup.cpp | 2 +-
|
||||
src/libs/ui/kpttaskeditor.cpp | 1 +
|
||||
src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
|
||||
src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
|
||||
15 files changed, 18 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kptview.h b/src/kptview.h
|
||||
index 44d11935e71..a98e55342db 100644
|
||||
--- a/src/kptview.h
|
||||
+++ b/src/kptview.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "kptcontext.h"
|
||||
#include "kptviewbase.h"
|
||||
|
||||
+#include <QActionGroup>
|
||||
#include <QDockWidget>
|
||||
#include <QMap>
|
||||
|
||||
diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
|
||||
index f34e702e055..0e6db7b2ffe 100644
|
||||
--- a/src/kptviewlist.cpp
|
||||
+++ b/src/kptviewlist.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <QStyle>
|
||||
#include <QBrush>
|
||||
#include <QContextMenuEvent>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
#include <kmessagebox.h>
|
||||
diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
|
||||
index 7991fafd779..54e3a87c94f 100644
|
||||
--- a/src/libs/ui/kptaccountseditor.cpp
|
||||
+++ b/src/libs/ui/kptaccountseditor.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <QContextMenuEvent>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
|
||||
#include <KLocalizedString>
|
||||
#include <kactioncollection.h>
|
||||
diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
|
||||
index 00ea3af80b2..491cb1ebb86 100644
|
||||
--- a/src/libs/ui/kptdocumentspanel.h
|
||||
+++ b/src/libs/ui/kptdocumentspanel.h
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include "kptdocuments.h"
|
||||
|
||||
+#include <QModelIndexList>
|
||||
#include <QWidget>
|
||||
#include <kundo2qstack.h>
|
||||
|
||||
diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
|
||||
index d1c3b1fc157..7c97a070b9a 100644
|
||||
--- a/src/libs/ui/kptitemviewsettup.cpp
|
||||
+++ b/src/libs/ui/kptitemviewsettup.cpp
|
||||
@@ -25,9 +25,9 @@
|
||||
|
||||
#include "KoPageLayoutWidget.h"
|
||||
|
||||
+#include <QHeaderView>
|
||||
#include <QPushButton>
|
||||
|
||||
-
|
||||
namespace KPlato
|
||||
{
|
||||
|
||||
diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
|
||||
index 21546118d33..91db5acbb18 100644
|
||||
--- a/src/libs/ui/kpttaskeditor.cpp
|
||||
+++ b/src/libs/ui/kpttaskeditor.cpp
|
||||
@@ -45,6 +45,7 @@
|
||||
#include <QVBoxLayout>
|
||||
#include <QDragMoveEvent>
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QMenu>
|
||||
|
||||
#include <kactionmenu.h>
|
||||
diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
index 344ebc2b599..9146f06ab8c 100644
|
||||
--- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <KFile>
|
||||
|
||||
#include <QAction>
|
||||
+#include <QHeaderView>
|
||||
#include <QTreeView>
|
||||
#include <QStandardItemModel>
|
||||
#include <QModelIndex>
|
||||
diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
index c9e17b748a9..b67e9848807 100644
|
||||
--- a/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
+++ b/src/libs/widgets/KoPageLayoutWidget.cpp
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
#include <KoUnit.h>
|
||||
|
||||
+#include <QButtonGroup>
|
||||
+
|
||||
class Q_DECL_HIDDEN KoPageLayoutWidget::Private
|
||||
{
|
||||
public:
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>kde@gentoo.org</email>
|
||||
<name>Gentoo KDE Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>office@gentoo.org</email>
|
||||
<name>Gentoo Office project</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="activities">Enable kactivities support</flag>
|
||||
<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
|
||||
<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
|
||||
<flag name="pim">Enable support for KDE PIM resources integration</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,3 @@
|
||||
DIST moneyguru-2.13.1.tar.gz 1665892 BLAKE2B 969286130c5336f4c41ccf0ee3cbfe55a13560f753e137ff5370184c5aff3e038995c79ad48620a5653552406ea6fb56d356a209cd36774751db4f8e3777354c SHA512 9544a2fe17d0c1d4a6f1ee6c52c79e66ca76da6a6ac35067f1961fe2b44a8efe20173ee5932a91adeeebcb0a522b544df11ad388cb4c453a0641060d75f2a17c
|
||||
EBUILD moneyguru-2.13.1.ebuild 933 BLAKE2B 5d0942c18322103220ead22dd78cef0e2aae4faf9f436a58407b50473515de6830e144650063823acf657b0622cdd63453173147201264cc57648ac75ba09eed SHA512 b447088bc3edb64c0672e887cf3e3c4b05ff48d4b80faa45720bcae57e8a8c82b6fcaa0c2deae82edeedfa8708438510d426e53d80c43491586e2258fdf60c58
|
||||
MISC metadata.xml 327 BLAKE2B f5321e18ece590533473467467f84d9ad63c202d2249c469f88d9896ef635625e3ee48f3497d81fe9e418e8819fb06b4609684279223978a366332163b25c1c9 SHA512 b0d34d5ba1be127bc8ffbe8f712b8f469333517bc288d471e365106876ed7db0a411c96520b606fefdb273495d1f75cdd4c6caa131fba2aec2483ff39e099fb4
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>vdurpas@gentoo.org</email>
|
||||
<name>Virgil Dupras</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">hsoft/moneyguru</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{5,6,7} )
|
||||
|
||||
inherit python-single-r1
|
||||
|
||||
DESCRIPTION="Future-aware personal finances management"
|
||||
HOMEPAGE="https://hardcoded.net/moneyguru"
|
||||
SRC_URI="https://download.hardcoded.net/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
dev-db/sqlite:3
|
||||
dev-libs/glib:2
|
||||
dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,printsupport]
|
||||
dev-qt/qttranslations"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-util/cunit
|
||||
)"
|
||||
|
||||
_emake() {
|
||||
emake CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" \
|
||||
SHEBANG="${PYTHON}" \
|
||||
DESTDIR="${ED}" \
|
||||
PREFIX=/usr \
|
||||
$@
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
_emake
|
||||
}
|
||||
|
||||
src_install() {
|
||||
_emake install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -C ccore CFLAGS="\$(DEFAULT_CFLAGS) ${CFLAGS}" tests
|
||||
pytest -vv core || die "Tests failed with ${EPYTHON}"
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue