From 2ee33f7b7bb6f36dcee29f7df1e6122b55139e92 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 27 Jul 2011 13:11:48 +0200 Subject: update to latest upstream version --- package/pcsc-lite/Makefile | 10 +++++----- package/pcsc-lite/files/pcscd.init | 2 +- package/pcsc-lite/patches/patch-ltmain_sh | 14 +++++++------- package/pcsc-lite/patches/patch-src_Makefile_in | 21 +++++++++++++++------ 4 files changed, 28 insertions(+), 19 deletions(-) (limited to 'package/pcsc-lite') diff --git a/package/pcsc-lite/Makefile b/package/pcsc-lite/Makefile index f53637a56..6164ca12f 100644 --- a/package/pcsc-lite/Makefile +++ b/package/pcsc-lite/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= pcsc-lite -PKG_VERSION:= 1.6.6 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f80d3ecd9569b71d557f283f16295c74 +PKG_VERSION:= 1.7.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1caf0b8ca2ecbf82fe3b035b3fff22dd PKG_DESCR:= middleware for smartcards PKG_SECTION:= crypto PKG_DEPENDS:= libusb libusb-compat libpthread PKG_BUILDDEP:= libusb libusb-compat PKG_URL:= http://pcsclite.alioth.debian.org/ -PKG_SITES:= http://alioth.debian.org/frs/download.php/3479/ +PKG_SITES:= http://alioth.debian.org/frs/download.php/3598/ PKG_SUBPKGS:= PCSC_LITE PCSC_LITE_DEV PKGSD_PCSC_LITE_DEV:= header files for pcsc-lite @@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,PCSC_LITE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PCSC_LITE_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_PCSC_LITE_DEV},${PKGSC_PCSC_LITE_DEV})) -CONFIGURE_ARGS+= --disable-libhal +CONFIGURE_ARGS+= --disable-libudev post-install: $(INSTALL_DIR) $(IDIR_PCSC_LITE)/etc/reader.conf.d diff --git a/package/pcsc-lite/files/pcscd.init b/package/pcsc-lite/files/pcscd.init index c76efc695..c3e6c2d19 100644 --- a/package/pcsc-lite/files/pcscd.init +++ b/package/pcsc-lite/files/pcscd.init @@ -10,7 +10,7 @@ autostart) exec sh $0 start ;; start) - /usr/sbin/pcscd + /usr/sbin/pcscd -f & ;; stop) kill $(pgrep -f /usr/sbin/pcscd) diff --git a/package/pcsc-lite/patches/patch-ltmain_sh b/package/pcsc-lite/patches/patch-ltmain_sh index 62af43733..cf271607f 100644 --- a/package/pcsc-lite/patches/patch-ltmain_sh +++ b/package/pcsc-lite/patches/patch-ltmain_sh @@ -1,11 +1,11 @@ ---- pcsc-lite-1.6.6.orig/ltmain.sh 2010-12-12 11:08:23.000000000 +0100 -+++ pcsc-lite-1.6.6/ltmain.sh 2011-01-14 20:20:39.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +--- pcsc-lite-1.7.4.orig/ltmain.sh 2011-06-22 09:28:37.000000000 +0200 ++++ pcsc-lite-1.7.4/ltmain.sh 2011-07-27 11:57:15.000000000 +0200 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" diff --git a/package/pcsc-lite/patches/patch-src_Makefile_in b/package/pcsc-lite/patches/patch-src_Makefile_in index 582fe0bb5..e867869ee 100644 --- a/package/pcsc-lite/patches/patch-src_Makefile_in +++ b/package/pcsc-lite/patches/patch-src_Makefile_in @@ -1,6 +1,15 @@ ---- pcsc-lite-1.6.6.orig/src/Makefile.in 2010-12-12 11:08:27.000000000 +0100 -+++ pcsc-lite-1.6.6/src/Makefile.in 2011-01-07 19:27:46.000000000 +0100 -@@ -338,7 +338,7 @@ libpcsclite_la_SOURCES = \ +--- pcsc-lite-1.7.4.orig/src/Makefile.in 2011-06-23 18:15:53.000000000 +0200 ++++ pcsc-lite-1.7.4/src/Makefile.in 2011-07-27 11:50:26.000000000 +0200 +@@ -94,7 +94,7 @@ am_libpcsclite_la_OBJECTS = libpcsclite_ + libpcsclite_la_OBJECTS = $(am_libpcsclite_la_OBJECTS) + libpcsclite_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpcsclite_la_CFLAGS) \ +- $(CFLAGS) $(libpcsclite_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libpcsclite_la_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS) + am_pcsc_wirecheck_OBJECTS = pcsc-wirecheck-dist.$(OBJEXT) \ + pcsc-wirecheck-main.$(OBJEXT) +@@ -340,7 +340,7 @@ libpcsclite_la_SOURCES = \ winscard_msg.c libpcsclite_la_LDFLAGS = -version-info 1:0:0 @@ -9,12 +18,12 @@ libpcsclite_la_LIBADD = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) pcscd_SOURCES = \ atrhandler.c \ -@@ -390,7 +390,7 @@ pcscd_SOURCES = \ +@@ -392,7 +392,7 @@ pcscd_SOURCES = \ winscard_svc.c \ winscard_svc.h --pcscd_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBHAL_CFLAGS) \ -+pcscd_CFLAGS = $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBHAL_CFLAGS) \ +-pcscd_CFLAGS = $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBUDEV_CFLAGS) \ ++pcscd_CFLAGS = $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS) $(LIBUDEV_CFLAGS) \ -DPCSCD -DSIMCLIST_NO_DUMPRESTORE pcscd_LDFLAGS = $(LDFLAGS) -export-dynamic -- cgit v1.2.3