[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/, app-crypt/ophcrack/files/

2023-03-18 Thread David Seifert 
commit: 55b721f46cd975804608700185143ba4a06c20eb
Author: David Seifert  gentoo  org>
AuthorDate: Sat Mar 18 21:22:45 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Mar 18 21:22:45 2023 +
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  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 ..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 *.

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2022-06-01 Thread Sam James 
commit: 8fbf6d64174136c982cfb0beaeddf07bf255bf61
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  2 02:59:29 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  2 03:00:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbf6d64

app-crypt/ophcrack: fix finding qmake

Closes: https://bugs.gentoo.org/765229
Signed-off-by: Sam James  gentoo.org>

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index e6f536daf1ab..c74837410a94 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop toolchain-funcs
+inherit desktop toolchain-funcs qmake-utils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
 HOMEPAGE="https://ophcrack.sourceforge.io/";
@@ -34,6 +34,9 @@ PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
 src_configure() {
tc-export AR
 
+   # bug #765229
+   export PATH="$(qt5_get_bindir):${PATH}"
+
econf \
$(use_enable debug) \
$(use_enable qt5 gui)

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack-tables/

2022-01-27 Thread David Seifert 
commit: a0402615bdc69bf1b47600746c5140377e1a49fb
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jan 27 09:29:58 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Jan 27 09:29:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0402615

app-crypt/ophcrack-tables: use https

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild 
b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
index aa17736fffbf..62fa4d53da7b 100644
--- a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
+++ b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Tables available for ophcrack"
-HOMEPAGE="http://ophcrack.sourceforge.net/";
+HOMEPAGE="https://ophcrack.sourceforge.io";
 SRC_URI="
xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip )
xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack-tables/

2021-08-10 Thread David Seifert 
commit: 902cb54e953fbc7586f4a43fd5d1d564d51c3771
Author: David Seifert  gentoo  org>
AuthorDate: Tue Aug 10 22:03:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Aug 10 22:03:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=902cb54e

app-crypt/ophcrack-tables: update EAPI 5 -> 8

Signed-off-by: David Seifert  gentoo.org>

 .../ophcrack-tables/ophcrack-tables-1.0-r2.ebuild  | 28 ++
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild 
b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
index f350b7c57fa..aa17736fffb 100644
--- a/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
+++ b/app-crypt/ophcrack-tables/ophcrack-tables-1.0-r2.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 DESCRIPTION="Tables available for ophcrack"
 HOMEPAGE="http://ophcrack.sourceforge.net/";
-SRC_URI="xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip )
-xpsmall? ( 
mirror://sourceforge/ophcrack/tables_xp_free_small.zip )
-vistafree? ( 
mirror://sourceforge/ophcrack/tables_vista_free.zip )"
+SRC_URI="
+   xpfast? ( mirror://sourceforge/ophcrack/tables_xp_free_fast.zip )
+   xpsmall? ( mirror://sourceforge/ophcrack/tables_xp_free_small.zip )
+   vistafree? ( mirror://sourceforge/ophcrack/tables_vista_free.zip )"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="+xpfast xpsmall +vistafree"
-
 REQUIRED_USE="|| ( xpfast xpsmall vistafree )"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
-   for i in ${A};
-   do
+   local i table
+   for i in ${A}; do
table=${i#tables_}
table=${table%.zip}
-   mkdir "${S}/${table}"
+   mkdir "${S}"/${table} || die
cd $_ || die
unpack "${i}"
done
 }
 
 src_install() {
-   dodir /usr/share/ophcrack/
-   cp -r "${S}"/* "${ED}"/usr/share/ophcrack/ || die
+   insinto /usr/share/ophcrack
+   doins -r .
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2021-05-02 Thread Mikle Kolyada 
commit: 336d9c091bb85eb0e6dbc394128f84706318d0f0
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 16:34:40 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 16:40:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=336d9c09

app-crypt/ophcrack: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index d3623f2b5da..e6f536daf1a 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ 
SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl qt5 +tables"
+IUSE="debug qt5 +tables"
 
 DEPEND="
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )
+   dev-libs/openssl:0=
dev-libs/expat
net-libs/netwib
qt5? (

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2020-12-29 Thread Mike Auty 
commit: 2083f13d46be3c03cee8d5e355ede7bd1a75cfe3
Author: Mike Auty  gentoo  org>
AuthorDate: Tue Dec 29 16:44:27 2020 +
Commit: Mike Auty  gentoo  org>
CommitDate: Tue Dec 29 16:46:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2083f13d

app-crypt/ophcrack: Fix missing expat dependency

Signed-off-by: Mike Auty  gentoo.org>

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 02782e37778..d3623f2b5da 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop toolchain-funcs
 
 DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://ophcrack.sourceforge.io/";
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,6 +17,7 @@ IUSE="debug libressl qt5 +tables"
 DEPEND="
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
+   dev-libs/expat
net-libs/netwib
qt5? (
dev-qt/qtcharts:5

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2020-11-16 Thread David Seifert 
commit: 8c6d9a8fd2fce86f98e502acfc3cf2238da919a4
Author: David Seifert  gentoo  org>
AuthorDate: Mon Nov 16 09:52:51 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Nov 16 09:52:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6d9a8f

app-crypt/ophcrack: Port to EAPI 7

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 45 +---
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index c35c0f3c154..02782e37778 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A time-memory-trade-off-cracker"
 HOMEPAGE="http://ophcrack.sourceforge.net/";
@@ -13,32 +14,34 @@ SLOT="0"
 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 )"
-DEPEND="app-arch/unzip
-   virtual/pkgconfig
-   ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
-   ${CDEPEND}"
-PATCHES=("${FILESDIR}/ophcrack-ar.patch")
+DEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   net-libs/netwib
+   qt5? (
+   dev-qt/qtcharts:5
+   dev-qt/qtgui:5
+   )"
+RDEPEND="
+   ${DEPEND}
+   tables? ( app-crypt/ophcrack-tables )"
+BDEPEND="
+   app-arch/unzip
+   virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/ophcrack-ar.patch )
 
 src_configure() {
+   tc-export AR
 
-   local myconf
-
-   myconf="$(use_enable debug)"
-   myconf="${myconf} $(use_enable qt5 gui)"
-
-   econf ${myconf}
+   econf \
+   $(use_enable debug) \
+   $(use_enable qt5 gui)
 }
 
 src_install() {
-   emake install DESTDIR="${D}"
+   default
 
-   cd "${S}"
newicon src/gui/pixmaps/os.xpm ophcrack.xpm
make_desktop_entry "${PN}" OphCrack ophcrack
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/, app-crypt/ophcrack/files/

2020-05-10 Thread Mike Auty 
commit: c0b57206a2d619d2c930643397bdb8718786ade8
Author: Mike Auty  gentoo  org>
AuthorDate: Sun May 10 11:04:29 2020 +
Commit: Mike Auty  gentoo  org>
CommitDate: Sun May 10 11:04:29 2020 +
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  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 000..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..000
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
+++ /dev/null
@@ -1,92 +0,0 @@
 a/src/lmtable.c2013-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

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2018-06-01 Thread Mike Auty 
commit: 38ebb2937974e8e8f44fae32a3545a564c7eda5b
Author: Mike Auty  gentoo  org>
AuthorDate: Fri Jun  1 19:33:25 2018 +
Commit: Mike Auty  gentoo  org>
CommitDate: Fri Jun  1 19:33:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ebb293

app-crypt/ophcrack: Fix QA warning that repoman full didn't spot.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 9165b752e55..47dd6396381 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -17,7 +17,7 @@ CDEPEND="!libressl? ( dev-libs/openssl:0= )
 libressl? ( dev-libs/libressl:0= )
 net-libs/netwib
 qt5? ( dev-qt/qtcharts:5
-   dev-qt/qtgui:5 )"
+dev-qt/qtgui:5 )"
 DEPEND="app-arch/unzip
 virtual/pkgconfig
 ${CDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2018-05-31 Thread Mike Auty 
commit: b2168c789622195e6e0b6e001b6d942e2149edee
Author: Mike Auty  gentoo  org>
AuthorDate: Thu May 31 22:09:22 2018 +
Commit: Mike Auty  gentoo  org>
CommitDate: Thu May 31 22:09:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2168c78

app-crypt/ophcrack: Bump to 3.8.0 (and drop ppc due to qtcharts)

dev-qt/qtcharts-5 isn't keyworded for ppc, so we've dropped ppc support until
then.  Fixes issue 656932.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-crypt/ophcrack/Manifest  |  1 +
 app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 43 
 2 files changed, 44 insertions(+)

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index ee7d083927e..823ea2bfcb1 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,2 +1,3 @@
 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/ophcrack-3.8.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
new file mode 100644
index 000..9165b752e55
--- /dev/null
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -0,0 +1,43 @@
+# 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 ~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 )"
+DEPEND="app-arch/unzip
+virtual/pkgconfig
+${CDEPEND}"
+RDEPEND="tables? ( app-crypt/ophcrack-tables )
+${CDEPEND}"
+
+src_configure() {
+
+   local myconf
+
+   myconf="$(use_enable debug)"
+   myconf="${myconf} $(use_enable qt5 gui)"
+
+   econf ${myconf} || die "Failed to compile"
+}
+
+src_install() {
+   emake install DESTDIR="${D}" || die "Installation failed."
+
+   cd "${S}"
+   newicon src/gui/pixmaps/os.xpm ophcrack.xpm
+   make_desktop_entry "${PN}" OphCrack ophcrack
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2018-03-13 Thread Andreas Sturmlechner 
commit: a7990ab2ef9a6811b2571e76e8ed9aa8ca77b1cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 13 09:33:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 13 09:33:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7990ab2

app-crypt/ophcrack: Drop no-op USE=qt4

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/ophcrack/ophcrack-3.6.0.ebuild | 2 +-
 app-crypt/ophcrack/ophcrack-3.7.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index af496d8184f..1e5b264f0c7 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl qt4 +tables"
+IUSE="debug libressl +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 libressl? ( dev-libs/libressl:0= )

diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
index 661cfdd2e15..0e985ea1117 100644
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl qt4 +tables"
+IUSE="debug libressl +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 libressl? ( dev-libs/libressl:0= )

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2018-01-18 Thread Mike Auty 
commit: ee95681ef24fc075f799ad540a858eb4311e04f8
Author: Mike Auty  gentoo  org>
AuthorDate: Thu Jan 18 23:04:10 2018 +
Commit: Mike Auty  gentoo  org>
CommitDate: Thu Jan 18 23:04:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee95681e

app-crypt/ophcrack: Remove deprecated qt4 USE flag

Remove qt4 USE flag, drop old versions, bump to 3.7.0 and fix whitespace
issues as mentioned in bug 644410.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-crypt/ophcrack/Manifest|  2 +-
 app-crypt/ophcrack/ophcrack-3.6.0.ebuild   | 16 +---
 .../{ophcrack-3.4.0.ebuild => ophcrack-3.7.0.ebuild}   | 18 ++
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index be7e84e1a2e..ee7d083927e 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,2 +1,2 @@
-DIST ophcrack-3.4.0.tar.bz2 279806 BLAKE2B 
13bed55784aab2cfa4770c7a79077ebc8def314b925895c15c8bf7213ae5455fe392da3fcc7b2ab624cc2a892b8aae50790bde01fe8344e7ff4c4535f9afeb3b
 SHA512 
38c3b41e76be1b2990cbf6a8ddbe776df3d7821696e42939c759d554a7a52d40555f7e1c8f11e3ab7dc20b553f43d814e271d7519a3b4bb4f84b70468c123df0
 DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B 
bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a
 SHA512 
caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
+DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B 
f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312
 SHA512 
27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6

diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index 2d78a14dabf..af496d8184f 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,11 +15,10 @@ IUSE="debug libressl qt4 +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 libressl? ( dev-libs/libressl:0= )
-net-libs/netwib
-qt4? ( dev-qt/qtgui:4 )"
+net-libs/netwib"
 DEPEND="app-arch/unzip
-   virtual/pkgconfig
-   ${CDEPEND}"
+virtual/pkgconfig
+${CDEPEND}"
 RDEPEND="tables? ( app-crypt/ophcrack-tables )
 ${CDEPEND}"
 
@@ -29,16 +28,11 @@ src_configure() {
 
local myconf
 
-   myconf="$(use_enable qt4 gui)"
-   myconf="${myconf} $(use_enable debug)"
+   myconf="${myconf} $(use_enable debug) --disable-gui"
 
econf ${myconf} || die "Failed to compile"
 }
 
 src_install() {
emake install DESTDIR="${D}" || die "Installation failed."
-
-   cd "${S}"
-   newicon src/gui/pixmaps/os.xpm ophcrack.xpm
-   make_desktop_entry "${PN}" OphCrack ophcrack
 }

diff --git a/app-crypt/ophcrack/ophcrack-3.4.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
similarity index 67%
rename from app-crypt/ophcrack/ophcrack-3.4.0.ebuild
rename to app-crypt/ophcrack/ophcrack-3.7.0.ebuild
index a42ac68b77d..661cfdd2e15 100644
--- a/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -15,11 +15,10 @@ IUSE="debug libressl qt4 +tables"
 
 CDEPEND="!libressl? ( dev-libs/openssl:0= )
 libressl? ( dev-libs/libressl:0= )
-net-libs/netwib
-qt4? ( dev-qt/qtgui:4 )"
+net-libs/netwib"
 DEPEND="app-arch/unzip
-   virtual/pkgconfig
-   ${CDEPEND}"
+virtual/pkgconfig
+${CDEPEND}"
 RDEPEND="tables? ( app-crypt/ophcrack-tables )
 ${CDEPEND}"
 
@@ -27,16 +26,11 @@ src_configure() {
 
local myconf
 
-   myconf="$(use_enable qt4 gui)"
-   myconf="${myconf} $(use_enable debug)"
+   myconf="${myconf} $(use_enable debug) --disable-gui"
 
econf ${myconf} || die "Failed to compile"
 }
 
 src_install() {
emake install DESTDIR="${D}" || die "Installation failed."
-
-   cd "${S}"
-   newicon src/gui/pixmaps/os.xpm ophcrack.xpm
-   make_desktop_entry "${PN}" OphCrack ophcrack
 }

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/files/, app-crypt/ophcrack/

2016-07-16 Thread Mike Auty 
commit: d43d9a5220f0085765f4940dbd0bb25cfb3cd72d
Author: Mike Auty  gentoo  org>
AuthorDate: Sat Jul 16 18:19:52 2016 +
Commit: Mike Auty  gentoo  org>
CommitDate: Sat Jul 16 18:19:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43d9a52

app-crypt/ophcrack: Fix issue 588902 (deprecated ssl functions).

This fixes the deprecation of the des_ functions in favour of
DES_ functions in openssl (and libressl which appears to have
done the deprecation early).  The revision was not bumped since
this is an issue that exhibits at build time only.

Package-Manager: portage-2.3.0

 app-crypt/ophcrack/Manifest|  3 -
 .../ophcrack/files/ophcrack-openssl-des.patch  | 92 ++
 app-crypt/ophcrack/ophcrack-3.1.0-r2.ebuild| 35 
 app-crypt/ophcrack/ophcrack-3.3.0.ebuild   | 35 
 app-crypt/ophcrack/ophcrack-3.3.1.ebuild   | 43 --
 app-crypt/ophcrack/ophcrack-3.6.0.ebuild   |  4 +-
 6 files changed, 95 insertions(+), 117 deletions(-)

diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 99faa1e..c537601 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,5 +1,2 @@
-DIST ophcrack-3.1.0.tar.bz2 238869 SHA256 
706bee5d11d246ae16cbca87436a70f0e6f6dbc7d49d14318c1c71e74f5e069d SHA512 
7292ba86f4a346644f9b35fef34693315315ef2ce105d9159bb7958527d62cb57f40f7acb7140c7103f729e2d29d6c009d6f29ec25e9d649963e071adb96e1ad
 WHIRLPOOL 
c403b84957d9d6037e7e035aaca0215e6c7749c899d35edad5740ff5d370a7fda2faf6c067eef5b793d156e965642ac64f0c8ec2a2c41f344aff9bbd1be15c16
-DIST ophcrack-3.3.0.tar.bz2 255049 SHA256 
4c46f839cc752e6e9c69196574fa1fd17ff4e1bc4c1d1c0faa4b9228a3509a92 SHA512 
91bcaf73d1dd22f6a0895c54dcaab48fe2157a9ef44110401bf507cca7bf599506e263a01f4539a81b3f4484af8a1c465d8eb90ea13c35383166b2e1822a1231
 WHIRLPOOL 
81597fa07b02d88159bd3c6e98d4d4f264066f24eae1e4b908006d544c605e32c02de8738535ff0e61d3b64a759d6d2a27981cf76fb095a6979e77d4ecd9184f
-DIST ophcrack-3.3.1.tar.bz2 255238 SHA256 
4e23bfccde7962a873cd0c44f4da626795aec17fcfb078f4329ec7145b218d18 SHA512 
e5e889cbf6493d56afe0c76e0bccd5c544665057ed7cfc46a9f636b1660351fedb704e5b76f8a3ed76c70be4ab0d8c855b0d7b58aa949b12e513e3ad08db8ad0
 WHIRLPOOL 
8b14e4e04199b3a258f7914bafea3a13a1061ebb20614ead0dbb02a14f2dc2ba6d59affacc91e5f6ff837cb5e65bf16ac94d483d083445d8a2d45200843a1f04
 DIST ophcrack-3.4.0.tar.bz2 279806 SHA256 
06cb22d95a8ded79eebb99ac19bd21b27321e85fe0f22f32407d0b925b66d3e3 SHA512 
38c3b41e76be1b2990cbf6a8ddbe776df3d7821696e42939c759d554a7a52d40555f7e1c8f11e3ab7dc20b553f43d814e271d7519a3b4bb4f84b70468c123df0
 WHIRLPOOL 
887d9f397c061b06072cd48e15b89596c81c893d0cc1fb8eb960f0561249b0085025cfd88482aba8549414d3d634685503be14b9f97b16edc248859095a3a1dc
 DIST ophcrack-3.6.0.tar.bz2 288830 SHA256 
79219baa03afd7e52bc6d365dd5a445bc73dfac2e88216e7b050ad7749191893 SHA512 
caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
 WHIRLPOOL 
5e492257aa504883892cc5bf19e123330963257874f2b1ad3ed53895161987012c6bd23f449c72de81e68ac0ebcb7adbff77883f1a0d976c0aa99654c87d342e

diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch 
b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
new file mode 100644
index 000..2515c17
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
@@ -0,0 +1,92 @@
+--- a/src/lmtable.c2013-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
+

[gentoo-commits] repo/gentoo:master commit in: app-crypt/ophcrack/

2016-06-03 Thread Anthony G. Basile 
commit: 53c6a0d3c4db4e078b7398230e0817cd1b3f98a2
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Jun  3 14:06:40 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Jun  3 14:07:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c6a0d3

app-crypt/ophcrack: add libressl support

Package-Manager: portage-2.2.28

 app-crypt/ophcrack/ophcrack-3.3.1.ebuild | 9 +
 app-crypt/ophcrack/ophcrack-3.4.0.ebuild | 9 +
 app-crypt/ophcrack/ophcrack-3.6.0.ebuild | 9 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild 
b/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
index 22aa37c..1e1909f 100644
--- a/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug +tables"
+IUSE="debug libressl qt4 +tables"
 
-CDEPEND="dev-libs/openssl
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
 net-libs/netwib
 qt4? ( dev-qt/qtgui:4 )"
 DEPEND="app-arch/unzip

diff --git a/app-crypt/ophcrack/ophcrack-3.4.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
index 22aa37c..1e1909f 100644
--- a/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug +tables"
+IUSE="debug libressl qt4 +tables"
 
-CDEPEND="dev-libs/openssl
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
 net-libs/netwib
 qt4? ( dev-qt/qtgui:4 )"
 DEPEND="app-arch/unzip

diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild 
b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
index bf69121..1e1909f 100644
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="A time-memory-trade-off-cracker"
@@ -12,9 +12,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4 debug +tables"
+IUSE="debug libressl qt4 +tables"
 
-CDEPEND="dev-libs/openssl
+CDEPEND="!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
 net-libs/netwib
 qt4? ( dev-qt/qtgui:4 )"
 DEPEND="app-arch/unzip