From a8f371bb7d2e16e4420ba8b09122c506dec63ea3 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 20 Jun 2014 12:42:45 +0200 Subject: www-client/inject: Injecteur HTTP simple Package-Manager: portage-2.2.10 --- www-client/inject/ChangeLog | 9 ++++++ www-client/inject/Manifest | 8 +++++ .../files/36-BUILD-INT_MAX-requires-limits.h.patch | 21 +++++++++++++ ...ve-hardcoded-march-i686-and-mpreferred-st.patch | 29 +++++++++++++++++ ...ve-hardcoded-march-i686-and-mpreferred-st.patch | 29 +++++++++++++++++ www-client/inject/inject-36.ebuild | 36 ++++++++++++++++++++++ www-client/inject/inject-9999.ebuild | 33 ++++++++++++++++++++ www-client/inject/metadata.xml | 8 +++++ 8 files changed, 173 insertions(+) create mode 100644 www-client/inject/ChangeLog create mode 100644 www-client/inject/Manifest create mode 100644 www-client/inject/files/36-BUILD-INT_MAX-requires-limits.h.patch create mode 100644 www-client/inject/files/36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch create mode 100644 www-client/inject/files/9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch create mode 100644 www-client/inject/inject-36.ebuild create mode 100644 www-client/inject/inject-9999.ebuild create mode 100644 www-client/inject/metadata.xml (limited to 'www-client') diff --git a/www-client/inject/ChangeLog b/www-client/inject/ChangeLog new file mode 100644 index 00000000..19559abf --- /dev/null +++ b/www-client/inject/ChangeLog @@ -0,0 +1,9 @@ +*inject-36 (20 Jun 2014) +*inject-9999 (20 Jun 2014) + + 20 Jun 2014; Bertrand Jacquin + +files/36-BUILD-INT_MAX-requires-limits.h.patch, + +files/36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch, + +files/9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch, + +inject-36.ebuild, +inject-9999.ebuild, +metadata.xml: + www-client/inject: Injecteur HTTP simple diff --git a/www-client/inject/Manifest b/www-client/inject/Manifest new file mode 100644 index 00000000..eda555a8 --- /dev/null +++ b/www-client/inject/Manifest @@ -0,0 +1,8 @@ +AUX 36-BUILD-INT_MAX-requires-limits.h.patch 507 SHA256 8ed85b5e9f51b1c8645fef2a305bd969d53f591e456a452a076fd03ae867eb0f WHIRLPOOL 10bb682203c7e1c491ab46b702d85f62803302032bdc0b5f3cb3be20c223b6acb2e672fd83e981277b25355de065cfb7d2dd9d2647ecc7e607a24d3d4dc34b86 +AUX 36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch 882 SHA256 69a1157313d392102473acfbe39bd631826a0fe6a397aba13e4b5365c497c4b8 WHIRLPOOL 5ddc00dc57ebed1cdb7eae53e796445fcd01dbdc8a67088c09ac2fb6c1fc096f5a85ce33748297babbb819e3a403e370ddf25f8c1d5cc5d583d9a7a529189418 +AUX 9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch 882 SHA256 3a5e32c4dc822c9d444cb738c47e6f460d43567b8e9e17befdd9876ea69100e0 WHIRLPOOL f034c3d274b86b490b13e60d985fdb114f1491f867a0b047779d62783693dc1a309b81a86978d237c64d33685a507708675ce7806e1f77d879ec0a9d2f668569 +DIST inject36.tar.gz 23142 SHA256 15fa2092c4e0bb680fd56536b15e20389209a3c3f93ad3f09f5670a07297963c WHIRLPOOL e706aff2f6e5694b76fe1d5c92e8e5376e67301f7634a993b0bd5a31355bcaf0670488377fcc073ce64a8357b280d268ac06580359ce4127545c69cd82632c57 +EBUILD inject-36.ebuild 713 SHA256 edc590d9687a56ba6438317a9e4d8543e90bcfc011be3fba94316e1a19c489bb WHIRLPOOL 59255783ba72510b7db63a35d37808147cd993cbd820037886655628d0d2ac94680702d577fd76e479423d8d662c29c84b29495c23a46b67dc368caf60d7e572 +EBUILD inject-9999.ebuild 605 SHA256 f6f1b715419efddab19a38e87fc7cd6af86059efe8c9c96cdc4844846eb6a7d0 WHIRLPOOL af34b1437883c615371c297d56141aecce847ff68b304371d1bdc3d64023091de2c1dcc1aead3c19a7dff80f3f08a737ac2c07ee0e1aa4ad4c3aea9c9c539067 +MISC ChangeLog 403 SHA256 e76ae51b8aa1752e3f8ad79600b726de2255b45ce88c991a8e853bd4e5db7586 WHIRLPOOL a8dececc6b182596ebc18f164835dfaaefb288122c4e74255cd4409e637cbafa2645cc2d86fa04dc1d426f55b085d457dda948d60e67ce5f47022280ee8dace7 +MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/www-client/inject/files/36-BUILD-INT_MAX-requires-limits.h.patch b/www-client/inject/files/36-BUILD-INT_MAX-requires-limits.h.patch new file mode 100644 index 00000000..15d582e3 --- /dev/null +++ b/www-client/inject/files/36-BUILD-INT_MAX-requires-limits.h.patch @@ -0,0 +1,21 @@ +From c92d40fb53a1690ff1378ab3b30523825d04b944 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Fri, 8 Jun 2012 16:09:31 +0200 +Subject: [PATCH] BUILD: INT_MAX requires limits.h + +--- + inject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/inject.c b/inject.c +index a38e9fa..458e868 100644 +--- a/inject.c ++++ b/inject.c +@@ -75,6 +75,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/www-client/inject/files/36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch b/www-client/inject/files/36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch new file mode 100644 index 00000000..71c6a8b6 --- /dev/null +++ b/www-client/inject/files/36-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch @@ -0,0 +1,29 @@ +From 1b4bf7f773d888ff4303f8e17f2641fdcb0d3e2a Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 20 Jun 2014 12:16:46 +0200 +Subject: [PATCH] MEDIUM: Remove hardcoded -march=i686 and + -mpreferred-stack-boundary=2 + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 02089d1..f2fc88a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,10 @@ + OBJS = inject injectl4 + + CC = gcc +-OPTS = -Os -momit-leaf-frame-pointer +-CPU = -march=i686 +-CPU_OPTS = -mpreferred-stack-boundary=2 -falign-functions=1 -falign-loops=1 -falign-jumps=1 +-LD_OPTS = -s ++OPTS = -momit-leaf-frame-pointer ++CPU = ++CPU_OPTS = -falign-functions=1 -falign-loops=1 -falign-jumps=1 ++LD_OPTS = + DEFINES = -DENABLE_SPLICE -DENABLE_TRUNC + CFLAGS = $(CPU) $(CPU_OPTS) $(OPTS) $(LD_OPTS) $(DEFINES) + diff --git a/www-client/inject/files/9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch b/www-client/inject/files/9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch new file mode 100644 index 00000000..6b5f0b42 --- /dev/null +++ b/www-client/inject/files/9999-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch @@ -0,0 +1,29 @@ +From 95bc52388f1c5fad677ddd559e26d9dc9eafe5ad Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 20 Jun 2014 12:16:46 +0200 +Subject: [PATCH] MEDIUM: Remove hardcoded -march=i686 and + -mpreferred-stack-boundary=2 + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 02089d1..f2fc88a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,10 @@ + OBJS = inject injectl4 + + CC = gcc +-OPTS = -Os -momit-leaf-frame-pointer +-CPU = -march=i686 +-CPU_OPTS = -mpreferred-stack-boundary=2 -falign-functions=1 -falign-loops=1 -falign-jumps=1 +-LD_OPTS = -s ++OPTS = -momit-leaf-frame-pointer ++CPU = ++CPU_OPTS = -falign-functions=1 -falign-loops=1 -falign-jumps=1 ++LD_OPTS = + DEFINES = -DENABLE_SPLICE -DENABLE_TRUNC + CFLAGS = $(CPU) $(CPU_OPTS) $(OPTS) $(LD_OPTS) $(DEFINES) + diff --git a/www-client/inject/inject-36.ebuild b/www-client/inject/inject-36.ebuild new file mode 100644 index 00000000..2f0ff9b1 --- /dev/null +++ b/www-client/inject/inject-36.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit eutils toolchain-funcs + +DESCRIPTION="Simple HTTP injector" +HOMEPAGE="http://1wt.eu/tools/inject" +SRC_URI="http://1wt.eu/tools/${PN}/${PN}${PV}.tar.gz" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}${PV}" + +src_prepare() { + epatch "${FILESDIR}/${PV}-BUILD-INT_MAX-requires-limits.h.patch" + epatch "${FILESDIR}/${PV}-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch" +} + +src_compile() { + emake "${PN}" \ + CC="$(tc-getCC)" \ + CPU="${CFLAGS}" \ + LD_OPTS="${LDFLAGS}" +} + +src_install() { + dobin "${PN}" +} diff --git a/www-client/inject/inject-9999.ebuild b/www-client/inject/inject-9999.ebuild new file mode 100644 index 00000000..ef5d6a04 --- /dev/null +++ b/www-client/inject/inject-9999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit eutils toolchain-funcs git-r3 + +DESCRIPTION="Simple HTTP injector" +HOMEPAGE="http://1wt.eu/tools/inject" +EGIT_REPO_URI="http://git.1wt.eu/git/${PN}.git" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${PV}-MEDIUM-Remove-hardcoded-march-i686-and-mpreferred-st.patch" +} + +src_compile() { + emake "${PN}" \ + CC="$(tc-getCC)" \ + CPU="${CFLAGS}" \ + LD_OPTS="${LDFLAGS}" +} + +src_install() { + dobin "${PN}" +} diff --git a/www-client/inject/metadata.xml b/www-client/inject/metadata.xml new file mode 100644 index 00000000..933498d8 --- /dev/null +++ b/www-client/inject/metadata.xml @@ -0,0 +1,8 @@ + + + + + beber@meleeweb.net + Bertrand Jacquin + + -- cgit v1.2.3