NaCl libpcsc

Check-in [e1fc5a5e98]
Login

Check-in [e1fc5a5e98]

Overview
Comment:Apply patch from Google
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA1: e1fc5a5e98463fe85c48f791e349ebb5cf5dc42a
User & Date: rkeene on 2019-01-30 17:18:36
Other Links: manifest | tags
Context
2019-01-30
17:18
Apply patch from Google Leaf check-in: e1fc5a5e98 user: rkeene tags: trunk
2016-04-14
19:26
Updated to always return a logger check-in: 889f3554e9 user: rkeene tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified build/assemble-source-from-google.sh from [787ba2e2c0] to [42b22aa3b4].

︙︙
15
16
17
18
19
20
21

22
23
24
25
26
27
28

29
30










31
32
33
34
35
36
37

PATH="${PATH}:$(pwd)/bin"
export PATH

# Build the libpcsc we need
function assemblePCSC() {
	local version url pkg sha256
	local archive workdir


	pkg='google-chrome-smart-card-apps'
	version='20160317'
	sha256='a144a81be9fe72eb7698a7dc0c1aba6425220551cca432ba7e58984422a7cf46'

	archive="archive/${pkg}-${version}-nobinaries.zip"
	workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build"


	extract "${archive}" "${workdir}" || return 1











	(
		cd "${workdir}" || exit 1

		# Copy out PC/SC headers for later use
		mkdir -p "${instdir}/include/PCSC" || exit 1
		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1








>







>


>
>
>
>
>
>
>
>
>
>








15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

PATH="${PATH}:$(pwd)/bin"
export PATH

# Build the libpcsc we need
function assemblePCSC() {
	local version url pkg sha256
	local archive workdir
	local patchfile

	pkg='google-chrome-smart-card-apps'
	version='20160317'
	sha256='a144a81be9fe72eb7698a7dc0c1aba6425220551cca432ba7e58984422a7cf46'

	archive="archive/${pkg}-${version}-nobinaries.zip"
	workdir="workdir-${RANDOM}${RANDOM}${RANDOM}${RANDOM}.build"
	patchdir="patches"

	extract "${archive}" "${workdir}" || return 1

	for patchfile in "${patchdir}"/*.diff; do
		if [ ! -f "${patchfile}" ]; then
			continue
		fi
		(
			cd "${workdir}" || exit 1
			patch -p1 --batch
		) < "${patchfile}"
	done

	(
		cd "${workdir}" || exit 1

		# Copy out PC/SC headers for later use
		mkdir -p "${instdir}/include/PCSC" || exit 1
		cp third_party/pcsc-lite/src-*/src/PCSC/*.h "${instdir}/include/PCSC" || exit 1
︙︙

Added patches/google-chrome-smart-card-apps-20160317-nobinaries-fixderef.diff version [6686c9c69e]. 



























>
>
>
>
>
>
>
>
>
>
>
>

1
2
3
4
5
6
7
8
9
10
11
12

diff -uNr google-chrome-smart-card-apps-20160317-nobinaries.orig/common/js/src/messaging/port-message-channel.js google-chrome-smart-card-apps-20160317-nobinaries-fixderef/common/js/src/messaging/port-message-channel.js
--- google-chrome-smart-card-apps-20160317-nobinaries.orig/common/js/src/messaging/port-message-channel.js	2016-03-11 09:26:42.000000000 -0600
+++ google-chrome-smart-card-apps-20160317-nobinaries-fixderef/common/js/src/messaging/port-message-channel.js	2019-01-30 11:13:15.451487478 -0600
@@ -127,6 +127,8 @@
   if (!goog.object.containsKey(port, 'sender'))
     return null;
   var sender = port['sender'];
+  if (!goog.isDef(sender))
+    return null;
   GSC.Logging.checkWithLogger(this.logger, goog.isObject(sender));
   if (!goog.object.containsKey(sender, 'id'))
     return null;