* [gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/, app-crypt/ophcrack/files/
@ 2020-05-10 11:04 Mike Auty
0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2020-05-10 11:04 UTC (permalink / raw
To: gentoo-commits
commit: c0b57206a2d619d2c930643397bdb8718786ade8
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 11:04:29 2020 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun May 10 11:04:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b57206
app-crypt/ophcrack: Fix issue 722030 (AR variable)
Also clears out old versions.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mike Auty <ikelos <AT> gentoo.org>
app-crypt/ophcrack/Manifest | 2 -
app-crypt/ophcrack/files/ophcrack-ar.patch | 13 +++
.../ophcrack/files/ophcrack-openssl-des.patch | 92 ----------------------
app-crypt/ophcrack/ophcrack-3.6.0.ebuild | 38 ---------
app-crypt/ophcrack/ophcrack-3.7.0.ebuild | 36 ---------
app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 17 ++--
6 files changed, 22 insertions(+), 176 deletions(-)
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 823ea2bfcb1..aa3a0de8f66 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,3 +1 @@
-DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
-DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
diff --git a/app-crypt/ophcrack/files/ophcrack-ar.patch b/app-crypt/ophcrack/files/ophcrack-ar.patch
new file mode 100644
index 00000000000..422c17398d2
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-ar.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common.mk.in b/src/common.mk.in
+index 0f090a8..9c133e0 100644
+--- a/src/common.mk.in
++++ b/src/common.mk.in
+@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
+ all:
+
+ %.a:
+- ar r $@ $^
++ $(AR) r $@ $^
+ $(RANLIB) $@
+
+ %.o: %.c
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
deleted file mode 100644
index 2515c178abb..00000000000
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/src/lmtable.c 2013-06-04 07:42:47 UTC
-+++ b/src/lmtable.c
-@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
- /*-------------------------------------------------------------------------*/
- void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
- uchar_t key[8];
-- des_key_schedule ks;
-- des_cblock *magic = (des_cblock*)lmmagic;
-+ DES_key_schedule ks;
-+ DES_cblock *magic = (DES_cblock*)lmmagic;
-
- key[0] = pwd[0];
- key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
-@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
- key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
- key[7] = (pwd[6] << 1) ;
-
-- des_set_odd_parity(&key);
-- des_set_key(&key, ks);
-- des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
-+ DES_set_odd_parity(&key);
-+ DES_set_key(&key, &ks);
-+ DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
- }
-
---- a/src/samdump2/samdump2.c 2015-03-30 02:26:33 UTC
-+++ b/src/samdump2/samdump2.c
-@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
- for (i=0;i<8;i++) {
- key[i] = (key[i]<<1);
- }
-- des_set_odd_parity((des_cblock *)key);
-+ DES_set_odd_parity((DES_cblock *)key);
- }
-
- /*
-@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
- unsigned char hbootkey[0x20];
-
- /* Des */
-- des_key_schedule ks1, ks2;
-- des_cblock deskey1, deskey2;
-+ DES_key_schedule ks1, ks2;
-+ DES_cblock deskey1, deskey2;
-
- int i, j;
-
-@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
-
- /* Get the two decrpt keys. */
- sid_to_key1(rid,(unsigned char *)deskey1);
-- des_set_key_checked((des_cblock *)deskey1,ks1);
-+ DES_set_key_checked((DES_cblock *)deskey1, &ks1);
- sid_to_key2(rid,(unsigned char *)deskey2);
-- des_set_key_unchecked((des_cblock *)deskey2,ks2);
-+ DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
-
- /* Decrypt the lanman password hash as two 8 byte blocks. */
-- des_ecb_encrypt((des_cblock *)obfkey,
-- (des_cblock *)fb, ks1, DES_DECRYPT);
-- des_ecb_encrypt((des_cblock *)(obfkey + 8),
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)obfkey,
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-
-
-
-@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
- if (lm_size != 0x14) {
- /* Get the two decrpt keys. */
- sid_to_key1(rid,(unsigned char *)deskey1);
-- des_set_key((des_cblock *)deskey1,ks1);
-+ DES_set_key((DES_cblock *)deskey1, &ks1);
- sid_to_key2(rid,(unsigned char *)deskey2);
-- des_set_key((des_cblock *)deskey2,ks2);
-+ DES_set_key((DES_cblock *)deskey2, &ks2);
- }
-
- /* Decrypt the NT md4 password hash as two 8 byte blocks. */
-- des_ecb_encrypt((des_cblock *)obfkey,
-- (des_cblock *)fb, ks1, DES_DECRYPT);
-- des_ecb_encrypt((des_cblock *)(obfkey + 8),
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)obfkey,
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-
- /* sf27 wrap to sf25 */
- //sf27( obfkey, (int*)&rid, fb );
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
deleted file mode 100644
index 94d9250666b..00000000000
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib"
-DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
-
-PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
-
-src_configure() {
-
- local myconf
-
- myconf="${myconf} $(use_enable debug) --disable-gui"
-
- econf ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
deleted file mode 100644
index 736f3bea8b8..00000000000
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib"
-DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
-
-src_configure() {
-
- local myconf
-
- myconf="${myconf} $(use_enable debug) --disable-gui"
-
- econf ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 98ebe5ffe25..c35c0f3c154 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug libressl qt5 +tables"
CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib
- qt5? ( dev-qt/qtcharts:5
- dev-qt/qtgui:5 )"
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/netwib
+ qt5? ( dev-qt/qtcharts:5
+ dev-qt/qtgui:5 )"
DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
+ virtual/pkgconfig
+ ${CDEPEND}"
RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
+ ${CDEPEND}"
+PATCHES=("${FILESDIR}/ophcrack-ar.patch")
src_configure() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/, app-crypt/ophcrack/files/
@ 2023-03-18 21:23 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2023-03-18 21:23 UTC (permalink / raw
To: gentoo-commits
commit: 55b721f46cd975804608700185143ba4a06c20eb
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 21:22:45 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 21:22:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b721f4
app-crypt/ophcrack: fix LLD build
Closes: https://bugs.gentoo.org/828946
Closes: https://bugs.gentoo.org/889364
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/ophcrack-3.8.0-buildsystem.patch | 223 +++++++++++++++++++++
app-crypt/ophcrack/files/ophcrack-ar.patch | 13 --
...crack-3.8.0.ebuild => ophcrack-3.8.0-r1.ebuild} | 35 ++--
3 files changed, 243 insertions(+), 28 deletions(-)
diff --git a/app-crypt/ophcrack/files/ophcrack-3.8.0-buildsystem.patch b/app-crypt/ophcrack/files/ophcrack-3.8.0-buildsystem.patch
new file mode 100644
index 000000000000..fc4ec60c016c
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-3.8.0-buildsystem.patch
@@ -0,0 +1,223 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -35,7 +35,7 @@
+ config \
+ config.h.in \
+ configure \
+- configure.in \
++ configure.ac \
+ COPYING \
+ INSTALL \
+ install-sh \
+@@ -82,13 +82,13 @@
+ tar cfj $(distdir).tar.bz2 $(distdir)
+ rm -rf $(distdir)
+
+-# automatic re-running of configure if the configure.in file has changed
+-configure: configure.in aclocal.m4
++# automatic re-running of configure if the configure.ac file has changed
++configure: configure.ac aclocal.m4
+ autoconf
+
+ # autoheader might not change config.h.in, so touch a stamp file
+ config.h.in: stamp-h.in
+-stamp-h.in: configure.in aclocal.m4
++stamp-h.in: configure.ac aclocal.m4
+ autoheader
+ echo timestamp > stamp-h.in
+
+--- a/configure.in
++++ b/configure.in
+@@ -68,7 +68,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_RANLIB
++AC_CHECK_TOOL([AR], [ar])
+
+ if test "$GCC" = "yes"; then
+ CFLAGS="$CFLAGS -Wall -std=gnu9x -pedantic -I.."
+@@ -167,55 +167,8 @@
+ AC_CHECK_LIB([pthread], [pthread_mutex_init], [], [AC_MSG_ERROR([ophcrack requires libpthread.])])
+ fi
+
+-
+-AC_MSG_CHECKING(for libssl)
+-with_ssl=no
+-AC_ARG_WITH(libssl, AC_HELP_STRING(--with-libssl=DIR,use libssl in DIR),
+-[ case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- ;;
+- *)
+- AC_MSG_RESULT(yes)
+- with_ssl=$withval
+- CFLAGS="$CFLAGS -I$with_ssl/include"
+- CXXFLAGS="$CXXFLAGS -I$with_ssl/include"
+- LIBS="$LIBS -L$with_ssl/lib -lssl -lcrypto"
+- ;;
+- esac ]
+-)
+-
+-if test "x$with_ssl" = "xno"; then
+- CHECK_SSL
+-fi
+-
+-with_expat=no
+-AC_ARG_WITH(libexpat, AC_HELP_STRING(--with-libexpat=DIR,use libexpat in DIR),
+-[ AC_MSG_CHECKING(for libexpat)
+- case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- ;;
+- *)
+- AC_MSG_RESULT(yes)
+- with_expat=$withval
+- if test "x$enable_win32" = "xyes"; then
+- CFLAGS="$CFLAGS -I$with_expat/lib"
+- CXXFLAGS="$CXXFLAGS -I$with_expat/lib"
+- LIBS="$LIBS -L$with_expat"
+- LIBS_END="$LIBS_END -lexpat"
+- else
+- CFLAGS="$CFLAGS -I$with_expat/include"
+- CXXFLAGS="$CXXFLAGS -I$with_expat/include"
+- LIBS="$LIBS -L$with_expat/lib -lexpat"
+- fi
+- ;;
+- esac ]
+-)
+-
+-if test "x$with_expat" = "xno"; then
+- AC_CHECK_LIB([expat], [XML_ParserCreate], [], [AC_MSG_ERROR([ophcrack requires libexpat.])])
+-fi
++PKG_CHECK_MODULES([EXPAT], [expat])
++PKG_CHECK_MODULES([CRYPTO], [libcrypto])
+
+ AC_CHECK_LIB([m], [sqrt], [], [AC_MSG_ERROR([ophcrack requires libmath.])])
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -20,9 +20,16 @@
+
+ CC = @CC@
+
+-CPPFLAGS = @CPPFLAGS@
+-CFLAGS = @CFLAGS@ -Icore -Intproba
+-LDFLAGS = @LDFLAGS@ @LIBS@
++CPPFLAGS = @CPPFLAGS@ -Icore -Intproba
++CFLAGS = @CFLAGS@
++LIBS = @LIBS@
++LDFLAGS = @LDFLAGS@
++
++EXPAT_CFLAGS = @EXPAT_CFLAGS@
++EXPAT_LIBS = @EXPAT_LIBS@
++
++CRYPTO_CFLAGS = @CRYPTO_CFLAGS@
++CRYPTO_LIBS = @CRYPTO_LIBS@
+
+ SUBDIRS = core ntproba samdump2 test
+ @HAVE_GUI_TRUE@SUBDIRS += gui
+@@ -48,7 +55,7 @@
+ ophcrack: gui/main.cpp core ntproba samdump2
+ cp $< main.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c main.c -o main.o
+- $(CC) main.o $(ARCHIVES) -o $@ $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) main.o $(ARCHIVES) -o $@ $(EXPAT_LIBS) $(CRYPTO_LIBS) $(LIBS)
+ rm main.c main.o
+
+ gui: core ntproba samdump2
+--- a/src/common.mk.in
++++ b/src/common.mk.in
+@@ -23,7 +23,14 @@
+
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@ @LIBS@
++LDFLAGS = @LDFLAGS@
++LIBS = @LIBS@
++
++EXPAT_CFLAGS = @EXPAT_CFLAGS@
++EXPAT_LIBS = @EXPAT_LIBS@
++
++CRYPTO_CFLAGS = @CRYPTO_CFLAGS@
++CRYPTO_LIBS = @CRYPTO_LIBS@
+
+ HEADERS = $(wildcard *.h)
+ SOURCES = $(wildcard *.c)
+@@ -32,11 +39,7 @@
+ all:
+
+ %.a:
+- ar r $@ $^
+- $(RANLIB) $@
+-
+-%.o: %.c
+- $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
++ $(AR) rcs $@ $^
+
+ clean_:
+ rm -f *.o *~
+--- a/src/core/Makefile.in
++++ b/src/core/Makefile.in
+@@ -17,7 +17,7 @@
+
+ include ../common.mk
+
+-CFLAGS += -I../.. -I../samdump2 -I../ntproba
++CPPFLAGS += -I../.. -I../samdump2 -I../ntproba $(CRYPTO_CFLAGS)
+
+ all: libophcrack.a
+
+--- a/src/gui/gui.pro.in
++++ b/src/gui/gui.pro.in
+@@ -30,7 +30,7 @@
+ ../ntproba/libntproba.a
+
+ PRE_TARGETDEPS += $$ARCHIVES
+-LIBS += $$ARCHIVES @LDFLAGS@ @LIBS@
++LIBS += $$ARCHIVES @LDFLAGS@ @EXPAT_LIBS@ @CRYPTO_LIBS@ @LIBS@
+
+ QMAKE_CC = @CC@
+ QMAKE_CXX = @CXX@
+--- a/src/ntproba/Makefile.in
++++ b/src/ntproba/Makefile.in
+@@ -17,6 +17,8 @@
+
+ include ../common.mk
+
++CPPFLAGS += $(EXPAT_CFLAGS) $(CRYPTO_CFLAGS)
++
+ all: libntproba.a
+
+ libntproba.a: $(OBJECTS)
+--- a/src/samdump2/Makefile.in
++++ b/src/samdump2/Makefile.in
+@@ -17,7 +17,7 @@
+
+ include ../common.mk
+
+-CFLAGS += -I../core
++CPPFLAGS += -I../core $(CRYPTO_CFLAGS)
+
+ all: libsamdump2.a
+
+--- a/src/test/Makefile.in
++++ b/src/test/Makefile.in
+@@ -17,7 +17,7 @@
+
+ include ../common.mk
+
+-CFLAGS += -I../.. -I../core -I../ntproba
++CPPFLAGS += -I../.. -I../core -I../ntproba
+
+ ARCHIVES = \
+ ../core/libophcrack.a \
+@@ -32,7 +32,7 @@
+ %.a:
+
+ test_%: test_%.o $(ARCHIVES)
+- $(CC) $^ -o $@ $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(EXPAT_LIBS) $(CRYPTO_LIBS) $(LIBS)
+
+ clean: clean_
+ rm -f $(TARGETS)
diff --git a/app-crypt/ophcrack/files/ophcrack-ar.patch b/app-crypt/ophcrack/files/ophcrack-ar.patch
deleted file mode 100644
index 422c17398d20..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-ar.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/common.mk.in b/src/common.mk.in
-index 0f090a8..9c133e0 100644
---- a/src/common.mk.in
-+++ b/src/common.mk.in
-@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
- all:
-
- %.a:
-- ar r $@ $^
-+ $(AR) r $@ $^
- $(RANLIB) $@
-
- %.o: %.c
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0-r1.ebuild
similarity index 54%
rename from app-crypt/ophcrack/ophcrack-3.8.0.ebuild
rename to app-crypt/ophcrack/ophcrack-3.8.0-r1.ebuild
index c74837410a94..2a8a1e16c775 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit desktop toolchain-funcs qmake-utils
+inherit autotools desktop qmake-utils xdg
DESCRIPTION="A time-memory-trade-off-cracker"
HOMEPAGE="https://ophcrack.sourceforge.io/"
@@ -12,15 +12,17 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug qt5 +tables"
+IUSE="gui +tables"
DEPEND="
- dev-libs/openssl:0=
+ dev-libs/openssl:=
dev-libs/expat
net-libs/netwib
- qt5? (
+ gui? (
dev-qt/qtcharts:5
+ dev-qt/qtcore:5
dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
)"
RDEPEND="
${DEPEND}
@@ -29,22 +31,25 @@ BDEPEND="
app-arch/unzip
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
-src_configure() {
- tc-export AR
+src_prepare() {
+ default
+ eautoreconf
+}
+src_configure() {
# bug #765229
- export PATH="$(qt5_get_bindir):${PATH}"
+ use gui && export PATH="$(qt5_get_bindir):${PATH}"
- econf \
- $(use_enable debug) \
- $(use_enable qt5 gui)
+ econf $(use_enable gui)
}
src_install() {
default
- newicon src/gui/pixmaps/os.xpm ophcrack.xpm
- make_desktop_entry "${PN}" OphCrack ophcrack
+ if use gui; then
+ newicon src/gui/pixmaps/os.xpm ophcrack.xpm
+ make_desktop_entry "${PN}" OphCrack ophcrack
+ fi
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-18 21:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-18 21:23 [gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/, app-crypt/ophcrack/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-05-10 11:04 Mike Auty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox