diff --git a/.cvsignore b/.cvsignore index f8b3e96..c197980 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -beecrypt-4.1.2.tar.gz -beecrypt-4.1.2.tar.gz.sig +beecrypt-4.2.1.tar.gz diff --git a/beecrypt-4.1.2-base64.patch b/beecrypt-4.1.2-base64.patch deleted file mode 100644 index 71883fb..0000000 --- a/beecrypt-4.1.2-base64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch by Miloslav Trmac for beecrypt >= 4.1.2, to fix b64encode() for -data starting with NUL. For further information see Red Hat Bugzilla for bug #123650. - ---- beecrypt-4.1.2/base64.c 2005-04-26 21:46:27.000000000 +0200 -+++ beecrypt-4.1.2/base64.c.base64 2005-04-26 21:47:48.000000000 +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; diff --git a/beecrypt-4.1.2-no-c++.patch b/beecrypt-4.1.2-no-c++.patch deleted file mode 100644 index ac039e1..0000000 --- a/beecrypt-4.1.2-no-c++.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch by Florian La Roche and Panu Matilainen -for beecrypt >= 4.1.2 to avoid linking against libstdc++. For further information see Red -Hat Bugzilla for bug #165080. - ---- beecrypt-4.1.2/Makefile.am 2004-12-22 09:06:31.000000000 +0200 -+++ beecrypt-4.1.2/Makefile.amno-c++ 2007-08-07 08:59:34.000000000 +0300 -@@ -49,7 +49,7 @@ - - libalt_LTLIBRARIES = libbeecrypt.la - --libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx -+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c # cppglue.cxx - libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) - libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo - libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) diff --git a/beecrypt-4.1.2-python-api.patch b/beecrypt-4.1.2-python-api.patch deleted file mode 100644 index 08756fe..0000000 --- a/beecrypt-4.1.2-python-api.patch +++ /dev/null @@ -1,25 +0,0 @@ -Patch by Miloslav Trmac for beecrypt >= 4.1.2, removing dependencies on -private symbols not present in Python >= 2.4 from the beecrypt-python package. - ---- beecrypt-4.1.2/python/debug-py.c 2004-06-20 13:09:21.000000000 +0200 -+++ beecrypt-4.1.2/python/debug-py.c.python-api 2005-05-17 21:13:14.000000000 +0200 -@@ -1,10 +1,4 @@ -- --/*@unchecked@*/ --extern PyTypeObject PyCode_Type; --/*@unchecked@*/ --extern PyTypeObject PyDictIter_Type; --/*@unchecked@*/ --extern PyTypeObject PyFrame_Type; -+#include "frameobject.h" - - #include "beecrypt/python/mpw-py.h" /* XXX debug only */ - #include "beecrypt/python/rng-py.h" /* XXX debug only */ -@@ -33,7 +27,6 @@ - if (o->ob_type == &PyCode_Type) return "Code"; - if (o->ob_type == &PyComplex_Type) return "Complex"; - if (o->ob_type == &PyDict_Type) return "Dict"; -- if (o->ob_type == &PyDictIter_Type) return "DictIter"; - if (o->ob_type == &PyFile_Type) return "File"; - if (o->ob_type == &PyFloat_Type) return "Float"; - if (o->ob_type == &PyFrame_Type) return "Frame"; diff --git a/beecrypt-4.1.2-sparc64.patch b/beecrypt-4.1.2-sparc64.patch deleted file mode 100644 index ddd259a..0000000 --- a/beecrypt-4.1.2-sparc64.patch +++ /dev/null @@ -1,73 +0,0 @@ -Patch by Dennis Gilmore for beecrypt >= 4.1.2 to catch lib64 on sparc64. - ---- beecrypt-4.1.2/acinclude.m4 2004-12-19 14:16:35.000000000 -0600 -+++ beecrypt-4.1.2/acinclude.m4.sparc64 2007-11-29 11:48:32.000000000 -0600 -@@ -102,6 +102,29 @@ - ;; - esac - ;; -+ sparc*) -+ case $withval in -+ sparc) -+ ;; -+ sparcv[789]) -+ bc_target_arch=sparc -+ ;; -+ sparcv9v) -+ bc_target_arch=sparc -+ ;; -+ sparc64) -+ bc_target_arch=sparc64 -+ ;; -+ sparc64v) -+ bc_target_arch=sparc64 -+ ;; -+ *) -+ AC_MSG_WARN([unsupported on invalid arch type]) -+ bc_target_arch=sparc -+ ;; -+ esac -+ ;; -+ - esac - ]) - -@@ -133,9 +156,15 @@ - s390x) - bc_target_arch=s390x - ;; -- sparc*) -+ sparc) - bc_target_arch=sparc - ;; -+ sparcv[789]*) -+ bc_target_arch=sparc -+ ;; -+ sparc64*) -+ bc_target_arch=sparc64 -+ ;; - x86_64) - bc_target_arch=x86_64 - ;; ---- beecrypt-4.1.2/aclocal.m4 2004-12-21 05:38:18.000000000 -0600 -+++ beecrypt-4.1.2/aclocal.m4.sparc64 2007-11-28 15:18:51.000000000 -0600 -@@ -1435,7 +1435,7 @@ - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -+ x86_64*|s390x*|powerpc64*|sparc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in ---- beecrypt-4.1.2/configure.ac 2004-12-21 05:37:56.000000000 -0600 -+++ beecrypt-4.1.2/configure.ac.sparc64 2007-11-28 12:45:39.000000000 -0600 -@@ -614,7 +614,7 @@ - case $target_os in - linux*) - case $bc_target_arch in -- powerpc64 | s390x | x86_64) -+ powerpc64 | s390x | x86_64| sparc64 ) - bc_libalt="64" - ;; - esac diff --git a/beecrypt-4.1.2-with-debug.patch b/beecrypt-4.1.2-with-debug.patch deleted file mode 100644 index c5f50da..0000000 --- a/beecrypt-4.1.2-with-debug.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch by Panu Matilainen and Robert Scheck -for beecrypt >= 4.1.2, which removes the usage of -g and -fomit-frame-pointer. Because both -makes the resulting debuginfo package pretty much useless. - ---- beecrypt-4.1.2/acinclude.m4 2004-12-19 21:16:35.000000000 +0100 -+++ beecrypt-4.1.2/acinclude.m4.withdebug 2008-05-19 23:50:43.000000000 +0200 -@@ -459,8 +459,7 @@ - CFLAGS="$CFLAGS -Wall -pedantic" - else - # Generic optimizations, including cpu tuning -- BEECRYPT_CFLAGS_REM([-g]) -- CFLAGS="$CFLAGS -DNDEBUG -fomit-frame-pointer" -+ CFLAGS="$CFLAGS -DNDEBUG" - if test "$bc_cv_c_aggressive_opt" = yes; then - case $bc_target_cpu in - athlon64) diff --git a/beecrypt-4.2.1-no-c++.patch b/beecrypt-4.2.1-no-c++.patch new file mode 100644 index 0000000..bb2d227 --- /dev/null +++ b/beecrypt-4.2.1-no-c++.patch @@ -0,0 +1,16 @@ +Patch by Robert Scheck for beecrypt >= 4.2.1 to avoid linking +against libstdc++. This patch is based on an old by Florian La Roche +and Panu Matilainen . For further information see Red Hat Bugzilla +for bug ID #165080. + +--- beecrypt-4.2.1/Makefile.am 2009-07-08 20:56:18.000000000 +0200 ++++ beecrypt-4.2.1/Makefile.am.no-c++ 2010-03-28 20:55:51.000000000 +0200 +@@ -62,7 +62,7 @@ + + lib_LTLIBRARIES = libbeecrypt.la + +-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx ++libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c # cppglue.cxx + libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) + libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS) + libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) diff --git a/beecrypt.spec b/beecrypt.spec index a1f3bad..97b1fbb 100644 --- a/beecrypt.spec +++ b/beecrypt.spec @@ -2,19 +2,14 @@ Summary: An open source cryptography library Name: beecrypt -Version: 4.1.2 -Release: 20%{?dist} +Version: 4.2.1 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://beecrypt.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz.sig -Patch0: beecrypt-4.1.2-base64.patch -Patch1: beecrypt-4.1.2-python-api.patch -Patch2: beecrypt-4.1.2-biarch.patch -Patch3: beecrypt-4.1.2-no-c++.patch -Patch4: beecrypt-4.1.2-with-debug.patch -Patch5: beecrypt-4.1.2-sparc64.patch +Source: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz +Patch0: beecrypt-4.1.2-biarch.patch +Patch1: beecrypt-4.2.1-no-c++.patch BuildRequires: autoconf, automake, libtool BuildRequires: tetex-dvips, tetex-latex, graphviz BuildRequires: doxygen, m4, python-devel @@ -56,26 +51,23 @@ files needed for using python with beecrypt. %prep %setup -q -%patch0 -p1 -b .base64 -%patch1 -p1 -b .python-api -%patch2 -p1 -b .biarch -%patch3 -p1 -b .noc++ -%patch4 -p1 -b .withdebug -%patch5 -p1 -b .sparc64 +%patch0 -p1 -b .biarch +%patch1 -p1 -b .no-c++ libtoolize autoreconf %build %configure --with-cplusplus=no --with-java=no make %{?_smp_mflags} pythondir=%{python_sitelib} + +cd include/beecrypt doxygen +cd ../.. %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT pythondir=%{python_sitelib} install - rm -f $RPM_BUILD_ROOT{%{_libdir},%{python_sitelib}}/*.{a,la} -find docs/html -name \*.map -size 0 -delete iconv -f ISO-8859-1 -t UTF-8 CONTRIBUTORS -o CONTRIBUTORS.utf8 mv -f CONTRIBUTORS.utf8 CONTRIBUTORS @@ -88,26 +80,29 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS BENCHMARKS CONTRIBUTORS %doc COPYING COPYING.LIB NEWS README %{_libdir}/libbeecrypt.so.* %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %doc BUGS %{_includedir}/%{name} %{_libdir}/libbeecrypt.so %files apidocs -%defattr(-,root,root) +%defattr(-,root,root,-) %doc docs/html %files python -%defattr(-,root,root) +%defattr(-,root,root,-) %{python_sitelib}/_bc.so %changelog +* Sun Mar 28 2010 Robert Scheck 4.2.1-1 +- Upgrade to 4.2.1 + * Fri Jul 24 2009 Fedora Release Engineering - 4.1.2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 69dfd68..97b5f4a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz -7a31857aa3c7a5bae88b02fb5e72cc1a beecrypt-4.1.2.tar.gz.sig +8441c014170823f2dff97e33df55af1e beecrypt-4.2.1.tar.gz