Sat Apr 6 00:05:46 PDT 2013

19 files changed, 205 insertions, 409 deletions

diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
new file mode 100644
index 000000000..833069ff2
--- /dev/null
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=bumblebee
+pkgname=bumblebee-libre
+pkgver=3.1
+pkgrel=5
+pkgdesc="NVIDIA Optimus support for GNU/Linux through VirtualGL, without nonfree nvidia driver support"
+arch=('i686' 'x86_64')
+depends=('virtualgl' 'libbsd' 'glib2' 'mesa-libgl')
+optdepends=('xf86-video-nouveau: nouveau driver'
+            'nouveau-dri: 3D acceleration features of nouveau'
+            'bbswitch: switch on/off discrete card'
+            'primus: faster back-end for optirun')
+if [ "$CARCH" = "x86_64" ]; then
+     optdepends[${#optdepends[@]}]='lib32-virtualgl: run 32bit applications with optirun'
+     optdepends[${#optdepends[@]}]='lib32-primus: faster back-end for optirun'
+fi
+replaces=('bumblebee')
+conflicts=('bumblebee' 'nvidia-libgl')
+provides=("bumblebee=$pkgver"'nvidia-libgl')
+url="http://www.bumblebee-project.org"
+license=("GPL3")
+install='bumblebee.install'
+backup=('etc/bumblebee/bumblebee.conf' 
+        'etc/bumblebee/xorg.conf.nouveau')
+source=("http://www.bumblebee-project.org/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('de515ef51b1e0714c2f1b2a95f83e77e')
+
+build() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    ./configure \
+        CONF_DRIVER=nouveau \
+        --prefix=/usr \
+        --sysconfdir=/etc
+
+    make
+}
+
+package() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+
+    make install DESTDIR="$pkgdir"
+
+    # Install systemd unit
+    install -D -m644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service"    
+
+    # Make bash_completion work
+    mv -v "${pkgdir}/etc/bash_completion.d/bumblebee" "${pkgdir}/etc/bash_completion.d/optirun"
+}
diff --git a/libre/bumblebee-libre/bumblebee.install b/libre/bumblebee-libre/bumblebee.install
new file mode 100644
index 000000000..57aed6cc5
--- /dev/null
+++ b/libre/bumblebee-libre/bumblebee.install
@@ -0,0 +1,16 @@
+_notice() {
+    echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee"
+}
+
+post_upgrade() {
+    getent group "bumblebee" &>/dev/null || groupadd -r bumblebee
+}
+
+post_remove() {
+    getent group "bumblebee" &>/dev/null && groupdel bumblebee 1>/dev/null
+}
+
+post_install() {
+    post_upgrade
+    _notice
+}
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 7604ea11a..9279a463f 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -7,7 +7,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.25
+pkgver=0.9.26
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -28,7 +28,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('5a6d9a94cde6233a233ab1be41d3459d'
+md5sums=('14df8fbe5e0fa5e8cc14b480603920e2'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 7d812a0d6..70118c9e2 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180418 2013-03-21 18:28:18Z andyrtr $
+# $Id: PKGBUILD 182034 2013-04-05 19:01:42Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.31
+pkgver=1.0.33
 pkgrel=1
-pkgdesc="OpenPrinting CUPS Filters (without foomatic-db-nonfree recommendation)"
+pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
@@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf
 options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz
         cups-browsed.service)
-md5sums=('5cc999de2ca310e042adb8cb658b9445'
+md5sums=('e35e497cbdb61ee29d9e7ffa58317c23'
          '4c9f97eae201798000483c4e7109e690')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 09e552a00..c133cedd5 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179154 2013-03-04 11:09:37Z andrea $
+# $Id: PKGBUILD 181442 2013-04-04 03:57:32Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,18 +6,18 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.10.1
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
+makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('1becdcaf0e41cb7da6c7f66562a0a2aad9fafb5a'
+sha1sums=('7f505292e95b35205cec3baa67e9e9b24f79b9b9'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
-pkgdesc='KDE File Manager & Web Browser (without Google and nonfree software recommendation)'
+pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
 optdepends=('kwebkitpart: to enable webkit engine')
 install='kdebase-konqueror.install'
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 96f7af2c2..a0d4c8603 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,9 +5,9 @@
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.10.1
+pkgver=4.10.2
 pkgrel=1
-pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
+pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
 license=('GPL' 'LGPL')
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('68d630a5f38a3bb3e629b8cfe4d800e6aef5e327'
+sha1sums=('b7f3c3907b8f19dcd975b1724b8ae01c4cae638b'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 76d09f737..d8d648b3b 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 179600 2013-03-07 17:47:07Z andrea $
+# $Id: PKGBUILD 181384 2013-04-04 03:32:27Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.10.1
-pkgrel=2
+pkgver=4.10.2
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -23,7 +23,7 @@ conflicts=('kdelibs')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff')
-sha1sums=('91d1ab65a561decf7506df45bda7a7fec9a524bb'
+sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 8fb964334..d670eb278 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179256 2013-03-04 11:13:30Z andrea $
+# $Id: PKGBUILD 181646 2013-04-04 04:27:59Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.10.1
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'use-libotr3.patch')
-sha1sums=('3d54276d1b3808896640d8a28db2c354ef268953'
+sha1sums=('972526be8275a8adcb6e4fa51188a5dad83a0b14'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
 
 build() {
@@ -44,7 +44,7 @@ build() {
 }
 
 package_kdenetwork-kopete-libre() {
-	pkgdesc='Instant Messenger (without skype support)'
+	pkgdesc='Instant Messenger, without skype support'
 	depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
 	         'libidn' 'qimageblitz' 'libgadu' 'mediastreamer')
         conflicts=('kdenetwork-kopete')
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 01e6a2024..34424602c 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.10.1
+pkgver=4.10.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -30,10 +30,14 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9d1102ec9ea7ee7b8ddc70011231f173ceb2e5c1')
+source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz"
+        "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592")
+sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859'
+          '61a7e31e7daee3358c442d3ac5f74171b45ae2c9')
 
 build() {
+    patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch
+
 	mkdir build
 	cd build
 	cmake ../${_pkgbase}-${pkgver} \
@@ -46,7 +50,7 @@ build() {
 }
 
 package_kdepim-akonadiconsole-libre() {
-	pkgdesc='Akonadi Management and Debugging Console (without nonfree pilot-link support)'
+	pkgdesc='Akonadi Management and Debugging Console, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim' 'nepomuk-widgets')
 	url='http://pim.kde.org'
 	replaces=('kdepim-akonadiconsole')
@@ -58,7 +62,7 @@ package_kdepim-akonadiconsole-libre() {
 }
 
 package_kdepim-akregator-libre() {
-	pkgdesc='A Feed Reader for KDE (without nonfree pilot-link support)'
+	pkgdesc='A Feed Reader for KDE, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/akregator/"
 	replaces=('kdepim-akregator')
@@ -74,7 +78,7 @@ package_kdepim-akregator-libre() {
 }
 
 package_kdepim-blogilo-libre() {
-	pkgdesc='A KDE Blogging Client (without nonfree pilot-link support)'
+	pkgdesc='A KDE Blogging Client, without nonfree pilot-link support'
 	depends=('kdepim-runtime')
 	url="http://kde.org/applications/internet/blogilo/"
 	replaces=('kdepim-blogilo' 'blogilo')
@@ -88,7 +92,7 @@ package_kdepim-blogilo-libre() {
 }
 
 package_kdepim-console-libre() {
-	pkgdesc='Command line tool for accessing calendar files (without nonfree pilot-link support)'
+	pkgdesc='Command line tool for accessing calendar files, without nonfree pilot-link support'
 	depends=('kdepim-runtime')
 	url='http://pim.kde.org'
 	replaces=('kdepim-console')
@@ -104,7 +108,7 @@ package_kdepim-console-libre() {
 }
 
 package_kdepim-kaddressbook-libre() {
-	pkgdesc='Contact Manager (without nonfree pilot-link support)'
+	pkgdesc='Contact Manager, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kaddressbook/"
 	replaces=('kdepim-kaddressbook')
@@ -120,7 +124,7 @@ package_kdepim-kaddressbook-libre() {
 }
 
 package_kdepim-kalarm-libre() {
-	pkgdesc='Personal Alarm Scheduler (without nonfree pilot-link support)'
+	pkgdesc='Personal Alarm Scheduler, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/kalarm/"
 	replaces=('kdepim-kalarm')
@@ -134,7 +138,7 @@ package_kdepim-kalarm-libre() {
 }
 
 package_kdepim-kjots-libre() {
-	pkgdesc='Note Taker (without nonfree pilot-link support)'
+	pkgdesc='Note Taker, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/kjots/"
 	replaces=('kdepim-kjots')
@@ -150,7 +154,7 @@ package_kdepim-kjots-libre() {
 }
 
 package_kdepim-kleopatra-libre() {
-	pkgdesc='Certificate Manager and Unified Crypto GUI (without nonfree pilot-link support)'
+	pkgdesc='Certificate Manager and Unified Crypto GUI, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	install='kdepim-kleopatra.install'
 	url="http://kde.org/applications/utilities/kleopatra/"
@@ -166,7 +170,7 @@ package_kdepim-kleopatra-libre() {
 }
 
 package_kdepim-kmail-libre() {
-	pkgdesc='Mail Client (without nonfree pilot-link support)'
+	pkgdesc='Mail Client, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/kmail/"
 	install='kdepim-kmail.install'
@@ -184,7 +188,7 @@ package_kdepim-kmail-libre() {
 }
 
 package_kdepim-knode-libre() {
-	pkgdesc='News Reader (without nonfree pilot-link support)'
+	pkgdesc='News Reader, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/internet/knode/"
 	replaces=('kdepim-knode')
@@ -202,7 +206,7 @@ package_kdepim-knode-libre() {
 }
 
 package_kdepim-knotes-libre() {
-	pkgdesc='Popup Notes (without nonfree pilot-link support)'
+	pkgdesc='Popup Notes, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/utilities/knotes/"
 	replaces=('kdepim-knotes')
@@ -218,7 +222,7 @@ package_kdepim-knotes-libre() {
 }
 
 package_kdepim-kontact-libre() {
-	pkgdesc='Personal Information Manager (without nonfree pilot-link support)'
+	pkgdesc='Personal Information Manager, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/kontact/"
 	install='kdepim.install'
@@ -233,7 +237,7 @@ package_kdepim-kontact-libre() {
 }
 
 package_kdepim-korganizer-libre() {
-	pkgdesc='Calendar and Scheduling Program (without nonfree pilot-link support)'
+	pkgdesc='Calendar and Scheduling Program, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url="http://kde.org/applications/office/korganizer"
 	replaces=('kdepim-korganizer')
@@ -248,7 +252,7 @@ package_kdepim-korganizer-libre() {
 }
 
 package_kdepim-kresources-libre() {
-	pkgdesc='KDE PIM resources (without nonfree pilot-link support)'
+	pkgdesc='KDE PIM resources, without nonfree pilot-link support'
 	depends=('kdepim-libkdepim')
 	url='http://pim.kde.org'
 	replaces=('kdepim-kresources')
@@ -259,7 +263,7 @@ package_kdepim-kresources-libre() {
 }
 
 package_kdepim-ktimetracker-libre() {
-	pkgdesc='Personal Time Tracker (without nonfree pilot-link support)'
+	pkgdesc='Personal Time Tracker, without nonfree pilot-link support'
 	depends=('kdepim-kresources')
 	url="http://kde.org/applications/utilities/ktimetracker/"
 	replaces=('kdepim-ktimetracker')
@@ -273,7 +277,7 @@ package_kdepim-ktimetracker-libre() {
 }
 
 package_kdepim-ktnef-libre() {
-	pkgdesc='A viewer/extractor for TNEF files (without nonfree pilot-link support)'
+	pkgdesc='A viewer/extractor for TNEF files, without nonfree pilot-link support'
 	depends=('kdebase-runtime' 'kdepimlibs')
 	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
 	replaces=('kdepim-ktnef')
@@ -287,7 +291,7 @@ package_kdepim-ktnef-libre() {
 }
 
 package_kdepim-libkdepim-libre() {
-	pkgdesc='Library for KDE PIM (without nonfree pilot-link support)'
+	pkgdesc='Library for KDE PIM, without nonfree pilot-link support'
 	groups=()
 	depends=('kde-agent' 'kdepim-runtime')
 	url='http://pim.kde.org'
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 838cc1fb0..c6ddcabfa 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 179261 2013-03-04 11:13:48Z andrea $
+# $Id: PKGBUILD 181656 2013-04-04 04:31:29Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.10.1
-pkgrel=1.1
-pkgdesc='Archiving Tool (with unar support)'
+pkgver=4.10.2
+pkgrel=1
+pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('cbb1a1fb9364f81d3653bbb570ab8907ba05aa95'
+sha1sums=('3927eec73d2f1d1c9cd7b0d8888047df0bfb04ff'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
deleted file mode 100644
index 85622aaac..000000000
--- a/libre/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 21:36:36 +1000
-Subject: [PATCH 1/4] Add conflict for replacing owned empty directory
-
-When two packages own an empty directory, pacman finds no conflict when
-one of those packages wants to replace the directory with a file or a
-symlink.  When it comes to actually extracting the new file/symlink,
-pacman sees the directory is still there (we do not remove empty
-directories if they are owned by a package) and refuses to extract.
-
-Detect this potential conflict early and bail. Note that it is a
-_potential_ conflict and not a guaranteed one as the other package owning
-the directory could be updated or removed first which would remove
-the conflict.  However, pacman currently can not sort package installation
-order to ensure this, so this conflict requires manual upgrade ordering.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c               | 32 ++++++++++++++++++++++++++------
- test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++
- test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++
- 3 files changed, 66 insertions(+), 6 deletions(-)
- create mode 100644 test/pacman/tests/fileconflict009.py
- create mode 100644 test/pacman/tests/fileconflict010.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index 32f6f30..efa1a87 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
- 	return NULL;
- }
- 
--static int dir_belongsto_pkg(const char *root, const char *dirpath,
-+static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- 		alpm_pkg_t *pkg)
- {
-+	alpm_list_t *i;
- 	struct stat sbuf;
- 	char path[PATH_MAX];
- 	char abspath[PATH_MAX];
--	struct dirent *ent = NULL;
- 	DIR *dir;
-+	struct dirent *ent = NULL;
-+	const char *root = handle->root;
-+
-+	/* TODO: this is an overly strict check but currently pacman will not
-+	 * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
-+	 * is not simple as even if the directory is being unowned by a conflicting
-+	 * package, pacman does not sort this to ensure all required directory
-+	 * "removals" happen before installation of file/symlink */
-+
-+	/* check that no other _installed_ package owns the directory */
-+	for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
-+		if(pkg == i->data) {
-+			continue;
-+		}
-+
-+		if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
-+			return 0;
-+		}
-+	}
- 
-+	/* check all files in directory are owned by the package */
- 	snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
- 	dir = opendir(abspath);
- 	if(dir == NULL) {
-@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath,
- 		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
- 			continue;
- 		}
--		snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
-+		snprintf(path, PATH_MAX, "%s%s", dirpath, name);
- 		snprintf(abspath, PATH_MAX, "%s%s", root, path);
- 		if(stat(abspath, &sbuf) != 0) {
- 			continue;
- 		}
- 		if(S_ISDIR(sbuf.st_mode)) {
--			if(dir_belongsto_pkg(root, path, pkg)) {
-+			if(dir_belongsto_pkg(handle, path, pkg)) {
- 				continue;
- 			} else {
- 				closedir(dir);
-@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
- 				sprintf(dir, "%s/", filestr);
- 				if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
- 					_alpm_log(handle, ALPM_LOG_DEBUG,
--							"check if all files in %s belongs to %s\n",
-+							"check if all files in %s belong to %s\n",
- 							dir, dbpkg->name);
--					resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
-+					resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
- 				}
- 				free(dir);
- 			}
-diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py
-new file mode 100644
-index 0000000..904af4a
---- /dev/null
-+++ b/test/pacman/tests/fileconflict009.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->symlink change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir -> /usr/dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
-diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py
-new file mode 100644
-index 0000000..0a3ce83
---- /dev/null
-+++ b/test/pacman/tests/fileconflict010.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->file change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
--- 
-1.7.11.1
-
diff --git a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch b/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
deleted file mode 100644
index 6cf496d16..000000000
--- a/libre/pacman/0002-Check-empty-subdirectory-ownership.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 23:58:37 +1000
-Subject: [PATCH 2/4] Check empty subdirectory ownership
-
-When checking if a package owns a directory, it is important to check
-not only that all the files in the directory are part of the package,
-but also if the directory is part of a package.  This catches empty
-subdirectories during conflict checking for directory to file/symlink
-replacements.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c               |  5 +++++
- test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++
- 2 files changed, 22 insertions(+)
- create mode 100644 test/pacman/tests/fileconflict012.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index efa1a87..d6e5d8c 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- 	struct dirent *ent = NULL;
- 	const char *root = handle->root;
- 
-+	/* check directory is actually in package - used for subdirectory checks */
-+	if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
-+		return 0;
-+	}
-+
- 	/* TODO: this is an overly strict check but currently pacman will not
- 	 * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
- 	 * is not simple as even if the directory is being unowned by a conflicting
-diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
-new file mode 100644
-index 0000000..421b739
---- /dev/null
-+++ b/test/pacman/tests/fileconflict012.py
-@@ -0,0 +1,17 @@
-+self.description = "dir->file change during package upgrade (filesystem file conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+self.filesystem = ["dir/file"]
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
--- 
-1.7.11.1
-
diff --git a/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
deleted file mode 100644
index ae3a57ecd..000000000
--- a/libre/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Fri, 04 May 2012 16:41:40 +0000
-Subject: Ensure pre_upgrade scriptlet gets old package version
-
-This was accidentally broken in the refactor done in commit 73139ccb.
-
-Fixes FS#29371.
-
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
-diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
-index 6c2f0cb..c49d99b 100644
---- a/lib/libalpm/add.c
-+++ b/lib/libalpm/add.c
-@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
- 	if(alpm_pkg_has_scriptlet(newpkg) &&
- 			!(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
- 		const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
--		_alpm_runscriptlet(handle, pkgfile,
--				scriptlet_name, newpkg->version, NULL, 1);
-+
-+		_alpm_runscriptlet(handle, pkgfile, scriptlet_name,
-+				newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
- 	}
- 
- 	/* we override any pre-set reason if we have alldeps or allexplicit set */
---
-cgit v0.9.0.2-13-g2bd3
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 6f82bded2..6bc77a345 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,51 +1,47 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 178901 2013-02-28 17:05:39Z dreisner $
+# $Id: PKGBUILD 181860 2013-04-04 22:54:14Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
-pkgver=4.0.3
-pkgrel=7
+pkgver=4.1.0
+pkgrel=2.1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4'
+depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-makedepends=('asciidoc')
+checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
 install=pacman.install
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-        0001-Add-conflict-for-replacing-owned-empty-directory.patch
-        0002-Check-empty-subdirectory-ownership.patch
-        0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-        pacman.conf
+        pacman.conf.i686
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
-         '1a70392526c8768470da678b31905a6e'
-         '1a9b79788640907a2b34e8671cacc94a'
-         'a9ddd43891bed364e1e97d27b2887bf1'
-         '2e8cbf55a94b1954b167c5dee6b62317'
-         '4ce9e714919e632f48129985ea6b671f'
-         '43628d586f93d64354654ae3f51aab85'
-         'f117e2e13f7d70629ce6923117c73881'
-         'debc512689a1aa8c124fe0ccf27f5758')
+md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
+         '4959b8d00056398195f4e549e7bdd346'
+         '688feb0a552f42643a76f72e7198bfe4'
+         '765858b55d2112d948932fc645ea538b'
+         '9e0c64937ef751ae4273fa4d73381484'
+         '5a94cdf966ad72284ee1aa148202857b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
-  patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
-  patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-doc
+    --localstatedir=/var --enable-doc \
+    --with-scriptlet-shell=/usr/bin/bash \
+    --with-ldconfig=/usr/bin/ldconfig
   make
+  make -C contrib
 }
 
 check() {
@@ -55,29 +51,29 @@ check() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir -C contrib install
 
   # install Arch specific stuff
-  mkdir -p $pkgdir/etc
+  install -dm755 $pkgdir/etc
+  install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+  
   case "$CARCH" in
     i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
       myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
       myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     mips64el)
-      install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
-      myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+      myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4"
       myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
       ;;
   esac
@@ -88,12 +84,14 @@ package() {
     -e "s|@CHOST[@]|$mychost|g" \
     -e "s|@LDFLAGS[@]|$myldflags|g" \
     -e "s|@CARCHFLAGS[@]|$myflags|g"
+    
+  # put bash_completion in the right location
+  install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+  mv ${pkgdir}/etc/bash_completion.d/pacman \
+    ${pkgdir}/usr/share/bash-completion/completions
+  rmdir ${pkgdir}/etc/bash_completion.d
 
-  # install completion files
-  install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
   for f in makepkg pacman-key; do
     ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
   done
-
-  install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
 }
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index 08a44167b..f1ce20fcb 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -11,7 +11,7 @@
 DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
           'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
           'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
-          'rsync::/usr/bin/rsync -z %u %o'
+          'rsync::/usr/bin/rsync --no-motd -z %u %o'
           'scp::/usr/bin/scp -C %u %o')
 
 # Other common tools:
@@ -29,11 +29,15 @@ CHOST="@CHOST@"
 #-- Compiler and Linker Flags
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
 CFLAGS="@CARCHFLAGS@"
 CXXFLAGS="@CARCHFLAGS@"
 LDFLAGS="@LDFLAGS@"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
-#-- strip:     Strip symbols from binaries/libraries
-#-- docs:      Save doc directories specified by DOC_DIRS
-#-- libtool:   Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman:    Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge:     Remove files specified by PURGE_TARGETS
-#-- upx:       Compress binary executable files using UPX
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+#-- strip:      Strip symbols from binaries/libraries
+#-- docs:       Save doc directories specified by DOC_DIRS
+#-- libtool:    Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs:  Leave empty directories in packages
+#-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge:      Remove files specified by PURGE_TARGETS
+#-- upx:        Compress binary executable files using UPX
+#-- debug:      Add debugging flags as specified in DEBUG_* variables
+#
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
@@ -109,6 +115,17 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #GPGKEY=""
 
 #########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+
+#########################################################################
 # EXTENSION DEFAULTS
 #########################################################################
 #
diff --git a/libre/pacman/pacman.conf b/libre/pacman/pacman.conf.i686
index fa8839c3d..84cec630c 100644
--- a/libre/pacman/pacman.conf
+++ b/libre/pacman/pacman.conf.i686
@@ -15,11 +15,10 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,14 +30,16 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-#UseDelta
+#Color
 #TotalDownload
 CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Arch Linux
@@ -68,39 +69,35 @@ CheckSpace
 # after the header, and they will be used before the default mirrors.
 
 #[libre-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
 # them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
 
+# Parabola community repo
+#[pcr]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index e6cff6811..604040640 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -15,11 +15,10 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = mips64el
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,14 +30,16 @@ Architecture = mips64el
 
 # Misc options
 #UseSyslog
-#UseDelta
+#Color
 #TotalDownload
 CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Arch Linux
@@ -68,39 +69,35 @@ CheckSpace
 # after the header, and they will be used before the default mirrors.
 
 #[libre-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
 # them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
 
+# Parabola community repo
+#[pcr]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index aa17bc498..5729b60c5 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -15,11 +15,10 @@
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
 HoldPkg     = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst   = archlinux-keyring parabola-keyring
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
+#UseDelta    = 0.7
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,14 +30,16 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-#UseDelta
+#Color
 #TotalDownload
 CheckSpace
 #VerbosePkgLists
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
 
 # NOTE: You must run `pacman-key --init` before first using pacman; the local
 # keyring can then be populated with the keys of all official Arch Linux
@@ -68,50 +69,44 @@ CheckSpace
 # after the header, and they will be used before the default mirrors.
 
 #[libre-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [libre]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
-SigLevel = PackageRequired
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 
 #[multilib-testing]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 #[multilib]
-#SigLevel = PackageRequired
 #Include = /etc/pacman.d/mirrorlist
 
 # Parabola also supports community projects and personal repositories, to find
 # them check out this wiki page: https://wiki.parabolagnulinux.org/Repositories
 
+# Parabola community repo
+#[pcr]
+#Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
-
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
deleted file mode 100644
index 810eff5b9..000000000
--- a/libre/pacman/rePKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-unset build package md5sums source check
-_repo=core
-source=(PKGBUILD
-       ftp://ftp.archlinux.org/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-       # files for pkg modifications
-  pacman.conf
-  pacman.conf.x86_64
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm -vf .{INSTALL,PKGINFO} ${srcdir}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  cp -a ${srcdir}/* ${pkgdir}
-
-  rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
-
-# No need to repackage for mips64el
-  case "$CARCH" in
-    i686)
-      install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
-      ;;
-    x86_64)
-      install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
-      ;;
-  esac
-}
-
-
-# vim:set ts=2 sw=2 et: