[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/
commit: 0f202177c3ad521a3d735530da03be35aad6811a
Author: John Helmert III gentoo org>
AuthorDate: Tue Aug 16 20:56:49 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Tue Aug 16 20:56:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f202177
net-misc/pcapfix: drop 1.1.4
Signed-off-by: John Helmert III gentoo.org>
net-misc/pcapfix/Manifest | 1 -
net-misc/pcapfix/pcapfix-1.1.4.ebuild | 27 ---
2 files changed, 28 deletions(-)
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index 7364fd2bbe2c..606bb40cbba3 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,3 +1,2 @@
-DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B
4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9
SHA512
6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
DIST pcapfix-1.1.7-musl-stdint.patch.bz2 2084 BLAKE2B
2dafe8597f247c1b403e89552403850f10e9a0149a74d092a9187510a997b6339af831ea6f3b01d7ab04367a966828aedc665b517e7108fea9b6d3607815d531
SHA512
5e6d197d6bda6bd10525066a46dc301ae7b92a2a0d9062e3dcef22730b27b12d1b8cd1e58e344f6b4a7bd5b0dfe1351bf868489285bf1651f8aa96f0014b3adf
DIST pcapfix-1.1.7.tar.gz 54784 BLAKE2B
c688b3eabf04ff4baf88170c5868edd2b504779a9550ce6a2ca8b4839310b75a26c7e6ae6afc82cf763f19f8ffebe357c730b0ea1bd4b05ed071e78ad6c9f6e5
SHA512
d8d1106349116303f35254f680916f1ea26b163f9afceb5d237eed89880810d4b7b40ebca9de58ec95af2336dd78f4e11af1a08b89f6765055843a9791c156bd
diff --git a/net-misc/pcapfix/pcapfix-1.1.4.ebuild
b/net-misc/pcapfix/pcapfix-1.1.4.ebuild
deleted file mode 100644
index 9f2ecbc9c679..
--- a/net-misc/pcapfix/pcapfix-1.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Repair and fix broken pcap files"
-HOMEPAGE="http://f00l.de/pcapfix/;
-SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DOCS=( Changelog README )
-
-src_prepare() {
- default
- sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
- use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile ||
die
-}
-
-src_install() {
- doman pcapfix.1
- dobin pcapfix
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/files/, net-misc/pcapfix/
commit: 35e18c7bc896c0a0a8b2a6267874f3f65cab147b
Author: Sam James gentoo org>
AuthorDate: Wed Dec 29 06:50:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 29 07:10:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e18c7b
net-misc/pcapfix: fully respect CFLAGS
Signed-off-by: Sam James gentoo.org>
.../files/pcapfix-1.1.7-respect-CFLAGS.patch| 21 +
net-misc/pcapfix/pcapfix-1.1.7.ebuild | 7 +--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch
b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch
new file mode 100644
index ..a80419b1a87b
--- /dev/null
+++ b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch
@@ -0,0 +1,21 @@
+https://github.com/Rup0rt/pcapfix/pull/27
+
+From: Sam James
+Date: Wed, 29 Dec 2021 06:48:09 +
+Subject: [PATCH] build: respect CFLAGS
+
+Allow overriding in the environment by using our value
+as just a default.
+
+Signed-off-by: Sam James
+--- a/Makefile
b/Makefile
+@@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man
+ OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOURCE=2 -O2
-fstack-protector --param=ssp-buffer-size=4
+ WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat
-Werror=format-security
+ DEBUGFLAGS = -g
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?= $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
+
+ # Determine extra LDFLAGS
+ OS := $(shell uname)
diff --git a/net-misc/pcapfix/pcapfix-1.1.7.ebuild
b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
index dd1060063ecc..71f00b4ceb75 100644
--- a/net-misc/pcapfix/pcapfix-1.1.7.ebuild
+++ b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="Repair and fix broken pcap files"
HOMEPAGE="https://f00l.de/pcapfix/;
@@ -18,17 +18,20 @@ IUSE="debug"
DOCS=( Changelog README )
PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.7-respect-CFLAGS.patch
"${WORKDIR}"/${PN}-1.1.7-musl-stdint.patch
)
src_prepare() {
default
- sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
+
use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile ||
die
}
src_configure() {
tc-export CC
+
+ append-lfs-flags
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/
commit: 3c0062d2b4ffa3f65a57cd06b99176555d5d50c8
Author: Sam James gentoo org>
AuthorDate: Wed Dec 29 06:44:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 29 06:44:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0062d2
net-misc/pcapfix: fix build on musl
Patch sent upstream.
Bug: https://github.com/Rup0rt/pcapfix/pull/26
Closes: https://bugs.gentoo.org/712772
Signed-off-by: Sam James gentoo.org>
net-misc/pcapfix/Manifest | 1 +
net-misc/pcapfix/pcapfix-1.1.7.ebuild | 5 +
2 files changed, 6 insertions(+)
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index 53d82312eeac..7364fd2bbe2c 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,2 +1,3 @@
DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B
4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9
SHA512
6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
+DIST pcapfix-1.1.7-musl-stdint.patch.bz2 2084 BLAKE2B
2dafe8597f247c1b403e89552403850f10e9a0149a74d092a9187510a997b6339af831ea6f3b01d7ab04367a966828aedc665b517e7108fea9b6d3607815d531
SHA512
5e6d197d6bda6bd10525066a46dc301ae7b92a2a0d9062e3dcef22730b27b12d1b8cd1e58e344f6b4a7bd5b0dfe1351bf868489285bf1651f8aa96f0014b3adf
DIST pcapfix-1.1.7.tar.gz 54784 BLAKE2B
c688b3eabf04ff4baf88170c5868edd2b504779a9550ce6a2ca8b4839310b75a26c7e6ae6afc82cf763f19f8ffebe357c730b0ea1bd4b05ed071e78ad6c9f6e5
SHA512
d8d1106349116303f35254f680916f1ea26b163f9afceb5d237eed89880810d4b7b40ebca9de58ec95af2336dd78f4e11af1a08b89f6765055843a9791c156bd
diff --git a/net-misc/pcapfix/pcapfix-1.1.7.ebuild
b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
index 90020f92dd38..dd1060063ecc 100644
--- a/net-misc/pcapfix/pcapfix-1.1.7.ebuild
+++ b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
@@ -8,6 +8,7 @@ inherit toolchain-funcs
DESCRIPTION="Repair and fix broken pcap files"
HOMEPAGE="https://f00l.de/pcapfix/;
SRC_URI="https://f00l.de/pcapfix/${P}.tar.gz;
+SRC_URI+="
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.7-musl-stdint.patch.bz2;
LICENSE="GPL-3"
SLOT="0"
@@ -16,6 +17,10 @@ IUSE="debug"
DOCS=( Changelog README )
+PATCHES=(
+ "${WORKDIR}"/${PN}-1.1.7-musl-stdint.patch
+)
+
src_prepare() {
default
sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/
commit: 2a99630400988afde2113fd13d22c3912c5cff41
Author: Sam James gentoo org>
AuthorDate: Wed Dec 29 06:26:27 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 29 06:27:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a996304
net-misc/pcapfix: add 1.1.7
Tagged musl bug b/c (from 1.1.5 changelog):
```
[...]
* improved compiling on all platforms (thanks to mdeweerd)
```
Bug: https://bugs.gentoo.org/712772
Bug: https://bugs.gentoo.org/830205
Signed-off-by: Sam James gentoo.org>
net-misc/pcapfix/Manifest | 1 +
net-misc/pcapfix/pcapfix-1.1.7.ebuild | 33 +
2 files changed, 34 insertions(+)
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index 23a3cc3dde91..53d82312eeac 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1 +1,2 @@
DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B
4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9
SHA512
6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
+DIST pcapfix-1.1.7.tar.gz 54784 BLAKE2B
c688b3eabf04ff4baf88170c5868edd2b504779a9550ce6a2ca8b4839310b75a26c7e6ae6afc82cf763f19f8ffebe357c730b0ea1bd4b05ed071e78ad6c9f6e5
SHA512
d8d1106349116303f35254f680916f1ea26b163f9afceb5d237eed89880810d4b7b40ebca9de58ec95af2336dd78f4e11af1a08b89f6765055843a9791c156bd
diff --git a/net-misc/pcapfix/pcapfix-1.1.7.ebuild
b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
new file mode 100644
index ..90020f92dd38
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Repair and fix broken pcap files"
+HOMEPAGE="https://f00l.de/pcapfix/;
+SRC_URI="https://f00l.de/pcapfix/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+ default
+ sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
+ use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile ||
die
+}
+
+src_configure() {
+ tc-export CC
+}
+
+src_install() {
+ doman pcapfix.1
+ dobin pcapfix
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/
commit: 81cd305b95230ed1ba42d4d600e589db954c1083
Author: Aaron Bauman gentoo org>
AuthorDate: Fri Aug 28 22:48:39 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri Aug 28 22:48:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81cd305b
net-misc/pcapfix: drop old EAPI
Signed-off-by: Aaron Bauman gentoo.org>
net-misc/pcapfix/Manifest | 1 -
net-misc/pcapfix/pcapfix-0.7.ebuild | 26 --
2 files changed, 27 deletions(-)
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index d74002f56de..23a3cc3dde9 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,2 +1 @@
-DIST pcapfix-0.7.tar.gz 25753 BLAKE2B
75a8bca8e5c0f7b6604a9c2202116f3fd18917bb98797b401618d32861a14e2bc7f7a1fe684d2e057c4314de72825dc3142ea93bd8dea0b1bc4716e240e0
SHA512
254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298
DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B
4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9
SHA512
6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
diff --git a/net-misc/pcapfix/pcapfix-0.7.ebuild
b/net-misc/pcapfix/pcapfix-0.7.ebuild
deleted file mode 100644
index a0ef34d6426..000
--- a/net-misc/pcapfix/pcapfix-0.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Repair and fix broken pcap files"
-HOMEPAGE="http://f00l.de/pcapfix/;
-SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile
-}
-
-src_install() {
- doman pcapfix.1
- dobin pcapfix
- dodoc README TODO Changelog
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/pcapfix/
commit: 56e4cf2e58f6dc15ea574e4eac6db82792087a74
Author: Zamarin Arthur gmail com>
AuthorDate: Tue Mar 19 15:33:44 2019 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 18 04:01:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e4cf2e
net-misc/pcapfix: version bump 1.1.4, EAPI 7
Closes: https://bugs.gentoo.org/498752
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Zamarin Arthur gmail.com>
Fixes: https://github.com/gentoo/gentoo/pull/11412
Signed-off-by: Robin H. Johnson gentoo.org>
net-misc/pcapfix/Manifest | 1 +
net-misc/pcapfix/pcapfix-1.1.4.ebuild | 27 +++
2 files changed, 28 insertions(+)
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index 6fd0868cb59..d74002f56de 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1 +1,2 @@
DIST pcapfix-0.7.tar.gz 25753 BLAKE2B
75a8bca8e5c0f7b6604a9c2202116f3fd18917bb98797b401618d32861a14e2bc7f7a1fe684d2e057c4314de72825dc3142ea93bd8dea0b1bc4716e240e0
SHA512
254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298
+DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B
4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9
SHA512
6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
diff --git a/net-misc/pcapfix/pcapfix-1.1.4.ebuild
b/net-misc/pcapfix/pcapfix-1.1.4.ebuild
new file mode 100644
index 000..9f2ecbc9c67
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-1.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Repair and fix broken pcap files"
+HOMEPAGE="http://f00l.de/pcapfix/;
+SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+ default
+ sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
+ use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile ||
die
+}
+
+src_install() {
+ doman pcapfix.1
+ dobin pcapfix
+ einstalldocs
+}
