* [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
[not found] <1444338280.8fe8aa173945158ebd3bd849b6304992eb29ddeb.zerochaos@gentoo>
@ 2015-10-09 15:37 ` hasufell
2015-10-09 16:23 ` Alexis Ballier
2015-10-09 15:37 ` hasufell
1 sibling, 1 reply; 6+ messages in thread
From: hasufell @ 2015-10-09 15:37 UTC (permalink / raw
To: gentoo-dev, Richard Farina
On 10/08/2015 11:04 PM, Richard Farina wrote:
> commit: 8fe8aa173945158ebd3bd849b6304992eb29ddeb
> Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
> AuthorDate: Thu Oct 8 20:48:03 2015 +0000
> Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
> CommitDate: Thu Oct 8 21:04:40 2015 +0000
> URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe8aa17
>
> dev-ruby/metasploit-payloads: import version bump from pentoo
>
> Package-Manager: portage-2.2.22
>
> dev-ruby/metasploit-payloads/Manifest | 1 +
> .../metasploit-payloads-1.0.15.ebuild | 45 ++++++++++++++++++++++
> 2 files changed, 46 insertions(+)
>
> diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
> index f16e5c6..9450c38 100644
> --- a/dev-ruby/metasploit-payloads/Manifest
> +++ b/dev-ruby/metasploit-payloads/Manifest
> @@ -1 +1,2 @@
> +DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
> DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
>
> diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> new file mode 100644
> index 0000000..87598a1
> --- /dev/null
> +++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> @@ -0,0 +1,45 @@
> +# Copyright 1999-2015 Gentoo Foundation
> +# Distributed under the terms of the GNU General Public License v2
> +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
> +
Incorrect header
[...]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
[not found] <1444338280.8fe8aa173945158ebd3bd849b6304992eb29ddeb.zerochaos@gentoo>
2015-10-09 15:37 ` [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/ hasufell
@ 2015-10-09 15:37 ` hasufell
2015-10-09 15:42 ` Michał Górny
1 sibling, 1 reply; 6+ messages in thread
From: hasufell @ 2015-10-09 15:37 UTC (permalink / raw
To: gentoo-dev, Richard Farina
On 10/08/2015 11:04 PM, Richard Farina wrote:
> commit: 8fe8aa173945158ebd3bd849b6304992eb29ddeb
> Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
> AuthorDate: Thu Oct 8 20:48:03 2015 +0000
> Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
> CommitDate: Thu Oct 8 21:04:40 2015 +0000
> URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe8aa17
>
> dev-ruby/metasploit-payloads: import version bump from pentoo
>
> Package-Manager: portage-2.2.22
>
> dev-ruby/metasploit-payloads/Manifest | 1 +
> .../metasploit-payloads-1.0.15.ebuild | 45 ++++++++++++++++++++++
> 2 files changed, 46 insertions(+)
>
> diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
> index f16e5c6..9450c38 100644
> --- a/dev-ruby/metasploit-payloads/Manifest
> +++ b/dev-ruby/metasploit-payloads/Manifest
> @@ -1 +1,2 @@
> +DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
> DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
>
> diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> new file mode 100644
> index 0000000..87598a1
> --- /dev/null
> +++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> @@ -0,0 +1,45 @@
> +# Copyright 1999-2015 Gentoo Foundation
> +# Distributed under the terms of the GNU General Public License v2
> +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
> +
> +EAPI=5
> +
> +USE_RUBY="ruby19 ruby20 ruby21"
> +
> +RUBY_FAKEGEM_TASK_DOC=""
> +
> +RUBY_FAKEGEM_EXTRAINSTALL="data"
> +
> +inherit ruby-fakegem
> +
> +DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
> +HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
> +
> +LICENSE="BSD"
> +
> +SLOT="${PV}"
> +KEYWORDS="~amd64 ~arm ~x86"
> +IUSE=""
> +
> +#no tests
> +RESTRICT="test strip"
> +
> +QA_PREBUILT="
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
> + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
> + "
> +
> +src_install() {
> + ruby-ng_src_install
> + #tell revdep-rebuild to ignore binaries meant for the target
> + dodir /etc/revdep-rebuild
> + cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
> + #These dirs contain prebuilt binaries for running on the TARGET not the HOST
> + SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
> + EOF
> +}
>
technically, 'cat' can fail too (e.g. if directory does not exist), so
it should '|| die' at the end of this line
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
2015-10-09 15:37 ` hasufell
@ 2015-10-09 15:42 ` Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2015-10-09 15:42 UTC (permalink / raw
To: hasufell; +Cc: gentoo-dev, Richard Farina
[-- Attachment #1: Type: text/plain, Size: 4376 bytes --]
Dnia 2015-10-09, o godz. 17:37:55
hasufell <hasufell@gentoo.org> napisał(a):
> On 10/08/2015 11:04 PM, Richard Farina wrote:
> > commit: 8fe8aa173945158ebd3bd849b6304992eb29ddeb
> > Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
> > AuthorDate: Thu Oct 8 20:48:03 2015 +0000
> > Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
> > CommitDate: Thu Oct 8 21:04:40 2015 +0000
> > URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe8aa17
> >
> > dev-ruby/metasploit-payloads: import version bump from pentoo
> >
> > Package-Manager: portage-2.2.22
> >
> > dev-ruby/metasploit-payloads/Manifest | 1 +
> > .../metasploit-payloads-1.0.15.ebuild | 45 ++++++++++++++++++++++
> > 2 files changed, 46 insertions(+)
> >
> > diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
> > index f16e5c6..9450c38 100644
> > --- a/dev-ruby/metasploit-payloads/Manifest
> > +++ b/dev-ruby/metasploit-payloads/Manifest
> > @@ -1 +1,2 @@
> > +DIST metasploit-payloads-1.0.15.gem 5249536 SHA256 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240 SHA512 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a WHIRLPOOL d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
> > DIST metasploit-payloads-1.0.9.gem 5248000 SHA256 bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3 SHA512 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed WHIRLPOOL a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
> >
> > diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> > new file mode 100644
> > index 0000000..87598a1
> > --- /dev/null
> > +++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> > @@ -0,0 +1,45 @@
> > +# Copyright 1999-2015 Gentoo Foundation
> > +# Distributed under the terms of the GNU General Public License v2
> > +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
> > +
> > +EAPI=5
> > +
> > +USE_RUBY="ruby19 ruby20 ruby21"
> > +
> > +RUBY_FAKEGEM_TASK_DOC=""
> > +
> > +RUBY_FAKEGEM_EXTRAINSTALL="data"
> > +
> > +inherit ruby-fakegem
> > +
> > +DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
> > +HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
> > +
> > +LICENSE="BSD"
> > +
> > +SLOT="${PV}"
> > +KEYWORDS="~amd64 ~arm ~x86"
> > +IUSE=""
> > +
> > +#no tests
> > +RESTRICT="test strip"
> > +
> > +QA_PREBUILT="
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
> > + usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
> > + "
> > +
> > +src_install() {
> > + ruby-ng_src_install
> > + #tell revdep-rebuild to ignore binaries meant for the target
> > + dodir /etc/revdep-rebuild
> > + cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT}
> > + #These dirs contain prebuilt binaries for running on the TARGET not the HOST
> > + SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
> > + EOF
> > +}
> >
>
> technically, 'cat' can fail too (e.g. if directory does not exist), so
> it should '|| die' at the end of this line
Before someone gets confused, the correct bash syntax here is:
cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
...
EOF
--
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
2015-10-09 15:37 ` [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/ hasufell
@ 2015-10-09 16:23 ` Alexis Ballier
2015-10-09 16:30 ` hasufell
0 siblings, 1 reply; 6+ messages in thread
From: Alexis Ballier @ 2015-10-09 16:23 UTC (permalink / raw
To: gentoo-dev
On Fri, 9 Oct 2015 17:37:10 +0200
hasufell <hasufell@gentoo.org> wrote:
> On 10/08/2015 11:04 PM, Richard Farina wrote:
> > commit: 8fe8aa173945158ebd3bd849b6304992eb29ddeb
> > Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
> > AuthorDate: Thu Oct 8 20:48:03 2015 +0000
> > Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
> > CommitDate: Thu Oct 8 21:04:40 2015 +0000
> > URL:
> > https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe8aa17
> >
> > dev-ruby/metasploit-payloads: import version bump from pentoo
> >
> > Package-Manager: portage-2.2.22
> >
> > dev-ruby/metasploit-payloads/Manifest | 1 +
> > .../metasploit-payloads-1.0.15.ebuild | 45
> > ++++++++++++++++++++++ 2 files changed, 46 insertions(+)
> >
> > diff --git a/dev-ruby/metasploit-payloads/Manifest
> > b/dev-ruby/metasploit-payloads/Manifest index f16e5c6..9450c38
> > 100644 --- a/dev-ruby/metasploit-payloads/Manifest
> > +++ b/dev-ruby/metasploit-payloads/Manifest
> > @@ -1 +1,2 @@
> > +DIST metasploit-payloads-1.0.15.gem 5249536 SHA256
> > 8d186c3bcf8a4537b9a96301e8cc0d847335d3cfa87ca5b2e88a6b2980eab240
> > SHA512
> > 58afa5c4bc191a05e3ec009d94d40f2d9fc5a025962088845db14aefc410340fdc7b1e30f17c75936495a43fc99576d188960bc5755dbec434d7428fbbdd495a
> > WHIRLPOOL
> > d136642c1de9b18e652c421ad3b9fd859b8d8850dd539d66d4c8b410e09064d7872bc06c505b01d5389d1e2ebe22ed6b3c88aa3a0f08a1578f204201c24b3438
> > DIST metasploit-payloads-1.0.9.gem 5248000 SHA256
> > bd9eec335158dd25e579c680856f8c48aa9ba081a5d51d87a05dbb1e511087a3
> > SHA512
> > 4c08284d4b1d667f545d97e879b2581830f34d42560ba6d6ed7adf32312adc841d5fdd8b55ab4e06a196d1e313fb44fbb861ccac7790e50f88260e2def0a76ed
> > WHIRLPOOL
> > a398dcad94b38626d4bd3d9980d05a24ccdbc12bbd2e902dd4f78c9bcd2cf4a26c76645d989a00aec69d041d9203c5ff31e0b0f948028ac6cd06ae724d573950
> >
> > diff --git
> > a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> > b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> > new file mode 100644 index 0000000..87598a1 --- /dev/null
> > +++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.15.ebuild
> > @@ -0,0 +1,45 @@
> > +# Copyright 1999-2015 Gentoo Foundation
> > +# Distributed under the terms of the GNU General Public License v2
> > +#
> > $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v
> > 1.1 2014/10/19 23:24:24 zerochaos Exp $ +
>
> Incorrect header
this one annoys me a lot; can't we get repoman to automagically fix it ?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
2015-10-09 16:23 ` Alexis Ballier
@ 2015-10-09 16:30 ` hasufell
2015-10-09 16:33 ` Alexis Ballier
0 siblings, 1 reply; 6+ messages in thread
From: hasufell @ 2015-10-09 16:30 UTC (permalink / raw
To: gentoo-dev
On 10/09/2015 06:23 PM, Alexis Ballier wrote:
>>> +# Copyright 1999-2015 Gentoo Foundation
>>> +# Distributed under the terms of the GNU General Public License v2
>>> +#
>>> $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v
>>> 1.1 2014/10/19 23:24:24 zerochaos Exp $ +
>>
>> Incorrect header
>
>
> this one annoys me a lot; can't we get repoman to automagically fix it ?
>
repoman is already broken in that regard as it expects overlay
maintainers to add gentoo copyright, which really makes no sense.
So we would first have to fix that and afair this is blocked by the API
rewrite dol-sen is doing.
Then, a --switch to automagically fix the header could make sense.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/
2015-10-09 16:30 ` hasufell
@ 2015-10-09 16:33 ` Alexis Ballier
0 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2015-10-09 16:33 UTC (permalink / raw
To: gentoo-dev
On Fri, 9 Oct 2015 18:30:53 +0200
hasufell <hasufell@gentoo.org> wrote:
> On 10/09/2015 06:23 PM, Alexis Ballier wrote:
> >>> +# Copyright 1999-2015 Gentoo Foundation
> >>> +# Distributed under the terms of the GNU General Public License
> >>> v2 +#
> >>> $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v
> >>> 1.1 2014/10/19 23:24:24 zerochaos Exp $ +
> >>
> >> Incorrect header
> >
> >
> > this one annoys me a lot; can't we get repoman to automagically fix
> > it ?
> >
>
> repoman is already broken in that regard as it expects overlay
> maintainers to add gentoo copyright, which really makes no sense.
>
> So we would first have to fix that and afair this is blocked by the
> API rewrite dol-sen is doing.
>
> Then, a --switch to automagically fix the header could make sense.
from man repoman:
fix Fix simple QA issues (stray digests, missing digests)
sounds like a match :)
(ewww digests....)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-10-09 16:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1444338280.8fe8aa173945158ebd3bd849b6304992eb29ddeb.zerochaos@gentoo>
2015-10-09 15:37 ` [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasploit-payloads/ hasufell
2015-10-09 16:23 ` Alexis Ballier
2015-10-09 16:30 ` hasufell
2015-10-09 16:33 ` Alexis Ballier
2015-10-09 15:37 ` hasufell
2015-10-09 15:42 ` Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox