From 27a61babf89122aeb64d52f4ea8f6f068b928da4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Oct 2022 13:23:59 +0100 Subject: gentoo auto-resync : 07:10:2022 - 13:23:59 --- net-analyzer/sslsplit/Manifest | 8 ++-- .../sslsplit/files/sslsplit-0.5.4-install.patch | 26 ----------- .../files/sslsplit-0.5.5-libcrypto-pkgconfig.patch | 23 ++++++++++ .../files/sslsplit-0.5.5-libnet-pkgconfig.patch | 40 +++++++++++++++++ net-analyzer/sslsplit/sslsplit-0.5.4.ebuild | 52 ---------------------- net-analyzer/sslsplit/sslsplit-0.5.5.ebuild | 11 ++++- net-analyzer/sslsplit/sslsplit-9999.ebuild | 48 -------------------- 7 files changed, 75 insertions(+), 133 deletions(-) delete mode 100644 net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch create mode 100644 net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch create mode 100644 net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch delete mode 100644 net-analyzer/sslsplit/sslsplit-0.5.4.ebuild delete mode 100644 net-analyzer/sslsplit/sslsplit-9999.ebuild (limited to 'net-analyzer/sslsplit') diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest index 4429b76ca3ad..adece3f781cc 100644 --- a/net-analyzer/sslsplit/Manifest +++ b/net-analyzer/sslsplit/Manifest @@ -1,8 +1,6 @@ -AUX sslsplit-0.5.4-install.patch 1131 BLAKE2B 1f81f8fbc8861e4ccfc0b2068d19e1a5dbb1485cf72d7aa0799e7addf7c73e4836b427afd510de8b6c98037e473e5699c33920fb7931c99ccc989fd0cb956bb3 SHA512 0219d175cf9f8a6a89f9a807bb5981a83c1e62c6738f5fafd93970045fa56dd0595761f3915cc223f60541b39a8bff9222233f176a5a608cdcf7a6774b69f56c +AUX sslsplit-0.5.5-libcrypto-pkgconfig.patch 589 BLAKE2B 4d3cf7a6e22c33ac8ee93abe070c5dc922487909f7f0222519a7c449b66be319b52c2f072ba6cb4300b80522b3164eeb61a6fb53d4b1fd276fd9cecc691e109e SHA512 38d1fc3199e3e4345b60a6dfce0c4827d62f05639a93e9d2be9af290a89a29939218779328f019dfb4af222bdea9df88f203071e96151a1e5954e90fe4724302 +AUX sslsplit-0.5.5-libnet-pkgconfig.patch 1265 BLAKE2B 574c6933a68afc61f540ad86a2130959061ee8d47266aaafaefe643bfebf268f15deef81e2842411e5ebe5367f35fafc32cad5da755729fdc91630168bc401f7 SHA512 29859c6774e004c3b568592f86c6a29a4e0a92e10ffd92771070440572873ca050f7f14cf82fb9ef6af994cccf722fa44a950dfa5841e0d8558058d1ebdb7e5c AUX sslsplit-0.5.5-openssl3.patch 980 BLAKE2B e8cd6c99ffb0287a7a6be416bc7ba1aa6a4c0426f731c1e0559e195323775e146506cb7a3ffd5baece5ee8d324fd5ce881e64ae3dcdb438efc7c07c0041bd5a1 SHA512 eecb137c27db74185186285c7fc0e15b01d15362100fa26e16649678fcab51223028e5bbcd62674c882c41fa86b32f78730e303b69f15920a51e743a4b541a0a -DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39 -EBUILD sslsplit-0.5.4.ebuild 1113 BLAKE2B f1dbf3553abdaa63f7f9e37f00a43939a91ae810b7faae363de80b7e817c3489403e2c157a55e412c23af602fecc1afe590aa3bbd2c6caca17a63996b637dd28 SHA512 27c5306499f1979b85253c20e8e86c46004aa6e5c61d46aeea64f552b82d2162fd73b836228c03d026eacf248415c35f22bf1098e83e9f7ce8170599bb312d30 -EBUILD sslsplit-0.5.5.ebuild 1129 BLAKE2B e7a9647db8eabb19b9ba0c0005fcaaaf487fd380b23ffc09f4af0e58a52db6a59e08efd6e43fb78e4cd7574a71d5750d7aa3baaa2445022b0ea4688b179d0a7c SHA512 6a5a325bae647f959c8454cedc764ad8034bdc4590042af2c2b372c0792a822c41864315f4a39f99d152567e55d3f6cee0283c51970380d72ef93c2140d15ef9 -EBUILD sslsplit-9999.ebuild 1082 BLAKE2B 6fa6c0b6d6c2cd4d0e3201a809b36b63c0e3722d86ff954c05dd034a7861cafd2a178062d0318c3544073e74b45f9b7a94a80b6bee8b6fbca5e00a224131829d SHA512 9dc78dfd9c03a0ca60d2a3e0b73f8d9047e2e03be3c1f42f1dcb89f89e5b4c36827ee45fb0b0cf8c762a4563fe982ff52a9eb0cfcbe0cd228e830de71ff138d3 +EBUILD sslsplit-0.5.5.ebuild 1256 BLAKE2B 1346003a2582cbbfad8ff743979c3a29eae8d0965757570a673f48ab26f5fa4bdc482445467495c279f09fed3e1a81cedd1930afc86d7bbd106e0af840572193 SHA512 906ab8816f344c65551db161f030598c4be1f0228f0f84c83d8df22a5aee43322be8ac07b8060b73cc5564aa7f9ebf980b46f4d442baca22f73e486475935db3 MISC metadata.xml 904 BLAKE2B 06a5a152e3200df6b912c6a967c60a162f1517bd52360f6aee1f12eb16b5ef9cfe3f797659a7b300b543e863c16fdd8ab26231aa1c980b73800d897b9c855758 SHA512 86259c095d592c1a7a8f5d747fe339ffb4ebe8943bccfdb3cf2ee3932159f8dfb2d248bdaa2eee4edfffb49e48ce2817cdf03fca460ab69ddf0a497a79a9cbbe 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..000000000000 --- 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/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch new file mode 100644 index 000000000000..dd6ae812efb6 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch @@ -0,0 +1,23 @@ +Use pkgconfig for localization of libcrypto. This is needed for tests in +multilib systems. + +diff --git a/extra/engine/GNUmakefile b/extra/engine/GNUmakefile +index b50717b..3712ad6 100644 +--- a/extra/engine/GNUmakefile ++++ b/extra/engine/GNUmakefile +@@ -16,9 +16,9 @@ else + SUFFIX:= so + endif + +-CFLAGS+= -fPIC -I$(OPENSSL_BASE)/include +-LDFLAGS+= -L$(OPENSSL_BASE)/lib +-LIBS+= -lcrypto ++CFLAGS+= -fPIC $(shell pkg-config --cflags libcrypto) ++LDFLAGS+= $(shell pkg-config --libs-only-L libcrypto) ++LIBS+= $(shell pkg-config --libs-only-l libcrypto) + + TARGET= dummy-engine + +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch new file mode 100644 index 000000000000..5eebf8d4deaf --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] locate libnet with pkgconfig + +This is partially reverted from upstream commit 46a55de8040a ("Refactor +location of packages, improve libnet detection") + +diff --git a/GNUmakefile b/GNUmakefile +index cc7197e..2343272 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -277,6 +277,10 @@ PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_openssl \ + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_pthreads \ + && echo libevent_pthreads) + endif ++ifndef LIBNET_BASE ++PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libnet \ ++ && echo libnet) ++endif + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + ifndef LIBPCAP_BASE + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libpcap \ +@@ -333,7 +337,7 @@ CHECK_MISSING:= 1 + endif + endif + +-# Always search filesystem for libnet because libnet-config is unreliable ++ifeq (,$(filter libnet,$(PKGS))) + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + LIBNET_FOUND:= $(call locate,libnet,include/libnet-1.1/libnet.h,$(LIBNET_BASE)) + ifdef LIBNET_FOUND +@@ -347,6 +351,7 @@ $(error dependency 'libnet' not found; \ + install it or point LIBNET_BASE to base path) + endif + endif ++endif + + ifdef OPENSSL_FOUND + PKG_CPPFLAGS+= -I$(OPENSSL_FOUND)/include +-- +2.35.1 + 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..000000000000 --- 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} == *9999 ]] ; 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 -} diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild index f156e951d876..9295120f10b3 100644 --- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild +++ b/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild @@ -6,7 +6,10 @@ EAPI=7 inherit flag-o-matic DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" +HOMEPAGE=" + https://www.roe.ch/SSLsplit + https://github.com/droe/sslsplit +" LICENSE="BSD-2" SLOT="0" @@ -32,7 +35,11 @@ DEPEND="${RDEPEND} test? ( dev-libs/check )" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-openssl3.patch" ) +PATCHES=( + "${FILESDIR}/${P}-openssl3.patch" + "${FILESDIR}/${P}-libnet-pkgconfig.patch" + "${FILESDIR}/${P}-libcrypto-pkgconfig.patch" +) src_prepare() { default diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild deleted file mode 100644 index 17ad8b68ff9c..000000000000 --- a/net-analyzer/sslsplit/sslsplit-9999.ebuild +++ /dev/null @@ -1,48 +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} == *9999 ]] ; 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" - -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" SYSCONFDIR="${EPREFIX}/etc" install - dodoc AUTHORS.md NEWS.md README.md -} -- cgit v1.2.3