Upgraded to Unionfs-2.5.10 pre-release.

Added USB 3G modems drivers.
Restored I2P clock synchronization removal patches.

src/etc/init.d/xconfig

@@ -77,9 +77,6 @@ start() {
             if [ -e /root/xorg.conf.new ]; then
                 mv /root/xorg.conf.new ${xorgrc}
 
-                # Bug #3319525 workaround (doesn't always work)
-                touch /mnt/hidden/rwroot/etc/X11
-
                 # Turn off text cursor on vt3 (cf. xserverrc)
                 echo -n "\033[?25l" > /dev/tty3
             else

src/root/config/linux-2.6.39-hardened.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.39-hardened-r8 Kernel Configuration
-# Wed Aug 31 17:11:50 2011
+# Sun Sep 11 14:17:43 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2766,7 +2766,59 @@ CONFIG_USB_UAS=m
 # USB port drivers
 #
 # CONFIG_USB_USS720 is not set
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_EZUSB is not set
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+# CONFIG_USB_SERIAL_BELKIN is not set
+# CONFIG_USB_SERIAL_CH341 is not set
+# CONFIG_USB_SERIAL_WHITEHEAT is not set
+# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
+# CONFIG_USB_SERIAL_CP210X is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+# CONFIG_USB_SERIAL_EMPEG is not set
+# CONFIG_USB_SERIAL_FTDI_SIO is not set
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+# CONFIG_USB_SERIAL_VISOR is not set
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+# CONFIG_USB_SERIAL_EDGEPORT is not set
+# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+CONFIG_USB_SERIAL_GARMIN=m
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IUU is not set
+# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
+# CONFIG_USB_SERIAL_KEYSPAN is not set
+# CONFIG_USB_SERIAL_KLSI is not set
+# CONFIG_USB_SERIAL_KOBIL_SCT is not set
+# CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+CONFIG_USB_SERIAL_MOTOROLA=m
+CONFIG_USB_SERIAL_NAVMAN=m
+# CONFIG_USB_SERIAL_PL2303 is not set
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_QCAUX is not set
+# CONFIG_USB_SERIAL_QUALCOMM is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+# CONFIG_USB_SERIAL_SAFE is not set
+# CONFIG_USB_SERIAL_SAMBA is not set
+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+# CONFIG_USB_SERIAL_SYMBOL is not set
+# CONFIG_USB_SERIAL_TI is not set
+# CONFIG_USB_SERIAL_CYBERJACK is not set
+# CONFIG_USB_SERIAL_XIRCOM is not set
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+# CONFIG_USB_SERIAL_OMNINET is not set
+# CONFIG_USB_SERIAL_OPTICON is not set
+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
+# CONFIG_USB_SERIAL_ZIO is not set
+# CONFIG_USB_SERIAL_SSU100 is not set
+# CONFIG_USB_SERIAL_DEBUG is not set
 
 #
 # USB Miscellaneous drivers

src/root/patches/kernel-patches.sha256

@@ -1,4 +1,4 @@
-# URL http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.5.9.2_for_2.6.39.2.diff.gz
+# URL http://download.filesystems.org/unionfs/pre-release/unionfs-2.5.10_for_2.6.39.4.diff.gz
 # URL http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.6-3.0-rc2.patch
-8e9b8a844ba5976e531d69482956c102bc83d2d4312f9f390d34ec086a5e8428  /usr/local/portage/distfiles/unionfs-2.5.9.2_for_2.6.39.2.diff.gz
+db46f24cbf209d624635c05d7caa9e4e1f5c9376e52bd11a4d93aac5d4f6c665  /usr/local/portage/distfiles/unionfs-2.5.10_for_2.6.39.4.diff.gz
 4dfeb082f912732c9fed05f0b66b547813271e83a495aa0c9bc559778a90f5e4  /usr/local/portage/distfiles/fbcondecor-0.9.6-3.0-rc2.patch

src/root/setup

@@ -104,8 +104,8 @@ if [ "$1" = fresh  -o  ! -e /usr/src/linux-${kversion}/incremental ]; then
 
 
     sinfo "Applying kernel patches"
-    spatch /usr/local/portage/distfiles/fbcondecor-0.9.6-3.0-rc2.patch       -d /usr/src/linux -p1
-    spatch /usr/local/portage/distfiles/unionfs-2.5.9.2_for_2.6.39.2.diff.gz -d /usr/src/linux -p1
+    spatch /usr/local/portage/distfiles/fbcondecor-0.9.6-3.0-rc2.patch      -d /usr/src/linux -p1
+    spatch /usr/local/portage/distfiles/unionfs-2.5.10_for_2.6.39.4.diff.gz -d /usr/src/linux -p1
 
 
     # Filter locales before remerging libc

src/usr/local/portage/net-p2p/i2p/Manifest

@@ -1,4 +1,4 @@
 AUX i2p 489 RMD160 9d0f7eadd7d94d6cc0a460e3fac5cb3a16452794 SHA1 1060635e80faaafa0f7f6a6d6a2c584986cfc653 SHA256 49ffe6dcabbd724b1dcb8ef3434ff49b17795e21f9360387d90e6ad68ff7ee4e
 DIST i2psource_0.8.8.tar.bz2 19407244 RMD160 4eda44d98c860c93f34a45c891e6e138df338589 SHA1 b63660f3d8dbca679958c6bd1735a356fc2a74bd SHA256 522adf14aeac28281ec469f2f45c9d5ead73dd510784d5ad148aa505784a4394
 DIST jetty-5.1.15.tgz 11063548 RMD160 600062500383b985b0bfbb30d286aba3f6a6c1e4 SHA1 3a7a3de50f86f0cdb23c33aec632ea7f44132c5e SHA256 c866bfe7715941e343e66bd5d6696a743b9c0811ef9763848eb673070f4a53d6
-EBUILD i2p-0.8.8.ebuild 2989 RMD160 8f3a0c70a8ff2419c8f30268e07f0681ed53d43e SHA1 60bd528dc7f73da0f738790f802f68a46e67fa65 SHA256 b76f452eeb369e795a0419930d3873f6f1acfd493f5cbdf8bc51a5445286c83e
+EBUILD i2p-0.8.8.ebuild 2978 RMD160 4efbe2c072d694acecceb6bcff325dcad90fe216 SHA1 2794d0c06566305a1615a9365a0b2fc20241219d SHA256 ed373ac176e72e4421f603830e17b42e36a61f4246fc9a7acb6b2c3ac7b08d2b

src/usr/local/portage/net-p2p/i2p/i2p-0.8.8.ebuild

@@ -39,10 +39,10 @@ src_unpack() {
 src_compile() {
 	# Make I2P router ignore internal clock offset due to internal / external clock jumps conflict
 	# Fudge factor of 90 minutes corresponds to Tor's approximate time possible error
-	# sed -i 's/\<return _offset;/return 0;/'                    core/java/src/net/i2p/util/Clock.java
-    # sed -i 's/\<return _alreadyChanged;/return true;/'         core/java/src/net/i2p/util/Clock.java
-	# sed -i 's/\<return offset + systemNow;/return systemNow;/' router/java/src/net/i2p/router/RouterClock.java
-	# sed -i 's/\( CLOCK_FUDGE_FACTOR =\) 1\*\(.*\);/\1 90*\2;/' router/java/src/net/i2p/router/Router.java
+	sed -i 's/\<return _offset;/return 0;/'                    core/java/src/net/i2p/util/Clock.java
+	sed -i 's/\<return _alreadyChanged;/return true;/'         core/java/src/net/i2p/util/Clock.java
+	sed -i 's/\<return offset + systemNow;/return systemNow;/' router/java/src/net/i2p/router/RouterClock.java
+	sed -i 's/\( CLOCK_FUDGE_FACTOR =\) 1\*\(.*\);/\1 90*\2;/' router/java/src/net/i2p/router/Router.java
 
 	eant pkg || die
 }