[Bug 250738] build patches for coolkey

[bugzilla at redhat.com]

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.


https://bugzilla.redhat.com/show_bug.cgi?id=250738





--- Comment #10 from Jack Magne <jmagne at redhat.com>  2009-09-16 16:30:26 EDT ---
Bob: I tried out these patches on rawhide build appears to work fine:


Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/Makefile.am,v
retrieving revision 1.6
diff -C 2 -r1.6 Makefile.am
*** Makefile.am 28 Jun 2007 20:54:21 -0000 1.6
--- Makefile.am 16 Sep 2009 20:22:24 -0000
***************
*** 26,31 ****
  endif

- ACLOCAL_AMFLAGS = -I m4
- 
  EXTRA_DIST = coolkey.spec LICENSE

--- 26,29 ----

RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.14
diff -C 2 -r1.14 configure.in
*** configure.in 16 Feb 2007 19:50:50 -0000 1.14
--- configure.in 16 Sep 2009 18:38:16 -0000
***************
*** 125,131 ****
    PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto
libraries) ])
  fi
!   enable_pk11install = "yes"
  else
!   enable_pk11install = "no"
    AC_MSG_WARN([skipping pk11install])
  fi
--- 125,131 ----
    PKG_CHECK_MODULES(NSS, nss, true, [ AC_MSG_ERROR(could not find NSS Crypto
libraries) ])
  fi
!   enable_pk11install="yes"
  else
!   enable_pk11install="no"
    AC_MSG_WARN([skipping pk11install])
  fi

Index: src/coolkey/slot.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/slot.cpp,v
retrieving revision 1.11
diff -C 2 -r1.11 slot.cpp
*** src/coolkey/slot.cpp 19 Feb 2009 02:04:13 -0000 1.11
--- src/coolkey/slot.cpp 16 Sep 2009 18:38:17 -0000
***************
*** 980,984 ****
  #define COOLKEY "CoolKey"
  #define POSSESSION " for "
!     if (!personName || personName == "") {
   const int coolKeySize = sizeof(COOLKEY) ;
   memcpy(label, COOLKEY, coolKeySize-1);
--- 980,984 ----
  #define COOLKEY "CoolKey"
  #define POSSESSION " for "
!     if (!personName || personName[0] == '\0' ) {
   const int coolKeySize = sizeof(COOLKEY) ;
   memcpy(label, COOLKEY, coolKeySize-1);

-- 
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.