From 32b069e79cb891e99962cbac53e2950c11ea403f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 May 2013 00:51:22 -0700 Subject: Fri May 3 00:51:21 PDT 2013 --- community/cinnamon/PKGBUILD | 13 +- community/cinnamon/idle-dim.patch | 35 ++++ community/f2fs-tools/PKGBUILD | 27 +++ community/go/PKGBUILD | 59 +++---- community/lmms/PKGBUILD | 8 +- community/mod_wsgi2/PKGBUILD | 9 +- community/mod_wsgi2/mod_wsgi2.install | 6 +- community/muffin/PKGBUILD | 14 +- community/muffin/fix-dnd.patch | 29 ++++ community/openimageio/PKGBUILD | 8 +- community/pekwm/PKGBUILD | 14 +- community/python-simplejson/PKGBUILD | 44 +++-- community/setconf/PKGBUILD | 9 +- community/sqlheavy/PKGBUILD | 40 +++++ community/stone-soup/PKGBUILD | 9 +- community/teeworlds/PKGBUILD | 15 +- community/yaml-cpp/PKGBUILD | 6 +- core/openldap/PKGBUILD | 50 ++++-- core/openldap/ntlm.patch | 230 -------------------------- core/openldap/openldap-nssov.patch | 30 ++++ core/openldap/openldap-ntlm.patch | 230 ++++++++++++++++++++++++++ core/zlib/PKGBUILD | 6 +- extra/ccrtp/PKGBUILD | 14 +- extra/libzrtpcpp/PKGBUILD | 18 +- extra/mercurial/PKGBUILD | 6 +- extra/soprano/PKGBUILD | 10 +- extra/ucommon/PKGBUILD | 14 +- libre-testing/libretools/PKGBUILD | 60 +++++++ libre-testing/libretools/libretools.install | 28 ++++ libre/linux-libre-lts/PKGBUILD | 18 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- pcr/babeld/PKGBUILD | 4 +- 32 files changed, 671 insertions(+), 394 deletions(-) create mode 100644 community/cinnamon/idle-dim.patch create mode 100644 community/f2fs-tools/PKGBUILD create mode 100644 community/muffin/fix-dnd.patch create mode 100755 community/sqlheavy/PKGBUILD delete mode 100644 core/openldap/ntlm.patch create mode 100644 core/openldap/openldap-nssov.patch create mode 100644 core/openldap/openldap-ntlm.patch create mode 100644 libre-testing/libretools/PKGBUILD create mode 100644 libre-testing/libretools/libretools.install diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 46ed9ffcf..5ff5db12a 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89648 2013-04-30 22:18:11Z faidoc $ +# $Id: PKGBUILD 89831 2013-05-02 18:23:50Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -29,13 +29,15 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "fix-control-center-check.patch" "gnome-3.8.patch" "switch-applications.patch" - "fallback-helpers.patch") + "fallback-helpers.patch" + "idle-dim.patch") sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262' - 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e') + 'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e' + 'b34c30299fb88228c59f36fced90d56346847019a080bc7b8157b72caa659100') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -62,6 +64,9 @@ build() { # Start media keys and mount helpers with the session patch -Np1 -i ../fallback-helpers.patch + # Fix brightness applet for GNOME 3.8 + patch -Np1 -i ../idle-dim.patch + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon \ diff --git a/community/cinnamon/idle-dim.patch b/community/cinnamon/idle-dim.patch new file mode 100644 index 000000000..17f5af616 --- /dev/null +++ b/community/cinnamon/idle-dim.patch @@ -0,0 +1,35 @@ +diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js +--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-04-30 18:01:56.000000000 +0200 ++++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js 2013-05-02 19:32:12.934254811 +0200 +@@ -9,8 +9,7 @@ + + /* constants */ + const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power"; +-const DimSettingsAc = "idle-dim-ac"; +-const DimSettingsBattery = "idle-dim-battery"; ++const DimSettings = "idle-dim"; + const PowerBusName = 'org.gnome.SettingsDaemon'; + const PowerObjectPath = '/org/gnome/SettingsDaemon/Power'; + +@@ -116,10 +115,8 @@ + + this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings")); + +- let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc); +- this._settingsMenu.menu.addMenuItem(dimSwitchAc); +- let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery); +- this._settingsMenu.menu.addMenuItem(dimSwitchBattery); ++ let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings); ++ this._settingsMenu.menu.addMenuItem(dimSwitch); + + //initial update. + //We have to wait until dbus calls back to decide whether to display brightness controls. +@@ -145,7 +142,7 @@ + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + } + +- this.menu.addSettingsAction(_("Settings"), "screen"); ++ this.menu.addSettingsAction(_("Settings"), "screensaver"); + })); + } + catch (e) { diff --git a/community/f2fs-tools/PKGBUILD b/community/f2fs-tools/PKGBUILD new file mode 100644 index 000000000..a089b0e35 --- /dev/null +++ b/community/f2fs-tools/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Christian Hesse + +pkgname=f2fs-tools +pkgver=1.1.0 +pkgrel=2 +pkgdesc="Tools for Flash-Friendly File System (F2FS)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/f2fs-tools/" +depends=('util-linux') +license=('GPL') +source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') +sha256sums=('c8cfb6895a0b3775f0df00a776fd451558739289684dd43f1fd75f876fa62867') + +build() { + cd "${pkgname}-${pkgver}" + + autoreconf -fi + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" install +} + diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index ab0dd64e4..f2c3a085f 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86967 2013-03-25 13:19:54Z arodseth $ +# $Id: PKGBUILD 89827 2013-05-02 17:23:12Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -7,10 +7,9 @@ # Contributor: Christian Himpel # Contributor: Mike Rosset # Contributor: Daniel YC Lin - pkgname=go -pkgver=1.0.3 -pkgrel=7 +pkgver=1.1rc1 +pkgrel=1 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') @@ -21,46 +20,48 @@ makedepends=('inetutils') options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') -source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" - "$pkgname.sh") -sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' +if [ "$CARCH" == 'x86_64' ]; then + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" + "$pkgname.sh") + sha256sums=('fc76b716b031d8afba3f3e6bcaca410e8dbf5fb625db5def00fbaaaa960e108c' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +else + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" + "$pkgname.sh") + sha256sums=('b4eb8d9b55ae4a78c86213fa968755163ab3a8efa3f5c9f3a472b182b9d9a52e' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') +fi build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname/src" - if [ "$CARCH" == 'x86_64' ]; then - export GOARCH=amd64 - elif [ "$CARCH" == 'i686' ]; then - export GOARCH=386 - else - # A friendly gesture to Arch Linux ARM - export GOARCH=arm - fi export GOROOT_FINAL=/usr/lib/go - export GOOS=linux - cd src + # Enable ARM crosscompilation for linux + export GOOS=linux + export GOARCH=arm bash make.bash - # Enable ARM crosscompilation for non-arm platforms - if [ "$CARCH" == 'x86_64' ]; then - export GOARCH=arm - elif [ "$CARCH" == 'i686' ]; then - export GOARCH=arm - fi - bash make.bash + # Crosscompilation for other platforms too (including linux i686 and x86_64) + for os in linux; do # also possible: darwin freebsd windows + for arch in amd64 386; do + export GOOS=$os + export GOARCH=$arch + bash make.bash + done + done } check() { cd "$srcdir/$pkgname" + # Only test for linux and the architecture we're on + export GOOS=linux if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 elif [ "$CARCH" == 'i686' ]; then export GOARCH=386 else - # A friendly gesture to Arch Linux ARM export GOARCH=arm fi @@ -86,8 +87,8 @@ package() { $pkgdir/usr/share/zsh/site-functions/_go for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \ - ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \ - syntax/go.vim syntax/godoc.vim plugin/godoc.vim; + ftplugin/go/fmt.vim ftplugin/go/import.vim syntax/go.vim syntax/godoc.vim \ + plugin/godoc.vim; do install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done @@ -136,7 +137,7 @@ package() { install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION # Clean up - rm -r "$pkgdir/usr/bin/linux_arm" + #rm -r "$pkgdir/usr/bin/linux_arm" } # vim:set ts=2 sw=2 et: diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index e58603521..728f8e500 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85371 2013-03-01 10:35:13Z andrea $ +# $Id: PKGBUILD 89669 2013-05-02 08:58:00Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Shinlun Hsieh # Contributor: Mateusz Herych # Contributor: Storyteller pkgname=lmms -pkgver=0.4.13 -pkgrel=3 +pkgver=0.4.14 +pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') url='http://lmms.sourceforge.net/' @@ -25,7 +25,7 @@ options=('!libtool' '!makeflags') install=lmms.install source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2" zynaddsubfx_unlink.patch) -md5sums=('80db0dc5263041d443f474220410991f' +md5sums=('a30e4fcc24c117a1fb4fd7bef891f7e8' 'd2ea78ac0cf2979505f140c6845617cf') build() { diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD index b408192d8..3a27e99e2 100644 --- a/community/mod_wsgi2/PKGBUILD +++ b/community/mod_wsgi2/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 80683 2012-11-29 03:29:49Z arodseth $ +# $Id: PKGBUILD 89811 2013-05-02 13:55:03Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Andrea Scarpino # Contributor: Ryan Coyner pkgname=mod_wsgi2 pkgver=3.4 -pkgrel=2 +pkgrel=3 pkgdesc='Python2 WSGI adapter module for Apache' arch=('x86_64' 'i686') url='http://www.modwsgi.org/' license=('APACHE') depends=('apache' 'python2') conflicts=('mod_wsgi') -install=$pkgname.install +install="$pkgname.install" source=("http://modwsgi.googlecode.com/files/mod_wsgi-$pkgver.tar.gz") sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8') build() { cd "$srcdir/mod_wsgi-$pkgver" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --with-apxs=/usr/sbin/apxs \ --with-python=/usr/bin/python2 make diff --git a/community/mod_wsgi2/mod_wsgi2.install b/community/mod_wsgi2/mod_wsgi2.install index d26d61631..a7f0290c2 100644 --- a/community/mod_wsgi2/mod_wsgi2.install +++ b/community/mod_wsgi2/mod_wsgi2.install @@ -1,9 +1,9 @@ post_install() { -/bin/cat << ENDOFMESSAGE + cat << ENDOFMESSAGE ==> ==> ==> To install mod_wsgi, add the following line in -==> /etc/httpd/conf/httpd.conf file : +==> /etc/httpd/conf/httpd.conf file: ==> ==> LoadModule wsgi_module modules/mod_wsgi.so ==> @@ -12,3 +12,5 @@ post_install() { ==> ENDOFMESSAGE } + +# vim:set ts=2 sw=2 et: diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index ccf3aa3a9..5c0d9cde1 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89374 2013-04-29 01:14:49Z bgyorgy $ +# $Id: PKGBUILD 89819 2013-05-02 15:47:37Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin pkgver=1.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -16,9 +16,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" - "switch-applications.patch") + "switch-applications.patch" + "fix-dnd.patch") md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b') + 'a5d5d76dc281277a8afc83d7affdcc7b' + '6d787466831def299360419cc3b5e47b') build() { cd linuxmint-muffin-* @@ -26,6 +28,9 @@ build() { # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch + # Fix unresponsive panel on DND + patch -RNp1 -i ../fix-dnd.patch + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make @@ -36,5 +41,4 @@ package() { make DESTDIR="$pkgdir/" install } - # vim:set ts=2 sw=2 et: diff --git a/community/muffin/fix-dnd.patch b/community/muffin/fix-dnd.patch new file mode 100644 index 000000000..f30e22521 --- /dev/null +++ b/community/muffin/fix-dnd.patch @@ -0,0 +1,29 @@ +From fca9ce4a1218837aef1886f8d98c8e5a5d124843 Mon Sep 17 00:00:00 2001 +From: luyikei +Date: Wed, 16 Jan 2013 14:09:39 +0900 +Subject: [PATCH] Put the rest of redirect window types into the top window + group + +--- + src/compositor/meta-window-actor.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c +index 4113e72..66ba3c4 100644 +--- a/src/compositor/meta-window-actor.c ++++ b/src/compositor/meta-window-actor.c +@@ -1513,7 +1513,10 @@ const char *meta_window_actor_get_description (MetaWindowActor *self) + + if (window->type == META_WINDOW_DROPDOWN_MENU || + window->type == META_WINDOW_POPUP_MENU || +- window->type == META_WINDOW_COMBO){ ++ window->type == META_WINDOW_COMBO || ++ window->type == META_WINDOW_NOTIFICATION || ++ window->type == META_WINDOW_DND || ++ window->type == META_WINDOW_OVERRIDE_OTHER){ + clutter_container_add_actor (CLUTTER_CONTAINER (info->top_window_group), + CLUTTER_ACTOR (self)); + } +-- +1.8.1.6 + diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index cf038c179..2505880c7 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88614 2013-04-20 16:45:07Z heftig $ +# $Id: PKGBUILD 89826 2013-05-02 16:18:15Z svenstaro $ # Contributor: SpepS # Maintainer: Sven-Hendrik Haase pkgname=openimageio -pkgver=1.1.9 -pkgrel=2 +pkgver=1.1.10 +pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') optdepends=('qt4: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('19ac43e2bf00e5b6b7f2dbc778ce9648') +md5sums=('e5c5cd77238f74c3a6a3610c211430f2') build() { cd "$srcdir"/$_pkgname* diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD index 91bdd5575..e3fe0f3b4 100644 --- a/community/pekwm/PKGBUILD +++ b/community/pekwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81762 2012-12-28 23:22:15Z arodseth $ +# $Id: PKGBUILD 89805 2013-05-02 12:32:13Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kevin Piche # Contributor: Eddie Lozon pkgname=pekwm pkgver=0.1.16 -pkgrel=2 +pkgrel=4 pkgdesc='Small, fast, functional, and flexible window manager' arch=('x86_64' 'i686') license=('GPL') @@ -27,16 +27,20 @@ backup=(etc/pekwm/autoproperties etc/pekwm/mouse_system etc/pekwm/start etc/pekwm/vars) -source=("http://www.pekwm.org/projects/pekwm/files/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2" "${pkgname}_kdm.desktop") sha256sums=('899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96' '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6') -build() { +prepare() { cd "$srcdir" + gendesk +} + +build() { + cd "$srcdir/$pkgname-$pkgver" - cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD index 6fab1f149..7805c6889 100644 --- a/community/python-simplejson/PKGBUILD +++ b/community/python-simplejson/PKGBUILD @@ -1,39 +1,37 @@ -# $Id: PKGBUILD 82843 2013-01-25 00:09:28Z arodseth $ -# Maintainer: Jaroslav Lichtblau +# $Id: PKGBUILD 89809 2013-05-02 13:39:19Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Jaroslav Lichtblau # Contributor: Allan McRae # Contributor: David Moore pkgbase=python-simplejson -pkgname=(python-simplejson python2-simplejson) -pkgver=3.0.7 -pkgrel=2 -pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" +pkgname=("$pkgbase" 'python2-simplejson') +pkgver=3.2.0 +pkgrel=1 +pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python' license=('MIT') -arch=('i686' 'x86_64') -url="http://undefined.org/python/#simplejson" +arch=('x86_64' 'i686') +url='http://undefined.org/python/#simplejson' makedepends=('python' 'python2-distribute') -changelog=python-simplejson.changelog -source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) -md5sums=('fc9013eab6330514196a7f19c2cff386') - -build() { - true -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}") +sha256sums=('507036d10039ccf437625437b2521c0f691c20c3911b2b7183d5a66c98d36432') package_python-simplejson() { depends=('python') - cd ${srcdir}/simplejson-simplejson-* - python setup.py install --root=${pkgdir} - install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "$srcdir/simplejson-simplejson-"* + python setup.py install --root="$pkgdir" + install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_python2-simplejson() { depends=('python2') - cd ${srcdir}/simplejson-simplejson-* - python2 setup.py install --root=${pkgdir} - install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + cd "$srcdir/simplejson-simplejson-"* + python2 setup.py install --root="$pkgdir" + install -Dm644 "$srcdir/simplejson-simplejson"-*/LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 6d0586f00..a2a9fbb34 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 86348 2013-03-15 13:28:26Z arodseth $ +# $Id: PKGBUILD 89807 2013-05-02 13:36:01Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.5.3 -pkgrel=1 +pkgrel=2 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686') url='http://setconf.roboticoverlords.org/' license=('GPL2') depends=('pcre' 'gc') -# Comment out the makedepends if you're on a platform not supported by shedskin -makedepends=('shedskin') +if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then + makedepends=('shedskin') +fi source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz") sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD new file mode 100755 index 000000000..43f08fc60 --- /dev/null +++ b/community/sqlheavy/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 89815 2013-05-02 15:11:19Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor : sebikul + +pkgname=sqlheavy +pkgver=0.1.1 +pkgrel=6 +pkgdesc="GObject SQLite wrapper" +arch=('i686' 'x86_64') +url="https://code.google.com/p/sqlheavy/" +license=('LGPL') +conflicts=('sqlheavy-git') +depends=('gtk2' 'sqlite3') +makedepends=('gobject-introspection' 'vala') +options=('!libtool') +source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031') + +prepare() { + cd "${srcdir}"/${pkgname}-${pkgver} + + sed -i 's/libvala-0.16/libvala-0.20/' configure + sed -i '/examples/d + /utils/d' Makefile.in +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index da7225f71..1092cda59 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Jakob Gruber pkgname=stone-soup -pkgver=0.11.2 -pkgrel=1 +pkgver=0.12.0 +pkgrel=2 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64') url='http://crawl.develz.org/' -depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'glu' 'freetype2' 'ttf-dejavu') +depends=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu') makedepends=('bison' 'flex' 'gendesk' 'mesa') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') @@ -64,5 +64,4 @@ package() { "${pkgdir}/usr/share/applications/${pkgname}.desktop" } - -md5sums=('84b5939d242fbaec4d9d8c64fa02156c') +md5sums=('38ed5bae81f6513cc898aa12efda2c38') diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD index 51ee46ff9..508577be5 100644 --- a/community/teeworlds/PKGBUILD +++ b/community/teeworlds/PKGBUILD @@ -5,19 +5,19 @@ # Maintainer: Sven-Hendrik Haase pkgname=teeworlds -pkgver=0.6.1 -pkgrel=3 +pkgver=0.6.2 +pkgrel=1 pkgdesc="A multiplayer 2D shooter" arch=('i686' 'x86_64') -url="http://teeworlds.com" +url="https://www.teeworlds.com" license=('custom') depends=('alsa-lib' 'glu' 'sdl' 'freetype2') -makedepends=('python2' 'bam' 'mesa') +makedepends=('python' 'bam' 'mesa') replaces=('teewars') -source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz +source=(https://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz teeworlds.desktop teeworlds.png) -md5sums=('00de7195ecd1f23596dc3237341af512' +md5sums=('649f6c05a7b117096b238c07062edc39' '3944aaf7a8c19a83510b2b39c4cddf5f' '44f39e398409232a0e0a431ed46d8cc8') @@ -25,9 +25,6 @@ build() { # Build teeworlds cd ${srcdir}/${pkgname}-*-source - # Use Python 2 - sed -i 's/python /python2 /' bam.lua - bam server_release client_release } diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD index b7a741c64..c2fc7add7 100644 --- a/community/yaml-cpp/PKGBUILD +++ b/community/yaml-cpp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82853 2013-01-25 03:41:30Z svenstaro $ +# $Id: PKGBUILD 89824 2013-05-02 16:13:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Markus Martin pkgname=yaml-cpp -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" url="http://code.google.com/p/yaml-cpp/" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64') license=('MIT') makedepends=('cmake' 'boost') source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('c6d96190434d5959d814c603f98512c6') +md5sums=('0fa47a5ed8fedefab766592785c85ee7') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 529b3e63c..95fa405d5 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 182592 2013-04-10 20:23:35Z eric $ +# $Id: PKGBUILD 184147 2013-05-02 19:39:44Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.35 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') -makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath') options=('!makeflags') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd.service slapd.tmpfiles ntlm.patch) + slapd.service slapd.tmpfiles openldap-ntlm.patch openldap-nssov.patch) sha1sums=('db02243150b050baac6a8ea4145ad73a1f6d2266' '9c7f3441e6a6ee13cdcfe8d965081c7a574c3393' 'f86a82e35ebe15026980467c9dee4007e686b795' - 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') - -build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}"/ntlm.patch + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' + 'b2d11b4c522750ad9da3409333094fb599ac2c85') +prepare() { + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/openldap-ntlm.patch + patch -p0 -i "${srcdir}"/openldap-nssov.patch sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h - sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.{conf,ldif} sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in +} +build() { + cd ${pkgbase}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ --sysconfdir=/etc --localstatedir=/var/lib/openldap \ --enable-ipv6 --enable-syslog --enable-local \ @@ -36,10 +40,14 @@ build() { --enable-spasswd --with-cyrus-sasl \ --enable-overlays=mod --enable-modules=yes make + + cd contrib/slapd-modules/nssov + make prefix=/usr libexecdir=/usr/lib sysconfdir=/etc/openldap + chrpath -d .libs/nssov.so } check() { - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} make test } @@ -49,7 +57,7 @@ package_libldap() { backup=('etc/openldap/ldap.conf') options=('!libtool') - cd "${srcdir}"/${pkgbase}-${pkgver} + cd ${pkgbase}-${pkgver} for dir in include libraries doc/man/man3 ; do pushd ${dir} make DESTDIR="${pkgdir}" install @@ -69,16 +77,24 @@ package_libldap() { package_openldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" depends=("libldap>=${pkgver}" 'libltdl') - backup=('etc/openldap/slapd.conf') + backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif') options=('!libtool' 'emptydirs') install=openldap.install - cd "${srcdir}"/${pkgbase}-${pkgver} - for dir in clients servers doc/man/man{1,5,8} ; do + cd ${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8}; do pushd ${dir} make DESTDIR="${pkgdir}" install popd done + + pushd contrib/slapd-modules/nssov + install -m755 .libs/nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap + ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so + ln -s nssov.so.0.0.0 "${pkgdir}"/usr/lib/openldap/nssov.so.0 + install -m444 ldapns.schema "${pkgdir}"/etc/openldap/schema + popd + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 rm -r "${pkgdir}"/run @@ -87,8 +103,8 @@ package_openldap() { ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd - chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} - chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chown root:439 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.{conf,ldif},DB_CONFIG.example} install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d diff --git a/core/openldap/ntlm.patch b/core/openldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/core/openldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include diff --git a/core/openldap/openldap-nssov.patch b/core/openldap/openldap-nssov.patch new file mode 100644 index 000000000..5ec2c36f3 --- /dev/null +++ b/core/openldap/openldap-nssov.patch @@ -0,0 +1,30 @@ +--- contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2013-03-28 11:41:51.000000000 -0400 ++++ contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h 2012-07-08 04:34:12.000000000 -0400 +@@ -71,6 +71,16 @@ + 1.0 release of nss-pam-ldapd is made. */ + #define NSLCD_VERSION 1 + ++/* Get a NSLCD configuration option. There is one request parameter: ++ INT32 NSLCD_CONFIG_* ++ the result value is: ++ STRING value, interpretation depending on request */ ++#define NSLCD_ACTION_CONFIG_GET 20006 ++ ++/* return the message, if any, that is presented to the user when password ++ modification through PAM is prohibited */ ++#define NSLCD_CONFIG_PAM_PASSWORD_PROHIBIT_MESSAGE 852 ++ + /* Email alias (/etc/aliases) NSS requests. The result values for a + single entry are: + STRING alias name +@@ -249,8 +262,10 @@ + #define NSLCD_PAM_NEW_AUTHTOK_REQD 12 /* Password expired */ + #define NSLCD_PAM_ACCT_EXPIRED 13 /* Account expired */ + #define NSLCD_PAM_SESSION_ERR 14 /* Cannot make/remove session record */ ++#define NSLCD_PAM_AUTHTOK_ERR 20 /* Authentication token manipulation error */ + #define NSLCD_PAM_AUTHTOK_DISABLE_AGING 23 /* Password aging disabled */ + #define NSLCD_PAM_IGNORE 25 /* Ignore module */ + #define NSLCD_PAM_ABORT 26 /* Fatal error */ ++#define NSLCD_PAM_AUTHTOK_EXPIRED 27 /* authentication token has expired */ + + #endif /* not _NSLCD_H */ diff --git a/core/openldap/openldap-ntlm.patch b/core/openldap/openldap-ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/core/openldap/openldap-ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ +@@ -47,7 +47,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index e9a9866a7..821d2e5df 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158552 2012-05-04 22:14:53Z pierre $ +# $Id: PKGBUILD 184034 2013-05-02 08:15:23Z pierre $ # Maintainer: Pierre Schmitz pkgname=zlib -pkgver=1.2.7 +pkgver=1.2.8 pkgrel=1 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('custom') url="http://www.zlib.net/" depends=('glibc') source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('60df6a37c56e7c1366cca812414f7b85') +md5sums=('44d667c142d7cda120332623eab69f40') build() { cd ${srcdir}/zlib-$pkgver diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD index 5901e29ed..099da0f85 100644 --- a/extra/ccrtp/PKGBUILD +++ b/extra/ccrtp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159161 2012-05-16 20:49:22Z andrea $ +# $Id: PKGBUILD 184148 2013-05-02 19:39:49Z eric $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Jeff Mickey @@ -6,8 +6,8 @@ # Contributor: Alexander Rødseth pkgname=ccrtp -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.5 +pkgrel=1 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ccrtp/" @@ -16,17 +16,17 @@ depends=('ucommon' 'libgcrypt') options=('!libtool') install=$pkgname.install source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('0d57da1b8e212fb634b8951067fbc1e0' - '127fa3b293f7a7c3be1d2891c4544453') +md5sums=('7f462f6b31c68180a93f36b06944fef4' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD index e004e6e6f..b9ad0f71f 100644 --- a/extra/libzrtpcpp/PKGBUILD +++ b/extra/libzrtpcpp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159301 2012-05-21 09:44:12Z andrea $ +# $Id: PKGBUILD 184149 2013-05-02 19:39:50Z eric $ # Maintainer: # Contributor: Sergej Pupykin # Contributor: Jeff Mickey # Contributor: Michel Brabants pkgname=libzrtpcpp -pkgver=2.1.2 +pkgver=2.3.2 pkgrel=1 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification" arch=('i686' 'x86_64') @@ -13,13 +13,15 @@ url='http://www.gnutelephony.org/index.php/GNU_ZRTP' license=('GPL3') depends=('ccrtp') makedepends=('cmake') -source=("https://github.com/downloads/wernerd/ZRTPCPP/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2f78cffbdb0f3e0ee92609fc01a1b6c5') +source=(http://ftp.gnu.org/gnu/ccrtp/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('b5f0a72252785862133e9cbc9cbbd3f8' + 'SKIP') -build() { - sed 's/lib64/lib/g' -i "${srcdir}"/${pkgname}-${pkgver}/CMakeLists.txt +prepare() { + sed 's/lib64/lib/g' -i ${pkgname}-${pkgver}/CMakeLists.txt +} - cd "${srcdir}" +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -29,6 +31,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3e6a8fcc5..3f880502c 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182356 2013-04-08 21:42:10Z giovanni $ +# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.5.4 +pkgver=2.6 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f3c64086519c32ba7e892b6215b0fcbc' +md5sums=('d012d8bb5f85369d3b6a630a80667170' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index b0bc51cbe..2b4a87884 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178996 2013-03-01 10:25:36Z andrea $ +# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=soprano -pkgver=2.9.0 -pkgrel=2 +pkgver=2.9.1 +pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' @@ -12,13 +12,11 @@ license=('GPL' 'LGPL') depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'java-environment' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('90134eaaf40b6663dd01cfaefdaba7fb') +md5sums=('c7beb1bda475f363fa0afb58edc541fe') build() { mkdir build cd build - . /etc/profile.d/jdk.sh - . /etc/profile.d/qt4.sh # we need the rpath cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index 918428a6e..86ecfffec 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166607 2012-09-13 00:51:08Z eric $ +# $Id: PKGBUILD 184150 2013-05-02 19:39:51Z eric $ # Maintainer: Sergej Pupykin pkgname=ucommon -pkgver=5.5.0 +pkgver=6.0.3 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64') @@ -12,21 +12,21 @@ depends=('openssl') options=('!libtool') #source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) source=("http://www.gnutelephony.org/dist/tarballs/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('99d302b5217bb92b6fb9d91ead6fd028' - '0fcfd66e9746c3105cb5d222ad2cc91d') +md5sums=('c6025b339417e817b6d5ac21b5334823' + 'SKIP') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD new file mode 100644 index 000000000..88960ddba --- /dev/null +++ b/libre-testing/libretools/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Joshua Haase +# Contributor: fauno + +pkgbase=libretools +pkgname=(libretools libretools-mips64el) +pkgdesc="Programs for Parabola development" +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3+' 'GPL2') + +pkgver=20130503 +_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d +_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c + +pkgrel=1 +arch=('any') + +_packages_url=https://projects.parabolagnulinux.org/packages +source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 + $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) + +build() { + cd "$srcdir" + ln -sf devtools-par-$_devtools_commit devtools-par + cd "$srcdir/$pkgbase-$_libretools_commit" + make build-libretools build-libretools-mips64el build-doc +} + +package_libretools() { + backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) + install=libretools.install + groups=(base-devel) + + depends=( + arch-install-scripts # `archroot` uses `pacstrap` + git # `createworkdir` + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + subversion # `diff-unfree` + tokyocabinet # `treepkg` + wget # `aur` and `pkgbuild-check-nonfree` + ) + optdepends=('namcap: to check package files') + makedepends=(emacs) # emacs --batch is used during the build to process text + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools install-doc DESTDIR="$pkgdir" +} + +package_libretools-mips64el() { + pkgdesc="Scripts for Parabola development (for mips64el architecture)" + backup=('etc/libretools.d/mips64el.conf') + depends=("$pkgbase=$pkgver") + + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools-mips64el DESTDIR="$pkgdir" +} + +md5sums=('dabae9bb6040431e8e2b84871a027237' + 'c5cd04723119762701db766cb8f6e5ef') diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install new file mode 100644 index 000000000..ff6a238fe --- /dev/null +++ b/libre-testing/libretools/libretools.install @@ -0,0 +1,28 @@ +#!/bin/sh + +_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + +# arg 1: the new package version +post_install() { + if grep -q 'libre::' etc/makepkg.conf; then + libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + else + libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" + printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + fi +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + post_install +} + +pre_remove() { + if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + sed -i '/libre::/d' + else + libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" + fi +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index a4f2d18ee..8e41245c2 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $ +# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,17 +7,17 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=75 +_sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.75 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils') options=('!strip') -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" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -31,8 +31,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-symbol-waiting-3.0.patch' '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' - '13ae458b95cc12f1fcf7e37e91206cbe' +md5sums=('f30a562307b6f71204370fcd33756466' + 'e405de6581d02d44c2c06a81a1d93f93' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '8e9b3e526d0d339004e141fddf2390dc') + '9f8275e1bd316b2b93fd21df3b26228f') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -58,7 +58,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 9f7b9706d..d4fbc8398 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.75-1-LIBRE-LTS +KERNEL_VERSION=3.0.76-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/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index 6794b3aca..e125f83e9 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez # Maintainer (Parabola): fauno pkgname=babeld -pkgver=1.3.5 +pkgver=1.3.6 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('55f3df2429f4cf7816fce312591ba488' +md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0' 'SKIP') -- cgit v1.2.3-54-g00ecf