rpms/beecrypt/F-8 beecrypt-4.1.2-sparc64.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 beecrypt-4.1.2-base64.patch, 1.1, 1.2 beecrypt-4.1.2-biarch.patch, 1.1, 1.2 beecrypt-4.1.2-no-c++.patch, 1.1, 1.2 beecrypt-4.1.2-python-api.patch, 1.1, 1.2 beecrypt-4.1.2-with-debug.patch, 1.1, 1.2 beecrypt.spec, 1.37, 1.38 sources, 1.7, 1.8

Robert Scheck (robert) fedora-extras-commits at redhat.com
Tue May 20 17:47:38 UTC 2008 

Author: robert

Update of /cvs/pkgs/rpms/beecrypt/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3994

Modified Files:
	.cvsignore beecrypt-4.1.2-base64.patch 
	beecrypt-4.1.2-biarch.patch beecrypt-4.1.2-no-c++.patch 
	beecrypt-4.1.2-python-api.patch 
	beecrypt-4.1.2-with-debug.patch beecrypt.spec sources 
Added Files:
	beecrypt-4.1.2-sparc64.patch 
Log Message:
- Removed -fomit-frame-pointer to fix debuginfo (#438262 #c5)
- Disabled beecrypt-java subpackage again (#151294, #438262 #c6)
- Changes to match with Fedora Packaging Guidelines (#438262)


beecrypt-4.1.2-sparc64.patch:

--- NEW FILE beecrypt-4.1.2-sparc64.patch ---
Patch by Dennis Gilmore <dennis at ausil.us> 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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Feb 2005 02:53:11 -0000	1.7
+++ .cvsignore	20 May 2008 17:46:44 -0000	1.8
@@ -1,2 +1,2 @@
-beecrypt-3.1.0.tar.gz
 beecrypt-4.1.2.tar.gz
+beecrypt-4.1.2.tar.gz.sig

beecrypt-4.1.2-base64.patch:

Index: beecrypt-4.1.2-base64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt-4.1.2-base64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beecrypt-4.1.2-base64.patch	17 May 2005 17:42:49 -0000	1.1
+++ beecrypt-4.1.2-base64.patch	20 May 2008 17:46:44 -0000	1.2
@@ -1,5 +1,8 @@
---- beecrypt-4.1.2/base64.c.b64	2005-04-26 21:46:27.000000000 +0200
-+++ beecrypt-4.1.2/base64.c	2005-04-26 21:47:48.000000000 +0200
+Patch by Miloslav Trmac <mitr at redhat.com> 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;
  

beecrypt-4.1.2-biarch.patch:

Index: beecrypt-4.1.2-biarch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt-4.1.2-biarch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beecrypt-4.1.2-biarch.patch	27 Jun 2006 13:15:53 -0000	1.1
+++ beecrypt-4.1.2-biarch.patch	20 May 2008 17:46:44 -0000	1.2
@@ -1,5 +1,8 @@
---- beecrypt-4.1.2/gnu.h.in.biarch	2006-05-22 15:53:45.000000000 -0400
-+++ beecrypt-4.1.2/gnu.h.in	2006-05-22 15:53:49.000000000 -0400
+Patch by Paul Nasrat <pnasrat at redhat.com> for beecrypt >= 4.1.2 to make multilib/multiarch
+of beecrypt-devel working.
+
+--- beecrypt-4.1.2/gnu.h.in				2006-05-22 15:53:45.000000000 -0400
++++ beecrypt-4.1.2/gnu.h.in.biarch			2006-05-22 15:53:49.000000000 -0400
 @@ -61,7 +61,12 @@
   * make assumptions about the size set by the configure script
   */

beecrypt-4.1.2-no-c++.patch:

Index: beecrypt-4.1.2-no-c++.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt-4.1.2-no-c++.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beecrypt-4.1.2-no-c++.patch	22 Aug 2007 10:19:55 -0000	1.1
+++ beecrypt-4.1.2-no-c++.patch	20 May 2008 17:46:44 -0000	1.2
@@ -1,6 +1,9 @@
-diff -uNr beecrypt-4.1.2-nocpp/Makefile.am beecrypt-4.1.2/Makefile.am
---- beecrypt-4.1.2-nocpp/Makefile.am	2004-12-22 09:06:31.000000000 +0200
-+++ beecrypt-4.1.2/Makefile.am	2007-08-07 08:59:34.000000000 +0300
+Patch by Florian La Roche <laroche at redhat.com> and Panu Matilainen <pmatilai at redhat.com>
+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

beecrypt-4.1.2-python-api.patch:

Index: beecrypt-4.1.2-python-api.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt-4.1.2-python-api.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beecrypt-4.1.2-python-api.patch	17 May 2005 19:25:12 -0000	1.1
+++ beecrypt-4.1.2-python-api.patch	20 May 2008 17:46:44 -0000	1.2
@@ -1,5 +1,8 @@
---- beecrypt-4.1.2/python/debug-py.c.python-api	2004-06-20 13:09:21.000000000 +0200
-+++ beecrypt-4.1.2/python/debug-py.c	2005-05-17 21:13:14.000000000 +0200
+Patch by Miloslav Trmac <mitr at redhat.com> 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@*/

beecrypt-4.1.2-with-debug.patch:

Index: beecrypt-4.1.2-with-debug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt-4.1.2-with-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- beecrypt-4.1.2-with-debug.patch	22 Aug 2007 10:19:55 -0000	1.1
+++ beecrypt-4.1.2-with-debug.patch	20 May 2008 17:46:44 -0000	1.2
@@ -1,11 +1,16 @@
-diff -up beecrypt-4.1.2/acinclude.m4.withdebug beecrypt-4.1.2/acinclude.m4
---- beecrypt-4.1.2/acinclude.m4.withdebug	2007-08-07 09:17:48.000000000 +0300
-+++ beecrypt-4.1.2/acinclude.m4	2007-08-07 09:17:58.000000000 +0300
-@@ -459,7 +459,6 @@ AC_DEFUN([BEECRYPT_GNU_CC],[
+Patch by Panu Matilainen <pmatilai at redhat.com> and Robert Scheck <robert at fedoraproject.org>
+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 -fomit-frame-pointer"
++    CFLAGS="$CFLAGS -DNDEBUG"
      if test "$bc_cv_c_aggressive_opt" = yes; then
        case $bc_target_cpu in
+       athlon64)


Index: beecrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/beecrypt.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- beecrypt.spec	22 Aug 2007 13:41:24 -0000	1.37
+++ beecrypt.spec	20 May 2008 17:46:44 -0000	1.38
@@ -1,76 +1,58 @@
-
-%define	with_python		--with-python
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-#define with_java		--with-java
 
-Summary: An open source cryptography library.
-Name: beecrypt
-Version: 4.1.2
-Release: 13
-Group: System Environment/Libraries
-License: LGPLv2+
-URL: http://sourceforge.net/projects/beecrypt
-Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
-Source1: http://prdownloads.sourceforge.net/beecrypt/%{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
-# XXX auto* needed for patches 3 & 4
-BuildRequires: autoconf automake libtool
-BuildRequires: doxygen tetex-dvips tetex-latex 
-# XXX this causes hideous amount of syntax errors from ghostscript... 
-BuildRequires: graphviz
-BuildRequires: m4
-%if %{?with_python:1}0
-BuildRequires: python-devel
-BuildRequires: python
-%endif
-BuildRoot: %{_tmppath}/%{name}-root
-Obsoletes: beecrypt-java =< 4.1.2-2
+Summary:	An open source cryptography library
+Name:		beecrypt
+Version:	4.1.2
+Release:	17%{?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
+BuildRequires:	autoconf, automake, libtool
+BuildRequires:	tetex-dvips, tetex-latex, graphviz
+BuildRequires:	doxygen, m4, python-devel
+Obsoletes:	beecrypt-java <= 4.1.2-3
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Beecrypt is a general-purpose cryptography library.
+BeeCrypt is an ongoing project to provide a strong and fast cryptography
+toolkit. Includes entropy sources, random generators, block ciphers, hash
+functions, message authentication codes, multiprecision integer routines
+and public key primitives.
 
 %package devel
-Summary: Files needed for developing applications with beecrypt.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:	Development files for the beecrypt toolkit and library
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Beecrypt is a general-purpose cryptography library.  This package contains
-files needed for developing applications with beecrypt.
+The beecrypt-devel package includes header files and libraries necessary
+for developing programs which use the beecrypt C toolkit and library. And
+beecrypt is a general-purpose cryptography library.
 
 %package apidocs
-Summary: API documentation for beecrypt
-Group: Documentation
+Summary:	API documentation for beecrypt toolkit and library
+Group:		Documentation
 
 %description apidocs
 Beecrypt is a general-purpose cryptography library. This package contains
 API documentation for developing applications with beecrypt.
 
-%if %{?with_python:1}0
 %package python
-Summary: Files needed for python applications using beecrypt.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Summary:	Files needed for python applications using beecrypt
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description python
-Beecrypt is a general-purpose cryptography library.  This package contains
+Beecrypt is a general-purpose cryptography library. This package contains
 files needed for using python with beecrypt.
-%endif
-
-%if %{?with_java:1}0
-%package java
-Summary: Files needed for java applications using beecrypt.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description java
-Beecrypt is a general-purpose cryptography library.  This package contains
-files needed for using java with beecrypt.
-%endif
 
 %prep
 %setup -q
@@ -79,34 +61,26 @@
 %patch2 -p1 -b .biarch
 %patch3 -p1 -b .noc++
 %patch4 -p1 -b .withdebug
-
+%patch5 -p1 -b .sparc64
 autoreconf
 
 %build
-
-%configure --enable-shared --enable-static %{?with_python} \
-    %{?with_java}%{!?with_java:--with-java=no} --with-cplusplus=no
-
-make %{?_smp_mflags} \
-	%{?with_python:pythondir="%{python_sitelib}"}
+%configure --with-cplusplus=no --with-java=no
+make %{?_smp_mflags} pythondir=%{python_sitelib}
 doxygen
 
 %install
-rm -fr $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT \
-  %{?with_python:pythondir="%{python_sitelib}"}
-
-# XXX nuke unpackaged files, artifacts from using libtool to produce module
-rm -f ${RPM_BUILD_ROOT}%{python_sitelib}/_bc.*a
-
-# XXX delete next line to build with legacy, non-check aware, rpmbuild.
-%check
-make check || :
-cat /proc/cpuinfo
-make bench || :
+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
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -114,36 +88,38 @@
 
 %files
 %defattr(-,root,root)
-%doc README BENCHMARKS
+%doc AUTHORS BENCHMARKS CONTRIBUTORS
+%doc COPYING COPYING.LIB NEWS README
 %{_libdir}/libbeecrypt.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc BUGS 
 %{_includedir}/%{name}
-%{_libdir}/libbeecrypt.a
-%{_libdir}/libbeecrypt.la
 %{_libdir}/libbeecrypt.so
 
 %files apidocs
 %defattr(-,root,root)
 %doc docs/html
 
-%if %{?with_python:1}0
 %files python
 %defattr(-,root,root)
 %{python_sitelib}/_bc.so
-%endif
-
-%if %{?with_java:1}0
-%files java
-%defattr(-,root,root)
-%{_libdir}/libbeecrypt_java.a
-%{_libdir}/libbeecrypt_java.la
-%{_libdir}/libbeecrypt_java.so*
-%endif
 
 %changelog
+* Tue May 20 2008 Robert Scheck <robert at fedoraproject.org> 4.1.2-17
+- Removed -fomit-frame-pointer to fix debuginfo (#438262 #c5)
+- Disabled beecrypt-java subpackage again (#151294, #438262 #c6)
+
+* Thu Mar 19 2008 Robert Scheck <robert at fedoraproject.org> 4.1.2-16
+- Changes to match with Fedora Packaging Guidelines (#438262)
+
+* Thu Nov 29 2007 Dennis Gilmore <dennis at ausil.us> - 4.1.2-15
+- update sparc64 patch  
+
+* Wed Nov 28 2007 Dennis Gilmore <dennis at ausil.us> - 4.1.2-14
+- add patch so sparc64 gets lib64 
+
 * Wed Aug 22 2007 Panu Matilainen <pmatilai at redhat.com> - 4.1.2-13
 - avoid linking against libstdc++ (#165080)
 - fix debuginfo contents by building with -g (#250035)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/F-8/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Feb 2005 02:53:11 -0000	1.7
+++ sources	20 May 2008 17:46:44 -0000	1.8
@@ -1 +1,2 @@
 820d26437843ab0a6a8a5151a73a657c  beecrypt-4.1.2.tar.gz
+7a31857aa3c7a5bae88b02fb5e72cc1a  beecrypt-4.1.2.tar.gz.sig

More information about the fedora-extras-commits mailing list