Upgraded to NetworkManager 0.9.4.0

The upgrade includes related utilities.

enter

@@ -80,7 +80,7 @@ else
 
     if [ -e ${LIVECD}/etc/polkit-1/localauthority ]; then
         ${RSYNC} --chmod=u=rwX,go=rX -i --delete-excluded -C \
-            ${SRC}/etc/polkit-1/localauthority/* ${LIVECD}/etc/polkit-1/localauthority
+            ${SRC}/etc/polkit-1/localauthority/30-site.d ${LIVECD}/etc/polkit-1/localauthority
     fi
 
     mkdir -p -m 755 ${LIVECD}/usr/local/addons

src/etc/NetworkManager/NetworkManager.conf

@@ -0,0 +1,5 @@
+[main]
+plugins=keyfile
+
+[keyfile]
+hostname=liberte

src/etc/NetworkManager/dispatcher.d/10-openrc-status

@@ -0,0 +1,4 @@
+# The OpenRC status script provided by Gentoo is disabled,
+# since it is a rather heavy hack, which may also interfere
+# with, e.g., mac-randomize.
+# (#252137)

src/etc/NetworkManager/nm-system-settings.conf

@@ -1,8 +0,0 @@
-# nm-system-settings.conf has been deprecated in favor of NetworkManager.conf
-# according to the manual, but on Gentoo the former is still used.
-
-[main]
-plugins=keyfile
-
-[keyfile]
-hostname=liberte

src/etc/polkit-1/localauthority/30-site.d/10-su.dee.liberte.modem-manager.pkla

@@ -1,6 +0,0 @@
-[ModemManager Permissions]
-Identity=unix-group:plugdev
-Action=org.freedesktop.ModemManager.*
-ResultAny=no
-ResultInactive=no
-ResultActive=yes

src/etc/portage/make.conf

@@ -32,11 +32,11 @@ USE="aac acpi action_modeswitch alsa archive aspell bluetooth bs2b cairo
      eap-sim eap-tls edd exif expat flac gmp goffice grammar groupwise gtk
      hires-icons hwdb hybrid-auth id3tag idn iproute2 irda jbig jpeg jpeg2k
      keymap lcms libkms libnl libnotify lzma m17n-lib mad madwifi mktemp mmx
-     mp3 multicall networkmanager ntfsprogs ogg opengl ots pcmcia pcsc-lite
-     pkcs11 png policykit postscript pth scsi silc smartcard smime sna
-     sndfile speex spell sse startup-notification staticsocket svg symlink
-     thesaurus threads tiff truetype usb v4l vorbis wavpack webgl wifi wimax
-     wmf X X509 x86emu xattr xft xinerama xmp xv"
+     modemmanager mp3 multicall networkmanager ntfsprogs ogg opengl ots
+     pcmcia pcsc-lite pkcs11 png policykit postscript pth scsi silc
+     smartcard smime sna sndfile speex spell sse startup-notification
+     staticsocket svg symlink thesaurus threads tiff truetype usb v4l vorbis
+     wavpack webgl wifi wimax wmf X X509 x86emu xattr xft xinerama xmp xv"
 
 USE="${USE} -ant -berkdb -cracklib -cramfs -cups -cxx -fts3 -gdbm -git
      -http-cache -hunspell -ipv6 -lvm1 -mudflap -orc -qt4 -session -sqlite

src/etc/portage/package.use

@@ -32,11 +32,10 @@ x11-drivers/xf86-video-virtualbox -dri
 app-emulation/open-vm-tools     -X
 
 # Networking, including SSL/TLS
-# (epiphany: +networkmanager requires >=net-misc/networkmanager-0.8.997)
 net-libs/libetpan               gnutls
 net-libs/libmicrohttpd          -ssl
 net-wireless/wpa_supplicant     -ssl  gnutls
-net-misc/networkmanager         gnutls
+net-misc/networkmanager         gnutls -nss
 net-im/pidgin                   gnutls sasl
 dev-libs/cyrus-sasl             -crypt
 dev-libs/libevent               -ssl
@@ -44,7 +43,7 @@ net-analyzer/netcat             -crypt
 net-misc/iputils                -ssl
 dev-libs/opensc                 -ssl
 app-i18n/uim                    -ssl
-www-client/epiphany             -nss -networkmanager
+www-client/epiphany             -nss
 net-libs/glib-networking        -gnome
 
 # Multimedia

src/root/setup

@@ -433,7 +433,8 @@ rm -f  /var/log/wtmp
 # "wheel"     group: necessary for su/sudo PAM authentication + GRSEC TPE (= 10)
 #                    + stop/restart PolicyKit permissions + lid events
 # "plugdev"   group: ModemManager control PolicyKit permissions;
-#                    wireless/bluetooth rfkill switch
+#                    + NetworkManager modify system connections
+#                    + wireless/bluetooth rfkill switch
 # "lp"        group: D-Bus communication with bluetoothd
 # ["uucp"]    group: access to RFCOMM devices (e.g., obexftp)
 # "games"     group: prevent games complaining about not keeping scores
@@ -540,7 +541,7 @@ sinfo "Generating EFI GRUB configuration"
 ${helpdir}/gen-efi
 
 
-sinfo "Generating test Secure Boot test certificates"
+sinfo "Generating Secure Boot test certificates"
 ${helpdir}/gen-sb-cert test
 
 

src/root/setup-copy

@@ -337,6 +337,8 @@ ln -s  ../local/libexec/java.wrapper /usr/bin/java
 sinfo "Setting cables-related and /root permissions"
 chmod 710 /home/anon{,/persist{,/security{,/cable},/mail,/cables}}
 chmod -R go= /root
+# (#431920)
+chmod go=u-w /var/log/wimax
 
 
 sinfo "Removing invalid symlinks, dirs and files"