Prechádzať zdrojové kódy

Updated PolKit and its SpiderMonkey Javascript engine

Maxim Kammerer 12 rokov pred
rodič
commit
ac4d2c8efe

+ 2 - 1
src/etc/portage/package.accept_keywords

@@ -27,7 +27,8 @@
 =dev-libs/m17n-lib-1.6.3*
 
 # Library-only Javascript for PolKit (#437520)
-=dev-lang/spidermonkey-1.8.7*:0/mozjs187
+=sys-auth/polkit-0.112*
+=dev-lang/spidermonkey-17.0.0*:17
 
 # Firmware
 sys-firmware/b43-firmware

+ 0 - 2
src/etc/portage/package.unmask

@@ -1,2 +0,0 @@
-# Masked due to reverse dependencies issues
-~dev-lang/spidermonkey-1.8.7

+ 0 - 11
src/root/patches/portage/polkit.patch

@@ -1,11 +0,0 @@
---- /usr/portage/sys-auth/polkit/polkit-0.110.ebuild	2013-03-12 11:31:30.000000000 +0000
-+++ /usr/portage/sys-auth/polkit/polkit-0.110.ebuild	2013-03-19 15:30:04.961719707 +0000
-@@ -61,6 +61,8 @@
- 
- 	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
- 
-+	sed -i 's/\$(EXPAT_LIBS).*/&\n$(LIBJS_LIBS)\\/' src/polkitbackend/Makefile.in
-+
- 	if has_version '>=dev-lang/spidermonkey-1.8.7'; then
- 		sed -i \
- 			-e '/mozjs/s:185:187:g' \

+ 3 - 2
src/root/setup

@@ -85,8 +85,6 @@ patch_ebuild ${HOME}/patches/portage/virtualbox-guest-additions.patch
 patch_ebuild ${HOME}/patches/portage/xf86-video-virtualbox.patch
 # (#437446)
 patch_ebuild ${HOME}/patches/portage/nip2.patch
-# (#448228, fixed in polkit-0.111)
-patch_ebuild ${HOME}/patches/portage/polkit.patch
 
 
 if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then
@@ -456,6 +454,9 @@ sed -n '/^\//p' ${HOME}/config/rootfs.nosuid | while read file caps; do
     fi
 done
 
+# (#485910, #485908)
+paxctl-ng -d /usr/lib/polkit-1/polkitd || :
+
 
 sinfo "Initializing a secondary PGP keyring"
 sudo -n -u anon gpg -q --homedir /home/anon/persist/security/pgp --no-default-keyring \