From 6a7a986e169c7c32c1277adeec04f41c32c929bf Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 28 Sep 2016 17:16:29 -0400 Subject: [PATCH] edb: update with lots of help from Petross404 and a little from kensington --- dev-util/edb/Manifest | 2 +- dev-util/edb/edb-0.9.18.ebuild | 47 --------- dev-util/edb/edb-0.9.20.ebuild | 6 +- dev-util/edb/edb-0.9.20_p20160928.ebuild | 76 +++++++++++++++ dev-util/edb/edb-9999.ebuild | 89 +++++++++++------ .../pentoo-sources-4.7.4.ebuild | 95 +++++++++++++++++++ 6 files changed, 236 insertions(+), 79 deletions(-) delete mode 100644 dev-util/edb/edb-0.9.18.ebuild create mode 100644 dev-util/edb/edb-0.9.20_p20160928.ebuild create mode 100644 sys-kernel/pentoo-sources/pentoo-sources-4.7.4.ebuild diff --git a/dev-util/edb/Manifest b/dev-util/edb/Manifest index 81a505cb1..abb2b8654 100644 --- a/dev-util/edb/Manifest +++ b/dev-util/edb/Manifest @@ -1,2 +1,2 @@ -DIST debugger-0.9.18.tgz 725688 SHA256 dd046187ca6301265f1a2116919a3bf4af64c9ad3fa14809030abbfe82af7b43 SHA512 0329f53081c4a6621ac33f5132da9040a9aa3b154d8c0b3dd9e14efd44312b72f9e2e2a40414e0f2f03de895a48bfa89f793082c6f50669e195b93537b40df7c WHIRLPOOL a8aa4648350880d9560a33ee9ede3fadc19aac38cf3421e5aec2b9af3038ca39fa29c3a9ac94c93f483f6a22ba1d1e6ff6ecbd0efd55fcc185e8556980bc8f0b DIST debugger-0.9.20.tgz 791820 SHA256 fd4ebdf8a30ace88395b7b61407fd264cb3919d97368d4932201f0fed6b7ef4d SHA512 c65c023c351ee7aee47dbb743a6e84e9b9c680e9eef39caa1a873903c53aa48b451ea92b5363720d55277d81ca8a95741c0777a2748da9fb6d09957ff000ecb1 WHIRLPOOL 50da20b6f0b153697baba5ce1b91402863fa4c2b243c6416d48eb8854f5abc982915f1c19931f66f20dd6bfd5697dec2cab4c8f43e6cdb5c6fd4e31b9b86ba7f +DIST edb-0.9.20_p20160928.zip 1309006 SHA256 0c4f99884d7bbd3020553c10fdf8dd42e2f34e92a219756406aae352b98a68f0 SHA512 c0fe3f2002c625de3c0f04c86af3e7a0eb0e02b4a12acec35139381040ccadd5e0a1c3031a3189a931c8577f15dccd395965555b3e923bc54bf1043c34474f0d WHIRLPOOL c9ffe401d3796b3b4c682230605cc297fe8ed784f959ba9be5cb310fa2da46c93231596eb7967a010d3d9ab21d1c52ad9228c8257dd0c5dcf3101d856054e2c1 diff --git a/dev-util/edb/edb-0.9.18.ebuild b/dev-util/edb/edb-0.9.18.ebuild deleted file mode 100644 index c9683f71a..000000000 --- a/dev-util/edb/edb-0.9.18.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit eutils multilib - -DESCRIPTION="EDB \"Evan's Debugger\" (OllyDbg workalike for Linux)" -HOMEPAGE="http://www.codef00.com/projects.php#debugger" -SRC_URI="http://www.codef00.com/projects/debugger-${PV}.tgz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" -RESTRICT="strip" - -DEPEND=" - >=dev-qt/qtcore-4.5.0 - >=dev-qt/qtgui-4.5.0 - >=dev-libs/boost-1.35.0" - -RDEPEND="${DEPEND}" -S="${WORKDIR}/debugger" - -src_prepare() { - epatch "${FILESDIR}"/edb-ldflags.patch -} - -src_configure() { - qmake -makefile DEFAULT_PLUGIN_PATH="/usr/$(get_libdir)/edb/" || die "qmake failed" -} - -src_install() { - emake INSTALL_ROOT="${D}/usr/" install - dodoc CHANGELOG README README.plugins - #this file didn't exist - #dobin edb_make_symbolmap.sh -} - -pkg_postinst() { - einfo "Note: EBD's plugins are installed by default into /usr/$(get_libdir)/edb." - einfo "If you have previously used EDB and have it set to look in a" - einfo "different directory, then you will need to adjust this. Also" - einfo "EDB looks for plugins in the current working directory as well" - einfo "as the directory specified in the options, so that unpriviledged" - einfo "users can use plugins not installed system wide." -} diff --git a/dev-util/edb/edb-0.9.20.ebuild b/dev-util/edb/edb-0.9.20.ebuild index aeec9cdff..58b7e527f 100644 --- a/dev-util/edb/edb-0.9.20.ebuild +++ b/dev-util/edb/edb-0.9.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -16,8 +16,8 @@ IUSE="" RESTRICT="strip" DEPEND=" - >=dev-qt/qtcore-4.6.0 - >=dev-qt/qtgui-4.6.0 + >=dev-qt/qtcore-4.6.0:4 + >=dev-qt/qtgui-4.6.0:4 >=dev-libs/boost-1.35.0" RDEPEND="${DEPEND}" diff --git a/dev-util/edb/edb-0.9.20_p20160928.ebuild b/dev-util/edb/edb-0.9.20_p20160928.ebuild new file mode 100644 index 000000000..2c61ca94c --- /dev/null +++ b/dev-util/edb/edb-0.9.20_p20160928.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" +HOMEPAGE="https://github.com/eteran/edb-debugger" + +LICENSE="GPL-2" +IUSE="graphviz legacy-mem-write" +SLOT="0" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git" + KEYWORDS="" +else + MY_GIT_COMMIT="2a9d49f79ce225e7bb487e22315af192480d7130" + SRC_URI="https://github.com/eteran/edb-debugger/archive/${MY_GIT_COMMIT}.zip -> ${P}.zip" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}"/"${PN}"-debugger-"${MY_GIT_COMMIT}" +fi + +RDEPEND=" + >=dev-libs/capstone-3.0 + graphviz? ( >=media-gfx/graphviz-2.38.0 ) + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + dev-qt/qtnetwork:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + " +DEPEND=" + >=dev-libs/boost-1.35.0 + ${RDEPEND}" + +src_prepare(){ + if ! use graphviz; then + sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt + fi + eapply_user +} + +src_configure() { + mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=/usr + -DASSUME_PROC_PID_MEM_WRITE_BROKEN=$(usex legacy-mem-write Yes No) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install(){ + cmake-utils_src_install + mv "${ED}"/usr/share/pixmaps/${PN}48-logo.png "${ED}"/usr/share/pixmaps/${PN}.png || die +} + +pkg_postinst() { + if use legacy-mem-write; then + ewarn "You really do not want to turn on legacy-mem-write unless you need it." + ewarn "Be sure to test wihtout legacy-mem-write first and only enable if you actually need it." + else + ewarn + ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag" + ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues" + ewarn + fi +} diff --git a/dev-util/edb/edb-9999.ebuild b/dev-util/edb/edb-9999.ebuild index 9ab49d345..2c61ca94c 100644 --- a/dev-util/edb/edb-9999.ebuild +++ b/dev-util/edb/edb-9999.ebuild @@ -1,43 +1,76 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Id$ -EAPI=5 -inherit eutils multilib subversion +EAPI=6 -DESCRIPTION="EDB \"Evan's Debugger\" (OllyDbg workalike for Linux)" -HOMEPAGE="http://www.codef00.com/projects.php#debugger" -SRC_URI="" -ESVN_REPO_URI="http://edb-debugger.googlecode.com/svn/trunk/" +inherit cmake-utils + +DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" +HOMEPAGE="https://github.com/eteran/edb-debugger" LICENSE="GPL-2" +IUSE="graphviz legacy-mem-write" SLOT="0" -KEYWORDS="" -IUSE="" -RESTRICT="strip" +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git" + KEYWORDS="" +else + MY_GIT_COMMIT="2a9d49f79ce225e7bb487e22315af192480d7130" + SRC_URI="https://github.com/eteran/edb-debugger/archive/${MY_GIT_COMMIT}.zip -> ${P}.zip" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}"/"${PN}"-debugger-"${MY_GIT_COMMIT}" +fi + +RDEPEND=" + >=dev-libs/capstone-3.0 + graphviz? ( >=media-gfx/graphviz-2.38.0 ) + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + dev-qt/qtnetwork:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtcore:5 + " DEPEND=" - >=dev-qt/qtcore-4.5.0 - >=dev-qt/qtgui-4.5.0 - >=dev-libs/boost-1.35.0" + >=dev-libs/boost-1.35.0 + ${RDEPEND}" -RDEPEND="${DEPEND}" -S="${WORKDIR}/debugger" - -src_configure() { - qmake -makefile DEFAULT_PLUGIN_PATH="/usr/$(get_libdir)/edb/" || die "qmake failed" +src_prepare(){ + if ! use graphviz; then + sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt + fi + eapply_user } -src_install() { - emake INSTALL_ROOT="${D}/usr/" install - dodoc CHANGELOG README README.plugins +src_configure() { + mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=/usr + -DASSUME_PROC_PID_MEM_WRITE_BROKEN=$(usex legacy-mem-write Yes No) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install(){ + cmake-utils_src_install + mv "${ED}"/usr/share/pixmaps/${PN}48-logo.png "${ED}"/usr/share/pixmaps/${PN}.png || die } pkg_postinst() { - einfo "Note: EBD's plugins are installed by default into /usr/$(get_libdir)/edb." - einfo "If you have previously used EDB and have it set to look in a" - einfo "different directory, then you will need to adjust this. Also" - einfo "EDB looks for plugins in the current working directory as well" - einfo "as the directory specified in the options, so that unpriviledged" - einfo "users can use plugins not installed system wide." + if use legacy-mem-write; then + ewarn "You really do not want to turn on legacy-mem-write unless you need it." + ewarn "Be sure to test wihtout legacy-mem-write first and only enable if you actually need it." + else + ewarn + ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag" + ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues" + ewarn + fi } diff --git a/sys-kernel/pentoo-sources/pentoo-sources-4.7.4.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-4.7.4.ebuild new file mode 100644 index 000000000..a9be92e57 --- /dev/null +++ b/sys-kernel/pentoo-sources/pentoo-sources-4.7.4.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +ETYPE="sources" +K_WANT_GENPATCHES="base" +K_GENPATCHES_VER="1" +K_DEBLOB_AVAILABLE="1" + +inherit kernel-2 +detect_version + +HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1" +HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2" +PENPATCHES_VER="2" +PENPATCHES="penpatches-${PV}-${PENPATCHES_VER}.tar.xz" +PENPATCHES_URI="http://dev.pentoo.ch/~zero/distfiles/${PENPATCHES}" +SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI}" + +UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2 ${DISTDIR}/${PENPATCHES}" + +DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})" +HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/${PV}" +#IUSE="aufs deblob injection openfile_log pax_kernel" +IUSE="aufs deblob injection pax_kernel" + +#KEYWORDS="amd64 x86" + +DEPEND=">=sys-devel/gcc-4.5" +PDEPEND="=sys-apps/gradm-3.1*" + +pkg_setup() { + # We are proud of it, let's show it + UNIPATCH_EXCLUDE="4421_grsec-remove-localversion-grsec.patch" + if ! use pax_kernel; then + UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \ + 4427_force_XATTR_PAX_tmpfs.patch \ + 4440_selinux-avc_audit-log-curr_ip.patch \ + 4475_emutramp_default_on.patch \ + 44??-grsec* \ + 44??_grsec* \ + 4445_disable-compat_vdso.patch \ + 4420_grsecurity-* \ + 4465_selinux-avc_audit-log-curr_ip.patch \ + 4470_disable-compat_vdso.patch \ + 4508_aufs4-mmap-pax.patch \ + 4511_pax-4.4.2.patch" + else + UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \ + 1500_XATTR_USER_PREFIX.patch \ + 2900_dev-root-proc-mount-fix.patch \ + 4508_aufs4-mmap.patch \ + 4400_logo_larry_the_cow.patch" + fi + if ! use aufs ; then + UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \ + 4506_aufs4-kbuild.patch \ + 4507_aufs4-base.patch \ + 4508_aufs4-mmap.patch \ + 4508_aufs4-mmap-pax.patch \ + 4509_aufs4-standalone.patch \ + 4510_aufs4-files.patch \ + 4511_pax-4.4.2.patch" + fi + if ! use injection ; then + UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} \ + 4002_mac80211-2.6.29-fix-tx-ctl-no-ack-retry-count.patch \ + 4004_zd1211rw-inject+dbi-fix-4.4ish.patch \ + 4005_ipw2200-inject.3.4.6.patch" + fi + #use openfile_log && UNIPATCH_LIST="${UNIPATCH_LIST} ${FILESDIR}/openfile_log-36.patch" + UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 4500-new-dect-stack.patch" +} + +pkg_postinst() { + kernel-2_pkg_postinst + + ewarn "It may be desired to download the official pentoo kernel config from here:" + if use amd64; then + if use pax_kernel; then + ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/amd64/kernel/config-${PV}" + else + ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/amd64/kernel/config-${PV}-soft" + fi + fi + if use x86; then + if use pax_kernel; then + ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/x86/kernel/config-${PV}" + else + ewarn "https://github.com/pentoo/pentoo-livecd/tree/master/livecd/x86/kernel/config-${PV}-soft" + fi + fi +}