From 3a1f3d94646f8de8b0ca07db0177a58205414bbf Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Thu, 20 Nov 2014 17:26:55 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- app-misc/binwalk/ChangeLog | 10 ++- app-misc/binwalk/Manifest | 22 ++++--- app-misc/binwalk/binwalk-2.0.1.ebuild | 44 +++++++++++++ .../binwalk/files/binwalk-2.0.1-libs.patch | 14 +++++ .../files/binwalk-2.0.1-makefile.patch | 61 +++++++++++++++++++ 5 files changed, 140 insertions(+), 11 deletions(-) create mode 100644 app-misc/binwalk/binwalk-2.0.1.ebuild create mode 100644 app-misc/binwalk/files/binwalk-2.0.1-libs.patch create mode 100644 app-misc/binwalk/files/binwalk-2.0.1-makefile.patch diff --git a/app-misc/binwalk/ChangeLog b/app-misc/binwalk/ChangeLog index 728f78928616..eb5ec593af2e 100644 --- a/app-misc/binwalk/ChangeLog +++ b/app-misc/binwalk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/binwalk -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.32 2013/11/06 06:56:15 radhermit Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/ChangeLog,v 1.33 2014/11/20 17:26:54 radhermit Exp $ + +*binwalk-2.0.1 (20 Nov 2014) + + 20 Nov 2014; Tim Harder +binwalk-2.0.1.ebuild, + +files/binwalk-2.0.1-libs.patch, +files/binwalk-2.0.1-makefile.patch: + Version bump. *binwalk-1.2.2_p1 (06 Nov 2013) diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest index 1db6d2528269..c1957fd29213 100644 --- a/app-misc/binwalk/Manifest +++ b/app-misc/binwalk/Manifest @@ -2,20 +2,24 @@ Hash: SHA256 AUX binwalk-1.2-no-deps-check.patch 1368 SHA256 773aa2bd7b3c98952dfa7b009a5eeb34ef3d84d308b19bd526b4e5579b99ea07 SHA512 6670178b945f507f0db7fdceaa9cd2889e17fcabce7bb27dd442db1307e05e8f0ebcc35825e273fe2b60f3c5516638b9b39ec1ee242ffe248a2d07ed263d2b63 WHIRLPOOL 49a9cb37bd6568f4236fa25bc87080ec01df04108a158bfd92059a8118ba81a4fc6ea98a49600edf53d0474b49dae0dc1f995ebc90491eefbeef267b09e82fe1 +AUX binwalk-2.0.1-libs.patch 499 SHA256 346d8c6f3ac16c794733c86eff58eb1f40b8955cf29e9a9e8fd1fece8863a18e SHA512 0f88e00dba085f915fa272cc976976bbfc8bb6a91b2677c76adf1e4020dd68dfa58bfa28d07a0c6310c50824241f94578fe387959ea1b3aab2bf63f3c6200903 WHIRLPOOL 95f95ca987f9e87939528d48c1ec00d5c464f76c5d60a4c0eb4cf060baf247a2f9cdf7cd5ea3c3b25f1ee80f7f399aea2947bd6c5b046618874fb203f1428763 +AUX binwalk-2.0.1-makefile.patch 1886 SHA256 e0ad03c7713b91f75c89e6d4fd742a2f7cd2edfda70d717f4cf3a4cef1b01f3a SHA512 4db674377973aa8e640c276902cac939af06725996b01788e078caf4e028b6dd6306c5cf0034cb1dd8f7e2127afcbf3a435e038a5f10252e2b519dbe232e06d0 WHIRLPOOL 4617e1c07167508c403ebcb4c0996ef37d8ff8e04131af2ccf39ae81b8e0fbb81b872a801f7b22380b1ee8d9999a9e382578e449827aa6832a2a020ed59f16bc DIST binwalk-1.2.1.tar.gz 89964 SHA256 5d286900b01af22499ac86f9fab7f8fb430e00e2c4cdafc142573837e16eb0c1 SHA512 a330e7ddd67faed1d1511a9c20d71fb96ba9637a78fb10165445c8c40ca7deb9b115b4f694d30a4327a26253830724fad4494048e251b74564bf4405439eb8c7 WHIRLPOOL fa1cf8c760407f0c685997b4454138399dd1d34caf355cf1fb34ae8423e549591f1f221e477e4286efdcdce38ad4ab0fd5a551901539a1fa7e2ac46b537e94fb DIST binwalk-1.2.2-1.tar.gz 100036 SHA256 32971bc0f02e26debfdebc8514b37d809c5a31e43e79fa3cb9d88dcf526dfb57 SHA512 64802aa9ec24744a824db29d943fb54042aba83fe59bc245eab767b1d812befd14e062fb4f709f08b49ea45dd516f813222029e1284c1d95c9c7315044642aef WHIRLPOOL 35ddf0482a9ddcd558066917475f11b4def3eaea19a8f75f2a1089c2cddb3100bee8accee298d79dd3fa94f6e8239178bc7fa93eb31084442154ef5cf92d71ed +DIST binwalk-2.0.1.tar.gz 2234469 SHA256 90ee8426d71e91b62dfe4a1446c457bc7835b475b28717859e275a0494403959 SHA512 de223f61a0a212469c21b8e36d02cadc83f1cdb96a0f6114490d15d8dc12c93a86b46ef74379acb96b32b305e75ca66e940d7a18a8dc3b5036ebe8946dcca0f3 WHIRLPOOL c66ea461132417629f59e3f7562330f038263a0d522aca1db1e85f0bad5e9564d8baa27125acfb67404f0ee8045bd8da71faedcf3d2e352303ca8b0295a2767d EBUILD binwalk-1.2.1.ebuild 732 SHA256 c45240f243307bde4af4606e7cc62800ada7dd4c1dbe81f679f7a12c5cefbc5d SHA512 9a458f5f755f67a02e082f3af40c796b7c4888b7a4a3196464daca79bc628992446012a2cd3ad60ffbcf3c27f9acb53a8258b4c7c06987394a0bcf593d281433 WHIRLPOOL dfb9a366c90d67b9bf7106b38a056f811d577823f055bbe0a7a9db2678896501a24a2ad3eaf8d5bb411f8a16713a30ba755f5ad2cf8e929429996d224aae9351 EBUILD binwalk-1.2.2_p1.ebuild 768 SHA256 1a5ae63aeb297924d8adb7467edef667a4091e80795cfcd62f313e3e7de62fa5 SHA512 2702b9fc28219aa470f013946663e72824b6557c6bdfd192b7b2ab2ed66e37048bed544fab3bdbc0e3d81a91a4f977b8231a12d86c8c07c4f956f5b41f907f8a WHIRLPOOL d0096310a315917c420291920d57f91f7dc90ec2ec338ae85384ca7198f61195080394b763eea4164fa229c09029b7f35ff415103917ceaa771030b856760a8a -MISC ChangeLog 4800 SHA256 68b26decf91183afda7479d3b0320670beb84b7801dc213485bbbb66f345d9b7 SHA512 329bcd51145d199874eeabe462be7b7f3b74fb8d07675e53123e76e0afb5e72f021476aac2f30c2e58d2e3fc7265ba9be653866342e070287f35baf0a220679d WHIRLPOOL 0a04c745348142c90797ff6a10679b328a06d2588501e4cd4450bc1af384623909f3f15dca1eaf21d21259f7fa6bd3f8d6dbd2e86cf480146e0fde53fa8c1862 +EBUILD binwalk-2.0.1.ebuild 963 SHA256 26e29052190451433600d452ad982684d54f0518c2daed7e3c2f0ebee376aa4e SHA512 3e437040846f6b6468a8a50c958da40af19f955d3b8113b06efec4e89be664a0d14e3b9b4ed3ad238224197ba3cb4564378097e466c32f24ccd2ba0277c21fd5 WHIRLPOOL 36b8aed214db62716c425dcf83ebe03784162ea7c01a1e10dd4a7f2dc942a67febf2889b5b9d07ba0c784819d56cb9edaeaf4abb7c01246d6a4964ad2ee51cab +MISC ChangeLog 4991 SHA256 988331406f34c0642a86cb41d8131a78bbdd1f97721c80519a84fd65a727cfe8 SHA512 7219c3b08c68630857ba3a7ed186d925d7fd7beeff5fb76488d65782efe17821914821a71d4f1e895c192ab3e54fc299027f4c685814ee29575f0afaddb4d59b WHIRLPOOL 8f4b0409a6db71a99aebfbf216cc7f6b2edcbbd83e024f449d3ab792dab1783e35d4510618d028cd2949c287f53aef82075cf2e16730d2033e335766c82ca1ba MISC metadata.xml 961 SHA256 919f7fe73600cbead22daa1c386071f46c98ba16aacd81b30bb8567f3324193f SHA512 a65c354968aa3b1a5d45bad191d4d0522eee79a4430945c992a1d1c2313ea7b048b6525475742ba9956527bef0e0766e74a4ded2f3b861e2b5d107ff41e33a83 WHIRLPOOL bea8bb42b7807efc02017838f311d60acac6a8c3338f9681dd4c379db7443e965819bb3614f137c3036b39be3c1a3106d78ae969263256a6cce979df68ee3a9d -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJSeegTAAoJEEqz6FtPBkyjnsoH/RAacYkoeVC/VgMElJvPN0ry -SIErnKExE0n7c2lrpgJhWqO6HqSFAozqWtT/uzGgwkDQhZ7+XUBkMfUx0lwYzIyk -YJK65Z5mIUkhEZ5jV3ShT5BpO/mHlXoSRTjQw2NN2Zw+Nusr4ynkFgW+Hrd4lx8n -ukr0sGXEhK99LcK5bWAuA1XqEsDhNWo0E15KTpGTAkW09pmODhDZy44rOENqNpb5 -uE2amxUmh/s76eQqDLgav9jCMt3LLh0tTPKcgA+zkbIbyS1BVUiv74IKUsbnF3qF -6USaPco3x3sKnJ/I6w4dAi4ARRXFuDz8bjB3KonGulMiK+B4de0Wgm3qFfcU9JQ= -=6b16 +iQEcBAEBCAAGBQJUbiRkAAoJEEqz6FtPBkyj1GcH/0V1964Afj+O7GpXKNXcbaqm +GwTEaW8ipjU3B/ADfG4Njce1oY2dv5QvlgXP90eKk4Sn+hnr+SprwSHP13mwEZmM +PiO3oxKhOSJp94SX1PovKKM9uT0GMFyquw+EFrSJknMEeoLf7T7ks1MkNElQDO0e +p+KCtLR2ytRxz45iwOcY8YaeledaeuoCzCOM9Q4rprrjmhQPlZPpkx1m1k6+jZRP +R0ZXH42SRxMX9Im6HOunDQpIoq887v5oCTT4n10beVbcj6zqMd7AiZw10OLCanI2 +2wC+sd3mr1JpWix8fqHIbt1UN/SjftKL8Y8NvR4pWpsxT+Zp5BvRKB/TtZyW6v8= +=v92q -----END PGP SIGNATURE----- diff --git a/app-misc/binwalk/binwalk-2.0.1.ebuild b/app-misc/binwalk/binwalk-2.0.1.ebuild new file mode 100644 index 000000000000..48c23f92decf --- /dev/null +++ b/app-misc/binwalk/binwalk-2.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/binwalk/binwalk-2.0.1.ebuild,v 1.1 2014/11/20 17:26:54 radhermit Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +MY_P=${P/_p/-} +DESCRIPTION="A tool for identifying files embedded inside firmware images" +HOMEPAGE="https://github.com/devttys0/binwalk" +SRC_URI="https://github.com/devttys0/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="graph" + +RDEPEND=" + app-crypt/ssdeep + sys-apps/file[python] + graph? ( dev-python/pyqtgraph[opengl,${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-libs.patch +) + +python_configure_all() { + econf --disable-bundles +} + +python_compile_all() { + emake +} + +python_install_all() { + local DOCS=( API.md INSTALL.md ) + distutils-r1_python_install_all + + dolib.so src/C/*/*.so +} diff --git a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch b/app-misc/binwalk/files/binwalk-2.0.1-libs.patch new file mode 100644 index 000000000000..5a746a4176fc --- /dev/null +++ b/app-misc/binwalk/files/binwalk-2.0.1-libs.patch @@ -0,0 +1,14 @@ +Don't install C libs by default since we don't need to install them for +every python version since they aren't linked with libpython. + +--- binwalk-2.0.1/setup.py ++++ binwalk-2.0.1/setup.py +@@ -134,7 +134,7 @@ + + # The data files to install along with the module + data_dirs = ["magic", "config", "plugins", "modules", "core"] +-install_data_files = [os.path.join("libs", "*.so")] ++install_data_files = [] + + for data_dir in data_dirs: + install_data_files.append("%s%s*" % (data_dir, os.path.sep)) diff --git a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch b/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch new file mode 100644 index 000000000000..e70f096ea6b4 --- /dev/null +++ b/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch @@ -0,0 +1,61 @@ +Don't build python via the makefile and fix parallel make jobs. + +--- binwalk-2.0.1/Makefile.in ++++ binwalk-2.0.1/Makefile.in +@@ -33,21 +33,20 @@ + $(PYTHON) ./setup.py install $(PREFIX) + + build: +- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi +- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi +- $(PYTHON) ./setup.py build ++ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR); fi ++ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR); fi + + deps: + ./deps.sh + + clean: +- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi +- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi ++ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) clean; fi ++ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) clean; fi + $(PYTHON) ./setup.py clean + + distclean: clean +- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi +- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi ++ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) distclean; fi ++ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) distclean; fi + rm -rf Makefile config.* *.cache + + uninstall: +--- binwalk-2.0.1/src/C/Makefile ++++ binwalk-2.0.1/src/C/Makefile +@@ -3,9 +3,9 @@ + .PHONY: all clean_libs clean distclean + + all: +- make -C miniz ++ $(MAKE) -C miniz + cp miniz/*.$(SOEXT) $(LIB_DIR) +- make -C compress ++ $(MAKE) -C compress + cp compress/*.$(SOEXT) $(LIB_DIR) + + clean_libs: +@@ -13,10 +13,10 @@ + rm -f $(LIB_DIR)/libcompress42.$(SOEXT) + + clean: clean_libs +- make -C miniz clean +- make -C compress clean ++ $(MAKE) -C miniz clean ++ $(MAKE) -C compress clean + + distclean: clean_libs +- make -C miniz distclean +- make -C compress distclean ++ $(MAKE) -C miniz distclean ++ $(MAKE) -C compress distclean + -- 2.26.2