public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/
Date: Mon, 14 May 2012 18:19:47 +0000 (UTC)	[thread overview]
Message-ID: <1337019574.d55049ef2aec33ab7b988136d89e65ede8582748.prometheanfire@gentoo> (raw)

commit:     d55049ef2aec33ab7b988136d89e65ede8582748
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 18:19:34 2012 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon May 14 18:19:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=d55049ef

first attempt to fix the patch for 1.7

---
 .../files/fix-prestripped-binaries-1.7.0.patch     |   23 ++++++++++++++++++++
 net-analyzer/icinga/icinga-1.7.0_beta1.ebuild      |    2 +-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
new file mode 100644
index 0000000..3dc7978
--- /dev/null
+++ b/net-analyzer/icinga/files/fix-prestripped-binaries-1.7.0.patch
@@ -0,0 +1,23 @@
+diff -Naur icinga-1.5.1.orig//base/Makefile.in icinga-1.5.1/base/Makefile.in
+--- icinga-1.5.1.orig//base/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/base/Makefile.in	2011-11-14 19:45:36.000000000 -0500
+@@ -41,7 +41,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIURL=@cgiurl@
+ HTMURL=@htmurl@
+diff -Naur icinga-1.5.1.orig//cgi/Makefile.in icinga-1.5.1/cgi/Makefile.in
+--- icinga-1.5.1.orig//cgi/Makefile.in	2011-09-09 11:50:53.000000000 -0400
++++ icinga-1.5.1/cgi/Makefile.in	2011-11-14 19:45:47.000000000 -0500
+@@ -21,7 +21,7 @@
+ INSTALL_OPTS=@INSTALL_OPTS@
+ INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
+ COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++STRIP=/bin/true
+ 
+ CGIEXTRAS=@CGIEXTRAS@

diff --git a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
index 360d4fa..0c34605 100644
--- a/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.0_beta1.ebuild
@@ -37,7 +37,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
 }
 
 src_configure() {



             reply	other threads:[~2012-05-14 18:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-14 18:19 Matt Thode [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-05-14 19:02 [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/files/, net-analyzer/icinga/ Matt Thode
2012-05-14 18:34 Matt Thode
2012-05-14 18:27 Matt Thode
2012-05-14 18:01 Matt Thode
2012-01-12 17:11 Matt Thode
2011-12-04 19:20 Matt Thode
2011-11-25 17:59 Matt Thode
2011-11-22 22:45 Matt Thode

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337019574.d55049ef2aec33ab7b988136d89e65ede8582748.prometheanfire@gentoo \
    --to=prometheanfire@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox