[packages/mcrypt] Rel 3

[arekm]

commit f939b07bf74f814b101e736809fc6b1d29cdbc03
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 9 14:44:06 2026 +0100

    Rel 3

 mcrypt-c99.patch | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mcrypt.spec      |   7 ++-
 2 files changed, 146 insertions(+), 2 deletions(-)
---
diff --git a/mcrypt.spec b/mcrypt.spec
index da64023..02ca6dd 100644
--- a/mcrypt.spec
+++ b/mcrypt.spec
@@ -2,13 +2,14 @@ Summary:	Mcrypt - simple crypting program
 Summary(pl.UTF-8):	Mcrypt - prosty program szyfrujący
 Name:		mcrypt
 Version:	2.6.8
-Release:	2
+Release:	3
 License:	GPL v3+
 Group:		Applications/Text
 Source0:	http://downloads.sourceforge.net/mcrypt/%{name}-%{version}.tar.gz
 # Source0-md5:	97639f8821b10f80943fa17da302607e
 Patch0:		%{name}-man_fix.patch
 Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-c99.patch
 URL:		http://mcrypt.sourceforge.net/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -42,14 +43,16 @@ kompatybilność z crypt(1).
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 # just invalid inclusions
 %{__rm} acinclude.m4
 
 %build
+echo 'el cs pl de es_AR' > po/LINGUAS
 %{__gettextize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
diff --git a/mcrypt-c99.patch b/mcrypt-c99.patch
new file mode 100644
index 0000000..ce31d50
--- /dev/null
+++ b/mcrypt-c99.patch
@@ -0,0 +1,141 @@
+diff -urN mcrypt-2.6.8.orig/src/defines.h mcrypt-2.6.8/src/defines.h
+--- mcrypt-2.6.8.orig/src/defines.h	2003-09-08 19:25:47.000000000 +0200
++++ mcrypt-2.6.8/src/defines.h	2026-03-09 14:38:56.528345115 +0100
+@@ -164,7 +164,7 @@
+ #endif
+ 
+ /*extern char *getpass();*/
+-extern char *crypt(); /* libufc */
++extern char *crypt(const char *, const char *); /* libufc */
+ 
+ #if HAVE_TERMIOS_H
+ # include <termios.h>
+diff -urN mcrypt-2.6.8.orig/src/errors.c mcrypt-2.6.8/src/errors.c
+--- mcrypt-2.6.8.orig/src/errors.c	2007-11-07 18:10:19.000000000 +0100
++++ mcrypt-2.6.8/src/errors.c	2026-03-09 14:38:56.523027868 +0100
+@@ -24,24 +24,24 @@
+ 
+ void err_quit(char *errmsg)
+ {
+-	fprintf(stderr, errmsg);
++	fprintf(stderr, "%s", errmsg);
+ 	exit(-1);
+ }
+ 
+ void err_warn(char *errmsg)
+ {
+ 	if (quiet <= 1)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_info(char *errmsg)
+ {
+ 	if (quiet == 0)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+ 
+ void err_crit(char *errmsg)
+ {
+ 	if (quiet <= 2)
+-		fprintf(stderr, errmsg);
++		fprintf(stderr, "%s", errmsg);
+ }
+diff -urN mcrypt-2.6.8.orig/src/extra.h mcrypt-2.6.8/src/extra.h
+--- mcrypt-2.6.8.orig/src/extra.h	2003-09-08 19:25:48.000000000 +0200
++++ mcrypt-2.6.8/src/extra.h	2026-03-09 14:38:56.544992026 +0100
+@@ -14,7 +14,7 @@
+ void Bzero(void *s, size_t n);
+ void mcrypt_tolow(char *str, int size);
+ 
+-char *my_getpass();
++char *my_getpass(char *);
+ int check_file_head(FILE *fstream, char *algorithm, char* mode, char* keymode, int *keysize, void* salt, int* salt_size);
+ void* read_iv(FILE *fstream, int ivsize);
+ int write_file_head(FILE * filedes, char* algorithm, char* mode, char* keymode, int* keysize, void *salt, int salt_size);
+diff -urN mcrypt-2.6.8.orig/src/gaaout.c mcrypt-2.6.8/src/gaaout.c
+--- mcrypt-2.6.8.orig/src/gaaout.c	2007-06-09 10:39:14.000000000 +0200
++++ mcrypt-2.6.8/src/gaaout.c	2026-03-09 14:38:56.546904738 +0100
+@@ -5,6 +5,7 @@
+ 
+ 
+ #include <defines.h>
++#include "mcrypt_int.h"
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff -urN mcrypt-2.6.8.orig/src/mcrypt_int.h mcrypt-2.6.8/src/mcrypt_int.h
+--- mcrypt-2.6.8.orig/src/mcrypt_int.h	2003-09-08 19:25:50.000000000 +0200
++++ mcrypt-2.6.8/src/mcrypt_int.h	2026-03-09 14:38:56.552826326 +0100
+@@ -12,6 +12,9 @@
+ 
+ void rol_buf(void * buffer, int buffersize,void * value);
+ 
+-void mcrypt_version();
+-void mcrypt_license();
++void mcrypt_version(void);
++void mcrypt_license(void);
+ void usage(void);
++int print_list(void);
++int print_keylist(void);
++int print_hashlist(void);
+diff -urN mcrypt-2.6.8.orig/src/ufc_crypt.c mcrypt-2.6.8/src/ufc_crypt.c
+--- mcrypt-2.6.8.orig/src/ufc_crypt.c	2007-10-28 13:59:19.000000000 +0100
++++ mcrypt-2.6.8/src/ufc_crypt.c	2026-03-09 14:38:56.542685817 +0100
+@@ -28,7 +28,7 @@
+ 
+ /* UFC optimized for 32 bit machines */
+ 
+-extern word32 *_ufc_dofinalperm();
++extern word32 *_ufc_dofinalperm(word32, word32, word32, word32);
+ 
+ 
+ /*
+@@ -40,8 +40,7 @@
+ 
+ #define SBA(sb, v) (*(word32*)((char*)(sb)+(v)))
+ 
+-word32 *_ufc_doit(l1, l2, r1, r2, itr)
+-word32 l1, l2, r1, r2, itr;
++word32 *_ufc_doit(word32 l1, word32 l2, word32 r1, word32 r2, word32 itr)
+ {
+ 	int i;
+ 	word32 s, *k;
+@@ -577,8 +576,7 @@
+  * Undo an extra E selection and do final permutations
+  */
+ 
+-word32 *_ufc_dofinalperm(l1, l2, r1, r2)
+-word32 l1, l2, r1, r2;
++word32 *_ufc_dofinalperm(word32 l1, word32 l2, word32 r1, word32 r2)
+ {
+ 	word32 v1, v2, x;
+ 	static word32 ary[2];
+@@ -642,9 +640,7 @@
+  * prefixing with the salt
+  */
+ 
+-char *output_conversion(v1, v2, salt)
+-word32 v1, v2;
+-char *salt;
++char *output_conversion(word32 v1, word32 v2, char *salt)
+ {
+ 	char *outbuf;
+ 	int i, s;
+@@ -668,14 +664,12 @@
+ 	return outbuf;
+ }
+ 
+-word32 *_ufc_doit();
+ 
+ /* 
+  * UNIX crypt function
+  */
+ 
+-char *__crypt(key, salt)
+-char *key, *salt;
++char *__crypt(char *key, char *salt)
+ {
+ 	word32 *s;
+ 	char ktab[9];
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mcrypt.git/commitdiff/f939b07bf74f814b101e736809fc6b1d29cdbc03