Hello community,
here is the log from the commit of package gtkcard for openSUSE:Factory
checked in at Tue Apr 20 02:27:42 CEST 2010.
--------
--- GNOME/gtkcard/gtkcard.changes 2007-06-07 14:33:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/gtkcard/gtkcard.changes 2010-04-19 15:41:06.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Apr 19 15:40:57 CEST 2010 - meissner@suse.de
+
+- fixed build with openssl 1.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gtkcard-fix-openssl.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkcard.spec ++++++
--- /var/tmp/diff_new_pack.sy4bAk/_old 2010-04-20 02:27:38.000000000 +0200
+++ /var/tmp/diff_new_pack.sy4bAk/_new 2010-04-20 02:27:38.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gtkcard (Version 0.1.9.106)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -20,16 +20,17 @@
Name: gtkcard
Version: 0.1.9.106
-Release: 216
+Release: 217
%define _version 0.2-svn-r106
Url: http://www.opensc-project.org/gtkcard/
Group: Productivity/Security
-License: GPL v2 or later
+License: GPLv2+
Summary: PKCS#11 Smard Card Utility
Source: %{name}-%{_version}.tar.bz2
Source1: opensc-key.png
# wget -N http://www.core.com.pl/svn2log/svn2log.py ; svn log -v --xml http://www.opensc-project.org/svn/gtkcard/trunk | python svn2log.py -D 0 -s -H -p '/(branches/[^/]+|trunk)/' -o gtkcard-ChangeLog ; sed -i 's/\+0000 \[r[0-9-]*\] \(.*\):$/\1/' gtkcard-ChangeLog
Source2: gtkcard-ChangeLog
+Patch0: gtkcard-fix-openssl.patch
AutoReqProv: on
BuildRequires: gtk2-devel opensc openssl-devel update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,7 +45,8 @@
Ludovic Rousseau
%prep
-%setup -n %{name}-%{_version}
+%setup -q -n %{name}-%{_version}
+%patch0 -p1
cp -a %{S:1} .
if ! test -f ChangeLog ; then
cp %{S:2} ChangeLog
@@ -54,10 +56,7 @@
fi
%build
-export CFLAGS="$RPM_OPT_FLAGS"
-./configure\
- --prefix=/usr\
- --enable-pkcs11=/usr/%{_lib}/opensc-pkcs11.so
+%configure --enable-pkcs11=/usr/%{_lib}/opensc-pkcs11.so
make %{?jobs:-j%jobs}
%install
++++++ gtkcard-fix-openssl.patch ++++++
Index: gtkcard-0.2-svn-r106/src/P11.c
===================================================================
--- gtkcard-0.2-svn-r106.orig/src/P11.c
+++ gtkcard-0.2-svn-r106/src/P11.c
@@ -366,7 +366,7 @@ BOOL readCertInfo(CK_OBJECT_HANDLE ohObj
X509 *cert = 0;
BIO *mem = BIO_new(BIO_s_mem());
ASN1_INTEGER *integer;
- STACK *nlist;
+ STACK_OF(X509_NAME_ENTRY) *nlist;
X509_NAME *name;
int len;
int j;
@@ -418,7 +418,7 @@ BOOL readCertInfo(CK_OBJECT_HANDLE ohObj
}
name = X509_get_issuer_name(cert);
- nlist = (STACK *) name->entries;
+ nlist = name->entries;
X509_NAME_print(mem, name, 0);
len = BIO_read(mem, issuerBuf, 256);
issuerBuf[len] = '\0';
@@ -1100,7 +1100,7 @@ BOOL P11_displayCert(pCertInfo certInfo,
// OpenSSL variables
X509 *cert = 0;
BIO *mem = BIO_new(BIO_s_mem());
- STACK *nlist;
+ STACK_OF(X509_NAME_ENTRY) *nlist;
ASN1_TIME *time;
ASN1_INTEGER *integer;
X509_NAME *name;
@@ -1148,7 +1148,7 @@ BOOL P11_displayCert(pCertInfo certInfo,
DISPLAY_FIXED(string);
name = X509_get_subject_name(cert);
- nlist = (STACK *) name->entries;
+ nlist = name->entries;
X509_NAME_print(mem, name, 0);
len = BIO_read(mem, buffer, 1000);
buffer[len] = '\0';
@@ -1156,7 +1156,7 @@ BOOL P11_displayCert(pCertInfo certInfo,
DISPLAY_FIXED(string);
name = X509_get_issuer_name(cert);
- nlist = (STACK *) name->entries;
+ nlist = name->entries;
X509_NAME_print(mem, name, 0);
len = BIO_read(mem, buffer, 1000);
buffer[len] = '\0';
@@ -1259,7 +1259,7 @@ BOOL localImportCert(X509 * cert, gchar
CK_OBJECT_CLASS certificateClass = CKO_CERTIFICATE;
int certSize, subjectSize, issuerSize;
CK_ULONG certType = CKC_X_509;
- STACK *nlist;
+ STACK_OF(X509_NAME_ENTRY) *nlist;
X509_NAME *name;
int len;
CK_BYTE_PTR issuer;
@@ -1305,7 +1305,7 @@ BOOL localImportCert(X509 * cert, gchar
}
name = X509_get_subject_name(cert);
- nlist = (STACK *) name->entries;
+ nlist = name->entries;
X509_NAME_print(mem, name, 0);
len = BIO_read(mem, subjectBuf, 256);
subjectBuf[len] = '\0';
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org