[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sslsplit/files/, net-analyzer/sslsplit/
commit: fd9ce803d199918ed9af825cb769320ce06ee1f4
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Oct 4 15:15:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 7 11:28:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9ce803
net-analyzer/sslsplit: drop 0.5.4
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
net-analyzer/sslsplit/Manifest | 1 -
.../sslsplit/files/sslsplit-0.5.4-install.patch| 26 ---
net-analyzer/sslsplit/sslsplit-0.5.4.ebuild| 52 --
3 files changed, 79 deletions(-)
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index c06f6601455f..99d65e3f8129 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1,2 +1 @@
-DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B
4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b
SHA512
5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B
b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b
SHA512
f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
deleted file mode 100644
index 65959f3e1090..
--- a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/GNUmakefile b/GNUmakefile
-index ebdcf0a..02cb4b7 100644
a/GNUmakefile
-+++ b/GNUmakefile
-@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
-
- install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
- test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
-- test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
-- $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
- test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
- $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
- test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
- $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
-- test -d $(DESTDIR)/var/log/$(TARGET) || \
-- $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
-- test -d $(DESTDIR)/var/run/$(TARGET) || \
-- $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
- $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
- $(TARGET) $(DESTDIR)$(PREFIX)/bin/
-- $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
-- $(TARGET).conf \
-- $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
- $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
- $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
- $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
deleted file mode 100644
index db089dcd713e..
--- a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Transparent SSL/TLS interception"
-HOMEPAGE="https://www.roe.ch/SSLsplit;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == * ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/droe/${PN};
- EGIT_BRANCH="develop"
-else
- SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
- dev-libs/libevent[ssl,threads]
- dev-libs/openssl:0=
- net-libs/libnet:1.1
- net-libs/libpcap
- elibc_musl? ( sys-libs/fts-standalone )"
-DEPEND="${RDEPEND}
- test? ( dev-libs/check )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-install.patch"
-)
-
-src_prepare() {
- default
-
- use elibc_musl && append-libs "-lfts"
-
- sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
- -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
- sed -i '/opts_suite/d' main.t.c || die
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
-}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sslsplit/files/, net-analyzer/sslsplit/
commit: fc0df4819cf65619f4df3d4f8b76945c44c37abd
Author: Petr Vaněk atlas cz>
AuthorDate: Mon May 23 15:29:15 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri May 27 06:53:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0df481
net-analyzer/sslsplit: fix openssl3 support
Upstream-issue: https://github.com/droe/sslsplit/issues/290
Closes: https://bugs.gentoo.org/805536
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25611
Signed-off-by: Joonas Niilola gentoo.org>
.../sslsplit/files/sslsplit-0.5.5-openssl3.patch | 31 ++
net-analyzer/sslsplit/sslsplit-0.5.5.ebuild| 2 ++
2 files changed, 33 insertions(+)
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
new file mode 100644
index ..10807bee3899
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch
@@ -0,0 +1,31 @@
+From: Soner Tari
+Date: Fri, 4 Feb 2022 19:46:58 +0300
+Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation
+ warnings, issue #290
+
+This patch fixes errors only, so that build succeeds, but deprecation
+warnings remain. It seems we need considerable changes to replace those
+deprecated functions in the warnings.
+---
+
+Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not
deprecation warnings, issue #290")
+Upstream-issue: https://github.com/droe/sslsplit/issues/290
+
+diff --git a/pxyconn.c b/pxyconn.c
+index e69de20..09a8b80 100644
+--- a/pxyconn.c
b/pxyconn.c
+@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct
bufferevent *bev,
+ }
+ #endif /* LIBEVENT_VERSION_NUMBER < 0x0201 */
+
++#if OPENSSL_VERSION_NUMBER >= 0x3000L
++#define ERR_GET_FUNC(x) 0
++#define ERR_func_error_string(x) ""
++#endif
+
+ /*
+ * Maximum size of data to buffer per connection direction before
+--
+2.35.1
+
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
index c6f530a49947..7d9691cbbcef 100644
--- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
+++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
test? ( dev-libs/check )"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${P}-openssl3.patch" )
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/sslsplit/files/, net-analyzer/sslsplit/
commit: 6d7e40d27f49d4d2015a3ec81e12da91b6d25b73
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Aug 6 08:58:30 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Aug 7 16:26:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7e40d2
net-analyzer/sslsplit: Bump to version 0.5.4
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Joonas Niilola gentoo.org>
net-analyzer/sslsplit/Manifest | 1 +
.../sslsplit/files/sslsplit-0.5.4-install.patch| 26 +++
net-analyzer/sslsplit/sslsplit-0.5.4.ebuild| 50 ++
3 files changed, 77 insertions(+)
diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest
index c214847d798..f2d8ea30a7d 100644
--- a/net-analyzer/sslsplit/Manifest
+++ b/net-analyzer/sslsplit/Manifest
@@ -1 +1,2 @@
DIST sslsplit-0.5.2.tar.gz 1526606 BLAKE2B
2eb9e1525072626cfdfdfe344a61d92cf340a87dbbabfd06c5a7b46ce6dd0305b27949f91260fe192ecf97484676600e39f79a74995b45fb5b59138726cfbffe
SHA512
5f0560dbf89355ad0ef443df2fb0358046efd8c35be6c45f27b04495fd6194c826ef1c7b261683e7f22eb14436293d00395329284d9e709e1188c3c885251935
+DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B
4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b
SHA512
5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed
diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
new file mode 100644
index 000..65959f3e109
--- /dev/null
+++ b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch
@@ -0,0 +1,26 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index ebdcf0a..02cb4b7 100644
+--- a/GNUmakefile
b/GNUmakefile
+@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE
+
+ install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5
+ test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+- test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit
+ test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
+ test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5
+- test -d $(DESTDIR)/var/log/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET)
+- test -d $(DESTDIR)/var/run/$(TARGET) || \
+- $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET)
+ $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \
+ $(TARGET) $(DESTDIR)$(PREFIX)/bin/
+- $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \
+- $(TARGET).conf \
+- $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample
+ $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
+ $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/
+ $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \
diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
new file mode 100644
index 000..af09469872b
--- /dev/null
+++ b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Transparent SSL/TLS interception"
+HOMEPAGE="https://www.roe.ch/SSLsplit;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_musl test"
+
+if [[ ${PV} == * ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/droe/${PN};
+ EGIT_BRANCH="develop"
+else
+ SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+ dev-libs/libevent[ssl,threads]
+ dev-libs/openssl:0=
+ net-libs/libnet:1.1
+ elibc_musl? ( sys-libs/fts-standalone )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )"
+BDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-install.patch"
+)
+
+src_prepare() {
+ default
+
+ use elibc_musl && append-libs "-lfts"
+
+ sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \
+ -e 's/\/SSLSPLIT_FEATURES/g' GNUmakefile || die
+ sed -i '/opts_suite/d' main.t.c || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+ dodoc AUTHORS.md NEWS.md README.md sslsplit.conf
+}
