rpms/mcrypt/EL-5 mcrypt-2.6.7-format_strings.patch, NONE, 1.1 mcrypt-2.6.7-gaafix.patch, NONE, 1.1 mcrypt-2.6.7-native-by-default.patch, NONE, 1.1 mcrypt-rfc2440-bugfixes.patch, NONE, 1.1 mcrypt.spec, 1.4, 1.5 sources, 1.2, 1.3
Tom Callaway
spot at fedoraproject.org
Tue Nov 25 14:40:48 UTC 2008
- Previous message: rpms/mcrypt/EL-4 mcrypt-2.6.7-format_strings.patch, NONE, 1.1 mcrypt-2.6.7-gaafix.patch, NONE, 1.1 mcrypt-2.6.7-native-by-default.patch, NONE, 1.1 mcrypt-rfc2440-bugfixes.patch, NONE, 1.1 mcrypt.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/mcrypt/F-10 mcrypt-rfc2440-bugfixes.patch, 1.1, 1.2 mcrypt.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/extras/rpms/mcrypt/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30772/EL-5
Modified Files:
mcrypt.spec sources
Added Files:
mcrypt-2.6.7-format_strings.patch mcrypt-2.6.7-gaafix.patch
mcrypt-2.6.7-native-by-default.patch
mcrypt-rfc2440-bugfixes.patch
Log Message:
2.6.8
mcrypt-2.6.7-format_strings.patch:
--- NEW FILE mcrypt-2.6.7-format_strings.patch ---
diff -up mcrypt-2.6.7/src/errors.c.BAD mcrypt-2.6.7/src/errors.c
--- mcrypt-2.6.7/src/errors.c.BAD 2008-08-25 17:34:36.000000000 -0400
+++ mcrypt-2.6.7/src/errors.c 2008-08-25 17:35:04.000000000 -0400
@@ -24,24 +24,24 @@ extern int quiet;
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);
}
mcrypt-2.6.7-gaafix.patch:
--- NEW FILE mcrypt-2.6.7-gaafix.patch ---
diff -up mcrypt-2.6.7/src/gaaout.c.BAD mcrypt-2.6.7/src/gaaout.c
--- mcrypt-2.6.7/src/gaaout.c.BAD 2008-08-25 17:44:59.000000000 -0400
+++ mcrypt-2.6.7/src/gaaout.c 2008-08-25 17:45:18.000000000 -0400
@@ -5,6 +5,7 @@
#include <defines.h>
+#include "mcrypt_int.h"
#include <stdio.h>
#include <string.h>
diff -up mcrypt-2.6.7/src/mcrypt_int.h.BAD mcrypt-2.6.7/src/mcrypt_int.h
--- mcrypt-2.6.7/src/mcrypt_int.h.BAD 2008-08-25 17:45:36.000000000 -0400
+++ mcrypt-2.6.7/src/mcrypt_int.h 2008-08-25 17:45:42.000000000 -0400
@@ -15,3 +15,8 @@ void rol_buf(void * buffer, int buffersi
void mcrypt_version();
void mcrypt_license();
void usage(void);
+
+int print_list(void);
+int print_hashlist(void);
+int print_keylist(void);
+
mcrypt-2.6.7-native-by-default.patch:
--- NEW FILE mcrypt-2.6.7-native-by-default.patch ---
diff -up mcrypt-2.6.7/src/gaaout.c.BAD mcrypt-2.6.7/src/gaaout.c
--- mcrypt-2.6.7/src/gaaout.c.BAD 2008-08-25 19:29:42.000000000 -0400
+++ mcrypt-2.6.7/src/gaaout.c 2008-08-25 19:30:21.000000000 -0400
@@ -124,7 +124,7 @@ void gaa_help(void)
{
printf(_("Mcrypt encrypts and decrypts files with symmetric encryption algorithms.\nUsage: mcrypt [-dFusgbhLvrzp] [-f keyfile] [-k key1 key2 ...] [-m mode] [-o keymode] [-s keysize] [-a algorithm] [-c config_file] [file ...]\n\n"));
__gaa_helpsingle('g', "openpgp", "", _("Use the OpenPGP (RFC2440) file format."));
- __gaa_helpsingle(0, "no-openpgp", "", _("Use the native (mcrypt) file format."));
+ __gaa_helpsingle(0, "no-openpgp", "", _("Use the native (mcrypt) file format. (DEFAULT)"));
__gaa_helpsingle(0, "openpgp-z", _("INTEGER "), _("Sets the compression level for openpgp packets (0 disables)."));
__gaa_helpsingle('d', "decrypt", "", _("decrypts."));
__gaa_helpsingle('s', "keysize", _("INTEGER "), _("Set the algorithm's key size (in bytes)."));
@@ -1037,7 +1037,7 @@ int gaa(int argc, char **argv, gaainfo *
gaaval->config_file=NULL; gaaval->mode=NULL; gaaval->input=NULL; gaaval->ed_specified=0;
gaaval->double_check=0; gaaval->noecho=1; gaaval->flush=0; gaaval->keysize=0;
gaaval->algorithms_directory=NULL; gaaval->modes_directory=NULL; gaaval->nodelete=0;
- gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=1; gaaval->openpgp_z = 0; ;};
+ gaaval->hash=NULL; gaaval->timer=0; gaaval->openpgp=0; gaaval->openpgp_z = 0; ;};
}
inited = 1;
diff -up mcrypt-2.6.7/src/mcrypt.gaa.BAD mcrypt-2.6.7/src/mcrypt.gaa
--- mcrypt-2.6.7/src/mcrypt.gaa.BAD 2008-08-25 19:30:37.000000000 -0400
+++ mcrypt-2.6.7/src/mcrypt.gaa 2008-08-25 19:31:09.000000000 -0400
@@ -12,7 +12,7 @@ helpnode "Mcrypt encrypts and decrypts f
#int openpgp;
option (g, openpgp) { $openpgp = 1 } "Use the OpenPGP (RFC2440) file format."
-option (no-openpgp) { $openpgp = 0 } "Use the native (mcrypt) file format."
+option (no-openpgp) { $openpgp = 0 } "Use the native (mcrypt) file format. (DEFAULT)"
#int openpgp_z;
option (openpgp-z) INT "INTEGER" { $openpgp_z = $1 } "Sets the compression level for openpgp packets (0 disables)."
@@ -119,7 +119,7 @@ init { $force=0; $quiet=1; $real_random_
$config_file=NULL; $mode=NULL; $input=NULL; $ed_specified=0;
$double_check=0; $noecho=1; $flush=0; $keysize=0;
$algorithms_directory=NULL; $modes_directory=NULL; $nodelete=0;
- $hash=NULL; $timer=0; $openpgp=1; $openpgp_z = 0; }
+ $hash=NULL; $timer=0; $openpgp=0; $openpgp_z = 0; }
INCOMP kf
INCOMP Vq
mcrypt-rfc2440-bugfixes.patch:
--- NEW FILE mcrypt-rfc2440-bugfixes.patch ---
diff -up mcrypt-2.6.8/src/rfc2440.c.orig mcrypt-2.6.8/src/rfc2440.c
--- mcrypt-2.6.8/src/rfc2440.c.orig 2008-11-16 14:50:01.000000000 -0500
+++ mcrypt-2.6.8/src/rfc2440.c 2008-11-25 09:26:00.000000000 -0500
@@ -409,7 +409,7 @@ length_decode(const uchar *buf, int pos,
len += (buf[pos+1] + 192);
}
else if (buf[pos] == 255) {
- len += (buf[pos+1] << 24);
+ len = (buf[pos+1] << 24);
len += (buf[pos+2] << 16);
len += (buf[pos+3] << 8);
len += buf[pos+4];
Index: mcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/mcrypt/EL-5/mcrypt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mcrypt.spec 24 Aug 2007 14:42:41 -0000 1.4
+++ mcrypt.spec 25 Nov 2008 14:40:17 -0000 1.5
@@ -1,12 +1,24 @@
Name: mcrypt
-Version: 2.6.4
-Release: 3%{?dist}
-License: GPLv2+
+Version: 2.6.8
+Release: 1%{?dist}
+License: GPLv3+
Group: Applications/System
Summary: Replacement for crypt()
URL: http://mcrypt.sourceforge.net/
Source0: http://download.sourceforge.net/mcrypt/mcrypt-%{version}.tar.gz
-Patch0: mcrypt-2.6.4-destdirfix.patch
+# From upstream, a combination of:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1191020&group_id=87941&atid=584895
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1872812&group_id=87941&atid=584895
+Patch0: mcrypt-rfc2440-bugfixes.patch
+# From upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1872809&group_id=87941&atid=584895
+Patch1: mcrypt-2.6.7-format_strings.patch
+# Upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1829488&group_id=87941&atid=584895
+Patch2: mcrypt-2.6.7-gaafix.patch
+# Upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2075758&group_id=87941&atid=584895
+Patch3: mcrypt-2.6.7-native-by-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libmcrypt-devel, mhash-devel, gettext, zlib-devel
@@ -19,6 +31,9 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .format_strings
+%patch2 -p1 -b .gaafix
+%patch3 -p1 -b .native_by_default
%build
%configure
@@ -40,6 +55,28 @@
%{_mandir}/man1/*
%changelog
+* Mon Nov 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.8-1
+- update to 2.6.8
+
+* Mon Aug 25 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.7-3
+- use native mcrypt format by default (not openpgp) (bz 433582)
+- fix gaa
+- fix format strings
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.6.7-2
+- Autorebuild for GCC 4.3
+
+* Mon Dec 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.7-1
+- 2.6.7
+- fix bugs in rfc2440.c (resolves bugzilla 418481)
+
+* Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.6-2
+- rebuild for ppc32, license fix
+
+* Thu Jul 19 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.6-1
+- bump to 2.6.6
+- destdir patch obsoleted upstream
+
* Tue Sep 12 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.4-3
- bump for FC-6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcrypt/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Sep 2005 16:33:20 -0000 1.2
+++ sources 25 Nov 2008 14:40:17 -0000 1.3
@@ -1 +1 @@
-5a011846fd0f166428c8d97359aaa6b3 mcrypt-2.6.4.tar.gz
+97639f8821b10f80943fa17da302607e mcrypt-2.6.8.tar.gz
- Previous message: rpms/mcrypt/EL-4 mcrypt-2.6.7-format_strings.patch, NONE, 1.1 mcrypt-2.6.7-gaafix.patch, NONE, 1.1 mcrypt-2.6.7-native-by-default.patch, NONE, 1.1 mcrypt-rfc2440-bugfixes.patch, NONE, 1.1 mcrypt.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message: rpms/mcrypt/F-10 mcrypt-rfc2440-bugfixes.patch, 1.1, 1.2 mcrypt.spec, 1.8, 1.9 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list