diff --git a/SOURCES/esc-1.1.0-fix28.patch b/SOURCES/esc-1.1.0-fix28.patch new file mode 100644 index 0000000..69d2643 --- /dev/null +++ b/SOURCES/esc-1.1.0-fix28.patch @@ -0,0 +1,22 @@ +diff -up ./esc/rpm/esc.fix28 ./esc/rpm/esc +--- ./esc/rpm/esc.fix28 2017-11-02 13:33:22.954482609 -0700 ++++ ./esc/rpm/esc 2017-11-02 13:34:15.847107506 -0700 +@@ -25,6 +25,7 @@ ESC_ARGS= + REDHAT_BASE=~/.redhat + ESC_PROFILE_BASE=$REDHAT_BASE/esc + ESC_LOG_FILE=esc.log ++ESC_PROFILE_PERMS=700 + + ESC_PATH=$LIBDIR/esc-1.1.0 + ESC_BIN_PATH=/usr/bin +@@ -102,8 +103,8 @@ processArgs $* + if [ ! -d $ESC_PROFILE_BASE ] + then + mkdir -p $ESC_PROFILE_BASE +- chmod 755 $REDHAT_BASE +- chmod 755 $ESC_PROFILE_BASE ++ chmod $ESC_PROFILE_PERMS $REDHAT_BASE ++ chmod $ESC_PROFILE_PERMS $ESC_PROFILE_BASE + fi + + cd $ESC_PATH diff --git a/SOURCES/esc-1.1.0-fix29.patch b/SOURCES/esc-1.1.0-fix29.patch new file mode 100644 index 0000000..f45eff6 --- /dev/null +++ b/SOURCES/esc-1.1.0-fix29.patch @@ -0,0 +1,13 @@ +diff -up ./esc/rpm/esc.fix29 ./esc/rpm/esc +--- ./esc/rpm/esc.fix29 2018-01-08 12:06:42.346885111 -0800 ++++ ./esc/rpm/esc 2018-01-08 12:06:45.450865866 -0800 +@@ -105,6 +105,9 @@ then + mkdir -p $ESC_PROFILE_BASE + chmod $ESC_PROFILE_PERMS $REDHAT_BASE + chmod $ESC_PROFILE_PERMS $ESC_PROFILE_BASE ++else ++ chmod -R $ESC_PROFILE_PERMS $REDHAT_BASE ++ chmod -R $ESC_PROFILE_PERMS $ESC_PROFILE_BASE + fi + + cd $ESC_PATH diff --git a/SPECS/esc.spec b/SPECS/esc.spec index 662ca01..6e3e3d6 100644 --- a/SPECS/esc.spec +++ b/SPECS/esc.spec @@ -1,6 +1,6 @@ Name: esc Version: 1.1.0 -Release: 37%{?dist} +Release: 40%{?dist} Summary: Enterprise Security Client Smart Card Client License: GPL+ URL: http://directory.fedoraproject.org/wiki/CoolKey @@ -43,6 +43,8 @@ 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 +Patch28: esc-1.1.0-fix28.patch +Patch29: esc-1.1.0-fix29.patch BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel @@ -124,6 +126,8 @@ cryptographic smartcards. %patch25 -p1 -b .fix25 %patch26 -p1 -b .fix26 %patch27 -p1 -b .fix37 +%patch28 -p1 -b .fix28 +%patch29 -p1 -b .fix29 r=$(uname -r | sed -e 's/\(^[^.]*\.[^.]*\).*/\1/') [ -f esc/coreconf/Linux$r.mk ] || ln -s Linux3.5.mk esc/coreconf/Linux$r.mk @@ -274,6 +278,12 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %changelog +* Fri Jan 19 2018 Jack Magne - 1.1.0-40 +- Resolves: Bug #1466949, Relate: Bug #1523946 - [ppc64] ld switch to relro breaks GDB. This caused an rpmdiff failure. +* Mon Jan 08 2018 Jack Magne - 1.1.0-39 +- Resolves: Bug #1466949 - esc created .redhat directory fails STIG umask check, fixed corner case. +* Thu Nov 02 2017 Jack Magne - 1.1.0-38 +- Resolves: Bug #1466949 - esc created .redhat directory fails STIG umask check * 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