From bdc0a028bfa13f75d07da18438ba7bf79eeff571 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 19 Dec 2021 08:06:01 +0100
Subject: [PATCH] codecrypt, revbump/patch/fix build for new cryptopp (#6479)

---
 app-crypt/codecrypt/codecrypt-1.8.recipe      |  4 +-
 .../codecrypt/patches/codecrypt-1.8.patchset  | 65 +++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 app-crypt/codecrypt/patches/codecrypt-1.8.patchset

diff --git a/app-crypt/codecrypt/codecrypt-1.8.recipe b/app-crypt/codecrypt/codecrypt-1.8.recipe
index 7483d2ad7..bc8aa4157 100644
--- a/app-crypt/codecrypt/codecrypt-1.8.recipe
+++ b/app-crypt/codecrypt/codecrypt-1.8.recipe
@@ -6,9 +6,10 @@ COPYRIGHT="2013-2016 Mirek Kratochvil"
 LICENSE="GNU GPL v3
 	GNU LGPL v3
 	"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://e-x-a.org/codecrypt/files/codecrypt-$portVersion.tar.gz"
 CHECKSUM_SHA256="3be7c2a548aa336dbac706c3cab2071664d02b11652c16c02a8b4fb5cac6bc88"
+PATCHES="codecrypt-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -41,6 +42,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	chmod +x configure
 	CPPFLAGS="-D_BSD_SOURCE" LIBS="-lbsd" runConfigure ./configure
 	make $jobArgs
 }
diff --git a/app-crypt/codecrypt/patches/codecrypt-1.8.patchset b/app-crypt/codecrypt/patches/codecrypt-1.8.patchset
new file mode 100644
index 000000000..9ebbfc703
--- /dev/null
+++ b/app-crypt/codecrypt/patches/codecrypt-1.8.patchset
@@ -0,0 +1,65 @@
+From 3f416dad98e5b526f0bc14714cdd3704241578bc Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 19 Dec 2021 07:51:02 +0000
+Subject: codecrypt, fix build
+
+
+diff --git a/configure b/configure
+old mode 100755
+new mode 100644
+index 30b676a..5a7bc38
+--- a/configure
++++ b/configure
+@@ -16468,12 +16468,12 @@ if test -n "$CRYPTOPP_CFLAGS"; then
+     pkg_cv_CRYPTOPP_CFLAGS="$CRYPTOPP_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto++\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libcrypto++") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcryptopp\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libcryptopp") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CRYPTOPP_CFLAGS=`$PKG_CONFIG --cflags "libcrypto++" 2>/dev/null`
++  pkg_cv_CRYPTOPP_CFLAGS=`$PKG_CONFIG --cflags "libcryptopp" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16485,12 +16485,12 @@ if test -n "$CRYPTOPP_LIBS"; then
+     pkg_cv_CRYPTOPP_LIBS="$CRYPTOPP_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcrypto++\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libcrypto++") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcryptopp\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libcryptopp") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CRYPTOPP_LIBS=`$PKG_CONFIG --libs "libcrypto++" 2>/dev/null`
++  pkg_cv_CRYPTOPP_LIBS=`$PKG_CONFIG --libs "libcryptopp" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -16511,14 +16511,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CRYPTOPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcrypto++" 2>&1`
++	        CRYPTOPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcryptopp" 2>&1`
+         else
+-	        CRYPTOPP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcrypto++" 2>&1`
++	        CRYPTOPP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcryptopp" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CRYPTOPP_PKG_ERRORS" >&5
+ 
+-	as_fn_error $? "Package requirements (libcrypto++) were not met:
++	as_fn_error $? "Package requirements (libcryptopp) were not met:
+ 
+ $CRYPTOPP_PKG_ERRORS
+ 
+-- 
+2.30.2
+