From 3c97fec911c755508afc8306eca35280db35e7b0 Mon Sep 17 00:00:00 2001 From: frankmorgner Date: Sat, 19 Feb 2011 07:37:13 +0000 Subject: [PATCH] - fixed references - bitbake updated versions git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@417 96b47cad-a561-4643-ad3b-153ac7d7599c --- bitbake/vsmartcard/ccid-emulator.bb | 4 ++-- bitbake/vsmartcard/eid-gui.bb | 10 ++++----- bitbake/vsmartcard/npa.bb | 4 ++-- bitbake/vsmartcard/picctopcsc.bb | 4 ++-- bitbake/vsmartcard/virtualsmartcard.bb | 4 ++-- bitbake/vsmartcard/vscarchitecture.bb | 2 +- eID_gui/src/eid/windows.py | 30 +++++++++++++------------- eID_gui/src/pace-gui.desktop.in | 2 +- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/bitbake/vsmartcard/ccid-emulator.bb b/bitbake/vsmartcard/ccid-emulator.bb index 0118868..d80d849 100644 --- a/bitbake/vsmartcard/ccid-emulator.bb +++ b/bitbake/vsmartcard/ccid-emulator.bb @@ -4,11 +4,11 @@ LICENSE = "GPL" DEPENDS = "pcsc-lite linux-libc-headers openssl opensc" RDEPENDS = "pcsc-lite kernel-module-gadgetfs libcrypto opensc" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=ccid;proto=https;rev=180" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=ccid;proto=https;rev=417" S = "${WORKDIR}/ccid" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-pace" diff --git a/bitbake/vsmartcard/eid-gui.bb b/bitbake/vsmartcard/eid-gui.bb index 0dd2ecf..2e5b9bf 100644 --- a/bitbake/vsmartcard/eid-gui.bb +++ b/bitbake/vsmartcard/eid-gui.bb @@ -1,15 +1,15 @@ -DESCRIPTION = "Simple GUI for entring a PIN and giving it to pace-tool" +DESCRIPTION = "Simple GUI for entring a PIN and giving it to npa-tool" LICENSE = "GPL" AUTHOR = "Dominik Oepen " -DEPENDS = "ccid-emulator" -RDEPENDS = "ccid-emulator python-pygtk libglade" +DEPENDS = "npa" +RDEPENDS = "npa python-pygtk libglade" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=eID_gui;proto=https;rev=237" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=eID_gui;proto=https;rev=417" S = "${WORKDIR}/eID_gui" -inherit autotools_stage pkgconfig python-dir +inherit autotools pkgconfig python-dir FILES_${PN} += "${bindir}/* \ ${datadir}/eid_gui/* \ diff --git a/bitbake/vsmartcard/npa.bb b/bitbake/vsmartcard/npa.bb index fb1516e..b0f7db5 100644 --- a/bitbake/vsmartcard/npa.bb +++ b/bitbake/vsmartcard/npa.bb @@ -2,9 +2,9 @@ DESCRIPTION = "API and Tools for the new German identity card (neuer Personalaus LICENSE = "GPL" DEPENDS = "openssl opensc" -RDEPENDS = "libcrypto" +RDEPENDS = "libcrypto opensc" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot;module=vsmartcard;proto=https;rev=396" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot;module=vsmartcard;proto=https;rev=417" S = "${WORKDIR}/vsmartcard/npa" diff --git a/bitbake/vsmartcard/picctopcsc.bb b/bitbake/vsmartcard/picctopcsc.bb index fd59a22..0b0f42a 100644 --- a/bitbake/vsmartcard/picctopcsc.bb +++ b/bitbake/vsmartcard/picctopcsc.bb @@ -4,11 +4,11 @@ LICENSE = "GPL" DEPENDS = "pcsc-lite" RDEPENDS = "pcsc-lite" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=picc_to_pcsc;proto=https;rev=180" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=picc_to_pcsc;proto=https;rev=417" S = "${WORKDIR}/picc_to_pcsc" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += "\ ${bindir}/* \ diff --git a/bitbake/vsmartcard/virtualsmartcard.bb b/bitbake/vsmartcard/virtualsmartcard.bb index 9f7534b..f48b68d 100644 --- a/bitbake/vsmartcard/virtualsmartcard.bb +++ b/bitbake/vsmartcard/virtualsmartcard.bb @@ -4,13 +4,13 @@ LICENSE = "GPL" DEPENDS = "pcsc-lite" RDEPENDS = "pcsc-lite python-pycrypto python-crypt python-textutils python-imaging python-pickle" -SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=virtualsmartcard;proto=https;rev=180" +SRC_URI = "svn://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard;module=virtualsmartcard;proto=https;rev=417" S = "${WORKDIR}/virtualsmartcard" EXTRA_OECONF = " --enable-serialdropdir=${libdir}/pcsc/drivers/serial" -inherit autotools_stage pkgconfig +inherit autotools pkgconfig FILES_${PN} += "\ ${bindir}/* \ diff --git a/bitbake/vsmartcard/vscarchitecture.bb b/bitbake/vsmartcard/vscarchitecture.bb index e78ced5..31b2232 100644 --- a/bitbake/vsmartcard/vscarchitecture.bb +++ b/bitbake/vsmartcard/vscarchitecture.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Virtual Smartcard with PCSC Driver and CCID to PCSC Gadget" LICENSE = "GPL" -DEPENDS = "ccid-emulator virtualsmartcard picctopcsc" +DEPENDS = "npa ccid-emulator virtualsmartcard picctopcsc" diff --git a/eID_gui/src/eid/windows.py b/eID_gui/src/eid/windows.py index 2c30b50..6f526ff 100644 --- a/eID_gui/src/eid/windows.py +++ b/eID_gui/src/eid/windows.py @@ -462,13 +462,13 @@ class PinpadGTK(object): return False def btnOk_clicked(self, widget): - """Pass the entered secret to pace-tool. If pace-tool is run + """Pass the entered secret to npa-tool. If npa-tool is run sucessfully exit, otherwise restart the PIN entry""" env_args = os.environ #cmd contains the command and all the parameters for our subproccess - cmd = ["pace-tool"] + cmd = ["npa-tool"] #We have to select the type of secret to use via a command line #parameter and provide the actual secret via an environment variable @@ -484,13 +484,13 @@ class PinpadGTK(object): else: raise ValueError("Unknown secret type: %s" % self.secret) - #If we have a CHAT, we pass it to pace-tool + #If we have a CHAT, we pass it to npa-tool #if (self.chat): # cmd.append("--chat=" + self.chat) cmd.append("-v") - #Try to call pace-tool. This is a blocking call. An animation is being + #Try to call npa-tool. This is a blocking call. An animation is being #shown while the subprocess is running try: #Stop polling the card while PACE is running @@ -498,7 +498,7 @@ class PinpadGTK(object): proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, env=env_args, close_fds=True) except OSError: - popup = MsgBox(self.window, "pace-tool wurde nicht gefunden", + popup = MsgBox(self.window, "npa-tool wurde nicht gefunden", "error") popup.run() popup.destroy() @@ -524,7 +524,7 @@ class PinpadGTK(object): gtk.main_iteration() line = proc.stdout.readline() - #Get the return value of the pace-tool process + #Get the return value of the npa-tool process ret = proc.poll() waiting.destroy() self.cardChecker.resume() @@ -632,16 +632,16 @@ class PINChanger(PinpadGTK): def __check_old_pin(self): """Run PACE with the old pin to see if it is correct""" #cmd contains the command and all the parameters for our subproccess - cmd = ["pace-tool", "--pin=" + self.pin] + cmd = ["npa-tool", "--pin=" + self.pin] - #Try to call pace-tool. This is a blocking call. An animation is being + #Try to call npa-tool. This is a blocking call. An animation is being #shown while the subprocess is running try: #Stop polling the card while PACE is running self.cardChecker.pause() proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) except OSError: - popup = MsgBox(self.window, "pace-tool wurde nicht gefunden", + popup = MsgBox(self.window, "npa-tool wurde nicht gefunden", "error") popup.run() popup.destroy() @@ -667,7 +667,7 @@ class PINChanger(PinpadGTK): gtk.main_iteration() line = proc.stdout.readline() - #Get the return value of the pace-tool process + #Get the return value of the npa-tool process ret = proc.poll() waiting.destroy() self.cardChecker.resume() @@ -682,20 +682,20 @@ class PINChanger(PinpadGTK): def __change_pin(self): - """Change the pin using pace-tool""" + """Change the pin using npa-tool""" #cmd contains the command and all the parameters for our subproccess - cmd = ["pace-tool", "--pin=" + self.__old_pin, + cmd = ["npa-tool", "--pin=" + self.__old_pin, "--new-pin=" + self.__new_pin1] - #Try to call pace-tool. This is a blocking call. An animation is being + #Try to call npa-tool. This is a blocking call. An animation is being #shown while the subprocess is running try: #Stop polling the card while PACE is running self.cardChecker.pause() proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True) except OSError: - popup = MsgBox(self.window, "pace-tool wurde nicht gefunden", + popup = MsgBox(self.window, "npa-tool wurde nicht gefunden", "error") popup.run() popup.destroy() @@ -721,7 +721,7 @@ class PINChanger(PinpadGTK): gtk.main_iteration() line = proc.stdout.readline() - #Get the return value of the pace-tool process + #Get the return value of the npa-tool process ret = proc.poll() waiting.destroy() self.cardChecker.resume() diff --git a/eID_gui/src/pace-gui.desktop.in b/eID_gui/src/pace-gui.desktop.in index 1ed6b64..36a0332 100644 --- a/eID_gui/src/pace-gui.desktop.in +++ b/eID_gui/src/pace-gui.desktop.in @@ -2,7 +2,7 @@ Version=@VERSION@ Encoding=UTF-8 Name=eID -Comment=GUI zur Eingabe einer PIN/CAN/PUK fuer pace-tool +Comment=GUI zur Eingabe einer PIN/CAN/PUK fuer npa-tool Exec=eid_gui.py Icon=@prefix@/share/eid_gui/images/OpenPACElogo.png Terminal=false