Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/afio/, app-arch/afio/files/
Date: Sat, 20 Oct 2018 16:36:59
Message-Id: 1540053334.a2b84ee1004c92153ab3d9feda7185d51eb2ebd8.pacho@gentoo
1 commit: a2b84ee1004c92153ab3d9feda7185d51eb2ebd8
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 20 15:21:17 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 20 16:35:34 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b84ee1
7
8 app-arch/afio: Fix control file handling (#651294 by John R. Graham)
9
10 Closes: https://bugs.gentoo.org/651294
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12 Package-Manager: Portage-2.3.51, Repoman-2.3.11
13
14 app-arch/afio/afio-2.5.1-r2.ebuild | 34 ++++++++++++++++++++++
15 .../afio-2.5.1-control-file-warning-fix.patch | 29 ++++++++++++++++++
16 2 files changed, 63 insertions(+)
17
18 diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild b/app-arch/afio/afio-2.5.1-r2.ebuild
19 new file mode 100644
20 index 00000000000..fced7417de8
21 --- /dev/null
22 +++ b/app-arch/afio/afio-2.5.1-r2.ebuild
23 @@ -0,0 +1,34 @@
24 +# Copyright 1999-2018 Gentoo Authors
25 +# Distributed under the terms of the GNU General Public License v2
26 +
27 +EAPI=7
28 +inherit toolchain-funcs
29 +
30 +DESCRIPTION="Afio creates cpio-format archives."
31 +HOMEPAGE="http://members.chello.nl/k.holtman/afio.html https://github.com/kholtman/afio"
32 +SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz"
33 +
34 +LICENSE="Artistic LGPL-2"
35 +SLOT="0"
36 +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
37 +
38 +PATCHES=(
39 + "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch
40 + "${FILESDIR}"/${PN}-2.5.1-control-file-warning-fix.patch
41 +)
42 +
43 +src_configure() {
44 + tc-export CC
45 +}
46 +
47 +src_install() {
48 + dobin "${PN}"
49 + doman "${PN}.1"
50 + dodoc ANNOUNCE-* HISTORY README SCRIPTS
51 +
52 + local i
53 + for i in {1..4}; do
54 + docinto "script${i}"
55 + dodoc -r "script${i}"/.
56 + done
57 +}
58
59 diff --git a/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
60 new file mode 100644
61 index 00000000000..f1c93c8e914
62 --- /dev/null
63 +++ b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
64 @@ -0,0 +1,29 @@
65 +Only in b: 1
66 +diff -ubBr a/afio.c b/afio.c
67 +--- a/afio.c 2018-03-23 09:16:07.230401966 -0400
68 ++++ b/afio.c 2018-03-23 09:20:05.614421756 -0400
69 +@@ -3724,7 +3724,8 @@
70 +
71 + /* ASX check if file changed between the begining
72 + and end of the backup */
73 +- if (*fsname)
74 ++ /* if *fsname==0, it was a control file, so do not check then */
75 ++ if (*fsname!=0)
76 + {
77 + struct stat st;
78 + /* I must check fsname !
79 +@@ -3739,13 +3740,10 @@
80 + if (st.st_mtime!=sb.sb_mtime)
81 + {
82 + warn (fsname, "File was modified during its backup");
83 ++ if(index(ignorewarnings,(int)'d')) warnings--;
84 + }
85 + }
86 + }
87 +- else
88 +- {
89 +- warn (name, "ASX no fsname for this name ??");
90 +- }
91 +
92 + if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
93 + {