qemu-system-libcacard.patch

   1 --- qemu-1.2.1/configure.orig   2012-11-25 13:26:46.638846657 +0100
   2 +++ qemu-1.2.1/configure        2012-11-25 13:31:17.258841016 +0100
   3 @@ -2710,9 +2710,10 @@
   4  #include <pk11pub.h>
   5  int main(void) { PK11_FreeSlot(0); return 0; }
   6  EOF
   7 -        smartcard_includes="-I\$(SRC_PATH)/libcacard"
   8 -        libcacard_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
   9 -        libcacard_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
  10 +        libcacard_libs="$($pkg_config --libs libcacard 2>/dev/null)"
  11 +        libcacard_cflags="$($pkg_config --cflags libcacard 2>/dev/null)"
  12 +        nss_libs="$($pkg_config --libs nss 2>/dev/null) $glib_libs"
  13 +        nss_cflags="$($pkg_config --cflags nss 2>/dev/null) $glib_cflags"
  14          test_cflags="$libcacard_cflags"
  15          # The header files in nss < 3.13.3 have a bug which causes them to
  16          # emit a warning. If we're going to compile QEMU with -Werror, then
  17 @@ -2722,11 +2723,10 @@
  18              test_cflags="-Werror $test_cflags"
  19          fi
  20          if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
  21 -          compile_prog "$test_cflags" "$libcacard_libs"; then
  22 +          compile_prog "$test_cflags" "$nss_libs"; then
  23              smartcard_nss="yes"
  24 -            QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
  25 -            QEMU_INCLUDES="$QEMU_INCLUDES $smartcard_includes"
  26 -            libs_softmmu="$libcacard_libs $libs_softmmu"
  27 +            QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags $nss_cflags"
  28 +            libs_softmmu="$libcacard_libs $nss_libs $libs_softmmu"
  29          else
  30              if test "$smartcard_nss" = "yes"; then
  31                  feature_not_found "nss"
  32 @@ -3058,9 +3058,6 @@
  33        tools="qemu-ga\$(EXESUF) $tools"
  34      fi
  35    fi
  36 -  if test "$smartcard_nss" = "yes" ; then
  37 -    tools="vscclient\$(EXESUF) $tools"
  38 -  fi
  39  fi
  40
  41  # Mac OS X ships with a broken assembler
  42 @@ -3449,6 +3446,8 @@
  43    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
  44    echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
  45    echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
  46 +  echo "nss_libs=$nss_libs" >> $config_host_mak
  47 +  echo "nss_cflags=$nss_cflags" >> $config_host_mak
  48  fi
  49
  50  if test "$usb_redir" = "yes" ; then
  51 @@ -3895,9 +3894,6 @@
  52    echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
  53    echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
  54    echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
  55 -  if test "$smartcard_nss" = "yes" ; then
  56 -    echo "subdir-$target: subdir-libcacard" >> $config_host_mak
  57 -  fi
  58    case "$target_arch2" in
  59      i386|x86_64)
  60        echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
  61 @@ -4100,10 +4096,9 @@
  62  DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
  63  DIRS="$DIRS roms/seabios roms/vgabios"
  64  DIRS="$DIRS qapi-generated"
  65 -DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"
  66  FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
  67  FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
  68 -FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
  69 +FILES="$FILES tests/tcg/lm32/Makefile"
  70  FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
  71  FILES="$FILES pc-bios/spapr-rtas/Makefile"
  72  FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
  73 diff -ur qemu-kvm-1.2.0/hw/ccid-card-passthru.c qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c
  74 --- qemu-kvm-1.2.0/hw/ccid-card-passthru.c      2012-09-06 10:31:27.000000000 +0200
  75 +++ qemu-kvm-1.2.0-system-libcacard/hw/ccid-card-passthru.c     2012-11-09 07:44:11.286748135 +0100
  76 @@ -12,7 +12,7 @@
  77  #include "qemu_socket.h"
  78  #include "monitor.h"
  79  #include "hw/ccid.h"
  80 -#include "libcacard/vscard_common.h"
  81 +#include <cacard/vscard_common.h>
  82
  83  #define DPRINTF(card, lvl, fmt, ...)                    \
  84  do {                                                    \
  85 diff -ur qemu-kvm-1.2.0/Makefile qemu-kvm-1.2.0-system-libcacard/Makefile
  86 --- qemu-kvm-1.2.0/Makefile     2012-09-06 10:31:27.000000000 +0200
  87 +++ qemu-kvm-1.2.0-system-libcacard/Makefile    2012-11-09 07:42:39.346751378 +0100
  88 @@ -98,8 +98,6 @@
  89  include $(SRC_PATH)/Makefile.objs
  90  endif
  91
  92 -subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
  93 -
  94  $(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y) subdir-libdis
  95
  96  $(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser
  97 @@ -130,25 +128,6 @@
  98         $(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
  99
 100  version-obj-$(CONFIG_WIN32) += version.o
 101 -######################################################################
 102 -# Support building shared library libcacard
 103 -
 104 -.PHONY: libcacard.la install-libcacard
 105 -ifeq ($(LIBTOOL),)
 106 -libcacard.la:
 107 -       @echo "libtool is missing, please install and rerun configure"; exit 1
 108 -
 109 -install-libcacard:
 110 -       @echo "libtool is missing, please install and rerun configure"; exit 1
 111 -else
 112 -libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(addsuffix .lo, $(basename $(trace-obj-y)))
 113 -       $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)
 114 -
 115 -install-libcacard: libcacard.la
 116 -       $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)
 117 -endif
 118 -
 119 -######################################################################
 120
 121  qemu-img.o: qemu-img-cmds.h
 122
 123 @@ -163,9 +142,6 @@
 124
 125  qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
 126
 127 -vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) $(tools-obj-y) qemu-timer-common.o libcacard/vscclient.o
 128 -       $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")
 129 -
 130  fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
 131  fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
 132
 133 @@ -226,7 +202,7 @@
 134         rm -rf qapi-generated
 135         rm -rf qga/qapi-generated
 136         $(MAKE) -C tests/tcg clean
 137 -       for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
 138 +       for d in $(ALL_SUBDIRS) $(QEMULIBS); do \
 139         if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
 140         rm -f $$d/qemu-options.def; \
 141          done
 142 diff -ur qemu-kvm-1.2.0/Makefile.objs qemu-kvm-1.2.0-system-libcacard/Makefile.objs
 143 --- qemu-kvm-1.2.0/Makefile.objs        2012-09-06 10:31:27.000000000 +0200
 144 +++ qemu-kvm-1.2.0-system-libcacard/Makefile.objs       2012-11-09 07:45:10.880079366 +0100
 145 @@ -204,17 +204,6 @@
 146  $(trace-obj-y): $(GENERATED_HEADERS)
 147
 148  ######################################################################
 149 -# smartcard
 150 -
 151 -libcacard-y += libcacard/cac.o libcacard/event.o
 152 -libcacard-y += libcacard/vcard.o libcacard/vreader.o
 153 -libcacard-y += libcacard/vcard_emul_nss.o
 154 -libcacard-y += libcacard/vcard_emul_type.o
 155 -libcacard-y += libcacard/card_7816.o
 156 -
 157 -common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
 158 -
 159 -######################################################################
 160  # qapi
 161
 162  qapi-obj-y = qapi/