From 3586c58e5f891235d2e27a197449289c3117f4ec Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:23:20 +0000 Subject: import esc-1.1.0-37.el7 --- diff --git a/SOURCES/esc-1.1.0-fix27.patch b/SOURCES/esc-1.1.0-fix27.patch new file mode 100755 index 0000000..718e792 --- /dev/null +++ b/SOURCES/esc-1.1.0-fix27.patch @@ -0,0 +1,97 @@ +diff -up ./esc/src/app/daemon/manifest.mn.fix27 ./esc/src/app/daemon/manifest.mn +--- ./esc/src/app/daemon/manifest.mn.fix27 2016-06-27 18:02:11.863677684 -0700 ++++ ./esc/src/app/daemon/manifest.mn 2016-06-27 18:02:30.416677684 -0700 +@@ -32,7 +32,7 @@ endif + + DEFINES += -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss + +-DEFINES += $(shell pkg-config --cflags xft) ++DEFINES += $(shell pkg-config --cflags xft) -fstack-protector-strong + + CPPFLAGS += $(DEFINES) -g + +diff -up ./esc/src/app/xpcom/Makefile.sdk.fix27 ./esc/src/app/xpcom/Makefile.sdk +--- ./esc/src/app/xpcom/Makefile.sdk.fix27 2016-06-27 18:03:07.239677684 -0700 ++++ ./esc/src/app/xpcom/Makefile.sdk 2016-06-27 18:03:52.117677684 -0700 +@@ -112,7 +112,7 @@ endif + ifeq ($(OS_ARCH),Linux) + CPPFLAGS += -g -fno-rtti \ + -DXPCOM_GLUE_USE_NSPR -fno-exceptions \ +- -fshort-wchar -fPIC -std=gnu++0x ++ -fshort-wchar -fPIC -std=gnu++0x -fstack-protector-strong + GECKO_LD_LIBS=-L$(GECKO_SDK_PATH)/lib -lnssutil3 -lnss3 -lcrmf -lssl3 -lsmime3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -L$(GECKO_SDK_PATH)/lib -lxpcomglue_s + endif + +diff -up ./esc/src/app/xpcom/tray/Makefile.sdk.fix27 ./esc/src/app/xpcom/tray/Makefile.sdk +--- ./esc/src/app/xpcom/tray/Makefile.sdk.fix27 2016-06-27 18:04:06.166677684 -0700 ++++ ./esc/src/app/xpcom/tray/Makefile.sdk 2016-06-27 18:04:28.840677684 -0700 +@@ -110,7 +110,7 @@ endif + CXX = c++ + CPPFLAGS += -fno-rtti \ + -fno-exceptions \ +- -fshort-wchar -DXPCOM_GLUE_USE_NSPR=1 ++ -fshort-wchar -DXPCOM_GLUE_USE_NSPR=1 -fstack-protector-strong + + ifeq ($(OS_ARCH),WINNT) + CPPFLAGS = -MD -DXP_WIN=1 -DXP_WIN32=1 -DXPCOM_GLUE -DXPCOM_GLUE_USE_NSPR -TP -nologo -W3 -Gy -EHsc -DNDEBUG +diff -up ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix27 ./esc/src/lib/coolkey/CoolKeyHandler.cpp +--- ./esc/src/lib/coolkey/CoolKeyHandler.cpp.fix27 2016-06-28 15:05:39.031677684 -0700 ++++ ./esc/src/lib/coolkey/CoolKeyHandler.cpp 2016-06-28 16:49:44.830201737 -0700 +@@ -2174,9 +2174,19 @@ CKHGetCoolKeyInfo(PK11SlotInfo *aSlot) + + // Give the CAC card some sort of unique key ID + +- if(strlen(info->mCUID) == 0) ++ //There is a bug in coolkey where it returns the CUID of some previous ++ // token's cuid , instead of something unique, thus lets use the label. ++ ++ if(strlen(info->mCUID) == 0 || !isACOOLKey) + { +- strncpy(info->mCUID,(char *)tokenInfo.label,35); ++ memset((void *) info->mCUID,0,35); ++ int max = 0; ++ if(sizeof(tokenInfo.label) < 34) { ++ max = sizeof(tokenInfo.label); ++ } else { ++ max = 34; ++ } ++ strncpy(info->mCUID,(char *)tokenInfo.label,max); + info->mCUID[34] = 0; + isACOOLKey = 0; + } +diff -up ./esc/src/lib/coolkey/manifest.mn.fix27 ./esc/src/lib/coolkey/manifest.mn +--- ./esc/src/lib/coolkey/manifest.mn.fix27 2016-06-27 17:54:18.221677684 -0700 ++++ ./esc/src/lib/coolkey/manifest.mn 2016-06-27 18:00:13.817677684 -0700 +@@ -26,7 +26,7 @@ REQUIRES = httpchunked nss nspr ckyapple + ifndef MOZ_OFFSET + MOZ_OFFSET = mozilla-1.7.13 + endif +-DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing ++DEFINES += -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fno-strict-aliasing -fstack-protector-strong + MAPFILE = $(OBJDIR)/ckymanager.def + + #EXTRA_LIBS += -L$(DIST)/lib -lckyapplet +diff -up ./esc/src/lib/notifytray/manifest.mn.fix27 ./esc/src/lib/notifytray/manifest.mn +--- ./esc/src/lib/notifytray/manifest.mn.fix27 2016-06-27 18:00:24.566677684 -0700 ++++ ./esc/src/lib/notifytray/manifest.mn 2016-06-27 18:01:03.809677684 -0700 +@@ -17,7 +17,7 @@ + + CORE_DEPTH = ../../.. + +-DEFINES += $(shell pkg-config --cflags gtk+-2.0) ++DEFINES += $(shell pkg-config --cflags gtk+-2.0) -fstack-protector-strong + CCFLAGS += $(shell pkg-config --libs gtk+-2.0) + CCFLAGS += $(shell pkg-config --cflags glib-2.0) + +diff -up ./esc/src/lib/NssHttpClient/manifest.mn.fix27 ./esc/src/lib/NssHttpClient/manifest.mn +--- ./esc/src/lib/NssHttpClient/manifest.mn.fix27 2016-06-27 18:01:15.521677684 -0700 ++++ ./esc/src/lib/NssHttpClient/manifest.mn 2016-06-27 18:01:34.320677684 -0700 +@@ -31,7 +31,7 @@ endif + + + MAPFILE = $(OBJDIR)/httpchunked.def +-DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss ++DEFINES = -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss -I$(XULRUNNER_BASE)/dist/public/nss -I$(XULRUNNER_BASE)/dist/include/nspr -I$(GECKO_SDK_PATH)/include/nspr -I$(GECKO_SDK_PATH)/include/nss -fstack-protector-strong + + CPPSRCS = \ + Cache.cpp \ diff --git a/SPECS/esc.spec b/SPECS/esc.spec index 5434c80..662ca01 100644 --- a/SPECS/esc.spec +++ b/SPECS/esc.spec @@ -1,6 +1,6 @@ Name: esc Version: 1.1.0 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Enterprise Security Client Smart Card Client License: GPL+ URL: http://directory.fedoraproject.org/wiki/CoolKey @@ -42,6 +42,7 @@ Patch23: esc-1.1.0-fix23.patch Patch24: esc-1.1.0-fix24.patch Patch25: esc-1.1.0-fix25.patch Patch26: esc-1.1.0-fix26.patch +Patch27: esc-1.1.0-fix27.patch BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel @@ -122,6 +123,7 @@ cryptographic smartcards. %patch24 -p1 -b .fix24 %patch25 -p1 -b .fix25 %patch26 -p1 -b .fix26 +%patch27 -p1 -b .fix37 r=$(uname -r | sed -e 's/\(^[^.]*\.[^.]*\).*/\1/') [ -f esc/coreconf/Linux$r.mk ] || ln -s Linux3.5.mk esc/coreconf/Linux$r.mk @@ -136,10 +138,12 @@ GECKO_BIN_PATH=%{_libdir}/xulrunner GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-$geckoversion GECKO_IDL_PATH=/usr/share/idl/xulrunner-$geckoversion +%if 0%{?__isa_bits} %if %{__isa_bits} == 64 USE_64=1 export USE_64 %endif +%endif export GECKO_SDK_PATH export GECKO_BIN_PATH @@ -187,10 +191,12 @@ chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc mkdir -p $RPM_BUILD_ROOT/%{escdir} +%if 0%{?__isa_bits} %if %{__isa_bits} == 64 USE_64=1 export USE_64 %endif +%endif make USE_XUL_SDK=1 install DESTDIR=$RPM_BUILD_ROOT/%{escdir} @@ -268,7 +274,10 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %changelog -* Tue Jan 07 2015 Jack Magne - 1.1.0-36 +* Tue Jun 28 2016 Jack Magne - 1.1.0-37 +- Resolves: Bug #885898 - ESC incorrectly display Issuer information for a CAC smart card +- Resolves: Bug 1070802 - missing -fstack-protector-strong +* Tue Jan 06 2015 Jack Magne - 1.1.0-36 - Resolves: Bug #1176241 - .redhat dir does not have the same permissions during manual and auto launch of ESC Client - Minor additional fix. * Mon Jan 05 2015 Jack Magne - 1.1.0-35