diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-26 00:10:07 +0100 |
| commit | 95461df035e3867364495f065e5e805bf629b2d7 (patch) | |
| tree | 867dce371a84a696e91be255d89f282975aa0480 /net-analyzer/hydra | |
| parent | 46eedbedafdb0040c37884982d4c775ce277fb7b (diff) | |
gentoo resync : 25.10.2021
Diffstat (limited to 'net-analyzer/hydra')
| -rw-r--r-- | net-analyzer/hydra/Manifest | 3 | ||||
| -rw-r--r-- | net-analyzer/hydra/files/hydra-9999999-respect-cflags-more.patch | 31 | ||||
| -rw-r--r-- | net-analyzer/hydra/hydra-9999999.ebuild | 4 |
3 files changed, 35 insertions, 3 deletions
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index b4ebc4f95e5f..a3dd3cc2510e 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,7 +1,8 @@ AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a +AUX hydra-9999999-respect-cflags-more.patch 1241 BLAKE2B 6f0cab7a763d0eb1cee2e20ab5dc8889e45c3ada5ba1dd9be79a029f2d22ec8d027af18cb61ca22418f1662ba68d7bbf7dad2fcdffc05ce0471f06b7db14fa49 SHA512 b01bd45cecc90984bb1c97749d4c333973d72fea75719f9f1a7d848ce9fba1933a1cb8ff3b452699fad64b5ae716e6e1bc872b077fa2dcb36363de802c0b59b7 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322 EBUILD hydra-9.1.ebuild 3565 BLAKE2B 0194fe7972904f7cb3941db204847863739c933ff6fe1340664e3d467b77ab47df699e3197856182792dc49b0ef888b4283486151395e83cb2490776da20047d SHA512 9415468c35018864d296d2ff73d74f682c22145cb6bc4862a4f75c5d53484361a9023e2d91e0ddc9a08a34e01bbb8bd5a4f0e6dea82d328ca760a37d0c3e18b2 EBUILD hydra-9.2.ebuild 3600 BLAKE2B 5e330a0145a4896cac130e4aa18b442d06fdc431b910da5488253e633588b85c877b51b1138385118b1c1127cebb9d3a7ccda9d24c8774d3e24f4cfbd84431da SHA512 35dd11e14736c1e8d322196b095c7930e828243bcf2a207256b7df8fdc8b870178fa0e676971adbd1e5ad0ab847a727874e9791c9bc8bf7dfd31162b2e06b151 -EBUILD hydra-9999999.ebuild 3526 BLAKE2B 62437e07d91e5424234b7adb9c86c6d9cb00b89e9133d37cdbcc861fa2d793737073e4c5243e612480d3333b2a514d7da690659d022a878a6ba0016e3e385d75 SHA512 9179b9f969452208c3be9720cb5529c01ebe44f1e5d58870365bf2b0b13138ba8d7fdf1a5b540ce2a8044aaf2448fc1614ff0e036a3c9b5aeaa53ae45ca47311 +EBUILD hydra-9999999.ebuild 3527 BLAKE2B 94d7b1ea6060c9fe2b365a96f75056a14036b3dd06edf5e5829c27efe83d27e5ce671a07793e144081fcf289f0131e88b46e5e155cec00c2a59e2e3b20fc983f SHA512 97d2ff803fae962de0efa28c94287973888cf64d729cd26ed2da38eff0a97bdf733789a27bbcdbe421fa82956263efa35083a8285c32b8e5d04ed576fe0e3132 MISC metadata.xml 584 BLAKE2B c408a4a825d860594a10c6ba9a562a5fb96344f2a02a5d7ff12622c986ebb2ba05eeff5a7a3c79c09a437c14fc7024df33196ccd7f6566325f2f7920afe2d545 SHA512 e548b8600a0b3d9a548b963c1b3dc6c917606942f165f7c0859ad7e877c21dbe677c964d54f9548e38452170c4a3b4872ec81436100ec7b55123628bf4383da8 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 000000000000..0fe5753ec8af --- /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 170b7b810865..4597ee4cb589 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 } |