Wed Mar 21 00:01:20 UTC 2012

11 files changed, 56 insertions, 52 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 28cb4339d..2fd86a35a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=24
+_sublevel=25
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.24 # nearly always the same as pkgver
 pkgrel=1
@@ -18,8 +18,8 @@ url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -31,17 +31,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'i915-fix-ghost-tv-output.patch'
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2")
-md5sums=('44e7bc20c235a193f9b6123a8d5e9509'
-         '6e746bffa81b08f165d3a5328eac0454'
-         '054af37f538b74a8090fc3e783a2edfa'
-         'e195768d5b8cbe788dbe615561d4314f'
+md5sums=('5f64180fe7df4e574dac5911b78f5067'
+         'f7b2ffc8ddec5819f8bac7d6c2afc629'
+         '8870dc3eff3ada9abf727892a9503350'
+         '33e7aa6dd13f780b8b65653dfa81c57e'
          'd2c0701480bce49fd4b40dc46b9863f1'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         '74d2b710d6c97aee441d7566f8f68815'
+         'f36222e7ce20c8e4dc27376f9be60f6c'
          '0b11552c826f65b666dfb53f2c8c12bb')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -53,7 +53,7 @@ build() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
   fi
 
   # Add freedo as boot logo
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 820ee9b2b..f39e9c870 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -511,17 +511,17 @@ CONFIG_APM_DO_ENABLE=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -5455,7 +5455,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index a8c0e10c0..6ec74a8a4 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -494,17 +494,17 @@ CONFIG_SFI=y
 # CPU Frequency scaling
 #
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
+CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
@@ -5197,7 +5197,7 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
+CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
diff --git a/libre/linux-libre-lts/ext4-options.patch b/libre/linux-libre-lts/ext4-options.patch
index 4aa23fdef..ef1b2417d 100644
--- a/libre/linux-libre-lts/ext4-options.patch
+++ b/libre/linux-libre-lts/ext4-options.patch
@@ -12,28 +12,28 @@ index 502c61f..30de9cd 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
 @@ -1333,6 +1333,7 @@ enum {
-	Opt_inode_readahead_blks, Opt_journal_ioprio,
-	Opt_dioread_nolock, Opt_dioread_lock,
-	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
+ 	Opt_inode_readahead_blks, Opt_journal_ioprio,
+ 	Opt_dioread_nolock, Opt_dioread_lock,
+ 	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
 +	Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum,
  };
-
+ 
  static const match_table_t tokens = {
 @@ -1408,6 +1409,10 @@ static const match_table_t tokens = {
-	{Opt_init_itable, "init_itable=%u"},
-	{Opt_init_itable, "init_itable"},
-	{Opt_noinit_itable, "noinit_itable"},
+ 	{Opt_init_itable, "init_itable=%u"},
+ 	{Opt_init_itable, "init_itable"},
+ 	{Opt_noinit_itable, "noinit_itable"},
 +	{Opt_nocheck, "nocheck"},
 +	{Opt_reservation, "reservation"},
 +	{Opt_noreservation, "noreservation"},
 +	{Opt_journal_inum, "journal=%u"},
-	{Opt_err, NULL},
+ 	{Opt_err, NULL},
  };
-
+ 
 @@ -1904,6 +1909,16 @@ set_qf_format:
-		case Opt_noinit_itable:
-			clear_opt(sb, INIT_INODE_TABLE);
-			break;
+ 		case Opt_noinit_itable:
+ 			clear_opt(sb, INIT_INODE_TABLE);
+ 			break;
 +#ifdef CONFIG_EXT4_USE_FOR_EXT23
 +		case Opt_nocheck:
 +		case Opt_reservation:
@@ -44,6 +44,6 @@ index 502c61f..30de9cd 100644
 +			       "by ext4 module", p);
 +			break;
 +#endif
-		default:
-			ext4_msg(sb, KERN_ERR,
-			       "Unrecognized mount option \"%s\" "
\ No newline at end of file
+ 		default:
+ 			ext4_msg(sb, KERN_ERR,
+ 			       "Unrecognized mount option \"%s\" "
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 642e9d52d..8468b0e12 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.24-1-LIBRE-LTS
+KERNEL_VERSION=3.0.25-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 73e443d6a..9384e9c1e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,6 +1,7 @@
 # $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 # Changes:
 # * Adapt to linux-libre
 # * virtualbox-{archlinux,parabola}-*
@@ -11,7 +12,7 @@
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.10
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -36,7 +37,7 @@ md5sums=('263e495ef3a7ab75943af28d446ee702'
          '3ac185709bfe688bb753c46e170d0546'
          'c159d683ba1947290fc2ad2c64194150')
 
-_extramodules=extramodules-3.2-LIBRE
+_extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
diff --git a/libre/virtualbox-modules/.directory b/libre/virtualbox-modules/.directory
new file mode 100644
index 000000000..7486c78f1
--- /dev/null
+++ b/libre/virtualbox-modules/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,20,12,36,27
diff --git a/libre/virtualbox-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk
index cd4e65e03..af79f90cd 100644
--- a/libre/virtualbox-modules/LocalConfig.kmk
+++ b/libre/virtualbox-modules/LocalConfig.kmk
@@ -14,6 +14,6 @@ VBOX_WITH_REGISTRATION_REQUEST =
 VBOX_WITH_UPDATE_REQUEST =
 VBOX_WITH_VNC := 1
 VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index 388eb8264..cd27b74a8 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $
+# $Id$
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
-#Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
+#Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
+#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
 pkgver=4.1.10
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -17,10 +18,10 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
          LocalConfig.kmk 60-vboxguest.rules)
 md5sums=('263e495ef3a7ab75943af28d446ee702'
-         '7e921d2ae193ec04b255daa0e338d3a4'
+         '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
-_extramodules=extramodules-3.2-LIBRE
+_extramodules=extramodules-3.3-LIBRE
 _kernver="$(cat /lib/modules/${_extramodules}/version || true)"
 
 export KERN_DIR=/lib/modules/${_kernver}/build
@@ -55,7 +56,7 @@ package_virtualbox-parabola-modules(){
     pkgdesc="Additions only for Parabola guests (kernel modules)"
     license=('GPL')
     install=virtualbox-parabola-modules.install
-    depends=('linux-libre>=3.2' 'linux-libre<3.3')
+    depends=('linux-libre>=3.3' 'linux-libre<3.4')
     replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
     provides=("virtualbox-archlinux-modules=$pkgver")
@@ -81,7 +82,7 @@ package_virtualbox-modules(){
     pkgdesc="Kernel modules for VirtualBox"
     license=('GPL')
     install=virtualbox-modules.install
-    depends=('linux-libre>=3.2' 'linux-libre<3.3')
+    depends=('linux-libre>=3.3' 'linux-libre<3.4')
 
     source "$srcdir/VirtualBox-${pkgver}/env.sh"
 
diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index bc2adbe64..72be196c2 100644
--- a/libre/virtualbox-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index b542db1ca..0cc4b44fd 100644
--- a/libre/virtualbox-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.2-LIBRE'
+    EXTRAMODULES='extramodules-3.3-LIBRE'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }