Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/xorg-server/PKGBUILD
	libre/cdrkit-libre/PKGBUILD

23 files changed, 136 insertions, 250 deletions

diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
deleted file mode 100644
index d111214d3..000000000
--- a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix <ted@tedfelix.com>
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().
----
- input_layer.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
---- a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-    evtest.c, acpi_genl, or kacpimon to find new events to add to this
-    table. */
- 
-+/*
-+ * The two numbers (e.g. "00000080 00000000") in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
- 	/*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
- 	{{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"},
- 	{{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"},
- 	{{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"},
- 
- 
- 	/*** VIDEO ***/
--- 
-1.8.1.1
-
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 355f848fb..b7763dec5 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.17
-pkgrel=4
+pkgver=2.0.18
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,22 +15,19 @@ depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"
         'acpid.socket'
         'acpid.service'
         'anything'
-        'handler.sh'
-        '0001-Fix-format-of-video-tabletmode-event-string.patch')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+        'handler.sh')
+md5sums=('7c4ff315ae960c54eea303c71c49f152'
          'ee6cb99e50e580c50331a73045412ae9'
          '10290f69491206cd104654e5b900b661'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '47f44ff5f02685dce8bcdab8568f0c38'
-         'a813e00553104f2129f64cae95a7983f')
+         '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 93dfedb16..d7f96b934 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82785 2013-01-24 12:55:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 84727 2013-02-23 17:46:16Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.16.1
-pkgrel=2
+pkgver=6.17
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
@@ -14,7 +14,7 @@ options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.systemd"
         "$pkgname.service")
-md5sums=('9fd70c825f052db7dc9d5ba0562b7083'
+md5sums=('9d439e279e02076f29fe7c9c059a5cae'
          '7daa4f163eef9db216cb4c428e0342a3'
          'b032241b96b5802975fe4321cc511c6b')
 
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 15f2a549b..c901f766e 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $
+# $Id: PKGBUILD 84730 2013-02-23 20:47:41Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 		logrotate)
 sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
             '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85')
+            'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9')
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/nginx/logrotate b/community/nginx/logrotate
index 8773578b5..1a5bd6441 100644
--- a/community/nginx/logrotate
+++ b/community/nginx/logrotate
@@ -1,6 +1,6 @@
 /var/log/nginx/*log {
 	missingok
-	create 750 root log
+	create 640 root log
 	sharedscripts
 	compress
 	postrotate
diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install
index 00a7b9cac..242766abd 100644
--- a/community/nginx/nginx.install
+++ b/community/nginx/nginx.install
@@ -1,12 +1,12 @@
 post_install() {
     if [[ -e var/log/nginx ]]; then
-        chmod 750 var/log/nginx
+        chmod 640 var/log/nginx
         chown root:log var/log/nginx
     fi
 }
 
 post_upgrade() {
-    [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install
+    [[ $(vercmp $2 1.2.7-2) -le 0 ]] && post_install
     if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
         echo " >>> Since 1.2.1-2 several changes has been made in package:"
         echo "      - *.conf files have been moved to /etc/nginx"
diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
deleted file mode 100644
index dda3c48c4..000000000
--- a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Thu, 21 Jun 2012 09:55:38 +0200
-Subject: [PATCH] isisd: fix typo in topology generator (BZ#731)
-
-There was a "lsp->" missing before "level" in line 2416.
-(introduced by git commit e38e0df)
-
-Reported-by: Seblu <seblu@seblu.net>
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
----
- isisd/isis_lsp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
-index 5c1e993..082e9dc 100644
---- a/isisd/isis_lsp.c
-+++ b/isisd/isis_lsp.c
-@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread)
-   isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname,
- 		     IS_LEVEL_1);
- 
--  lsp->lsp_header->lsp_bits = lsp_bits_generate (level,
-+  lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level,
-                                                  lsp->area->overload_bit);
-   rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1);
-   lsp->lsp_header->rem_lifetime = htons (rem_lifetime);
--- 
-1.7.11
-
diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch
deleted file mode 100644
index aae2d7b18..000000000
--- a/community/quagga/0002-CVE-2012-1820.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-@@ -, +, @@ 
-    bgpd: CVE-2012-1820, DoS in bgp_capability_orf()
-    
-    An ORF (code 3) capability TLV is defined to contain exactly one
-    AFI/SAFI block. Function bgp_capability_orf(), which parses ORF
-    capability TLV, uses do-while cycle to call its helper function
-    bgp_capability_orf_entry(), which actually processes the AFI/SAFI data
-    block. The call is made at least once and repeated as long as the input
-    buffer has enough data for the next call.
-    
-    The helper function, bgp_capability_orf_entry(), uses "Number of ORFs"
-    field of the provided AFI/SAFI block to verify, if it fits the input
-    buffer. However, the check is made based on the total length of the ORF
-    TLV regardless of the data already consumed by the previous helper
-    function call(s). This way, the check condition is only valid for the
-    first AFI/SAFI block inside an ORF capability TLV.
-    
-    For the subsequent calls of the helper function, if any are made, the
-    check condition may erroneously tell, that the current "Number of ORFs"
-    field fits the buffer boundary, where in fact it does not. This makes it
-    possible to trigger an assertion by feeding an OPEN message with a
-    specially-crafted malformed ORF capability TLV.
-    
-    This commit fixes the vulnerability by making the implementation follow
-    the spec.
---- a/bgpd/bgp_open.c	
-+++ a/bgpd/bgp_open.c	
-@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
-     }
-   
-   /* validate number field */
--  if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length)
-+  if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length)
-     {
-       zlog_info ("%s ORF Capability entry length error,"
-                  " Cap length %u, num %u",
-@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
- }
- 
- static int
--bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
--{
--  struct stream *s = BGP_INPUT (peer);
--  size_t end = stream_get_getp (s) + hdr->length;
--  
--  assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end);
--  
--  /* We must have at least one ORF entry, as the caller has already done
--   * minimum length validation for the capability code - for ORF there must
--   * at least one ORF entry (header and unknown number of pairs of bytes).
--   */
--  do
--    {
--      if (bgp_capability_orf_entry (peer, hdr) == -1)
--        return -1;
--    } 
--  while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end);
--  
--  return 0;
--}
--
--static int
- bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
- {
-   struct stream *s = BGP_INPUT (peer);
-@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability,
-             break;
-           case CAPABILITY_CODE_ORF:
-           case CAPABILITY_CODE_ORF_OLD:
--            if (bgp_capability_orf (peer, &caphdr))
-+            if (bgp_capability_orf_entry (peer, &caphdr))
-               return -1;
-             break;
-           case CAPABILITY_CODE_RESTART:
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 84f921a81..b976cc754 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83621 2013-02-04 00:43:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 84732 2013-02-23 20:56:41Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=quagga
-pkgver=0.99.21
-pkgrel=3
+pkgver=0.99.22
+pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
@@ -19,10 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service'
-        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch'
-        '0002-CVE-2012-1820.patch')
-md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
+        'zebra.service')
+md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
          '45d8bf56a426b0e7ebe429547be8a27a'
          'ab31ed8dafd7a92137f4f00ad0937b4f'
          '4c05d0105cd0db23a2583bd75a1bde4d'
@@ -30,9 +28,7 @@ md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
          'c5f8a729685cebf8fc5b1a1552d37b6d'
          'e721b334bb0b31983642b307033c63d0'
          'effeb26ff78ffcafe7808596ddc5d3fc'
-         'f0c0b99346b2c373a74158e45f04cf91'
-         'c80174f7bdd32cd84550d52451e8f495'
-         '44f39016d81f3b13b2744f7dcd93289d')
+         'f0c0b99346b2c373a74158e45f04cf91')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 12700fbfe..6937d0ca5 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p385
+pkgver=1.9.3_p392
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
@@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs' '!makeflags')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
         'gemrc')
-md5sums=('5ec9aff670f4912b0f6f0e11e855ef6c'
+md5sums=('a810d64e2255179d2f334eb61fb8519c'
          '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 81beb4f8e..adaad515b 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178020 2013-02-13 16:45:46Z andyrtr $
+# $Id: PKGBUILD 178462 2013-02-23 11:12:21Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.2
+pkgver=2.21.3
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2e6890ecacc715caa5459581b00b63152e08646ea1b76330bf79b996a139d850')
+sha256sums=('1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 48bed0ef9..fa2ea0add 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175947 2013-01-25 08:45:46Z andyrtr $
+# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.2
+pkgver=1.13.2.901
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -17,15 +17,18 @@ options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
+        xserver-1.6.0-less-acpi-brokenness.patch
+        bug59825.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
         loongson.patch
-        #git-fixes.patch
         use-pixman-glyph-cache.patch)
-sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
+sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
+            'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
+            '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
@@ -35,12 +38,6 @@ sha256sums=('3850adb89e9170ad85aea39d240279494c07779e50cd3cd60126028681209408'
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  # Apply upstream fixes from server-1.13 branch
-#  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  # Use pixman 0.28.0 glyph cache - backported from git master
-#  patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
-
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
@@ -50,6 +47,12 @@ build() {
   # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
   patch -Np1 -i "${srcdir}/loongson.patch"
 
+  # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
+  patch -Np1 -i "${srcdir}/bug59825.patch"
+
+  # From Fedora. Do not build acpid code, it is buggy and we do not need it
+  patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
+
   autoreconf -fi
 
   if [ "$CARCH" = "mips64el" ]; then
diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch
new file mode 100644
index 000000000..b405d136d
--- /dev/null
+++ b/extra/xorg-server/bug59825.patch
@@ -0,0 +1,12 @@
+diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c

+--- a/glx/glxdri.c	2013-01-24 22:14:35.216092949 +0100

++++ b/glx/glxdri.c	2013-01-24 22:13:48.499427991 +0100

+@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen)

+     size_t buffer_size;

+     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);

+ 

++    framebuffer.base = NULL;

++

+     if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||

+         !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) {

+         LogMessage(X_INFO,
\ No newline at end of file
diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
new file mode 100644
index 000000000..b42c2d7c8
--- /dev/null
+++ b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch
@@ -0,0 +1,25 @@
+From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 9 Nov 2011 11:52:06 +1000
+Subject: [PATCH 2/7] Don't build the ACPI code.
+
+No good can come of this.
+---
+ configure.ac |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a12783c..54f4464 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
+ 		  	linux_alpha=yes
+ 			;;
+ 		  i*86|amd64*|x86_64*|ia64*)
+-			linux_acpi="yes"
+ 			;;
+ 		  *)
+ 			;;
+-- 
+1.7.10.1
+
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index b0c6d36a2..41dea657a 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -1,42 +1,35 @@
+# $Id: PKGBUILD 157442 2012-04-28 11:27:45Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
+_pkgname=cdrkit
 pkgname=cdrkit-libre
 pkgver=1.1.11
-pkgrel=2.2
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
+pkgrel=2.3
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdrkit.org/"
 license=('GPL2')
-depends=('file' 'bzip2' 'perl')
+depends=('file' 'bzip2')
+optdepends=('perl: for dirsplit')
 makedepends=('cmake')
-provides=('cdrtools' "cdrkit=${pkgver}")
-conflicts=('cdrtools' 'cdrkit')
-replaces=('cdrtools' 'cdrkit')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+provides=("cdrkit=${pkgver}")
+conflicts=('cdrkit')
+replaces=('cdrkit')
+source=(http://cdrkit.org/releases/$_pkgname-$pkgver.tar.gz)
+md5sums=('efe08e2f3ca478486037b053acd512e9')
 
-mksource() {
-    if [ ! -d ${pkgname}-${pkgver} ]; then
-        wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \
-        bsdtar xzf -
-
-        mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver}
-    fi
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
-    rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+  # Remove nonfree apple_driver utility
+  rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
 
-    tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
-    rm -r ${pkgname}-${pkgver}/
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
   make PREFIX="$pkgdir/usr" install
 
   # Make symlinks for cdrtools compatibility
@@ -54,4 +47,3 @@ package() {
   ln -s genisoimage.1 mkhybrid.1
   ln -s icedax.1 cdda2wav.1
 }
-md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435')
diff --git a/community/cdrtools/PKGBUILD b/libre/cdrtools-libre/PKGBUILD
index 040b156bc..453979842 100644
--- a/community/cdrtools/PKGBUILD
+++ b/libre/cdrtools-libre/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 84509 2013-02-19 13:38:15Z stativ $
+# $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=cdrtools
+_pkgname=cdrtools
+pkgname=cdrtools-libre
 pkgver=3.01a12
 pkgrel=1
-pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
-arch=('i686' 'x86_64')
+pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning (without nonfree apple_driver utility)"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdrecord.berlios.de/private/cdrecord.html"
 license=('CDDL')
 depends=('acl')
-conflicts=('cdrkit')
-provides=('cdrkit')
+replaces=('cdrtools')
+conflicts=('cdrtools' 'cdrkit')
+provides=("cdrtools=${pkgver}" 'cdrkit')
 options=(!makeflags)
 backup=('etc/default/cdrecord' 'etc/default/rscsi')
 install=cdrtools.install
@@ -18,6 +20,14 @@ md5sums=('563d80a7102175bea3e41fbfc269b914')
 
 build() {
   cd "$srcdir"/cdrtools-${pkgver%%a*}
+
+  # Remove nonfree apple_driver utility
+  rm -rvf mkisofs/{apple_driver{.c,.8,.mk,_man.mk},README.hfs_boot,Rhfs_boot.mk}
+  sed -i -e '/apple_driver/d' mkisofs/Makefile
+  sed -i -e '/README.hfs_boot/d' pkgdefs/CSW/CSWcdrtools/prototype
+  sed -i -e '/README.hfs_boot/d' pkgdefs/OCSW/CSWcdrtools/prototype
+  sed -i -e '/README.hfs_boot/d' vms/vms_name_fix.sh
+
   sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
   sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
   
diff --git a/community/cdrtools/cdrtools.install b/libre/cdrtools-libre/cdrtools.install
index 3f49eb1bb..3f49eb1bb 100644
--- a/community/cdrtools/cdrtools.install
+++ b/libre/cdrtools-libre/cdrtools.install
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index aea37615e..7778b62a1 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172168 2012-11-30 14:31:06Z tomegun $
+# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,8 +6,8 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.12.11
-pkgrel=2
+pkgver=3.13.2
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
@@ -49,9 +49,6 @@ build() {
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
  
- # fix rc script path - FS#31921
- sed -i 's|\/etc\/init.d\/cupsys|\/etc\/rc.d\/cupsd|g' setup.py
- 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
@@ -92,7 +89,9 @@ package() {
  rm -rf "$pkgdir"/usr/share/hal
  # log dir should not be world writeable
  chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ # remove rc script
+ rm -rf "$pkgdir"/etc/init.d
 }
-md5sums=('6caadc4a9e49076c284b146e2dce2937'
-         '835d3b854d097f229a32291338fa2320'
+md5sums=('cd7edef6b2df2cdb468b145cd2127e1b'
+         'cc3fc6de33ccf8bfce0bc890e30bd4e1'
          'ef64578c6cb3ce252dbdcb0f1c2f4a47')
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index 756507986..d64060918 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -3,10 +3,10 @@
 _kernver=3.8
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
-_version=v3.8
-_pkgver=3.8-1-u
-pkgver=3.8.1
-pkgrel=1
+_version=v3.8-rc7
+_pkgver=3.8-rc7-1-u
+pkgver=3.8rc7.1
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -19,7 +19,7 @@ provides=('alx' 'alx-driver' 'dkms-alx')
 conflicts=('alx' 'alx-driver' 'dkms-alx')
 source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz)
 
-md5sums=('557e3099c642455ec272d9ddf46de484')
+md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
 
 
 build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 7aa2c127b..4120e933f 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.65
+_kernver=3.0.66
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=3
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 298bbd2fb..3717e9627 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178204 2013-02-18 00:59:48Z foutrelis $
+# $Id: PKGBUILD 178426 2013-02-21 22:37:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=65
+_sublevel=66
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.64 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.65 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '080f45e61f2b17015ac68279a801c17b'
+         'b27bb5195c9fdb7fa6f609307a7d208b'
          '99f9c408b64393aceb2482c9a3e329ee'
          'fba95bf1857ce6bf863e13a1ab73f584'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '62baade17c89e99f9aefc364a4304e78')
+         '7a7c3165d735a73cada5851d1b5d04ca')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 67065a1ef..2650a9f83 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.65-1-LIBRE-LTS
+KERNEL_VERSION=3.0.66-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/pcr/hexchat-libre/PKGBUILD b/pcr/hexchat-libre/PKGBUILD
index 26c353fb9..489fb0c91 100644
--- a/pcr/hexchat-libre/PKGBUILD
+++ b/pcr/hexchat-libre/PKGBUILD
@@ -4,8 +4,8 @@
 _pkgname=hexchat
 pkgname=hexchat-libre
 pkgver=2.9.4
-pkgrel=2
-pkgdesc='A GTK+ based IRC client without non-free browser reference'
+pkgrel=2.1
+pkgdesc='A GTK+ based IRC client without non-free browser reference (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.hexchat.org/'
 license=('GPL')
@@ -29,6 +29,7 @@ md5sums=('5609cac7200fc91be57196501aaf07fa'
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
+  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
   patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
   patch -p1 -i "${srcdir}/no-firefox.patch"
   mkdir m4