diff options
| -rw-r--r-- | community/glfw/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/nodejs/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/tea/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/tomoyo-tools/PKGBUILD | 5 | ||||
| -rw-r--r-- | community/xmobar/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/libffi/PKGBUILD | 4 | ||||
| -rw-r--r-- | extra/bftpd/PKGBUILD | 12 | ||||
| -rwxr-xr-x | extra/bftpd/bftpd.rc | 44 | ||||
| -rw-r--r-- | extra/ifplugd/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/ifplugd/ifplugd | 105 | ||||
| -rw-r--r-- | extra/libiscsi/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/maxima/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/modemmanager/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/networkmanager/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/networkmanager/modem-manager-0.7.991-1.patch | 59 | ||||
| -rw-r--r-- | extra/networkmanager/modem-manager-0.7.991-2.patch | 62 | ||||
| -rw-r--r-- | extra/sbcl/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/strace/PKGBUILD | 8 |
18 files changed, 178 insertions, 207 deletions
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index e017a51c6..5b817cdb6 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87832 2013-04-07 21:39:10Z svenstaro $ +# $Id: PKGBUILD 92480 2013-06-06 17:40:18Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,7 +7,7 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=2.7.8 +pkgver=2.7.9 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu') makedepends=('mesa') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('a2e1b13e46a7c637a7760c94b72896cd') +md5sums=('96e12be48801984f0f0c23e38549b277') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 27d84001f..dd0579bab 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92185 2013-06-02 15:29:37Z bpiotrowski $ +# $Id: PKGBUILD 92476 2013-06-06 10:35:48Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,8 +8,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.10.9 -pkgrel=2 +pkgver=0.10.10 +pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('25fb276ac6765ebb19f44d3e3775ed1c0275f874c896755d0d619226caee9c30') +sha256sums=('a54de71d2c3ac7ae864ab9640b6eecb27d7d49c190ac1ca6526243fd7a8ad15c') prepare() { cd node-v$pkgver diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index 788c6c222..531a88c9d 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87037 2013-03-26 11:01:18Z spupykin $ +# $Id: PKGBUILD 92472 2013-06-06 09:43:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,17 +6,17 @@ # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu> pkgname=tea -pkgver=35.0.0 +pkgver=36.0.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') -url="http://tea-editor.sourceforge.net/" +url="http://semiletov.org/tea/" license=('GPL') depends=('qt4' 'aspell' 'hunspell') install=tea.install -source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 +source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('aabbbac2b5251e7c3eeb36d8f188d08a' +md5sums=('50a6eeae9cf940afdb4cf8e815453886' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index c046d9d44..9d1e58107 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92435 2013-06-05 10:32:39Z spupykin $ +# $Id: PKGBUILD 92474 2013-06-06 09:43:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> @@ -7,14 +7,13 @@ _basever=2.5.0 _timestamp=20130214 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=4 +pkgrel=5 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' arch=('i686' 'x86_64') url='http://tomoyo.sourceforge.jp' #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' license=('GPL') depends=('ncurses' 'linux>=3.2') -conflicts=('ccs-tools') install=tomoyo-tools.install source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") md5sums=('ffff6b531ed9ac32b01722a9cd749a2f') diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index dbbbdc72d..1f62f28c3 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89949 2013-05-06 07:32:36Z jelle $ +# $Id: PKGBUILD 92482 2013-06-06 20:06:10Z jelle $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=xmobar -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" @@ -11,7 +11,7 @@ license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' - 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3') + 'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-compat') options=('strip') source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz) @@ -28,4 +28,4 @@ package() { install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('d50287cd9f2284737c89e36de0eca107') +md5sums=('4d0502fa75cd51ff23e41e1711f25adb') diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 14633e682..80b457202 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180905 2013-03-27 21:58:17Z stephane $ +# $Id: PKGBUILD 187810 2013-06-06 08:25:26Z foutrelis $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi pkgver=3.0.13 -pkgrel=1 +pkgrel=3 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64') url="http://sourceware.org/libffi/" diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 3d8c636ae..166b2faa8 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165789 2012-08-29 23:52:16Z thomas $ +# $Id: PKGBUILD 187832 2013-06-06 18:31:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.8 -pkgrel=2 +pkgver=4.0 +pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64) url="http://bftpd.sourceforge.net/" @@ -15,15 +15,13 @@ backup=(etc/bftpd.conf etc/pam.d/bftpd etc/xinetd.d/bftpd) source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz - bftpd.rc bftpd.logrotate bftpd.pam bftpd.xinetd bftpd.service bftpd.socket bftpd_AT.service) -md5sums=('880c1274e623ddd1e3e37f9f0cf09d70' - '2419d7293000813f9d01bd357181445c' +md5sums=('34bac87bb196ae823fa2b4731dfa9383' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' '23feb84e8ecbae5df320b49e01821d9a' @@ -35,6 +33,7 @@ build() { cd "${srcdir}"/$pkgname # The bftpd author keeps screwing up the release tarballs rm -f config.{cache,status} + autoreconf sed 's|$(prefix)/sbin|$(prefix)/bin|g' -i Makefile.in ./configure --prefix=/usr \ --enable-pam \ @@ -47,7 +46,6 @@ package() { cd "${srcdir}"/$pkgname install -d -m755 "${pkgdir}"/usr/{bin,share/man/man8} install -D -m644 "${srcdir}"/bftpd.logrotate "${pkgdir}"/etc/logrotate.d/bftpd - install -D -m755 "${srcdir}"/bftpd.rc "${pkgdir}"/etc/rc.d/bftpd make DESTDIR="${pkgdir}" install # Remove log file and /var/run from the package # This guy keeps messing up his Makefile, /usr/var, wtf? diff --git a/extra/bftpd/bftpd.rc b/extra/bftpd/bftpd.rc deleted file mode 100755 index 4784ae28a..000000000 --- a/extra/bftpd/bftpd.rc +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE="/var/run/bftpd.pid" - -case "$1" in - start) - stat_busy "Starting bftpd Server" - PID="$(pidof -o %PPID /usr/bin/bftpd)" - if [ -z "$PID" ]; then - /usr/bin/bftpd -d - if [ $? -gt 0 ]; then - stat_fail - else - # wait until it forks - sleep 2 - echo $(pidof -o %PPID /usr/bin/bftpd) > $PIDFILE - add_daemon bftpd - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping bftpd Server" - if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then - kill -15 $(cat $PIDFILE) - rm $PIDFILE - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index 91c354179..49b8c616a 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $ +# $Id: PKGBUILD 187834 2013-06-06 18:34:52Z thomas $ # Contributor: Manolis Tzanidakis # Contributor: kevin <kevin@archlinux.org> # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=13 +pkgrel=14 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64') url="http://0pointer.de/lennart/projects/ifplugd" @@ -13,17 +13,15 @@ install=ifplugd.install license=('GPL2') depends=('libdaemon' 'bash') backup=('etc/ifplugd/ifplugd.conf') -options=('!makeflags') +options=('!makeflags' '!emptydirs') source=($url/${pkgname}-${pkgver}.tar.gz ifplugd-0.28-interface.patch ifplugd-fix-return-value.patch - ifplugd ifplugd-daemon ifplugd.systemd) md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '54eb22844b5aeed161c0b80aa9008570' 'f26dbd7597d9d637f0b2b104b11ab820' - '1ea9aa64415a5a9e27b84634cd08a7f2' 'f2e8a37af52b79ee0e3c5bcc2470ce10' '3dc2ce45d0e12d155ecc7a5bc9e3ee04') @@ -41,11 +39,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # replace the default init script & action files with ours. - install -D -m755 ${srcdir}/ifplugd ${pkgdir}/etc/rc.d/ifplugd install -D -m755 ${srcdir}/ifplugd-daemon ${pkgdir}/usr/bin/ifplugd-daemon - # remove default action script - rm -f ${pkgdir}/etc/ifplugd/ifplugd.action + # remove the default init script and action script + rm -f ${pkgdir}/etc/{ifplugd/ifplugd.action,rc.d/ifplugd} # install systemd unit install -D -m644 ${srcdir}/ifplugd.systemd ${pkgdir}/usr/lib/systemd/system/ifplugd@.service } diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd deleted file mode 100644 index 354238fe2..000000000 --- a/extra/ifplugd/ifplugd +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# -# ifplugd daemon script for Arch Linux - -. /etc/rc.conf -. /etc/rc.d/functions - -shopt -s extglob - -# env vars -daemonname=ifplugd -cfg=/etc/ifplugd/ifplugd.conf -PID=$(pidof -o %PPID ifplugd) - -# source configuration file -[[ -r $cfg ]] && . "$cfg" - -# discover interfaces to monitor -net_ifs=($INTERFACES) - -case $1 in - start) - stat_busy "Starting $daemonname: ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - # only start if a PID doesn't already exist - if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then - /usr/bin/ifplugd-daemon $nic - - # use presence of PID file to check for start success - [[ -f /var/run/ifplugd.$nic.pid ]] || (( ++err )) - fi - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - add_daemon $daemonname - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemonname: ${net_ifs[*]}" - - for nic in /var/run/ifplugd.*.pid; do - [[ -f $nic ]] || { (( ++err )); break; } - nic=${nic%.pid} - nic=${nic##*.} - ifplugd -k -i "$nic" || (( ++err )) - done - - if (( err )); then - stat_fail - exit 1 - else - rm_daemon $daemonname - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - for nic in "${net_ifs[@]}"; do - ifplugd -c -i "$nic" - done - unset nic - ;; - suspend) - stat_busy "Suspending $daemonname: ${net_ifs[*]}" - for nic in "${net_ifs[@]}"; do - ifplugd -S -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - resume) - stat_busy "Resuming $daemonname ${net_ifs[*]}" - - for nic in "${net_ifs[@]}"; do - ifplugd -R -i $nic || (( ++err )) - done - unset nic - - if (( err )); then - stat_fail - exit 1 - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|status|suspend|resume}" -esac -exit 0 diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD index 26f3c5381..022c26a78 100644 --- a/extra/libiscsi/PKGBUILD +++ b/extra/libiscsi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# $Id: PKGBUILD 187826 2013-06-06 15:44:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libiscsi pkgver=1.7.0 -pkgrel=1 +pkgrel=2 depends=('glibc' 'popt') -pkgdesc="Library that provides generic access to USB device" +pkgdesc="Clientside library to implement the iSCSI protocol" arch=(i686 x86_64) url="https://github.com/sahlberg/libiscsi" license=('LGPL') diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index d5f926997..81ba2b373 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ +# $Id: PKGBUILD 187812 2013-06-06 11:09:25Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima pkgver=5.30.0 -pkgrel=1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64') license=('GPL') url="http://maxima.sourceforge.net" -depends=('sbcl=1.1.7' 'texinfo' 'sh') +depends=('sbcl=1.1.8' 'texinfo' 'sh') makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') # needs rebuild when bash changes version diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 493f63cbf..7ff9e90f8 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187065 2013-06-03 11:16:44Z allan $ +# $Id: PKGBUILD 187818 2013-06-06 13:48:42Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager -pkgver=0.7.990 -pkgrel=5 +pkgver=0.7.991 +pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=(i686 x86_64) url="http://cgit.freedesktop.org/ModemManager/ModemManager/" @@ -16,7 +16,7 @@ optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install #source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=67d3ed1") +source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=a00f1d7") sha256sums=('SKIP') build() { diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 5fc37eb52..bac735262 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187067 2013-06-03 11:16:48Z allan $ +# $Id: PKGBUILD 187841 2013-06-06 20:23:04Z tpowa $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.8.0 -pkgrel=4 +pkgrel=6 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -27,14 +27,20 @@ options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz - NetworkManager.conf disable_set_hostname.patch) + NetworkManager.conf disable_set_hostname.patch + modem-manager-0.7.991-1.patch + modem-manager-0.7.991-2.patch) sha256sums=('c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '0499a409aa53a57290ccecf52e2bfa0b81926261012d166f6d12a36edbbcfeff' + '570626b0bfd86a4ffc30f515ffffbb32f10ea69ae5825a3f015379e1a54066d8') prepare() { cd $_pkgname-$pkgver patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../modem-manager-0.7.991-1.patch + patch -Np1 -i ../modem-manager-0.7.991-2.patch } build() { diff --git a/extra/networkmanager/modem-manager-0.7.991-1.patch b/extra/networkmanager/modem-manager-0.7.991-1.patch new file mode 100644 index 000000000..02ed33fdd --- /dev/null +++ b/extra/networkmanager/modem-manager-0.7.991-1.patch @@ -0,0 +1,59 @@ +From 0ff869e1c76803348047150bb6a361f1fef9ef87 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado <aleksander@lanedo.com> +Date: Mon, 03 Jun 2013 10:21:25 +0000 +Subject: modem-manager: don't request allowed modes when talking to ModemManager1 modems + +Just let them get connected with whatever network type they currently have. +--- +diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c +index 538b262..53839df 100644 +--- a/src/modem-manager/nm-modem-broadband.c ++++ b/src/modem-manager/nm-modem-broadband.c +@@ -262,45 +262,6 @@ create_gsm_connect_properties (NMConnection *connection) + if (str) + mm_simple_connect_properties_set_password (properties, str); + +- /* TODO: We should check SUPPORTED MODES here */ +- switch (nm_setting_gsm_get_network_type (setting)) { +- case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_3G, +- MM_MODEM_MODE_NONE); +- break; +- case NM_SETTING_GSM_NETWORK_TYPE_GPRS_EDGE: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_2G, +- MM_MODEM_MODE_NONE); +- break; +- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_UMTS_HSPA: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_ANY, +- MM_MODEM_MODE_3G); +- break; +- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_GPRS_EDGE: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_ANY, +- MM_MODEM_MODE_2G); +- break; +- case NM_SETTING_GSM_NETWORK_TYPE_PREFER_4G: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_ANY, +- MM_MODEM_MODE_4G); +- break; +- case NM_SETTING_GSM_NETWORK_TYPE_4G: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_4G, +- MM_MODEM_MODE_NONE); +- break; +- default: +- mm_simple_connect_properties_set_allowed_modes (properties, +- MM_MODEM_MODE_ANY, +- MM_MODEM_MODE_NONE); +- break; +- } +- + /* Roaming */ + if (nm_setting_gsm_get_home_only (setting)) + mm_simple_connect_properties_set_allow_roaming (properties, FALSE); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/networkmanager/modem-manager-0.7.991-2.patch b/extra/networkmanager/modem-manager-0.7.991-2.patch new file mode 100644 index 000000000..f1ca11784 --- /dev/null +++ b/extra/networkmanager/modem-manager-0.7.991-2.patch @@ -0,0 +1,62 @@ +From c126d97cb6666c714d75dc68d808b34c77a99398 Mon Sep 17 00:00:00 2001 +From: Aleksander Morgado <aleksander@lanedo.com> +Date: Wed, 05 Jun 2013 14:34:10 +0000 +Subject: modem-manager: read 'SupportedCapabilities' instead of 'ModemCapabilities' (bgo #701668) + +There is no longer a 'ModemCapabilities' uint32 property; instead we have +'SupportedCapabilities' giving a list of uint32 values. Just read the list and +merge the values into a single mask; NM doesn't care about the exact +combinations supported. + +https://bugzilla.gnome.org/show_bug.cgi?id=701668 +--- +diff --git a/configure.ac b/configure.ac +index d0ee1bd..e2e3862 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -464,7 +464,7 @@ AC_SUBST(PPPD_PLUGIN_DIR) + AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface support]),,[with_modem_manager_1=auto]) + if (test "${with_modem_manager_1}" != "no"); then + PKG_CHECK_MODULES(MM_GLIB, +- [mm-glib], ++ [mm-glib >= 0.7.991], + [have_libmm_glib=yes], + [have_libmm_glib=no]) + AC_SUBST(MM_GLIB_CFLAGS) +@@ -782,4 +782,3 @@ echo " documentation: $enable_gtk_doc" + echo " tests: $enable_tests" + echo " code coverage: $enable_code_coverage" + echo +- +diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c +index 53839df..febab8a 100644 +--- a/src/modem-manager/nm-modem-broadband.c ++++ b/src/modem-manager/nm-modem-broadband.c +@@ -116,8 +116,23 @@ nm_modem_broadband_get_capabilities (NMModemBroadband *self, + NMDeviceModemCapabilities *modem_caps, + NMDeviceModemCapabilities *current_caps) + { +- *modem_caps = (NMDeviceModemCapabilities)mm_modem_get_modem_capabilities (self->priv->modem_iface); +- *current_caps = (NMDeviceModemCapabilities)mm_modem_get_current_capabilities (self->priv->modem_iface); ++ MMModemCapability all_supported = MM_MODEM_CAPABILITY_NONE; ++ MMModemCapability *supported; ++ guint n_supported; ++ ++ /* For now, we don't care about the capability combinations, just merge all ++ * combinations in a single mask */ ++ if (mm_modem_get_supported_capabilities (self->priv->modem_iface, &supported, &n_supported)) { ++ guint i; ++ ++ for (i = 0; i < n_supported; i++) ++ all_supported |= supported[i]; ++ ++ g_free (supported); ++ } ++ ++ *modem_caps = (NMDeviceModemCapabilities) all_supported; ++ *current_caps = (NMDeviceModemCapabilities) mm_modem_get_current_capabilities (self->priv->modem_iface); + } + + /*****************************************************************************/ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index adbbb6f91..522d428b4 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ +# $Id: PKGBUILD 187814 2013-06-06 11:10:02Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk "arch-fixes.lisp" "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" "texinfo-4.13a-data_types.patch") -md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' +md5sums=('118dea06e26151d8315a118169ec16ec' '7ac0c1936547f4278198b8bf7725204d' '71ba711519209b5fb583fed2b3d86fcb' 'd8574782ff7def1e2dc5c291dbeaec18') diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD index 30a93a69f..487446796 100644 --- a/extra/strace/PKGBUILD +++ b/extra/strace/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158298 2012-05-03 15:18:30Z giovanni $ +# $Id: PKGBUILD 187820 2013-06-06 14:47:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=strace -pkgver=4.7 +pkgver=4.8 pkgrel=1 pkgdesc="A useful diagnositic, instructional, and debugging tool" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://sourceforge.net/projects/strace/" license=('custom') depends=('perl') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.xz") -md5sums=('6054c3880a00c6703f83b57f15e04642') +md5sums=('c575ef43829586801f514fd91bfe7575') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,5 +24,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" install - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |