Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

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.000000000 +0100
+++ openssl_tpm_engine/openssl_tpm_engine.changes       2011-09-05 
06:15:15.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep  5 04:14:00 UTC 2011 - crrodriguez@xxxxxxxxxxxx
+
+- 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.000000000 +0200
+++ /var/tmp/diff_new_pack.BMU8Ah/_new  2011-09-05 16:39:25.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.BMU8Ah/_new  2011-09-05 16:39:25.000000000 +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-users@xxxxxxxxxxxx)
+-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+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx