backport some patches to fix some potential problems. Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com> Conflicts: ccid.spec (cherry picked from commit 2d304b21c865abdd007a08aff658450e9a71de68)
