PR#2: Fixes for C99 conformance issues. - rpms/beecrypt

rpms / beecrypt

#2 Fixes for C99 conformance issues.

Closed a year ago by fweimer. Opened a year ago by pjfordham.

rpms/ pjfordham/beecrypt rawhide into rawhide

Fixes for C99 conformance issues.

Peter Fordham • a year ago

a742098

beecrypt-4.2.1-autoconf-c99.patch

file added

+64

		`@@ -0,0 +1,64 @@`
		`+ diff --git a/acinclude.m4 b/acinclude.m4`
		`+ index 7df3867..2e0a41c 100644`
		`+ --- a/acinclude.m4`
		`+ +++ b/acinclude.m4`
		`+ @@ -320,6 +320,9 @@ EOF`
		`+ #if HAVE_FCNTL_H`
		`+ # include <fcntl.h>`
		`+ #endif`
		`+ + #if HAVE_TIME_H`
		`+ + # include <time.h>`
		`+ + #endif`
		`+ #if HAVE_STRING_H`
		`+ # include <string.h>`
		`+ #endif`
		`+ @@ -338,7 +341,7 @@ EOF`
		`+ int i, rc, fd = open("conftest.aio", O_RDONLY);`
		`+`
		`+ if (fd < 0)`
		`+ - exit(1);`
		`+ + return 1;`
		`+`
		`+ memset(&a, 0, sizeof(struct aiocb));`
		`+`
		`+ @@ -355,7 +358,7 @@ EOF`
		`+ if (aio_read(&a) < 0)`
		`+ {`
		`+ perror("aio_read");`
		`+ - exit(1);`
		`+ + return 1;`
		`+ }`
		`+ if (aio_suspend(&a_list, 1, &a_timeout) < 0)`
		`+ {`
		`+ @@ -368,25 +371,25 @@ EOF`
		`+ if (aio_suspend(&a_list, 1, &a_timeout) < 0)`
		`+ {`
		`+ perror("aio_suspend");`
		`+ - exit(1);`
		`+ + return 1;`
		`+ }`
		`+ }`
		`+ else`
		`+ {`
		`+ perror("aio_suspend");`
		`+ - exit(1);`
		`+ + return 1;`
		`+ }`
		`+ #else`
		`+ - exit(1);`
		`+ + return 1;`
		`+ #endif`
		`+ }`
		`+ if (aio_error(&a) < 0)`
		`+ - exit(1);`
		`+ + return 1;`
		`+`
		`+ if (aio_return(&a) < 0)`
		`+ - exit(1);`
		`+ + return 1;`
		`+`
		`+ - exit(0);`
		`+ + return 0;`
		`+ ]])],[bc_cv_working_aio=yes],[bc_cv_working_aio=no],[`
		`+ case $target_os in`
		`+ linux* \| solaris*)`

beecrypt-4.2.1-c99.patch

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ diff --git a/blockmode.c b/blockmode.c`
		`+ index 46d1fde..9998c23 100644`
		`+ --- a/blockmode.c`
		`+ +++ b/blockmode.c`
		`+ @@ -29,6 +29,7 @@`
		`+ # include "config.h"`
		`+ #endif`
		`+`
		`+ +#include "beecrypt/endianness.h"`
		`+ #include "beecrypt/blockmode.h"`
		`+`
		`+ int blockEncryptECB(const blockCipher* bc, blockCipherParam* bp, uint32_t* dst, const uint32_t* src, unsigned int nblocks)`

beecrypt.spec

file modified

+8 -1

		`@@ -1,12 +1,14 @@`
		`Summary: Open source cryptography library`
		`Name: beecrypt`
		`Version: 4.2.1`
		`- Release: 30%{?dist}`
		`+ Release: 31%{?dist}`
		`License: LGPLv2+`
		`URL: http://beecrypt.sourceforge.net/`
		`Source0: https://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz`
		`Patch0: beecrypt-4.1.2-biarch.patch`
		`Patch1: beecrypt-4.2.1-no-c++.patch`
		`+ Patch2: beecrypt-4.2.1-c99.patch`
		`+ Patch3: beecrypt-4.2.1-autoconf-c99.patch`
		`BuildRequires: autoconf`
		`BuildRequires: automake`
		`BuildRequires: libtool`
		`@@ -48,6 +50,8 @@`
		`%setup -q`
		`%patch0 -p1 -b .biarch`
		`%patch1 -p1 -b .no-c++`
		`+ %patch2 -p1 -b .c99`
		`+ %patch3 -p1 -b .autoconf-c99`
		`libtoolize`
		`autoreconf -i`

		`@@ -87,6 +91,9 @@`
		`%endif`

		`%changelog`
		`+ * Thu Dec 08 2022 Peter Fordham <peter.fordham@gmail.com> - 4.2.1-31`
		`+ - Fixes for C99 conformance issues.`
		`+`
		`* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-30`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild`

pjfordham commented a year ago

https://fedoraproject.org/wiki/Toolchain/PortingToModernC

Opened upstream bugs:

https://sourceforge.net/p/beecrypt/patches/12/
https://sourceforge.net/p/beecrypt/patches/13/

robert commented a year ago

Is this the same like @fweimer already pushed?

Edited a year ago by robert

fweimer commented a year ago

Right, sorry, I forgot to close the pull request. I added the missing line between commit subject and the rest of the commit message, and put the upstream URLs into the patches themselves (because they are more likely to survive the tides of time than commit metadata and the PR).