liberte.patch

diff -bur liberte/enter new_liberte/enter
--- liberte/enter	2014-05-07 21:10:46.848691021 +0400
+++ new_liberte/enter	2014-05-03 20:12:18.156302000 +0400
@@ -114,7 +114,7 @@
 [ -L ${LIVECD}/dev/fd ] || ln -sfT /proc/self/fd ${LIVECD}/dev/fd
 loop=`losetup -f`
 
-for mp in /proc /dev/null /dev/random /dev/urandom /dev/tty /dev/ptmx /dev/pts ${loop} ${tty}; do
+for mp in /proc /dev/null /dev/shm /dev/random /dev/urandom /dev/tty /dev/ptmx /dev/pts ${loop} ${tty}; do
     if [ ${mp#/dev/loop} = ${mp} ]; then
         lmp=${LIVECD}${mp}
     else
@@ -127,18 +127,18 @@
             touch ${lmp}
         fi
     fi
-    mount -B ${mp} ${lmp}
+    mount -R ${mp} ${lmp}
     mounted="${lmp} ${mounted}"
 done
-mount -rB -o remount ${LIVECD}/proc
+mount -rR -o remount ${LIVECD}/proc
 
 if   [ ${PHASE} = src ]; then
     mkdir -p -m 755 ${LIVECD}/../copy ${LIVECD}/../dist
-    mount -B ${LIVECD}/../copy ${LIVECD}/mnt/live
-    mount -B ${LIVECD}/../dist ${LIVECD}/mnt/boot
+    mount -R ${LIVECD}/../copy ${LIVECD}/mnt/live
+    mount -R ${LIVECD}/../dist ${LIVECD}/mnt/boot
 elif [ ${PHASE} = copy  -a  -d ${LIVECD}/usr/portage ]; then
-    mount -B ${LIVECD}/../src/usr/portage ${LIVECD}/usr/portage
-    mount -rB -o remount ${LIVECD}/usr/portage
+    mount -R ${LIVECD}/../src/usr/portage ${LIVECD}/usr/portage
+    mount -rR -o remount ${LIVECD}/usr/portage
 fi
 
 
Только в liberte/: .gitattributes
diff -bur liberte/mkroot new_liberte/mkroot
--- liberte/mkroot	2014-05-07 21:10:46.848691021 +0400
+++ new_liberte/mkroot	2014-05-03 15:49:31.956316000 +0400
@@ -125,11 +125,11 @@
 
 
 sinfo "Extracting stage3 to ${LIVECD}/src"
-tar -xpSjf ${LIVECD}/mirror/stage3/${stage3file} -C ${LIVECD}/src --exclude './dev/*'
+tar -xvpSjf ${LIVECD}/mirror/stage3/${stage3file} -C ${LIVECD}/src --exclude './dev/*'
 
 
 sinfo "Extracting portage to ${LIVECD}/src/usr"
-tar -xpSjf ${LIVECD}/mirror/portage/portage-latest.tar.bz2 -C ${LIVECD}/src/usr
+tar -xvpSjf ${LIVECD}/mirror/portage/portage-latest.tar.bz2 -C ${LIVECD}/src/usr
 
 
 sinfo "Done."
diff -bur liberte/src/etc/portage/make.conf new_liberte/src/etc/portage/make.conf
--- liberte/src/etc/portage/make.conf	2014-05-07 21:10:47.298691031 +0400
+++ new_liberte/src/etc/portage/make.conf	2014-05-04 06:14:33.446268000 +0400
@@ -86,7 +86,10 @@
 # Broadcom                    = should probably be "as-is" (#446658)
 # PUEL                        = personal license (build-time virtualbox-bin)
 ACCEPT_LICENSE="-* @FREE as-is freedist unRAR lha @BINARY-REDISTRIBUTABLE Atmel
-                   myspell-ru_RU-ALexanderLebedev bluez-firmware Broadcom PUEL"
+                   myspell-ru_RU-ALexanderLebedev bluez-firmware Broadcom PUEL
+                   CC-BY-NC-SA-3.0 CC-BY-ND-3.0 all-rights-reserved"
 
 # Backward compatibility wrt. /etc/portage/repos.conf (#474574, #478318)
 PORTDIR="/usr/portage"
+PYTHON_TARGETS="python2_7 python3_3"
+PYTHON_SINGLE_TARGET="python2_7"
\ В конце файла нет новой строки
diff -bur liberte/src/etc/portage/package.accept_keywords new_liberte/src/etc/portage/package.accept_keywords
--- liberte/src/etc/portage/package.accept_keywords	2014-05-07 21:10:47.298691031 +0400
+++ new_liberte/src/etc/portage/package.accept_keywords	2014-05-06 16:04:00.401771000 +0400
@@ -1,9 +1,13 @@
 # System
 =app-crypt/gnupg-pkcs11-scd-0.7.3*
 =sys-power/cpupower-3.11*
+dev-libs/opencryptoki
+app-crypt/tpm-tools
 
 # Network
 =net-wireless/reaver-1.4*
+=net-proxy/obfsproxy-0.2.9*
+=dev-python/pyptlib-0.0.6*
 
 # GTK+ 3
 =x11-themes/light-themes-0.1.93*
@@ -15,6 +19,7 @@
 
 # Removes X dependencies
 =dev-libs/m17n-lib-1.6.3*
+=lxde-base/lxpolkit-0.1.0-r2*
 
 # Library-only Javascript for PolKit (#437520)
 =sys-auth/polkit-0.112*
Только в new_liberte/src/etc/portage/package.mask: kernel
Только в new_liberte/src/etc/portage: package.unmask
diff -bur liberte/src/etc/portage/package.use/all new_liberte/src/etc/portage/package.use/all
--- liberte/src/etc/portage/package.use/all	2014-05-07 21:10:47.298691031 +0400
+++ new_liberte/src/etc/portage/package.use/all	2014-05-06 11:45:53.801514000 +0400
@@ -22,18 +22,19 @@
 dev-db/sqlite                   -readline
 app-i18n/uim                    gtk3
 x11-themes/light-themes         gtk3
+x11-libs/cairo                  opengl
 
 # Drivers
 # [xf86-video-vmware requires mesa[xa]]
 # [xf86-video-virtualbox[dri] conflicts w/ mprotect]
-media-libs/mesa                 xa -egl -llvm
+media-libs/mesa                 xa egl gbm -llvm
 x11-drivers/xf86-video-virtualbox -dri
 app-emulation/open-vm-tools     -X
 x11-base/xorg-drivers           -video_cards_nv
 
 # Networking, including SSL/TLS
 net-libs/libetpan               gnutls
-net-libs/libmicrohttpd          -ssl
+net-libs/libmicrohttpd          ssl
 net-misc/networkmanager         gnutls -nss
 net-im/pidgin                   gnutls sasl
 net-analyzer/netcat             -crypt
@@ -43,6 +44,9 @@
 net-libs/glib-networking        -gnome
 net-irc/hexchat                 -libproxy
 
+#fix obfsproxy
+dev-python/twisted-core         crypt
+
 # Multimedia
 # [ffmpeg/libav: encode-only flags: mp3 aac aacplus faac theora vorbis x264 xvid]
 media-video/totem               -youtube
@@ -55,6 +59,8 @@
 www-client/firefox              -alsa gstreamer  system-jpeg system-cairo system-sqlite system-icu  -wifi
 net-im/pidgin                   -gstreamer
 media-libs/libass               -harfbuzz
+media-libs/harfbuzz             icu
+media-libs/libvpx               sse sse2 -sse3
 
 # Unnecessary functionality
 sys-libs/ncurses                minimal
@@ -132,3 +138,5 @@
 sys-libs/e2fsprogs-libs         static-libs
 dev-libs/popt                   static-libs
 dev-libs/libgpg-error           static-libs
+
+app-crypt/tpm-tools             nls
diff -bur liberte/src/etc/portage/sets/apps new_liberte/src/etc/portage/sets/apps
--- liberte/src/etc/portage/sets/apps	2014-05-07 21:10:47.298691031 +0400
+++ new_liberte/src/etc/portage/sets/apps	2014-05-06 16:04:23.481771000 +0400
@@ -39,7 +39,7 @@
 app-text/evince
 app-office/abiword
 app-office/gnumeric
-www-client/firefox
+www-client/firefox-bin
 mail-client/claws-mail
 app-crypt/gpa
 sci-calculators/qalculate-gtk
diff -bur liberte/src/etc/portage/sets/basic new_liberte/src/etc/portage/sets/basic
--- liberte/src/etc/portage/sets/basic	2014-05-07 21:10:47.298691031 +0400
+++ new_liberte/src/etc/portage/sets/basic	2014-05-06 16:03:57.701771000 +0400
@@ -46,6 +46,8 @@
 dev-libs/engine_pkcs11
 app-crypt/gnupg-pkcs11-scd
 app-crypt/ccid
+app-crypt/trousers
+dev-libs/opencryptoki
 app-crypt/tpm-tools
 sys-apps/haveged
 
@@ -70,7 +72,6 @@
 net-misc/proxychains
 net-misc/whois
 net-proxy/torsocks
-net-proxy/obfsproxy
 net-proxy/privoxy
 net-mail/cables
 
diff -bur liberte/src/root/config/kversion new_liberte/src/root/config/kversion
--- liberte/src/root/config/kversion	2014-05-07 21:10:47.318691031 +0400
+++ new_liberte/src/root/config/kversion	2014-05-03 15:36:21.666317000 +0400
@@ -1 +1 @@
-3.11.2
+3.11.7-r1
Только в liberte/src/root/config: linux-3.11.2-hardened.config
Только в liberte/src/root/config: linux-3.11.2-hardened-kexec-64.config
Только в liberte/src/root/config: linux-3.11.2-hardened-kexec.config
Только в new_liberte/src/root/config: linux-3.11.7-hardened.config
Только в new_liberte/src/root/config: linux-3.11.7-hardened-kexec-64.config
Только в new_liberte/src/root/config: linux-3.11.7-hardened-kexec.config
diff -bur liberte/src/root/patches/portage/virtualbox-guest-additions.patch new_liberte/src/root/patches/portage/virtualbox-guest-additions.patch
--- liberte/src/root/patches/portage/virtualbox-guest-additions.patch	2014-05-07 21:10:47.318691031 +0400
+++ new_liberte/src/root/patches/portage/virtualbox-guest-additions.patch	2014-05-03 15:31:28.066317000 +0400
@@ -1,5 +1,5 @@
---- /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild	2013-06-24 10:58:49.000000000 +0000
-+++ /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.18.ebuild	2013-08-11 03:33:14.113055078 +0000
+--- /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild	2013-06-24 10:58:49.000000000 +0000
++++ /usr/portage/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.22.ebuild	2013-08-11 03:33:14.113055078 +0000
 @@ -49,7 +49,7 @@
  
  pkg_setup() {
diff -bur liberte/src/root/patches/portage/xf86-video-virtualbox.patch new_liberte/src/root/patches/portage/xf86-video-virtualbox.patch
--- liberte/src/root/patches/portage/xf86-video-virtualbox.patch	2014-05-07 21:10:47.318691031 +0400
+++ new_liberte/src/root/patches/portage/xf86-video-virtualbox.patch	2014-05-03 15:31:49.596317000 +0400
@@ -1,5 +1,5 @@
---- /usr/portage/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.18.ebuild	2013-06-24 10:57:30.000000000 +0000
-+++ /usr/portage/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.18.ebuild	2013-08-11 03:34:50.091510612 +0000
+--- /usr/portage/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild	2013-06-24 10:57:30.000000000 +0000
++++ /usr/portage/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.22.ebuild	2013-08-11 03:34:50.091510612 +0000
 @@ -52,7 +52,7 @@
  
  pkg_setup() {
diff -bur liberte/src/root/setup new_liberte/src/root/setup
--- liberte/src/root/setup	2014-05-07 21:10:47.318691031 +0400
+++ new_liberte/src/root/setup	2014-05-07 21:06:13.588685213 +0400
@@ -145,7 +145,7 @@
         # unmerge only if the "new" gcc has a different version
         if [ -n "${newgccprof}" ]; then
             gcc-config "${newgccprof}"
-            emerge -qC --deselect=n =sys-devel/`basename ${oldgcc}`
+            emerge -C --deselect=n =sys-devel/`basename ${oldgcc}`
         fi
     fi
     env-update
@@ -154,15 +154,15 @@
     # necessary after gcc upgrades
     emerge -q1 sys-devel/libtool
 
-    emerge -q1 sys-libs/glibc
+    #emerge -q1 sys-libs/glibc
     rm -f ${protected}
 
 
     # Rely on timezone-data ebuild updating /etc/localtime
     sinfo "Compiling system"
     touch /tmp/system-build
-    USE="-X -consolekit" emerge -qeupv @system
-    USE="-X -consolekit" emerge -qeu   @system
+    USE="-X -consolekit" emerge -eupv @system
+    USE="-X -consolekit" emerge -eu   @system
     rm -f ${protected}
     rebuild_locales
 
@@ -173,7 +173,7 @@
     sinfo "Removing non-system packages"
     mv /etc/portage/sets/all{,.off}
     echo sys-kernel/hardened-sources > /etc/portage/sets/all
-    emerge -qc --deselect=n
+    emerge -c --deselect=n
     mv /etc/portage/sets/all{.off,}
 
 
@@ -199,14 +199,14 @@
 
     # Shouldn't contain any rebuilds
     sinfo "Listing updates"
-    emerge -qupvDN --with-bdeps y @world
+    emerge -upvDN --with-bdeps y @world
 
 else
     sinfo "Skipping full rebuild (use \"fresh\")"
     sinfo "Listing updates"
 
     updlist=`mktemp`
-    emerge -qupvDN --with-bdeps y --color y @world | tee ${updlist}
+    emerge -upvDN --with-bdeps y --color y @world | tee ${updlist}
 
     if [ -s ${updlist} ]; then
         echo -n "Press Enter to continue..."
@@ -218,7 +218,10 @@
 
 
 sinfo "Compiling world"
-emerge -quDN --with-bdeps y @world
+emerge -uDN --with-bdeps y @world
+emerge -q1 dev-python/pip
+emerge -q1 dev-lang/python-exec
+pip install --upgrade obfsproxy
 
 
 # Some news are delayed until first emerge
@@ -227,7 +230,7 @@
 
 
 sinfo "Removing unnecessary packages"
-emerge -qc --deselect=n
+emerge -c --deselect=n
 
 
 sinfo "Performing package move updates"
@@ -240,12 +243,12 @@
 perl-cleaner --ph-clean --modules -- -q
 
 
-# sinfo "Updating Python modules"
-# python-updater -dmanual -- -q
+sinfo "Updating Python modules"
+python-updater -dmanual -- -q
 
 
 sinfo "Rebuilding packages that use old libraries"
-emerge -q @preserved-rebuild
+emerge @preserved-rebuild
 
 
 sinfo "Checking linking consistency"
@@ -435,6 +438,7 @@
 
 # "vmware" disabled (#474636)
 usermod -G wheel,plugdev,lp,games,vboxguest anon
+useradd cable
 usermod -G legion                           cable
 
 useradd -c slay    -d /dev/null -s /sbin/nologin -r slay || [ $? = 9 ]