OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Jun-2007 19:04:50
Branch: HEAD Handle: 2007060918044900
Added files:
openpkg-src/mcrypt mcrypt.patch
Modified files:
openpkg-src/mcrypt mcrypt.spec
Log:
upgrading package: mcrypt 2.6.5 -> 2.6.6
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/mcrypt/mcrypt.patch
1.21 +8 -7 openpkg-src/mcrypt/mcrypt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mcrypt/mcrypt.patch
============================================================================
$ cvs diff -u -r0 -r1.1 mcrypt.patch
--- /dev/null 2007-06-09 19:01:06 +0200
+++ mcrypt.patch 2007-06-09 19:04:49 +0200
@@ -0,0 +1,12 @@
+Index: src/rfc2440.c
+--- src/rfc2440.c.orig 2007-06-09 10:36:46 +0200
++++ src/rfc2440.c 2007-06-09 19:00:30 +0200
+@@ -24,7 +24,7 @@
+ #include <zlib.h>
+ #endif
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include "xmalloc.h"
+ #include "keys.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mcrypt/mcrypt.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 mcrypt.spec
--- openpkg-src/mcrypt/mcrypt.spec 19 Feb 2007 17:09:11 -0000 1.20
+++ openpkg-src/mcrypt/mcrypt.spec 9 Jun 2007 17:04:49 -0000 1.21
@@ -32,19 +32,20 @@
Class: PLUS
Group: Cryptography
License: GPL
-Version: 2.6.5
-Release: 20070219
+Version: 2.6.6
+Release: 20070609
# list of sources
Source0:
http://switch.dl.sourceforge.net/mcrypt/mcrypt-%{version}.tar.gz
+Patch0: mcrypt.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: libmcrypt >= 2.5.8, mhash, zlib
-PreReq: libmcrypt >= 2.5.8, mhash, zlib
+BuildPreReq: libmcrypt >= 2.5.8, mhash >= 0.9.9, zlib
+PreReq: libmcrypt >= 2.5.8, mhash >= 0.9.9, zlib
AutoReq: no
AutoReqProv: no
@@ -73,6 +74,7 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc} %{l_cppflags}" \
@@ -81,6 +83,7 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-libmcrypt-prefix=%{l_prefix} \
--disable-nls \
--disable-shared
@@ -88,9 +91,7 @@
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
