[Buildroot] [PATCH 1/3] package/pcsc-lite: drop unneeded first patch

[Buildroot] [PATCH 1/3] package/pcsc-lite: drop unneeded first patch

[Fabrice Fontaine]

This patch is not needed as static build has been disabled since
commit ad8c327053f3736881e1ef6d7b394b3a500ed8fa

Moreover, pthread dependency should be correclty retrieved from
libusb-1.0.pc

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...01-Add-disable-documentation-option.patch} |  0
 .../0001-pthread-needed-for-libusb.patch      | 29 -------------------
 2 files changed, 29 deletions(-)
 rename package/pcsc-lite/{0002-Add-disable-documentation-option.patch => 0001-Add-disable-documentation-option.patch} (100%)
 delete mode 100644 package/pcsc-lite/0001-pthread-needed-for-libusb.patch

diff --git a/package/pcsc-lite/0002-Add-disable-documentation-option.patch b/package/pcsc-lite/0001-Add-disable-documentation-option.patch
similarity index 100%
rename from package/pcsc-lite/0002-Add-disable-documentation-option.patch
rename to package/pcsc-lite/0001-Add-disable-documentation-option.patch
diff --git a/package/pcsc-lite/0001-pthread-needed-for-libusb.patch b/package/pcsc-lite/0001-pthread-needed-for-libusb.patch
deleted file mode 100644
index acb777aa44..0000000000
--- a/package/pcsc-lite/0001-pthread-needed-for-libusb.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-configure.ac: explicitly add pthread cflags/libs in the libusb test
-
-If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be
-empty, and the test for libusb will be performed without additional flags.
-However, when libusb needs threads, some extra flags are needed (depending
-on the platform), like -pthreads, -lpthread, etc. Without these flags, the
-test for libusb_init() will fail to link correctly, and pcsc-lite will fail
-detecting libusb.
-
-Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-
-Upstream-status: will be submitted
-
----
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then
- 	saved_CPPFLAGS="$CPPFLAGS"
- 	saved_LIBS="$LIBS"
- 
--	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS"
--	LIBS="$LDFLAGS $LIBUSB_LIBS"
-+	CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS"
-+	LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS"
- 
- 	AC_CHECK_HEADERS(libusb.h, [],
- 		[ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ])
-- 
2.20.1

[Buildroot] [PATCH 2/3] package/pcsc-lite: fix license

[Fabrice Fontaine]

pcsc-lite is not only licensed under BSD-3-Clause, so retrieve licenses
from COPYING (BSD-2-Clause, GPL-3.0+, MIT, ISC) and add GPL-3.0.txt to
license files

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pcsc-lite/pcsc-lite.hash | 1 +
 package/pcsc-lite/pcsc-lite.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash
index fe5ce94696..3b8cde1617 100644
--- a/package/pcsc-lite/pcsc-lite.hash
+++ b/package/pcsc-lite/pcsc-lite.hash
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256 5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9  pcsc-lite-1.8.23.tar.bz2
 sha256 2ce8f52bc5afa74f223121955e4e6328c432b16044ea535acd550435dda2b5db  COPYING
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-3.0.txt
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 0d55d4b706..5a18d46a71 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -9,8 +9,8 @@ PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-3-Clause
-PCSC_LITE_LICENSE_FILES = COPYING
+PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist), MIT (sd-daemon)
+PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
 PCSC_LITE_AUTORECONF = YES
 
 # - libudev and libusb are optional
-- 
2.20.1

[Buildroot] [PATCH 3/3] package/pcsc-lite: security bump to version 1.8.25

[Fabrice Fontaine]

Contains the following security related fixes:
 - Race condition possibility; CWE-362: Concurrent Execution using
   Shared Resource with Improper Synchronization ('Race Condition'):
   https://github.com/LudovicRousseau/PCSC/commit/36c8eae890dc81f0e25ebf0be1c6a969ffd9543a
 - Fix realloc error handling:
   https://github.com/LudovicRousseau/PCSC/commit/430043842e05a300f1dda1b93fcfa8fceadd81e5

Update hash of COPYING and remove MIT from licenses because sd-daemon
files were removed:
https://github.com/LudovicRousseau/PCSC/commit/0984e0f4a03e5e29bb5725b6f149f56c9e9c73c2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/pcsc-lite/pcsc-lite.hash | 4 ++--
 package/pcsc-lite/pcsc-lite.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/pcsc-lite/pcsc-lite.hash b/package/pcsc-lite/pcsc-lite.hash
index 3b8cde1617..7e209f8cd2 100644
--- a/package/pcsc-lite/pcsc-lite.hash
+++ b/package/pcsc-lite/pcsc-lite.hash
@@ -1,4 +1,4 @@
 # Locally calculated
-sha256 5a27262586eff39cfd5c19aadc8891dd71c0818d3d629539bd631b958be689c9  pcsc-lite-1.8.23.tar.bz2
-sha256 2ce8f52bc5afa74f223121955e4e6328c432b16044ea535acd550435dda2b5db  COPYING
+sha256 d76d79edc31cf76e782b9f697420d3defbcc91778c3c650658086a1b748e8792  pcsc-lite-1.8.25.tar.bz2
+sha256 40d4358bb8dc8d30f5365ae6d999b6f820bbc051b292912482f2e4d0ebd837e1  COPYING
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  GPL-3.0.txt
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
index 5a18d46a71..e819a93910 100644
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PCSC_LITE_VERSION = 1.8.23
+PCSC_LITE_VERSION = 1.8.25
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
 PCSC_LITE_SITE = https://pcsclite.apdu.fr/files
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist), MIT (sd-daemon)
+PCSC_LITE_LICENSE = BSD-2-Clause (auth), BSD-3-Clause, GPL-3.0+ (demo, spy, tests), ISC (simclist)
 PCSC_LITE_LICENSE_FILES = COPYING GPL-3.0.txt
 PCSC_LITE_AUTORECONF = YES
 
-- 
2.20.1

[Buildroot] [PATCH 1/3] package/pcsc-lite: drop unneeded first patch

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > This patch is not needed as static build has been disabled since
 > commit ad8c327053f3736881e1ef6d7b394b3a500ed8fa

 > Moreover, pthread dependency should be correclty retrieved from
 > libusb-1.0.pc

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/3] package/pcsc-lite: fix license

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > pcsc-lite is not only licensed under BSD-3-Clause, so retrieve licenses
 > from COPYING (BSD-2-Clause, GPL-3.0+, MIT, ISC) and add GPL-3.0.txt to
 > license files

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/3] package/pcsc-lite: security bump to version 1.8.25

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Contains the following security related fixes:
 >  - Race condition possibility; CWE-362: Concurrent Execution using
 >    Shared Resource with Improper Synchronization ('Race Condition'):
 >    https://github.com/LudovicRousseau/PCSC/commit/36c8eae890dc81f0e25ebf0be1c6a969ffd9543a
 >  - Fix realloc error handling:
 >    https://github.com/LudovicRousseau/PCSC/commit/430043842e05a300f1dda1b93fcfa8fceadd81e5

 > Update hash of COPYING and remove MIT from licenses because sd-daemon
 > files were removed:
 > https://github.com/LudovicRousseau/PCSC/commit/0984e0f4a03e5e29bb5725b6f149f56c9e9c73c2

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/3] package/pcsc-lite: drop unneeded first patch

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > This patch is not needed as static build has been disabled since
 > commit ad8c327053f3736881e1ef6d7b394b3a500ed8fa

 > Moreover, pthread dependency should be correclty retrieved from
 > libusb-1.0.pc

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/3] package/pcsc-lite: fix license

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > pcsc-lite is not only licensed under BSD-3-Clause, so retrieve licenses
 > from COPYING (BSD-2-Clause, GPL-3.0+, MIT, ISC) and add GPL-3.0.txt to
 > license files

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 3/3] package/pcsc-lite: security bump to version 1.8.25

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Contains the following security related fixes:
 >  - Race condition possibility; CWE-362: Concurrent Execution using
 >    Shared Resource with Improper Synchronization ('Race Condition'):
 >    https://github.com/LudovicRousseau/PCSC/commit/36c8eae890dc81f0e25ebf0be1c6a969ffd9543a
 >  - Fix realloc error handling:
 >    https://github.com/LudovicRousseau/PCSC/commit/430043842e05a300f1dda1b93fcfa8fceadd81e5

 > Update hash of COPYING and remove MIT from licenses because sd-daemon
 > files were removed:
 > https://github.com/LudovicRousseau/PCSC/commit/0984e0f4a03e5e29bb5725b6f149f56c9e9c73c2

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard