1. photon
  2. Commit 01d2b9e16b717b0de0c3f7e905586c8109b40689
Browse code

Update polkit and mozjs.

Change-Id: I7d4f88ad9f51162a9797c614db922c36f088849c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3981
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Vinay Kulkarni authored on 2017/10/06 10:12:02
Showing 2 changed files
SPECS/js/js.spec
History View file @ 01d2b9e
... ... 
@@ -1,48 +1,81 @@
1 
-Summary:	Mozilla's JavaScript engine.
2 
-Name:		js
3 
-Version:	17.0.0
4 
-Release:	1%{?dist}
5 
-License:	GPLv2+ or LGPLv2+ or MPLv1.1
6 
-URL:		http://www.mozilla.org/js
7 
-Group:		Development/Languages
8 
-Vendor:		VMware, Inc.
9 
-Distribution:	Photon
10 
-Source0:	https://ftp.mozilla.org/pub/%{name}/moz%{name}%{version}.tar.gz
11 
-%define sha1 mozjs=7805174898c34e5d3c3b256117af9944ba825c89
12 
-BuildRequires:	libffi nspr python2-libs python2-devel
13 
-Requires:	libffi nspr python2
1 
+Summary:       Mozilla's JavaScript engine.
2 
+Name:          js
3 
+Version:       1.8.5
4 
+Release:       1%{?dist}
5 
+Group:         Applications/System
6 
+Vendor:        VMware, Inc.
7 
+License:       GPLv2+ or LGPLv2+ or MPLv1.1
8 
+URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5
9 
+Source0:       https://archive.mozilla.org/pub/js/js185-1.0.0.tar.gz
10 
+Distribution:  Photon
11 
+BuildRequires: autoconf
12 
+BuildRequires: ncurses-devel
13 
+BuildRequires: nspr-devel >= 4.7
14 
+BuildRequires: zip
15 
+Requires:      ncurses
16 
+Requires:      nspr
17 
+%define sha1 js185=52a01449c48d7a117b35f213d3e4263578d846d6
18 
+
14 19 
 %description
15 
-JS is Mozilla's JavaScript engine written in C/C++.
16 
-%package 	devel
17 
-Group:          Development/Libraries
18 
-Summary:        Headers and static lib for application development
19 
-Requires:	%{name} = %{version}
20 
-%description 	devel
21 
-Install this package if you want do compile applications using this package.
20 
+Mozilla's JavaScript engine includes a just-in-time compiler (JIT) that compiles
21 
+JavaScript to machine code, for a significant speed increase.
22 
+
23 
+%package devel
24 
+Summary:        js devel
25 
+Group:          Development/Tools
26 
+Requires:       %{name} = %{version}
27 
+%description devel
28 
+This contains development tools and libraries for SpiderMonkey.
29 
+
22 30 
 %prep
23 
-%setup -q -n moz%{name}%{version}/js/src
31 
+%setup -q
32 
+
24 33 
 %build
25 
-sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl
26 
-./configure --prefix=%{_prefix} \
27 
-	    --enable-threadsafe \
28 
-	    --with-system-ffi \
29 
-	    --with-system-nspr
30 
-#	    --enable-readline \
31 
-make %{?_smp_mflags}
34 
+cd js/src
35 
+./configure \
36 
+    --prefix=%{_prefix} \
37 
+    --bindir=%{_bindir} \
38 
+    --sbindir=%{_sbindir} \
39 
+    --includedir=%{_includedir} \
40 
+    --libdir=%{_libdir} \
41 
+    --mandir=%{_mandir} \
42 
+    --infodir=%{_infodir} \
43 
+    --datadir=%{_datarootdir} \
44 
+    --sysconfdir=/etc \
45 
+    --with-system-nspr \
46 
+    --enable-threadsafe \
47 
+    --enable-readline
48 
+make CXX=g++ CXXFLAGS='-std=gnu++98 -DXP_UNIX=1 -DJS_THREADSAFE=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1'
49 
+
32 50 
 %install
51 
+cd js/src
33 52 
 make DESTDIR=%{buildroot} install
34 
-find %{buildroot}/usr/include/js-17.0/            \
35 
-     %{buildroot}/usr/lib/libmozjs-17.0.a         \
36 
-     %{buildroot}/usr/lib/pkgconfig/mozjs-17.0.pc \
37 
-     -type f -exec chmod -v 644 {} \;
53 
+pushd %{buildroot}/%{_libdir}
54 
+ln -fs libmozjs185.so.1.0.0 libmozjs185.so.1.0
55 
+ln -fs libmozjs185.so.1.0 libmozjs185.so
56 
+popd
57 
+find %{buildroot} -name '*.la' -delete
58 
+
59 
+%post
60 
+/sbin/ldconfig
61 
+
62 
+%postun
63 
+/sbin/ldconfig
64 
+
38 65 
 %files
39 66 
 %defattr(-,root,root)
40 
-%{_bindir}/*
41 
-%{_libdir}/*
42 
-%exclude %{_libdir}/debug
67 
+%{_bindir}/js-config
68 
+%{_libdir}/libmozjs185.so.*
69 
+
43 70 
 %files devel
44 71 
 %defattr(-,root,root)
45 
-%{_includedir}/*
72 
+%{_includedir}/%{name}/*
73 
+%{_libdir}/libmozjs185-1.0.a
74 
+%{_libdir}/libmozjs185.so
75 
+%{_libdir}/pkgconfig/mozjs185.pc
76 
+
46 77 
 %changelog
47 
-*	Fri May 22 2015 Alexey Makhalov <amakhalov@vmware.com> 17.0.0-1
48 
--	initial version
78 
+*   Tue Oct 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 1.8.5-1
79 
+-   mozjs v1.8.5.
80 
+*   Fri May 22 2015 Alexey Makhalov <amakhalov@vmware.com> 17.0.0-1
81 
+-   initial version
SPECS/polkit/polkit.spec
History View file @ 01d2b9e
... ... 
@@ -1,38 +1,62 @@
1 
-Summary:	toolkit for defining and handling authorizations.
2 
-Name:		polkit
3 
-Version:	0.113
4 
-Release:	1%{?dist}
5 
-License:	LGPLv2+
6 
-URL:		http://www.freedesktop.org/software/polkit
7 
-Group:		User Interface/Desktops
8 
-Vendor:		VMware, Inc.
9 
-Distribution:	Photon
10 
-Source0:	http://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
1 
+Summary:       A toolkit for defining and handling authorizations.
2 
+Name:          polkit
3 
+Version:       0.113
4 
+Release:       2%{?dist}
5 
+Group:         Applications/System
6 
+Vendor:        VMware, Inc.
7 
+License:       LGPLv2+
8 
+URL:           https://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html
9 
+Source0:       https://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
10 
+Distribution:  Photon
11 
+BuildRequires: autoconf
12 
+BuildRequires: expat-devel
13 
+BuildRequires: glib-devel
14 
+BuildRequires: gobject-introspection
15 
+BuildRequires: intltool >= 0.40.0
16 
+BuildRequires: js-devel
17 
+BuildRequires: Linux-PAM-devel
18 
+BuildRequires: systemd-devel
19 
+Requires:      expat
20 
+Requires:      glib
21 
+Requires:      js
22 
+Requires:      Linux-PAM
23 
+Requires:      systemd
11 24 
 %define sha1 polkit=ef855c2d04184dceb38e0940dc7bec9cc3da415c
12 
-BuildRequires:	intltool glib-devel js-devel expat-devel systemd
13 
-Requires:	glib js expat shadow systemd
25 
+
14 26 
 %description
15 
-Polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to communicate with privileged processes.
16 
-%package 	devel
17 
-Group:          Development/Libraries
18 
-Summary:        Headers and static lib for application development
19 
-Requires:	%{name} = %{version}
20 
-Requires:	intltool glib-devel js-devel expat systemd
21 
-%description 	devel
22 
-Install this package if you want do compile applications using the polkit.
27 
+polkit provides an authorization API intended to be used by privileged programs
28 
+(“MECHANISMS”) offering service to unprivileged programs (“SUBJECTS”) often
29 
+through some form of inter-process communication mechanism
30 
+
31 
+%package devel
32 
+Summary: polkit development headers and libraries
33 
+Group: Development/Libraries
34 
+Requires: polkit = %{version}-%{release}
35 
+
36 
+%description devel
37 
+header files and libraries for polkit
38 
+
23 39 
 %prep
24 40 
 %setup -q
41 
+
25 42 
 %build
26 
-# current configure uses old auto tools
27 
-./configure --prefix=%{_prefix} \
28 
-	    --sysconfdir=%{_sysconfdir} \
29 
-	    --localstatedir=%{_localstatedir} \
30 
-	    --disable-static \
31 
-	    --enable-libsystemd-login=no \
32 
-	    --with-authfw=shadow
43 
+./configure \
44 
+    --prefix=%{_prefix} \
45 
+    --bindir=%{_bindir} \
46 
+    --sbindir=%{_sbindir} \
47 
+    --includedir=%{_includedir} \
48 
+    --libdir=%{_libdir} \
49 
+    --mandir=%{_mandir} \
50 
+    --infodir=%{_infodir} \
51 
+    --datadir=%{_datarootdir} \
52 
+    --sysconfdir=%{_sysconfdir} \
53 
+    --enable-libsystemd-login=yes \
54 
+    --with-systemdsystemunitdir=%{_libdir}/systemd/system
33 55 
 make %{?_smp_mflags}
56 
+
34 57 
 %install
35 58 
 make DESTDIR=%{buildroot} install
59 
+find %{buildroot} -name '*.la' -delete
36 60 
 install -vdm 755 %{buildroot}/etc/pam.d
37 61 
 cat > %{buildroot}/etc/pam.d/polkit-1 << "EOF"
38 62 
 # Begin /etc/pam.d/polkit-1
... ... 
@@ -44,28 +68,56 @@ session  include        system-session
44 44
45 45 
 # End /etc/pam.d/polkit-1
46 46 
 EOF
47 
+
48 
+%check
49 
+# Disable check. It requires dbus - not available in chroot/container.
50 
+
47 51 
 %pre
48 52 
 getent group polkitd > /dev/null || groupadd -fg 27 polkitd &&
49 
-getent passwd polkitd > /dev/null || useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
53 
+getent passwd polkitd > /dev/null || \
54 
+    useradd -c "PolicyKit Daemon Owner" -d /etc/polkit-1 -u 27 \
50 55 
         -g polkitd -s /bin/false polkitd
51 56
57 
+%post
58 
+/sbin/ldconfig
59 
+
60 
+%postun
61 
+/sbin/ldconfig
62 
+if [ $1 -eq 0 ] ; then
63 
+    systemctl stop polkit
64 
+    if getent passwd polkitd >/dev/null; then
65 
+        userdel polkitd
66 
+    fi
67 
+    if getent group polkitd >/dev/null; then
68 
+        groupdel polkitd
69 
+    fi
70 
+fi
71 
+
52 72 
 %files
53 73 
 %defattr(-,root,root)
54 
-%{_sysconfdir}/*
55 
-%{_bindir}/*
56 
-%{_libdir}/*
57 
-%exclude %{_libdir}/debug
58 
-%exclude %{_libdir}/*.la
59 
-%exclude %{_libdir}/*.so
60 
-%exclude %{_libdir}/debug
61 
-%{_datadir}/*
74 
+%{_bindir}/pk*
75 
+%{_libdir}/lib%{name}-*.so.*
76 
+%{_libdir}/polkit-1/polkit-agent-helper-1
77 
+%{_libdir}/polkit-1/polkitd
78 
+%{_libdir}/systemd/system/polkit.service
79 
+%{_datarootdir}/dbus-1/system-services/org.freedesktop.PolicyKit1.service
80 
+%{_datarootdir}/locale/*
81 
+%{_datarootdir}/polkit-1/actions/*.policy
82 
+%{_sysconfdir}/dbus-1/system.d/org.freedesktop.PolicyKit1.conf
83 
+%{_sysconfdir}/pam.d/polkit-1
84 
+%{_sysconfdir}/polkit-1/rules.d/50-default.rules
85 
+
62 86 
 %files devel
63 87 
 %defattr(-,root,root)
64 
-%{_includedir}/*
65 
-%{_libdir}/*.la
66 
-%{_libdir}/*.so
88 
+%{_includedir}/%{name}-1/
89 
+%{_libdir}/lib%{name}-*.a
90 
+%{_libdir}/lib%{name}-*.so
91 
+%{_libdir}/pkgconfig/*.pc
92 
+
67 93 
 %changelog
68 
-*	Wed Oct 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.113-1
69 
--	Upgrade to 0.113-1
70 
-*	Fri May 22 2015 Alexey Makhalov <amakhalov@vmware.com> 0.112-1
71 
--	initial version
94 
+*   Thu Oct 05 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.113-2
95 
+-   Enable PAM and systemd.
96 
+*   Wed Oct 04 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.113-1
97 
+-   Upgrade to 0.113-1
98 
+*   Fri May 22 2015 Alexey Makhalov <amakhalov@vmware.com> 0.112-1
99 
+-   initial version