commit: 0a6dddca771421a50134b6a27ba0122f3fe25d83 Author: EmilienMottet <emilien.mottet <AT> grenoble-inp <DOT> org> AuthorDate: Thu Oct 21 08:11:25 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 22 03:47:40 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a6dddca
net-analyzer/hydra: update live ebuild - Use README instead of README.md in dodoc - Update patch for matching new configure Closes: https://bugs.gentoo.org/818988 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Emilien Mottet <emilien.mottet <AT> grenoble-inp.org> Closes: https://github.com/gentoo/gentoo/pull/22653 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/hydra-9999999-respect-cflags-more.patch | 31 ++++++++++++++++++++++ net-analyzer/hydra/hydra-9999999.ebuild | 4 +-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch new file mode 100644 index 00000000000..0fe5753ec8a --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch @@ -0,0 +1,31 @@ +Don't inject hardening CFLAGS. We already have these by default in Gentoo. +--- a/configure ++++ b/configure +@@ -1380,27 +1380,6 @@ if [ -n "$CRYPTO_PATH" ]; then + echo " ... RSA_generate_key()$RSA found" + fi + +-echo "Checking for secure compile option support in $CC ..." +-GCCSEC="no" +-LDSEC="no" +-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +-echo '#include <stdio.h>' > $TMPC.c +-echo 'int main() { printf(""); return 0; }' >> $TMPC.c +-$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err +-test -x $TMPC && GCCSEC="yes" +-grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT" +-rm -f "$TMPC" +-$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err +-test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; } +-rm -f $TMPC $TMPC.c $TMPC.c.err +-echo " Compiling... $GCCSEC" +-echo " Linking... $LDSEC" +- +-echo "Checking for --allow-multiple-definition linker option ... $WALLOW" +-if [ "$WALLOW" = "yes" ]; then +- GCCSECOPT="$GCCSECOPT -Wl,--allow-multiple-definition" +-fi +- + echo + XDEFINES="" + XLIBS="" \ No newline at end of file diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild index 170b7b81086..4597ee4cb58 100644 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ b/net-analyzer/hydra/hydra-9999999.ebuild @@ -43,7 +43,7 @@ DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch + "${FILESDIR}"/${PN}-9999999-respect-cflags-more.patch ) src_prepare() { @@ -117,5 +117,5 @@ src_compile() { src_install() { dobin hydra pw-inspector use gtk && dobin hydra-gtk/src/xhydra - dodoc CHANGES README.md + dodoc CHANGES README }
