diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-10-19 08:51:19 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-10-19 08:51:19 +0300 |
| commit | 0b774a19996038fbe858511923261dafea81be34 (patch) | |
| tree | aab3bcd76d41be6c8fb0e934a8b7bcc61b56b3cb | |
| parent | 14e6d1c97d97638cd7a650a57ec9fddee3141352 (diff) | |
| download | aports-0b774a19996038fbe858511923261dafea81be34.tar.bz2 aports-0b774a19996038fbe858511923261dafea81be34.tar.xz | |
main/pcsc-lite: upgrade to 1.8.18
fix pcscd capabilities
| -rw-r--r-- | main/pcsc-lite/APKBUILD | 46 | ||||
| -rw-r--r-- | main/pcsc-lite/pcsc-lite-1.8.11-nopolkit.patch | 35 |
2 files changed, 16 insertions, 65 deletions
diff --git a/main/pcsc-lite/APKBUILD b/main/pcsc-lite/APKBUILD index b9f0de87e3..d29ccf0ad5 100644 --- a/main/pcsc-lite/APKBUILD +++ b/main/pcsc-lite/APKBUILD @@ -1,36 +1,25 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=pcsc-lite -pkgver=1.8.11 -pkgrel=8 +pkgver=1.8.18 +pkgrel=0 pkgdesc="Middleware to access a smart card using SCard API (PC/SC)" url="http://pcsclite.alioth.debian.org/pcsclite.html" arch="all" license="Custom" depends="" depends_dev="eudev-dev" -makedepends="$depends_dev perl automake autoconf libtool libcap-ng-utils" +makedepends="$depends_dev perl libcap-ng-utils" install="pcsc-lite.pre-install pcsc-lite.pre-upgrade" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -source="https://alioth.debian.org/frs/download.php/file/3991/pcsc-lite-1.8.11.tar.bz2 +source="https://alioth.debian.org/frs/download.php/file/4179/pcsc-lite-1.8.18.tar.bz2 pcscd.initd - musl-stacksize.patch - pcsc-lite-1.8.11-nopolkit.patch" + musl-stacksize.patch" -_builddir="$srcdir"/pcsc-lite-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/pcsc-lite-$pkgver build() { - cd "$_builddir" - ./bootstrap + cd "$builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -49,7 +38,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 install -D -m755 "$srcdir"/pcscd.initd \ "$pkgdir"/etc/init.d/pcscd || return 1 @@ -57,8 +46,8 @@ package() { # fix pcscd permissions and grant sysfs access chown root:pcscd "$pkgdir"/usr/sbin/pcscd - chmod 0710 "$pkgdir"/usr/sbin/pcscd - filecap "$pkgdir"/usr/sbin/pcscd dac_read_search + chmod 0550 "$pkgdir"/usr/sbin/pcscd + filecap "$pkgdir"/usr/sbin/pcscd dac_override } libs() { @@ -68,15 +57,12 @@ libs() { "$subpkgdir"/usr || return 1 } -md5sums="73502ca4ba6526727f9f49c63d805408 pcsc-lite-1.8.11.tar.bz2 +md5sums="03d92b060183b9cb0b559ea38c6c6c6f pcsc-lite-1.8.18.tar.bz2 f9a2037622e5ed088185bb7e2b0a7031 pcscd.initd -5431070535db7126b196dd47af781325 musl-stacksize.patch -04d6b0bd35bc7b95319d483222675335 pcsc-lite-1.8.11-nopolkit.patch" -sha256sums="945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6 pcsc-lite-1.8.11.tar.bz2 +5431070535db7126b196dd47af781325 musl-stacksize.patch" +sha256sums="b22d32b018f6a1016adba91abfcc63876cca999daa472dd86e953ddd41d00905 pcsc-lite-1.8.18.tar.bz2 738381311ebfe75d9c7221d7eb99f852130ed5fd058f6802a51db2a6fc99e2c4 pcscd.initd -f04fa89cae71a21d322b0a140aa3738c66dce2baadfdd514136e5e0ab088f008 musl-stacksize.patch -f35db5c74576bb656130f0a0402cd67917a65fb63fb37b7fcddca5800e76ad9a pcsc-lite-1.8.11-nopolkit.patch" -sha512sums="22f65f27f5b5cab04f6067f820c2564c3b42fcb3a54764416aa8676c9e19ccae1f0414f4e90d7ef1b91e27535bdfa31d73f5af4a9d994957d4ab369b0aadc5bd pcsc-lite-1.8.11.tar.bz2 +f04fa89cae71a21d322b0a140aa3738c66dce2baadfdd514136e5e0ab088f008 musl-stacksize.patch" +sha512sums="928e8ca24491b0c457a36cf627b356d3218bc101ea3477b905694cfa943289e83273ef9fe468c85e625fcb58138240555b511d91e56ec3f8eb2be8df5f662f87 pcsc-lite-1.8.18.tar.bz2 6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041 pcscd.initd -bff3f9dd8157de960b7c9694ff178be0df087f4d96aa56aad1d91dd3555f2aef51992c86f9d9460086d2e6c2b519b258ca66ad609a4e0a64d8f2a0a3c6d405d2 musl-stacksize.patch -54e91069a6a0a87c02d986cf9b51096f7aac2f559cfd0603c32439a9ff0604b33d1d799790312fa876d3331ce88be2a0457c5f64219c5b5276263a6f2675e97f pcsc-lite-1.8.11-nopolkit.patch" +bff3f9dd8157de960b7c9694ff178be0df087f4d96aa56aad1d91dd3555f2aef51992c86f9d9460086d2e6c2b519b258ca66ad609a4e0a64d8f2a0a3c6d405d2 musl-stacksize.patch" diff --git a/main/pcsc-lite/pcsc-lite-1.8.11-nopolkit.patch b/main/pcsc-lite/pcsc-lite-1.8.11-nopolkit.patch deleted file mode 100644 index 8e6fbc9e68..0000000000 --- a/main/pcsc-lite/pcsc-lite-1.8.11-nopolkit.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: pcsc-lite-1.8.11/configure.ac -=================================================================== ---- pcsc-lite-1.8.11/configure.ac -+++ pcsc-lite-1.8.11/configure.ac -@@ -284,16 +284,15 @@ fi - POLKIT_MINIMUM=0.111 - AC_ARG_ENABLE(polkit, - AS_HELP_STRING([--enable-polkit], -- [Build with polkit support]), -- use_polkit=$withval, use_polkit=no) --if test "$use_polkit" != "no"; then -- PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [use_polkit=yes], [use_polkit=no]) -- if test "$use_polkit" != "no";then -+ [Build with polkit support])) -+if test "x$enable_polkit" != "xno"; then -+ PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [enable_polkit=yes], [enable_polkit=no]) -+ if test "$enable_polkit" != "no";then - AC_DEFINE([HAVE_POLKIT], 1, [Build polkit access control support]) - polkit_policy_dir=$($PKG_CONFIG polkit-gobject-1 --variable=policydir) - AC_SUBST(POLICY_DIR, [$polkit_policy_dir]) - else -- use_polkit=no -+ enable_polkit=no - AC_MSG_ERROR([[ - *** - *** polkit >= $POLKIT_MINIMUM was not found. Access control will be disabled. -@@ -301,7 +300,7 @@ if test "$use_polkit" != "no"; then - *** ]]) - fi - fi --AM_CONDITIONAL(ENABLE_POLKIT, test "$use_polkit" != "no") -+AM_CONDITIONAL(ENABLE_POLKIT, test "$enable_polkit" != "no") - - # --with-systemdsystemunitdir=DIR - AC_ARG_WITH([systemdsystemunitdir], |