commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory checked in at 2018-07-28 12:43:35
Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old)
and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New)
Package is "openssl_tpm_engine"
Sat Jul 28 12:43:35 2018 rev:20 rq:625689 version:0.4.2
Changes:
--- /work/SRC/openSUSE:Factory/openssl_tpm_engine/openssl_tpm_engine.changes
2017-12-06 09:00:18.309216307 +0100
+++
/work/SRC/openSUSE:Factory/.openssl_tpm_engine.new/openssl_tpm_engine.changes
2018-07-28 12:43:36.244793929 +0200
@@ -1,0 +2,9 @@
+Fri Jul 20 07:00:05 UTC 2018 - mplus...@suse.com
+
+- Modernise spec file with spec-cleaner
+- Use pkgconfig style dependencies
+- Update dependencies
+- Drop %check section - tests are not usable in build environment
+ (and not run anyways).
+
+---
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.ab4EB9/_old 2018-07-28 12:43:36.796794932 +0200
+++ /var/tmp/diff_new_pack.ab4EB9/_new 2018-07-28 12:43:36.800794939 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openssl_tpm_engine
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,15 @@
#
+%define enginesdir %(pkg-config libcrypto --variable=enginesdir)
Name: openssl_tpm_engine
-Url:http://sourceforge.net/projects/trousers
-Summary:OpenSSL TPM interface engine plugin
-License:GPL-2.0+
-Group: Productivity/Security
Version:0.4.2
Release:0
-Source0:
https://downloads.sourceforge.net/project/trousers/OpenSSL%20TPM%20Engine/%{version}/%{name}-%{version}.tar.gz
+Summary:OpenSSL TPM interface engine plugin
+License:GPL-2.0-or-later
+Group: Productivity/Security
+URL:http://sourceforge.net/projects/trousers
+Source0:
https://downloads.sourceforge.net/project/trousers/OpenSSL%%20TPM%%20Engine/%{version}/%{name}-%{version}.tar.gz
Patch0: openssl_tpm_engine-somodule.patch
Patch1: -openssl-1.1-compatibility-preparation-remove-unneede.patch
Patch2: 0001-openssl-1.1-compatibility-preparation-fix-warnings-a.patch
@@ -32,12 +33,12 @@
Patch5: 0004-automake-add-linker-flags-to-explicitly-build-a-plug.patch
Patch6: 0005-autotools-choose-engine-plugin-name-based-on-OpenSSL.patch
Patch7: 0006-autotools-make-engine-plugin-installation-dir-config.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
-BuildRequires: libopenssl-devel
BuildRequires: libtool
+BuildRequires: pkgconfig >= 0.9.0
BuildRequires: trousers-devel
-%define enginesdir %(pkg-config libcrypto --variable=enginesdir)
+BuildRequires: pkgconfig(libcrypto)
+BuildRequires: pkgconfig(openssl)
%description
This package contains a plugin a for OpenSSL which connects it with the
@@ -46,7 +47,7 @@
%prep
%setup -q
-%patch0 -p0
+%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -59,21 +60,15 @@
mkdir m4
sh ./bootstrap.sh
%configure --libdir=/%{_lib}
-make
-
-%check
-make check
+make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{enginesdir}/tpm.la
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
+rm %{buildroot}/%{enginesdir}/tpm.la
%files
-%defattr(-, root, root)
-%doc LICENSE README openssl.cnf.sample
+%license LICENSE
+%doc README openssl.cnf.sample
%{_bindir}/create_tpm_key
%dir %{enginesdir}
%{enginesdir}/tpm.so
commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory checked in at 2017-12-06 09:00:13
Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old)
and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New)
Package is "openssl_tpm_engine"
Wed Dec 6 09:00:13 2017 rev:19 rq:548608 version:0.4.2
Changes:
--- /work/SRC/openSUSE:Factory/openssl_tpm_engine/openssl_tpm_engine.changes
2015-05-10 10:47:03.0 +0200
+++
/work/SRC/openSUSE:Factory/.openssl_tpm_engine.new/openssl_tpm_engine.changes
2017-12-06 09:00:18.309216307 +0100
@@ -1,0 +2,20 @@
+Mon Dec 4 18:03:54 UTC 2017 - matthias.gerst...@suse.com
+
+- Adjustment to OpenSSL 1.1. I've developed these patches myself, since
+ upstream doesn't have anything yet (and it doesn't look like they will
+ soon). I'll offer it to upstream by way of a pull request soon.
+
+ By way of these patches the spec file becomes a little bit simpler. The
+ enginesdir should be recognized dynamically by the autotools setup via
+ pkg-config now. Code and spec should still be able to build against OpenSSL
+ 1.0 as well.
+
+ -openssl-1.1-compatibility-preparation-remove-unneede.patch
+ 0001-openssl-1.1-compatibility-preparation-fix-warnings-a.patch
+ 0002-Explicitly-link-create_tpm_key-against-libcrypto.patch
+ 0003-OpenSSL-1.1-compatibility.patch
+ 0004-automake-add-linker-flags-to-explicitly-build-a-plug.patch
+ 0005-autotools-choose-engine-plugin-name-based-on-OpenSSL.patch
+ 0006-autotools-make-engine-plugin-installation-dir-config.patch
+
+---
New:
-openssl-1.1-compatibility-preparation-remove-unneede.patch
0001-openssl-1.1-compatibility-preparation-fix-warnings-a.patch
0002-Explicitly-link-create_tpm_key-against-libcrypto.patch
0003-OpenSSL-1.1-compatibility.patch
0004-automake-add-linker-flags-to-explicitly-build-a-plug.patch
0005-autotools-choose-engine-plugin-name-based-on-OpenSSL.patch
0006-autotools-make-engine-plugin-installation-dir-config.patch
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.M9I5r3/_old 2017-12-06 09:00:20.001154377 +0100
+++ /var/tmp/diff_new_pack.M9I5r3/_new 2017-12-06 09:00:20.001154377 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openssl_tpm_engine
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,11 +25,19 @@
Release:0
Source0:
https://downloads.sourceforge.net/project/trousers/OpenSSL%20TPM%20Engine/%{version}/%{name}-%{version}.tar.gz
Patch0: openssl_tpm_engine-somodule.patch
+Patch1: -openssl-1.1-compatibility-preparation-remove-unneede.patch
+Patch2: 0001-openssl-1.1-compatibility-preparation-fix-warnings-a.patch
+Patch3: 0002-Explicitly-link-create_tpm_key-against-libcrypto.patch
+Patch4: 0003-OpenSSL-1.1-compatibility.patch
+Patch5: 0004-automake-add-linker-flags-to-explicitly-build-a-plug.patch
+Patch6: 0005-autotools-choose-engine-plugin-name-based-on-OpenSSL.patch
+Patch7: 0006-autotools-make-engine-plugin-installation-dir-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
BuildRequires: libopenssl-devel
BuildRequires: libtool
BuildRequires: trousers-devel
+%define enginesdir %(pkg-config libcrypto --variable=enginesdir)
%description
This package contains a plugin a for OpenSSL which connects it with the
@@ -39,6 +47,13 @@
%prep
%setup -q
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
%build
mkdir m4
@@ -51,7 +66,7 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_lib}/engines/libtpm.la
+rm $RPM_BUILD_ROOT/%{enginesdir}/tpm.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -60,7 +75,7 @@
%defattr(-, root, root)
%doc LICENSE README openssl.cnf.sample
%{_bindir}/create_tpm_key
-%dir /%{_lib}/engines
-/%{_lib}/engines/libtpm.so
+%dir %{enginesdir}
+%{enginesdir}/tpm.so
%changelog
++ -openssl-1.1-compatibility-preparation-remove-unneede.patch ++
>From 592ecaa916bec4764c74fd378803252f13d0ec61 Mon Sep 17 00:00:00 2001
From: Matthias Gerstner
Date: Thu, 30 Nov 2017 12:58:39 +0100
Subject: [PATCH] openssl 1.1 compatibility preparation: remove unneeded
setting of rsa->e
The fixed exponent is later set in fill_out_rsa_object. This piece of code is
thus useless.
---
e_tpm.c | 7 ---
1 file
commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory checked in at 2015-05-10 10:47:01
Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old)
and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New)
Package is openssl_tpm_engine
Changes:
--- /work/SRC/openSUSE:Factory/openssl_tpm_engine/openssl_tpm_engine.changes
2013-08-01 17:15:20.0 +0200
+++
/work/SRC/openSUSE:Factory/.openssl_tpm_engine.new/openssl_tpm_engine.changes
2015-05-10 10:47:03.0 +0200
@@ -1,0 +2,7 @@
+Thu May 7 08:52:42 UTC 2015 - dims...@opensuse.org
+
+- Use the upstream provided bootstrap to make a full cycle.
+ Otherwise we might end up with version conflicts between used
+ tools.
+
+---
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.cBKwuY/_old 2015-05-10 10:47:03.0 +0200
+++ /var/tmp/diff_new_pack.cBKwuY/_new 2015-05-10 10:47:03.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openssl_tpm_engine
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,9 +42,7 @@
%build
mkdir m4
-aclocal
-autoconf
-automake --foreign --add-missing
+sh ./bootstrap.sh
%configure --libdir=/%{_lib}
make
commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory checked in at 2013-08-01 17:15:18
Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old)
and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New)
Package is openssl_tpm_engine
Changes:
--- /work/SRC/openSUSE:Factory/openssl_tpm_engine/openssl_tpm_engine.changes
2011-11-25 23:05:33.0 +0100
+++
/work/SRC/openSUSE:Factory/.openssl_tpm_engine.new/openssl_tpm_engine.changes
2013-08-01 17:15:20.0 +0200
@@ -1,0 +2,7 @@
+Fri Nov 2 16:10:46 UTC 2012 - meiss...@suse.com
+
+- updated to 0.4.2
+ - license adjustments
+ - allow TPM migration keys
+
+---
Old:
openssl_tpm_engine-0.4.1.tar.bz2
New:
openssl_tpm_engine-0.4.2.tar.gz
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.yovmL8/_old 2013-08-01 17:15:21.0 +0200
+++ /var/tmp/diff_new_pack.yovmL8/_new 2013-08-01 17:15:21.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openssl_tpm_engine
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,20 @@
#
-
Name: openssl_tpm_engine
-License:GPL-2.0+
-Group: Productivity/Security
Url:http://sourceforge.net/projects/trousers
Summary:OpenSSL TPM interface engine plugin
-Version:0.4.1
-Release:32
-Source0:%{name}-%{version}.tar.bz2
+License:GPL-2.0+
+Group: Productivity/Security
+Version:0.4.2
+Release:0
+Source0:
https://downloads.sourceforge.net/project/trousers/OpenSSL%20TPM%20Engine/%{version}/%{name}-%{version}.tar.gz
Patch0: openssl_tpm_engine-somodule.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libopenssl-devel libtool trousers-devel
+BuildRequires: automake
+BuildRequires: libopenssl-devel
+BuildRequires: libtool
+BuildRequires: trousers-devel
%description
This package contains a plugin a for OpenSSL which connects it with the
@@ -40,7 +42,9 @@
%build
mkdir m4
-autoreconf -fiv
+aclocal
+autoconf
+automake --foreign --add-missing
%configure --libdir=/%{_lib}
make
++ openssl_tpm_engine-somodule.patch ++
--- /var/tmp/diff_new_pack.yovmL8/_old 2013-08-01 17:15:21.0 +0200
+++ /var/tmp/diff_new_pack.yovmL8/_new 2013-08-01 17:15:21.0 +0200
@@ -1,49 +1,39 @@
+Index: Makefile.in
+===
--- Makefile.in.orig
+++ Makefile.in
-@@ -208,6 +208,7 @@ openssl_enginedir = @libdir@/openssl/eng
- libtpm_la_LIBADD = -L@OPENSSL_LIB_DIR@ -lcrypto -lc
- libtpm_la_CFLAGS = -I@OPENSSL_INCLUDE_DIR@
+@@ -299,6 +299,7 @@ openssl_engine_LTLIBRARIES = libtpm.la
+ openssl_enginedir = @libdir@/openssl/engines
+ libtpm_la_LIBADD = -lcrypto -lc -ltspi
libtpm_la_SOURCES = e_tpm.c e_tpm.h e_tpm_err.c
+libtpm_la_LDFLAGS=-avoid-version -module
create_tpm_key_SOURCES = create_tpm_key.c
create_tpm_key_LDADD = -ltspi
all: all-recursive
+Index: Makefile.am
+===
--- Makefile.am.orig
+++ Makefile.am
-@@ -1,14 +1,17 @@
-+ACLOCAL_AMFLAGS = -I m4
- SUBDIRS=. test
-
- EXTRA_DIST = README openssl.cnf.sample
+@@ -4,10 +4,11 @@ EXTRA_DIST = README openssl.cnf.sample
openssl_engine_LTLIBRARIES=libtpm.la
bin_PROGRAMS=create_tpm_key
-openssl_enginedir=@libdir@/openssl/engines
+openssl_enginedir=@libdir@/engines
--libtpm_la_LIBADD=-L@OPENSSL_LIB_DIR@ -lcrypto -lc
+-libtpm_la_LIBADD=-lcrypto -lc -ltspi
+libtpm_la_LDFLAGS= -no-undefined -avoid-version
-+libtpm_la_LIBADD= -lcrypto
- libtpm_la_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
++libtpm_la_LIBADD=-lcrypto -ltspi
libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
create_tpm_key_SOURCES=create_tpm_key.c
-create_tpm_key_LDADD=-ltspi
+create_tpm_key_LDADD=-ltspi -lcrypto
-+
+Index: configure.in
+===
--- configure.in.orig
+++ configure.in
-@@ -3,7 +3,8 @@
- #
-
- AC_INIT(openssl-tpm-engine, 0.4.1, trousers-us...@lists.sf.net)
--AM_INIT_AUTOMAKE(1.6.3)
-+AM_INIT_AUTOMAKE(1.6.3 foreign)
-+AC_CONFIG_MACRO_DIR([m4])
-
- # Debugging support
- AC_ARG_ENABLE(debug,
-@@ -45,7 +46,10 @@ AC_ARG_WITH(openssl,
+@@ -45,7 +45,10 @@ AC_ARG_WITH(openssl,
AC_SUBST(OPENSSL_INCLUDE_DIR)])
AC_DISABLE_STATIC
--
To unsubscribe, e-mail:
commit openssl_tpm_engine for openSUSE:Factory
Hello community, here is the log from the commit of package openssl_tpm_engine for openSUSE:Factory checked in at 2011-12-06 18:34:47 Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old) and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New) Package is openssl_tpm_engine, Maintainer is meiss...@suse.com Changes: Other differences: -- ++ openssl_tpm_engine.spec ++ --- /var/tmp/diff_new_pack.sgIDTZ/_old 2011-12-06 18:56:22.0 +0100 +++ /var/tmp/diff_new_pack.sgIDTZ/_new 2011-12-06 18:56:22.0 +0100 @@ -18,7 +18,7 @@ Name: openssl_tpm_engine -License:GPL v2 or later +License:GPL-2.0+ Group: Productivity/Security Url:http://sourceforge.net/projects/trousers Summary:OpenSSL TPM interface engine plugin -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory checked in at 2011-11-25 23:12:33
Comparing /work/SRC/openSUSE:Factory/openssl_tpm_engine (Old)
and /work/SRC/openSUSE:Factory/.openssl_tpm_engine.new (New)
Package is openssl_tpm_engine, Maintainer is meiss...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/openssl_tpm_engine/openssl_tpm_engine.changes
2011-09-23 12:20:45.0 +0200
+++
/work/SRC/openSUSE:Factory/.openssl_tpm_engine.new/openssl_tpm_engine.changes
2011-11-25 23:05:33.0 +0100
@@ -1,0 +2,5 @@
+Fri Nov 25 10:41:53 UTC 2011 - co...@suse.com
+
+- add libtool as buildrequire to avoid implicit dependency
+
+---
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.1WpnTL/_old 2011-11-25 23:05:34.0 +0100
+++ /var/tmp/diff_new_pack.1WpnTL/_new 2011-11-25 23:05:34.0 +0100
@@ -15,33 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-Url:http://sourceforge.net/projects/trousers
Name: openssl_tpm_engine
License:GPL v2 or later
Group: Productivity/Security
-AutoReqProv:on
+Url:http://sourceforge.net/projects/trousers
Summary:OpenSSL TPM interface engine plugin
Version:0.4.1
Release:32
Source0:%{name}-%{version}.tar.bz2
Patch0: openssl_tpm_engine-somodule.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: libopenssl-devel trousers-devel
+BuildRequires: libopenssl-devel libtool trousers-devel
%description
This package contains a plugin a for OpenSSL which connects it with the
Trusted Platform Module found on newer machines and a create_tpm_key
helper binary to create and extract a TPM key.
-
-
-Authors:
-
-Kent Yoder kyo...@users.sf.net
-
%prep
%setup -q
%patch0 -p0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit openssl_tpm_engine for openSUSE:Factory
Hello community,
here is the log from the commit of package openssl_tpm_engine for
openSUSE:Factory
checked in at Mon Sep 5 16:40:34 CEST 2011.
--- openssl_tpm_engine/openssl_tpm_engine.changes 2009-02-20
15:15:19.0 +0100
+++ openssl_tpm_engine/openssl_tpm_engine.changes 2011-09-05
06:15:15.0 +0200
@@ -1,0 +2,6 @@
+Mon Sep 5 04:14:00 UTC 2011 - crrodrig...@opensuse.org
+
+- Fix build with no-add-needed
+- engines currently live in %/{_lib}/engines
+
+---
calling whatdependson for head-i586
Other differences:
--
++ openssl_tpm_engine.spec ++
--- /var/tmp/diff_new_pack.BMU8Ah/_old 2011-09-05 16:39:25.0 +0200
+++ /var/tmp/diff_new_pack.BMU8Ah/_new 2011-09-05 16:39:25.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package openssl_tpm_engine (Version 0.4.1)
+# spec file for package openssl_tpm_engine
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
AutoReqProv:on
Summary:OpenSSL TPM interface engine plugin
Version:0.4.1
-Release:22
+Release:32
Source0:%{name}-%{version}.tar.bz2
Patch0: openssl_tpm_engine-somodule.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -47,7 +47,9 @@
%patch0 -p0
%build
-%configure
+mkdir m4
+autoreconf -fiv
+%configure --libdir=/%{_lib}
make
%check
@@ -55,7 +57,7 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT/%{_libdir}/openssl/engines/libtpm.la
+rm $RPM_BUILD_ROOT/%{_lib}/engines/libtpm.la
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,8 +66,7 @@
%defattr(-, root, root)
%doc LICENSE README openssl.cnf.sample
%{_bindir}/create_tpm_key
-%dir %{_libdir}/openssl
-%dir %{_libdir}/openssl/engines/
-%{_libdir}/openssl/engines/libtpm.so
+%dir /%{_lib}/engines
+/%{_lib}/engines/libtpm.so
%changelog
++ openssl_tpm_engine-somodule.patch ++
--- /var/tmp/diff_new_pack.BMU8Ah/_old 2011-09-05 16:39:25.0 +0200
+++ /var/tmp/diff_new_pack.BMU8Ah/_new 2011-09-05 16:39:25.0 +0200
@@ -1,6 +1,6 @@
Makefile.in
+--- Makefile.in.orig
+++ Makefile.in
-@@ -208,6 +208,7 @@
+@@ -208,6 +208,7 @@ openssl_enginedir = @libdir@/openssl/eng
libtpm_la_LIBADD = -L@OPENSSL_LIB_DIR@ -lcrypto -lc
libtpm_la_CFLAGS = -I@OPENSSL_INCLUDE_DIR@
libtpm_la_SOURCES = e_tpm.c e_tpm.h e_tpm_err.c
@@ -8,3 +8,50 @@
create_tpm_key_SOURCES = create_tpm_key.c
create_tpm_key_LDADD = -ltspi
all: all-recursive
+--- Makefile.am.orig
Makefile.am
+@@ -1,14 +1,17 @@
++ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS=. test
+
+ EXTRA_DIST = README openssl.cnf.sample
+
+ openssl_engine_LTLIBRARIES=libtpm.la
+ bin_PROGRAMS=create_tpm_key
+-openssl_enginedir=@libdir@/openssl/engines
++openssl_enginedir=@libdir@/engines
+
+-libtpm_la_LIBADD=-L@OPENSSL_LIB_DIR@ -lcrypto -lc
++libtpm_la_LDFLAGS= -no-undefined -avoid-version
++libtpm_la_LIBADD= -lcrypto
+ libtpm_la_CFLAGS=-I@OPENSSL_INCLUDE_DIR@
+ libtpm_la_SOURCES=e_tpm.c e_tpm.h e_tpm_err.c
+
+ create_tpm_key_SOURCES=create_tpm_key.c
+-create_tpm_key_LDADD=-ltspi
++create_tpm_key_LDADD=-ltspi -lcrypto
++
+--- configure.in.orig
configure.in
+@@ -3,7 +3,8 @@
+ #
+
+ AC_INIT(openssl-tpm-engine, 0.4.1, trousers-us...@lists.sf.net)
+-AM_INIT_AUTOMAKE(1.6.3)
++AM_INIT_AUTOMAKE(1.6.3 foreign)
++AC_CONFIG_MACRO_DIR([m4])
+
+ # Debugging support
+ AC_ARG_ENABLE(debug,
+@@ -45,7 +46,10 @@ AC_ARG_WITH(openssl,
+AC_SUBST(OPENSSL_INCLUDE_DIR)])
+
+ AC_DISABLE_STATIC
+-AC_PROG_CC
++AC_PROG_CC_STDC
++AM_PROG_CC_C_O
++AC_USE_SYSTEM_EXTENSIONS
++AC_SYS_LARGEFILE
+ AC_PROG_LIBTOOL
+
+ CFLAGS=$CFLAGS -Wall
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
