Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-02-13 02:41:43 +01:00
Code Issues Projects Releases Wiki Activity

Fixed pyrit-9999, don't patch unconditionally

Browse source
This commit is contained in:
jensp 2009-11-28 17:54:23 +00:00
parent 187b1ccea7
commit bd7294aa48
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app-crypt/pyrit/Manifest
View file

@ -1,6 +1,6 @@
AUX pyrit-0.2.2.patch 1072 RMD160 a78dfe38760d6146848f054da2b2b2ea2abf9a8e SHA1 8848b76dda5d332975537021bb9d7996d7c17f91 SHA256 3c424fab44379b5e81f001887baf15ba0afc2e0466d29d612865303e689fa980
AUX pyrit-0.2.4.patch 1106 RMD160 ddb3374356d684376420eb6ca0032945f0bd9492 SHA1 4d4399a4e2b4c0fee932dad2ec4e9562a5fb6704 SHA256 6f0345c00c6dc7fc4b13a3b6ce94c030d2db568b1b772100bd68cb200dce0f43
AUX pyrit-9999.patch 1106 RMD160 ddb3374356d684376420eb6ca0032945f0bd9492 SHA1 4d4399a4e2b4c0fee932dad2ec4e9562a5fb6704 SHA256 6f0345c00c6dc7fc4b13a3b6ce94c030d2db568b1b772100bd68cb200dce0f43
AUX pyrit-9999.patch 950 RMD160 4bade1fc92ab97c77d62f7d3ebee960e8b1b71f7 SHA1 8c83d40418b69088f0cfcc48336722889e5cb289 SHA256 663f821ee8e30b3f0e35d6415379b3268c5ada29d163fb21d9a3ba576698b0b6
EBUILD pyrit-0.2.2-r1.ebuild 1149 RMD160 f66e5dcf8013df3774b35ee06ce91b7a038063c0 SHA1 e4fcf70b88c259c264098c1bcdfcd14c359a4200 SHA256 26916241933d5c690ec8b8564dd9e20d11ebaa63b3826576dd10ff0ffbfa7206
EBUILD pyrit-0.2.4-r1.ebuild 1154 RMD160 84785048aec804c37e4c52549be9ad65b550e352 SHA1 c9141cf96da083e7b382e3923ef73e1be8c81b3f SHA256 15cb221d235efbd16b435b69612471ab683efa6f7d32c226b731f0aa500b57d8
EBUILD pyrit-9999.ebuild 1041 RMD160 5bb0da9f72b2eebe3e1e67959c768d4b5eb10366 SHA1 a3569632eefe50aa9f7e1da954a63727aa0fac2f SHA256 5f2297382a9edd69cfb1b782428d960bd32bb8cb72908e015f0b49ab3ecb64e0
EBUILD pyrit-9999.ebuild 1211 RMD160 b5110bb055d81d659a9ad9424050915ac8f8e406 SHA1 f95e4348f3fbc307bb05b05e26ef584bb39f6b3d SHA256 34ac3e9a831cc35aaa7b745920c2a81dad2566f7989c3c77928acee03de343b1

23
app-crypt/pyrit/files/pyrit-9999.patch
View file

@ -1,26 +1,25 @@
Index: cpyrit_stream/setup.py
===================================================================
--- cpyrit_stream/setup.py (revision 168)
+++ cpyrit_stream/setup.py (working copy)
@@ -27,19 +27,10 @@
--- setup.py.orig 2009-11-21 14:30:29.756444115 +0100
+++ setup.py 2009-11-21 14:33:18.623230521 +0100
@@ -27,20 +27,9 @@
import subprocess
# Try to find the Brook+ library and headers
-STREAM_LIB_DIRS = []
-STREAM_INC_DIRS = []
+STREAM_INC_DIRS = ['/opt/atibrook/include','/opt/atibrook/include/brook']
+STREAM_LIB_DIRS = ['/opt/atibrook/lib','/usr/lib']
+STREAM_LIB_DIRS = ['/opt/atibrook/include','/opt/atibrook/include/brook']
+STREAM_INC_DIRS = ['/opt/atibrook/lib','/usr/lib']
BRCC = 'brcc'
-for path in ('/usr/local/atibrook/sdk','/opt/atibrook/sdk'):
-for path in ('/usr/local/atibrook/sdk', '/opt/atibrook/sdk'):
- if os.path.exists(path):
- STREAM_LIB_DIRS.append(os.path.sep.join((path, 'lib')))
- STREAM_INC_DIRS.append(os.path.sep.join((path, 'include')))
- BRCC = os.path.sep.join((path, 'bin', 'brcc'))
- break
-else:
- print >>sys.stderr, "The AMD-Stream compiler, headers and libraries required to build the kernel were not found. Trying to continue anyway..."
- print >>sys.stderr, "The AMD-Stream compiler, headers and libraries " \
- "required to build the kernel were not found. " \
- "Trying to continue anyway..."
-
try:
svn_info = subprocess.Popen(('svn', 'info'), stdout=subprocess.PIPE).stdout.read()
version_string = '0.2.4 (svn r%i)' % int(re.compile('Revision: ([0-9]*)').findall(svn_info)[0])
svn_info = subprocess.Popen(('svn', 'info'), \

7
app-crypt/pyrit/pyrit-9999.ebuild
View file

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
inherit eutils python distutils subversion
inherit eutils python distutils subversion flag-o-matic
DESCRIPTION="A GPU-based WPA-PSK and WPA2-PSK cracking tool"
HOMEPAGE="http://code.google.com/p/pyrit/"
ESVN_REPO_URI="http://pyrit.googlecode.com/svn/trunk/"
@ -16,7 +16,8 @@ DEPEND="stream? ( >=dev-util/ati-stream-sdk-bin-1.4.0_beta )
RDEPEND="${DEPEND}"
src_compile() {
epatch "${FILESDIR}/pyrit-9999.patch"
# pyrit fails with --as-needed will investigate properly later
filter-ldflags -Wl,--as-needed
cd "${S}/pyrit"
distutils_src_compile
if use cuda; then
@ -24,6 +25,8 @@ src_compile() {
distutils_src_compile
fi
if use stream; then
# patch is only needed when compiling with stream support
epatch "${FILESDIR}/pyrit-9999.patch"
cd "${S}/cpyrit_stream"
distutils_src_compile
fi