[gentoo-commits] repo/gentoo:master commit in: app-arch/afio/, app-arch/afio/files/
commit: a2b84ee1004c92153ab3d9feda7185d51eb2ebd8
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Oct 20 15:21:17 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Oct 20 16:35:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b84ee1
app-arch/afio: Fix control file handling (#651294 by John R. Graham)
Closes: https://bugs.gentoo.org/651294
Signed-off-by: Pacho Ramos gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
app-arch/afio/afio-2.5.1-r2.ebuild | 34 ++
.../afio-2.5.1-control-file-warning-fix.patch | 29 ++
2 files changed, 63 insertions(+)
diff --git a/app-arch/afio/afio-2.5.1-r2.ebuild
b/app-arch/afio/afio-2.5.1-r2.ebuild
new file mode 100644
index 000..fced7417de8
--- /dev/null
+++ b/app-arch/afio/afio-2.5.1-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Afio creates cpio-format archives."
+HOMEPAGE="http://members.chello.nl/k.holtman/afio.html
https://github.com/kholtman/afio;
+SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz;
+
+LICENSE="Artistic LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.1-fix-build-system.patch
+ "${FILESDIR}"/${PN}-2.5.1-control-file-warning-fix.patch
+)
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ dodoc ANNOUNCE-* HISTORY README SCRIPTS
+
+ local i
+ for i in {1..4}; do
+ docinto "script${i}"
+ dodoc -r "script${i}"/.
+ done
+}
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
new file mode 100644
index 000..f1c93c8e914
--- /dev/null
+++ b/app-arch/afio/files/afio-2.5.1-control-file-warning-fix.patch
@@ -0,0 +1,29 @@
+Only in b: 1
+diff -ubBr a/afio.c b/afio.c
+--- a/afio.c 2018-03-23 09:16:07.230401966 -0400
b/afio.c 2018-03-23 09:20:05.614421756 -0400
+@@ -3724,7 +3724,8 @@
+
+ /* ASX check if file changed between the begining
+ and end of the backup */
+- if (*fsname)
++/* if *fsname==0, it was a control file, so do not check then */
++ if (*fsname!=0)
+ {
+ struct stat st;
+ /* I must check fsname !
+@@ -3739,13 +3740,10 @@
+ if (st.st_mtime!=sb.sb_mtime)
+ {
+ warn (fsname, "File was modified during its backup");
++ if(index(ignorewarnings,(int)'d')) warnings--;
+ }
+ }
+ }
+- else
+- {
+- warn (name, "ASX no fsname for this name ??");
+-}
+
+ if(aflag && *fsname && ((sb.sb_mode & S_IFMT)==S_IFREG))
+ {
[gentoo-commits] repo/gentoo:master commit in: app-arch/afio/, app-arch/afio/files/
commit: 433780efc5ab5c4346598470a3c3291d7573f828
Author: Michael Palimaka gentoo org>
AuthorDate: Wed Feb 28 09:04:40 2018 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Feb 28 09:04:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433780ef
app-arch/afio: remove 2.5 and 2.5.1-r0
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-arch/afio/Manifest| 1 -
app-arch/afio/afio-2.5.1.ebuild | 31 -
app-arch/afio/afio-2.5.ebuild | 43 ---
app-arch/afio/files/Makefile-r1.patch | 23 ---
app-arch/afio/files/Makefile.patch| 25
5 files changed, 123 deletions(-)
diff --git a/app-arch/afio/Manifest b/app-arch/afio/Manifest
index 4c96d581600..679a988d1be 100644
--- a/app-arch/afio/Manifest
+++ b/app-arch/afio/Manifest
@@ -1,2 +1 @@
DIST afio-2.5.1.tgz 191765 BLAKE2B
48a590c1180942444eb8fc17701563ee822cad9d0ae423e12996e7b3dff16ab7ba13d8041b78fb6415d1a422d14be8ba3443910ae1a57290dca801334ced7ffe
SHA512
afa4e01cc9e7da5bff7c96d2da9a41c296e7b89c50484f58a8b011173a99a144a9e77d3ee8136622e490287b99a7ae76c6eba901a2186b5a3a6bab164a37c864
-DIST afio-2.5.tgz 179184 BLAKE2B
2e4e31b27ce7c7cc60ea81d6d7101289e8cfbe4ff6a52c185abef482e06d233c739e60d40bc2ee35c79405606e5cfe27746813a8e74dbbe1b407d4092707aee5
SHA512
8e8fba115989b60284d09fb37b8f4782b6adc4a0887a05544615a38e62c6b3a48c3194b53ea4496fea64b25d420ff89cf6faab31646998f3612082118fcbb052
diff --git a/app-arch/afio/afio-2.5.1.ebuild b/app-arch/afio/afio-2.5.1.ebuild
deleted file mode 100644
index b61f9aa8241..000
--- a/app-arch/afio/afio-2.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Afio creates cpio-format archives."
-HOMEPAGE="http://members.chello.nl/k.holtman/afio.html
https://github.com/kholtman/afio;
-SRC_URI="http://members.chello.nl/k.holtman/${P}.tgz;
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/Makefile-r1.patch
- tc-export CC
-}
-
-src_install() {
- local i
- dobin afio
- dodoc ANNOUNCE-* HISTORY README SCRIPTS
- for i in 1 2 3 4; do
- docinto script$i
- dodoc script$i/*
- done
- doman afio.1
-}
diff --git a/app-arch/afio/afio-2.5.ebuild b/app-arch/afio/afio-2.5.ebuild
deleted file mode 100644
index e5b6eea24f2..000
--- a/app-arch/afio/afio-2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Afio creates cpio-format archives."
-HOMEPAGE="http://members.chello.nl/k.holtman/afio.html
https://github.com/kholtman/afio;
-SRC_URI="http://members.brabant.chello.nl/~k.holtman/${P}.tgz;
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-apps/sed-4"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/Makefile.patch
- # use our cflags
- sed -i \
- -e "s:-O2 -fomit-frame-pointer:${CFLAGS}:" \
- Makefile \
- || die "sed Makefile failed"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
- local i
- dobin afio || die "dobin failed"
- dodoc ANNOUNCE-2.5 HISTORY README SCRIPTS
- for i in 1 2 3 4 5 ; do
- docinto script$i
- dodoc script$i/*
- done
- doman afio.1
-}
diff --git a/app-arch/afio/files/Makefile-r1.patch
b/app-arch/afio/files/Makefile-r1.patch
deleted file mode 100644
index 70ec6caa4b9..000
--- a/app-arch/afio/files/Makefile-r1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN afio-2.5.1.orig/Makefile afio-2.5.1/Makefile
afio-2.5.1.orig/Makefile 2012-02-05 14:52:24.0 +0100
-+++ afio-2.5.1/Makefile2012-03-11 14:02:16.267636685 +0100
-@@ -71,15 +71,12 @@
- MW=
- #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long
-Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes
-Wmissing-declarations
-
--CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer
${LARGEFILEFLAGS} ${MW}
--
--CC=gcc
--
--CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
--LDFLAGS =
-+CC?=gcc
-+CFLAGS+=-Wall -Wstrict-prototypes -s ${LARGEFILEFLAGS} ${2} ${3} ${6} ${8}
${c} ${d} ${e2} ${f} ${g}
-+LDFLAGS+=
-
- afio : afio.o compfile.o exten.o match.o $M
-- ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
-+ ${CC} ${CFLAGS} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
-
- clean:
- rm -f *.o
