Hello community, here is the log from the commit of package eID-belgium checked in at Tue Oct 24 11:37:05 CEST 2006. -------- --- eID-belgium/eID-belgium.changes 2006-09-30 13:19:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/eID-belgium/eID-belgium.changes 2006-10-23 17:46:06.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 23 17:12:33 CEST 2006 - skh@suse.de + +- Update to version 2.5.9 (sbrys@novell.com) +- inclusion of application privacy filter and related daemon +- fixed compatibility issues with FireFox 1.5 +- now using QT for rendering of pop-up windows + +------------------------------------------------------------------- Old: ---- beleid-base.conf beleid-pkcs11-tool.1 beleid-tool.1 beleid.tar.gz pkcs11_register.html pkcs11_unregister.html readme_fr.txt readme_nl.txt New: ---- beid-2.5.9-20060629-110246.tar.bz2 beid-cert-belgiumrca.der beid-cert-government.der beid-cert-government2004.der beid-cert-government2005.der beid-cert-government2006.der beid-pkcs11-register.html beid-pkcs11-unregister.html beidgui.conf eID-belgium-2.5.9-64bit.patch eID-belgium-2.5.9-ccflags-sconstruct.patch eID-belgium-2.5.9-conffiles-beidcommon-config-cpp.patch eID-belgium-2.5.9-conffiles-newpkcs11-config-h.patch eID-belgium-2.5.9-conffiles-sconstruct.patch eID-belgium-2.5.9-deadlock-newpkcs11-src-pkcs11-pkcs11session.patch eID-belgium-2.5.9-ldconfig-configure.patch eID-belgium-2.5.9-mono-eidlib-eidlib.cpp.patch eID-belgium-2.5.9-qtdir-sconstruct.patch eID-belgium-2.5.9-reloc-beidcommlib-sconscript.patch eID-belgium-2.5.9-reloc-beidcommon-sconscript.patch eID-belgium-2.5.9-reloc-beidservicecrl-beidcrld.patch eID-belgium-2.5.9-reloc-beidservicecrl-sconscript.patch eID-belgium-2.5.9-reloc-belpicgui-sconscript.patch eID-belgium-2.5.9-reloc-belpicpcscservice-beidpcscd.patch eID-belgium-2.5.9-reloc-belpicpcscservice-sconscript.patch eID-belgium-2.5.9-reloc-eidlib-sconscript.patch eID-belgium-2.5.9-reloc-eidlibjni-sconscript.patch eID-belgium-2.5.9-reloc-newpkcs11-sconscript.patch eID-belgium-2.5.9-reloc-newpkcs11-src-libopensc-sconscript.patch eID-belgium-2.5.9-reloc-newpkcs11-src-pkcs11-sconscript.patch eID-belgium-2.5.9-reloc-newpkcs11-src-sconscript.patch eID-belgium-2.5.9-reloc-newpkcs11-src-tools-sconscript.patch eID-belgium-2.5.9-reloc-sconscript.patch eID-belgium-2.5.9-reloc-sconstruct.patch eID-belgium-2.5.9-reloc-winscarp-sconscript.patch eID-toolkit_licensingtermsconditions_Deutsch.rtf eID-toolkit_licensingtermsconditions_English.rtf eID-toolkit_licensingtermsconditions_Francais.rtf eID-toolkit_licensingtermsconditions_Nederlands.rtf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eID-belgium.spec ++++++ --- /var/tmp/diff_new_pack.V9BV82/_old 2006-10-24 11:36:55.000000000 +0200 +++ /var/tmp/diff_new_pack.V9BV82/_new 2006-10-24 11:36:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package eID-belgium (Version 2.3.13) +# spec file for package eID-belgium (Version 2.5.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,23 +11,54 @@ # norootforbuild Name: eID-belgium -BuildRequires: gtk2-devel openssl-devel pcsc-lite-devel update-desktop-files +BuildRequires: gnutls-devel java2-devel-packages libglade2-devel libgnomeprintui-devel libgnomeui-devel pcsc-lite-devel python qt3-devel scons update-desktop-files Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Libraries -Version: 2.3.13 -Release: 21 +Version: 2.5.9 +Release: 1 Summary: Software for Belgian eID Card URL: http://eid.belgium.be/ -Source: beleid.tar.gz -Source1: beleid-base.conf -Source2: beleid-pkcs11-tool.1 -Source3: beleid-tool.1 -Source4: pkcs11_register.html -Source5: pkcs11_unregister.html -Source6: readme_fr.txt -Source7: readme_nl.txt BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: beid-2.5.9-20060629-110246.tar.bz2 +Source1: eID-toolkit_licensingtermsconditions_Deutsch.rtf +Source2: eID-toolkit_licensingtermsconditions_English.rtf +Source3: eID-toolkit_licensingtermsconditions_Francais.rtf +Source4: eID-toolkit_licensingtermsconditions_Nederlands.rtf +Source5: beid-pkcs11-register.html +Source6: beid-pkcs11-unregister.html +Source7: beidgui.conf +Source8: beid-cert-belgiumrca.der +Source9: beid-cert-government2004.der +Source10: beid-cert-government2005.der +Source11: beid-cert-government2006.der +Source12: beid-cert-government.der +Patch: %{name}-%{version}-qtdir-sconstruct.patch +Patch1: %{name}-%{version}-conffiles-sconstruct.patch +Patch2: %{name}-%{version}-conffiles-beidcommon-config-cpp.patch +Patch3: %{name}-%{version}-conffiles-newpkcs11-config-h.patch +Patch4: %{name}-%{version}-reloc-sconstruct.patch +Patch5: %{name}-%{version}-reloc-sconscript.patch +Patch6: %{name}-%{version}-reloc-beidcommlib-sconscript.patch +Patch7: %{name}-%{version}-reloc-beidcommon-sconscript.patch +Patch8: %{name}-%{version}-reloc-beidservicecrl-sconscript.patch +Patch9: %{name}-%{version}-reloc-belpicgui-sconscript.patch +Patch10: %{name}-%{version}-reloc-belpicpcscservice-sconscript.patch +Patch11: %{name}-%{version}-reloc-eidlibjni-sconscript.patch +Patch12: %{name}-%{version}-reloc-eidlib-sconscript.patch +Patch13: %{name}-%{version}-reloc-newpkcs11-sconscript.patch +Patch14: %{name}-%{version}-reloc-newpkcs11-src-libopensc-sconscript.patch +Patch15: %{name}-%{version}-reloc-newpkcs11-src-pkcs11-sconscript.patch +Patch16: %{name}-%{version}-reloc-newpkcs11-src-sconscript.patch +Patch17: %{name}-%{version}-reloc-newpkcs11-src-tools-sconscript.patch +Patch18: %{name}-%{version}-reloc-winscarp-sconscript.patch +Patch19: %{name}-%{version}-reloc-beidservicecrl-beidcrld.patch +Patch20: %{name}-%{version}-reloc-belpicpcscservice-beidpcscd.patch +Patch21: %{name}-%{version}-ldconfig-configure.patch +Patch22: %{name}-%{version}-mono-eidlib-eidlib.cpp.patch +Patch23: %{name}-%{version}-deadlock-newpkcs11-src-pkcs11-pkcs11session.patch +Patch24: %{name}-%{version}-ccflags-sconstruct.patch +Patch25: %{name}-%{version}-64bit.patch %description This PKCS11 library can be used for cryptographic operations with the @@ -38,48 +69,96 @@ %prep -%setup -q -n beleid +%setup -n beid-2.5.9 +%patch -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p0 +%patch7 -p0 +%patch8 -p0 +%patch9 -p0 +%patch10 -p0 +%patch11 -p0 +%patch12 -p0 +%patch13 -p0 +%patch14 -p0 +%patch15 -p0 +%patch16 -p0 +%patch17 -p0 +%patch18 -p0 +%patch19 -p0 +%patch20 -p0 +%patch21 -p0 +%patch22 -p0 +%patch23 -p0 +%patch24 -p0 +%patch25 -p0 %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -./configure --prefix=/usr --libdir=%{_libdir} +export JAVA_HOME=/usr/lib/jvm/java +export CFLAGS="$RPM_OPT_FLAGS" +./configure prefix=/usr libdir=%{_libdir} bindir=/usr/bin make %install rm -rf $RPM_BUILD_ROOT # install everything ... %makeinstall +# documentation files, to be picked up from %doc in files section +cp %{SOURCE1} . +cp %{SOURCE2} . +cp %{SOURCE3} . +cp %{SOURCE4} . +cp %{SOURCE5} . +cp %{SOURCE6} . +# config file +cp %{SOURCE7} $RPM_BUILD_ROOT/etc/eID-belgium/ +# certs and crl files +mkdir $RPM_BUILD_ROOT/usr/share/beid/certs +mkdir $RPM_BUILD_ROOT/usr/share/beid/crl +cp %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} $RPM_BUILD_ROOT/usr/share/beid/certs/ # ... and remove stuff we provide in other packages already or which is # plainly superfluous -rm -r $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ -rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/Belgium-EID-pkcs11.{la,a} -rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/libpkcs11.* -rm $RPM_BUILD_ROOT%{_libdir}/pkcs11/pkcs11-spy.* -rm -r $RPM_BUILD_ROOT/usr/share -rm -r $RPM_BUILD_ROOT/usr/include -# remove whatever make install created... -rm -r $RPM_BUILD_ROOT/usr/man/* -# ... and use man pages provided as separate sources -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1 -mkdir $RPM_BUILD_ROOT/etc -install %{SOURCE1} $RPM_BUILD_ROOT/etc/beleid-base.conf -# documentation files, to be picked up from %doc in files section -cp %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . +rm -r $RPM_BUILD_ROOT/usr/include/beid +#rm -r $RPM_BUILD_ROOT/usr/lib/*.{la,so} +rm -r $RPM_BUILD_ROOT%{_libdir}/*.la +rm -r $RPM_BUILD_ROOT/usr/share/beid/*.{rtf,html} +rm -r $RPM_BUILD_ROOT/usr/share/beid/*.doc +rm -r $RPM_BUILD_ROOT/usr/share/beid/sdk-samples +rm $RPM_BUILD_ROOT/usr/local/lib/pkcs11/Belgian_eID_PKCS11_java.cfg %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%dir /etc/eID-belgium +%dir /usr/share/beid +%dir %{_libdir}/pkcs11 +/etc/init.d/belgium.be-beidcrld +/etc/init.d/belgium.be-beidpcscd %{_bindir}/* -%{_libdir}/libbeleid* -%{_libdir}/pkcs11 +%{_libdir}/libbeid* +%{_libdir}/pkcs11/libbeid* +/usr/share/beid/* %attr(644,root,root) %{_mandir}/man1/* -%attr(644,root,root) /etc/* -%doc pkcs11_register.html pkcs11_unregister.html readme_fr.txt readme_nl.txt +%attr(644,root,root) /etc/eID-belgium/* +%doc eID-toolkit_licensingtermsconditions_*.rtf +%doc beid-pkcs11-*.html +%doc CHANGES +%doc INSTALL +%doc README +%doc VERSION %changelog -n eID-belgium +* Mon Oct 23 2006 - skh@suse.de +- Update to version 2.5.9 (sbrys@novell.com) +- inclusion of application privacy filter and related daemon +- fixed compatibility issues with FireFox 1.5 +- now using QT for rendering of pop-up windows * Sat Sep 30 2006 - aj@suse.de - Cleanup BuildRequires. * Sat Apr 01 2006 - sndirsch@suse.de ++++++ eID-belgium-2.5.9-64bit.patch ++++++ diff -Naur ../beid-2.5.9.orig/src/eidlib/OpenSCReader.cpp ./src/eidlib/OpenSCReader.cpp --- ../beid-2.5.9.orig/src/eidlib/OpenSCReader.cpp 2006-04-28 10:35:13.000000000 +0200 +++ ./src/eidlib/OpenSCReader.cpp 2006-10-23 16:27:37.000000000 +0200 @@ -183,7 +183,7 @@ sc_append_path_id(&tPath, ucFile, iFileLen); tPath.count = -1; tPath.type = SC_PATH_TYPE_PATH; - if(SC_NO_ERROR != (lRet = sc_pkcs15_read_file2(m_p15Card, &tPath, pucOutput, (unsigned int*)pulOutLen, NULL))) + if(SC_NO_ERROR != (lRet = sc_pkcs15_read_file2(m_p15Card, &tPath, pucOutput, (size_t *)pulOutLen, NULL))) { *pulOutLen = 0; } ++++++ eID-belgium-2.5.9-ccflags-sconstruct.patch ++++++ diff -Naur ../beid-2.5.9.orig/SConstruct ./SConstruct --- ../beid-2.5.9.orig/SConstruct 2006-06-28 13:12:04.000000000 +0200 +++ ./SConstruct 2006-10-23 15:19:02.000000000 +0200 @@ -21,7 +21,7 @@ env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin']) env['QT_LIB'] = 'qt-mt' env.Append(ENV = {'HOME': os.environ['HOME']}) -env.AppendUnique(CCFLAGS='-Dlinux -pipe -DQT_THREAD_SUPPORT -D_REENTRANT') +env.AppendUnique(CCFLAGS=['\"-Dlinux -pipe -DQT_THREAD_SUPPORT -D_REENTRANT\"']) env.AppendUnique(CPPPATH=['/usr/include/PCSC']) # here needed for config step (for debian) # FIXME not for for 32 bit mandriva ! diff -Naur ../beid-2.5.9.orig/src/newpkcs11/src/libopensc/SConscript ./src/newpkcs11/src/libopensc/SConscript --- ../beid-2.5.9.orig/src/newpkcs11/src/libopensc/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ./src/newpkcs11/src/libopensc/SConscript 2006-10-23 15:21:11.000000000 +0200 @@ -1,7 +1,7 @@ Import('env') myenv=env.Copy() myenv.Append(CPPPATH=['../..', '../include', '/usr/include/PCSC']) -myenv.Append(CCFLAGS=' -DHAVE_CONFIG_H') +myenv.Append(CCFLAGS=['\"-DHAVE_CONFIG_H\"']) # LIBPATH before LIBS !? myenv.Append(LIBPATH='../../../winscarp') myenv.Append(LIBS=['beidpcsclite', 'crypto', 'ssl']) diff -Naur ../beid-2.5.9.orig/src/newpkcs11/src/pkcs11/SConscript ./src/newpkcs11/src/pkcs11/SConscript --- ../beid-2.5.9.orig/src/newpkcs11/src/pkcs11/SConscript 2006-06-28 13:11:20.000000000 +0200 +++ ./src/newpkcs11/src/pkcs11/SConscript 2006-10-23 15:22:08.000000000 +0200 @@ -1,7 +1,7 @@ Import('env') myenv = env.Copy() myenv.Append(CPPPATH='../include', LIBS=['beidlibopensc'], LIBPATH=['../libopensc']) -myenv.Append(CCFLAGS=' -DHAVE_OPENSSL') +myenv.Append(CCFLAGS=['\"-DHAVE_OPENSSL\"']) obj = myenv.genobj('shlib', myenv) obj.src = Split(""" debug.c diff -Naur ../beid-2.5.9.orig/src/newpkcs11/src/tools/SConscript ./src/newpkcs11/src/tools/SConscript --- ../beid-2.5.9.orig/src/newpkcs11/src/tools/SConscript 2006-01-05 21:28:55.000000000 +0100 +++ ./src/newpkcs11/src/tools/SConscript 2006-10-23 15:21:39.000000000 +0200 @@ -5,7 +5,7 @@ '../../../beidcommlib', '../../../beidcommon'], LIBS=['beidlibopensc', 'beidpcsclite', 'beidcomm', 'beidcommon'], - CCFLAGS='-DHAVE_CONFIG_H') + CCFLAGS=['\"-DHAVE_CONFIG_H\"']) #following only needed if no getopt.h ... #../common/getopt.c ../common/getopt1.c ++++++ eID-belgium-2.5.9-conffiles-beidcommon-config-cpp.patch ++++++ --- src/beidcommon/config.cpp 2006-05-31 12:20:53.000000000 +0200 +++ ../config.cpp 2006-09-01 11:33:45.000000000 +0200 @@ -18,7 +18,7 @@ /********** Harcoded config path **********/ -#define LINUX_CONF_PATH "/usr/local/etc/" +#define LINUX_CONF_PATH "/etc/eID-belgium/" #define CONFFILE_BEID "beidgui.conf" ++++++ eID-belgium-2.5.9-conffiles-newpkcs11-config-h.patch ++++++ --- src/newpkcs11/config.h 2006-06-16 14:11:44.000000000 +0200 +++ ../config.h 2006-09-01 11:42:38.000000000 +0200 @@ -3,7 +3,7 @@ /********** Hardcoded path to the config file **********/ -#define OPENSC_CONF_PATH "/usr/local/etc/beidbase.conf" +#define OPENSC_CONF_PATH "/etc/eID-belgium/beidbase.conf" /* Enable debug messages. */ ++++++ eID-belgium-2.5.9-conffiles-sconstruct.patch ++++++ --- SConstruct 2006-09-01 11:28:43.000000000 +0200 +++ ../SConstruct 2006-09-01 11:30:54.000000000 +0200 @@ -35,7 +35,7 @@ env['PREFIX'] = ARGUMENTS.get('prefix', '/usr/local') # FIXME: the confdir is hardcoded to /usr/local/etc, as is done in the sources #env['CONFDIR'] = ARGUMENTS.get('confdir', '/usr/local/etc') -env['CONFDIR'] = '/usr/local/etc' +env['CONFDIR'] = '/etc/eID-belgium' env['LIBDIR'] = ARGUMENTS.get('libdir', '/usr/local/lib') def CheckPKGConfig(context, version): ++++++ eID-belgium-2.5.9-deadlock-newpkcs11-src-pkcs11-pkcs11session.patch ++++++ --- src/newpkcs11/src/pkcs11/pkcs11-session.c 2006-01-05 21:28:58.000000000 +0100 +++ ../pkcs11-session.c 2006-09-05 13:27:35.000000000 +0200 @@ -82,9 +82,11 @@ struct sc_pkcs11_session *session; int rv; + /* rv = sc_pkcs11_lock(); if (rv != CKR_OK) return rv; + */ rv = pool_find_and_delete(&session_pool, hSession, (void**) &session); if (rv != CKR_OK) @@ -103,7 +105,10 @@ free(session); -out: sc_pkcs11_unlock(); + +out: /* + sc_pkcs11_unlock(); + */ return rv; } ++++++ eID-belgium-2.5.9-ldconfig-configure.patch ++++++ --- configure 2006-09-01 16:59:25.000000000 +0200 +++ ../configure 2006-09-01 16:59:38.000000000 +0200 @@ -58,7 +58,7 @@ install: @$SCONS install - ldconfig -v + #ldconfig -v clean: @$SCONS -c ++++++ eID-belgium-2.5.9-mono-eidlib-eidlib.cpp.patch ++++++ --- ./src/eidlib/eidlib.cpp 2006-09-04 13:36:15.000000000 +0200 +++ ../eidlib.cpp 2006-09-04 13:37:22.000000000 +0200 @@ -71,6 +71,24 @@ tStatus.general = BEID_E_NOT_INITIALIZED; return tStatus; } + + memset (ptData->cardNumber, 0, (BEID_MAX_CARD_NUMBER_LEN + 1) * sizeof (char)); + memset (ptData->chipNumber, 0, (BEID_MAX_CHIP_NUMBER_LEN + 1) * sizeof (char)); + memset (ptData->validityDateBegin, 0, (BEID_MAX_DATE_BEGIN_LEN + 1) * sizeof (char)); + memset (ptData->validityDateEnd, 0, (BEID_MAX_DATE_END_LEN + 1) * sizeof (char)); + memset (ptData->municipality, 0, (BEID_MAX_DELIVERY_MUNICIPALITY_LEN + 1) * sizeof (char)); + memset (ptData->nationalNumber, 0, (BEID_MAX_NATIONAL_NUMBER_LEN + 1) * sizeof (char)); + memset (ptData->name, 0, (BEID_MAX_NAME_LEN + 1) * sizeof (char)); + memset (ptData->firstName1, 0, (BEID_MAX_FIRST_NAME1_LEN + 1) * sizeof (char)); + memset (ptData->firstName2, 0, (BEID_MAX_FIRST_NAME2_LEN + 1) * sizeof (char)); + memset (ptData->firstName3, 0, (BEID_MAX_FIRST_NAME3_LEN + 1) * sizeof (char)); + memset (ptData->nationality, 0, (BEID_MAX_NATIONALITY_LEN + 1) * sizeof (char)); + memset (ptData->birthLocation, 0, (BEID_MAX_BIRTHPLACE_LEN + 1) * sizeof (char)); + memset (ptData->birthDate, 0, (BEID_MAX_BIRTHDATE_LEN + 1) * sizeof (char)); + memset (ptData->sex, 0, (BEID_MAX_SEX_LEN + 1) * sizeof (char)); + memset (ptData->nobleCondition, 0, (BEID_MAX_NOBLE_CONDITION_LEN + 1) * sizeof (char)); + memset (ptData->hashPhoto, 0, (BEID_MAX_HASH_PICTURE_LEN + 1) * sizeof (BYTE)); + memset (ptData->rfu, 0, (6) * sizeof (BYTE)); pInit->GetID(ptData, ptCertifCheck, &tStatus); ++++++ eID-belgium-2.5.9-qtdir-sconstruct.patch ++++++ --- SConstruct 2006-10-23 10:04:48.000000000 +0200 +++ ../SConstruct 2006-10-23 10:06:48.000000000 +0200 @@ -18,6 +18,9 @@ if os.path.isfile("/etc/debian_version"): os.environ['QTDIR'] = "/usr/share/qt3" +if os.path.isfile("/etc/SuSE-release") or os.path.isfile("/.buildenv") : + os.environ['QTDIR'] = ARGUMENTS.get('libdir', '/usr/lib') + "/qt3" + print 'os.environ[\'QTDIR\']: ' + os.environ['QTDIR'] env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin']) env['QT_LIB'] = 'qt-mt' env.Append(ENV = {'HOME': os.environ['HOME']}) ++++++ eID-belgium-2.5.9-reloc-beidcommlib-sconscript.patch ++++++ --- ./src/beidcommlib/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-beidcommlib 2006-09-01 15:52:05.000000000 +0200 @@ -2,6 +2,7 @@ myenv=env.Copy() obj=myenv.genobj('shlib', myenv) obj.target='libbeidcomm' +obj.instdir=myenv['LIBDIR'] obj.src=Split(""" CardMessage.cpp ConnectionListener.cpp @@ -14,5 +15,6 @@ obj.vnum='0.0.0' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, obj.target + '.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so')) ++++++ eID-belgium-2.5.9-reloc-beidcommon-sconscript.patch ++++++ --- ./src/beidcommon/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-beidcommon 2006-09-01 15:04:58.000000000 +0200 @@ -4,6 +4,7 @@ myenv=env.Copy() obj=myenv.genobj('shlib', myenv) obj.target='libbeidcommon' +obj.instdir=myenv['LIBDIR'] obj.src=Split(""" bytearray.cpp datafile.cpp @@ -21,5 +22,6 @@ obj.vnum='0.0.0' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, 'libbeidcommon.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, 'libbeidcommon.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, 'libbeidcommon.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir, 'libbeidcommon.so')) ++++++ eID-belgium-2.5.9-reloc-beidservicecrl-beidcrld.patch ++++++ --- ./src/beidservicecrl/belgium.be-beidcrld 2006-09-11 16:56:05.000000000 +0200 +++ ../belgium.be-beidcrld 2006-09-11 17:00:23.000000000 +0200 @@ -110,7 +110,7 @@ # # Set daemon specific information (adapt DAEMON_PATH to reflect your installation) -DAEMON_PATH=/usr/local/bin ## standard location of the binary (do not include a trailing slash /) +DAEMON_PATH=/usr/bin ## standard location of the binary (do not include a trailing slash /) ## the exact path depends the on prefix used when compiling the binary DAEMON_BINNAME=beidcrld ## name of the binary DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME" ++++++ eID-belgium-2.5.9-reloc-beidservicecrl-sconscript.patch ++++++ --- ./src/beidservicecrl/SConscript 2006-06-27 10:12:30.000000000 +0200 +++ ../SConscript-beidservicecrl 2006-09-01 15:09:36.000000000 +0200 @@ -2,6 +2,7 @@ myenv = env.Copy() obj=myenv.genobj('program', myenv) obj.target='beidcrld' +obj.instdir=myenv['BINDIR'] obj.includes='../eidlib' obj.libpaths='../eidlib ../newpkcs11/src/libopensc ../winscarp ../beidcommlib ../beidcommon' obj.libs='ssl beid beidlibopensc beidpcsclite beidcomm beidcommon' @@ -11,6 +12,7 @@ obj.execute() prefix = env['PREFIX'] +destdir = env['DESTDIR'] initscript = 'belgium.be-beidcrld' -env.Alias('install', env.Install(prefix + '/bin', obj.target)) -env.Alias('install', env.Install('/etc/init.d', initscript)) +env.Alias('install', env.Install(destdir + prefix + '/bin', obj.target)) +env.Alias('install', env.Install(destdir + '/etc/init.d', initscript)) ++++++ eID-belgium-2.5.9-reloc-belpicgui-sconscript.patch ++++++ --- ./src/belpicgui/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-belpicgui 2006-09-01 15:13:47.000000000 +0200 @@ -3,6 +3,7 @@ obj=myenv.genobj('shlib', myenv) # note: correct libname is crucial: dynamically loaded by pkcs11 ... obj.target='libbeidgui' +obj.instdir=myenv['LIBDIR'] obj.src=Split(""" askmessagedialog.ui authenticationdialog.ui @@ -20,5 +21,6 @@ obj.vnum='1.5.0' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum) ) -env.Alias('install', env.Install(libdir, obj.target + '.so') ) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum) ) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so') ) ++++++ eID-belgium-2.5.9-reloc-belpicpcscservice-beidpcscd.patch ++++++ --- ./src/Belpic PCSC Service/belgium.be-beidpcscd 2006-09-11 16:57:18.000000000 +0200 +++ ../belgium.be-beidpcscd 2006-09-11 17:00:37.000000000 +0200 @@ -115,7 +115,7 @@ # # Set daemon specific information (adapt DAEMON_PATH to reflect your installation) -DAEMON_PATH=/usr/local/bin ## standard location of the binary (do not include a trailing slash /) +DAEMON_PATH=/usr/bin ## standard location of the binary (do not include a trailing slash /) ## the exact path depends the on prefix used when compiling the binary DAEMON_BINNAME=beidpcscd ## name of the binary DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME" ++++++ eID-belgium-2.5.9-reloc-belpicpcscservice-sconscript.patch ++++++ --- ./src/Belpic PCSC Service/SConscript 2006-06-27 10:12:11.000000000 +0200 +++ ../SConscript-Belpic PCSC Service 2006-09-01 15:08:10.000000000 +0200 @@ -2,6 +2,7 @@ myenv = env.Copy() obj=myenv.genobj('program', myenv) obj.target='beidpcscd' +obj.instdir=myenv['BINDIR'] obj.src=Split(""" maindialog.ui @@ -25,6 +26,7 @@ obj.execute() prefix = env['PREFIX'] +destdir = env['DESTDIR'] initscript = 'belgium.be-beidpcscd' -env.Alias('install', env.Install(prefix + '/bin', obj.target)) -env.Alias('install', env.Install('/etc/init.d', initscript)) +env.Alias('install', env.Install(destdir + prefix + '/bin', obj.target)) +env.Alias('install', env.Install(destdir + '/etc/init.d', initscript)) ++++++ eID-belgium-2.5.9-reloc-eidlib-sconscript.patch ++++++ --- ./src/eidlib/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-eidlib 2006-09-01 15:12:37.000000000 +0200 @@ -4,6 +4,7 @@ myenv=env.Copy() obj=myenv.genobj('shlib', myenv) obj.target='libbeid' +obj.instdir=myenv['LIBDIR'] obj.src=Split(""" walldialog.ui @@ -28,9 +29,10 @@ obj.vnum='2.7.3' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, obj.target + '.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so')) prefix = env['PREFIX'] -env.Alias('install', env.Install(prefix + '/include/beid', 'eidlib.h')) -env.Alias('install', env.Install(prefix + '/include/beid', 'eiddefines.h')) -env.Alias('install', env.Install(prefix + '/include/beid', 'eiderrors.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid', 'eidlib.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid', 'eiddefines.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid', 'eiderrors.h')) ++++++ eID-belgium-2.5.9-reloc-eidlibjni-sconscript.patch ++++++ --- ./src/eidlibjni/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-eidlibjni 2006-09-01 15:11:28.000000000 +0200 @@ -8,6 +8,7 @@ javaHome = env['JAVA'] obj = myenv.genobj('shlib', myenv) obj.target='libbeidlibjni' +obj.instdir=myenv['LIBDIR'] obj.src = Split('eidlib_wrap.cpp MyApp.cpp') obj.vnum='2.7.2' obj.libs='beid' @@ -15,5 +16,6 @@ obj.includes='../eidlib ' + javaHome + '/include ' + javaHome + '/include/linux' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, obj.target + '.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so')) ++++++ eID-belgium-2.5.9-reloc-newpkcs11-sconscript.patch ++++++ --- ./src/newpkcs11/SConscript 2006-05-31 17:04:41.000000000 +0200 +++ ../SConscript-newpkcs11 2006-09-01 15:59:06.000000000 +0200 @@ -4,12 +4,13 @@ prefix = env['PREFIX'] confdir = env['CONFDIR'] +destdir = env['DESTDIR'] -env.Alias('install', env.Install(prefix + '/share/man/man1', 'docs/beid-tool.1')) -env.Alias('install', env.Install(prefix + '/share/man/man1', 'docs/beid-pkcs11-tool.1')) +env.Alias('install', env.Install(destdir + prefix + '/share/man/man1', 'docs/beid-tool.1')) +env.Alias('install', env.Install(destdir + prefix + '/share/man/man1', 'docs/beid-pkcs11-tool.1')) -env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-register.html')) -env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-unregister.html')) -env.Alias('install', env.Install(confdir, 'etc/beidbase.conf')) -env.Alias('install', env.Install('/usr/local/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg')) -env.Alias('install', env.Install(prefix + '/include/beid', 'config.h')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'etc/beid-pkcs11-register.html')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'etc/beid-pkcs11-unregister.html')) +env.Alias('install', env.Install(destdir + confdir, 'etc/beidbase.conf')) +env.Alias('install', env.Install(destdir + '/usr/local/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid', 'config.h')) ++++++ eID-belgium-2.5.9-reloc-newpkcs11-src-libopensc-sconscript.patch ++++++ --- ./src/newpkcs11/src/libopensc/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-newpkcs11-src-libopensc 2006-09-01 15:55:28.000000000 +0200 @@ -41,9 +41,11 @@ ../scconf/lex-parse.c """) obj.target='libbeidlibopensc' +obj.instdir=myenv['LIBDIR'] obj.vnum='2.2.0' obj.execute() prefix = env['PREFIX'] libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, obj.target + '.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so')) ++++++ eID-belgium-2.5.9-reloc-newpkcs11-src-pkcs11-sconscript.patch ++++++ --- ./src/newpkcs11/src/pkcs11/SConscript 2006-06-28 13:11:20.000000000 +0200 +++ ../SConscript 2006-09-06 13:05:01.000000000 +0200 @@ -20,9 +20,11 @@ ../scrandom/scrandom.c """) obj.target='libbeidpkcs11' +obj.instdir=myenv['LIBDIR'] + '/pkcs11' obj.vnum='2.1.0' obj.execute() prefix = env['PREFIX'] libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum)) -env.Alias('install', env.Install(libdir, obj.target + '.so')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir + '/pkcs11', obj.target + '.so.' + obj.vnum)) +env.Alias('install', env.Install(destdir + libdir + '/pkcs11', obj.target + '.so')) ++++++ eID-belgium-2.5.9-reloc-newpkcs11-src-sconscript.patch ++++++ --- ./src/newpkcs11/src/SConscript 2006-06-27 10:14:40.000000000 +0200 +++ ../SConscript-newpkcs11-src 2006-09-01 15:53:52.000000000 +0200 @@ -5,17 +5,18 @@ env.SConscript('tools/SConscript') prefix = env['PREFIX'] -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/asn1.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/errors.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/log.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/opensc.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'pkcs11/pkcs11.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/pkcs15.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'scconf/scconf.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'scdl/scdl.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'scrandom/scrandom.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc', 'libopensc/types.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11f.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11t.h')) -env.Alias('install', env.Install(prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/unix.h')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/asn1.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/errors.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/log.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/opensc.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'pkcs11/pkcs11.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/pkcs15.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'scconf/scconf.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'scdl/scdl.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'scrandom/scrandom.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc', 'libopensc/types.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11f.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/pkcs11t.h')) +env.Alias('install', env.Install(destdir + prefix + '/include/beid/opensc/rsaref', 'pkcs11/rsaref/unix.h')) ++++++ eID-belgium-2.5.9-reloc-newpkcs11-src-tools-sconscript.patch ++++++ --- ./src/newpkcs11/src/tools/SConscript 2006-01-05 21:28:55.000000000 +0100 +++ ../SConscript-newpkcs11-src-tools 2006-09-01 15:56:49.000000000 +0200 @@ -14,5 +14,6 @@ tool1 = myenv.Program('beid-pkcs11-tool', ['pkcs11-tool.c', 'libpkcs11.c', 'util.c']) tool2 = myenv.Program('beid-tool', ['opensc-tool.c', 'util.c']) prefix = env['PREFIX'] -env.Alias('install', env.Install(prefix + '/bin', tool1)) -env.Alias('install', env.Install(prefix + '/bin', tool2)) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + prefix + '/bin', tool1)) +env.Alias('install', env.Install(destdir + prefix + '/bin', tool2)) ++++++ eID-belgium-2.5.9-reloc-sconscript.patch ++++++ --- src/SConscript 2006-06-28 16:47:31.000000000 +0200 +++ ../SConscript 2006-09-01 16:39:14.000000000 +0200 @@ -24,9 +24,10 @@ env.SConscript(dirs = dirs) prefix = env['PREFIX'] -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/cpp', 'eidlib/test/test.cpp')) -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/cpp', 'eidlib/test/Makefile')) -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/java', 'eidlibjni/eidlib/beidlib.jar')) -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/java', 'eidlibjni/BEIDCard.html')) -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/java', 'eidlibjni/eidlibTest/README')) -env.Alias('install', env.Install(prefix + '/share/beid/sdk-samples/java/eidlibtest', 'eidlibjni/eidlibTest/src/eidlibtest/Test.java')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/cpp', 'eidlib/test/test.cpp')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/cpp', 'eidlib/test/Makefile')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/java', 'eidlibjni/eidlib/beidlib.jar')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/java', 'eidlibjni/BEIDCard.html')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/java', 'eidlibjni/eidlibTest/README')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid/sdk-samples/java/eidlibtest', 'eidlibjni/eidlibTest/src/eidlibtest/Test.java')) ++++++ eID-belgium-2.5.9-reloc-sconstruct.patch ++++++ --- SConstruct 2006-09-01 16:49:51.000000000 +0200 +++ ../SConstruct 2006-09-01 16:49:26.000000000 +0200 @@ -37,6 +37,7 @@ #env['CONFDIR'] = ARGUMENTS.get('confdir', '/usr/local/etc') env['CONFDIR'] = '/etc/eID-belgium' env['LIBDIR'] = ARGUMENTS.get('libdir', '/usr/local/lib') +env['BINDIR'] = ARGUMENTS.get('bindir', '/usr/local/bin') def CheckPKGConfig(context, version): context.Message( 'Checking for pkg-config... ' ) @@ -57,6 +58,9 @@ opts.AddOptions(('WITHEIDGUI', 'with eidgui')) opts.AddOptions(('WITHJNI', 'with eidlib JNI')) opts.AddOptions(('JAVA', 'JAVA_HOME')) + opts.AddOptions(('LIBDIR', env['LIBDIR'])) + opts.AddOptions(('BINDIR', env['BINDIR'])) + opts.AddOptions(('PREFIX', env['PREFIX'])) opts.Update(env) if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('CUSTOMISCONFIGURED')): @@ -143,11 +147,12 @@ env.SConscript('src/SConscript') prefix = env['PREFIX'] -env.Alias('install', env.Install(prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Deutch.rtf')) -env.Alias('install', env.Install(prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions English.rtf')) -env.Alias('install', env.Install(prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Francais.rtf')) -env.Alias('install', env.Install(prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Nederlands.rtf')) -env.Alias('install', env.Install(prefix + '/share/beid', 'doc/DeveloperGuide.doc')) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Deutch.rtf')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions English.rtf')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Francais.rtf')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'doc/eID-toolkit_licensingtermsconditions Nederlands.rtf')) +env.Alias('install', env.Install(destdir + prefix + '/share/beid', 'doc/DeveloperGuide.doc')) # if you forget to add a version number, the one in the file VERSION will be used instead #env.dist('beid', '2.52') ++++++ eID-belgium-2.5.9-reloc-winscarp-sconscript.patch ++++++ --- src/winscarp/SConscript 2006-06-27 14:07:51.000000000 +0200 +++ ../SConscript-winscarp 2006-09-01 15:52:50.000000000 +0200 @@ -2,6 +2,7 @@ myenv = env.Copy() obj=myenv.genobj('shlib', myenv) obj.target='libbeidpcsclite' +obj.instdir=myenv['LIBDIR'] obj.src=Split(""" ServerPoll.cpp winscarp.cpp @@ -13,6 +14,7 @@ obj.libpaths='../beidcommlib ../beidcommon' obj.execute() libdir = env['LIBDIR'] -env.Alias('install', env.Install(libdir, obj.target + '.so.' + obj.vnum) ) -env.Alias('install', env.Install(libdir, obj.target + '.so') ) +destdir = env['DESTDIR'] +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so.' + obj.vnum) ) +env.Alias('install', env.Install(destdir + libdir, obj.target + '.so') ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org