
Hello community, here is the log from the commit of package mcrypt checked in at Fri May 4 17:28:17 CEST 2007. -------- --- mcrypt/mcrypt.changes 2007-04-02 14:46:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/mcrypt/mcrypt.changes 2007-05-04 16:25:59.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 4 14:56:31 CEST 2007 - prusnak@suse.cz + +- updated to 2.6.5 (maintenance update) +- cleaned spec file + +------------------------------------------------------------------- Old: ---- mcrypt-2.6.4.diff mcrypt-2.6.4-format_strings.diff mcrypt-2.6.4-overflow.patch mcrypt-2.6.4.tar.bz2 New: ---- mcrypt-2.6.5.diff mcrypt-2.6.5-format_strings.diff mcrypt-2.6.5-overflow.patch mcrypt-2.6.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mcrypt.spec ++++++ --- /var/tmp/diff_new_pack.DS2997/_old 2007-05-04 17:26:44.000000000 +0200 +++ /var/tmp/diff_new_pack.DS2997/_new 2007-05-04 17:26:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mcrypt (Version 2.6.4) +# spec file for package mcrypt (Version 2.6.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,11 +15,11 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Security Autoreqprov: on -Version: 2.6.4 -Release: 152 +Version: 2.6.5 +Release: 1 Summary: Replacement for the crypt Command Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.diff +Patch0: %{name}-%{version}.diff Patch1: %{name}-%{version}-overflow.patch Patch2: %{name}-%{version}-format_strings.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,22 +41,18 @@ %prep %setup -q -%patch -%patch1 -p1 +%patch0 +%patch1 %patch2 %build rm -fv ac*.m4 autoreconf --force --install test -f po/Makevars || mv po/Makevars.template po/Makevars -CFLAGS="$RPM_OPT_FLAGS" ./configure \ - --prefix=/usr \ - --mandir=%{_mandir} +%configure make %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean @@ -66,15 +62,14 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README THANKS TODO %doc doc/FORMAT doc/magic doc/sample.mcryptrc -/usr/bin/* -/usr/share/locale/cs/LC_MESSAGES/mcrypt.mo -/usr/share/locale/de/LC_MESSAGES/mcrypt.mo -/usr/share/locale/el/LC_MESSAGES/mcrypt.mo -/usr/share/locale/es_AR/LC_MESSAGES/mcrypt.mo -/usr/share/locale/pl/LC_MESSAGES/mcrypt.mo +%{_bindir}/* +%{_datadir}/locale/*/LC_MESSAGES/mcrypt.mo %doc %{_mandir}/man1/* %changelog +* Fri May 04 2007 - prusnak@suse.cz +- updated to 2.6.5 (maintenance update) +- cleaned spec file * Mon Apr 02 2007 - rguenther@suse.de - add zlib-devel BuildRequires * Wed Jan 24 2007 - prusnak@suse.cz ++++++ mcrypt-2.6.4.diff -> mcrypt-2.6.5.diff ++++++ ++++++ mcrypt-2.6.4-format_strings.diff -> mcrypt-2.6.5-format_strings.diff ++++++ ++++++ mcrypt-2.6.4-overflow.patch -> mcrypt-2.6.5-overflow.patch ++++++ --- mcrypt/mcrypt-2.6.4-overflow.patch 2007-01-24 17:45:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/mcrypt/mcrypt-2.6.5-overflow.patch 2007-02-22 11:20:42.000000000 +0100 @@ -1,10 +1,10 @@ ---- mcrypt-2.6.4/src/rfc2440.c.xx 2005-04-27 15:45:02.804961396 +0200 -+++ mcrypt-2.6.4/src/rfc2440.c 2005-04-27 15:45:24.982554291 +0200 +--- src/rfc2440.c ++++ src/rfc2440.c @@ -631,7 +631,7 @@ { USTRING result = NULL; int pos = 0; -- uchar buf[13]; +- uchar buf[14]; + uchar buf[15]; assert( dek->keylen ); ++++++ mcrypt-2.6.4.tar.bz2 -> mcrypt-2.6.5.tar.bz2 ++++++ ++++ 48602 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/acinclude.m4 new/mcrypt-2.6.5/acinclude.m4 --- old/mcrypt-2.6.4/acinclude.m4 2002-10-01 12:23:48.000000000 +0200 +++ new/mcrypt-2.6.5/acinclude.m4 2007-02-19 07:39:35.000000000 +0100 @@ -1,10 +1,2 @@ -include(codeset.m4) -include(gettext.m4) -include(glibc21.m4) -include(iconv.m4) -include(isc-posix.m4) -include(lcmessage.m4) -include(progtest.m4) -include(libmcrypt.m4) dnl *-*wedit:notab*-* Please keep this as the last line. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/buildconf new/mcrypt-2.6.5/buildconf --- old/mcrypt-2.6.4/buildconf 1970-01-01 01:00:00.000000000 +0100 +++ new/mcrypt-2.6.5/buildconf 2007-02-19 07:37:28.000000000 +0100 @@ -0,0 +1,8 @@ +#! /bin/sh + +aclocal && \ +libtoolize -c --force && \ +autoheader && \ +automake -a -c +autoconf + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/config.h.in new/mcrypt-2.6.5/config.h.in --- old/mcrypt-2.6.4/config.h.in 2003-02-21 18:47:51.000000000 +0100 +++ new/mcrypt-2.6.5/config.h.in 2007-02-19 07:39:47.000000000 +0100 @@ -16,6 +16,14 @@ /* Define to 1 if you have the `bzero' function. */ #undef HAVE_BZERO +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the <ctype.h> header file. */ #undef HAVE_CTYPE_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/configure.in new/mcrypt-2.6.5/configure.in --- old/mcrypt-2.6.4/configure.in 2003-02-21 18:46:10.000000000 +0100 +++ new/mcrypt-2.6.5/configure.in 2007-02-19 07:46:47.000000000 +0100 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.50) +AC_PREREQ(2.59) AC_INIT dnl AC_CONFIG_HEADER(config.h) @@ -10,7 +10,7 @@ AC_DEFINE_UNQUOTED(T_VENDOR, "$target_vendor", [Vendor]) AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS]) -AM_INIT_AUTOMAKE(mcrypt, 2.6.4) +AM_INIT_AUTOMAKE(mcrypt, 2.6.5) AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/src/defines.h new/mcrypt-2.6.5/src/defines.h --- old/mcrypt-2.6.4/src/defines.h 2003-02-21 18:45:12.000000000 +0100 +++ new/mcrypt-2.6.5/src/defines.h 2007-02-19 07:36:53.000000000 +0100 @@ -5,8 +5,8 @@ /* #define DEBUG Don't even think defining it:) */ -#include <mhash.h> -#include <mcrypt.h> +#include <mutils/mhash.h> +#include <mutils/mcrypt.h> #if MCRYPT_API_VERSION < 20000222 # error "Your mcrypt.h header file is older than the library" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/mcrypt-2.6.4/src/rfc2440.c new/mcrypt-2.6.5/src/rfc2440.c --- old/mcrypt-2.6.4/src/rfc2440.c 2003-02-21 18:32:16.000000000 +0100 +++ new/mcrypt-2.6.5/src/rfc2440.c 2007-02-18 22:56:04.000000000 +0100 @@ -631,7 +631,7 @@ { USTRING result = NULL; int pos = 0; - uchar buf[13]; + uchar buf[14]; assert( dek->keylen ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de