OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 08-Jul-2009 10:41:42
Branch: HEAD Handle: 2009070809414100
Modified files:
openpkg-src/beecrypt beecrypt.patch beecrypt.spec
Log:
upgrading package: beecrypt 4.1.2 -> 4.2.0
Summary:
Revision Changes Path
1.6 +31 -74 openpkg-src/beecrypt/beecrypt.patch
1.28 +3 -5 openpkg-src/beecrypt/beecrypt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/beecrypt/beecrypt.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 beecrypt.patch
--- openpkg-src/beecrypt/beecrypt.patch 19 Jul 2007 12:05:36 -0000
1.5
+++ openpkg-src/beecrypt/beecrypt.patch 8 Jul 2009 08:41:41 -0000
1.6
@@ -1,79 +1,25 @@
-Index: base64.c
---- base64.c.orig 2004-12-19 21:21:04 +0100
-+++ base64.c 2007-07-19 14:03:18 +0200
-@@ -253,7 +253,6 @@
- unsigned c;
-
- if (s == NULL) return NULL;
-- if (*s == '\0') return calloc(1, sizeof(*t));
-
- if (ns == 0) ns = strlen((const char*) s);
- nt = ((ns + 2) / 3) * 4;
-@@ -275,7 +274,7 @@
- {
- c = *s++;
- *te++ = b64enc[ (c >> 2) ], lc++;
-- *te++ = b64enc[ ((c & 0x3) << 4) | (*s >> 4) ], lc++;
-+ *te++ = b64enc[ ((c & 0x3) << 4) | (((ns-1) > 0 ? *s : 0) >> 4)
], lc++;
- if (--ns == 0)
- {
- *te++ = '=';
-@@ -283,7 +282,7 @@
- continue;
- }
- c = *s++;
-- *te++ = b64enc[ ((c & 0xf) << 2) | (*s >> 6) ], lc++;
-+ *te++ = b64enc[ ((c & 0xf) << 2) | (((ns-1) > 0 ? *s : 0) >> 6)
], lc++;
- if (--ns == 0)
- {
- *te++ = '=';
-Index: gas/aesopt.x86.m4
---- gas/aesopt.x86.m4.orig 2004-08-21 15:37:40 +0200
-+++ gas/aesopt.x86.m4 2007-07-19 13:54:45 +0200
-@@ -134,6 +134,9 @@
- pxor 6144(%esi,%edx,8),s0
- ')
-
-+')
-+ifdef(`USE_MMX',`
-+
- define(`elr',`
- movd 0(%ebp),s0
- movd t0,%eax
-@@ -253,6 +256,9 @@
- ')
-
-
-+')
-+ifdef(`USE_MMX',`
-+
- C_FUNCTION_BEGIN(aesEncrypt)
- pushl %edi
- pushl %esi
-@@ -364,6 +370,9 @@
- pxor 6144(%esi,%edx,8),t2
- ')
-
-+')
-+ifdef(`USE_MMX',`
-+
- define(`dsft',`
- movd $1+ 0(%ebp),s0
- movd t0,%eax
-@@ -490,6 +499,9 @@
- pxor t3,s2
- ')
-
-+')
-+ifdef(`USE_MMX',`
-+
- define(`dblock',`
- sxrk
+Index: configure
+--- configure.orig 2009-07-04 12:04:15 +0200
++++ configure 2009-07-07 23:55:17 +0200
+@@ -4497,13 +4497,7 @@
+ if $ac_preproc_ok; then
+ :
+ else
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity
check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++ :
+ fi
+ ac_ext=c
Index: gnu.h.in
---- gnu.h.in.orig 2004-12-19 21:18:48 +0100
-+++ gnu.h.in 2007-07-19 13:54:45 +0200
-@@ -48,15 +48,6 @@
+--- gnu.h.in.orig 2009-06-18 21:56:25 +0200
++++ gnu.h.in 2009-07-07 23:55:17 +0200
+@@ -59,15 +59,6 @@
@TYPEDEF_UINT32_T@
@TYPEDEF_UINT64_T@
@@ -89,3 +35,14 @@
/* WARNING: overriding this value is dangerous; some assembler routines
* make assumptions about the size set by the configure script
*/
+Index: include/Makefile.in
+--- include/Makefile.in.orig 2009-07-04 12:04:18 +0200
++++ include/Makefile.in 2009-07-08 10:36:03 +0200
+@@ -509,7 +509,6 @@
+ beecrypt/c++/util/RandomAccess.h \
+ beecrypt/c++/util/Set.h \
+ \
+-beecrypt/c++/util/concurrent/locks \
+ beecrypt/c++/util/concurrent/locks/Condition.h \
+ beecrypt/c++/util/concurrent/locks/Lock.h \
+ beecrypt/c++/util/concurrent/locks/ReentrantLock.h
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/beecrypt/beecrypt.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 beecrypt.spec
--- openpkg-src/beecrypt/beecrypt.spec 30 Jun 2009 20:20:08 -0000
1.27
+++ openpkg-src/beecrypt/beecrypt.spec 8 Jul 2009 08:41:41 -0000
1.28
@@ -31,8 +31,8 @@
Class: PLUS
Group: Cryptography
License: LGPL
-Version: 4.1.2
-Release: 20080101
+Version: 4.2.0
+Release: 20090708
# list of sources
Source0:
http://switch.dl.sourceforge.net/beecrypt/beecrypt-%{version}.tar.gz
@@ -70,9 +70,6 @@
-e 's;cppglue\.cxx;;g' \
-e '/^CXX = /s;@CXX@;@CC@;g' \
Makefile.in
- %{l_shtool} subst \
- -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
- configure
%build
( echo 'ac_cv_have_dev_dsp=no'
@@ -98,6 +95,7 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/beecrypt/c++ >/dev/null 2>&1
|| true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
