Attachment #184657 for bug #187422

Lines 326-332 Link Here

(-)beid-2.6.0-orig/admin/generic.py (-1 / +1 lines)
326	p('BOLD','* debug ','debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O by default')	326	p('BOLD','* debug ','debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O by default')
327	p('BOLD','* prefix ','the installation path')	327	p('BOLD','* prefix ','the installation path')
328	p('BOLD','* extraincludes','a list of paths separated by ":"')	328	p('BOLD','* extraincludes','a list of paths separated by ":"')
329	p('BOLD','* scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local')	329	p('BOLD','* scons configure debug=full prefix=____PREFIX____usr extraincludes=/tmp/include:____PREFIX____usr')
330	p('BOLD','* scons install prefix=/opt/local DESTDIR=/tmp/blah\n')	330	p('BOLD','* scons install prefix=/opt/local DESTDIR=/tmp/blah\n')
331	return	331	return
332		332

Lines 20-26 Link Here

(-)beid-2.6.0-orig/configure (-1 / +1 lines)
20	echo -e $GREEN"not found!"$NORMAL	20	echo -e $GREEN"not found!"$NORMAL
21	echo "Please make sure that the Python interpreter is available in your PATH"	21	echo "Please make sure that the Python interpreter is available in your PATH"
22	echo "or invoke configure using the PYTHON flag, e.g."	22	echo "or invoke configure using the PYTHON flag, e.g."
23	echo "$ PYTHON=/usr/local/bin/python configure"	23	echo "$ PYTHON=/usr/bin/python configure"
24	exit 1	24	exit 1
25	fi	25	fi
26	echo -e $GREEN"$PYTHON"$NORMAL	26	echo -e $GREEN"$PYTHON"$NORMAL





* After installation of this middleware you can test if the installation
  of the smart card reader was successfull:
     /usr/bin/beid-tool -l
  This should list the name(s) of your smart card reader(s).

* To test the pkcs11 library, you can issue the following command:
     /usr/bin/beid-pkcs11-tool -t -l --module /usr/lib/libbeidpkcs11.so
  You will be asked to enter your PIN twice in a dialog box;
  afterwards you should enter 'x' twice on the command line,
  then the tool should print "No errors".

* To register the pkcs11 library with Mozilla or Firefox (for authenticating to
  a web site and signing mails), you can load the html page
        /usr/share/beid/beid-pkcs11-register.html
  into your browser (javascript must be enabled).
  For registration with Thunderbird, see the online documentation.


  
* PKCS#11 PIN dialog boxes language:

  In /etc/beid/beidbase.conf : force_language = fr (default = en, other languages: fr, nl or ger)




clean      -> scons -c
install    -> scons install
uninstall  -> scons -c install
configure  -> scons configure prefix=/tmp/ita debug=full extraincludes=____PREFIX____usr/include:/tmp/include prefix=____PREFIX____usr

Run from a subdirectory -> scons -u
The variables are saved automatically after the first run (look at cache/kde.cache.py, ..)

EnsureSConsVersion(0, 96)

if os.path.isfile("/etc/debian_version"):
    os.environ['QTDIR'] = "/usr/share/qt4"

env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin'])
env['QT_LIB'] = 'qt-mt'


# FIXME not for for 32 bit mandriva !
if os.path.isfile("/etc/mandriva-release"):
    # FIXME should remove /usr/lib/qt4 from path (now warning ...)
    env.Append(LIBPATH=['/usr/lib/qt4'])

env['PREFIX'] = ARGUMENTS.get('prefix', '____PREFIX____usr')
# FIXME: the confdir is hardcoded to ____PREFIX____etc/beid, as is done in the sources
#env['CONFDIR'] = ARGUMENTS.get('confdir', '____PREFIX____etc/beid')
env['CONFDIR'] = '____PREFIX____etc/beid'
env['LIBDIR'] = ARGUMENTS.get('libdir', '____PREFIX____usr/lib')

def CheckPKGConfig(context, version):
     context.Message( 'Checking for pkg-config... ' )

Lines 18-24 Link Here

(-)beid-2.6.0-orig/src/beidcommon/config.cpp (-1 / +1 lines)
18		18
19		19
20	/******** Harcoded config path ********/	20	/******** Harcoded config path ********/
21	#define LINUX_CONF_PATH "/usr/local/etc/"	21	#define LINUX_CONF_PATH "/etc/"
22		22
23		23
24	#define CONFFILE_BEID "beidgui.conf"	24	#define CONFFILE_BEID "beidgui.conf"

Lines 13-19 Link Here

(-)beid-2.6.0-orig/src/beidservicecrl/belgium.be-beidcrld (-2 / +2 lines)
13	# See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html	13	# See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html
14	#	14	#
15	# * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation	15	# * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation
16	# directory of the daemon. The default is set to /usr/local/bin	16	# directory of the daemon. The default is set to /usr/bin
17	# The variable is defined further down in this script.	17	# The variable is defined further down in this script.
18	#	18	#
19	#	19	#
Lines 110-116 Link Here
110		110
111	#	111	#
112	# Set daemon specific information (adapt DAEMON_PATH to reflect your installation)	112	# Set daemon specific information (adapt DAEMON_PATH to reflect your installation)
113	DAEMON_PATH=/usr/local/bin ## standard location of the binary (do not include a trailing slash /)	113	DAEMON_PATH=/usr/bin ## standard location of the binary (do not include a trailing slash /)
114	## the exact path depends the on prefix used when compiling the binary	114	## the exact path depends the on prefix used when compiling the binary
115	DAEMON_BINNAME=beidcrld ## name of the binary	115	DAEMON_BINNAME=beidcrld ## name of the binary
116	DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"	116	DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"

Lines 13-16 Link Here

(-)beid-2.6.0-orig/src/beidservicecrl/SConscript (-1 / +1 lines)
13	prefix = env['PREFIX']	13	prefix = env['PREFIX']
14	initscript = 'belgium.be-beidcrld'	14	initscript = 'belgium.be-beidcrld'
15	env.Alias('install', env.Install(prefix + '/bin', obj.target))	15	env.Alias('install', env.Install(prefix + '/bin', obj.target))
16	env.Alias('install', env.Install('/etc/init.d', initscript))	16	env.Alias('install', env.Install('____PREFIX____etc/init.d', initscript))

Lines 13-19 Link Here

(-)beid-2.6.0-orig/src/Belpic PCSC Service/belgium.be-beidpcscd (-2 / +2 lines)
13	# See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html	13	# See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html
14	#	14	#
15	# * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation	15	# * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation
16	# directory of the daemon. The default is set to /usr/local/bin	16	# directory of the daemon. The default is set to /usr/bin
17	# The variable is defined further down in this script.	17	# The variable is defined further down in this script.
18	#	18	#
19	#	19	#
Lines 115-121 Link Here
115		115
116	#	116	#
117	# Set daemon specific information (adapt DAEMON_PATH to reflect your installation)	117	# Set daemon specific information (adapt DAEMON_PATH to reflect your installation)
118	DAEMON_PATH=/usr/local/bin ## standard location of the binary (do not include a trailing slash /)	118	DAEMON_PATH=/usr/bin ## standard location of the binary (do not include a trailing slash /)
119	## the exact path depends the on prefix used when compiling the binary	119	## the exact path depends the on prefix used when compiling the binary
120	DAEMON_BINNAME=beidpcscd ## name of the binary	120	DAEMON_BINNAME=beidpcscd ## name of the binary
121	DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"	121	DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"

Lines 27-30 Link Here

(-)beid-2.6.0-orig/src/Belpic PCSC Service/SConscript (-1 / +1 lines)
27	prefix = env['PREFIX']	27	prefix = env['PREFIX']
28	initscript = 'belgium.be-beidpcscd'	28	initscript = 'belgium.be-beidpcscd'
29	env.Alias('install', env.Install(prefix + '/bin', obj.target))	29	env.Alias('install', env.Install(prefix + '/bin', obj.target))
30	env.Alias('install', env.Install('/etc/init.d', initscript))	30	env.Alias('install', env.Install('____PREFIX____etc/init.d', initscript))

Lines 8-11 Link Here

(-)beid-2.6.0-orig/src/eidlibjni/eidlibTest/README (-1 / +1 lines)
8		8
9	applet	9	applet
10	------	10	------
11	LD_LIBRARY_PATH=/usr/local/lib firefox BEIDCard.html	11	LD_LIBRARY_PATH=/usr/lib firefox BEIDCard.html

Lines 2-11 Link Here

(-)beid-2.6.0-orig/src/eidviewer/beidgui.conf (-2 / +2 lines)
2		2
3	[BEID_default]	3	[BEID_default]
4	# The certificates directory (must exist)	4	# The certificates directory (must exist)
5	certs = /usr/local/share/beid/certs/	5	certs = /usr/share/beid/certs/
6		6
7	# The CRL directory (must exist)	7	# The CRL directory (must exist)
8	crl = /usr/local/share/beid/crl/	8	crl = /usr/share/beid/crl/
9		9
10		10
11	[CA_certs]	11	[CA_certs]

Lines 7-16 Link Here

(-)beid-2.6.0-orig/src/eidviewer/beidgui.desktop (-2 / +2 lines)
7	Comment=Display and administer your eID card	7	Comment=Display and administer your eID card
8	Comment[nl]=Weergeven en beheren van uw eID kaart	8	Comment[nl]=Weergeven en beheren van uw eID kaart
9	Comment[fr]=Affichage et gestion de votre carte eID	9	Comment[fr]=Affichage et gestion de votre carte eID
10	Exec=/usr/local/bin/beidgui	10	Exec=/usr/bin/beidgui
11	Terminal=false	11	Terminal=false
12	MultipleArgs=false	12	MultipleArgs=false
13	Type=Application	13	Type=Application
14	Icon=/usr/local/bin/beidgui.png	14	Icon=/usr/bin/beidgui.png
15	Categories=Application	15	Categories=Application
16		16

Lines 109-115 Link Here

(-)beid-2.6.0-orig/src/eidviewer/eidviewerApp.cpp (-1 / +1 lines)
109	CFRelease(macPath);	109	CFRelease(macPath);
110		110
111	int i = 1;	111	int i = 1;
112	static char *s = app_path; // "/usr/local/lib/libbelpicgui.dylib";	112	static char *s = app_path; // "/usr/lib/libbelpicgui.dylib";
113	gMyApp = new QApplication(i, &s);	113	gMyApp = new QApplication(i, &s);
114	#endif	114	#endif
115	}	115	}

Lines 3-9 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/config.h (-1 / +1 lines)
3		3
4		4
5	/******** Hardcoded path to the config file ********/	5	/******** Hardcoded path to the config file ********/
6	#define OPENSC_CONF_PATH "/usr/local/etc/beidbase.conf"	6	#define OPENSC_CONF_PATH "/etc/beid/beidbase.conf"
7		7
8		8
9	/* Enable debug messages. */	9	/* Enable debug messages. */

Lines 83-91 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/etc/beid-pkcs11-register.html (-2 / +2 lines)
83	}	83	}
84	else {	84	else {
85	if (navigator.platform.indexOf("Mac") >= 0)	85	if (navigator.platform.indexOf("Mac") >= 0)
86	p11Lib = "/usr/local/lib/beid-pkcs11.bundle";	86	p11Lib = "/usr/lib/beid-pkcs11.bundle";
87	else if (navigator.platform.indexOf("Linux") >= 0)	87	else if (navigator.platform.indexOf("Linux") >= 0)
88	p11Lib = "/usr/local/lib/libbeidpkcs11.so";	88	p11Lib = "/usr/lib/libbeidpkcs11.so";
89		89
90	res = pkcs11.addmodule(p11Name, p11Lib, 0, 0);	90	res = pkcs11.addmodule(p11Name, p11Lib, 0, 0);
91		91

Lines 1-3 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/etc/Belgian_eID_PKCS11_java.cfg (-1 / +1 lines)
1	name = BelgianEID	1	name = BelgianEID
2	library = /usr/local/lib/libbeidpkcs11.so	2	library = /usr/lib/libbeidpkcs11.so
3		3

Lines 11-15 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/SConscript (-1 / +1 lines)
11	env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-register.html'))	11	env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-register.html'))
12	env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-unregister.html'))	12	env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-unregister.html'))
13	env.Alias('install', env.Install(confdir, 'etc/beidbase.conf'))	13	env.Alias('install', env.Install(confdir, 'etc/beidbase.conf'))
14	env.Alias('install', env.Install('/usr/local/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg'))	14	env.Alias('install', env.Install('____PREFIX____usr/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg'))
15	env.Alias('install', env.Install(prefix + '/include/beid', 'config.h'))	15	env.Alias('install', env.Install(prefix + '/include/beid', 'config.h'))

Lines 958-964 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/src/libopensc/card-belpic.c (-1 / +1 lines)
958	modgui = (void *)scdl_open("beidgui.dll");	958	modgui = (void *)scdl_open("beidgui.dll");
959	#elif defined (__APPLE__)	959	#elif defined (__APPLE__)
960	/* QT complains if not full path given on Mac */	960	/* QT complains if not full path given on Mac */
961	modgui = (void *)scdl_open("/usr/local/lib/libbeidgui.dylib");	961	modgui = (void *)scdl_open("/usr/lib/libbeidgui.dylib");
962	#else	962	#else
963	modgui = (void *)scdl_open("libbeidgui.so");	963	modgui = (void *)scdl_open("libbeidgui.so");
964	#endif	964	#endif

Lines 369-375 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/src/tools/opensc-tool.c (-1 / +1 lines)
369	CFRelease(macPath);	369	CFRelease(macPath);
370		370
371	int i = 1;	371	int i = 1;
372	static char *s = app_path; // "/usr/local/lib/libbelpicgui.dylib";	372	static char *s = app_path; // "/usr/lib/libbelpicgui.dylib";
373	QApplication app(i, &s);	373	QApplication app(i, &s);
374	#endif	374	#endif
375		375

Lines 82-88 Link Here

(-)beid-2.6.0-orig/src/newpkcs11/src/tools/pkcs11-tool.c (-1 / +1 lines)
82	static const char * opt_input = NULL;	82	static const char * opt_input = NULL;
83	static const char * opt_output = NULL;	83	static const char * opt_output = NULL;
84	#ifdef __APPLE__	84	#ifdef __APPLE__
85	static const char * opt_module = "/usr/local/lib/beid-pkcs11.bundle";	85	static const char * opt_module = "/usr/lib/beid-pkcs11.bundle";
86	#else	86	#else
87	static const char * opt_module = "libbeidpkcs11.so";	87	static const char * opt_module = "libbeidpkcs11.so";
88	#endif	88	#endif

Return to bug 187422

Lines 13-30 Link Here

(-)beid-2.6.0-orig/README (-4 / +4 lines)
13		13
14	* After installation of this middleware you can test if the installation	14	* After installation of this middleware you can test if the installation
15	of the smart card reader was successfull:	15	of the smart card reader was successfull:
16	/usr/local/bin/beid-tool -l	16	/usr/bin/beid-tool -l
17	This should list the name(s) of your smart card reader(s).	17	This should list the name(s) of your smart card reader(s).
18		18
19	* To test the pkcs11 library, you can issue the following command:	19	* To test the pkcs11 library, you can issue the following command:
20	/usr/local/bin/beid-pkcs11-tool -t -l --module /usr/local/lib/beidpkcs11.so	20	/usr/bin/beid-pkcs11-tool -t -l --module /usr/lib/libbeidpkcs11.so
21	You will be asked to enter your PIN twice in a dialog box;	21	You will be asked to enter your PIN twice in a dialog box;
22	afterwards you should enter 'x' twice on the command line,	22	afterwards you should enter 'x' twice on the command line,
23	then the tool should print "No errors".	23	then the tool should print "No errors".
24		24
25	* To register the pkcs11 library with Mozilla or Firefox (for authenticating to	25	* To register the pkcs11 library with Mozilla or Firefox (for authenticating to
26	a web site and signing mails), you can load the html page	26	a web site and signing mails), you can load the html page
27	/usr/local/share/beid/beid-pkcs11-register.html	27	/usr/share/beid/beid-pkcs11-register.html
28	into your browser (javascript must be enabled).	28	into your browser (javascript must be enabled).
29	For registration with Thunderbird, see the online documentation.	29	For registration with Thunderbird, see the online documentation.
30		30
Lines 39-42 Link Here
39		39
40	* PKCS#11 PIN dialog boxes language:	40	* PKCS#11 PIN dialog boxes language:
41		41
42	In /usr/local/etc/beidbase.conf : force_language = fr (default = en, other languages: fr, nl or ger)	42	In /etc/beid/beidbase.conf : force_language = fr (default = en, other languages: fr, nl or ger)

Lines 4-10 Link Here

(-)beid-2.6.0-orig/SConstruct (-9 / +9 lines)
4	clean -> scons -c	4	clean -> scons -c
5	install -> scons install	5	install -> scons install
6	uninstall -> scons -c install	6	uninstall -> scons -c install
7	configure -> scons configure prefix=/tmp/ita debug=full extraincludes=/usr/local/include:/tmp/include prefix=/usr/local	7	configure -> scons configure prefix=/tmp/ita debug=full extraincludes=____PREFIX____usr/include:/tmp/include prefix=____PREFIX____usr
8		8
9	Run from a subdirectory -> scons -u	9	Run from a subdirectory -> scons -u
10	The variables are saved automatically after the first run (look at cache/kde.cache.py, ..)	10	The variables are saved automatically after the first run (look at cache/kde.cache.py, ..)
Lines 16-22 Link Here
16	EnsureSConsVersion(0, 96)	16	EnsureSConsVersion(0, 96)
17		17
18	if os.path.isfile("/etc/debian_version"):	18	if os.path.isfile("/etc/debian_version"):
19	os.environ['QTDIR'] = "/usr/share/qt3"	19	os.environ['QTDIR'] = "/usr/share/qt4"
20		20
21	env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin'])	21	env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin'])
22	env['QT_LIB'] = 'qt-mt'	22	env['QT_LIB'] = 'qt-mt'
Lines 26-39 Link Here
26		26
27	# FIXME not for for 32 bit mandriva !	27	# FIXME not for for 32 bit mandriva !
28	if os.path.isfile("/etc/mandriva-release"):	28	if os.path.isfile("/etc/mandriva-release"):
29	# FIXME should remove /usr/lib/qt3/lib from path (now warning ...)	29	# FIXME should remove /usr/lib/qt4 from path (now warning ...)
30	env.Append(LIBPATH=['/usr/lib/qt3/lib64'])	30	env.Append(LIBPATH=['/usr/lib/qt4'])
31		31
32	env['PREFIX'] = ARGUMENTS.get('prefix', '/usr/local')	32	env['PREFIX'] = ARGUMENTS.get('prefix', '____PREFIX____usr')
33	# FIXME: the confdir is hardcoded to /usr/local/etc, as is done in the sources	33	# FIXME: the confdir is hardcoded to ____PREFIX____etc/beid, as is done in the sources
34	#env['CONFDIR'] = ARGUMENTS.get('confdir', '/usr/local/etc')	34	#env['CONFDIR'] = ARGUMENTS.get('confdir', '____PREFIX____etc/beid')
35	env['CONFDIR'] = '/usr/local/etc'	35	env['CONFDIR'] = '____PREFIX____etc/beid'
36	env['LIBDIR'] = ARGUMENTS.get('libdir', '/usr/local/lib')	36	env['LIBDIR'] = ARGUMENTS.get('libdir', '____PREFIX____usr/lib')
37		37
38	def CheckPKGConfig(context, version):	38	def CheckPKGConfig(context, version):
39	context.Message( 'Checking for pkg-config... ' )	39	context.Message( 'Checking for pkg-config... ' )