OBS User unknown 2007-01-15 23:28:17 +00:00 committed by Git OBS Bridge
commit 201887ba84
8 changed files with 247 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

67
ibmca-configure.patch Normal file
View File

@ -0,0 +1,67 @@
--- openssl-ibmca-1.0.0-rc2/configure.in 2006/03/28 08:09:45 1.1
+++ openssl-ibmca-1.0.0-rc2/configure.in 2006/03/28 08:09:54
@@ -21,39 +21,16 @@
fi
fi
-OPENSSL_LIB_DIR="/usr/local/ssl/lib"
+# OpenSSL location
+AC_MSG_CHECKING([OpenSSL])
+AC_CHECK_LIB(crypto, RAND_add, [LIBCRYPTO="-lcrypto"], \
+ AC_MSG_ERROR([*** libcrypto not found]))
# libica
AC_MSG_CHECKING([libICA])
AC_CHECK_LIB(ica, icaOpenAdapter, [LIBICA="-lica"], \
- AC_MSG_ERROR([*** libICA not found]))
-
-# OpenSSL location
-AC_MSG_CHECKING([OpenSSL location])
-AC_ARG_WITH(openssl,
- [ --with-openssl=PATH Location of openssl libs/includes],
- [OPENSSL_INCLUDE_DIR="$withval/include"
- OPENSSL_LIB_DIR="$withval/lib"
- if [[ ! -d $OPENSSL_INCLUDE_DIR -o ! -d $OPENSSL_LIB_DIR ]]; then
- AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
- else
- AC_MSG_RESULT([yes])
- CFLAGS="$CFLAGS -L$OPENSSL_LIB_DIR -I$OPENSSL_INCLUDE_DIR"
- fi],
- [AC_MSG_RESULT([no])
- AC_SUBST([OPENSSL_LIB_DIR], [/usr/local/ssl/lib])
- AC_SUBST([OPENSSL_INCLUDE_DIR], [/usr/local/ssl/include]) ] )
-
-# Is the library specified?
-AC_MSG_CHECKING([Engines library directory])
-AC_ARG_WITH(engines-dir,
- [ --with-engines-dir=PATH Location of OpenSSL engines],
- [OPENSSL_ENGINES_DIR="$withval/"],
- [AC_MSG_RESULT([no])
- AC_SUBST([OPENSSL_ENGINES_DIR], [$OPENSSL_LIB_DIR/engines])])
+ AC_MSG_ERROR([*** libICA not found]),-lssl)
-# for the correct install target
-libdir=$OPENSSL_ENGINES_DIR
AC_DISABLE_STATIC
AC_PROG_CC
@@ -61,6 +38,8 @@
CFLAGS="$CFLAGS -Wall"
AC_SUBST(CFLAGS)
+AC_SUBST(LIBCRYPTO)
+AC_SUBST(LIBICA)
AC_OUTPUT(Makefile openssl.cnf.sample)
--- openssl-ibmca-1.0.0-rc2/Makefile.am 2006/03/28 08:06:46 1.1
+++ openssl-ibmca-1.0.0-rc2/Makefile.am 2006/03/28 08:07:34
@@ -1,7 +1,4 @@
lib_LTLIBRARIES=libibmca.la
-libibmca_la_LIBADD=@OPENSSL_LIB_DIR@/libcrypto.a
-libibmca_la_LDFLAGS=-lc
-libibmca_la_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
-AM_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
+libibmca_la_LDFLAGS=@LIBICA@ @LIBCRYPTO@ -lc
libibmca_la_SOURCES=e_ibmca.c e_ibmca.h e_ibmca_err.c

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3b114bc78fe8180b0c5f5d4d687b0fe2b3b23942c1f03e70aebc99b253119c9
size 215240

View File

@ -0,0 +1,65 @@
--- README
+++ README
@@ -7,45 +7,28 @@
ABOUT
-This package contains the dynamic IBMCA engine.
+This package contains the dynamic IBMCA engine. Note that, as of
+OpenSSL version 0.9.8, the IBMCA engine is shipped as a dynamic engine
+in a separate RPM.
BUILDING
Requirements: OpenSSL 0.9.8, libICA
- By default, the build will assume that you have a custom openssl installed
-in /usr/local/ssl.
-
- $ configure [--enable-debug] [--with-openssl=/path/to/custom/openssl] \
- [--with-engines-dir=/path/to/openssl/engines/directory]
- $ make
- # make install
-
-Included in this package is a sample openssl.cnf file (openssl.cnf.sample),
-which can be used to turn on use of the IBMCA engine in apps where OpenSSL
-config support is compiled in. In order to enable the IBMCA engine, the
-content from this file should be concatenated to the existing openssl.cnf file
-on the host.
-
-During the build process, the path to the engines/ directory is substituted in
-for the dynamic_path parameter in the ibmca section. By default, this path to
-the engines/ directory is relative to the OpenSSL installation target. With no
-parameters passed to the ./configure script, this target is /usr/local/ssl,
-and so the default entry in the sample openssl.cnf file is:
-
-dynamic_path = /usr/local/ssl/lib/engines/libibmca.so
-
-If OpenSSL is installed to a different location, then the --with-openssl=
-option should be passed to the ./configure script. For instance, if
---with-openssl=/usr is given, then the entry in the sample openssl.cnf file
-is:
+Included in this package is a sample openssl.cnf file
+(openssl.cnf.sample), which can be used to enable use of the IBMCA
+engine in apps where OpenSSL config support is compiled in. In order
+to enable the IBMCA engine, the content from this file should be
+concatenated to the existing openssl.cnf file on the host.
+
+The path to the engines/ directory is /usr/lib/engines; the dynamic
+path to the IBMCA engine for 32-bit binary RPM installations should
+be:
dynamic_path = /usr/lib/engines/libibmca.so
-If the OpenSSL engines directory is located elsewhere, then that location must
-be specified in the --with-engines-dir= option. For instance, if the engines/
-directory is under /usr/lib64, then the ./configure script will need the
-option --with-engines-dir=/usr/lib64/engines, which will produce this entry in
-the sample openssl.cnf file:
+The dynamic path to the IBMCA engine for 64-bit binary RPM
+installations should be:
+
+dynamic_path = /usr/lib64/engines/libibmca.so
-dynamic_path = /usr/lib64/engines/libibmca.so
\ No newline at end of file

12
openssl-ibmca.changes Normal file
View File

@ -0,0 +1,12 @@
-------------------------------------------------------------------
Mon Jun 19 17:24:22 CEST 2006 - uli@suse.de
- updated README (bug #185508)
-------------------------------------------------------------------
Tue Mar 28 14:27:32 CEST 2006 - hare@suse.de
- Fixed configure.in to build correctly
- Fixed spec file
- Initial version from Mike Halcrow

76
openssl-ibmca.spec Normal file
View File

@ -0,0 +1,76 @@
#
# spec file for package openssl-ibmca (Version 1.0.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: openssl-ibmca
BuildRequires: libica openssl-devel
Summary: The IBMCA OpenSSL dynamic engine
Version: 1.0.0
Release: 7
License: IBM Public License
Group: Hardware/Other
Source: openssl-ibmca-1.0.0-rc2.tar.bz2
Patch: ibmca-configure.patch
Patch1: openssl-ibmca-README.patch
URL: http://sourceforge.net/projects/opencryptoki
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq
Requires: openssl libica
%define ibmca_64bit_arch s390x ppc64
%define ibmca_32bit_arch %ix86 s390 ppc %arm
ExclusiveArch: %ibmca_32bit_arch %ibmca_64bit_arch
%description
This package contains a shared object OpenSSL dynamic engine for the
IBM eServer Cryptographic Accelerator (ICA).
Authors:
--------
Mike Halcrow <mhalcrow@us.ibm.com>
%prep
%setup -n openssl-ibmca-1.0.0-rc2
%patch -p1
%patch1
%build
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS"
export CPPFLAGS="$RPM_OPT_FLAGS"
./configure --with-engines-dir=%_libdir/engines --libdir=%_libdir/engines
make
%install
%makeinstall
(cd $RPM_BUILD_ROOT; libtool --finish %_libdir/engines)
rm ${RPM_BUILD_ROOT}%{_libdir}/engines/libibmca.la
%post
%run_ldconfig
%postun
%files
%defattr(-, root, root)
%doc README
%doc openssl.cnf.sample
%{_libdir}/engines/libibmca.*
%changelog -n openssl-ibmca
* Mon Jun 19 2006 - uli@suse.de
- updated README (bug #185508)
* Tue Mar 28 2006 - hare@suse.de
- Fixed configure.in to build correctly
- Fixed spec file
- Initial version from Mike Halcrow

0
ready Normal file
View File