5:15 p.m.
The package rpms/esc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/esc.git/commit/?id=01bbf42f592819....
Change:
-%ifarch x86_64 %{power64} ia64 aarch64
Thanks.
Full change:
============
commit 01bbf42f592819017511b2ab71f25ee718076544
Author: Jack Magne <jmagne(a)localhost.localdomain>
Date: Tue Jul 31 15:12:40 2018 -0700
Resolves:
Bug 1538645 - esc MUST NOT require coolkey
diff --git a/esc b/esc
index cce19fc..293b861 100755
--- a/esc
+++ b/esc
@@ -18,155 +18,17 @@
# END COPYRIGHT BLOCK
-DO_FORCEMODE="false"
-DO_SHOW_VERSION="false"
-ESC_ARGS=
-
-
-ESC_PROFILE_BASE=~/.redhat/esc
-ESC_LOG_FILE=esc.log
-
-ESC_PATH=$LIBDIR/esc-1.1.1
-ESC_BIN_PATH=/usr/bin
-ESC_EXEC=esc
-ESCD_EXEC=escd
-
-ESC_BIN=$ESC_PATH/xulrunner/xulrunner-bin
-ESCD_BIN=./$ESCD_EXEC
-
-LAST_PROG_PID=0
-SIGUSR1=10
-
-FORCE_START_ESC=
-
-XPTI_DAT=xpti.dat
-COMPREG_DAT=compreg.dat
-LOCK_FILE=lock
-PARENT_LOCK_FILE=.parentlock
+ESC_PATH=/usr/lib64/esc-1.1.2
+ESC_BIN=esc.js
+ESC_EXEC=gjs
export OPENSC_CONF=$ESC_PATH/opensc.esc.conf
-
-function isProgRunning {
-
- userID=$(whoami)
- isProgRunning=$(pgrep -U $userID -f $1)
- if [ $isProgRunning ];
- then
- LAST_PROG_PID=$isProgRunning
- return 0
- fi
- LAST_PROG_PID=0
- return 1
-}
-
-function removeFile {
-
- rm -f $1
-}
-
-function cleanupProfile {
-
- removeFile $ESC_PROFILE_BASE/*default/$XPTI_DAT
- removeFile $ESC_PROFILE_BASE/*default/$COMPREG_DAT
- removeFile $ESC_PROFILE_BASE/*default/$LOCK_FILE
- removeFile $ESC_PROFILE_BASE/*default/$PARENT_LOCK_FILE
-
-}
-
-function processArgs {
-
- for arg in $1
- do
-
- #echo "theArg: $arg"
- if [ $arg == "forceStartESC" ]
- then
- #echo "Do force mode!"
- FORCE_START_ESC="true"
- fi
-
- if [ $arg == "keyInserted" ]
- then
- FORCE_START_ESC="true"
- fi
-
- if [ $arg == "-version" ]
- then
- #echo "Do show version!"
- DO_SHOW_VERSION="true"
- fi
- done
-}
-
-
-processArgs $*
-
-if [ ! -d $ESC_PROFILE_BASE ]
-then
- mkdir -p $ESC_PROFILE_BASE
-fi
+export GI_TYPELIB_PATH=$ESC_PATH/lib/girepository-1.0
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ESC_PATH/lib
cd $ESC_PATH
-#First check if we just want the version
-
-if [ $DO_SHOW_VERSION == "true" ]
- then
- #echo "try to run the version command!"
- ESC_ARGS="-version"
- ./$ESC_EXEC $ESC_ARGS
- exit 0
-fi
-
-# Start up the daemon if it is not running
-
-isProgRunning $ESCD_BIN
-
-if [ $LAST_PROG_PID -gt 0 ]
-then
- false
- #echo "escd already running."
-else
- #echo "escd not running start."
- cleanupProfile
- ./$ESCD_EXEC --key_Inserted=\"/usr/bin/esc\"
--on_Signal=\"/usr/bin/esc\"
- exit 0
-fi
-
-# Now check to see if we wer signaled from the daemon
-
-if [ $FORCE_START_ESC ]
-then
- #echo "force start esc."
-
- #Check to see if esc is already running
-
- isProgRunning $ESC_BIN
- if [ $LAST_PROG_PID -gt 0 ]
- then
- #echo "attempting a force start but already running ... exit."
- exit 0
- fi
- #echo "force start esc not running start esc..."
- ./$ESC_EXEC
- exit 0
-fi
-
-isProgRunning $ESC_BIN
-
-if [ $LAST_PROG_PID -gt 0 ]
-then
- #echo "esc already running."
- ./$ESC_EXEC
- exit 0
-else
- #echo "esc not already running start up and bring up window."
- ./$ESC_EXEC &
- sleep 4
- #echo "done sleeping bring up esc window."
- ./$ESC_EXEC
- exit 0
-fi
+$ESC_EXEC ./$ESC_BIN &
exit 0
diff --git a/esc.spec b/esc.spec
index f82589a..abc8b2e 100644
--- a/esc.spec
+++ b/esc.spec
@@ -1,95 +1,50 @@
Name: esc
-Version: 1.1.1
-Release: 5%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Summary: Enterprise Security Client Smart Card Client
License: GPL+
URL: http://directory.fedora.redhat.com/wiki/CoolKey
Group: Applications/Internet
-%global freetype_version 2.1.9
-%global libnotify_version 0.7.0
-%global libvpx_version 1.0.0
-Patch1: esc-1.1.1-fix1.patch
-Patch2: esc-1.1.1-fix2.patch
-
-BuildRequires: doxygen fontconfig-devel
+#BuildRequires: doxygen fontconfig-devel
BuildRequires: glib2-devel atk-devel
BuildRequires: pkgconfig
BuildRequires: nspr-devel nss-devel nss-static
-BuildRequires: libX11-devel libXt-devel
+#BuildRequires: libX11-devel libXt-devel
BuildRequires: pcsc-lite-devel
-BuildRequires: desktop-file-utils zip binutils
-BuildRequires: libnotify-devel >= %{libnotify_version}
-BuildRequires: dbus-devel
-BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
-BuildRequires: zip
-BuildRequires: bzip2-devel
-BuildRequires: zlib-devel
-BuildRequires: libIDL-devel
-BuildRequires: gtk2-devel
-BuildRequires: krb5-devel
-BuildRequires: pango-devel
-BuildRequires: freetype-devel >= %{freetype_version}
-BuildRequires: libXt-devel
-BuildRequires: libXrender-devel
-BuildRequires: hunspell-devel
-BuildRequires: startup-notification-devel
-BuildRequires: alsa-lib-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: libcurl-devel
-BuildRequires: libvpx-devel >= %{libvpx_version}
-BuildRequires: autoconf213
-BuildRequires: pulseaudio-libs-devel
+BuildRequires: desktop-file-utils
BuildRequires: pkgconfig(gconf-2.0)
-BuildRequires: yasm
BuildRequires: dbus-glib-devel
-BuildRequires: libffi-devel
-BuildRequires: sqlite-devel
+BuildRequires: glib2-devel
BuildRequires: opensc
-Requires: sqlite
+BuildRequires: gobject-introspection-devel
+BuildRequires: gtk3-devel
+BuildRequires: gjs-devel
Requires: pcsc-lite nss nspr
-Requires: zip dbus >= 0.90 libnotify >= 0.4.2
-Requires: mozilla-filesystem
+Requires: dbus
Requires: nspr-devel
Requires: nss-devel
-Requires: libjpeg-devel
-Requires: zip
-Requires: bzip2-devel
-Requires: zlib-devel
-Requires: libIDL-devel
-Requires: gtk2-devel
-Requires: krb5-devel
-Requires: pango-devel
-Requires: freetype-devel >= %{freetype_version}
-Requires: libXt-devel
-Requires: libXrender-devel
-Requires: hunspell-devel
-Requires: sqlite-devel
-Requires: startup-notification-devel
-Requires: alsa-lib-devel
-Requires: libnotify-devel
-Requires: mesa-libGL-devel
-Requires: libvpx-devel >= %{libvpx_version}
Requires: opensc
+Requires: gjs
+Requires: gobject-introspection
+Requires: gtk3
+Requires: glib2
# 390 does not have smartCards
ExcludeArch: s390 s390x
#xulrunner doesn't seem to support these right now
#Temporary anyway, since xulrunner is going away soon.
-ExcludeArch: aarch64 i686
# We can't allow the internal xulrunner to leak out
AutoReqProv: 0
%define debug_build 0
-#%define __prelink_undo_cmd %{nil}
%define escname %{name}-%{version}
%define escdir %{_libdir}/%{escname}
%define escbindir %{_bindir}
@@ -100,10 +55,6 @@ AutoReqProv: 0
%define autostartdir %{_sysconfdir}/xdg/autostart
%define pixmapdir %{_datadir}/pixmaps
%define docdir %{_defaultdocdir}/%{escname}
-%define escappdir src/app/xpcom
-%define escxuldir src/app/xul/esc
-%define escxulchromeicons %{escxuldir}/chrome/icons/default
-%define escdaemon escd
Source0: http://pki.fedoraproject.org/pki/sources/%name/%{escname}.tar.bz2
Source1: http://pki.fedoraproject.org/pki/sources/%name/esc
@@ -121,49 +72,20 @@ cryptographic smartcards.
#patch esc
-%patch1 -p1 -b .fix1
-%patch2 -p1 -b .fix2
-
-r=$(uname -r | sed -e 's/\(^[^.]*\.[^.]*\).*/\1/')
-[ -f esc/coreconf/Linux$r.mk ] || ln -s Linux3.5.mk esc/coreconf/Linux$r.mk
-
%build
echo $RPM_BUILD_DIR
-%define geckoversion `rpm -qi xulrunner | grep Version | sed 's/[\t ]//g;/^$/d'
| sed 's/Version://'`
-
-GECKO_BASE_PATH=$RPM_BUILD_DIR/%{escname}/%{name}/src/xulrunner/xulrunner-45.9.0/firefox-45.9.0esr/objdir
-GECKO_SDK_PATH=$GECKO_BASE_PATH/dist/xulrunner-sdk
-GECKO_BIN_PATH=$GECKO_BASE_PATH/dist/xulrunner-sdk/sdk/bin
-GECKO_INCLUDE_PATH=%{_includedir}/xulrunner-%{geckoversion}
-GECKO_IDL_PATH=$GECKO_BASE_PATH/dist/xulrunner-sdk/idl
-
-%ifarch x86_64 %{power64} ia64 aarch64
-USE_64=1
-export USE_64
-%endif
-
-export GECKO_SDK_PATH
-export GECKO_BIN_PATH
-export GECKO_INCLUDE_PATH
-export GECKO_IDL_PATH
-# last setup call moved the current directory
+echo "build section" $PWD
cd esc
-#cd ../..
-
-cp %{SOURCE3} %{escxuldir}/%{esc_chromepath}
-rm -f %{escxulchromeicons}/*.ico
-cp %{escxulchromeicons}/esc-window.xpm %{escxulchromeicons}/default.xpm
-
-
-#xulrunner based flags.
-
-make HAVE_LIB_NOTIFY=1 ESC_VERSION=%{version}-%{release} USE_XUL_SDK=1
+./autogen.sh
+make
%install
-cd esc/src/app/xpcom
+echo "install section" $PWD
+cd esc
+make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/%{escbindir}
mkdir -p $RPM_BUILD_ROOT/%{icondir}
@@ -172,27 +94,24 @@ mkdir -p $RPM_BUILD_ROOT/%{autostartdir}
mkdir -p $RPM_BUILD_ROOT/%{pixmapdir}
mkdir -p $RPM_BUILD_ROOT/%{docdir}
-
+echo "dir: " $RPM_BUILD_ROOT/%{escbindir}/%{name}
sed -e 's;\$LIBDIR;'%{_libdir}';g' %{SOURCE1} >
$RPM_BUILD_ROOT/%{escbindir}/%{name}
-
-
-chmod 755 $RPM_BUILD_ROOT/%{escbindir}/esc
+chmod 755 $RPM_BUILD_ROOT/%{escbindir}/%{name}
mkdir -p $RPM_BUILD_ROOT/%{escdir}
+mkdir -p $RPM_BUILD_ROOT/%{escdir}/lib
-%ifarch x86_64 %{power64} ia64 aarch64
-USE_64=1
-export USE_64
-%endif
+cp $RPM_BUILD_ROOT/usr/local/bin/* $RPM_BUILD_ROOT/%{escdir}
+cp -rf $RPM_BUILD_ROOT/usr/local/lib $RPM_BUILD_ROOT/%{escdir}
-make USE_XUL_SDK=1 install DESTDIR=$RPM_BUILD_ROOT/%{escdir}
+rm $RPM_BUILD_ROOT/%{escdir}/lib/*.a
+rm $RPM_BUILD_ROOT/%{escdir}/lib/*.la
-rm -rf $RPM_BUILD_ROOT/%{escdir}/usr
-cd ../../../dist/*DBG*/esc_build/esc
+rm -rf $RPM_BUILD_ROOT/usr/local
-cp %{esc_chromepath}/esc.png $RPM_BUILD_ROOT/%{icondir}
+cp %{SOURCE3} $RPM_BUILD_ROOT/%{icondir}
ln -s $RPMBUILD_ROOT%{icondir}/esc.png $RPM_BUILD_ROOT/%{pixmapdir}/esc.png
cp %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/%{appdir}
@@ -201,52 +120,26 @@ cp %{SOURCE2} $RPM_BUILD_ROOT/%{autostartdir}
cd %{_builddir}
cp %{escname}/esc/LICENSE $RPM_BUILD_ROOT/%{docdir}
-rm -f $RPM_BUILD_ROOT/%{escdir}/esc
-#rm -rf $RPM_BUILD_ROOT/%{escdir}/xulrunner
-
-echo "xulrunner/xulrunner ./application.ini \$* &" >
$RPM_BUILD_ROOT/%{escdir}/esc
-
-chmod 755 $RPM_BUILD_ROOT/%{escdir}/esc
-chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/chrome
-chmod 755 -R $RPM_BUILD_ROOT/%{escdir}/defaults
-chmod 755 $RPM_BUILD_ROOT/%{escdir}/application.ini
-
-
%files
%{!?_licensedir:%global license %%doc}
%license %{docdir}/LICENSE
-%{escdir}/esc
-%attr(755, root, root) %{escdir}/esc
-%{escdir}/escd
%{escbindir}/esc
-%{escdir}/application.ini
+%{escdir}/lib
+%{escdir}/esc.js
%{escdir}/opensc.esc.conf
-%dir %{escdir}/chrome
-%dir %{escdir}/defaults
-%{escdir}/chrome.manifest
-%{escdir}/chrome/chrome.manifest
-
-%{escdir}/chrome/content
-%{escdir}/chrome/locale
-%{escdir}/chrome/icons/default
-%{escdir}/components
-%{escdir}/defaults/preferences/esc-prefs.js
-%{escdir}/xulrunner
%{icondir}/esc.png
%{pixmapdir}/esc.png
%{autostartdir}/esc.desktop
%{_datadir}/%{appdir}/esc.desktop
-%preun
-
-killall --exact -q escd
-exit 0
-
%changelog
+* Mon Jul 30 2018 Jack Magne <jmagne(a)redhat.com> - 1.1.2-1
+- Build bare bones esc, without xulrunner, using gjs / gobject
+- introspection.
* Thu Jun 07 2018 Jack Magne <jmagne(a)redhat.com> - 1.1.1-5
- Rebuild.
* Mon Apr 23 2018 Jack Magne <jmagne(a)redhat.com> - 1.1.1-4