Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/dump/, app-arch/dump/files/
Date: Thu, 08 Apr 2021 09:37:48
Message-Id: 1617874640.7efddfc2003771f4125852f77be2ab600d370bde.soap@gentoo
1 commit: 7efddfc2003771f4125852f77be2ab600d370bde
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 8 09:37:20 2021 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 8 09:37:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efddfc2
7
8 app-arch/dump: Remove old 0.4.46-r1
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 app-arch/dump/Manifest | 1 -
14 app-arch/dump/dump-0.4.46-r1.ebuild | 94 -------------------------
15 app-arch/dump/files/dump-0.4.46-openssl11.patch | 91 ------------------------
16 3 files changed, 186 deletions(-)
17
18 diff --git a/app-arch/dump/Manifest b/app-arch/dump/Manifest
19 index be437558471..09804a91cee 100644
20 --- a/app-arch/dump/Manifest
21 +++ b/app-arch/dump/Manifest
22 @@ -1,2 +1 @@
23 -DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
24 DIST dump-0.4b47.tar.gz 583380 BLAKE2B a5a6c507fc67451e6ce5117b28b9e97e45783059358c357e1f6d4b268437c8340f13e0d77e97631112824eca8205c49d206a8a7904bc3e00b1f0d5abb31418f7 SHA512 e9c567fe2ffad196b9657c551d83f7607758f3704cad6cb407514bbe2bc765c16968997dc3a5bc92b9eb5900fa5bd6e7cebc92c81afff53339fca92891a5259d
25
26 diff --git a/app-arch/dump/dump-0.4.46-r1.ebuild b/app-arch/dump/dump-0.4.46-r1.ebuild
27 deleted file mode 100644
28 index 1ebc6f99374..00000000000
29 --- a/app-arch/dump/dump-0.4.46-r1.ebuild
30 +++ /dev/null
31 @@ -1,94 +0,0 @@
32 -# Copyright 1999-2021 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit flag-o-matic
38 -
39 -MY_P="${PN}-$(ver_rs 2 b)"
40 -S=${WORKDIR}/${MY_P}
41 -DESCRIPTION="Dump/restore ext2fs backup utilities"
42 -HOMEPAGE="http://dump.sourceforge.net/"
43 -SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
44 -
45 -LICENSE="BSD"
46 -SLOT="0"
47 -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
48 -# We keep uuid USE flag default dsiabled for this version. Don't forget
49 -# to default enable it for later versions as this is the upstream default.
50 -IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
51 -RESTRICT="!test? ( test )"
52 -REQUIRED_USE="
53 - ermt? ( ssl )
54 - ssl? ( zlib )
55 - test? ( sqlite? ( uuid ) )
56 -"
57 -
58 -RDEPEND=">=sys-fs/e2fsprogs-1.27:=
59 - >=sys-libs/e2fsprogs-libs-1.27:=
60 - sys-apps/util-linux
61 - bzip2? ( >=app-arch/bzip2-1.0.2:= )
62 - zlib? ( >=sys-libs/zlib-1.1.4:= )
63 - lzo? ( dev-libs/lzo:2= )
64 - sqlite? ( dev-db/sqlite:3= )
65 - ermt? (
66 - !libressl? ( dev-libs/openssl:0= )
67 - libressl? ( dev-libs/libressl:0= )
68 - )
69 - ssl? (
70 - !libressl? ( dev-libs/openssl:0= )
71 - libressl? ( dev-libs/libressl:0= )
72 - )
73 - readline? (
74 - sys-libs/readline:0=
75 - sys-libs/ncurses:=
76 - static? ( sys-libs/ncurses:=[static-libs] )
77 - )"
78 -DEPEND="${RDEPEND}
79 - virtual/os-headers"
80 -BDEPEND="
81 - virtual/pkgconfig
82 -"
83 -
84 -PATCHES=(
85 - "${FILESDIR}"/${P}-openssl11.patch
86 -)
87 -
88 -src_configure() {
89 - append-flags -fcommon
90 -
91 - local myeconfargs=(
92 - --with-dumpdatespath=/etc/dumpdates
93 - --with-rmtpath='$(sbindir)/rmt'
94 - --enable-blkid
95 - $(use_enable bzip2)
96 - $(use_enable debug)
97 - $(use_enable ermt)
98 - $(use_enable lzo)
99 - $(use_enable readline)
100 - $(use_enable selinux)
101 - $(use_enable sqlite)
102 - $(use_enable ssl)
103 - $(use_enable static static-progs)
104 - $(use_enable uuid)
105 - $(use_enable zlib)
106 - )
107 - econf "${myeconfargs[@]}"
108 -}
109 -
110 -src_install() {
111 - default
112 - mv "${ED}"/usr/sbin/{,dump-}rmt || die
113 - mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
114 - use ermt && newsbin rmt/ermt dump-ermt
115 -
116 - dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
117 - dodoc -r examples
118 -}
119 -
120 -pkg_postinst() {
121 - if [[ -z ${REPLACING_VERSIONS} ]] ; then
122 - ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
123 - ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
124 - fi
125 -}
126
127 diff --git a/app-arch/dump/files/dump-0.4.46-openssl11.patch b/app-arch/dump/files/dump-0.4.46-openssl11.patch
128 deleted file mode 100644
129 index db18e8190f5..00000000000
130 --- a/app-arch/dump/files/dump-0.4.46-openssl11.patch
131 +++ /dev/null
132 @@ -1,91 +0,0 @@
133 -Index: dump-0.4b46/common/transformation_ssl.c
134 -===================================================================
135 ---- dump-0.4b46.orig/common/transformation_ssl.c
136 -+++ dump-0.4b46/common/transformation_ssl.c
137 -@@ -215,7 +215,10 @@ generateIV(Transformation *xform, unsign
138 - /* to be exposed to any attacker anyway. */
139 - *saltlen = 16;
140 - if (xform->enc == 1) {
141 -- RAND_pseudo_bytes(salt, *saltlen);
142 -+ if (!RAND_bytes(salt, *saltlen) != 1) {
143 -+ /* PRNG not sufficiently seeded */
144 -+ return -1;
145 -+ }
146 - }
147 - memcpy(ivbuffer, salt, 16);
148 -
149 -@@ -274,7 +277,7 @@ ssl_compress(Transformation *xform, stru
150 - digestlen = sizeof(digest);
151 -
152 - /* generate salt, put it in header */
153 -- generateIV(xform, salt, &saltlen, iv, &ivlen);
154 -+ generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
155 - memcpy(tpbin->buf, salt, saltlen);
156 -
157 - /* compress the buffer first - increase the entropy */
158 -@@ -351,7 +354,7 @@ ssl_decompress(Transformation *xform, st
159 -
160 - // how to know salt length?
161 - memcpy(salt, src, saltlen);
162 -- generateIV(xform, salt, &saltlen, iv, &ivlen);
163 -+ generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
164 -
165 - EVP_DecryptInit_ex(xform->state.ssl.dataCtx, xform->state.ssl.cipher, xform->state.ssl.engine, NULL, NULL);
166 - //EVP_CIPHER_CTX_set_key_length(&ctx, 8);
167 -@@ -515,7 +518,7 @@ Transformation
168 - //EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key);
169 - //EVP_CIPHER_CTX_cleanup(ctx);
170 - //EVP_CIPHER_CTX_free(ctx);
171 -- RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len);
172 -+ RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher));
173 - } else {
174 - // how do we get keys?
175 - }
176 -Index: dump-0.4b46/rmt/cipher.c
177 -===================================================================
178 ---- dump-0.4b46.orig/rmt/cipher.c
179 -+++ dump-0.4b46/rmt/cipher.c
180 -@@ -23,7 +23,7 @@
181 - char *
182 - cipher(char *buf, int buflen, int do_encrypt)
183 - {
184 -- static EVP_CIPHER_CTX ctx;
185 -+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
186 - static char *out = NULL; /* return value, grown as necessary */
187 - static int outlen = 0;
188 - static int init = 0, which, blocksize;
189 -@@ -71,13 +71,13 @@ cipher(char *buf, int buflen, int do_enc
190 - }
191 - EVP_BytesToKey(cipher, EVP_md5(), NULL,
192 - buf, strlen(buf), 1, key, iv);
193 -- EVP_CIPHER_CTX_init(&ctx);
194 -- EVP_CipherInit_ex(&ctx, cipher, NULL, key, iv, do_encrypt);
195 -- EVP_CIPHER_CTX_set_padding(&ctx, 0); // -nopad
196 -+ EVP_CIPHER_CTX_init(ctx);
197 -+ EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, do_encrypt);
198 -+ EVP_CIPHER_CTX_set_padding(ctx, 0); // -nopad
199 - OPENSSL_cleanse(buf, sizeof buf);
200 - OPENSSL_cleanse(key, sizeof key);
201 - OPENSSL_cleanse(iv, sizeof iv);
202 -- blocksize = EVP_CIPHER_CTX_block_size(&ctx);
203 -+ blocksize = EVP_CIPHER_CTX_block_size(ctx);
204 - which = do_encrypt;
205 - init = 1;
206 - }
207 -@@ -95,7 +95,7 @@ cipher(char *buf, int buflen, int do_enc
208 - outlen = (buflen+blocksize) * 2;
209 - out = realloc(out, outlen);
210 - }
211 -- if (!EVP_CipherUpdate(&ctx, out, &n, buf, buflen)) {
212 -+ if (!EVP_CipherUpdate(ctx, out, &n, buf, buflen)) {
213 - syslog(LOG_ERR, "EVP_CipherUpdate failed");
214 - errno = EINVAL;
215 - return NULL;
216 -@@ -106,6 +106,7 @@ cipher(char *buf, int buflen, int do_enc
217 - return NULL;
218 - }
219 - // assert(ctx->buf_len == 0);
220 -+ EVP_CIPHER_CTX_free(ctx);
221 - return out;
222 - }
223 -