[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/, app-crypt/reop/files/

2024-07-11 Thread David Roman 
commit: 1fd7313bb6cc36d7aa1efe51a641500da0bfdd66
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Wed Jul 10 23:46:57 2024 +
Commit: David Roman  gmail  com>
CommitDate: Wed Jul 10 23:48:00 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fd7313b

app-crypt/reop: Modern-C fixes

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 .../reop-2.1.1-base64-function-signatures.patch| 41 ++
 .../reop-2.1.1-bcrypt_hash-cdata-sizeof.patch  | 11 ++
 .../{reop-2.1.1.ebuild => reop-2.1.1-r1.ebuild}|  7 +++-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app-crypt/reop/files/reop-2.1.1-base64-function-signatures.patch 
b/app-crypt/reop/files/reop-2.1.1-base64-function-signatures.patch
new file mode 100644
index 0..1641abd81
--- /dev/null
+++ b/app-crypt/reop/files/reop-2.1.1-base64-function-signatures.patch
@@ -0,0 +1,41 @@
+--- a/other/other.c
 b/other/other.c
+@@ -328,11 +328,7 @@ static const char Pad64 = '=';
+*/
+ 
+ int
+-b64_ntop(src, srclength, target, targsize)
+-  u_char const *src;
+-  size_t srclength;
+-  char *target;
+-  size_t targsize;
++b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
+ {
+   size_t datalength = 0;
+   u_char input[3];
+@@ -392,10 +388,7 @@ b64_ntop(src, srclength, target, targsize)
+  */
+ 
+ int
+-b64_pton(src, target, targsize)
+-  char const *src;
+-  u_char *target;
+-  size_t targsize;
++b64_pton(char const *src, u_char *target, size_t targsize)
+ {
+   int tarindex, state, ch;
+   u_char nextbyte;
+diff --git a/other/other.h b/other/other.h
+index 08701fa..9ff1c0d 100644
+--- a/other/other.h
 b/other/other.h
+@@ -3,6 +3,9 @@
+ 
+ #define _PATH_TTY "/dev/tty"
+ 
++int b64_ntop(u_char const *src, size_t srclength, char *target, size_t 
targsize);
++int b64_pton(char const *src, u_char *target, size_t targsize);
++
+ #ifndef HAVE_STRLCAT
+ size_t strlcat(char *dst, const char *src, size_t siz);
+ #endif

diff --git a/app-crypt/reop/files/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch 
b/app-crypt/reop/files/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch
new file mode 100644
index 0..d418740d3
--- /dev/null
+++ b/app-crypt/reop/files/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch
@@ -0,0 +1,11 @@
+--- a/other/other.c
 b/other/other.c
+@@ -659,7 +659,7 @@ bcrypt_hash(u_int8_t *sha2pass, u_int8_t *sha2salt, 
u_int8_t *out)
+   cdata[i] = Blowfish_stream2word(ciphertext, sizeof(ciphertext),
+   );
+   for (i = 0; i < 64; i++)
+-  blf_enc(, cdata, sizeof(cdata) / sizeof(uint64_t));
++  blf_enc(, cdata, sizeof(cdata) / sizeof(uint32_t));
+ 
+   /* copy out */
+   for (i = 0; i < BCRYPT_BLOCKS; i++) {

diff --git a/app-crypt/reop/reop-2.1.1.ebuild 
b/app-crypt/reop/reop-2.1.1-r1.ebuild
similarity index 76%
rename from app-crypt/reop/reop-2.1.1.ebuild
rename to app-crypt/reop/reop-2.1.1-r1.ebuild
index 6ce103535..0d22e5341 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,11 @@ KEYWORDS="~amd64"
 DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/reop-2.1.1-base64-function-signatures.patch"
+   "${FILESDIR}/reop-2.1.1-bcrypt_hash-cdata-sizeof.patch"
+)
+
 src_compile() {
emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
 }

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2021-06-27 Thread Andrew Ammerlaan 
commit: 592331311e3cf8a3f3c6826993f164c81c35b2ac
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sun Jun 27 13:49:14 2021 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sun Jun 27 13:49:14 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=59233131

app-crypt/reop: Bump to EAPI-8

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 app-crypt/reop/reop-2.1.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index a4bb9583b..6ce103535 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -22,7 +22,7 @@ src_compile() {
 
 src_test() {
cd ./tests || die
-   source test.sh || die
+   sh ./test.sh || die
cd .. || die
 }
 src_install() {

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2021-05-14 Thread Andrew Ammerlaan 
commit: 69b1a896b2359c0c43f08271b452c7d6e953175e
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri May 14 11:15:44 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Fri May 14 11:15:44 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69b1a896

app-crypt/reop: Fix LDFLAGS ordering

Closes: https://bugs.gentoo.org/785229
Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

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

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index 439cf435b..b0b69c931 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -15,7 +15,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-   emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -lsodium"
+   emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="-lsodium ${LDFLAGS}"
 }
 
 src_test() {

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2021-04-23 Thread Andrew Ammerlaan 
commit: eb20aca75b8e8685cf17b0e0a3775a2cbfd26f66
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Apr 23 08:55:26 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Fri Apr 23 09:56:53 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eb20aca7

app-crypt/reop: Fix LDFLAGS

Closes: https://bugs.gentoo.org/780609
Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

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

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index 848357b7e..439cf435b 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -15,7 +15,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-   emake CC="${CC:-cc}" CFLAGS="${CFLAGS}"
+   emake CC="${CC:-cc}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -lsodium"
 }
 
 src_test() {

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2020-05-24 Thread Andrew Ammerlaan 
commit: 9fed6fe0729bb7592dbeaff4de21eb940d37f281
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sun May 24 17:42:58 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun May 24 17:42:58 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9fed6fe0

app-crypt/reop: Fallback on cc if $CC is unset

Related: 
https://github.com/gentoo/guru/commit/ab9f93926f8bfcee8800a58b13523ae191397b53#commitcomment-39401778
Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

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

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index bc3e143..124477a 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -14,7 +14,7 @@ DEPEND="dev-libs/libsodium:="
 RDEPEND="${DEPEND}"
 
 src_compile() {
-   emake CC="${CC}" CFLAGS="${CFLAGS}"
+   emake CC="${CC:-cc}" CFLAGS="${CFLAGS}"
 }
 
 src_test() {

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2020-05-24 Thread Andrew Ammerlaan 
commit: f38a7f246e579c3698ed94ee1a9b9832965ecb3a
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sun May 24 08:02:51 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun May 24 08:02:51 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f38a7f24

app-crypt/reop: Fix typo

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

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

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
index e9ff7d5..d6b1063 100644
--- a/app-crypt/reop/reop-2.1.1.ebuild
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -23,5 +23,5 @@ src_test() {
 }
 src_install() {
dobin reop
-   doman repo.1
+   doman reop.1
 }

[gentoo-commits] repo/proj/guru:master commit in: app-crypt/reop/

2020-05-24 Thread Andrew Ammerlaan 
commit: ab9f93926f8bfcee8800a58b13523ae191397b53
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Sun May 24 07:50:48 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun May 24 07:55:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ab9f9392

app-crypt/reop: New package

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 app-crypt/reop/Manifest  |  1 +
 app-crypt/reop/metadata.xml  |  8 
 app-crypt/reop/reop-2.1.1.ebuild | 27 +++
 3 files changed, 36 insertions(+)

diff --git a/app-crypt/reop/Manifest b/app-crypt/reop/Manifest
new file mode 100644
index 000..9a0f2e9
--- /dev/null
+++ b/app-crypt/reop/Manifest
@@ -0,0 +1 @@
+DIST reop-2.1.1.tgz 32533 BLAKE2B 
48d6182f4f6a629f8b32c8144205abd7c719a5586a83914d4d4c574cde3f3b5d32c637bc7cd7c568b9da6164a65d331b38fb96491ac7ff2a2dab7023f8b8b885
 SHA512 
ce145cfb7c2347c4df4b6a25f28dab22d6bd0b3cf27d9fcb42b81d969634b122b706aff01c1c3108557d5778981dd8a025ac29d1aa2dfe9e77902ed24daa8ef1

diff --git a/app-crypt/reop/metadata.xml b/app-crypt/reop/metadata.xml
new file mode 100644
index 000..c698af2
--- /dev/null
+++ b/app-crypt/reop/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   cont...@hacktivis.me
+   Haelwenn (lanodan) Monnier
+   
+

diff --git a/app-crypt/reop/reop-2.1.1.ebuild b/app-crypt/reop/reop-2.1.1.ebuild
new file mode 100644
index 000..e9ff7d5
--- /dev/null
+++ b/app-crypt/reop/reop-2.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Haelwenn (lanodan) Monnier 
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="reasonable expectation of privacy"
+HOMEPAGE="https://flak.tedunangst.com/post/reop;
+SRC_URI="https://flak.tedunangst.com/files/reop-2.1.1.tgz;
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libsodium:="
+RDEPEND="${DEPEND}"
+
+src_compile() {
+   emake CC="${CC}" CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+   cd ./test || die
+   ./test.sh || die
+}
+src_install() {
+   dobin reop
+   doman repo.1
+}