From dd762ff83c330186ee2ede002e08b2f780cddd51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 14 Jul 2019 11:04:34 +0100 Subject: gentoo resync : 14.07.2019 --- app-arch/Manifest.gz | Bin 16415 -> 16425 bytes app-arch/dump/Manifest | 2 + app-arch/dump/dump-0.4.46-r1.ebuild | 87 ++++++++++++++++++++++ app-arch/dump/files/dump-0.4.46-openssl11.patch | 91 ++++++++++++++++++++++++ app-arch/gcab/Manifest | 2 +- app-arch/gcab/gcab-1.2.ebuild | 2 +- app-arch/hardlink/Manifest | 2 - app-arch/hardlink/hardlink-0.2.0.ebuild | 40 ----------- 8 files changed, 182 insertions(+), 44 deletions(-) create mode 100644 app-arch/dump/dump-0.4.46-r1.ebuild create mode 100644 app-arch/dump/files/dump-0.4.46-openssl11.patch delete mode 100644 app-arch/hardlink/hardlink-0.2.0.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index bb5cd05739f6..d44e1213cf19 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest index 9db1c61ad7a7..7801d4424b46 100644 --- a/app-arch/dump/Manifest +++ b/app-arch/dump/Manifest @@ -1,3 +1,5 @@ +AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d +EBUILD dump-0.4.46-r1.ebuild 2163 BLAKE2B 5f635773a87a38f5fdb9572cfcc515d5eebe6c6348a3c6912a5f683beb0818a4517d9fbe9b4eec5470a10219a5231f1a783552b7cbec56a10e51b552ffcd6ae6 SHA512 b5f9a6ae66f66b6a242f35e7dd45770ab4fd7982feb8ded709e8be6fff10c00935cd046d1000927ab948f9a6413060e4b2bd179c363ab2e2ae24b5e4e0fa7047 EBUILD dump-0.4.46.ebuild 2113 BLAKE2B 431fd8ae0fa1c3b28015f27687c28f43a8d6fcb205c97a99f3d4ee1e96d3da7683456f02e4683b85c202848ddcc9efdaac85b63f31e0a4ad5fbf2d430465a8b5 SHA512 b99325a0d0cee4599e2e00ed40ea4a49050321c7b11d6fc2416dafa7b2dff56896d7861940ed009393e73dd514beb9f2b9c7e4c494664ed9c517987844ffba90 MISC metadata.xml 542 BLAKE2B beff8763f8b3848f9592dbf200cb547e9c416e7d675b4e9015f20b417861523949916da4a6a38553abf7fdf5fc839841870f74258becb4e8dbbcbca9c564e328 SHA512 670b1e0032f69e22337cbd18c25ecda11a239d63345c32526e111ad2eb23199892aa7e1f39a79168bb4b81b6ebde4c7796f8ccf78233f3244bfbaf62c7e0345d diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild new file mode 100644 index 000000000000..f984ca0ef78b --- /dev/null +++ b/app-arch/dump/dump-0.4.46-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit versionator + +MY_P="${PN}-$(replace_version_separator 2 b)" +S=${WORKDIR}/${MY_P} +DESCRIPTION="Dump/restore ext2fs backup utilities" +HOMEPAGE="http://dump.sourceforge.net/" +SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +# We keep uuid USE flag default dsiabled for this version. Don't forget +# to default enable it for later versions as this is the upstream default. +IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib" +REQUIRED_USE=" + ermt? ( ssl ) + ssl? ( zlib ) + test? ( sqlite? ( uuid ) ) +" + +RDEPEND=">=sys-fs/e2fsprogs-1.27:= + >=sys-libs/e2fsprogs-libs-1.27:= + sys-apps/util-linux + bzip2? ( >=app-arch/bzip2-1.0.2:= ) + zlib? ( >=sys-libs/zlib-1.1.4:= ) + lzo? ( dev-libs/lzo:2= ) + sqlite? ( dev-db/sqlite:3= ) + ermt? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + readline? ( + sys-libs/readline:0= + sys-libs/ncurses:= + static? ( sys-libs/ncurses:=[static-libs] ) + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + virtual/os-headers" + +PATCHES=( "${FILESDIR}"/${P}-openssl11.patch ) + +src_configure() { + local myeconfargs=( + --with-dumpdatespath=/etc/dumpdates + --with-rmtpath='$(sbindir)/rmt' + --enable-blkid + $(use_enable bzip2) + $(use_enable debug) + $(use_enable ermt) + $(use_enable lzo) + $(use_enable readline) + $(use_enable selinux) + $(use_enable sqlite) + $(use_enable ssl) + $(use_enable static static-progs) + $(use_enable uuid) + $(use_enable zlib) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + mv "${ED}"/usr/sbin/{,dump-}rmt || die + mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die + use ermt && newsbin rmt/ermt dump-ermt + + dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS + dodoc -r examples +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'." + ewarn "This is to avoid conflicts with app-arch/tar 'rmt'." + fi +} diff --git a/app-arch/dump/files/dump-0.4.46-openssl11.patch b/app-arch/dump/files/dump-0.4.46-openssl11.patch new file mode 100644 index 000000000000..db18e8190f5c --- /dev/null +++ b/app-arch/dump/files/dump-0.4.46-openssl11.patch @@ -0,0 +1,91 @@ +Index: dump-0.4b46/common/transformation_ssl.c +=================================================================== +--- dump-0.4b46.orig/common/transformation_ssl.c ++++ dump-0.4b46/common/transformation_ssl.c +@@ -215,7 +215,10 @@ generateIV(Transformation *xform, unsign + /* to be exposed to any attacker anyway. */ + *saltlen = 16; + if (xform->enc == 1) { +- RAND_pseudo_bytes(salt, *saltlen); ++ if (!RAND_bytes(salt, *saltlen) != 1) { ++ /* PRNG not sufficiently seeded */ ++ return -1; ++ } + } + memcpy(ivbuffer, salt, 16); + +@@ -274,7 +277,7 @@ ssl_compress(Transformation *xform, stru + digestlen = sizeof(digest); + + /* generate salt, put it in header */ +- generateIV(xform, salt, &saltlen, iv, &ivlen); ++ generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */ + memcpy(tpbin->buf, salt, saltlen); + + /* compress the buffer first - increase the entropy */ +@@ -351,7 +354,7 @@ ssl_decompress(Transformation *xform, st + + // how to know salt length? + memcpy(salt, src, saltlen); +- generateIV(xform, salt, &saltlen, iv, &ivlen); ++ generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */ + + EVP_DecryptInit_ex(xform->state.ssl.dataCtx, xform->state.ssl.cipher, xform->state.ssl.engine, NULL, NULL); + //EVP_CIPHER_CTX_set_key_length(&ctx, 8); +@@ -515,7 +518,7 @@ Transformation + //EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key); + //EVP_CIPHER_CTX_cleanup(ctx); + //EVP_CIPHER_CTX_free(ctx); +- RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len); ++ RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher)); + } else { + // how do we get keys? + } +Index: dump-0.4b46/rmt/cipher.c +=================================================================== +--- dump-0.4b46.orig/rmt/cipher.c ++++ dump-0.4b46/rmt/cipher.c +@@ -23,7 +23,7 @@ + char * + cipher(char *buf, int buflen, int do_encrypt) + { +- static EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); + static char *out = NULL; /* return value, grown as necessary */ + static int outlen = 0; + static int init = 0, which, blocksize; +@@ -71,13 +71,13 @@ cipher(char *buf, int buflen, int do_enc + } + EVP_BytesToKey(cipher, EVP_md5(), NULL, + buf, strlen(buf), 1, key, iv); +- EVP_CIPHER_CTX_init(&ctx); +- EVP_CipherInit_ex(&ctx, cipher, NULL, key, iv, do_encrypt); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); // -nopad ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, do_encrypt); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); // -nopad + OPENSSL_cleanse(buf, sizeof buf); + OPENSSL_cleanse(key, sizeof key); + OPENSSL_cleanse(iv, sizeof iv); +- blocksize = EVP_CIPHER_CTX_block_size(&ctx); ++ blocksize = EVP_CIPHER_CTX_block_size(ctx); + which = do_encrypt; + init = 1; + } +@@ -95,7 +95,7 @@ cipher(char *buf, int buflen, int do_enc + outlen = (buflen+blocksize) * 2; + out = realloc(out, outlen); + } +- if (!EVP_CipherUpdate(&ctx, out, &n, buf, buflen)) { ++ if (!EVP_CipherUpdate(ctx, out, &n, buf, buflen)) { + syslog(LOG_ERR, "EVP_CipherUpdate failed"); + errno = EINVAL; + return NULL; +@@ -106,6 +106,7 @@ cipher(char *buf, int buflen, int do_enc + return NULL; + } + // assert(ctx->buf_len == 0); ++ EVP_CIPHER_CTX_free(ctx); + return out; + } + diff --git a/app-arch/gcab/Manifest b/app-arch/gcab/Manifest index 136395a7803a..934be68a6e60 100644 --- a/app-arch/gcab/Manifest +++ b/app-arch/gcab/Manifest @@ -2,5 +2,5 @@ AUX 1.2-optional-vapi.patch 1417 BLAKE2B 69bb7480a352894ec9c96f0566972a87004801a DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2 DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64 EBUILD gcab-0.8.ebuild 924 BLAKE2B e1d26430d255f52f12ae93d5a5b034e384aa049ef75bea44c9dee082519f6cc166d8e4dd9dd2041879397d896d375aefff345578c96a5c9a1e712e1ee05107b1 SHA512 af2f575805991c4737106b77212c9b3f241bcf6fdc0ddd50fa497c6e6e4d6bf3a61dad3800512b19e3028016fc226f0cfe777d72edc57da2afb45add3f398795 -EBUILD gcab-1.2.ebuild 1145 BLAKE2B 302866d4b7b07a13c2738300648d9a3fa06f33ca44e984293b23923d7bc2a6f21ee82d9e589ecba94fba4d14efec0ac897bcadb1a0bda2df918de57f978856f7 SHA512 5b41f2787c730419aad15133e2d91b8698e0e2c49a51a7c1e023d207b40a316b8f8aadd8c17667a92cee2ea3f62ca73eb3c4f2a270d0bed81ea355faa9c9d09c +EBUILD gcab-1.2.ebuild 1144 BLAKE2B 6a3c33843b194eb03b929478472d139e35152f80dd466b95b320b6c4089a81b4e0d8e1b99c1ba8a9dbb3d76e792ed60925bde29e0742cc4ee37ac90a525a8c88 SHA512 28030c1f3dad612c89c732657a2b2345cfe0f888c366c8ec814f528abaadbe9365f892cc5b62c41a78040b4e11d5a9a51d0b6d475a6efcc5a1d25038cd9fec79 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/app-arch/gcab/gcab-1.2.ebuild b/app-arch/gcab/gcab-1.2.ebuild index d5ac8f9cb2c6..870507f4b164 100644 --- a/app-arch/gcab/gcab-1.2.ebuild +++ b/app-arch/gcab/gcab-1.2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="gtk-doc +introspection test vala" REQUIRED_USE="vala? ( introspection )" diff --git a/app-arch/hardlink/Manifest b/app-arch/hardlink/Manifest index 518bd46231fc..d22a523e76c8 100644 --- a/app-arch/hardlink/Manifest +++ b/app-arch/hardlink/Manifest @@ -1,5 +1,3 @@ DIST hardlink-0.3.2.tar.bz2 15479 BLAKE2B dd6cfc312ed75dc6d9e37b898215ed90efe4734c5974297c9e29a51a69c9b2d4e91d9aa3bca1d42679307eecd95ee46e6f636c211d1ceafef1ea52428761d1ec SHA512 1d027f7b2f1974c950044fa8872dc58101800ca557a4d66406652fb43f64653f7dd39a70f4ac65f5f6bca9116de4ce44aeba2ef1fe446834641ba5c4c5604dff -DIST hardlink_0.2.0.tar.gz 12478 BLAKE2B 42918fbacdd230796e59f6ae7968599a90b63cc35876872ef34919377d6489c6c99d06f201a122f5859a283cea2672dbcc207e04c6b5ca0c54ab4e2f4178a970 SHA512 963fe90aa09e2bd548722b5c7f047fbd54fddf37967333e86251d7e5d1c646108ce90d78e7efeb8af6b9169b9a0bc5bc8b744afe1e813390f3e0bd535ce22005 -EBUILD hardlink-0.2.0.ebuild 985 BLAKE2B 04207e034de33f2cd8b40e9f5a0165362646dea99a6222b202c360bb703fb4e67ddb51aed9b8b0bb15f2ae7f0973c07b820ab597ec573c91dfaa9cc791c978ec SHA512 1043e76c0e975e2cc53003bcbc82b55e24dc9576ca880542464551b550a904b9ec12055ecc7dedd4c68acf2e40e992e9bd975a60b248a3025fb9013feb161d54 EBUILD hardlink-0.3.2.ebuild 1076 BLAKE2B 6a0d9ac49371bb12f77899d7994b596ce654ea904f80800ad407260d7a4c97ee01e62e6d1f71e5e1468ee82624207ec2330d48b739c46832eb2bb280ae0873ef SHA512 d96f33ede57e1d190f4993c2928808b13005746bce63272359a3d1af5ee5a4e7c327e5d7caefbfe4023738db19c8898056fbeab036bc57725a27295e7db64ba5 MISC metadata.xml 375 BLAKE2B d148dcbae6b75d007f0fdb447b3e0a866df0468da507482ce60fbf4dc8f758053bc4fd9d5179f07915576dc10a96102c797747cb499199f55d22c7a989cc10a2 SHA512 1f14b085ab758738cc521af00de93bd47ca037f6b59fff96352c72e8f4acae7fa2bb5a8aa2df9eb865d992035a9c57c0b976cbe5f6033e4a77250e9101b22b7c diff --git a/app-arch/hardlink/hardlink-0.2.0.ebuild b/app-arch/hardlink/hardlink-0.2.0.ebuild deleted file mode 100644 index d2c3f14fffd6..000000000000 --- a/app-arch/hardlink/hardlink-0.2.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit toolchain-funcs - -DESCRIPTION="A tool which replaces copies of a file with hardlinks" -HOMEPAGE="https://jak-linux.org/projects/hardlink/" -SRC_URI="https://jak-linux.org/projects/${PN}/${PN}_${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="" - -RDEPEND="dev-libs/libpcre - !>=sys-apps/util-linux-2.34[hardlink]" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS="README ${T}/README.rsync" - -src_prepare() { - sed -i -e '/^CF/s:?=:+=:' -e '/^CF/s:-O2 -g::' Makefile || die - - cat <<-EOF > "${T}"/README.rsync - https://hardlinkpy.googlecode.com/svn/trunk/hardlink.py has regex '^\..*\.\?{6,6}$' - for excluding rsync temporary files by default. - - To accomplish same with this version, you can use following syntax: - # hardlink -x '^\..*\.\?{6,6}$' - - This was discussed at https://bugs.gentoo.org/416613 - EOF -} - -src_compile() { - tc-export CC - emake -} -- cgit v1.2.3